Merge branch 'main' into synthetic

Sheikh-Abubaker · web-flow · commit f5a82920f7fa · 2026-02-11T23:53:33.000+05:30
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,3 +1,5 @@
+# This file is auto-generated by scripts/generate-codeowners.sh. Do not edit manually.
+
 # See https://github.com/prometheus-community/helm-charts/issues/12
 # https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
 # https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
diff --git a/.github/linters/.markdown-lint.yml b/.github/linters/.markdown-lint.yml
@@ -1,2 +1,14 @@
 MD013:
   line_length: 600
+MD060:
+  enabled: false
+MD022:
+  enabled: false
+MD031:
+  enabled: false
+MD032:
+  enabled: false
+MD033:
+  enabled: false
+MD034:
+  enabled: false
diff --git a/.github/linters/.textlintrc b/.github/linters/.textlintrc
@@ -0,0 +1,13 @@
+{
+  "filters": {
+    "comments": true,
+    "allowlist": {
+      "allow": [
+        "e-mail"
+      ]
+    }
+  },
+  "rules": {
+    "terminology": true
+  }
+}
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -17,6 +17,7 @@ jobs:
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           fetch-depth: 0
+          persist-credentials: false
 
       - name: Set up Helm
         uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4.3.1
@@ -69,26 +70,28 @@ jobs:
       - name: Run chart-testing (install)
         run: ct install --config .github/linters/ct.yaml
 
-  check-codeowners-maintainers:
-    name: Check CODEOWNERS & MAINTAINERS.md
+  check-generated-files:
+    name: Check generated files
     runs-on: ubuntu-24.04
     permissions:
       contents: read
     steps:
       - name: Checkout Code
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
 
       - name: generate CODEOWNERS
         run: |
-          ./scripts/check-codeowners.sh | tee .github/CODEOWNERS
+          ./scripts/generate-codeowners.sh | tee .github/CODEOWNERS
 
       - name: check CODEOWNERS for modifications
         run: |
           git diff --exit-code
 
       - name: generate MAINTAINERS.md
         run: |
-          ./scripts/check-maintainers.sh | tee MAINTAINERS.md
+          ./scripts/generate-maintainers.sh | tee MAINTAINERS.md
 
       - name: check MAINTAINERS.md for modifications
         run: |
@@ -103,29 +106,34 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
+          persist-credentials: false
           fetch-depth: 0
 
       - name: Lint Code Base
         uses: super-linter/super-linter/slim@61abc07d755095a68f4987d1c2c3d1d64408f1f9 # v8.5.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          LINTER_RULES_PATH: .github/linters
           MULTI_STATUS: false
+          LINTER_RULES_PATH: .github/linters
+          ENABLE_GITHUB_ACTIONS_STEP_SUMMARY: true
+          ENABLE_GITHUB_PULL_REQUEST_SUMMARY_COMMENT: false
+          SAVE_SUPER_LINTER_SUMMARY: true
           VALIDATE_ALL_CODEBASE: false
           VALIDATE_BASH: true
           VALIDATE_BASH_EXEC: true
-          # VALIDATE_CHECKOV: true - always scans everything and all charts have too much errors
           VALIDATE_EDITORCONFIG: true
           VALIDATE_ENV: true
           VALIDATE_GITHUB_ACTIONS: true
+          VALIDATE_GITHUB_ACTIONS_ZIZMOR: true
           VALIDATE_GITLEAKS: true
+          VALIDATE_HTML: true
           VALIDATE_JSON: true
-          # VALIDATE_MARKDOWN: true #TODO: fix lint issues
-          # VALIDATE_NATURAL_LANGUAGE: true #TODO: fix lint issues
-          VALIDATE_PYTHON: true
-          VALIDATE_RENOVATE: true # does not support newest renovate config
+          VALIDATE_NATURAL_LANGUAGE: true
+          # VALIDATE_MARKDOWN: true - disable to for now.
+          VALIDATE_RENOVATE: true
           VALIDATE_SHELL_SHFMT: true
-          VALIDATE_XML: true
+          # VALIDATE_XML: true
+          # VALIDATE_YAML: true
   validate-pr:
     name: Validate PR Metadata
     runs-on: ubuntu-24.04
