Merge pull request #194 from appuio/silence-duration

Expire silences after one day instead of one year
appuio · Mar 28, 2024 · 735dbbb · 735dbbb
2 parents 3225f0f + b70457c
commit 735dbbb
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 13 deletions.
diff --git a/component/scripts/silence.sh b/component/scripts/silence.sh
@@ -9,7 +9,7 @@ while IFS= read -r silence; do
   body=$(printf %s "$silence" | \
     jq \
       --arg startsAt "$(date -u +'%Y-%m-%dT%H:%M:%S' --date '-1 min')" \
-      --arg endsAt "$(date -u +'%Y-%m-%dT%H:%M:%S' --date '+1 year')" \
+      --arg endsAt "$(date -u +'%Y-%m-%dT%H:%M:%S' --date '+1 day')" \
       --arg createdBy "Kubernetes object \`cronjob/silence\` in the monitoring namespace" \
       '.startsAt = $startsAt | .endsAt = $endsAt | .createdBy = $createdBy'
   )

diff --git a/docs/modules/ROOT/pages/references/parameters.adoc b/docs/modules/ROOT/pages/references/parameters.adoc
@@ -534,7 +534,7 @@ default::
 Contains the list of silences to be applied.
 The key is used as the comment of the silence and the value is a dictionary which is passed to Alertmanager.
 
-Silences removed from the hierarchy stay active in Alertmanager for up to a year until they expire.
+Silences removed from the hierarchy stay active in Alertmanager for up to 24h until they expire.
 
 Silences all non-SYN alerts by default.
 

diff --git a/...capacity-alerts-with-node-labels/openshift4-monitoring/openshift4-monitoring/silence.yaml b/...capacity-alerts-with-node-labels/openshift4-monitoring/openshift4-monitoring/silence.yaml
@@ -12,7 +12,7 @@ data:
       body=$(printf %s "$silence" | \
         jq \
           --arg startsAt "$(date -u +'%Y-%m-%dT%H:%M:%S' --date '-1 min')" \
-          --arg endsAt "$(date -u +'%Y-%m-%dT%H:%M:%S' --date '+1 year')" \
+          --arg endsAt "$(date -u +'%Y-%m-%dT%H:%M:%S' --date '+1 day')" \
           --arg createdBy "Kubernetes object \`cronjob/silence\` in the monitoring namespace" \
           '.startsAt = $startsAt | .endsAt = $endsAt | .createdBy = $createdBy'
       )

diff --git a/tests/golden/capacity-alerts/openshift4-monitoring/openshift4-monitoring/silence.yaml b/tests/golden/capacity-alerts/openshift4-monitoring/openshift4-monitoring/silence.yaml
@@ -12,7 +12,7 @@ data:
       body=$(printf %s "$silence" | \
         jq \
           --arg startsAt "$(date -u +'%Y-%m-%dT%H:%M:%S' --date '-1 min')" \
-          --arg endsAt "$(date -u +'%Y-%m-%dT%H:%M:%S' --date '+1 year')" \
+          --arg endsAt "$(date -u +'%Y-%m-%dT%H:%M:%S' --date '+1 day')" \
           --arg createdBy "Kubernetes object \`cronjob/silence\` in the monitoring namespace" \
           '.startsAt = $startsAt | .endsAt = $endsAt | .createdBy = $createdBy'
       )

diff --git a/tests/golden/custom-rules/openshift4-monitoring/openshift4-monitoring/silence.yaml b/tests/golden/custom-rules/openshift4-monitoring/openshift4-monitoring/silence.yaml
@@ -12,7 +12,7 @@ data:
       body=$(printf %s "$silence" | \
         jq \
           --arg startsAt "$(date -u +'%Y-%m-%dT%H:%M:%S' --date '-1 min')" \
-          --arg endsAt "$(date -u +'%Y-%m-%dT%H:%M:%S' --date '+1 year')" \
+          --arg endsAt "$(date -u +'%Y-%m-%dT%H:%M:%S' --date '+1 day')" \
           --arg createdBy "Kubernetes object \`cronjob/silence\` in the monitoring namespace" \
           '.startsAt = $startsAt | .endsAt = $endsAt | .createdBy = $createdBy'
       )

diff --git a/tests/golden/release-4.11/openshift4-monitoring/openshift4-monitoring/silence.yaml b/tests/golden/release-4.11/openshift4-monitoring/openshift4-monitoring/silence.yaml
@@ -12,7 +12,7 @@ data:
       body=$(printf %s "$silence" | \
         jq \
           --arg startsAt "$(date -u +'%Y-%m-%dT%H:%M:%S' --date '-1 min')" \
-          --arg endsAt "$(date -u +'%Y-%m-%dT%H:%M:%S' --date '+1 year')" \
+          --arg endsAt "$(date -u +'%Y-%m-%dT%H:%M:%S' --date '+1 day')" \
           --arg createdBy "Kubernetes object \`cronjob/silence\` in the monitoring namespace" \
           '.startsAt = $startsAt | .endsAt = $endsAt | .createdBy = $createdBy'
       )

diff --git a/tests/golden/release-4.12/openshift4-monitoring/openshift4-monitoring/silence.yaml b/tests/golden/release-4.12/openshift4-monitoring/openshift4-monitoring/silence.yaml
@@ -12,7 +12,7 @@ data:
       body=$(printf %s "$silence" | \
         jq \
           --arg startsAt "$(date -u +'%Y-%m-%dT%H:%M:%S' --date '-1 min')" \
-          --arg endsAt "$(date -u +'%Y-%m-%dT%H:%M:%S' --date '+1 year')" \
+          --arg endsAt "$(date -u +'%Y-%m-%dT%H:%M:%S' --date '+1 day')" \
           --arg createdBy "Kubernetes object \`cronjob/silence\` in the monitoring namespace" \
           '.startsAt = $startsAt | .endsAt = $endsAt | .createdBy = $createdBy'
       )

diff --git a/tests/golden/release-4.13/openshift4-monitoring/openshift4-monitoring/silence.yaml b/tests/golden/release-4.13/openshift4-monitoring/openshift4-monitoring/silence.yaml
@@ -12,7 +12,7 @@ data:
       body=$(printf %s "$silence" | \
         jq \
           --arg startsAt "$(date -u +'%Y-%m-%dT%H:%M:%S' --date '-1 min')" \
-          --arg endsAt "$(date -u +'%Y-%m-%dT%H:%M:%S' --date '+1 year')" \
+          --arg endsAt "$(date -u +'%Y-%m-%dT%H:%M:%S' --date '+1 day')" \
           --arg createdBy "Kubernetes object \`cronjob/silence\` in the monitoring namespace" \
           '.startsAt = $startsAt | .endsAt = $endsAt | .createdBy = $createdBy'
       )

diff --git a/tests/golden/release-4.14/openshift4-monitoring/openshift4-monitoring/silence.yaml b/tests/golden/release-4.14/openshift4-monitoring/openshift4-monitoring/silence.yaml
@@ -12,7 +12,7 @@ data:
       body=$(printf %s "$silence" | \
         jq \
           --arg startsAt "$(date -u +'%Y-%m-%dT%H:%M:%S' --date '-1 min')" \
-          --arg endsAt "$(date -u +'%Y-%m-%dT%H:%M:%S' --date '+1 year')" \
+          --arg endsAt "$(date -u +'%Y-%m-%dT%H:%M:%S' --date '+1 day')" \
           --arg createdBy "Kubernetes object \`cronjob/silence\` in the monitoring namespace" \
           '.startsAt = $startsAt | .endsAt = $endsAt | .createdBy = $createdBy'
       )

diff --git a/tests/golden/remote-write/openshift4-monitoring/openshift4-monitoring/silence.yaml b/tests/golden/remote-write/openshift4-monitoring/openshift4-monitoring/silence.yaml
@@ -12,7 +12,7 @@ data:
       body=$(printf %s "$silence" | \
         jq \
           --arg startsAt "$(date -u +'%Y-%m-%dT%H:%M:%S' --date '-1 min')" \
-          --arg endsAt "$(date -u +'%Y-%m-%dT%H:%M:%S' --date '+1 year')" \
+          --arg endsAt "$(date -u +'%Y-%m-%dT%H:%M:%S' --date '+1 day')" \
           --arg createdBy "Kubernetes object \`cronjob/silence\` in the monitoring namespace" \
           '.startsAt = $startsAt | .endsAt = $endsAt | .createdBy = $createdBy'
       )

diff --git a/tests/golden/team-routing/openshift4-monitoring/openshift4-monitoring/silence.yaml b/tests/golden/team-routing/openshift4-monitoring/openshift4-monitoring/silence.yaml
@@ -12,7 +12,7 @@ data:
       body=$(printf %s "$silence" | \
         jq \
           --arg startsAt "$(date -u +'%Y-%m-%dT%H:%M:%S' --date '-1 min')" \
-          --arg endsAt "$(date -u +'%Y-%m-%dT%H:%M:%S' --date '+1 year')" \
+          --arg endsAt "$(date -u +'%Y-%m-%dT%H:%M:%S' --date '+1 day')" \
           --arg createdBy "Kubernetes object \`cronjob/silence\` in the monitoring namespace" \
           '.startsAt = $startsAt | .endsAt = $endsAt | .createdBy = $createdBy'
       )

diff --git a/.../golden/user-workload-monitoring/openshift4-monitoring/openshift4-monitoring/silence.yaml b/.../golden/user-workload-monitoring/openshift4-monitoring/openshift4-monitoring/silence.yaml
@@ -12,7 +12,7 @@ data:
       body=$(printf %s "$silence" | \
         jq \
           --arg startsAt "$(date -u +'%Y-%m-%dT%H:%M:%S' --date '-1 min')" \
-          --arg endsAt "$(date -u +'%Y-%m-%dT%H:%M:%S' --date '+1 year')" \
+          --arg endsAt "$(date -u +'%Y-%m-%dT%H:%M:%S' --date '+1 day')" \
           --arg createdBy "Kubernetes object \`cronjob/silence\` in the monitoring namespace" \
           '.startsAt = $startsAt | .endsAt = $endsAt | .createdBy = $createdBy'
       )

diff --git a/tests/golden/vsphere/openshift4-monitoring/openshift4-monitoring/silence.yaml b/tests/golden/vsphere/openshift4-monitoring/openshift4-monitoring/silence.yaml
@@ -12,7 +12,7 @@ data:
       body=$(printf %s "$silence" | \
         jq \
           --arg startsAt "$(date -u +'%Y-%m-%dT%H:%M:%S' --date '-1 min')" \
-          --arg endsAt "$(date -u +'%Y-%m-%dT%H:%M:%S' --date '+1 year')" \
+          --arg endsAt "$(date -u +'%Y-%m-%dT%H:%M:%S' --date '+1 day')" \
           --arg createdBy "Kubernetes object \`cronjob/silence\` in the monitoring namespace" \
           '.startsAt = $startsAt | .endsAt = $endsAt | .createdBy = $createdBy'
       )