From: Florian Forster <octo@collectd.org>
Date: Thu, 18 May 2017 08:07:03 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/pr/2190'
X-Git-Tag: collectd-5.8.0~172
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=d45f9cdfc084fc5e8783073b993d58b84deb5d58;hp=-c

Merge remote-tracking branch 'github/pr/2190'
---

d45f9cdfc084fc5e8783073b993d58b84deb5d58
diff --combined src/types.db
index 0a5413bb,4a4f56f7..c9838e16
--- a/src/types.db
+++ b/src/types.db
@@@ -26,7 -26,7 +26,7 @@@ clock_last_meas         value:GAUGE:0:
  clock_last_update       value:GAUGE:U:U
  clock_mode              value:GAUGE:0:U
  clock_reachability      value:GAUGE:0:U
- clock_skew_ppm          value:GAUGE:-2:2
+ clock_skew_ppm          value:GAUGE:0:1000000
  clock_state             value:GAUGE:0:U
  clock_stratum           value:GAUGE:0:U
  compression             uncompressed:DERIVE:0:U, compressed:DERIVE:0:U
@@@ -37,7 -37,6 +37,7 @@@ contextswitch           value:DERIVE:0:
  count                   value:GAUGE:0:U
  counter                 value:COUNTER:U:U
  cpu                     value:DERIVE:0:U
 +cpu_affinity            value:GAUGE:0:1
  cpufreq                 value:GAUGE:0:U
  current                 value:GAUGE:U:U
  current_connections     value:GAUGE:0:U
@@@ -48,7 -47,6 +48,7 @@@ df                      used:GAUGE:0:11
  df_complex              value:GAUGE:0:U
  df_inodes               value:GAUGE:0:U
  dilution_of_precision   value:GAUGE:0:U
 +disk_error              value:GAUGE:0:U
  disk_io_time            io_time:DERIVE:0:U, weighted_io_time:DERIVE:0:U
  disk_latency            read:GAUGE:0:U, write:GAUGE:0:U
  disk_merged             read:DERIVE:0:U, write:DERIVE:0:U
@@@ -72,7 -70,6 +72,7 @@@ dns_response            value:DERIVE:0:
  dns_transfer            value:DERIVE:0:U
  dns_update              value:DERIVE:0:U
  dns_zops                value:DERIVE:0:U
 +domain_state            state:GAUGE:0:U, reason:GAUGE:0:U
  drbd_resource           value:DERIVE:0:U
  duration                seconds:GAUGE:0:U
  email_check             value:GAUGE:0:U
@@@ -92,7 -89,7 +92,7 @@@ filter_result           value:DERIVE:0:
  flow                    value:GAUGE:0:U
  fork_rate               value:DERIVE:0:U
  frequency               value:GAUGE:0:U
- frequency_error         value:GAUGE:-2:2 
+ frequency_error         value:GAUGE:-1000000:1000000
  frequency_offset        value:GAUGE:-1000000:1000000
  fscache_stat            value:DERIVE:0:U
  gauge                   value:GAUGE:U:U
@@@ -122,7 -119,6 +122,7 @@@ ipc                     value:GAUGE:0:
  ipt_bytes               value:DERIVE:0:U
  ipt_packets             value:DERIVE:0:U
  irq                     value:DERIVE:0:U
 +job_stats               value:DERIVE:0:U
  latency                 value:GAUGE:0:U
  links                   value:GAUGE:0:U
  load                    shortterm:GAUGE:0:5000, midterm:GAUGE:0:5000, longterm:GAUGE:0:5000
@@@ -172,7 -168,6 +172,7 @@@ pending_operations      value:GAUGE:0:
  percent                 value:GAUGE:0:100.1
  percent_bytes           value:GAUGE:0:100.1
  percent_inodes          value:GAUGE:0:100.1
 +perf                    value:DERIVE:0:U
  pf_counters             value:DERIVE:0:U
  pf_limits               value:DERIVE:0:U
  pf_source               value:DERIVE:0:U