Merge branch 'collectd-5.6' into collectd-5.7

diff --combined contrib/redhat/collectd.spec
index 4fc76e1,33cc985..bed3cc5
--- 1/contrib/redhat/collectd.spec
--- 2/contrib/redhat/collectd.spec
+++ b/contrib/redhat/collectd.spec
@@@ -73,7 -73,6 +73,7 @@@
  %define with_gmond 0%{!?_without_gmond:1}
  %define with_gps 0%{!?_without_gps:1}
  %define with_hddtemp 0%{!?_without_hddtemp:1}
 +%define with_hugepages 0%{!?_without_hugepages:1}
  %define with_interface 0%{!?_without_interface:1}
  %define with_ipc 0%{!?_without_ipc:1}
  %define with_ipmi 0%{!?_without_ipmi:1}
@@@ -148,8 -147,8 +148,9 @@@
  %define with_write_graphite 0%{!?_without_write_graphite:1}
  %define with_write_http 0%{!?_without_write_http:1}
  %define with_write_log 0%{!?_without_write_log:1}
 +%define with_write_prometheus 0%{!?_without_write_prometheus:1}
  %define with_write_redis 0%{!?_without_write_redis:1}
+ %define with_write_riemann 0%{!?_without_write_riemann:1}
  %define with_write_sensu 0%{!?_without_write_sensu:1}
  %define with_write_tsdb 0%{!?_without_write_tsdb:1}
  %define with_xmms 0%{!?_without_xmms:0%{?_has_xmms}}
@@@ -167,12 -166,8 +168,12 @@@
  %define with_barometer 0%{!?_without_barometer:0}
  # plugin grpc disabled, requires protobuf-compiler >= 3.0
  %define with_grpc 0%{!?_without_grpc:0}
 +# plugin dpdkstat disabled, requires libdpdk
 +%define with_dpdkstat 0%{!?_without_dpdkstat:0}
  # plugin lpar disabled, requires AIX
  %define with_lpar 0%{!?_without_lpar:0}
 +# plugin intel_rdt disabled, requires intel-cmt-cat
 +%define with_intel_rdt 0%{!?_without_intel_rdt:0}
  # plugin mic disabled, requires Mic
  %define with_mic 0%{!?_without_mic:0}
  # plugin netapp disabled, requires libnetapp
@@@ -195,8 -190,6 +196,6 @@@
  %define with_write_kafka 0%{!?_without_write_kafka:0}
  # plugin write_mongodb disabled, requires libmongoc
  %define with_write_mongodb 0%{!?_without_write_mongodb:0}
- # plugin write_riemann disabled, requires a new enough riemann_c_client
- %define with_write_riemann 0%{!?_without_write_riemann:0}
  # plugin xencpu disabled, requires xen-devel from non-default repo
  %define with_xencpu 0%{!?_without_xencpu:0}
  # plugin zone disabled, requires Solaris
@@@ -218,8 -211,8 +217,9 @@@
  %define with_redis 0
  %define with_smart 0
  %define with_turbostat 0
 +%define with_write_prometheus 0
  %define with_write_redis 0
+ %define with_write_riemann 0
  %endif
  
  # Plugins not buildable on RHEL < 7
@@@ -230,12 -223,13 +230,13 @@@
  %define with_redis 0
  %define with_rrdcached 0
  %define with_write_redis 0
+ %define with_write_riemann 0
  %define with_xmms 0
  %endif
  
  Summary:      Statistics collection and monitoring daemon
  Name:         collectd
 -Version:      5.6.1
 +Version:      5.7.0
  Release:      2%{?dist}
  URL:          https://collectd.org
  Source:               https://collectd.org/files/%{name}-%{version}.tar.bz2
@@@ -460,17 -454,6 +461,17 @@@ The HDDTemp plugin collects the tempera
  provided via SMART and queried by the external hddtemp daemon.
  %endif
  
 +%if %{with_intel_rdt}
 +%package intel_rdt
 +Summary:      Intel RDT plugin for collectd
 +Group:                System Environment/Daemons
 +Requires:     %{name}%{?_isa} = %{version}-%{release}
 +BuildRequires:        intel-cmt-cat
 +%description intel_rdt
 +The intel_rdt plugin collects information provided by monitoring features of
 +Intel Resource Director Technology (Intel(R) RDT).
 +%endif
 +
  %if %{with_ipmi}
  %package ipmi
  Summary:      IPMI plugin for collectd