@@ -205,12 +213,12 @@ jobs:
     runs-on: ubuntu-24.04
     needs:
       - lint-test
-      - check-codeowners-maintainers
+      - check-generated-files
       - super-linter
     if: >-
       github.event.pull_request.head.repo.full_name == github.repository
       && contains(github.event.pull_request.labels.*.name, 'dependencies/auto-merge')
-      && (github.actor == 'renovate[bot]' || github.actor == 'mend[bot]' || github.actor == 'helm-charts-renovate-helper[bot]')
+      && (github.event.pull_request.user.login  == 'renovate[bot]' || github.event.pull_request.user.login  == 'helm-charts-renovate-helper-app[bot]')
     steps:
       # Using a GitHub App token, because GitHub Actions doesn't run on commits from github-actions bot
       # Used App:
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -18,6 +18,8 @@ jobs:
     steps:
       - name: Checkout Code
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
 
       - name: Fetch history
         run: git fetch --prune --unshallow
diff --git a/.github/workflows/renovate-custom-hooks.yaml b/.github/workflows/renovate-custom-hooks.yaml
@@ -1,5 +1,7 @@
 name: renovate hooks
 
+permissions: {}
+
 on:
   pull_request:
     branches:
@@ -10,11 +12,14 @@ on:
 jobs:
   renovate-post-run:
     name: Renovate Post Run
-    runs-on: ubuntu-latest
-    if: github.actor == 'renovate[bot]' || github.actor == 'mend[bot]'
+    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
+    if: github.event.pull_request.user.login  == 'renovate[bot]'
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
+          persist-credentials: false
           fetch-depth: 0
 
       # Using a GitHub App token, because GitHub Actions doesn't run on commits from github-actions bot
diff --git a/.github/workflows/sync-readme.yaml b/.github/workflows/sync-readme.yaml
@@ -15,10 +15,13 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
       - run: |
           cp -f README.md ${{ runner.temp }}/README.md
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
+          persist-credentials: true
           ref: gh-pages
       - run: |
           cp -f ${{ runner.temp }}/README.md .
diff --git a/AGENTS.md b/AGENTS.md
@@ -34,15 +34,15 @@ make helm-docs
 
 - **One chart per PR**: CI enforces that PRs only change a single chart.
 - **PR title format**: Must start with `[chart-name] ` (e.g., `[grafana] Add new feature`).
-- **Version bumps**: Every chart change (excluding files listed in `.helmignore`) requires a semver version bump in `Chart.yaml`. Major bumps for breaking changes.
+- **Version bumps**: Every chart change (excluding files listed in `.helmignore`) requires a SemVer version bump in `Chart.yaml`. Major bumps for breaking changes.
 - **DCO sign-off**: Commits must include `Signed-off-by` line (`git commit -s`).
-- **Squash merge only**: The repo only allows squash merges.
-- **CODEOWNERS/MAINTAINERS**: Auto-generated from `Chart.yaml` maintainer entries by `scripts/check-codeowners.sh` and `scripts/check-maintainers.sh`. Do not edit `.github/CODEOWNERS` or `MAINTAINERS.md` directly.
+- **Squash merge only**: The repository only allows squash merges.
+- **CODEOWNERS/MAINTAINERS**: Auto-generated from `Chart.yaml` maintainer entries by `scripts/generate-codeowners.sh` and `scripts/generate-maintainers.sh`. Do not edit `.github/CODEOWNERS` or `MAINTAINERS.md` directly.
 - **Minimum Kubernetes version**: Charts target `^1.25.0-0` (`kubeVersion` in `Chart.yaml`).
 
 ## Dependency Management
 
