Merge branch 'collectd-4.10' into collectd-5.3

diff --combined src/collectd.conf.in
index 331fad7,af8c164..f9d011f
--- 1/src/collectd.conf.in
--- 2/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@@ -11,24 -11,14 +11,24 @@@
  ##############################################################################
  
  #Hostname    "localhost"
 -FQDNLookup   true
 -#BaseDir     "@prefix@/var/lib/@PACKAGE_NAME@"
 -#PIDFile     "@prefix@/var/run/@PACKAGE_NAME@.pid"
 -#PluginDir   "@prefix@/lib/@PACKAGE_NAME@"
 +#FQDNLookup   true
 +#BaseDir     "@localstatedir@/lib/@PACKAGE_NAME@"
 +#PIDFile     "@localstatedir@/run/@PACKAGE_NAME@.pid"
 +#PluginDir   "@libdir@/@PACKAGE_NAME@"
  #TypesDB     "@prefix@/share/@PACKAGE_NAME@/types.db"
 +
 +#----------------------------------------------------------------------------#
 +# Interval at which to query values. This may be overwritten on a per-plugin #
 +# base by using the 'Interval' option of the LoadPlugin block:               #
 +#   <LoadPlugin foo>                                                         #
 +#       Interval 60                                                          #
 +#   </LoadPlugin>                                                            #
 +#----------------------------------------------------------------------------#
  #Interval     10
 +
  #Timeout      2
  #ReadThreads  5
 +#WriteThreads 5
  
  ##############################################################################
  # Logging                                                                    #
@@@ -62,8 -52,6 +62,8 @@@
  # to missing dependencies or because they have been deactivated explicitly.  #
  ##############################################################################
  
 +#@BUILD_PLUGIN_AGGREGATION_TRUE@LoadPlugin aggregation
 +#@BUILD_PLUGIN_AMQP_TRUE@LoadPlugin amqp
  #@BUILD_PLUGIN_APACHE_TRUE@LoadPlugin apache
  #@BUILD_PLUGIN_APCUPS_TRUE@LoadPlugin apcups
  #@BUILD_PLUGIN_APPLE_SENSORS_TRUE@LoadPlugin apple_sensors
@@@ -84,7 -72,6 +84,7 @@@
  #@BUILD_PLUGIN_DNS_TRUE@LoadPlugin dns
  #@BUILD_PLUGIN_EMAIL_TRUE@LoadPlugin email
  #@BUILD_PLUGIN_ENTROPY_TRUE@LoadPlugin entropy
 +#@BUILD_PLUGIN_ETHSTAT_TRUE@LoadPlugin ethstat
  #@BUILD_PLUGIN_EXEC_TRUE@LoadPlugin exec
  #@BUILD_PLUGIN_FILECOUNT_TRUE@LoadPlugin filecount
  #@BUILD_PLUGIN_FSCACHE_TRUE@LoadPlugin fscache
@@@ -98,10 -85,8 +98,10 @@@
  #@BUILD_PLUGIN_JAVA_TRUE@LoadPlugin java
  #@BUILD_PLUGIN_LIBVIRT_TRUE@LoadPlugin libvirt
  @BUILD_PLUGIN_LOAD_TRUE@@BUILD_PLUGIN_LOAD_TRUE@LoadPlugin load
 +#@BUILD_PLUGIN_LPAR_TRUE@LoadPlugin lpar
  #@BUILD_PLUGIN_MADWIFI_TRUE@LoadPlugin madwifi
  #@BUILD_PLUGIN_MBMON_TRUE@LoadPlugin mbmon
 +#@BUILD_PLUGIN_MD_TRUE@LoadPlugin md
  #@BUILD_PLUGIN_MEMCACHEC_TRUE@LoadPlugin memcachec
  #@BUILD_PLUGIN_MEMCACHED_TRUE@LoadPlugin memcached
  @BUILD_PLUGIN_MEMORY_TRUE@@BUILD_PLUGIN_MEMORY_TRUE@LoadPlugin memory