@@@ -832,17 -815,6 +833,17 @@@ BuildRequires: librdkafka-deve
  The write_kafka plugin sends values to kafka, a distributed messaging system.
  %endif
  
 +%if %{with_write_prometheus}
 +%package write_prometheus
 +Summary:      Write-prometheus plugin for collectd
 +Group:                System Environment/Daemons
 +Requires:     %{name}%{?_isa} = %{version}-%{release}
 +BuildRequires:        libmicrohttpd-devel
 +%description write_prometheus
 +The Write Prometheus plugin exposes collected values using an embedded HTTP
 +server, turning the collectd daemon into a Prometheus exporter.
 +%endif
 +
  %if %{with_write_redis}
  %package write_redis
  Summary:      Write-Redis plugin for collectd
@@@ -858,7 -830,7 +859,7 @@@ The Write Redis plugin stores values i
  Summary:      riemann plugin for collectd
  Group:                System Environment/Daemons
  Requires:     %{name}%{?_isa} = %{version}-%{release}
- BuildRequires:        protobuf-c-devel
+ BuildRequires:        riemann-c-client-devel >= 1.6
  %description write_riemann
  The riemann plugin submits values to Riemann, an event stream processor.
  %endif
@@@ -1099,12 -1071,6 +1100,12 @@@ Collectd utilitie
  %define _with_drbd --disable-drbd
  %endif
  
 +%if %{with_dpdkstat}
 +%define _with_dpdkstat --enable-dpdkstat
 +%else
 +%define _with_dpdkstat --disable-dpdkstat
 +%endif
 +
  %if %{with_email}
  %define _with_email --enable-email
  %else
@@@ -1171,18 -1137,6 +1172,18 @@@
  %define _with_hddtemp --disable-hddtemp
  %endif
  
 +%if %{with_hugepages}
 +%define _with_hugepages --enable-hugepages
 +%else
 +%define _with_hugepages --disable-hugepages
 +%endif
 +
 +%if %{with_intel_rdt}
 +%define _with_intel_rdt --enable-intel_rdt
 +%else
 +%define _with_intel_rdt --disable-intel_rdt
 +%endif
 +
  %if %{with_interface}
  %define _with_interface --enable-interface
  %else
@@@ -1704,12 -1658,6 +1705,12 @@@
  %define _with_write_mongodb --disable-write_mongodb
  %endif
  
 +%if %{with_write_prometheus}
 +%define _with_write_prometheus --enable-write_prometheus
 +%else
 +%define _with_write_prometheus --disable-write_prometheus
 +%endif
 +
  %if %{with_write_redis}
  %define _with_write_redis --enable-write_redis
  %else
@@@ -1806,7 -1754,6 +1807,7 @@@
        %{?_with_disk} \
        %{?_with_dns} \
        %{?_with_drbd} \
 +      %{?_with_dpdkstat} \
        %{?_with_email} \
        %{?_with_entropy} \
        %{?_with_ethstat} \
@@@ -1818,8 -1765,6 +1819,8 @@@
        %{?_with_gps} \
        %{?_with_grpc} \
        %{?_with_hddtemp} \
 +      %{?_with_hugepages} \
 +      %{?_with_intel_rdt} \
        %{?_with_interface} \
        %{?_with_ipc} \
        %{?_with_ipmi} \
@@@ -1907,7 -1852,6 +1908,7 @@@
        %{?_with_write_kafka} \
        %{?_with_write_log} \
        %{?_with_write_mongodb} \
 +      %{?_with_write_prometheus} \
        %{?_with_write_redis} \
        %{?_with_write_riemann} \
        %{?_with_write_sensu} \
@@@ -2086,9 -2030,6 +2087,9 @@@ f
  %if %{with_drbd}
  %{_libdir}/%{name}/drbd.so
  %endif
 +%if %{with_dpdkstat}
 +%{_libdir}/%{name}/dpdkstat.so
 +%endif
  %if %{with_ethstat}
  %{_libdir}/%{name}/ethstat.so
  %endif
@@@ -2107,9 -2048,6 +2108,9 @@@
  %if %{with_fscache}
  %{_libdir}/%{name}/fscache.so
  %endif
 +%if %{with_hugepages}
 +%{_libdir}/%{name}/hugepages.so
 +%endif
  %if %{with_interface}
  %{_libdir}/%{name}/interface.so
  %endif
@@@ -2369,11 -2307,6 +2370,11 @@@
  %{_libdir}/%{name}/hddtemp.so
  %endif
  
 +%if %{with_intel_rdt}
 +%files intel_rdt
 +%{_libdir}/%{name}/intel_rdt.so
 +%endif
 +
  %if %{with_ipmi}
  %files ipmi
  %{_libdir}/%{name}/ipmi.so
@@@ -2550,11 -2483,6 +2551,11 @@@
  %{_libdir}/%{name}/write_kafka.so
  %endif
  
 +%if %{with_write_prometheus}
 +%files write_prometheus
 +%{_libdir}/%{name}/write_prometheus.so
 +%endif
 +
  %if %{with_write_redis}
  %files write_redis
  %{_libdir}/%{name}/write_redis.so
@@@ -2587,13 -2515,8 +2588,13 @@@
  %doc contrib/
  
  %changelog
 -* Tue Nov 29 2016 Ruben Kerkhof <ruben@rubenkerkhof.com> - 5.6.1-2
 -- Disable redis plugin on RHEL < 7, hiredis has been retired from EPEL6
 +* Tue Nov 29 2016 Ruben Kerkhof <ruben@rubenkerkhof.com> - 5.7.0-2
 +- Disable redis plugin on RHEL 6, hiredis has been retired from EPEL6
 +
 +* Mon Oct 10 2016 Marc Fournier <marc.fournier@camptocamp.com> - 5.7.0-1
 +- New PRE-RELEASE version
 +- New plugins enabled by default: hugepages, write_prometheus
 +- New plugins disabled by default: dpdkstat, intel_rdt
  
  * Mon Oct 10 2016 Victor Demonchy <v.demonchy@criteo.com> - 5.6.1-1
  - New upstream version

diff --combined src/Makefile.am
index bec7ca9,eb55de3..be4162b
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -27,15 -27,6 +27,15 @@@ noinst_LTLIBRARIES 
  check_PROGRAMS =
  TESTS =
  
 +noinst_LTLIBRARIES += libformat_graphite.la
 +libformat_graphite_la_SOURCES  = utils_format_graphite.c utils_format_graphite.h
 +libformat_graphite_la_CPPFLAGS = $(AM_CPPFLAGS)
 +libformat_graphite_la_LDFLAGS  = $(AM_LDFLAGS)
 +check_PROGRAMS += test_format_graphite
 +TESTS += test_format_graphite
 +test_format_graphite_SOURCES = utils_format_graphite_test.c testing.h
 +test_format_graphite_LDADD = libformat_graphite.la daemon/libmetadata.la daemon/libplugin_mock.la -lm
 +
  noinst_LTLIBRARIES += libformat_json.la
  libformat_json_la_SOURCES   = utils_format_json.c utils_format_json.h
  libformat_json_la_CPPFLAGS  = $(AM_CPPFLAGS)
@@@ -52,29 -43,12 +52,29 @@@ test_format_json_LDADD = libformat_json
  endif
  
  noinst_LTLIBRARIES += liblatency.la
 -liblatency_la_SOURCES = utils_latency.c utils_latency.h
 +liblatency_la_SOURCES = utils_latency.c utils_latency.h utils_latency_config.c utils_latency_config.h
 +liblatency_la_LIBADD = daemon/libcommon.la -lm
  check_PROGRAMS += test_utils_latency
  TESTS += test_utils_latency
  test_utils_latency_SOURCES = utils_latency_test.c testing.h
  test_utils_latency_LDADD = liblatency.la daemon/libplugin_mock.la -lm
  
 +noinst_LTLIBRARIES += libcmds.la
 +libcmds_la_SOURCES = utils_cmds.c utils_cmds.h \
 +                     utils_cmd_flush.c utils_cmd_flush.h \
 +                     utils_cmd_getthreshold.c utils_cmd_getthreshold.h \
 +                     utils_cmd_getval.c utils_cmd_getval.h \
 +                     utils_cmd_listval.c utils_cmd_listval.h \
 +                     utils_cmd_putnotif.c utils_cmd_putnotif.h \
 +                     utils_cmd_putval.c utils_cmd_putval.h \
 +                     utils_parse_option.c utils_parse_option.h
 +libcmds_la_LIBADD = daemon/libcommon.la daemon/libmetadata.la -lm
 +check_PROGRAMS += test_utils_cmds
 +TESTS += test_utils_cmds
 +test_utils_cmds_SOURCES = utils_cmds_test.c testing.h
 +test_utils_cmds_LDADD = libcmds.la \
 +                        daemon/libplugin_mock.la
 +
  noinst_LTLIBRARIES += liblookup.la
  liblookup_la_SOURCES = utils_vl_lookup.c utils_vl_lookup.h
  liblookup_la_LIBADD = daemon/libavltree.la
