.github/workflows/renovate-bump-chart-version.yaml

@@ -36,6 +36,7 @@ jobs:
 
       - name: Detect changed charts
         id: list-changed
+        #language=bash
         run: |
           changed="$(ct list-changed --config .github/linters/ct.yaml)"
           if [[ -n "$changed" ]]; then
@@ -47,9 +48,10 @@ jobs:
         if: steps.list-changed.outputs.changed == 'true'
         env:
           CHART: ${{ steps.list-changed.outputs.changed_list }}
+        #language=bash
         run: |
-          if [[ $CHANGED_LIST == *" "* ]]; then
-            echo "Multiple charts changed, skipping bumping chart version"
+          if [[ ! -d "${CHART}" ]]; then
+            echo "${CHART} directory not found"
             exit 0
           fi
 
@@ -58,43 +60,78 @@ jobs:
           CHART_MINOR_VERSION=$(printf '%s' "$CHART_VERSION" | cut -d "." -f 2)
           CHART_MINOR_VERSION=$((CHART_MINOR_VERSION+1))
           CHART_NEW_VERSION="${CHART_MAJOR_VERSION}.${CHART_MINOR_VERSION}.0"
-          sed -i "s/^version:.*/version: \"${CHART_NEW_VERSION}\"/" "$CHART/Chart.yaml"
+          sed -i "s/^version:.*/version: ${CHART_NEW_VERSION}/" "$CHART/Chart.yaml"
+
+      - name: run renovate-post-upgrade-hook
+        if: steps.list-changed.outputs.changed == 'true'
+        env:
+          CHART: ${{ steps.list-changed.outputs.changed_list }}
+        #language=bash
+        run: |
+          if [[ -x "$CHART/hack/renovate-post-upgrade-hook.sh" ]]; then
+            cd "$CHART"
+            ./hack/renovate-post-upgrade-hook.sh
+          fi
 
       - name: Commit changes
         if: steps.list-changed.outputs.changed == 'true'
         env:
           CHART: ${{ steps.list-changed.outputs.changed_list }}
           GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
           GITHUB_HEAD_REF: ${{ github.head_ref }}
+        #language=bash
         run: |
+          # Define the target directory
+          TARGET_DIR="$CHART"
+          
+          # Fetch deleted files in the target directory
+          DELETED_FILES=$(git diff --diff-filter=D --name-only HEAD -- "$TARGET_DIR")
+          
+          # Fetch added/modified files in the target directory
+          MODIFIED_FILES=$(git diff --diff-filter=ACM --name-only HEAD -- "$TARGET_DIR")
+            
+          # Initialize JSON structure
+          FILE_CHANGES_JSON='{ "deletions": [], "additions": [] }'
+          
+          # Add deletions
+          for file in $DELETED_FILES; do
+            FILE_CHANGES_JSON=$(echo "$FILE_CHANGES_JSON" | jq --arg path "$file" '.deletions += [{"path": $path}]')
+          done
+          
+          # Add additions (new or modified files)
+          for file in $MODIFIED_FILES; do
+            BASE64_CONTENT=$(base64 -w 0 <"$file")
+            FILE_CHANGES_JSON=$(echo "$FILE_CHANGES_JSON" | jq --arg path "$file" --arg content "$BASE64_CONTENT" '.additions += [{"path": $path, "contents": $content}]')
+          done
+          
+          # Construct final JSON using jq
+          JSON_PAYLOAD=$(jq -n --arg repo "$GITHUB_REPOSITORY" \
+                              --arg branch "$GITHUB_HEAD_REF" \
+                              --arg message "post upgrade changes from renovate" \
+                              --arg expectedOid "$GITHUB_SHA" \
+                              --argjson fileChanges "$FILE_CHANGES_JSON" \
+                              '{
+                                query: "mutation ($input: CreateCommitOnBranchInput!) {
+                                  createCommitOnBranch(input: $input) { 
+                                    commit { 
+                                      url 
+                                    } 
+                                  } 
+                                }",
+                                variables: {
+                                  input: {
+                                    branch: {
+                                      repositoryNameWithOwner: $repo,
+                                      branchName: $branch
+                                    },
+                                    message: { headline: $message },
+                                    fileChanges: $fileChanges,
+                                    expectedHeadOid: $expectedOid
+                                  }
+                                }
+                              }')
+          
+          # Call GitHub API
           curl https://api.github.com/graphql -f \
                -sSf -H "Authorization: Bearer $GITHUB_TOKEN" \
-               --data @- <<GRAPHQL | jq
-          {
-            "query": "mutation (\$input: CreateCommitOnBranchInput!) {
-              createCommitOnBranch(input: \$input) { 
-                commit { 
-                  url 
-                } 
-              } 
-            }",
-            "variables": {
-              "input": {
-                "branch": {
-                  "repositoryNameWithOwner": "${{ github.repository }}",
-                  "branchName": "$GITHUB_HEAD_REF"
-                },
-                "message": { "headline": "Update Chart.yaml" },
-                "fileChanges": {
-                  "additions": [
-                    {
-                      "path": "$CHART/Chart.yaml",
-                      "contents": "$(base64 -w 0 <"$CHART/Chart.yaml")"
-                    }
-                  ]
-                },
-                "expectedHeadOid": "${{ github.sha }}"
-              }
-            }
-          }
-          GRAPHQL
+               --data "$JSON_PAYLOAD"

charts/kube-prometheus-stack/Chart.yaml

@@ -31,7 +31,7 @@ name: kube-prometheus-stack
 sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
-version: 70.0.2
+version: 70.0.3
 appVersion: v0.81.0
 kubeVersion: ">=1.19.0-0"
 home: https://github.com/prometheus-operator/kube-prometheus

charts/kube-prometheus-stack/hack/renovate-post-upgrade-hook.sh

@@ -5,9 +5,23 @@ set -euo pipefail
 SCRIPT_DIR=$(cd -- "$(dirname -- "${0}")" &>/dev/null && pwd)
 
 if ! which jb &>/dev/null; then
-  echo "'jb' command not found
-Install jsonnet-bundler from https://github.com/jsonnet-bundler/jsonnet-bundler"
-  exit 1
+  if ! which go &>/dev/null; then
+    echo "'jb' command not found"
+    echo "Install jsonnet-bundler from https://github.com/jsonnet-bundler/jsonnet-bundler"
+    exit 1
+  fi
+
+  echo "'jb' command not found. Try to install it from github.com/jsonnet-bundler/jsonnet-bundler"
+
+  go install -a github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb@latest
+  PATH="$(go env GOPATH)/bin:$PATH"
+  export PATH
+
+  if ! which jb &>/dev/null; then
+    echo "'jb' command not found"
+    echo "Install jsonnet-bundler from https://github.com/jsonnet-bundler/jsonnet-bundler"
+    exit 1
+  fi
 fi
 
 rm -rf "${SCRIPT_DIR}/tmp"

charts/prometheus-cloudwatch-exporter/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "0.16.0"
 description: A Helm chart for prometheus cloudwatch-exporter
 name: prometheus-cloudwatch-exporter
-version: 0.26.0
+version: 0.27.0
 home: https://github.com/prometheus/cloudwatch_exporter
 sources:
   - https://github.com/prometheus/cloudwatch_exporter

charts/prometheus-cloudwatch-exporter/templates/pdb.yaml

