From 8480db309cd1ef91e27990c66ae449454a017034 Mon Sep 17 00:00:00 2001
From: Varac <varac@varac.net>
Date: Thu, 17 Mar 2022 16:09:52 +0100
Subject: [PATCH] Fix prometheus resource settings

---
 .../kube-prometheus-stack-values-configmap.yaml    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/flux2/apps/monitoring/kube-prometheus-stack-values-configmap.yaml b/flux2/apps/monitoring/kube-prometheus-stack-values-configmap.yaml
index c89a43306..c42b4d42c 100644
--- a/flux2/apps/monitoring/kube-prometheus-stack-values-configmap.yaml
+++ b/flux2/apps/monitoring/kube-prometheus-stack-values-configmap.yaml
@@ -107,6 +107,7 @@ data:
 
     prometheus:
       # https://github.com/prometheus-community/helm-charts/tree/main/charts/prometheus
+      # https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/values.yaml#L2101
       prometheusSpec:
         # Use these settings to debug prometheus queries
         # logLevel: debug
@@ -121,12 +122,6 @@ data:
               resources:
                 requests:
                   storage: 10Gi
-        resources:
-          limits:
-            memory: 1.5Gi
-          requests:
-            cpu: 300m
-            memory: 1Gi
         # Discover ALL custom serviceMonitors, podMonitors and prometheusrules,
         # not only those with particular release labels set by
         # kube-prometheus-stack
@@ -134,6 +129,13 @@ data:
         serviceMonitorSelectorNilUsesHelmValues: false
         ruleSelectorNilUsesHelmValues: false
         podMonitorSelectorNilUsesHelmValues: false
+      server:
+        resources:
+          limits:
+            memory: 1.5Gi
+          requests:
+            cpu: 300m
+            memory: 1Gi
 
       ingress:
         enabled: true
-- 
GitLab