From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH] collectd: update to 5.7.0 and add sensors support
Date: Fri, 16 Dec 2016 16:53:10 +0100 [thread overview]
Message-ID: <20161216155310.cdvhtfwbihiv32jm@pengutronix.de> (raw)
In-Reply-To: <20161215135222.16594-1-clemens.gruber@pqgruber.com>
On Thu, Dec 15, 2016 at 02:52:09PM +0100, Clemens Gruber wrote:
> Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
> ---
> projectroot/etc/collectd.d/sensors.conf | 1 +
> rules/collectd.in | 9 +++++++-
> rules/collectd.make | 39 +++++++++++++++++++++++++++------
> 3 files changed, 41 insertions(+), 8 deletions(-)
> create mode 100644 projectroot/etc/collectd.d/sensors.conf
>
> diff --git a/projectroot/etc/collectd.d/sensors.conf b/projectroot/etc/collectd.d/sensors.conf
> new file mode 100644
> index 0000000..2dc3ffe
> --- /dev/null
> +++ b/projectroot/etc/collectd.d/sensors.conf
> @@ -0,0 +1 @@
> +LoadPlugin sensors
> diff --git a/rules/collectd.in b/rules/collectd.in
> index bff2cb5..ba359f0 100644
> --- a/rules/collectd.in
> +++ b/rules/collectd.in
> @@ -2,7 +2,8 @@
>
> menuconfig COLLECTD
> tristate
> - select RRDTOOL if COLLECTD_RRDTOOL
> + select RRDTOOL if COLLECTD_RRDTOOL
> + select LM_SENSORS if COLLECTD_SENSORS
> prompt "collectd "
> help
> collectd is a daemon which collects system performance statistics
> @@ -43,4 +44,10 @@ config COLLECTD_CPU
> The CPU plugin collects data about what your CPU is actually doing,
> and if it is being idle or in the various states.
>
> +config COLLECTD_SENSORS
> + bool
> + prompt "sensors"
> + help
> + The Sensors plugin uses lm-sensors to read hardware sensors.
> +
> endif
> diff --git a/rules/collectd.make b/rules/collectd.make
> index 2ef50e7..61f3dca 100644
> --- a/rules/collectd.make
> +++ b/rules/collectd.make
> @@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_COLLECTD) += collectd
> #
> # Paths and names
> #
> -COLLECTD_VERSION := 5.4.1
> +COLLECTD_VERSION := 5.7.0
> COLLECTD := collectd-$(COLLECTD_VERSION)
> COLLECTD_SUFFIX := tar.bz2
> COLLECTD_URL := http://collectd.org/files/${COLLECTD}.${COLLECTD_SUFFIX}
> -COLLECTD_MD5 := 6f56c71c96573a7f4f7fb3bfab185974
> +COLLECTD_MD5 := c5cbe74a5638cac793caa13b3df60ce1
> COLLECTD_DIR := $(BUILDDIR)/$(COLLECTD)
> COLLECTD_SOURCE := $(SRCDIR)/$(COLLECTD).$(COLLECTD_SUFFIX)
> COLLECTD_LICENSE := GPL2
> @@ -33,6 +33,7 @@ COLLECTD_ENABLE-$(PTXCONF_COLLECTD_LOGFILE) += logfile
> COLLECTD_ENABLE-$(PTXCONF_COLLECTD_SYSLOG) += syslog
> COLLECTD_ENABLE-$(PTXCONF_COLLECTD_RRDTOOL) += rrdtool
> COLLECTD_ENABLE-$(PTXCONF_COLLECTD_CPU) += cpu
> +COLLECTD_ENABLE-$(PTXCONF_COLLECTD_SENSORS) += sensors
>
> # 'noyywrap' is set, so no lex library is needed
> COLLECTD_CONF_ENV := \
> @@ -46,8 +47,8 @@ COLLECTD_CONF_TOOL := autoconf
> COLLECTD_CONF_OPT := $(CROSS_AUTOCONF_USR) \
> $(GLOBAL_LARGE_FILE_OPTION) \
> --disable-standards \
> - --disable-glibtest \
> --disable-debug \
> + --disable-xfs \
Wrong order.
And add the --disable-werror. Warnings are often compiler version and
architecture specific.
Michael
> --enable-daemon \
> --disable-getifaddrs \
> --disable-all-plugins \
> @@ -62,20 +63,26 @@ COLLECTD_CONF_OPT := $(CROSS_AUTOCONF_USR) \
> --disable-apple_sensors \
> --disable-aquaero \
> --disable-ascent \
> + --disable-barometer \
> --disable-battery \
> --disable-bind \
> + --disable-ceph \
> + --disable-cgroups \
> + --disable-chrony \
> --disable-conntrack \
> --disable-contextswitch \
> --disable-cpufreq \
> + --disable-cpusleep \
> --disable-csv \
> --disable-curl \
> --disable-curl_json \
> --disable-curl_xml \
> - --disable-cgroups \
> --disable-dbi \
> --disable-df \
> --disable-disk \
> --disable-dns \
> + --disable-dpdkstat \
> + --disable-drbd \
> --disable-email \
> --disable-entropy \
> --disable-ethstat \
> @@ -83,16 +90,22 @@ COLLECTD_CONF_OPT := $(CROSS_AUTOCONF_USR) \
> --disable-filecount \
> --disable-fscache \
> --disable-gmond \
> + --disable-gps \
> + --disable-grpc \
> --disable-hddtemp \
> + --disable-hugepages \
> + --disable-intel_rdt \
> --disable-interface \
> + --disable-ipc \
> --disable-ipmi \
> --disable-iptables \
> --disable-ipvs \
> --disable-irq \
> --disable-java \
> - --disable-libvirt \
> --disable-load \
> + --disable-log_logstash \
> --disable-lpar \
> + --disable-lua \
> --disable-lvm \
> --disable-madwifi \
> --disable-match_empty_counter \
> @@ -107,6 +120,7 @@ COLLECTD_CONF_OPT := $(CROSS_AUTOCONF_USR) \
> --disable-memory \
> --disable-mic \
> --disable-modbus \
> + --disable-mqtt \
> --disable-multimeter \
> --disable-mysql \
> --disable-netapp \
> @@ -116,11 +130,13 @@ COLLECTD_CONF_OPT := $(CROSS_AUTOCONF_USR) \
> --disable-nginx \
> --disable-notify_desktop \
> --disable-notify_email \
> + --disable-notify_nagios \
> --disable-ntpd \
> --disable-numa \
> --disable-nut \
> --disable-olsrd \
> --disable-onewire \
> + --disable-openldap \
> --disable-openvpn \
> --disable-oracle \
> --disable-perl \
> @@ -135,9 +151,9 @@ COLLECTD_CONF_OPT := $(CROSS_AUTOCONF_USR) \
> --disable-redis \
> --disable-routeros \
> --disable-rrdcached \
> - --disable-sensors \
> --disable-serial \
> --disable-sigrok \
> + --disable-smart \
> --disable-snmp \
> --disable-statsd \
> --disable-swap \
> @@ -156,21 +172,31 @@ COLLECTD_CONF_OPT := $(CROSS_AUTOCONF_USR) \
> --disable-thermal \
> --disable-threshold \
> --disable-tokyotyrant \
> + --disable-turbostat \
> --disable-unixsock \
> --disable-uptime \
> --disable-users \
> --disable-uuid \
> --disable-varnish \
> + --disable-virt \
> --disable-vmem \
> --disable-vserver \
> --disable-wireless \
> --disable-write_graphite \
> --disable-write_http \
> + --disable-write_kafka \
> --disable-write_mongodb \
> + --disable-write_prometheus \
> --disable-write_redis \
> --disable-write_riemann \
> + --disable-write_sensu \
> + --disable-write_tsdb \
> + --disable-xencpu \
> --disable-xmms \
> --disable-zfs_arc \
> + --disable-zone \
> + --disable-zonekeeper \
Here is a typo and there are some plugins missing. Please update this list
by filtering the output from ./configure --help.
This is currectly a bit awkward with the optional plugins above.
Maybe list them all above and use
COLLECTD_ENABLE- += <plugin>
for the unconditional plugins? The way things are, we are currently likely
to forget some for each update.
Something like this can be generated for all options and then merged with
the existing listing.
Michael
> + --without-libdpdk \
> --without-perl-bindings
>
> ifneq ($(call remove_quotes,$(COLLECTD_ENABLE-y)),)
> @@ -198,7 +224,6 @@ $(STATEDIR)/collectd.targetinstall:
> @$(call install_lib, collectd, 0, 0, 0644, libcollectdclient)
> @$(call install_copy, collectd, 0, 0, 0755, -, /usr/sbin/collectd)
> @$(call install_alternative, collectd, 0, 0, 0644, /etc/collectd.conf)
> - @$(call install_copy, collectd, 0, 0, 0644, /etc/collectd)
> @$(call install_copy, collectd, 0, 0, 0644, -, /usr/share/collectd/types.db)
> @$(call install_copy, collectd, 0, 0, 0755, /usr/lib/collectd)
>
> --
> 2.10.2
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
prev parent reply other threads:[~2016-12-16 15:53 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-15 13:52 Clemens Gruber
2016-12-15 13:52 ` [ptxdist] [PATCH] dbus: bump version Clemens Gruber
2016-12-15 13:52 ` [ptxdist] [PATCH] file: " Clemens Gruber
2016-12-16 15:05 ` Michael Olbrich
2016-12-15 13:52 ` [ptxdist] [PATCH] glib: " Clemens Gruber
2016-12-15 13:52 ` [ptxdist] [PATCH] iperf: version bump Clemens Gruber
2016-12-16 15:12 ` Michael Olbrich
2016-12-17 19:51 ` Clemens Gruber
2017-01-04 16:33 ` Michael Olbrich
2017-01-04 20:34 ` Robert Schwebel
2016-12-15 13:52 ` [ptxdist] [PATCH] iproute2: bump version Clemens Gruber
2016-12-15 13:52 ` [ptxdist] [PATCH] projectroot: Fix HTML syntax in examples Clemens Gruber
2016-12-15 13:52 ` [ptxdist] [PATCH] rrdtool: update to 1.6.0 and make more modular Clemens Gruber
2016-12-16 15:22 ` Michael Olbrich
2016-12-15 13:52 ` [ptxdist] [PATCH] sqlite: bump version Clemens Gruber
2016-12-15 13:52 ` [ptxdist] [PATCH] systemd-bootchart: update to 231 Clemens Gruber
2016-12-15 13:52 ` [ptxdist] [PATCH] tmux: bump version Clemens Gruber
2016-12-16 15:25 ` Michael Olbrich
2016-12-15 13:52 ` [ptxdist] [PATCH] u-boot-tools: " Clemens Gruber
2016-12-15 13:52 ` [ptxdist] [PATCH] util-linux-ng: update to 2.29 and fix URL deduction Clemens Gruber
2016-12-16 15:30 ` Michael Olbrich
2016-12-15 13:52 ` [ptxdist] [PATCH] picocom: update to version 2.2 Clemens Gruber
2016-12-16 15:53 ` Michael Olbrich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161216155310.cdvhtfwbihiv32jm@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox