* [PR PATCH] collectd: add build prometheus build option
@ 2020-11-07 18:46 sirikid
2020-11-07 21:57 ` collectd: add " PaperMountainStudio
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: sirikid @ 2020-11-07 18:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 456 bytes --]
There is a new pull request by sirikid against master on the void-packages repository
https://github.com/sirikid/void-packages feature/collectd/prometheus
https://github.com/void-linux/void-packages/pull/26202
collectd: add build prometheus build option
I will remove WIP commit before merge, I just don't know how to enable build with non-default options on CI.
A patch file from https://github.com/void-linux/void-packages/pull/26202.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-feature/collectd/prometheus-26202.patch --]
[-- Type: text/x-diff, Size: 3487 bytes --]
From 9cfe6817cb6aa1f494e5068c7be373bb3ed531af Mon Sep 17 00:00:00 2001
From: Ivan Sokolov <ivan-p-sokolov@ya.ru>
Date: Sat, 7 Nov 2020 18:12:18 +0300
Subject: [PATCH 1/2] collectd: add prometheus build option
---
srcpkgs/collectd/template | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index f0ff336a74d..b89e8bd45d6 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,18 +1,22 @@
# Template file for 'collectd'
pkgname=collectd
version=5.11.0
-revision=4
+revision=5
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"
+configure_args="--disable-static --disable-werror --enable-virt
+ --sysconfdir=/etc --with-fp-layout=nothing --with-libiptc --with-libpython
+ $(vopt_enable notify notify_desktop)
+ $(vopt_enable perl)
+ $(vopt_enable rrdtool)
+ $(vopt_with prometheus libmicrohttpd) $(vopt_with prometheus libprotobuf-c)"
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)"
+makedepends="iptables-devel libcurl-devel libesmtp-devel libgcrypt-devel
+ libltdl-devel libmysqlclient-devel libressl-devel libsensors-devel
+ libvirt-devel libxml2-devel net-snmp-devel python3-devel yajl-devel zlib-devel
+ $(vopt_if notify libnotify-devel)
+ $(vopt_if rrdtool rrdtool-devel)
+ $(vopt_if prometheus protobuf-c-devel) $(vopt_if prometheus 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 +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 support for Write Prometheus plugin"
if [ -z "$CROSS_BUILD" ]; then
build_options_default="rrdtool perl"
From 601c94d1b45c2436663c903e17983a4d664c3936 Mon Sep 17 00:00:00 2001
From: Ivan Sokolov <ivan-p-sokolov@ya.ru>
Date: Sat, 7 Nov 2020 18:19:53 +0300
Subject: [PATCH 2/2] WIP: collectd: enable prometheus
---
srcpkgs/collectd/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index b89e8bd45d6..58fe5a3a036 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -26,13 +26,10 @@ checksum=37b10a806e34aa8570c1cafa6006c604796fae13cc2e1b3e630d33dcba9e5db2
LDFLAGS="-lgcrypt"
build_options="rrdtool perl notify prometheus"
+build_options_default="prometheus"
desc_option_rrdtool="Enable support for RRDTool"
desc_option_prometheus="Enable support for Write Prometheus plugin"
-if [ -z "$CROSS_BUILD" ]; then
- build_options_default="rrdtool perl"
-fi
-
pre_configure() {
autoreconf -fi
}
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: collectd: add prometheus build option
2020-11-07 18:46 [PR PATCH] collectd: add build prometheus build option sirikid
@ 2020-11-07 21:57 ` PaperMountainStudio
2020-11-07 23:45 ` [PR PATCH] [Updated] " sirikid
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: PaperMountainStudio @ 2020-11-07 21:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 166 bytes --]
New comment by PaperMountainStudio on void-packages repository
https://github.com/void-linux/void-packages/pull/26202#issuecomment-723500168
Comment:
@felix #21202
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] collectd: add prometheus build option
2020-11-07 18:46 [PR PATCH] collectd: add build prometheus build option sirikid
2020-11-07 21:57 ` collectd: add " PaperMountainStudio
@ 2020-11-07 23:45 ` sirikid
2020-11-08 11:28 ` sirikid
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: sirikid @ 2020-11-07 23:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 455 bytes --]
There is an updated pull request by sirikid against master on the void-packages repository
https://github.com/sirikid/void-packages feature/collectd/prometheus
https://github.com/void-linux/void-packages/pull/26202
collectd: add prometheus build option
I will remove WIP commit before merge, I just don't know how to enable build with non-default options on CI.
A patch file from https://github.com/void-linux/void-packages/pull/26202.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-feature/collectd/prometheus-26202.patch --]
[-- Type: text/x-diff, Size: 3515 bytes --]
From a09994953ac619e7d250416ad9c5156c469b0ce1 Mon Sep 17 00:00:00 2001
From: Ivan Sokolov <ivan-p-sokolov@ya.ru>
Date: Sat, 7 Nov 2020 18:12:18 +0300
Subject: [PATCH 1/2] collectd: add prometheus build option
---
srcpkgs/collectd/template | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
mode change 100644 => 100755 srcpkgs/collectd/template
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
old mode 100644
new mode 100755
index f0ff336a74d..54f95eab6d9
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,18 +1,22 @@
# Template file for 'collectd'
pkgname=collectd
version=5.11.0
-revision=4
+revision=5
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"
+configure_args="--disable-static --disable-werror --enable-virt
+ --sysconfdir=/etc --with-fp-layout=nothing --with-libiptc --with-libpython
+ $(vopt_enable notify notify_desktop)
+ $(vopt_enable perl)
+ $(vopt_enable rrdtool)
+ $(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)"
+makedepends="iptables-devel libcurl-devel libesmtp-devel libgcrypt-devel
+ libltdl-devel libmysqlclient-devel libressl-devel libsensors-devel
+ libvirt-devel libxml2-devel net-snmp-devel python3-devel yajl-devel zlib-devel
+ $(vopt_if notify libnotify-devel)
+ $(vopt_if rrdtool rrdtool-devel)
+ $(vopt_if prometheus "libmicrohttpd-devel protobuf-c-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 +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 support for Write Prometheus plugin"
if [ -z "$CROSS_BUILD" ]; then
build_options_default="rrdtool perl"
From 561dd894d17ed5d801e6d566f381c4bf09338a04 Mon Sep 17 00:00:00 2001
From: Ivan Sokolov <ivan-p-sokolov@ya.ru>
Date: Sat, 7 Nov 2020 18:19:53 +0300
Subject: [PATCH 2/2] WIP: collectd: enable prometheus
---
srcpkgs/collectd/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 54f95eab6d9..45c27d73640 100755
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -26,13 +26,10 @@ checksum=37b10a806e34aa8570c1cafa6006c604796fae13cc2e1b3e630d33dcba9e5db2
LDFLAGS="-lgcrypt"
build_options="rrdtool perl notify prometheus"
+build_options_default="prometheus"
desc_option_rrdtool="Enable support for RRDTool"
desc_option_prometheus="Enable support for Write Prometheus plugin"
-if [ -z "$CROSS_BUILD" ]; then
- build_options_default="rrdtool perl"
-fi
-
pre_configure() {
autoreconf -fi
}
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] collectd: add prometheus build option
2020-11-07 18:46 [PR PATCH] collectd: add build prometheus build option sirikid
2020-11-07 21:57 ` collectd: add " PaperMountainStudio
2020-11-07 23:45 ` [PR PATCH] [Updated] " sirikid
@ 2020-11-08 11:28 ` sirikid
2020-12-20 4:09 ` ericonr
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: sirikid @ 2020-11-08 11:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 455 bytes --]
There is an updated pull request by sirikid against master on the void-packages repository
https://github.com/sirikid/void-packages feature/collectd/prometheus
https://github.com/void-linux/void-packages/pull/26202
collectd: add prometheus build option
I will remove WIP commit before merge, I just don't know how to enable build with non-default options on CI.
A patch file from https://github.com/void-linux/void-packages/pull/26202.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-feature/collectd/prometheus-26202.patch --]
[-- Type: text/x-diff, Size: 3622 bytes --]
From 05cf1b156fb701e73272f958c088995d5e1e8163 Mon Sep 17 00:00:00 2001
From: Ivan Sokolov <ivan-p-sokolov@ya.ru>
Date: Sat, 7 Nov 2020 18:12:18 +0300
Subject: [PATCH 1/2] collectd: add prometheus build option
---
srcpkgs/collectd/template | 27 ++++++++++++++++-----------
1 file changed, 16 insertions(+), 11 deletions(-)
mode change 100644 => 100755 srcpkgs/collectd/template
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
old mode 100644
new mode 100755
index f0ff336a74d..00c2c953e55
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,18 +1,22 @@
# Template file for 'collectd'
pkgname=collectd
version=5.11.0
-revision=4
+revision=5
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"
+configure_args="--disable-static --disable-werror --enable-virt
+ --sysconfdir=/etc --with-fp-layout=nothing --with-libiptc --with-libpython
+ $(vopt_enable notify notify_desktop)
+ $(vopt_enable perl)
+ $(vopt_enable rrdtool)
+ $(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)"
+hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel $(vopt_if prometheus protobuf-c)"
+makedepends="iptables-devel libcurl-devel libesmtp-devel libgcrypt-devel
+ libltdl-devel libmysqlclient-devel libressl-devel libsensors-devel
+ libvirt-devel libxml2-devel net-snmp-devel python3-devel yajl-devel zlib-devel
+ $(vopt_if notify libnotify-devel)
+ $(vopt_if rrdtool rrdtool-devel)
+ $(vopt_if prometheus "libmicrohttpd-devel protobuf-c-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 +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 support for Write Prometheus plugin"
if [ -z "$CROSS_BUILD" ]; then
build_options_default="rrdtool perl"
From 23d36b2d7f5bd06818dbe705ffe8c20b924e28ae Mon Sep 17 00:00:00 2001
From: Ivan Sokolov <ivan-p-sokolov@ya.ru>
Date: Sat, 7 Nov 2020 18:19:53 +0300
Subject: [PATCH 2/2] WIP: collectd: enable prometheus
---
srcpkgs/collectd/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 00c2c953e55..71c767ecd8b 100755
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -26,13 +26,10 @@ checksum=37b10a806e34aa8570c1cafa6006c604796fae13cc2e1b3e630d33dcba9e5db2
LDFLAGS="-lgcrypt"
build_options="rrdtool perl notify prometheus"
+build_options_default="prometheus"
desc_option_rrdtool="Enable support for RRDTool"
desc_option_prometheus="Enable support for Write Prometheus plugin"
-if [ -z "$CROSS_BUILD" ]; then
- build_options_default="rrdtool perl"
-fi
-
pre_configure() {
autoreconf -fi
}
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: collectd: add prometheus build option
2020-11-07 18:46 [PR PATCH] collectd: add build prometheus build option sirikid
` (2 preceding siblings ...)
2020-11-08 11:28 ` sirikid
@ 2020-12-20 4:09 ` ericonr
2020-12-20 4:09 ` ericonr
2020-12-20 4:10 ` [PR PATCH] [Closed]: " ericonr
5 siblings, 0 replies; 7+ messages in thread
From: ericonr @ 2020-12-20 4:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 160 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26202#issuecomment-748560308
Comment:
Superseded by 21202
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: collectd: add prometheus build option
2020-11-07 18:46 [PR PATCH] collectd: add build prometheus build option sirikid
` (3 preceding siblings ...)
2020-12-20 4:09 ` ericonr
@ 2020-12-20 4:09 ` ericonr
2020-12-20 4:10 ` [PR PATCH] [Closed]: " ericonr
5 siblings, 0 replies; 7+ messages in thread
From: ericonr @ 2020-12-20 4:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 161 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26202#issuecomment-748560308
Comment:
Superseded by #21202
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Closed]: collectd: add prometheus build option
2020-11-07 18:46 [PR PATCH] collectd: add build prometheus build option sirikid
` (4 preceding siblings ...)
2020-12-20 4:09 ` ericonr
@ 2020-12-20 4:10 ` ericonr
5 siblings, 0 replies; 7+ messages in thread
From: ericonr @ 2020-12-20 4:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 279 bytes --]
There's a closed pull request on the void-packages repository
collectd: add prometheus build option
https://github.com/void-linux/void-packages/pull/26202
Description:
I will remove WIP commit before merge, I just don't know how to enable build with non-default options on CI.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-12-20 4:10 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-07 18:46 [PR PATCH] collectd: add build prometheus build option sirikid
2020-11-07 21:57 ` collectd: add " PaperMountainStudio
2020-11-07 23:45 ` [PR PATCH] [Updated] " sirikid
2020-11-08 11:28 ` sirikid
2020-12-20 4:09 ` ericonr
2020-12-20 4:09 ` ericonr
2020-12-20 4:10 ` [PR PATCH] [Closed]: " 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).