Merge branch 'collectd-4.2'

[collectd.git] / src / types.db

diff --git a/src/types.db b/src/types.db
index e53f92f..a19f26d 100644 (file)
--- a/src/types.db
+++ b/src/types.db
@@ -6,8 +6,8 @@ bitrate                 value:GAUGE:0:4294967295
 charge                 value:GAUGE:0:U
 connections            value:COUNTER:0:U
 counter                        value:COUNTER:U:U
-cpu                    value:COUNTER:0:4294967295
 cpufreq                        value:GAUGE:0:U
+cpu                    value:COUNTER:0:4294967295
 current                        value:GAUGE:U:U
 delay                  seconds:GAUGE:-1000000:1000000
 df                     used:GAUGE:0:1125899906842623, free:GAUGE:0:1125899906842623
@@ -27,7 +27,7 @@ fanspeed              value:GAUGE:0:U
 frequency              frequency:GAUGE:0:U
 frequency_offset       ppm:GAUGE:-1000000:1000000
 gauge                  value:GAUGE:U:U
-humitidy               value:GAUGE:0:100
+humidity               value:GAUGE:0:100
 if_collisions          value:COUNTER:0:4294967295
 if_dropped             rx:COUNTER:0:4294967295, tx:COUNTER:0:4294967295
 if_errors              rx:COUNTER:0:4294967295, tx:COUNTER:0:4294967295
@@ -40,6 +40,11 @@ ipt_bytes            value:COUNTER:0:134217728
 ipt_packets            value:COUNTER:0:134217728
 irq                    value:COUNTER:U:65535
 load                   shortterm:GAUGE:0:100, midterm:GAUGE:0:100, longterm:GAUGE:0:100
+memcached_command      value:COUNTER:0:U
+memcached_connections  value:GAUGE:0:U
+memcached_items                value:GAUGE:0:U
+memcached_octets       rx:COUNTER:0:4294967295, tx:COUNTER:0:4294967295
+memcached_ops          value:COUNTER:0:134217728
 memory                 value:GAUGE:0:281474976710656
 multimeter             value:GAUGE:U:U
 mysql_commands         value:COUNTER:0:U
@@ -48,27 +53,32 @@ mysql_octets                rx:COUNTER:0:4294967295, tx:COUNTER:0:4294967295
 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
 nfs_procedure          value:COUNTER:0:4294967295
+nginx_connections      value:GAUGE:0:U
+nginx_requests         value:COUNTER:0:134217728
 percent                        percent:GAUGE:0:100.1
 ping                   ping:GAUGE:0:65535
 power                  value:GAUGE:0:U
 ps_count               processes:GAUGE:0:1000000, threads:GAUGE:0:1000000
-ps_cputime             user:COUNTER:0:1000000, syst:COUNTER:0:1000000
+ps_cputime             user:COUNTER:0:16000000, syst:COUNTER:0:16000000
 ps_pagefaults          minflt:COUNTER:0:9223372036854775807, majflt:COUNTER:0:9223372036854775807
 ps_rss                 value:GAUGE:0:9223372036854775807
 ps_state               value:GAUGE:0:65535
+serial_octets          rx:COUNTER:0:4294967295, tx:COUNTER:0:4294967295
+signal_noise           value:GAUGE:U:0
+signal_power           value:GAUGE:U:0
+signal_quality         value:GAUGE:0:U
 spam_score             value:GAUGE:U:U
+swap                   value:GAUGE:0:1099511627776
 tcp_connections                value:GAUGE:0:4294967295
 temperature            value:GAUGE:-273.15:U
 time_dispersion                seconds:GAUGE:-1000000:1000000
-time_offset            seconds:GAUGE:-1000000:1000000
 timeleft               timeleft:GAUGE:0:3600
-voltage                        value:GAUGE:U:U
-serial_octets          rx:COUNTER:0:4294967295, tx:COUNTER:0:4294967295
-swap                   value:GAUGE:0:1099511627776
+time_offset            seconds:GAUGE:-1000000:1000000
 users                  users:GAUGE:0:65535
-vs_threads             value:GAUGE:0:65535
-vs_processes           value:GAUGE:0:65535
+virt_cpu_total         ns:COUNTER:0:256000000000
+virt_vcpu              ns:COUNTER:0:1000000000
+voltage_threshold      value:GAUGE:U:U, threshold:GAUGE:U:U
+voltage                        value:GAUGE:U:U
 vs_memory              value:GAUGE:0:9223372036854775807
-signal_quality         value:GAUGE:0:U
-signal_power           value:GAUGE:U:0
-signal_noise           value:GAUGE:U:0
+vs_processes           value:GAUGE:0:65535
+vs_threads             value:GAUGE:0:65535