From be4b7e46e79d677a7460123a507240a69c7f2a45 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Apr 14 2024 19:17:10 +0000 Subject: Merge branch 'crameleon/postfix-metrics-quiet' into 'production' Silence queue metric checks See merge request infra/salt!1703 --- diff --git a/salt/profile/monitoring/prometheus/files/textfile/scripts/postfix-queue-size-metrics.sh.jinja b/salt/profile/monitoring/prometheus/files/textfile/scripts/postfix-queue-size-metrics.sh.jinja index c783eba..c2e1e98 100644 --- a/salt/profile/monitoring/prometheus/files/textfile/scripts/postfix-queue-size-metrics.sh.jinja +++ b/salt/profile/monitoring/prometheus/files/textfile/scripts/postfix-queue-size-metrics.sh.jinja @@ -3,6 +3,7 @@ # Inspired by https://gitlab.torproject.org/tpo/tpa/grafana-dashboards/-/issues/1 +DEBUG="${DEBUG:-0}" queues='active bounce corrupt deferred flush hold incoming maildrop' spool_dir='/var/spool/postfix' @@ -11,11 +12,11 @@ spool_dir='/var/spool/postfix' do if [ -d "${spool_dir}/${queue}" ] then - >&2 echo "Checking $queue" + [ "$DEBUG" = 1 ] && >&2 echo "Checking $queue" printf 'postfix_queue_length{postfix_instance="postfix", queue="%s"} ' "$queue" find "${spool_dir}/${queue}" -type f -printf \\n | wc -l else - >&2 echo "Skipping $queue" + [ "$DEBUG" = 1 ] && >&2 echo "Skipping $queue" fi done } | sponge /var/spool/prometheus/postfix_queues.prom