@@@ -179,11 -153,13 +179,11 @@@ endi
  
  if BUILD_PLUGIN_AMQP
  pkglib_LTLIBRARIES += amqp.la
 -amqp_la_SOURCES = amqp.c \
 -                utils_cmd_putval.c utils_cmd_putval.h \
 -                utils_parse_option.c utils_parse_option.h \
 -                utils_format_graphite.c utils_format_graphite.h
 +amqp_la_SOURCES = amqp.c
  amqp_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBRABBITMQ_LDFLAGS)
  amqp_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBRABBITMQ_CPPFLAGS)
 -amqp_la_LIBADD = $(BUILD_WITH_LIBRABBITMQ_LIBS) libformat_json.la
 +amqp_la_LIBADD = $(BUILD_WITH_LIBRABBITMQ_LIBS) \
 +                 libcmds.la libformat_graphite.la libformat_json.la
  endif
  
  if BUILD_PLUGIN_APACHE
@@@ -237,7 -213,7 +237,7 @@@ endi
  
  if BUILD_PLUGIN_BATTERY
  pkglib_LTLIBRARIES += battery.la
 -battery_la_SOURCES = battery.c
 +battery_la_SOURCES = battery.c battery_statefs.c
  battery_la_LDFLAGS = $(PLUGIN_LDFLAGS)
  if BUILD_WITH_LIBIOKIT
  battery_la_LDFLAGS += -framework IOKit
@@@ -273,6 -249,7 +273,7 @@@ if BUILD_PLUGIN_CHRON
  pkglib_LTLIBRARIES += chrony.la
  chrony_la_SOURCES = chrony.c
  chrony_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+ chrony_la_LIBADD = -lm
  endif
  
  if BUILD_PLUGIN_CONNTRACK
@@@ -333,11 -310,10 +334,11 @@@ endi
  if BUILD_PLUGIN_CURL
  pkglib_LTLIBRARIES += curl.la
  curl_la_SOURCES = curl.c \
 -                utils_curl_stats.c utils_curl_stats.h
 +                  utils_curl_stats.c utils_curl_stats.h \
 +                  utils_match.c utils_match.h
  curl_la_LDFLAGS = $(PLUGIN_LDFLAGS)
  curl_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBCURL_CFLAGS)
 -curl_la_LIBADD = $(BUILD_WITH_LIBCURL_LIBS)
 +curl_la_LIBADD = $(BUILD_WITH_LIBCURL_LIBS) liblatency.la
  endif
  
  if BUILD_PLUGIN_CURL_JSON
@@@ -415,14 -391,6 +416,14 @@@ dns_la_LDFLAGS = $(PLUGIN_LDFLAGS
  dns_la_LIBADD = -lpcap
  endif
  
 +if BUILD_PLUGIN_DPDKSTAT
 +pkglib_LTLIBRARIES += dpdkstat.la
 +dpdkstat_la_SOURCES = dpdkstat.c
 +dpdkstat_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDPDK_CPPFLAGS)
 +dpdkstat_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(LIBDPDK_LDFLAGS)
 +dpdkstat_la_LIBADD = -ldpdk
 +endif
 +
  if BUILD_PLUGIN_DRBD
  pkglib_LTLIBRARIES += drbd.la
  drbd_la_SOURCES = drbd.c
@@@ -443,9 -411,11 +444,9 @@@ endi
  
  if BUILD_PLUGIN_EXEC
  pkglib_LTLIBRARIES += exec.la
 -exec_la_SOURCES = exec.c \
 -                utils_cmd_putnotif.c utils_cmd_putnotif.h \
 -                utils_cmd_putval.c utils_cmd_putval.h \
 -                utils_parse_option.h utils_parse_option.c
 +exec_la_SOURCES = exec.c
  exec_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 +exec_la_LIBADD = libcmds.la
  endif
  
  if BUILD_PLUGIN_ETHSTAT
