X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftypes.db;h=0abab4bbf9a9564142fe98671458059c82ec0f45;hb=33e60ef35f745c56b1a5936272b1dd8b0cf63d12;hp=6d0b57a567bb9b98bd1fda7b92d95e3a14cc0922;hpb=77a6905147798210ec17173bd5e4410adcc3a112;p=collectd.git

diff --git a/src/types.db b/src/types.db
index 6d0b57a5..0abab4bb 100644
--- a/src/types.db
+++ b/src/types.db
@@ -4,15 +4,11 @@ apache_connections	value:GAUGE:0:65535
 apache_idle_workers	value:GAUGE:0:65535
 apache_requests		value:DERIVE:0:U
 apache_scoreboard	value:GAUGE:0:65535
-arc_counts		demand_data:DERIVE:0:U, demand_metadata:DERIVE:0:U, prefetch_data:DERIVE:0:U, prefetch_metadata:DERIVE:0:U
-arc_l2_bytes		read:DERIVE:0:U, write:DERIVE:0:U
-arc_l2_size		value:GAUGE:0:U
-arc_ratio		value:GAUGE:0:U
-arc_size		current:GAUGE:0:U, target:GAUGE:0:U, minlimit:GAUGE:0:U, maxlimit:GAUGE:0:U
 ath_nodes		value:GAUGE:0:65535
 ath_stat		value:DERIVE:0:U
 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
@@ -64,10 +60,11 @@ fanspeed		value:GAUGE:0:U
 file_size		value:GAUGE:0:U
 files			value:GAUGE:0:U
 fork_rate		value:DERIVE:0:U
-frequency		value:GAUGE:0:U
 frequency_offset	value:GAUGE:-1000000:1000000
+frequency		value:GAUGE:0:U
 fscache_stat		value:DERIVE:0:U
 gauge			value:GAUGE:U:U
+hash_collisions		value:DERIVE:0:U
 http_request_methods	value:DERIVE:0:U
 http_requests		value:DERIVE:0:U
 http_response_codes	value:DERIVE:0:U
@@ -89,6 +86,7 @@ irq			value:DERIVE:0:U
 latency			value:GAUGE:0:65535
 links			value:GAUGE:0:U
 load			shortterm:GAUGE:0:100, midterm:GAUGE:0:100, longterm:GAUGE:0:100
+md_disks		value:GAUGE:0:U
 memcached_command	value:DERIVE:0:U
 memcached_connections	value:GAUGE:0:U
 memcached_items		value:GAUGE:0:U
@@ -96,6 +94,7 @@ memcached_octets	rx:DERIVE:0:U, tx:DERIVE:0:U
 memcached_ops		value:DERIVE:0:U
 memory			value:GAUGE:0:281474976710656
 multimeter		value:GAUGE:U:U
+mutex_operations	value:DERIVE:0:U
 mysql_commands		value:DERIVE:0:U
 mysql_handler		value:DERIVE:0:U
 mysql_locks		value:DERIVE:0:U
@@ -110,6 +109,11 @@ node_stat		value:DERIVE:0:U
 node_tx_rate		value:GAUGE:0:127
 operations		value:DERIVE:0:U
 percent			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
@@ -118,8 +122,8 @@ pg_numbackends		value:GAUGE:0:U
 pg_scan			value:DERIVE:0:U
 pg_xact			value:DERIVE:0:U
 ping_droprate		value:GAUGE:0:100
-ping			value:GAUGE:0:65535
 ping_stddev		value:GAUGE:0:65535
+ping			value:GAUGE:0:65535
 players			value:GAUGE:0:1000000
 power			value:GAUGE:0:U
 protocol_counter	value:DERIVE:0:U
@@ -154,7 +158,7 @@ tcp_connections		value:GAUGE:0:4294967295
 temperature		value:GAUGE:-273.15: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
@@ -179,3 +183,14 @@ 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)
+#
+arc_counts		demand_data:COUNTER:0:U, demand_metadata:COUNTER:0:U, prefetch_data:COUNTER:0:U, prefetch_metadata:COUNTER:0:U
+arc_l2_bytes		read:COUNTER:0:U, write:COUNTER:0:U
+arc_l2_size		value:GAUGE:0:U
+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