Merge branch 'pull/collectd-4.1' into collectd-4.1

diff --combined src/types.db
index a04a6e8,ac33227..c0463c4
--- 1/src/types.db
--- 2/src/types.db
+++ b/src/types.db
@@@ -5,8 -5,8 +5,8 @@@ apache_scoreboard        count:GAUGE:0:6553
  bitrate                       value:GAUGE:0:4294967295
  charge                        value:GAUGE: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
@@@ -26,7 -26,7 +26,7 @@@ fanspeed              value:GAUGE:0:
  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
@@@ -55,19 -55,18 +55,19 @@@ ps_cputime         user:COUNTER:0:16000000, sy
  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
  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
 +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