From 8e8d0ec260ac28acee14884672c30555fc687936 Mon Sep 17 00:00:00 2001 From: rcshell Date: Mon, 13 May 2024 07:08:22 +0000 Subject: [PATCH 1/6] app-metrics/unbound_exporter: add 9999 --- .../files/unbound_exporter.confd | 16 ++++++++ .../files/unbound_exporter.initd | 23 +++++++++++ .../files/unbound_exporter.service | 17 ++++++++ .../files/unbound_exporter.service.conf | 19 +++++++++ app-metrics/unbound_exporter/metadata.xml | 11 ++++++ .../unbound_exporter-9999.ebuild | 39 +++++++++++++++++++ 6 files changed, 125 insertions(+) create mode 100644 app-metrics/unbound_exporter/files/unbound_exporter.confd create mode 100644 app-metrics/unbound_exporter/files/unbound_exporter.initd create mode 100644 app-metrics/unbound_exporter/files/unbound_exporter.service create mode 100644 app-metrics/unbound_exporter/files/unbound_exporter.service.conf create mode 100644 app-metrics/unbound_exporter/metadata.xml create mode 100644 app-metrics/unbound_exporter/unbound_exporter-9999.ebuild diff --git a/app-metrics/unbound_exporter/files/unbound_exporter.confd b/app-metrics/unbound_exporter/files/unbound_exporter.confd new file mode 100644 index 00000000..22be0a0b --- /dev/null +++ b/app-metrics/unbound_exporter/files/unbound_exporter.confd @@ -0,0 +1,16 @@ +command_args="" + +# Prometheus-unbound-exporter supports the following options: + +# -web.listen-address +# Address to listen on for web interface and telemetry. (Default: ":9167") +# -web.telemetry-path +# Path under which to expose metrics. (Default: "/metrics") +# -unbound.host +# Unbound control socket hostname and port number. (Default: "localhost:8953") +# -unbound.ca +# Unbound server certificate. (Default "/etc/unbound/unbound_server.pem") +# -unbound.cert +# Unbound client certificate. (Default: "/etc/unbound/unbound_control.pem") +# -unbound.key +# Unbound client key. (Default: "/etc/unbound/unbound_control.key") diff --git a/app-metrics/unbound_exporter/files/unbound_exporter.initd b/app-metrics/unbound_exporter/files/unbound_exporter.initd new file mode 100644 index 00000000..feec654c --- /dev/null +++ b/app-metrics/unbound_exporter/files/unbound_exporter.initd @@ -0,0 +1,23 @@ +#!/sbin/openrc-run +# Copyright 2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +description="Prometheus unbound exporter" +pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"} +user=${user:-prometheus-exporter} + +command="/usr/bin/${SVCNAME}" +command_args="${command_args}" +command_background="true" +start_stop_daemon_args="--user ${user} \ + --stdout /var/log/prometheus/${SVCNAME}.log \ + --stderr /var/log/prometheus/${SVCNAME}.log" + +depend() { + need net + after net +} + +start_pre() { + checkpath -d -m 0755 -o "${user}" "${pidfile%/*}" +} diff --git a/app-metrics/unbound_exporter/files/unbound_exporter.service b/app-metrics/unbound_exporter/files/unbound_exporter.service new file mode 100644 index 00000000..a5c63177 --- /dev/null +++ b/app-metrics/unbound_exporter/files/unbound_exporter.service @@ -0,0 +1,17 @@ +[Unit] +Description=Prometheus unbound exporter +Documentation=https://github.com/kumina/unbound_exporter +After=network-online.target + +[Service] +EnvironmentFile=/etc/default/%p +User=prometheus-exporter +Restart=on-failure +ExecStart=/usr/bin/%p $ARGS +ExecReload=/bin/kill -HUP $MAINPID +TimeoutStopSec=20s +SendSIGKILL=no + +[Install] +WantedBy=multi-user.target + diff --git a/app-metrics/unbound_exporter/files/unbound_exporter.service.conf b/app-metrics/unbound_exporter/files/unbound_exporter.service.conf new file mode 100644 index 00000000..087fae85 --- /dev/null +++ b/app-metrics/unbound_exporter/files/unbound_exporter.service.conf @@ -0,0 +1,19 @@ +[Service] +# Set the command-line arguments to pass to the server. +#Environment="ARGS=" + +# Prometheus-unbound-exporter supports the following options: + +# -web.listen-address +# Address to listen on for web interface and telemetry. (Default: ":9167") +# -web.telemetry-path +# Path under which to expose metrics. (Default: "/metrics") +# -unbound.host +# Unbound control socket hostname and port number. (Default: "localhost:8953") +# -unbound.ca +# Unbound server certificate. (Default "/etc/unbound/unbound_server.pem") +# -unbound.cert +# Unbound client certificate. (Default: "/etc/unbound/unbound_control.pem") +# -unbound.key +# Unbound client key. (Default: "/etc/unbound/unbound_control.key") + diff --git a/app-metrics/unbound_exporter/metadata.xml b/app-metrics/unbound_exporter/metadata.xml new file mode 100644 index 00000000..bff3b31f --- /dev/null +++ b/app-metrics/unbound_exporter/metadata.xml @@ -0,0 +1,11 @@ + + + + + mva@gentoo.org + Vadim Misbakh-Soloviov + + + letsencrypt/unbound_exporter + + diff --git a/app-metrics/unbound_exporter/unbound_exporter-9999.ebuild b/app-metrics/unbound_exporter/unbound_exporter-9999.ebuild new file mode 100644 index 00000000..c4544b5e --- /dev/null +++ b/app-metrics/unbound_exporter/unbound_exporter-9999.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module systemd git-r3 + +DESCRIPTION="Prometheus exporter for PostgreSQL metrics" +HOMEPAGE="https://github.com/letsencrypt/unbound_exporter" +EGIT_REPO_URI="https://github.com/letsencrypt/unbound_exporter" +LICENSE="Apache-2.0" +SLOT="0" + +RDEPEND=" + acct-user/prometheus + acct-group/prometheus +" +DOCS=(README.md) + +src_unpack() { + default + git-r3_src_unpack + go-module_live_vendor +} + +src_compile() { + ego build -o "${PN}" +} + +src_install() { + dobin "${PN}" + + newinitd "${FILESDIR}/${PN}.initd" "${PN}" + newconfd "${FILESDIR}/${PN}.confd" "${PN}" + systemd_dounit "${FILESDIR}/${PN}.service" + systemd_install_serviced "${FILESDIR}/${PN}.service.conf" + + einstalldocs +} From 5c6cbebffb063155e79e1487d589fb7e38646b3a Mon Sep 17 00:00:00 2001 From: rcshell <124035632+rcshell@users.noreply.github.com> Date: Fri, 24 May 2024 10:49:22 +0200 Subject: [PATCH 2/6] app-metrics/unbound_exporter: drop newlines Co-authored-by: Teerapatr K. <97140774+teerapatrk@users.noreply.github.com> --- app-metrics/unbound_exporter/files/unbound_exporter.service | 1 - app-metrics/unbound_exporter/files/unbound_exporter.service.conf | 1 - 2 files changed, 2 deletions(-) diff --git a/app-metrics/unbound_exporter/files/unbound_exporter.service b/app-metrics/unbound_exporter/files/unbound_exporter.service index a5c63177..702cdc2b 100644 --- a/app-metrics/unbound_exporter/files/unbound_exporter.service +++ b/app-metrics/unbound_exporter/files/unbound_exporter.service @@ -14,4 +14,3 @@ SendSIGKILL=no [Install] WantedBy=multi-user.target - diff --git a/app-metrics/unbound_exporter/files/unbound_exporter.service.conf b/app-metrics/unbound_exporter/files/unbound_exporter.service.conf index 087fae85..89783647 100644 --- a/app-metrics/unbound_exporter/files/unbound_exporter.service.conf +++ b/app-metrics/unbound_exporter/files/unbound_exporter.service.conf @@ -16,4 +16,3 @@ # Unbound client certificate. (Default: "/etc/unbound/unbound_control.pem") # -unbound.key # Unbound client key. (Default: "/etc/unbound/unbound_control.key") - From cd95d62fc98236f4dfe5736ecc71b8a92bfb9913 Mon Sep 17 00:00:00 2001 From: rcshell <124035632+rcshell@users.noreply.github.com> Date: Fri, 24 May 2024 10:49:59 +0200 Subject: [PATCH 3/6] app-metrics/unbound_exporter: fix username Co-authored-by: Teerapatr K. <97140774+teerapatrk@users.noreply.github.com> --- app-metrics/unbound_exporter/files/unbound_exporter.initd | 2 +- app-metrics/unbound_exporter/files/unbound_exporter.service | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app-metrics/unbound_exporter/files/unbound_exporter.initd b/app-metrics/unbound_exporter/files/unbound_exporter.initd index feec654c..ccaeb0ad 100644 --- a/app-metrics/unbound_exporter/files/unbound_exporter.initd +++ b/app-metrics/unbound_exporter/files/unbound_exporter.initd @@ -4,7 +4,7 @@ description="Prometheus unbound exporter" pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"} -user=${user:-prometheus-exporter} +user=${user:-prometheus} command="/usr/bin/${SVCNAME}" command_args="${command_args}" diff --git a/app-metrics/unbound_exporter/files/unbound_exporter.service b/app-metrics/unbound_exporter/files/unbound_exporter.service index 702cdc2b..a29b50af 100644 --- a/app-metrics/unbound_exporter/files/unbound_exporter.service +++ b/app-metrics/unbound_exporter/files/unbound_exporter.service @@ -5,7 +5,7 @@ After=network-online.target [Service] EnvironmentFile=/etc/default/%p -User=prometheus-exporter +User=prometheus Restart=on-failure ExecStart=/usr/bin/%p $ARGS ExecReload=/bin/kill -HUP $MAINPID From 1b2c3b02570e18739085e94ef174f095981e53c9 Mon Sep 17 00:00:00 2001 From: rcshell Date: Fri, 24 May 2024 08:56:11 +0000 Subject: [PATCH 4/6] app-metrics/unbound_exporter: fix log name --- app-metrics/unbound_exporter/files/unbound_exporter.initd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-metrics/unbound_exporter/files/unbound_exporter.initd b/app-metrics/unbound_exporter/files/unbound_exporter.initd index ccaeb0ad..1cc9bd0f 100644 --- a/app-metrics/unbound_exporter/files/unbound_exporter.initd +++ b/app-metrics/unbound_exporter/files/unbound_exporter.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 2017 Gentoo Foundation +# Copyright 2024 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 description="Prometheus unbound exporter" @@ -11,7 +11,7 @@ command_args="${command_args}" command_background="true" start_stop_daemon_args="--user ${user} \ --stdout /var/log/prometheus/${SVCNAME}.log \ - --stderr /var/log/prometheus/${SVCNAME}.log" + --stderr /var/log/prometheus/${SVCNAME}.err" depend() { need net From 8ea46651c739da06fce4562615591df5df1b8564 Mon Sep 17 00:00:00 2001 From: rcshell Date: Fri, 24 May 2024 09:01:41 +0000 Subject: [PATCH 5/6] app-metrics/unbound_exporter: fix url --- app-metrics/unbound_exporter/files/unbound_exporter.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-metrics/unbound_exporter/files/unbound_exporter.service b/app-metrics/unbound_exporter/files/unbound_exporter.service index a29b50af..fe701a59 100644 --- a/app-metrics/unbound_exporter/files/unbound_exporter.service +++ b/app-metrics/unbound_exporter/files/unbound_exporter.service @@ -1,6 +1,6 @@ [Unit] Description=Prometheus unbound exporter -Documentation=https://github.com/kumina/unbound_exporter +Documentation=https://github.com/letsencrypt/unbound_exporter After=network-online.target [Service] From 74404d93ecc08b4b4ce9467b217469b9cea9ed04 Mon Sep 17 00:00:00 2001 From: rcshell Date: Fri, 24 May 2024 09:05:07 +0000 Subject: [PATCH 6/6] app-metrics/unbound_exporter: fix metadata --- app-metrics/unbound_exporter/metadata.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app-metrics/unbound_exporter/metadata.xml b/app-metrics/unbound_exporter/metadata.xml index bff3b31f..9d393e55 100644 --- a/app-metrics/unbound_exporter/metadata.xml +++ b/app-metrics/unbound_exporter/metadata.xml @@ -1,9 +1,9 @@ - - mva@gentoo.org - Vadim Misbakh-Soloviov + + ops@adjustcom + Adjust Ops Team letsencrypt/unbound_exporter