@@@ -116,7 -101,6 +116,7 @@@
  #@BUILD_PLUGIN_NOTIFY_DESKTOP_TRUE@LoadPlugin notify_desktop
  #@BUILD_PLUGIN_NOTIFY_EMAIL_TRUE@LoadPlugin notify_email
  #@BUILD_PLUGIN_NTPD_TRUE@LoadPlugin ntpd
 +#@BUILD_PLUGIN_NUMA_TRUE@LoadPlugin numa
  #@BUILD_PLUGIN_NUT_TRUE@LoadPlugin nut
  #@BUILD_PLUGIN_OLSRD_TRUE@LoadPlugin olsrd
  #@BUILD_PLUGIN_ONEWIRE_TRUE@LoadPlugin onewire
@@@ -134,7 -118,6 +134,7 @@@
  #@BUILD_PLUGIN_PYTHON_TRUE@<LoadPlugin python>
  #@BUILD_PLUGIN_PYTHON_TRUE@  Globals true
  #@BUILD_PLUGIN_PYTHON_TRUE@</LoadPlugin>
 +#@BUILD_PLUGIN_REDIS_TRUE@LoadPlugin redis
  #@BUILD_PLUGIN_ROUTEROS_TRUE@LoadPlugin routeros
  #@BUILD_PLUGIN_RRDCACHED_TRUE@LoadPlugin rrdcached
  @LOAD_PLUGIN_RRDTOOL@LoadPlugin rrdtool
@@@ -144,7 -127,6 +144,7 @@@
  #@BUILD_PLUGIN_SWAP_TRUE@LoadPlugin swap
  #@BUILD_PLUGIN_TABLE_TRUE@LoadPlugin table
  #@BUILD_PLUGIN_TAIL_TRUE@LoadPlugin tail
 +#@BUILD_PLUGIN_TAIL_CSV_TRUE@LoadPlugin tail_csv
  #@BUILD_PLUGIN_TAPE_TRUE@LoadPlugin tape
  #@BUILD_PLUGIN_TCPCONNS_TRUE@LoadPlugin tcpconns
  #@BUILD_PLUGIN_TEAMSPEAK2_TRUE@LoadPlugin teamspeak2
@@@ -155,15 -137,10 +155,15 @@@
  #@BUILD_PLUGIN_UPTIME_TRUE@LoadPlugin uptime
  #@BUILD_PLUGIN_USERS_TRUE@LoadPlugin users
  #@BUILD_PLUGIN_UUID_TRUE@LoadPlugin uuid
 +#@BUILD_PLUGIN_VARNISH_TRUE@LoadPlugin varnish
  #@BUILD_PLUGIN_VMEM_TRUE@LoadPlugin vmem
  #@BUILD_PLUGIN_VSERVER_TRUE@LoadPlugin vserver
  #@BUILD_PLUGIN_WIRELESS_TRUE@LoadPlugin wireless
 +#@BUILD_PLUGIN_WRITE_GRAPHITE_TRUE@LoadPlugin write_graphite
  #@BUILD_PLUGIN_WRITE_HTTP_TRUE@LoadPlugin write_http
 +#@BUILD_PLUGIN_WRITE_MONGODB_TRUE@LoadPlugin write_mongodb
 +#@BUILD_PLUGIN_WRITE_REDIS_TRUE@LoadPlugin write_redis
 +#@BUILD_PLUGIN_WRITE_RIEMANN_TRUE@LoadPlugin write_riemann
  #@BUILD_PLUGIN_XMMS_TRUE@LoadPlugin xmms
  #@BUILD_PLUGIN_ZFS_ARC_TRUE@LoadPlugin zfs_arc
  
