From 616ac447396cb99526d604d8d9d56085f983215f Mon Sep 17 00:00:00 2001
From: "Alex Ellis (VMware)" <alexellis2@gmail.com>
Date: Tue, 13 Mar 2018 09:26:32 +0000
Subject: [PATCH] Bump alertmanager to RC version due to bug
Signed-off-by: Alex Ellis (VMware) <alexellis2@gmail.com>
---
docker-compose.yml | 7 +++---
prometheus/alertmanager.yml | 49 +------------------------------------
2 files changed, 5 insertions(+), 51 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index 0cc9975c..c808555b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -104,7 +104,7 @@ services:
# Start monitoring
prometheus:
- image: prom/prometheus:v2.0.0
+ image: prom/prometheus:v2.2.0
environment:
no_proxy: "gateway"
configs:
@@ -131,11 +131,12 @@ services:
memory: 200M
alertmanager:
- image: prom/alertmanager:v0.7.1
+ image: prom/alertmanager:v0.15.0-rc.0
environment:
no_proxy: "gateway"
command:
- - '-config.file=/alertmanager.yml'
+ - '--config.file=/alertmanager.yml'
+ - '--storage.path=/alertmanager'
networks:
- functions
# Uncomment the following port mapping if you wish to expose the Prometheus
diff --git a/prometheus/alertmanager.yml b/prometheus/alertmanager.yml
index 93282307..491c75ff 100644
--- a/prometheus/alertmanager.yml
+++ b/prometheus/alertmanager.yml
@@ -1,69 +1,22 @@
-global:
- # The smarthost and SMTP sender used for mail notifications.
- smtp_smarthost: 'localhost:25'
- smtp_from: 'alertmanager@example.org'
- smtp_auth_username: 'alertmanager'
- smtp_auth_password: 'password'
- # The auth token for Hipchat.
- hipchat_auth_token: '1234556789'
- # Alternative host for Hipchat.
- hipchat_url: 'https://hipchat.foobar.org/'
-
-# The directory from which notification templates are read.
-templates:
-- '/etc/alertmanager/template/*.tmpl'
-
-# The root route on which each incoming alert enters.
route:
- # The labels by which incoming alerts are grouped together. For example,
- # multiple alerts coming in for cluster=A and alertname=LatencyHigh would
- # be batched into a single group.
group_by: ['alertname', 'cluster', 'service']
-
- # When a new group of alerts is created by an incoming alert, wait at
- # least 'group_wait' to send the initial notification.
- # This way ensures that you get multiple alerts for the same group that start
- # firing shortly after another are batched together on the first
- # notification.
group_wait: 5s
-
- # When the first notification was sent, wait 'group_interval' to send a batch
- # of new alerts that started firing for that group.
group_interval: 10s
-
- # If an alert has successfully been sent, wait 'repeat_interval' to
- # resend them.
- repeat_interval: 30s
-
- # A default receiver
+ repeat_interval: 30s
receiver: scale-up
-
- # All the above attributes are inherited by all child routes and can
- # overwritten on each.
-
- # The child route trees.
routes:
- match:
service: gateway
receiver: scale-up
severity: major
-
-
-# Inhibition rules allow to mute a set of alerts given that another alert is
-# firing.
-# We use this to mute any warning-level notifications if the same alert is
-# already critical.
inhibit_rules:
- source_match:
severity: 'critical'
target_match:
severity: 'warning'
- # Apply inhibition if the alertname is the same.
equal: ['alertname', 'cluster', 'service']
-
receivers:
- name: 'scale-up'
webhook_configs:
- url: http://gateway:8080/system/alert
send_resolved: true
-
--
GitLab