From: Florian Forster Date: Thu, 8 Sep 2016 06:11:42 +0000 (+0200) Subject: Merge branch 'collectd-5.6' X-Git-Tag: collectd-5.7.0~107 X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=e62ca6291b991412d3d8cbcecd4274b8c66a457d;hp=-c;p=collectd.git Merge branch 'collectd-5.6' --- e62ca6291b991412d3d8cbcecd4274b8c66a457d diff --combined src/types.db index 1ab1d7c6,9ebc5fc6..093df15a --- a/src/types.db +++ b/src/types.db @@@ -92,7 -92,6 +92,7 @@@ hash_collisions value:DERIVE:0: http_request_methods value:DERIVE:0:U http_requests value:DERIVE:0:U http_response_codes value:DERIVE:0:U +hugepages free:GAUGE:0:4294967295, used:GAUGE:0:4294967295 humidity value:GAUGE:0:100 if_collisions value:DERIVE:0:U if_dropped rx:DERIVE:0:U, tx:DERIVE:0:U @@@ -174,7 -173,7 +174,7 @@@ ping value:GAUGE:0:6 ping_droprate value:GAUGE:0:100 ping_stddev value:GAUGE:0:65535 players value:GAUGE:0:1000000 - power value:GAUGE:0:U + power value:GAUGE:U:U pressure value:GAUGE:0:U protocol_counter value:DERIVE:0:U ps_code value:GAUGE:0:9223372036854775807