X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Ftypes.db;h=97cc4cc08ad81a640be9b6550d0435deb447e9ba;hb=ef6a236ecbfbea57871e74bc8cda4ca2609d9a6d;hp=3dcb5e7a4cffc21108b568342fe45e28ef355f9d;hpb=76a7816d2c066f2feff5c77e7da58df4dbc982c2;p=collectd.git

diff --git a/src/types.db b/src/types.db
index 3dcb5e7a..97cc4cc0 100644
--- a/src/types.db
+++ b/src/types.db
@@ -6,13 +6,14 @@ apache_requests		value:DERIVE:0:U
 apache_scoreboard	value:GAUGE:0:65535
 ath_nodes		value:GAUGE:0:65535
 ath_stat		value:DERIVE:0:U
+backends		value:GAUGE:0:65535
 bitrate			value:GAUGE:0:4294967295
 bytes			value:GAUGE:0:U
 cache_eviction		value:DERIVE:0:U
 cache_operation		value:DERIVE:0:U
 cache_ratio		value:GAUGE:0:100
 cache_result		value:DERIVE:0:U
-cache_size		value:GAUGE:0:4294967295
+cache_size		value:GAUGE:0:U
 charge			value:GAUGE:0:U
 compression_ratio	value:GAUGE:0:2
 compression		uncompressed:DERIVE:0:U, compressed:DERIVE:0:U
@@ -52,14 +53,15 @@ dns_response		value:DERIVE:0:U
 dns_transfer		value:DERIVE:0:U
 dns_update		value:DERIVE:0:U
 dns_zops		value:DERIVE:0:U
+duration		seconds:GAUGE:0:U
 email_check		value:GAUGE:0:U
 email_count		value:GAUGE:0:U
 email_size		value:GAUGE:0:U
 entropy			value:GAUGE:0:4294967295
-evaluations	value:COUNTER:0:U
 fanspeed		value:GAUGE:0:U
 file_size		value:GAUGE:0:U
 files			value:GAUGE:0:U
+flow			value:GAUGE:0:U
 fork_rate		value:DERIVE:0:U
 frequency_offset	value:GAUGE:-1000000:1000000
 frequency		value:GAUGE:0:U
@@ -77,16 +79,18 @@ if_multicast		value:DERIVE:0:U
 if_octets		rx:DERIVE:0:U, tx:DERIVE:0:U
 if_packets		rx:DERIVE:0:U, tx:DERIVE:0:U
 if_rx_errors		value:DERIVE:0:U
+if_rx_octets		value:DERIVE:0:U
 if_tx_errors		value:DERIVE:0:U
+if_tx_octets		value:DERIVE:0:U
 invocations		value:DERIVE:0:U
 io_octets		rx:DERIVE:0:U, tx:DERIVE:0:U
 io_packets		rx:DERIVE:0:U, tx:DERIVE:0:U
 ipt_bytes		value:DERIVE:0:U
 ipt_packets		value:DERIVE:0:U
 irq			value:DERIVE:0:U
-latency			value:GAUGE:0:65535
+latency			value:GAUGE:0:U
 links			value:GAUGE:0:U
-load			shortterm:GAUGE:0:100, midterm:GAUGE:0:100, longterm:GAUGE:0:100
+load			shortterm:GAUGE:0:5000, midterm:GAUGE:0:5000, longterm:GAUGE:0:5000
 md_disks		value:GAUGE:0:U
 memcached_command	value:DERIVE:0:U
 memcached_connections	value:GAUGE:0:U
@@ -108,17 +112,16 @@ node_octets		rx:DERIVE:0:U, tx:DERIVE:0:U
 node_rssi		value:GAUGE:0:255
 node_stat		value:DERIVE:0:U
 node_tx_rate		value:GAUGE:0:127
+objects			value:GAUGE:0:U
 operations		value:DERIVE:0:U
 percent			value:GAUGE:0:100.1
-pf_bytes_in	value:COUNTER:0:U
-pf_bytes_out	value:COUNTER:0:U
-pf_counters	value:COUNTER:0:U
-pf_limits	value:COUNTER:0:U
-pf_packets_in	value:COUNTER:0:U
-pf_packets_out	value:COUNTER:0:U
-pf_source	value:COUNTER:0:U
-pf_states	value:GAUGE:0:U
-pf_state	value:COUNTER:0:U
+percent_bytes		value:GAUGE:0:100.1
+percent_inodes		value:GAUGE:0:100.1
+pf_counters		value:DERIVE:0:U
+pf_limits		value:DERIVE:0:U
+pf_source		value:DERIVE:0:U
+pf_states		value:GAUGE:0:U
+pf_state		value:DERIVE:0:U
 pg_blks			value:DERIVE:0:U
 pg_db_size		value:GAUGE:0:U
 pg_n_tup_c		value:DERIVE:0:U
@@ -147,6 +150,7 @@ queue_length		value:GAUGE:0:U
 records			value:GAUGE:0:U
 requests		value:GAUGE:0:U
 response_time		value:GAUGE:0:U
+response_code		value:GAUGE:0:U
 route_etx		value:GAUGE:0:U
 route_metric		value:GAUGE:0:U
 routes			value:GAUGE:0:U
@@ -157,18 +161,18 @@ signal_quality		value:GAUGE:0:U
 snr			value:GAUGE:0:U
 spam_check		value:GAUGE:0:U
 spam_score		value:GAUGE:U:U
-states_cur	value:GAUGE:0:U
-states_tot	value:COUNTER:0:U
+spl			value:GAUGE:U:U
 swap_io			value:DERIVE:0:U
 swap			value:GAUGE:0:1099511627776
 tcp_connections		value:GAUGE:0:4294967295
-temperature		value:GAUGE:-273.15:U
+temperature		value:GAUGE:U:U
 threads			value:GAUGE:0:U
 time_dispersion		value:GAUGE:-1000000:1000000
-timeleft		value:GAUGE:0:3600
+timeleft		value:GAUGE:0:U
 time_offset		value:GAUGE:-1000000:1000000
 total_bytes		value:DERIVE:0:U
 total_connections	value:DERIVE:0:U
+total_objects		value:DERIVE:0:U
 total_operations	value:DERIVE:0:U
 total_requests		value:DERIVE:0:U
 total_sessions		value:DERIVE:0:U
@@ -177,6 +181,7 @@ total_time_in_ms	value:DERIVE:0:U
 total_values		value:DERIVE:0:U
 uptime			value:GAUGE:0:4294967295
 users			value:GAUGE:0:65535
+vcl			value:GAUGE:0:65535
 vcpu			value:GAUGE:0:U
 virt_cpu_total		value:DERIVE:0:U
 virt_vcpu		value:DERIVE:0:U
@@ -190,6 +195,7 @@ voltage			value:GAUGE:U:U
 vs_memory		value:GAUGE:0:9223372036854775807
 vs_processes		value:GAUGE:0:65535
 vs_threads		value:GAUGE:0:65535
+
 #
 # Legacy types
 # (required for the v5 upgrade target)
@@ -201,4 +207,3 @@ arc_ratio		value:GAUGE:0:U
 arc_size		current:GAUGE:0:U, target:GAUGE:0:U, minlimit:GAUGE:0:U, maxlimit:GAUGE:0:U
 mysql_qcache		hits:COUNTER:0:U, inserts:COUNTER:0:U, not_cached:COUNTER:0:U, lowmem_prunes:COUNTER:0:U, queries_in_cache:GAUGE:0:U
 mysql_threads		running:GAUGE:0:U, connected:GAUGE:0:U, cached:GAUGE:0:U, created:COUNTER:0:U
->>>>>>> master