@@@ -174,53 -151,16 +174,53 @@@
  # ription of those options is available in the collectd.conf(5) manual page. #
  ##############################################################################
  
 +#<Plugin "aggregation">
 +#  <Aggregation>
 +#    #Host "unspecified"
 +#    Plugin "cpu"
 +#    #PluginInstance "unspecified"
 +#    Type "cpu"
 +#    #TypeInstance "unspecified"
 +#
 +#    GroupBy "Host"
 +#    GroupBy "TypeInstance"
 +#
 +#    CalculateNum false
 +#    CalculateSum false
 +#    CalculateAverage true
 +#    CalculateMinimum false
 +#    CalculateMaximum false
 +#    CalculateStddev false
 +#  </Aggregation>
 +#</Plugin>
 +
 +#<Plugin "amqp">
 +#  <Publish "name">
 +#    Host "localhost"
 +#    Port "5672"
 +#    VHost "/"
 +#    User "guest"
 +#    Password "guest"
 +#    Exchange "amq.fanout"
 +#    RoutingKey "collectd"
 +#    Persistent false
 +#    StoreRates false
 +#  </Publish>
 +#</Plugin>
 +
  #<Plugin apache>
 -#     URL "http://localhost/status?auto"
 -#     User "www-user"
 -#     Password "secret"
 -#     CACert "/etc/ssl/ca.crt"
 +#  <Instance "local">
 +#    URL "http://localhost/status?auto"
 +#    User "www-user"
 +#    Password "secret"
 +#    CACert "/etc/ssl/ca.crt"
 +#  </Instance>
  #</Plugin>
  
  #<Plugin apcups>
  #     Host "localhost"
  #     Port "3551"
 +#     ReportSeconds true
  #</Plugin>
  
  #<Plugin ascent>
@@@ -232,7 -172,6 +232,7 @@@
  
  #<Plugin "bind">
  #  URL "http://localhost:8053/"
 +#  ParseTime       false
  #  OpCodes         true
  #  QTypes          true
  #
@@@ -251,7 -190,7 +251,7 @@@
  #</Plugin>
  
  #<Plugin csv>
 -#     DataDir "@prefix@/var/lib/@PACKAGE_NAME@/csv"
 +#     DataDir "@localstatedir@/lib/@PACKAGE_NAME@/csv"
  #     StoreRates false
  #</Plugin>
  
@@@ -338,7 -277,6 +338,7 @@@
  #             #SelectDB "custdb0"
  #             Query "num_of_customers"
  #             #Query "..."
 +#             #Host "..."
  #     </Database>
  #</Plugin>
  
@@@ -365,19 -303,12 +365,19 @@@
  #</Plugin>
  
  #<Plugin email>
 -#     SocketFile "@prefix@/var/run/@PACKAGE_NAME@-email"
 +#     SocketFile "@localstatedir@/run/@PACKAGE_NAME@-email"
  #     SocketGroup "collectd"
  #     SocketPerms "0770"
  #     MaxConns 5
  #</Plugin>
  
 +#<Plugin ethstat>
 +#     Interface "eth0"
 +#     Map "rx_csum_offload_errors" "if_rx_errors" "checksum_offload"
 +#     Map "multicast" "if_multicast"
 +#     MappedOnly false
 +#</Plugin>
 +
  #<Plugin exec>
  #     Exec "user:group" "/path/to/exec"
  #     NotificationExec "user:group" "/path/to/exec"
@@@ -411,6 -342,13 +411,6 @@@
  #<Plugin hddtemp>
  #  Host "127.0.0.1"
  #  Port "7634"
 -#
 -#  #----------------------------------------------------------------#
 -#  # `TranslateDevicename' enables backwards compatibility behavior #
 -#  # and is enabled by default. Setting this option to `false' is   #
 -#  # highly recommended.                                            #
 -#  #----------------------------------------------------------------#
 -#  TranslateDevicename false
  #</Plugin>
  
  #<Plugin interface>
