src/types.db: Rename the data sources of all types with only one DS to "value".

I'm not yet 100% sure what to do with the types with two or more data sources.

diff --git a/src/types.db b/src/types.db
index 5fdfa02c0b21ec30ce4cc341eba6dd546f2a761c..6d0b57a567bb9b98bd1fda7b92d95e3a14cc0922 100644 (file)
--- a/src/types.db
+++ b/src/types.db
@@ -1,9 +1,9 @@
-absolute               count:ABSOLUTE:0:U
-apache_bytes           count:DERIVE:0:U
-apache_connections     count:GAUGE:0:65535
-apache_idle_workers    count:GAUGE:0:65535
-apache_requests                count:DERIVE:0:U
-apache_scoreboard      count:GAUGE:0:65535
+absolute               value:ABSOLUTE:0:U
+apache_bytes           value:DERIVE:0:U
+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
@@ -21,15 +21,15 @@ charge                      value:GAUGE:0:U
 compression_ratio      value:GAUGE:0:2
 compression            uncompressed:DERIVE:0:U, compressed:DERIVE:0:U
 connections            value:DERIVE:0:U
-conntrack              entropy:GAUGE:0:4294967295
-contextswitch          contextswitches:DERIVE:0:U
+conntrack              value:GAUGE:0:4294967295
+contextswitch          value:DERIVE:0:U
 counter                        value:COUNTER:U:U
 cpufreq                        value:GAUGE:0:U
 cpu                    value:DERIVE:0:U
 current_connections    value:GAUGE:0:U
 current_sessions       value:GAUGE:0:U
 current                        value:GAUGE:U:U
-delay                  seconds:GAUGE:-1000000:1000000
+delay                  value:GAUGE:-1000000:1000000
 derive                 value:DERIVE:0:U
 df_complex             value:GAUGE:0:U
 df_inodes              value:GAUGE:0:U
@@ -59,18 +59,18 @@ dns_zops            value:DERIVE:0:U
 email_check            value:GAUGE:0:U
 email_count            value:GAUGE:0:U
 email_size             value:GAUGE:0:U
-entropy                        entropy:GAUGE:0:4294967295
+entropy                        value:GAUGE:0:4294967295
 fanspeed               value:GAUGE:0:U
-file_size              bytes:GAUGE:0:U
+file_size              value:GAUGE:0:U
 files                  value:GAUGE:0:U
 fork_rate              value:DERIVE:0:U
-frequency              frequency:GAUGE:0:U
-frequency_offset       ppm:GAUGE:-1000000:1000000
+frequency              value:GAUGE:0:U
+frequency_offset       value:GAUGE:-1000000:1000000
 fscache_stat           value:DERIVE:0:U
 gauge                  value:GAUGE:U:U
-http_request_methods   count:DERIVE:0:U
-http_requests          count:DERIVE:0:U
-http_response_codes    count:DERIVE:0:U
+http_request_methods   value:DERIVE:0:U
+http_requests          value:DERIVE:0:U
+http_response_codes    value:DERIVE:0:U
 humidity               value:GAUGE:0:100
 if_collisions          value:DERIVE:0:U
 if_dropped             rx:DERIVE:0:U, tx:DERIVE:0:U
@@ -109,7 +109,7 @@ node_rssi           value:GAUGE:0:255
 node_stat              value:DERIVE:0:U
 node_tx_rate           value:GAUGE:0:127
 operations             value:DERIVE:0:U
-percent                        percent:GAUGE:0:100.1
+percent                        value:GAUGE:0:100.1
 pg_blks                        value:DERIVE:0:U
 pg_db_size             value:GAUGE:0:U
 pg_n_tup_c             value:DERIVE:0:U
@@ -118,7 +118,7 @@ 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                   ping:GAUGE:0:65535
+ping                   value:GAUGE:0:65535
 ping_stddev            value:GAUGE:0:65535
 players                        value:GAUGE:0:1000000
 power                  value:GAUGE:0:U
@@ -135,7 +135,7 @@ ps_stacksize                value:GAUGE:0:9223372036854775807
 ps_state               value:GAUGE:0:65535
 ps_vm                  value:GAUGE:0:9223372036854775807
 queue_length           value:GAUGE:0:U
-records                        count:GAUGE:0:U
+records                        value:GAUGE:0:U
 requests               value:GAUGE:0:U
 response_time          value:GAUGE:0:U
 route_etx              value:GAUGE:0:U
@@ -153,9 +153,9 @@ swap                        value:GAUGE:0:1099511627776
 tcp_connections                value:GAUGE:0:4294967295
 temperature            value:GAUGE:-273.15:U
 threads                        value:GAUGE:0:U
-time_dispersion                seconds:GAUGE:-1000000:1000000
-timeleft               timeleft:GAUGE:0:3600
-time_offset            seconds:GAUGE:-1000000:1000000
+time_dispersion                value:GAUGE:-1000000:1000000
+timeleft               value:GAUGE:0:3600
+time_offset            value:GAUGE:-1000000:1000000
 total_bytes            value:DERIVE:0:U
 total_connections      value:DERIVE:0:U
 total_operations       value:DERIVE:0:U
@@ -165,10 +165,10 @@ total_threads             value:DERIVE:0:U
 total_time_in_ms       value:DERIVE:0:U
 total_values           value:DERIVE:0:U
 uptime                 value:GAUGE:0:4294967295
-users                  users:GAUGE:0:65535
+users                  value:GAUGE:0:65535
 vcpu                   value:GAUGE:0:U
-virt_cpu_total         ns:DERIVE:0:U
-virt_vcpu              ns:DERIVE:0:U
+virt_cpu_total         value:DERIVE:0:U
+virt_vcpu              value:DERIVE:0:U
 vmpage_action          value:DERIVE:0:U
 vmpage_faults          minflt:DERIVE:0:U, majflt:DERIVE:0:U
 vmpage_io              in:DERIVE:0:U, out:DERIVE:0:U