matthijs/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

fixes to __prometheus_{server,alertmanager} (#565)

Browse source
This commit is contained in:
kamila 2017-09-02 21:22:33 +02:00 committed by Darko Poljak
parent 0043b3f4b0
commit 7564038f04
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cdist/conf/type/__prometheus_alertmanager/manifest
View file

@ -21,8 +21,8 @@ REAL_FLAGS="$(echo "$FLAGS" | sed -nE 's/^([^#]+).*/ --\1 \\/p')"
__go_get github.com/prometheus/alertmanager/cmd/... __go_get github.com/prometheus/alertmanager/cmd/...
__user prometheus --system __user prometheus --system
require="__user/prometheus" __directory "$storage_path" --owner prometheus require="__user/prometheus" __directory "$storage_path" --owner prometheus --parents
require="__user/prometheus" __directory "$CONF_DIR" --owner prometheus require="__user/prometheus" __directory "$CONF_DIR" --owner prometheus --parents
__daemontools_service alertmanager --run "setuidgid prometheus $GOBIN/alertmanager $REAL_FLAGS" __daemontools_service alertmanager --run "setuidgid prometheus $GOBIN/alertmanager $REAL_FLAGS"
@ -30,4 +30,5 @@ require="$require __directory/$storage_path __user/prometheus" \
__config_file $CONF \ __config_file $CONF \
--source $config \ --source $config \
--group prometheus --mode 640 \ --group prometheus --mode 640 \
--onchange "$ONCHANGE" --onchange "svc -h /service/alertmanager" # TODO when a config-check tool is available, check config here

4
cdist/conf/type/__prometheus_server/manifest
View file

@ -30,8 +30,8 @@ REAL_FLAGS="$(echo "$FLAGS" | sed -nE 's/^([^#]+).*/ --\1 \\/p')"
__go_get github.com/prometheus/prometheus/cmd/... __go_get github.com/prometheus/prometheus/cmd/...
__user prometheus --system __user prometheus --system
require="__user/prometheus" __directory "$storage_path" --owner prometheus require="__user/prometheus" __directory "$storage_path" --owner prometheus --parents
require="__user/prometheus" __directory "$CONF_DIR" --owner prometheus require="__user/prometheus" __directory "$CONF_DIR" --owner prometheus --parents
__daemontools_service prometheus --run "setuidgid prometheus $GOBIN/prometheus $REAL_FLAGS" __daemontools_service prometheus --run "setuidgid prometheus $GOBIN/prometheus $REAL_FLAGS"