@@@ -456,12 -394,6 +456,12 @@@
  #     InterfaceDevice "name:device"
  #     IgnoreSelected false
  #     HostnameFormat name
 +#     InterfaceFormat name
 +#</Plugin>
 +
 +#<Plugin lpar>
 +#     CpuPoolStats   false
 +#     ReportBySerial false
  #</Plugin>
  
  #<Plugin madwifi>
@@@ -480,11 -412,6 +480,11 @@@
  #     Port "411"
  #</Plugin>
  
 +#<Plugin md>
 +#     Device "/dev/md0"
 +#     IgnoreSelected false
 +#</Plugin>
 +
  #<Plugin memcachec>
  #     <Page "plugin_instance">
  #             Server "localhost"
@@@ -500,10 -427,8 +500,10 @@@
  #</Plugin>
  
  #<Plugin memcached>
 -#     Host "127.0.0.1"
 -#     Port "11211"
 +#     <Instance "local">
 +#             Host "127.0.0.1"
 +#             Port "11211"
 +#     </Instance>
  #</Plugin>
  
  #<Plugin modbus>
@@@ -613,7 -538,7 +613,7 @@@
  #             Password "secret"
  #             Interface "eth0"
  @LOAD_PLUGIN_NETWORK@ </Server>
- #     TimeToLive "128"
+ #     TimeToLive 128
  #
  #     # server setup:
  #     Listen "ff18::efc0:4a42" "25826"
@@@ -622,7 -547,7 +622,7 @@@
  #             AuthFile "/etc/collectd/passwd"
  #             Interface "eth0"
  #     </Listen>
 -#     MaxPacketSize 1024
 +#     MaxPacketSize 1452
  #
  #     # proxy setup (client and server as above):
  #     Forward true
@@@ -663,7 -588,6 +663,7 @@@
  #     Host "localhost"
  #     Port 123
  #     ReverseLookups false
 +#     IncludeUnitID true
  #</Plugin>
  
  #<Plugin nut>
@@@ -766,11 -690,6 +766,11 @@@
  #                     ValuesFrom "count"
  #             </Result>
  #     </Query>
 +#     <Writer sqlstore>
 +#             # See contrib/postgresql/collectd_insert.sql for details
 +#             Statement "SELECT collectd_insert($1, $2, $3, $4, $5, $6, $7, $8, $9);"
 +#             StoreRates true
 +#     </Writer>
  #     <Database foo>
  #             Host "hostname"
  #             Port "5432"
@@@ -786,12 -705,6 +786,12 @@@
  #             Query backend # predefined
  #             Query rt36_tickets
  #     </Database>
 +#     <Database qux>
 +#             Service "collectd_store"
 +#             Writer sqlstore
 +#             # see collectd.conf(5) for details
 +#             CommitInterval 30
 +#     </Database>
  #</Plugin>
  
  #<Plugin powerdns>
@@@ -828,14 -741,6 +828,14 @@@
  #     </Module>
  #</Plugin>
  
 +#<Plugin redis>
 +#   <Node example>
 +#      Host "redis.example.com"
 +#      Port "6379"
 +#      Timeout 2000
 +#   </Node>
 +#</Plugin>
 +
  #<Plugin routeros>
  #     <Router>
  #             Host "router.example.com"
@@@ -853,22 -758,18 +853,22 @@@
  
  #<Plugin rrdcached>
  #     DaemonAddress "unix:/tmp/rrdcached.sock"
 -#     DataDir "@prefix@/var/lib/@PACKAGE_NAME@/rrd"
 +#     DataDir "@localstatedir@/lib/@PACKAGE_NAME@/rrd"
  #     CreateFiles true
 +#     CreateFilesAsync false
  #     CollectStatistics true
  #</Plugin>
  
  #<Plugin rrdtool>
 -#     DataDir "@prefix@/var/lib/@PACKAGE_NAME@/rrd"
 +#     DataDir "@localstatedir@/lib/@PACKAGE_NAME@/rrd"
 +#     CreateFilesAsync false
  #     CacheTimeout 120
  #     CacheFlush   900
 +#     WritesPerSecond 50
  #</Plugin>
  
  #<Plugin sensors>
 +#     SensorConfigFile "/etc/sensors.conf"
  #     Sensor "it8712-isa-0290/temperature-temp1"
  #     Sensor "it8712-isa-0290/fanspeed-fan3"
  #     Sensor "it8712-isa-0290/voltage-in8"
@@@ -917,11 -818,6 +917,11 @@@
  #   </Host>
  #</Plugin>
  
 +#<Plugin "swap">
 +#     ReportByDevice false
 +#     ReportBytes true
 +#</Plugin>
 +
  #<Plugin "table">
  #     <Table "/proc/slabinfo">
  #             Instance "slabinfo"
@@@ -960,33 -856,6 +960,33 @@@
  #  </File>
  #</Plugin>
  
 +#<Plugin "tail_csv">
 +#   <Metric "dropped">
 +#       Type "percent"
 +#       Instance "dropped"
 +#       ValueFrom 1
 +#   </Metric>
 +#   <Metric "mbps">
 +#       Type "bytes"
 +#       Instance "wire-realtime"
 +#       ValueFrom 2
 +#   </Metric>
 +#   <Metric "alerts">
 +#       Type "alerts_per_second"
 +#       ValueFrom 3
 +#   </Metric>
 +#   <Metric "kpps">
 +#       Type "kpackets_wire_per_sec.realtime"
 +#       ValueFrom 4
 +#   </Metric>
 +#   <File "/var/log/snort/snort.stats">
 +#       Instance "snort-eth0"
 +#       Interval 600
 +#       Collect "dropped" "mbps" "alerts" "kpps"
 +#       TimeFrom 0
 +#   </File>
 +#</Plugin>
 +
  #<Plugin tcpconns>
  #     ListeningPorts false
  #     LocalPort "25"
@@@ -1019,50 -888,16 +1019,50 @@@
  #     SocketFile "@prefix@/var/run/@PACKAGE_NAME@-unixsock"
  #     SocketGroup "collectd"
  #     SocketPerms "0660"
 +#     DeleteSocket false
  #</Plugin>
  
  #<Plugin uuid>
  #     UUIDFile "/etc/uuid"
  #</Plugin>
  
 +#<Plugin varnish>
 +#   This tag support an argument if you want to
 +#   monitor the local instance just use </Instance>
 +#   If you prefer defining another instance you can do
 +#   so by using <Instance "myinstance">
 +#   <Instance>
 +#      CollectCache true
 +#      CollectBackend true
 +#      CollectConnections true
 +#      CollectSHM true
 +#      CollectESI false
 +#      CollectFetch false
 +#      CollectHCB false
 +#      CollectSMA false
 +#      CollectSMS false
 +#      CollectSM false
 +#      CollectTotals false
 +#      CollectWorkers false
 +#   </Instance>
 +#</Plugin>
 +
  #<Plugin vmem>
  #     Verbose false
  #</Plugin>
  
 +#<Plugin write_graphite>
 +#  <Node "example">
 +#    Host "localhost"
 +#    Port "2003"
 +#    Prefix "collectd"
 +#    Postfix "collectd"
 +#    StoreRates true
 +#    AlwaysAppendDS false
 +#    EscapeCharacter "_"
 +#  </Node>
 +#</Plugin>
 +
  #<Plugin write_http>
  #     <URL "http://example.com/collectd-post">
  #             User "collectd"
@@@ -1075,37 -910,6 +1075,37 @@@
  #     </URL>
  #</Plugin>
  
 +#<Plugin write_mongodb>
 +#     <Node "example">
 +#             Host "localhost"
 +#             Port "27017"
 +#             Timeout 1000
 +#             StoreRates false
 +#             Database "auth_db"
 +#             User "auth_user"
 +#             Password "auth_passwd"
 +#     </Node>
 +#</Plugin>
 +
 +#<Plugin write_redis>
 +#     <Node "example">
 +#             Host "localhost"
 +#             Port "6379"
 +#             Timeout 1000
 +#     </Node>
 +#</Plugin>
 +
 +#<Plugin write_riemann>
 +#     <Node "example">
 +#             Host "localhost"
 +#             Port 5555
 +#             Protocol UDP
 +#             StoreRates true
 +#             AlwaysAppendDS false
 +#     </Node>
 +#     Tag "foobar"
 +#</Plugin>
 +
  ##############################################################################
  # Filter configuration                                                       #
  #----------------------------------------------------------------------------#
@@@ -1126,7 -930,6 +1126,7 @@@
  #@BUILD_PLUGIN_TARGET_REPLACE_TRUE@LoadPlugin target_replace
  #@BUILD_PLUGIN_TARGET_SCALE_TRUE@LoadPlugin target_scale
  #@BUILD_PLUGIN_TARGET_SET_TRUE@LoadPlugin target_set
 +#@BUILD_PLUGIN_TARGET_V5UPGRADE_TRUE@LoadPlugin target_v5upgrade
  
  #----------------------------------------------------------------------------#
  # The following block demonstrates the default behavior if no filtering is   #
@@@ -1136,52 -939,3 +1136,52 @@@
  #<Chain "PostCache">
  #  Target "write"
  #</Chain>
 +
 +##############################################################################
 +# Threshold configuration                                                    #
 +#----------------------------------------------------------------------------#
 +# The following outlines how to configure collectd's threshold checking      #
 +# plugin. The plugin and possible configuration options are documented in    #
 +# the collectd-threshold(5) manual page.                                     #
 +##############################################################################
 +
 +#@BUILD_PLUGIN_THRESHOLD_TRUE@LoadPlugin "threshold"
 +#<Plugin "threshold">
 +#  <Type "foo">
 +#    WarningMin    0.00
 +#    WarningMax 1000.00
 +#    FailureMin    0.00
 +#    FailureMax 1200.00
 +#    Invert false
 +#    Instance "bar"
 +#  </Type>
 +#
 +#  <Plugin "interface">
 +#    Instance "eth0"
 +#    <Type "if_octets">
 +#      FailureMax 10000000
 +#      DataSource "rx"
 +#    </Type>
 +#  </Plugin>
 +#
 +#  <Host "hostname">
 +#    <Type "cpu">
 +#      Instance "idle"
 +#      FailureMin 10
 +#    </Type>
 +#
 +#    <Plugin "memory">
 +#      <Type "memory">
 +#        Instance "cached"
 +#        WarningMin 100000000
 +#      </Type>
 +#    </Plugin>
 +#
 +#    <Type "load">
 +#     DataSource "midterm"
 +#     FailureMax 4
 +#     Hits 3
 +#     Hysteresis 3
 +#    </Type>
 +#  </Host>
 +#</Plugin>

diff --combined src/types_list.c
index 10cb4f2,1b0507f..887b43d
--- 1/src/types_list.c
--- 2/src/types_list.c
+++ b/src/types_list.c
@@@ -102,10 -102,6 +102,10 @@@ static void parse_line (char *buf
    if (fields_num < 2)
      return;
  
 +  /* Ignore lines which begin with a hash sign. */
 +  if (fields[0][0] == '#')
 +    return;
 +
    ds = (data_set_t *) malloc (sizeof (data_set_t));
    if (ds == NULL)
      return;
@@@ -159,7 -155,7 +159,7 @@@ static void parse_file (FILE *fh
        continue;
  
      while ((buf_len > 0) && ((buf[buf_len - 1] == '\n')
-         || (buf[buf_len - 1] == '\n')))
+         || (buf[buf_len - 1] == '\r')))
        buf[--buf_len] = '\0';
  
      if (buf_len == 0)