@@@ -501,12 -471,6 +502,12 @@@ hddtemp_la_LIBADD += -lsocke
  endif
  endif
  
 +if BUILD_PLUGIN_HUGEPAGES
 +pkglib_LTLIBRARIES += hugepages.la
 +hugepages_la_SOURCES = hugepages.c
 +hugepages_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 +endif
 +
  if BUILD_PLUGIN_INTERFACE
  pkglib_LTLIBRARIES += interface.la
  interface_la_SOURCES = interface.c
@@@ -683,11 -647,10 +684,11 @@@ endi
  
  if BUILD_PLUGIN_MEMCACHEC
  pkglib_LTLIBRARIES += memcachec.la
 -memcachec_la_SOURCES = memcachec.c
 +memcachec_la_SOURCES = memcachec.c \
 +                       utils_match.c utils_match.h
  memcachec_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBMEMCACHED_LDFLAGS)
  memcachec_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBMEMCACHED_CPPFLAGS)
 -memcachec_la_LIBADD = $(BUILD_WITH_LIBMEMCACHED_LIBS)
 +memcachec_la_LIBADD = $(BUILD_WITH_LIBMEMCACHED_LIBS) liblatency.la
  endif
  
  if BUILD_PLUGIN_MEMCACHED
@@@ -986,14 -949,6 +987,14 @@@ protocols_la_SOURCES = protocols.
  protocols_la_LDFLAGS = $(PLUGIN_LDFLAGS)
  endif
  
 +if BUILD_PLUGIN_INTEL_RDT
 +pkglib_LTLIBRARIES += intel_rdt.la
 +intel_rdt_la_SOURCES = intel_rdt.c
 +intel_rdt_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBPQOS_LDFLAGS)
 +intel_rdt_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBPQOS_CPPFLAGS)
 +intel_rdt_la_LIBADD = $(BUILD_WITH_LIBPQOS_LIBS)
 +endif
 +
  if BUILD_PLUGIN_REDIS
  pkglib_LTLIBRARIES += redis.la
  redis_la_SOURCES = redis.c
@@@ -1070,7 -1025,7 +1071,7 @@@ if BUILD_PLUGIN_STATS
  pkglib_LTLIBRARIES += statsd.la
  statsd_la_SOURCES = statsd.c
  statsd_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 -statsd_la_LIBADD = liblatency.la -lm
 +statsd_la_LIBADD = liblatency.la
  endif
  
  if BUILD_PLUGIN_SWAP
@@@ -1112,18 -1067,13 +1113,18 @@@ endi
  
  if BUILD_PLUGIN_TAIL
  pkglib_LTLIBRARIES += tail.la
 -tail_la_SOURCES = tail.c
 +tail_la_SOURCES = tail.c \
 +                  utils_match.c utils_match.h \
 +                  utils_tail.c utils_tail.h \
 +                  utils_tail_match.c utils_tail_match.h
  tail_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 +tail_la_LIBADD = liblatency.la
  endif
  
  if BUILD_PLUGIN_TAIL_CSV
  pkglib_LTLIBRARIES += tail_csv.la
 -tail_csv_la_SOURCES = tail_csv.c
 +tail_csv_la_SOURCES = tail_csv.c \
 +                      utils_tail.c utils_tail.h
  tail_csv_la_LDFLAGS = $(PLUGIN_LDFLAGS)
  endif
  
@@@ -1217,9 -1167,15 +1218,9 @@@ endi
  
  if BUILD_PLUGIN_UNIXSOCK
  pkglib_LTLIBRARIES += unixsock.la
 -unixsock_la_SOURCES = unixsock.c \
 -                    utils_cmd_flush.h utils_cmd_flush.c \
 -                    utils_cmd_getval.h utils_cmd_getval.c \
 -                    utils_cmd_getthreshold.h utils_cmd_getthreshold.c \
 -                    utils_cmd_listval.h utils_cmd_listval.c \
 -                    utils_cmd_putval.h utils_cmd_putval.c \
 -                    utils_cmd_putnotif.h utils_cmd_putnotif.c \
 -                    utils_parse_option.h utils_parse_option.c
 +unixsock_la_SOURCES = unixsock.c
  unixsock_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 +unixsock_la_LIBADD =  libcmds.la
  endif
  
  if BUILD_PLUGIN_UPTIME
@@@ -1293,9 -1249,9 +1294,9 @@@ endi
  
  if BUILD_PLUGIN_WRITE_GRAPHITE
  pkglib_LTLIBRARIES += write_graphite.la
 -write_graphite_la_SOURCES = write_graphite.c \
 -                        utils_format_graphite.c utils_format_graphite.h
 +write_graphite_la_SOURCES = write_graphite.c
  write_graphite_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 +write_graphite_la_LIBADD = libformat_graphite.la
  endif
  
  if BUILD_PLUGIN_WRITE_HTTP
@@@ -1310,18 -1266,19 +1311,18 @@@ endi
  if BUILD_PLUGIN_WRITE_KAFKA
  pkglib_LTLIBRARIES += write_kafka.la
  write_kafka_la_SOURCES = write_kafka.c \
 -                        utils_format_graphite.c utils_format_graphite.h \
 -                        utils_cmd_putval.c utils_cmd_putval.h \
 -                        utils_crc32.c utils_crc32.h
 +                         utils_crc32.c utils_crc32.h
  write_kafka_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBRDKAFKA_CPPFLAGS)
  write_kafka_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBRDKAFKA_LDFLAGS)
 -write_kafka_la_LIBADD = $(BUILD_WITH_LIBRDKAFKA_LIBS) libformat_json.la
 +write_kafka_la_LIBADD = $(BUILD_WITH_LIBRDKAFKA_LIBS) \
 +                        libcmds.la libformat_graphite.la libformat_json.la
  endif
  
  if BUILD_PLUGIN_WRITE_LOG
  pkglib_LTLIBRARIES += write_log.la
 -write_log_la_SOURCES = write_log.c \
 -                        utils_format_graphite.c utils_format_graphite.h
 +write_log_la_SOURCES = write_log.c
  write_log_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 +write_log_la_LIBADD = libformat_graphite.la libformat_json.la
  endif
  
  if BUILD_PLUGIN_WRITE_MONGODB
@@@ -1332,15 -1289,6 +1333,15 @@@ write_mongodb_la_LDFLAGS = $(PLUGIN_LDF
  write_mongodb_la_LIBADD = -lmongoc
  endif
  
 +if BUILD_PLUGIN_WRITE_PROMETHEUS
 +pkglib_LTLIBRARIES += write_prometheus.la
 +write_prometheus_la_SOURCES = write_prometheus.c
 +nodist_write_prometheus_la_SOURCES = prometheus.pb-c.c prometheus.pb-c.h
 +write_prometheus_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBPROTOBUF_C_CPPFLAGS) $(BUILD_WITH_LIBMICROHTTPD_CPPFLAGS)
 +write_prometheus_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBPROTOBUF_C_LDFLAGS) $(BUILD_WITH_LIBMICROHTTPD_LDFLAGS)
 +write_prometheus_la_LIBADD = $(BUILD_WITH_LIBPROTOBUF_C_LIBS) $(BUILD_WITH_LIBMICROHTTPD_LIBS)
 +endif
 +
  if BUILD_PLUGIN_WRITE_REDIS
  pkglib_LTLIBRARIES += write_redis.la
  write_redis_la_SOURCES = write_redis.c
@@@ -1483,15 -1431,6 +1484,15 @@@ pinba.pb-c.c pinba.pb-c.h: pinba.prot
        $(AM_V_PROTOC_C)$(PROTOC_C) -I$(srcdir) --c_out . $(srcdir)/pinba.proto
  endif
  
 +# Protocol buffer for the "write_prometheus" plugin.
 +if BUILD_PLUGIN_WRITE_PROMETHEUS
 +CLEANFILES += prometheus.pb-c.c prometheus.pb-c.h
 +BUILT_SOURCES += prometheus.pb-c.c prometheus.pb-c.h
 +
 +prometheus.pb-c.c prometheus.pb-c.h: $(top_srcdir)/proto/prometheus.proto
 +      $(AM_V_PROTOC_C)$(PROTOC_C) -I$(top_srcdir)/proto --c_out=$(builddir) $(top_srcdir)/proto/prometheus.proto
 +endif
 +
  install-exec-hook:
        $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
        if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \