From 69aae2ec9d248eba20ae0c548564d9680b4331bc Mon Sep 17 00:00:00 2001 From: Viktor Barzin Date: Fri, 13 Feb 2026 23:08:44 +0000 Subject: [PATCH] [ci skip] Fix code review findings: correct Alertmanager URL, add atomic to Loki, remove dead minio NFS export, update design doc --- ...02-13-centralized-log-collection-design.md | 6 +++--- modules/kubernetes/monitoring/loki.tf | 1 + modules/kubernetes/monitoring/loki.yaml | 2 +- secrets/nfs_directories.txt | Bin 1634 -> 1623 bytes 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/plans/2026-02-13-centralized-log-collection-design.md b/docs/plans/2026-02-13-centralized-log-collection-design.md index 60940345..5f8ca12c 100644 --- a/docs/plans/2026-02-13-centralized-log-collection-design.md +++ b/docs/plans/2026-02-13-centralized-log-collection-design.md @@ -62,7 +62,7 @@ Single-binary deployment. Existing Helm chart config in `loki.yaml`, updated wit **Ruler:** - Evaluates LogQL alert rules in real-time (before chunk flush) -- Fires to `http://alertmanager.monitoring.svc.cluster.local:9093` +- Fires to `http://prometheus-alertmanager.monitoring.svc.cluster.local:9093` **Storage:** - NFS PV/PVC at `/mnt/main/loki/loki` (15Gi, existing) @@ -70,7 +70,7 @@ Single-binary deployment. Existing Helm chart config in `loki.yaml`, updated wit **Resources:** - Memory: 6Gi limit -- CPU: 500m limit +- CPU: 1 limit ### 3. Alloy (Helm Release) @@ -82,7 +82,7 @@ DaemonSet log collector. Existing config in `alloy.yaml` is complete: **Resources per pod:** - Memory: 128Mi limit -- CPU: 100m limit +- CPU: 200m limit ### 4. Grafana Datasource diff --git a/modules/kubernetes/monitoring/loki.tf b/modules/kubernetes/monitoring/loki.tf index b6446d09..a638cc3e 100644 --- a/modules/kubernetes/monitoring/loki.tf +++ b/modules/kubernetes/monitoring/loki.tf @@ -7,6 +7,7 @@ resource "helm_release" "loki" { chart = "loki" values = [templatefile("${path.module}/loki.yaml", {})] + atomic = true timeout = 300 depends_on = [kubernetes_config_map.loki_alert_rules] diff --git a/modules/kubernetes/monitoring/loki.yaml b/modules/kubernetes/monitoring/loki.yaml index 06bb8765..00ab5da5 100644 --- a/modules/kubernetes/monitoring/loki.yaml +++ b/modules/kubernetes/monitoring/loki.yaml @@ -34,7 +34,7 @@ loki: type: local local: directory: /loki/rules - alertmanager_url: http://alertmanager.monitoring.svc.cluster.local:9093 + alertmanager_url: http://prometheus-alertmanager.monitoring.svc.cluster.local:9093 ring: kvstore: store: inmemory diff --git a/secrets/nfs_directories.txt b/secrets/nfs_directories.txt index 17e83a1d87b70b6292db4ecbc1a42aadf06050a4..d99f3aacdafb397a9b299cf35fcff9e30844636e 100644 GIT binary patch literal 1623 zcmV-d2B`S}M@dveQdv+`0AH;WV;xtw7t+}OT{YaiK`!^}Nagh3OIMNvdv zrM&71bfq{7u~-Bw5^}wu@!T5PnLiPC(EYS2@P+|4Hz1YI_wOO#Dm}cJP;w?%{ipvq z{d-}67ZwAkJvg0(19U>UaXJsJryPp7-YVe4#(^B2oooPdNiN-SFof5o6p0}^8&Y6m zfCpTjo#(9%c{5-;?bWIgCpArLnqM&x=R>LP>+r$?BJFPE=z;q zh!F`OAnSh%A}~fe<_f1$TsSi<^nNUxGNF1!9?6<#oz)Rg6!>}j;rrkW+F#bnk>bEV z#E%39?r?r<5-(~+(9eCxKTJ@<28rC3`BwR4_`&?v_!|(2u6{l{<2LX|$J8Md5i*Wq zKOzvf^lwuaKa3bpL*~&djr#7q*cQVn+QE+Yu_h^FQR$ny+>B*^X*7hK5qZXMf*XFt z)Bnt_dwYocSgH7*JGyM@IHgBr+?q3X?8jV9IkYj5rSx48;LC8&hcobc!^Y58!9VdN znpt+s)uoQk^jsjG@83?AxuBiRJ1tVgU)+RKGAg7e%(S1*?Gah=a8cnJ~2C4SaXoje{m_^K}YkWAft4zw-U z6P3T2P=3bXvQ(SUiz`$oBv@v6T)rtQV*1x&o@Y>Fu$hysvq&>n|2FYS79(eF69pup z2)M<}{};MtVQ3ybnz$=(nuD7!_TlgP!7M2jRr@43UY+XG3-@jKyt*aQ!b&CCNh;nc zBXQzFMcBctK)V^R~!p5E9 zA;5G|k$s|$9OXQMy|JG~RogUL81y5T`rPDnpEjIM$yOZs;k!X4wYu(cFUP!hg=O&! z$jM@xlN%*C;*i9f0@1_6=w-eQKqowvIPQdBcs9wDHYt~mync)fa9j6LM+GABkqVh2 zN75jzDzl1NKYh-hh(V_XFFuW0?r%If*em;-C82*Ufs(LZJoZN4Ggx!J<3d=`X(BYi}jFx>k`EXkWeeb@3 z3b?jS(lsZv+b?f?P@d&Ep6InV|7U5urU-fH62w}MrUI(!V&i8eOi?&hzt5Cril|!w zdZO|xCMRRcute_NxzfIf#@WhO-S`ei=@>&h=fjEMdkI2<#u{Cv-jaJU4%%EYgUTmF zd)5wnaYyvKR`f(Y|BRbX$GTv+!N&@6-KH#j7UhBd@OOyzT? zj1c<1qH|}_e27ke7NdjnHvqgoD5jisc`!k5@}TVXBuh^@JcCTUYaW VVQV?B_3XpZ5bIcYR6?SDV6XPYAS?g? literal 1634 zcmV-o2A%l;M@dveQdv+`06R;7ioxT+R9(QlcN#dDG_=~dS4s#9Gaf1he zG8eCp?BY%Ok|A=Z(Crb~y_olgilhe{vZ@jio$8dipjk0vQ{6eXzcJg(t!JR(Rvuuf zz!Q3Qn`4isrI{2FT>>Hm`duV={d^Vek zh_o)T^Q2Gh_W$md1>sB#N$-Kyt6f#K^tqG}{1g9hV&)eH5l3KkCbXCx9tmL-%BE)u zD}`Q5mK7!klF<_#BGOkQIQH8Abt#AcQK1SDs6*djv~xn*&xQ3Lm1Yw<8|}doFDicXb_GJ6Ghu1GM?niqm>T+Jdgh*A z{tQW!G{o`uHLWWn=g#A)MSm{zr2`5^meLFolZjJb?=Pbdu{TUiw=eX(52(UwEX>b| z0Q~Z$^tdy$x3VgH{PIk7N4~~Dg*LA6hD+HeFXY{VZBwFg`q>sR68NrtT5z82=%m)1 zl<2s8IieRlCwp+%L@ARK+^uTnL)Z%|ENVmo@=Uz$Q{^3Dm>RrPx&L2c&YFAExT&Ls zzNr>W0@ILk5F?_b0_M^;4srr7NvqAPygM*7dc0)qw3*ZdNQ)Q*^Bv9#Q$1G&?AT|x zEpOO*e_Ejr_Ij6hTgQ&FDILDsSe|EKkApj&z=IE%AXwdES?D`(IG-MP7hYsa75_Uo zt+8l5lYuPc7w&UCNC!Fm&n@HNb&AzeEt@HINNeL*?x&-}aQgkpzU1?j*_@qRb?S`M zWlG6(`IQ1_B8`0H3ft1@-_TDqA4dl)Q9AYn2ep;vOjRJvaW$f1^eaRCoYvgwBEh+k zVD^V!@mKX$iNMoz_;-0xX2Uh(o?%PHo)35WuNEAVvqjxRm(NjB@({>|&lBvxUxi!ijUEP(=GSEbDeJP9uU{uN z-qf<3`V^&df*f*li#Y|sW(#eu#hL&0HjsY{HE7b@?_PTw^cv%COwG@M1ULzbU8ygC zvzdY7%Sb=C@)>pXvJI!9Q#pD=Y@3u6Q-toX5x8FXfN0PWKXdzmnO3+WfJrE%gx$Ej zjS0$lIRQ|M~#eCn68kP#wi_2&x&tjdgJvx$e% zL>X$1R7EE-9-`|LR1E?DEJk1;-Tsa;l*u=PY`h1^m5tm8?P*g zObzb=6ROk%U-T=JRo`sQZ4ZZv~ zH|!n8F!}(gW;sbn|9wC=*8%x{l6tLdCcVHSE7<~PPY~c#0akrbt3S8ogY&!lO>1&< zcd2@YIY~(uf3P%7M<^eMy{TZ^P(PLM3&kz42RM{5=Tz1iI_>yU@wO(E2NFjB-HTW1 zfnG3I4nhQsoU)|PE!#vr+w4cLs>o@NJGz#Q2-yV#gpxG))&D76%E1BdeKmiDNDBLJ zxx&1E7>kPFrB=5B$2cSz&9KxzL&d+Z@x<0DEAtxL39qFn-fxjuyc54=;r8N8b`uLV zd^q17G{kfLijFomODV%<;LckJY~`n9W|#jLBCYmTV@xSFFZs-lb;Hp9H4=a1Ru(pE|cPdvarB$ljVlL_ZKR;2gC%?nEW0G6Qw za!KOCpI^3|bqf(%4yGdtR8b$;x{_J8RO8!J%c|W49J42d>%g^0ZaNMq>>f^|IrQYB z_~8M^msYpdDRX)e=1*2O^^F4q{j6rfWomLYd0RR91