Merge branch 'collectd-4.10' into collectd-5.1

[collectd.git] / src / types.db

diff --git a/src/types.db b/src/types.db
index caf31e7..a9b8b78 100644 (file)
--- a/src/types.db
+++ b/src/types.db
@@ -8,6 +8,7 @@ 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
@@ -25,7 +26,6 @@ current_connections   value:GAUGE:0:U
 current_sessions       value:GAUGE:0:U
 current                        value:GAUGE:U:U
 delay                  value:GAUGE:-1000000:1000000
-deleted                 deleted:COUNTER:0:U
 derive                 value:DERIVE:0:U
 df_complex             value:GAUGE:0:U
 df_inodes              value:GAUGE:0:U
@@ -56,7 +56,6 @@ email_check           value:GAUGE:0:U
 email_count            value:GAUGE:0:U
 email_size             value:GAUGE:0:U
 entropy                        value:GAUGE:0:4294967295
-evict                   evict_l2_cached:COUNTER:0:U, evict_l2_eligible:COUNTER:0:U, evict_l2_ineligible:COUNTER:0:U
 fanspeed               value:GAUGE:0:U
 file_size              value:GAUGE:0:U
 files                  value:GAUGE:0:U
@@ -65,7 +64,7 @@ frequency             value:GAUGE:0:U
 frequency_offset       value:GAUGE:-1000000:1000000
 fscache_stat           value:DERIVE:0:U
 gauge                  value:GAUGE:U:U
-hash                    hash_collisions:COUNTER:0: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
@@ -95,7 +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                   mutex_miss:COUNTER:0: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
@@ -154,7 +153,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