From 7db11609b2f1a6d9db0a4a719bfcf6fd607f3e21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Fri, 12 Jun 2020 15:29:11 +0100 Subject: [PATCH] chore(demo): add 3rd alertmanager instance --- demo/generator.py | 4 ++-- demo/karma.yaml | 16 ++++++++++++++-- demo/supervisord.conf | 8 ++++++++ make/docker.mk | 2 +- 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/demo/generator.py b/demo/generator.py index 0681cb551..63cea210b 100755 --- a/demo/generator.py +++ b/demo/generator.py @@ -35,7 +35,7 @@ import time import urllib.request, urllib.error, urllib.parse -APIs = ["http://localhost:9093", "http://localhost:9094"] +APIs = ["http://localhost:9093", "http://localhost:9094", "http://localhost:9095"] MAX_INTERVAL = 10 MIN_INTERVAL = 5 @@ -411,7 +411,7 @@ class PaginationTest(AlertGenerator): severity="warning", job="node_exporter", region="US"), self._annotations(dashboard="https://example.com") - ) for i in range(0, 1000) + ) for i in range(0, 500) ] def silences(self): diff --git a/demo/karma.yaml b/demo/karma.yaml index 85d08eaf1..1b94d4937 100644 --- a/demo/karma.yaml +++ b/demo/karma.yaml @@ -18,6 +18,12 @@ alertmanager: proxy: true cors: credentials: same-origin + - name: single + uri: "http://localhost:9095" + timeout: 10s + proxy: true + cors: + credentials: same-origin alertAcknowledgement: enabled: true duration: 15m0s @@ -31,6 +37,7 @@ custom: debug: true filters: default: + - "@cluster=HA" - "@receiver=by-cluster-service" grid: sorting: @@ -56,9 +63,14 @@ labels: unique: - cluster - instance - - @receiver - - @cluster + - "@receiver" + - "@cluster" custom: + "@cluster": + - value: HA + color: "#70e1e1" + - value: single + color: "#ff6347" region: - value_re: ".*" color: "#736598" diff --git a/demo/supervisord.conf b/demo/supervisord.conf index e5f8aaac0..a8b4ff505 100644 --- a/demo/supervisord.conf +++ b/demo/supervisord.conf @@ -22,6 +22,14 @@ stdout_logfile_maxbytes=0 stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 +[program:alertmanager3] +command=/alertmanager --config.file=/etc/alertmanager.yaml --storage.path=/tmp/alertmanager3 --web.listen-address=:9095 --cluster.listen-address=127.0.0.1:8003 +autorestart=true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 + [program:generator] command=/generator.py autorestart=true diff --git a/make/docker.mk b/make/docker.mk index 992bf42e7..78052aef2 100644 --- a/make/docker.mk +++ b/make/docker.mk @@ -8,4 +8,4 @@ docker-image: run-demo: docker build --build-arg VERSION=$(VERSION) -t $(NAME):demo -f demo/Dockerfile . @docker rm -f $(NAME)-demo || true - docker run --rm --name $(NAME)-demo -p 8080:8080 -p 9093:9093 -p 9094:9094 $(NAME):demo + docker run --rm --name $(NAME)-demo -p 8080:8080 -p 9093:9093 -p 9094:9094 -p 9095:9095 $(NAME):demo