From 3bdbd4105deb8001119ef18a6d8c4b5e8fe632e4 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Mon, 6 Jan 2020 09:54:43 -0500 Subject: [PATCH] alertmanager: add alertmanager_args to initd/confd Many alertmanager options are only configurable at the command line. --- sr.ht/alertmanager/APKBUILD | 6 +++--- sr.ht/alertmanager/alertmanager.confd | 1 + sr.ht/alertmanager/alertmanager.initd | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sr.ht/alertmanager/APKBUILD b/sr.ht/alertmanager/APKBUILD index 86529cb..5bf6919 100644 --- a/sr.ht/alertmanager/APKBUILD +++ b/sr.ht/alertmanager/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Drew DeVault pkgname=alertmanager pkgver=0.19.0 -pkgrel=4 +pkgrel=5 pkgdesc="Prometheus Alertmanager" url="https://github.com/prometheus/alertmanager" arch="all" @@ -51,5 +51,5 @@ package() { } sha512sums="2c21bfbb1001e07e81b1115439ad15e7c0e7089839e56a19c445177e322b8ef9aa2b85e96478f3c3d709cbbd3a5447662a8c55da370b84aa4b6b24f83848744b alertmanager-0.19.0.tar.gz -9516a5a26ecfff4b6511084df346ee66fd923522d2750ce5deb894980c7782f5175ebd83a5a401a384f6caa28c1aa436de56660538f417fa6c71d9e4397b6bf4 alertmanager.confd -ab8196d64dd26c74b7eace2a53ba72b5909accb98e82b2796a97940c6cdd5ff5cfda2528f01b9a23aa510ba0e33606890ca00db05c2d695a74e549cfa14e00e8 alertmanager.initd" +58420cf10ed51ec389d21ffdd5b4a0e588f0dc78b1069e32d0db1e0215f64c1c980d8f539ae902839f2f9342090b50ce1db756839f3676ee18b77548ce8f99c8 alertmanager.confd +def36c9933e91a38d863c06679efd840952ba003a839afe5b5c6423fa6ee8f229755f758c5363564b433756af34509fef282b81dea2532500f1287c47c426787 alertmanager.initd" diff --git a/sr.ht/alertmanager/alertmanager.confd b/sr.ht/alertmanager/alertmanager.confd index 5c21c6a..e2304e8 100644 --- a/sr.ht/alertmanager/alertmanager.confd +++ b/sr.ht/alertmanager/alertmanager.confd @@ -1,3 +1,4 @@ +alertmanager_args= alertmanager_config_file=/etc/alertmanager/alertmanager.yml alertmanager_storage_path=/var/lib/alertmanager/data diff --git a/sr.ht/alertmanager/alertmanager.initd b/sr.ht/alertmanager/alertmanager.initd index ca2a840..3359279 100644 --- a/sr.ht/alertmanager/alertmanager.initd +++ b/sr.ht/alertmanager/alertmanager.initd @@ -4,7 +4,8 @@ description="alert manager for the prometheus monitoring system" supervisor=supervise-daemon command=/usr/bin/alertmanager command_args="--config.file=$alertmanager_config_file \ - --storage.path=$alertmanager_storage_path" + --storage.path=$alertmanager_storage_path \ + $alertmanager_args" command_user="prometheus:prometheus" pidfile="/run/${RC_SVCNAME}.pid" -- 2.45.2