From 64bcd0675438636f9ac3ec472ca82a900f5cae22 Mon Sep 17 00:00:00 2001
From: astro-stan <36302090+astro-stan@users.noreply.github.com>
Date: Sat, 21 Mar 2026 19:02:48 +0000
Subject: [PATCH] fix(grafana): Reduce default Grafana k8s-sidecar resources
 (#46287)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

**Description**

The default Grafana chart requests and limits for the `k8s-sidecar`
containers are a bit over the top:

```bash
kubectl resource-capacity --namespace grafana --pods -uc
NODE            POD                       CONTAINER             CPU REQUESTS   CPU LIMITS     CPU UTIL   MEMORY REQUESTS   MEMORY LIMITS   MEMORY UTIL

...
k8s-control-1   grafana-9554bbdd8-ph6vq   grafana-alerts        75m (0%)       1500m (10%)    2m (0%)    200Mi (0%)        2400Mi (2%)     272Mi (0%)
k8s-control-1   grafana-9554bbdd8-ph6vq   grafana-dashboards    75m (0%)       1500m (10%)    1m (0%)    200Mi (0%)        2400Mi (2%)     275Mi (0%)
k8s-control-1   grafana-9554bbdd8-ph6vq   grafana-datasources   75m (0%)       1500m (10%)    1m (0%)    200Mi (0%)        2400Mi (2%)     272Mi (0%)
k8s-control-1   grafana-9554bbdd8-ph6vq   grafana-notifiers     75m (0%)       1500m (10%)    1m (0%)    200Mi (0%)        2400Mi (2%)     272Mi (0%)
k8s-control-1   grafana-9554bbdd8-ph6vq   grafana-plugins       75m (0%)       1500m (10%)    1m (0%)    200Mi (0%)        2400Mi (2%)     272Mi (0%)
...
```

I have never seen them use more than 10m CPU or go over 300Mi of memory.

So I think it makes sense to assign lower default resources than what
the `common` defaults are.

⚒️ Fixes  # <!--(issue)-->

**⚙️ Type of change**

- [ ] ⚙️ Feature/App addition
- [X] 🪛 Bugfix
- [ ] ⚠️ Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- [ ] 🔃 Refactor of current code
- [ ] 📜 Documentation Changes

**🧪 How Has This Been Tested?**
<!--
Please describe the tests that you ran to verify your changes. Provide
instructions so we can reproduce. Please also list any relevant details
for your test configuration
-->

**📃 Notes:**
<!-- Please enter any other relevant information here -->

**✔️ Checklist:**

- [X] ⚖️ My code follows the style guidelines of this project
- [X] 👀 I have performed a self-review of my own code
- [ ] #️⃣ I have commented my code, particularly in hard-to-understand
areas
- [ ] 📄 I have made changes to the documentation
- [ ] 🧪 I have added tests to this description that prove my fix is
effective or that my feature works
- [x] ⬆️ I increased versions for any altered app according to semantic
versioning
- [X] I made sure the title starts with `feat(chart-name):`,
`fix(chart-name):`, `chore(chart-name):`, `docs(chart-name):` or
`fix(docs):`

**➕ App addition**

If this PR is an app addition please make sure you have done the
following.

- [ ] 🖼️ I have added an icon in the Chart's root directory called
`icon.png`

---

_Please don't blindly check all the boxes. Read them and only check
those that apply.
Those checkboxes are there for the reviewer to see what is this all
about and
the status of this PR with a quick glance._
---
 charts/stable/grafana/Chart.yaml  |  3 +--
 charts/stable/grafana/values.yaml | 35 +++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/charts/stable/grafana/Chart.yaml b/charts/stable/grafana/Chart.yaml
index 2930b2434c9..692419255af 100644
--- a/charts/stable/grafana/Chart.yaml
+++ b/charts/stable/grafana/Chart.yaml
@@ -39,5 +39,4 @@ sources:
   - https://grafana.com/
   - https://hub.docker.com/r/grafana/grafana
 type: application
-version: 22.0.0
-
+version: 22.0.1
diff --git a/charts/stable/grafana/values.yaml b/charts/stable/grafana/values.yaml
index 5be2cecc41d..cf1e3f3b3a3 100644
--- a/charts/stable/grafana/values.yaml
+++ b/charts/stable/grafana/values.yaml
@@ -211,6 +211,13 @@ workload:
               enabled: false
             startup:
               enabled: false
+          resources:
+            requests:
+              cpu: 10m
+              memory: 128Mi
+            limits:
+              cpu: 200m
+              memory: 1536Mi
         datasources:
           enabled: true
           imageSelector: sidecarImage
@@ -241,6 +248,13 @@ workload:
               enabled: false
             startup:
               enabled: false
+          resources:
+            requests:
+              cpu: 10m
+              memory: 128Mi
+            limits:
+              cpu: 200m
+              memory: 1536Mi
         alerts:
           enabled: true
           imageSelector: sidecarImage
@@ -271,6 +285,13 @@ workload:
               enabled: false
             startup:
               enabled: false
+          resources:
+            requests:
+              cpu: 10m
+              memory: 128Mi
+            limits:
+              cpu: 200m
+              memory: 1536Mi
         plugins:
           enabled: true
           imageSelector: sidecarImage
@@ -301,6 +322,13 @@ workload:
               enabled: false
             startup:
               enabled: false
+          resources:
+            requests:
+              cpu: 10m
+              memory: 128Mi
+            limits:
+              cpu: 200m
+              memory: 1536Mi
         notifiers:
           enabled: true
           imageSelector: sidecarImage
@@ -331,6 +359,13 @@ workload:
               enabled: false
             startup:
               enabled: false
+          resources:
+            requests:
+              cpu: 10m
+              memory: 128Mi
+            limits:
+              cpu: 200m
+              memory: 1536Mi
 
 configmap:
   dashboard-provider: