CCCHH/ansible-infra
CCCHH/ansible-infra
3
0
Fork 0
Code Issues 4 Pull requests Actions Wiki Activity

Compare commits

base: CCCHH:2e29b78f6ac3a782becbff80c8621f7b2bea50e0
Branches Tags
CCCHH:main
CCCHH:lint_and_ci
CCCHH:cleanup
..
compare: CCCHH:30876f821c4b090a678ff35ff6b9d5dac5b5f183
Branches Tags
CCCHH:lint_and_ci
CCCHH:cleanup
CCCHH:main

No commits in common. "2e29b78f6ac3a782becbff80c8621f7b2bea50e0" and "30876f821c4b090a678ff35ff6b9d5dac5b5f183" have entirely different histories.
2e29b78f6a ... 30876f821c

2 changed files with 1 additions and 3 deletions
Show stats Expand all files Collapse all files

2
playbooks/files/chaosknoten/configs/grafana/docker_compose/prometheus.yml
View file

@ -57,6 +57,7 @@ scrape_configs:
scheme: http scheme: http
static_configs: static_configs:
- targets: - targets:
- jitsi.hamburg.ccc.de:9100 # Node Exporter
- jitsi.hamburg.ccc.de:9888 # Jitsi Video Bridge - jitsi.hamburg.ccc.de:9888 # Jitsi Video Bridge
- job_name: chaosknoten - job_name: chaosknoten
honor_timestamps: true honor_timestamps: true
@ -100,4 +101,3 @@ scrape_configs:
- mjolnir-intern.hamburg.ccc.de:9100 - mjolnir-intern.hamburg.ccc.de:9100
- woodpecker-intern.hamburg.ccc.de:9100 - woodpecker-intern.hamburg.ccc.de:9100
- penpot-intern.hamburg.ccc.de:9100 - penpot-intern.hamburg.ccc.de:9100
- jitsi.hamburg.ccc.de:9100

2
playbooks/templates/chaosknoten/configs/grafana/compose.yaml.j2
View file

@ -25,7 +25,6 @@ services:
volumes: volumes:
- ./configs/alertmanager.yaml:/etc/alertmanager/alertmanager.yaml - ./configs/alertmanager.yaml:/etc/alertmanager/alertmanager.yaml
- ./configs/alertmanager_alert_templates.tmpl:/etc/alertmanager/templates/alert_templates.tmpl - ./configs/alertmanager_alert_templates.tmpl:/etc/alertmanager/templates/alert_templates.tmpl
- alertmanager_data:/alertmanager
grafana: grafana:
image: grafana/grafana image: grafana/grafana
@ -58,4 +57,3 @@ services:
volumes: volumes:
graf_data: {} graf_data: {}
prom_data: {} prom_data: {}
alertmanager_data: {}