tom/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

a

Browse source
This commit is contained in:
ahmadbilalkhalid 2019-10-04 17:58:18 +05:00
parent 25ca70f338
commit 7c987513f1
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -30,6 +30,7 @@ if [ -f "$__object/parameter/install-from-backports" ]; then
*) *)
echo "--install-from-backports is only supported on Devuan -- ignoring." >&2 echo "--install-from-backports is only supported on Devuan -- ignoring." >&2
echo "Send a pull request if you require it." >&2 echo "Send a pull request if you require it." >&2
exit 1
;; ;;
esac esac
else else
@ -60,5 +61,5 @@ require="$require __directory/$storage_path $require_pkg" \
__config_file $CONF \ __config_file $CONF \
--source "$config" \ --source "$config" \
--group prometheus --mode 640 \ --group prometheus --mode 640 \
--onchange "service prometheus-alertmanager reload" # TODO when a config-check tool is available, check config here --onchange "service prometheus-alertmanager restart" # TODO when a config-check tool is available, check config here

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

@ -33,11 +33,13 @@ if [ -f "$__object/parameter/install-from-backports" ]; then
*) *)
echo "--install-from-backports is only supported on Devuan -- ignoring." >&2 echo "--install-from-backports is only supported on Devuan -- ignoring." >&2
echo "Send a pull request if you require it." >&2 echo "Send a pull request if you require it." >&2
exit 1
;; ;;
esac esac
else else
__package prometheus __package prometheus
require_pkg="__package/prometheus" __package prometheus-blackbox-exporter
require_pkg="__package/prometheus __package/prometheus-blackbox-exporter"
fi fi
##### PREPARE PATHS AND SUCH ################################################ ##### PREPARE PATHS AND SUCH ################################################
@ -58,7 +60,7 @@ require="$require __directory/$storage_path $require_pkg" \
__config_file $CONF \ __config_file $CONF \
--source "$config" \ --source "$config" \
--group prometheus --mode 640 \ --group prometheus --mode 640 \
--onchange "promtool check config $CONF && service prometheus reload" --onchange "promtool check config $CONF && service prometheus restart"
for file in $rule_files; do for file in $rule_files; do
dest=$CONF_DIR/$(basename "$file") dest=$CONF_DIR/$(basename "$file")
@ -66,6 +68,6 @@ for file in $rule_files; do
__config_file "$dest" \ __config_file "$dest" \
--source "$file" \ --source "$file" \
--owner prometheus \ --owner prometheus \
--onchange "promtool check rules '$dest' && service prometheus reload" --onchange "promtool check rules '$dest' && service prometheus restart"
done done