CCCHH/ansible-infra
CCCHH/ansible-infra
4
2
Fork 1
Code Issues 4 Pull requests 1 Wiki Activity Actions

Compare commits

base: CCCHH:0c9e3ccb87a570a8b627096c2527ed732e5a8501
Branches Tags
CCCHH:main
CCCHH:feature/add-new-router
CCCHH:router-killing-turing
CCCHH:fux-alerts
CCCHH:ansible_pull
CCCHH:move_to_sops
..
compare: CCCHH:e183f1a2c3b6516a640d61eeb9dc46038ea0c21b
Branches Tags
CCCHH:feature/add-new-router
CCCHH:router-killing-turing
CCCHH:main
CCCHH:fux-alerts
CCCHH:ansible_pull
CCCHH:move_to_sops

No commits in common. "0c9e3ccb87a570a8b627096c2527ed732e5a8501" and "e183f1a2c3b6516a640d61eeb9dc46038ea0c21b" have entirely different histories.
0c9e3ccb87 ... e183f1a2c3

3 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
inventories/chaosknoten/host_vars/grafana.yaml
View file

@ -104,8 +104,8 @@ alloy_config: |
prometheus.relabel "default" { prometheus.relabel "default" {
forward_to = [prometheus.remote_write.default.receiver] forward_to = [prometheus.remote_write.default.receiver]
rule { rule {
target_label = "org" replacement = "org"
replacement = "ccchh" target_label = "ccchh"
} }
rule { rule {
target_label = "host" target_label = "host"

2
resources/chaosknoten/grafana/nginx/metrics.hamburg.ccc.de.conf
View file

@ -7,8 +7,6 @@ server {
# Z9 # Z9
allow 2a07:c480:0:100::/56; allow 2a07:c480:0:100::/56;
allow 2a07:c481:1::/48; allow 2a07:c481:1::/48;
# fuxnoc
allow 2a07:c481:0:1::/64;
deny all; deny all;
listen [2a00:14b0:4200:3380:0000:5a5f:1dbc:6a39]:443 ssl; listen [2a00:14b0:4200:3380:0000:5a5f:1dbc:6a39]:443 ssl;

1
resources/chaosknoten/grafana/nginx/metrics.htpasswd.j2
View file

@ -1,2 +1 @@
chaos:{{ lookup("community.general.passwordstore", "noc/vm-secrets/chaosknoten/grafana/metrics_chaos_basic_auth", create=false, missing="error") }} chaos:{{ lookup("community.general.passwordstore", "noc/vm-secrets/chaosknoten/grafana/metrics_chaos_basic_auth", create=false, missing="error") }}
fux:{{ lookup("community.general.passwordstore", "noc/vm-secrets/chaosknoten/grafana/metrics_fux_basic_auth", create=false, missing="error") }}