diff --git a/secrets/passwords.yaml b/secrets/passwords.yaml index 3f192a7..e670e9d 100644 --- a/secrets/passwords.yaml +++ b/secrets/passwords.yaml @@ -14,8 +14,8 @@ services: nginx: ENC[AES256_GCM,data:1vQE9z+w6RGwFK8mOuhzW3NArwthEcY/c/yQzAA6IwXtsDuxu7AS11M=,iv:jMtkHRR/+DVX1FREGUVTSTVUUUzOpjrLbNabHnw8Dq0=,tag:HbtQyuLlW5AbYqYDrtrbJA==,type:str] vyos: vyos: ENC[AES256_GCM,data:IUeOs7fPj008Iz31QLC7iCxG5wQ=,iv:FlZcvasmJBR3l6Pk1DELgF0f/lBfrxxoS6jeRsGunmQ=,tag:CMZr2AvzxDO3Vo1FKzoQtw==,type:str] - telegram_bot: - token: ENC[AES256_GCM,data:fdjeYTIES8Ur6LXI5Ix+QVa4q488QdUNaVjGytGUFf9uuGfe6hqHChYM0UKZhA==,iv:/LDYrngYw/bBWata7qrxaGDKhM3yAOrP32FaAOGAeWg=,tag:12htPWas6JvBfFEjbYCG7g==,type:str] + telegrambot: + token: ENC[AES256_GCM,data:z4petJLrEzU2Wtc86t6M+DTa9wcc3nI8thPU3l8aTA9HKC7VLSgH2B3D6McN4uA=,iv:7drqfGluodIxbpl6wJ6S+aD0g7Oy79/C+D4jgwW/iLM=,tag:WIPg3Gbs4VQB7sQUEdJJ+g==,type:str] juniperswitches: root: ENC[AES256_GCM,data:EpYwKI9TJ+6TUlIwSbIDhmOAgJD38+RI,iv:bJq0Bnr7SdvGRXR141+rKpZxi1jWO+efUcZDLFkdMcY=,tag:WgN15gUMdawEj92TZOss7g==,type:str] hardware: @@ -100,7 +100,7 @@ sops: V2IwTDgvaTVwU1JSYnppQzIrb3RsT3MKrYBsN/2DHCT49ilW8KGjqVmNXcjqtWVl TGsxv+tZdzR/f4y55j9XKObjxBTALiLGoa/Wy2eqHM6i7k6jvXI5eA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-04-18T22:14:33Z" - mac: ENC[AES256_GCM,data:lK59/ig4lIovjErFkyKu8x4TemuQ/sXfO8Ybo0n1eLbfJAolraEzlHoALmhcUB7PRG5ll2uiBjhIutWsPPe5hjCezzVDHEM4aN/qkJqINvNOEj/vdbHm8s6jsMwc7XC5X7tr8kVicrfZJBnLC2YvNXQ0nKZD1qT7QW18GZEGEhQ=,iv:c8y9UPOJsrkuQVr+qWH/SnSNKcBrb7LZ4sA/1vxCbGo=,tag:LGo89zXkZ+z5WtJlAsVuTg==,type:str] + lastmodified: "2025-04-17T10:43:07Z" + mac: ENC[AES256_GCM,data:n2IGcbD4huMjxPk+A5rQZrGGRZwuLxkDu4H/lIj2r/IWi4B77ivzTdL4hafQ+yk3UNg2m5IVrVwqZAIDXDCY6mDAMUmpHsTDPo2ApME0x1IBkEKvrUH6uKFIPRjHIwP+5oPCREhQNhCokPHdbV37ZSC49Q+jof3gTxdq7Phr4zQ=,iv:b35D4VnzlBwig+yrWYSIaghy0vLPs1ll75wwZhehWKw=,tag:nQj8d4kr8k6pysu3KASmqg==,type:str] unencrypted_suffix: _unencrypted version: 3.10.1 diff --git a/systems/monitoring.noc.eh22.intern/alloy-conf.nix b/systems/monitoring.noc.eh22.intern/alloy-conf.nix index 5dc1400..9079c50 100644 --- a/systems/monitoring.noc.eh22.intern/alloy-conf.nix +++ b/systems/monitoring.noc.eh22.intern/alloy-conf.nix @@ -31,10 +31,6 @@ target_label = "component" replacement = "telegraf-prometheus-client" } - rule { - target_label = "job" - replacement = "telegraf-prometheus-client" - } } ''; }; diff --git a/systems/monitoring.noc.eh22.intern/mimir.nix b/systems/monitoring.noc.eh22.intern/mimir.nix index 8dd7c08..1936ae2 100644 --- a/systems/monitoring.noc.eh22.intern/mimir.nix +++ b/systems/monitoring.noc.eh22.intern/mimir.nix @@ -70,14 +70,14 @@ in receiver = "telegram"; group_wait = "45s"; group_interval = "3m"; - repeat_interval = "30m"; + repeat_interval = "45m"; }; receivers = [ { name = "telegram"; telegram_configs = [ { - bot_token_file = config.sops.secrets."services/telegram_bot/token".path; + bot_token_file = config.sops.secrets."services/telegrambot/token".path; chat_id = -1002579132187; } ]; diff --git a/systems/monitoring.noc.eh22.intern/pve-exporter.nix b/systems/monitoring.noc.eh22.intern/pve-exporter.nix index 6c89216..c660b73 100644 --- a/systems/monitoring.noc.eh22.intern/pve-exporter.nix +++ b/systems/monitoring.noc.eh22.intern/pve-exporter.nix @@ -38,11 +38,11 @@ metrics_path = "/pve" params = { - "target" = ["proxmox.noc.eh22.intern"], + "target" = ["94.45.255.1"], "module" = ["default"], } - scrape_interval = "15s" + scrape_interval = "10s" forward_to = [prometheus.relabel.pve.receiver] } diff --git a/systems/monitoring.noc.eh22.intern/system.nix b/systems/monitoring.noc.eh22.intern/system.nix index a9fb869..5af61e4 100644 --- a/systems/monitoring.noc.eh22.intern/system.nix +++ b/systems/monitoring.noc.eh22.intern/system.nix @@ -32,7 +32,7 @@ group = "nginx"; restartUnits = [ "nginx.service" ]; }; - secrets."services/telegram_bot/token" = { + secrets."services/telegrambot/token" = { mode = "0444"; owner = "root"; group = "root";