Merge branch 'collectd-4.5'

[collectd.git] / src / types.db

diff --git a/src/types.db b/src/types.db
index 942c7ba..67d8f0d 100644 (file)
--- a/src/types.db
+++ b/src/types.db
@@ -3,8 +3,9 @@ apache_connections      count:GAUGE:0:65535
 apache_requests                count:COUNTER:0:134217728
 apache_scoreboard      count:GAUGE:0:65535
 bitrate                        value:GAUGE:0:4294967295
+bytes                  value:GAUGE:0:U
 cache_result           value:COUNTER:0:4294967295
-cache_size              value:GAUGE:0:4294967295
+cache_size             value:GAUGE:0:4294967295
 charge                 value:GAUGE:0:U
 connections            value:COUNTER:0:U
 counter                        value:COUNTER:U:U
@@ -28,6 +29,7 @@ email_count           value:GAUGE:0:U
 email_size             value:GAUGE:0:U
 entropy                        entropy:GAUGE:0:4294967295
 fanspeed               value:GAUGE:0:U
+files                  value:GAUGE:0:U
 frequency              frequency:GAUGE:0:U
 frequency_offset       ppm:GAUGE:-1000000:1000000
 gauge                  value:GAUGE:U:U
@@ -40,6 +42,8 @@ if_octets             rx:COUNTER:0:4294967295, tx:COUNTER:0:4294967295
 if_packets             rx:COUNTER:0:4294967295, tx:COUNTER:0:4294967295
 if_rx_errors           value:COUNTER:0:4294967295
 if_tx_errors           value:COUNTER:0:4294967295
+io_octets              rx:COUNTER:0:4294967295, tx:COUNTER:0:4294967295
+io_packets             rx:COUNTER:0:4294967295, tx:COUNTER:0:4294967295
 ipt_bytes              value:COUNTER:0:134217728
 ipt_packets            value:COUNTER:0:134217728
 irq                    value:COUNTER:U:65535
@@ -60,18 +64,29 @@ mysql_threads               running:GAUGE:0:U, connected:GAUGE:0:U, cached:GAUGE:0:U, created
 nfs_procedure          value:COUNTER:0:4294967295
 nginx_connections      value:GAUGE:0:U
 nginx_requests         value:COUNTER:0:134217728
+operations             value:COUNTER:0:4294967295
 percent                        percent:GAUGE:0:100.1
+pg_blks                        value:COUNTER:0:U
+pg_db_size             value:GAUGE:0:U
+pg_n_tup_c             value:COUNTER:0:U
+pg_n_tup_g             value:GAUGE:0:U
+pg_numbackends         value:GAUGE:0:U
+pg_scan                        value:COUNTER:0:U
+pg_xact                        value:COUNTER:0:U
 ping                   ping:GAUGE:0:65535
+players                        value:GAUGE:0:1000000
 power                  value:GAUGE:0:U
 ps_count               processes:GAUGE:0:1000000, threads:GAUGE: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
+queue_length           value:GAUGE:0:U
 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_check             value:GAUGE:0:U
 spam_score             value:GAUGE:U:U
 swap                   value:GAUGE:0:1099511627776
 tcp_connections                value:GAUGE:0:4294967295
@@ -79,15 +94,13 @@ temperature         value:GAUGE:-273.15:U
 time_dispersion                seconds:GAUGE:-1000000:1000000
 timeleft               timeleft:GAUGE:0:3600
 time_offset            seconds:GAUGE:-1000000:1000000
-octets                 send:COUNTER:0:4294967295, received:COUNTER:0:4294967295
-packets                        send:COUNTER:0:4294967295, received:COUNTER:0:4294967295
 users                  users:GAUGE:0:65535
 virt_cpu_total         ns:COUNTER:0:256000000000
 virt_vcpu              ns:COUNTER:0:1000000000
 vmpage_action          value:COUNTER:0:4294967295
-vmpage_number          value:GAUGE:0:4294967295
 vmpage_faults          minflt:COUNTER:0:9223372036854775807, majflt:COUNTER:0:9223372036854775807
 vmpage_io              in:COUNTER:0:4294967295, out:COUNTER:0:4294967295
+vmpage_number          value:GAUGE:0:4294967295
 voltage_threshold      value:GAUGE:U:U, threshold:GAUGE:U:U
 voltage                        value:GAUGE:U:U
 vs_memory              value:GAUGE:0:9223372036854775807