Skip to content

Commit 3708eec

Browse files
authored
Move webhook_config to the slack-alerts-ticket receiver for Alertmanager (#1095)
* Moves webhook_config to the slack-alerts-ticket receiver When I added the slack-fyis receiver last year I accidentally moved the webhook_config section of the slack-alerts-ticket receiver to the new slack-fyis receiver. The outcome is that alerts stopped being routed to the alertmanager-github-receiver service which is responsible for creating Github issuse in the ops-tracker repository for production alerts. * Updates configmap-reload container to 0.9.0 in alertmanager pod A while ago when I updated the Alertmanager config, the build updated the Alertmanager configmap. When the configmap-reload container noticed the configmap was updated it tried to restart the Alertmanager container, but got "x509: certificate signed by unknown authority". This used to work, so I'm not sure what changed. I'm attempting to update the configmap-reload container in the hope that perhaps the maintainer perhaps updated the ca-certificates in the container image. * Updates configmap-reload in alertmanager pod to v0.15.0 The previous commit (@530986f) updated configmap-reload to 0.9.0, but I then realized that the repo was no longer publishing updated images to Docker Hub, but instead to Github Container Registry. This commit changes the image repo and updates to the latest. With this update in place, reloads are now working again. * Updates a comment to reflect ghcr.io instead of hub.docker.com
1 parent e869047 commit 3708eec

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

config/federation/alertmanager/config.yml.template

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,10 @@ receivers:
142142
{{- printf "}" | urlquery }}
143143
{{- end -}}
144144

145+
# All alerts sent to slack are also sent to the github webhook receiver.
146+
webhook_configs:
147+
- url: '{{GITHUB_RECEIVER_URL}}'
148+
145149
- name: 'slack-fyis'
146150
slack_configs:
147151
- send_resolved: false
@@ -187,10 +191,6 @@ receivers:
187191
{{- printf "}" | urlquery }}
188192
{{- end -}}
189193

190-
# All alerts sent to slack are also sent to the github webhook receiver.
191-
webhook_configs:
192-
- url: '{{GITHUB_RECEIVER_URL}}'
193-
194194
- name: 'pagerduty-pages'
195195
pagerduty_configs:
196196
- send_resolved: true

k8s/prometheus-federation/deployments/alertmanager.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ spec:
5656
- mountPath: /etc/alertmanager
5757
name: alertmanager-config
5858

59-
# Check https://hub.docker.com/r/jimmidyson/configmap-reload/tags/ for the current
59+
# Check https://ghcr.io/jimmidyson/configmap-reload/tags/ for the current
6060
# stable version.
61-
- image: jimmidyson/configmap-reload:v0.7.1
61+
- image: ghcr.io/jimmidyson/configmap-reload:v0.15.0
6262
name: configmap-reload
6363
args: ["-webhook-url", "$(ALERTMGR_RELOAD_URL)", "-volume-dir", "/alertmanager-config"]
6464
env:

0 commit comments

Comments
 (0)