-Renovate manages automated dependency updates. Charts with subchart dependencies (e.g., `tempo-distributed` depends on `minio`, `grafana-agent-operator`, `rollout-operator`) declare them in `Chart.yaml`. Dependency repos used in CI/release:
+Renovate manages automated dependency updates. Charts with subchart dependencies (e.g., `tempo-distributed` depends on `minio`, `grafana-agent-operator`, `rollout-operator`) declare them in `Chart.yaml`. Dependency repositories used in CI/release:
 
 ```
 bitnami, grafana, grafana-community, prometheus-community, minio
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -36,7 +36,7 @@ See `git help commit`:
 * Must pass [DCO check](#sign-off-your-work)
 * Must follow [Charts best practices](https://helm.sh/docs/topics/chart_best_practices/)
 * Must pass CI jobs for linting and installing changed charts with the [chart-testing](https://github.com/helm/chart-testing) tool
-* Any change to a chart requires a version bump following [semver](https://semver.org/) principles. See [Immutability](#immutability) and [Versioning](#versioning) below
+* Any change to a chart requires a version bump following [SemVer](https://semver.org/) principles. See [Immutability](#immutability) and [Versioning](#versioning) below
 
 Once changes have been merged, the release job will automatically run to package and release changed charts.
 
@@ -46,14 +46,14 @@ Chart releases must be immutable. Any change to a chart warrants a chart version
 
 ### Versioning
 
-The chart `version` should follow [semver](https://semver.org/).
+The chart `version` should follow [SemVer](https://semver.org/).
 
 Charts should start at `1.0.0`. Any breaking (backwards incompatible) changes to a chart should:
 
 1. Bump the MAJOR version
-2. In the README, under a section called "Upgrading", describe the manual steps necessary to upgrade to the new (specified) MAJOR version
+2. In the readme, under a section called "Upgrading", describe the manual steps necessary to upgrade to the new (specified) MAJOR version
 
-### Generate README
+### Generate readme
 
 The readme of each chart can be re-generated with the following command (run inside the chart directory):
 
diff --git a/PROCESSES.md b/PROCESSES.md
@@ -23,7 +23,7 @@ maintainers:
   url:    # The URL of the GitHub profile, using the format https://github.com/<username>. Required.
 ```
 
-### Community admins (including repo admins)
+### Community admins (including repository admins)
 
 Chart admins are responsible for managing the repository (for example: housekeeping and adding new chart maintainers).
 They are also the point of contact for existing chart maintainers.
diff --git a/README.md b/README.md
@@ -11,15 +11,15 @@ The code is provided as-is with no warranties.
 [Helm](https://helm.sh) must be installed to use the charts.
 Please refer to Helm's [documentation](https://helm.sh/docs/) to get started.
 
-Once Helm is set up properly, add the repo as follows:
+Once Helm is set up properly, add the repository as follows:
 
 ```console
 helm repo add grafana-community https://grafana-community.github.io/helm-charts
 ```
 
 You can then run `helm search repo grafana-community` to see the charts.
 
-<!-- Keep full URL links to repo files because this README syncs from main to gh-pages.  -->
+<!-- Keep full URL links to repository files because this README syncs from main to gh-pages.  -->
 Chart documentation is available in [grafana directory](https://github.com/grafana-community/helm-charts/blob/main/charts/grafana/README.md).
 
 **OCI artifacts of all Grafana Community Helm charts are available in [ghcr.io](https://github.com/orgs/grafana-community/packages?repo_name=helm-charts).**
diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: grafana
-version: 11.1.0
+version: 11.1.1
 # renovate: docker=docker.io/grafana/grafana
 appVersion: 12.3.2
 kubeVersion: "^1.25.0-0"
diff --git a/charts/grafana/templates/_pod.tpl b/charts/grafana/templates/_pod.tpl
@@ -1419,7 +1419,7 @@ containers:
             key: {{ .Values.admin.passwordKey | default "admin-password" }}
       {{- end }}
       {{- if .Values.plugins }}
-      - name: GF_INSTALL_PLUGINS
+      - name: GF_PLUGINS_PREINSTALL_SYNC
         valueFrom:
           configMapKeyRef:
             name: {{ include "grafana.fullname" . }}
diff --git a/scripts/generate-codeowners.sh b/scripts/generate-codeowners.sh
@@ -4,6 +4,8 @@
 export LC_ALL=C
 
 cat <<EOF
+# This file is auto-generated by scripts/generate-codeowners.sh. Do not edit manually.
+
 # See https://github.com/prometheus-community/helm-charts/issues/12
 # https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
 # https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
diff --git a/scripts/generate-maintainers.sh b/scripts/generate-maintainers.sh

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# This file is auto-generated by scripts/generate-codeowners.sh. Do not edit manually.`
	`2`	`+`
`1`	`3`	`# See https://github.com/prometheus-community/helm-charts/issues/12`
`2`	`4`	`# https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners`
`3`	`5`	`# https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax`