* [PR PATCH] collectd: add write_prometheus plugin
@ 2020-04-21 12:53 felix
2020-04-30 2:04 ` [PR PATCH] [Updated] " felix
` (7 more replies)
0 siblings, 8 replies; 9+ messages in thread
From: felix @ 2020-04-21 12:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 319 bytes --]
There is a new pull request by felix against master on the void-packages repository
https://github.com/felix/void-packages collectd
https://github.com/void-linux/void-packages/pull/21202
collectd: add write_prometheus plugin
A patch file from https://github.com/void-linux/void-packages/pull/21202.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-collectd-21202.patch --]
[-- Type: text/x-diff, Size: 2115 bytes --]
From beb1eb6462c1d49709386b4961ed4a0bc38d53b9 Mon Sep 17 00:00:00 2001
From: Felix Hanley <felix@userspace.com.au>
Date: Tue, 21 Apr 2020 22:53:05 +1000
Subject: [PATCH] collectd: add write_prometheus plugin
---
srcpkgs/collectd/template | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index c29dd0c7b0a..65dabca84fd 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -6,13 +6,17 @@ build_style=gnu-configure
configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
$(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
--sysconfdir=/etc --disable-static --with-fp-layout=nothing
- --with-python=/bin/python3 --disable-werror"
+ --with-python=/bin/python3 --disable-werror
+ $(vopt_with prometheus "libmicrohttpd protobuf-c")
+ $(vopt_enable prometheus write_prometheus)"
conf_files="/etc/collectd.conf"
hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel"
makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel
libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel
libgcrypt-devel libmysqlclient-devel libltdl-devel libvirt-devel
- $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)"
+ $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)
+ $(vopt_if prometheus "protobuf-c-devel libmicrohttpd-devel")"
+depends="$(vopt_if prometheus protobuf-c libmicrohttpd)"
short_desc="Daemon which collects system performance statistics periodically"
maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
license="GPL-2.0-only, MIT"
@@ -21,8 +25,9 @@ distfiles="https://collectd.org/files/${pkgname}-${version}.tar.bz2"
checksum=7b220f8898a061f6e7f29a8c16697d1a198277f813da69474a67911097c0626b
LDFLAGS="-lgcrypt"
-build_options="rrdtool perl notify"
+build_options="rrdtool perl notify prometheus"
desc_option_rrdtool="Enable support for RRDTool"
+desc_option_prometheus="Enable write_prometheus plugin"
if [ -z "$CROSS_BUILD" ]; then
build_options_default="rrdtool perl"
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] collectd: add write_prometheus plugin
2020-04-21 12:53 [PR PATCH] collectd: add write_prometheus plugin felix
@ 2020-04-30 2:04 ` felix
2020-09-29 1:59 ` [PR REVIEW] " ericonr
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: felix @ 2020-04-30 2:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 324 bytes --]
There is an updated pull request by felix against master on the void-packages repository
https://github.com/felix/void-packages collectd
https://github.com/void-linux/void-packages/pull/21202
collectd: add write_prometheus plugin
A patch file from https://github.com/void-linux/void-packages/pull/21202.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-collectd-21202.patch --]
[-- Type: text/x-diff, Size: 2208 bytes --]
From 01475a6f0eab4678394f3e2a2d80c7a6cd37d5e8 Mon Sep 17 00:00:00 2001
From: Felix Hanley <felix@userspace.com.au>
Date: Tue, 21 Apr 2020 22:53:05 +1000
Subject: [PATCH] collectd: add write_prometheus plugin
---
srcpkgs/collectd/template | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 73c29bc2667..27c101a05ca 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,18 +1,22 @@
# Template file for 'collectd'
pkgname=collectd
version=5.11.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
$(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
--sysconfdir=/etc --disable-static --with-fp-layout=nothing
- --with-python=/bin/python3 --disable-werror"
+ --with-python=/bin/python3 --disable-werror
+ $(vopt_with prometheus "libmicrohttpd protobuf-c")
+ $(vopt_enable prometheus write_prometheus)"
conf_files="/etc/collectd.conf"
hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel"
makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel
libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel
libgcrypt-devel libmysqlclient-devel libltdl-devel libvirt-devel
- $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)"
+ $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)
+ $(vopt_if prometheus "protobuf-c-devel libmicrohttpd-devel")"
+depends="$(vopt_if prometheus protobuf-c libmicrohttpd)"
short_desc="Daemon which collects system performance statistics periodically"
maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
license="GPL-2.0-only, MIT"
@@ -21,8 +25,9 @@ distfiles="https://collectd.org/files/${pkgname}-${version}.tar.bz2"
checksum=37b10a806e34aa8570c1cafa6006c604796fae13cc2e1b3e630d33dcba9e5db2
LDFLAGS="-lgcrypt"
-build_options="rrdtool perl notify"
+build_options="rrdtool perl notify prometheus"
desc_option_rrdtool="Enable support for RRDTool"
+desc_option_prometheus="Enable write_prometheus plugin"
if [ -z "$CROSS_BUILD" ]; then
build_options_default="rrdtool perl"
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR REVIEW] collectd: add write_prometheus plugin
2020-04-21 12:53 [PR PATCH] collectd: add write_prometheus plugin felix
2020-04-30 2:04 ` [PR PATCH] [Updated] " felix
@ 2020-09-29 1:59 ` ericonr
2020-09-30 1:51 ` felix
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2020-09-29 1:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 282 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/21202#discussion_r496334298
Comment:
Aren't these libraries detected automatically? And multiple items like these should be in single quotes: `'protobuf-c libmicrohhtpd')"`
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR REVIEW] collectd: add write_prometheus plugin
2020-04-21 12:53 [PR PATCH] collectd: add write_prometheus plugin felix
2020-04-30 2:04 ` [PR PATCH] [Updated] " felix
2020-09-29 1:59 ` [PR REVIEW] " ericonr
@ 2020-09-30 1:51 ` felix
2020-09-30 2:21 ` ericonr
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: felix @ 2020-09-30 1:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 242 bytes --]
New review comment by felix on void-packages repository
https://github.com/void-linux/void-packages/pull/21202#discussion_r497199137
Comment:
I thought the point was to ensure the dependent libraries are present if that option is selected?
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR REVIEW] collectd: add write_prometheus plugin
2020-04-21 12:53 [PR PATCH] collectd: add write_prometheus plugin felix
` (2 preceding siblings ...)
2020-09-30 1:51 ` felix
@ 2020-09-30 2:21 ` ericonr
2020-10-01 4:13 ` [PR PATCH] [Updated] " felix
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2020-09-30 2:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 319 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/21202#discussion_r497206328
Comment:
The idea is that when building with this option, the final binaries will be dynamically linked to these libraries, meaning that the build system automatically detects them.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] collectd: add write_prometheus plugin
2020-04-21 12:53 [PR PATCH] collectd: add write_prometheus plugin felix
` (3 preceding siblings ...)
2020-09-30 2:21 ` ericonr
@ 2020-10-01 4:13 ` felix
2020-10-10 22:49 ` ericonr
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: felix @ 2020-10-01 4:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 324 bytes --]
There is an updated pull request by felix against master on the void-packages repository
https://github.com/felix/void-packages collectd
https://github.com/void-linux/void-packages/pull/21202
collectd: add write_prometheus plugin
A patch file from https://github.com/void-linux/void-packages/pull/21202.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-collectd-21202.patch --]
[-- Type: text/x-diff, Size: 2056 bytes --]
From 8e461a38b918d9e78d982f2425852bcb9fc369aa Mon Sep 17 00:00:00 2001
From: Felix Hanley <felix@userspace.com.au>
Date: Tue, 21 Apr 2020 22:53:05 +1000
Subject: [PATCH] collectd: add write_prometheus plugin
---
srcpkgs/collectd/template | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index a88454aa4e8..88b2ace370e 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -6,13 +6,16 @@ build_style=gnu-configure
configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
$(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
--sysconfdir=/etc --disable-static --with-fp-layout=nothing
- --with-python=/bin/python3 --disable-werror"
+ --with-python=/bin/python3 --disable-werror
+ $(vopt_with prometheus "libmicrohttpd protobuf-c")
+ $(vopt_enable prometheus write_prometheus)"
conf_files="/etc/collectd.conf"
hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel"
makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel
libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel
libgcrypt-devel libmysqlclient-devel libltdl-devel libvirt-devel
- $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)"
+ $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)
+ $(vopt_if prometheus 'protobuf-c-devel libmicrohttpd-devel')"
short_desc="Daemon which collects system performance statistics periodically"
maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
license="GPL-2.0-only, MIT"
@@ -21,8 +24,9 @@ distfiles="https://collectd.org/files/${pkgname}-${version}.tar.bz2"
checksum=37b10a806e34aa8570c1cafa6006c604796fae13cc2e1b3e630d33dcba9e5db2
LDFLAGS="-lgcrypt"
-build_options="rrdtool perl notify"
+build_options="rrdtool perl notify prometheus"
desc_option_rrdtool="Enable support for RRDTool"
+desc_option_prometheus="Enable write_prometheus plugin"
if [ -z "$CROSS_BUILD" ]; then
build_options_default="rrdtool perl"
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: collectd: add write_prometheus plugin
2020-04-21 12:53 [PR PATCH] collectd: add write_prometheus plugin felix
` (4 preceding siblings ...)
2020-10-01 4:13 ` [PR PATCH] [Updated] " felix
@ 2020-10-10 22:49 ` ericonr
2020-10-12 6:04 ` felix
2020-12-20 4:09 ` [PR PATCH] [Merged]: " ericonr
7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2020-10-10 22:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 188 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/21202#issuecomment-706621932
Comment:
Any reason this couldn't be enabled by default?
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: collectd: add write_prometheus plugin
2020-04-21 12:53 [PR PATCH] collectd: add write_prometheus plugin felix
` (5 preceding siblings ...)
2020-10-10 22:49 ` ericonr
@ 2020-10-12 6:04 ` felix
2020-12-20 4:09 ` [PR PATCH] [Merged]: " ericonr
7 siblings, 0 replies; 9+ messages in thread
From: felix @ 2020-10-12 6:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 290 bytes --]
New comment by felix on void-packages repository
https://github.com/void-linux/void-packages/pull/21202#issuecomment-706887240
Comment:
Perhaps the following reasons:
- It depends on/installs extra libraries.
- collectd + prometheus is perhaps not a common combination for monitoring??
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Merged]: collectd: add write_prometheus plugin
2020-04-21 12:53 [PR PATCH] collectd: add write_prometheus plugin felix
` (6 preceding siblings ...)
2020-10-12 6:04 ` felix
@ 2020-12-20 4:09 ` ericonr
7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2020-12-20 4:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 171 bytes --]
There's a merged pull request on the void-packages repository
collectd: add write_prometheus plugin
https://github.com/void-linux/void-packages/pull/21202
Description:
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2020-12-20 4:09 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-21 12:53 [PR PATCH] collectd: add write_prometheus plugin felix
2020-04-30 2:04 ` [PR PATCH] [Updated] " felix
2020-09-29 1:59 ` [PR REVIEW] " ericonr
2020-09-30 1:51 ` felix
2020-09-30 2:21 ` ericonr
2020-10-01 4:13 ` [PR PATCH] [Updated] " felix
2020-10-10 22:49 ` ericonr
2020-10-12 6:04 ` felix
2020-12-20 4:09 ` [PR PATCH] [Merged]: " ericonr
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).