Skip to content

Commit 8e3d7f3

Browse files
authored
Merge pull request #50 from redis-field-engineering/feature/kickstart-alerts
2 parents 60c24e5 + 14c94cd commit 8e3d7f3

File tree

4 files changed

+19
-7
lines changed

4 files changed

+19
-7
lines changed

grafana_v2/demo_v2/docker-compose.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ services:
33
image: prom/prometheus:latest
44
volumes:
55
- ./prometheus.yml:/etc/prometheus/prometheus.yml
6+
- ../../prometheus_v2/rules/alerts.yml:/etc/prometheus/rules/alerts.yml
67
ports:
78
- "9090:9090"
89
networks:

grafana_v2/demo_v2/prometheus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ global:
1313

1414
# Load rules once and periodically evaluate them according to the global 'evaluation_interval'.
1515
rule_files:
16-
# - "first_rules.yml"
16+
- "/etc/prometheus/rules/alerts.yml"
1717
# - "second_rules.yml"
1818

1919
# A scrape configuration containing exactly one endpoint to scrape:

grafana_v2/kickstart_v2/docker-compose.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
services:
22
prometheus:
33
image: prom/prometheus:latest
4+
links:
5+
- alertmanager
46
volumes:
57
- ./prometheus.yml:/etc/prometheus/prometheus.yml
8+
- ../../prometheus_v2/rules/alerts.yml:/etc/prometheus/rules/alerts.yml
69
ports:
710
- "9090:9090"
811
networks:
@@ -19,6 +22,14 @@ services:
1922
networks:
2023
kickstart:
2124
ipv4_address: "172.27.2.3"
25+
alertmanager:
26+
image: prom/alertmanager:latest
27+
container_name: alertmanager
28+
ports:
29+
- 9093:9093
30+
networks:
31+
kickstart:
32+
ipv4_address: "172.27.2.4"
2233
networks:
2334
kickstart:
2435
driver: bridge

grafana_v2/kickstart_v2/prometheus.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ global:
55
# scrape_timeout is set to the global default (10s).
66

77
# Alertmanager configuration
8-
#alerting:
9-
# alertmanagers:
10-
# - static_configs:
11-
# - targets:
12-
# - alertmanager:9093
8+
alerting:
9+
alertmanagers:
10+
- static_configs:
11+
- targets:
12+
- alertmanager:9093
1313

1414
# Load rules once and periodically evaluate them according to the global 'evaluation_interval'.
1515
rule_files:
16-
# - "first_rules.yml"
16+
- "/etc/prometheus/rules/alerts.yml"
1717
# - "second_rules.yml"
1818

1919
# A scrape configuration containing exactly one endpoint to scrape:

0 commit comments

Comments
 (0)