From 563e0685d4ed9884c4df7c78f830a97508a8998e Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 8 Jul 2024 10:01:25 +0300
Subject: [PATCH] Metrics fixups

- fix grafana-agent config format
- rekey metrics-push-password for fodwatch
---
 secrets.nix                       |   4 ++--
 secrets/metrics-push-password.age | Bin 579 -> 689 bytes
 services/monitoring/agent.nix     |   2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/secrets.nix b/secrets.nix
index 9e6f070..368ff9d 100644
--- a/secrets.nix
+++ b/secrets.nix
@@ -12,8 +12,8 @@ let
     loki-environment = [ machines.meta01 ];
 
     # These are the same password, but nginx wants it in htpasswd format
-    loki-htpasswd = [ machines.meta01 ];
-    promtail-password = builtins.attrValues machines;
+    metrics-push-htpasswd = [ machines.meta01 ];
+    metrics-push-password = builtins.attrValues machines;
   };
 in
   builtins.listToAttrs (
diff --git a/secrets/metrics-push-password.age b/secrets/metrics-push-password.age
index 00835a924a22c28f316728d862e67e871e1f1cd9..b36ab5d2909b8cb3e1c5f1bab72140548edbe12f 100644
GIT binary patch
literal 689
zcmZ9_JB!nB003|&hq?$pz{w2WVyJmEY5NB`NH1yAq)n41X`60&HP1_%_hWZ;@eAmx
zgTie$xHvh82#0r@a)XNq2M&rLy7%`5e!63~?Z`~(UFL10N87|f3ar&WgwoV)+ZIle
z7=U0_r8g9`&XY1~g2gyjVNOOW5EzYFnTizaN&(_bV#}bPAwZL*mQ^q;yiB5LU{^Rw
zt{PgPVk6=!u|LwhloKelVEsPV35op;i#29bLY#*NxW8S&JC-q0V=>(9W^qDCBxpLK
zgVb)*OZ!4LsTHji5*!xDDi>;ujW?RO>N#HN`=Bzt87##EUE%<VS&ZWL_cxq|DUpJj
zdd<4((ju@RlMQKMJK0!?>WN?`-Q`%XMRDB`?Fmt+M9Uj4h`HaeUTx(7kSIdS)<}!F
zgoWifzgY!4;CBOJNn_6b=Hm$-OOQwEd>3rR4yt1erdZN!;UwvlU}sFGfS4@EC66ma
z)~(A{zQ~8iN7B@=MQ=zWmbPJahvLM(E9~T&9{>U4(W4q37wZ1TcZ}YEf<zfqn7LuR
z%pT>YgNC*ogz`EL%ATAWYb8B406Yx_J2Y*Dg}pWArJs63fs?ChQMeB8&m<&|xN@Uv
zs5u9L8A*LZYqi^Lh(Xn{4kCKqY@?OAEHYyhitK>kNI6is3g=y9G6`1&JDRrc2;bbN
z&rdrSZ(p4}d-(eL<5Thc7xiZJ@!hS<_dk1A-O1UX7biCl{(k>F{CfZL$>FCP4_<!A
To3o4aYd;RY+`V`8``_*VMl<aN

delta 487
zcmV~$JBZU@003YLXAdGb*HIS-OKJ0N28X11_S!s}rcF;!^19?t+B9hzlRtxpA~-mx
z+@|0vI0z0-CoVVZ<mz^l+i|=2eP3@~9=z=>tm%Lqjryt*Bu{NrPe#C=%g#IyaOjr)
zW`$=!t}qZJ2I9#vLx{?Z3e_<#SB$98$0(_-!rF}!Czkf3(>>qCrn{l{?z*$wH*2V+
ztesA3Tk8{aN|1%9gRzK<w$BVLi*#Z=;<3ss5Pf*!TYw9u0!o_}#%0q`%ZY3a**t6}
znz57}v}@2_yxN{WX?2#k1`?hbYnw8p6JKZbraPYZcaWoM&WK8^>s2Nbk;Sp3AU06S
zT7v<^6e`-}j%$tdX5tOWypQe}ty)O2yj-b9kqyp&wmN5=pL_Y9kitn*nm|YusBCzk
z8Bzt6DB3nNd%96~86B<_gd*eZiI=Viavm^)d4vi6B6Pjl8jBgkPqi?iwmLB72xF06
zuXmTKDNa;j=5<S)&kEVbO((7dh|cqZ-MeA{2CDDRGGWVw2y*q=l77^kn7H`z>+Ij*
zEBE2e$D8Z#?V0}^FXYvq+rQtmTMvwH%q8_AJ!rqiiNpI>)rX7DvpdnfPe+emKKlFq
EKP}Lx-v9sr

diff --git a/services/monitoring/agent.nix b/services/monitoring/agent.nix
index 17274ba..5c44126 100644
--- a/services/monitoring/agent.nix
+++ b/services/monitoring/agent.nix
@@ -54,7 +54,7 @@ in
               scrape_configs = lib.mapAttrsToList (name: value: {
                 job_name = name;
                 static_configs = [
-                  { targets = "localhost:" + (toString value.port); }
+                  { targets = [ "localhost:${toString value.port}" ]; }
                 ];
               }) config.bagel.monitoring.grafana-agent.exporters;
             }