@@ -0,0 +1,23 @@
+{{- if .Values.podDisruptionBudget.enabled -}}
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ template "prometheus-cloudwatch-exporter.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app: {{ template "prometheus-cloudwatch-exporter.name" . }}
+    chart: {{ template "prometheus-cloudwatch-exporter.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  {{- if .Values.podDisruptionBudget.minAvailable }}
+  minAvailable: {{ .Values.podDisruptionBudget.minAvailable }}
+  {{- end }}
+  {{- if .Values.podDisruptionBudget.maxUnavailable }}
+  maxUnavailable: {{ .Values.podDisruptionBudget.maxUnavailable }}
+  {{- end }}
+  selector:
+    matchLabels:
+      app: {{ template "prometheus-cloudwatch-exporter.name" . }}
+      release: {{ .Release.Name }}
+{{- end -}}

charts/prometheus-cloudwatch-exporter/values.yaml

@@ -243,3 +243,10 @@ containerSecurityContext: {}
 # ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/
 # priorityClassName: system-cluster-critical
 priorityClassName: ""
+
+# Specifying a Disruption Budget for prometheus-cloudwatch-exporter
+# ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/
+podDisruptionBudget:
+  enabled: false
+  maxUnavailable: 1
+  # minAvailable: 2

charts/prometheus-elasticsearch-exporter/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
 description: Elasticsearch stats exporter for Prometheus
 name: prometheus-elasticsearch-exporter
-version: 6.6.1
+version: 6.7.0
 kubeVersion: ">=1.19.0-0"
-appVersion: "v1.8.0"
+appVersion: "v1.9.0"
 home: https://github.com/prometheus-community/elasticsearch_exporter
 sources:
   - https://github.com/prometheus-community/helm-charts/tree/main/charts/prometheus-elasticsearch-exporter

charts/prometheus-elasticsearch-exporter/templates/deployment.yaml

@@ -107,7 +107,7 @@ spec:
                     "--collector.clustersettings",
                     {{- end }}
                     {{- if .Values.es.slm }}
-                    "--es.slm",
+                    "--collector.slm",
                     {{- end }}
                     {{- if .Values.es.data_stream }}
                     "--es.data_stream",

charts/prometheus-snmp-exporter/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Prometheus SNMP Exporter
 name: prometheus-snmp-exporter
-version: 8.0.0
+version: 9.0.0
 appVersion: v0.28.0
 home: https://github.com/prometheus/snmp_exporter
 sources:

charts/prometheus-snmp-exporter/README.md

@@ -107,6 +107,10 @@ Update your scrape definitions to include the system module if you need sysUpTim
 
 This version changes the additional metrics values to always be a string.
 
+### To 9.0.0
+
+This version adds ability to enable config-reloader on demand, also to specify custom --watched-dir and ability to mount snmp-exporter pods extraVolumeMounts for consistency of mounted configs.
+
 ## Configuration
 
 See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing). To see all configurable options with detailed comments, visit the chart's [values.yaml](./values.yaml), or run these configuration commands:

charts/prometheus-snmp-exporter/templates/daemonset.yaml

@@ -86,19 +86,29 @@ spec:
           {{- with .Values.extraVolumeMounts }}
           {{ toYaml . | nindent 12 }}
           {{- end }}
-      {{- if .Values.config }}
+      {{- if .Values.configmapReload.enabled }}
         - name: configmap-reload
           image: "{{ .Values.configmapReload.image.repository }}:{{ .Values.configmapReload.image.tag }}"
           imagePullPolicy: "{{ .Values.configmapReload.image.pullPolicy }}"
           args:
+          {{ if .Values.config }}
             - --watched-dir=/etc/config
+          {{- end }}
             - --reload-url=http://localhost:{{ .Values.service.port }}/-/reload
+        {{- if .Values.configmapReload.extraArgs }}
+{{ toYaml .Values.configmapReload.extraArgs | indent 12 }}
+        {{- end }}
           resources:
 {{ toYaml .Values.configmapReload.resources | indent 12 }}
           volumeMounts:
+          {{ if .Values.config }}
             - mountPath: /etc/config
               name: config
               readOnly: true
+          {{- end }}
+          {{- with .Values.configmapReload.extraVolumeMounts }}
+          {{ toYaml . | nindent 12 }}
+          {{- end }}
 {{- if .Values.configmapReload.containerSecurityContext }}
           securityContext:
 {{ toYaml .Values.configmapReload.containerSecurityContext | indent 12 }}

charts/prometheus-snmp-exporter/templates/deployment.yaml

@@ -93,19 +93,29 @@ spec:
           {{- with .Values.extraVolumeMounts }}
           {{ toYaml . | nindent 12 }}
           {{- end }}
-      {{- if .Values.config }}
+      {{- if .Values.configmapReload.enabled }}
         - name: configmap-reload
           image: "{{ .Values.configmapReload.image.repository }}:{{ .Values.configmapReload.image.tag }}"
           imagePullPolicy: "{{ .Values.configmapReload.image.pullPolicy }}"
           args:
+          {{ if .Values.config }}
             - --watched-dir=/etc/config
+          {{- end }}
             - --reload-url=http://localhost:{{ .Values.service.port }}/-/reload
+        {{- if .Values.configmapReload.extraArgs }}
+{{ toYaml .Values.configmapReload.extraArgs | indent 12 }}
+        {{- end }}
           resources:
 {{ toYaml .Values.configmapReload.resources | indent 12 }}
           volumeMounts:
+           {{ if .Values.config }}
             - mountPath: /etc/config
               name: config
               readOnly: true
+          {{- end }}
+          {{- with .Values.configmapReload.extraVolumeMounts }}
+          {{ toYaml . | nindent 12 }}
+          {{- end }}
 {{- if .Values.configmapReload.containerSecurityContext }}
           securityContext:
 {{ toYaml .Values.configmapReload.containerSecurityContext | indent 12 }}

charts/prometheus-snmp-exporter/values.yaml

@@ -146,8 +146,18 @@ replicas: 1
 configmapReload:
   ## configmap-reload container name
   ##
+  enabled: false
   name: configmap-reload
 
+  extraArgs: []
+  # - "--watched-dir=/etc/configuration"
+
+  # Mounts extraVolumes specified for snmp-exporter pod. Can use projected volumes to mounts multiple configMaps into same directory
+  extraVolumeMounts: []
+  # - name: projeted-volume
+  #  mountPath: "/etc/configuration"
+  #  readOnly: true
+
   ## configmap-reload container image
   ##
   image: