Merge pull request #68 from yjinjo/master

Update grafana/k8s-monitoring:0.13.4

charts/k8s-monitoring/Chart.lock

@@ -1,16 +1,16 @@
 dependencies:
 - name: grafana-agent
   repository: https://grafana.github.io/helm-charts
-  version: 0.37.0
+  version: 0.38.0
 - name: grafana-agent
   repository: https://grafana.github.io/helm-charts
-  version: 0.37.0
+  version: 0.38.0
 - name: grafana-agent
   repository: https://grafana.github.io/helm-charts
-  version: 0.37.0
+  version: 0.38.0
 - name: grafana-agent
   repository: https://grafana.github.io/helm-charts
-  version: 0.37.0
+  version: 0.38.0
 - name: kube-state-metrics
   repository: https://prometheus-community.github.io/helm-charts
   version: 5.18.1
@@ -19,12 +19,12 @@ dependencies:
   version: 4.32.0
 - name: prometheus-operator-crds
   repository: https://prometheus-community.github.io/helm-charts
-  version: 10.0.0
+  version: 11.0.0
 - name: prometheus-windows-exporter
   repository: https://prometheus-community.github.io/helm-charts
   version: 0.3.1
 - name: opencost
   repository: https://opencost.github.io/opencost-helm-chart
-  version: 1.33.1
-digest: sha256:9d5edfce638e0c137814e1dd36459f32283f765a9cdfd48d976e69ef6b6ce4f8
-generated: "2024-04-05T00:16:39.628394092Z"
+  version: 1.33.3
+digest: sha256:c6d6d90f49a350e95901c3eb6929e1df0e3a77946d266302a7a4efa01f62dc24
+generated: "2024-04-15T11:05:34.968771-05:00"

charts/k8s-monitoring/Chart.yaml

@@ -1,24 +1,24 @@
 apiVersion: v2
-appVersion: 2.1.3
+appVersion: 2.2.0
 dependencies:
 - name: grafana-agent
   repository: https://grafana.github.io/helm-charts
-  version: 0.37.0
+  version: 0.38.0
 - alias: grafana-agent-events
   condition: logs.cluster_events.enabled
   name: grafana-agent
   repository: https://grafana.github.io/helm-charts
-  version: 0.37.0
+  version: 0.38.0
 - alias: grafana-agent-logs
   condition: logs.pod_logs.enabled
   name: grafana-agent
   repository: https://grafana.github.io/helm-charts
-  version: 0.37.0
+  version: 0.38.0
 - alias: grafana-agent-profiles
   condition: profiles.enabled
   name: grafana-agent
   repository: https://grafana.github.io/helm-charts
-  version: 0.37.0
+  version: 0.38.0
 - condition: kube-state-metrics.enabled
   name: kube-state-metrics
   repository: https://prometheus-community.github.io/helm-charts
@@ -30,15 +30,15 @@ dependencies:
 - condition: prometheus-operator-crds.enabled
   name: prometheus-operator-crds
   repository: https://prometheus-community.github.io/helm-charts
-  version: 10.0.0
+  version: 11.0.0
 - condition: prometheus-windows-exporter.enabled
   name: prometheus-windows-exporter
   repository: https://prometheus-community.github.io/helm-charts
   version: 0.3.1
 - condition: opencost.enabled
   name: opencost
   repository: https://opencost.github.io/opencost-helm-chart
-  version: 1.33.1
+  version: 1.33.3
 description: A Helm chart for gathering, scraping, and forwarding Kubernetes telemetry
   data to a Grafana Stack.
 icon: https://raw.githubusercontent.com/grafana/grafana/main/public/img/grafana_icon.svg
@@ -51,4 +51,4 @@ name: k8s-monitoring
 sources:
 - https://github.com/grafana/k8s-monitoring-helm/tree/main/charts/k8s-monitoring
 type: application
-version: 0.13.1
+version: 0.13.4

charts/k8s-monitoring/README.md

@@ -3,7 +3,7 @@
 
 # k8s-monitoring
 
-![Version: 0.13.1](https://img.shields.io/badge/Version-0.13.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.3](https://img.shields.io/badge/AppVersion-2.1.3-informational?style=flat-square)
+![Version: 0.13.4](https://img.shields.io/badge/Version-0.13.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.0](https://img.shields.io/badge/AppVersion-2.2.0-informational?style=flat-square)
 
 A Helm chart for gathering, scraping, and forwarding Kubernetes telemetry data to a Grafana Stack.
 
@@ -101,14 +101,14 @@ The Prometheus and Loki services may be hosted on the same cluster, or remotely
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://grafana.github.io/helm-charts | grafana-agent | 0.37.0 |
-| https://grafana.github.io/helm-charts | grafana-agent-events(grafana-agent) | 0.37.0 |
-| https://grafana.github.io/helm-charts | grafana-agent-logs(grafana-agent) | 0.37.0 |
-| https://grafana.github.io/helm-charts | grafana-agent-profiles(grafana-agent) | 0.37.0 |
-| https://opencost.github.io/opencost-helm-chart | opencost | 1.33.1 |
+| https://grafana.github.io/helm-charts | grafana-agent | 0.38.0 |
+| https://grafana.github.io/helm-charts | grafana-agent-events(grafana-agent) | 0.38.0 |
+| https://grafana.github.io/helm-charts | grafana-agent-logs(grafana-agent) | 0.38.0 |
+| https://grafana.github.io/helm-charts | grafana-agent-profiles(grafana-agent) | 0.38.0 |
+| https://opencost.github.io/opencost-helm-chart | opencost | 1.33.3 |
 | https://prometheus-community.github.io/helm-charts | kube-state-metrics | 5.18.1 |
 | https://prometheus-community.github.io/helm-charts | prometheus-node-exporter | 4.32.0 |
-| https://prometheus-community.github.io/helm-charts | prometheus-operator-crds | 10.0.0 |
+| https://prometheus-community.github.io/helm-charts | prometheus-operator-crds | 11.0.0 |
 | https://prometheus-community.github.io/helm-charts | prometheus-windows-exporter | 0.3.1 |
 
 ## Values

charts/k8s-monitoring/charts/grafana-agent/CHANGELOG.md

@@ -7,6 +7,13 @@ This document contains a historical list of changes between releases. Only
 changes that impact end-user behavior are listed; changes to documentation or
 internal API changes are not present.
 
+0.38.0 (2024-04-12)
+----------
+
+### Enhancements
+
+- Update Grafana Agent version to v0.40.4. (@ptodev)
+
 0.37.0 (2024-03-14)
 ----------
 

charts/k8s-monitoring/charts/grafana-agent/Chart.lock

@@ -3,4 +3,4 @@ dependencies:
   repository: ""
   version: 0.0.0
 digest: sha256:1980431a3d80822fca2e67e9cf16ff7a7f8d1dc87deb9e44d50e85e3e8e33a81
-generated: "2024-03-14T17:06:58.169147702Z"
+generated: "2024-04-12T14:53:43.763263778Z"

charts/k8s-monitoring/charts/grafana-agent/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: v0.40.3
+appVersion: v0.40.4
 dependencies:
 - condition: crds.create
   name: crds
@@ -8,4 +8,4 @@ dependencies:
 description: Grafana Agent
 name: grafana-agent
 type: application
-version: 0.37.0
+version: 0.38.0

charts/k8s-monitoring/charts/grafana-agent/README.md

@@ -1,6 +1,6 @@
 # Grafana Agent Helm chart
 
-![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![Version: 0.37.0](https://img.shields.io/badge/Version-0.37.0-informational?style=flat-square) ![AppVersion: v0.40.3](https://img.shields.io/badge/AppVersion-v0.40.3-informational?style=flat-square)
+![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![Version: 0.38.0](https://img.shields.io/badge/Version-0.38.0-informational?style=flat-square) ![AppVersion: v0.40.4](https://img.shields.io/badge/AppVersion-v0.40.4-informational?style=flat-square)
 
 Helm chart for deploying [Grafana Agent][] to Kubernetes.
 

charts/k8s-monitoring/charts/grafana-agent/ci/nonroot-values.yaml

@@ -0,0 +1,7 @@
+global:
+  podSecurityContext:
+    fsGroup: 473
+agent:
+  securityContext:
+    runAsUser: 473
+    runAsGroup: 473

charts/k8s-monitoring/charts/opencost/Chart.yaml

@@ -16,4 +16,4 @@ maintainers:
   name: brito-rafa
 name: opencost
 type: application
-version: 1.33.1
+version: 1.33.3

charts/k8s-monitoring/charts/opencost/README.md

@@ -2,9 +2,11 @@
 
 OpenCost and OpenCost UI
 
-![Version: 1.33.1](https://img.shields.io/badge/Version-1.33.1-informational?style=flat-square)
+![Version: 1.33.3](https://img.shields.io/badge/Version-1.33.3-informational?style=flat-square)
 ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 ![AppVersion: 1.109.0](https://img.shields.io/badge/AppVersion-1.109.0-informational?style=flat-square)
+[![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/opencost)](https://artifacthub.io/packages/search?repo=opencost)
+[![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/opencost-oci)](https://artifacthub.io/packages/search?repo=opencost-oci)
 
 ## Maintainers
 
@@ -95,10 +97,10 @@ $ helm install opencost opencost/opencost
 | opencost.extraContainers | list | `[]` | extra sidecars to add to the pod.  Useful for things like oauth-proxy for the UI |
 | opencost.metrics.config.disabledMetrics | list | `[]` | List of metrics to be disabled |
 | opencost.metrics.config.enabled | bool | `false` | Enables creating the metrics.json configuration as a ConfigMap |
-| opencost.metrics.kubeStateMetrics.emitKsmV1Metrics | string | `""` | Enable emission of KSM v1 metrics |
-| opencost.metrics.kubeStateMetrics.emitKsmV1MetricsOnly | string | `""` | Enable only emission of KSM v1 metrics that do not exist in KSM 2 by default |
-| opencost.metrics.kubeStateMetrics.emitNamespaceAnnotations | string | `""` | Enable emission of namespace annotations |
-| opencost.metrics.kubeStateMetrics.emitPodAnnotations | string | `""` | Enable emission of pod annotations |
+| opencost.metrics.kubeStateMetrics.emitKsmV1Metrics | bool | `nil` | Enable emission of KSM v1 metrics |
+| opencost.metrics.kubeStateMetrics.emitKsmV1MetricsOnly | bool | `nil` | Enable only emission of KSM v1 metrics that do not exist in KSM 2 by default |
+| opencost.metrics.kubeStateMetrics.emitNamespaceAnnotations | bool | `nil` | Enable emission of namespace annotations |
+| opencost.metrics.kubeStateMetrics.emitPodAnnotations | bool | `nil` | Enable emission of pod annotations |
 | opencost.metrics.serviceMonitor.additionalLabels | object | `{}` | Additional labels to add to the ServiceMonitor |
 | opencost.metrics.serviceMonitor.enabled | bool | `false` | Create ServiceMonitor resource for scraping metrics using PrometheusOperator |
 | opencost.metrics.serviceMonitor.extraEndpoints | list | `[]` | extra Endpoints to add to the ServiceMonitor.  Useful for scraping sidecars |

charts/k8s-monitoring/charts/opencost/README.md.gotmpl

@@ -5,6 +5,9 @@
 {{ template "chart.versionBadge" . }}
 {{ template "chart.typeBadge" . }}
 {{ template "chart.appVersionBadge" . }}
+[![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/opencost)](https://artifacthub.io/packages/search?repo=opencost)
+[![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/opencost-oci)](https://artifacthub.io/packages/search?repo=opencost-oci)
+
 
 {{ template "chart.maintainersSection" . }}
 

charts/k8s-monitoring/charts/opencost/templates/deployment.yaml

@@ -204,21 +204,21 @@ spec:
               value: {{ .Values.opencost.cloudCost.queryWindowDays | quote }}
             - name: CLOUD_COST_RUN_WINDOW_DAYS
               value: {{ .Values.opencost.cloudCost.runWindowDays | quote }}
-            {{- if .Values.opencost.metrics.kubeStateMetrics.emitPodAnnotations }}
+            {{- if not (quote .Values.opencost.metrics.kubeStateMetrics.emitPodAnnotations | empty ) }}
             - name: EMIT_POD_ANNOTATIONS_METRIC
-              value: {{ ( .Values.opencost.metrics.kubeStateMetrics.emitPodAnnotations) | quote }}
+              value: {{ .Values.opencost.metrics.kubeStateMetrics.emitPodAnnotations | quote }}
             {{- end }}
-            {{- if .Values.opencost.metrics.kubeStateMetrics.emitNamespaceAnnotations }}
+            {{- if not (quote .Values.opencost.metrics.kubeStateMetrics.emitNamespaceAnnotations | empty ) }}
             - name: EMIT_NAMESPACE_ANNOTATIONS_METRIC
-              value: {{ ( .Values.opencost.metrics.kubeStateMetrics.emitNamespaceAnnotations) | quote}}
+              value: {{ .Values.opencost.metrics.kubeStateMetrics.emitNamespaceAnnotations | quote }}
             {{- end }}
-            {{- if .Values.opencost.metrics.kubeStateMetrics.emitKsmV1Metrics }}
+            {{- if not (quote .Values.opencost.metrics.kubeStateMetrics.emitKsmV1Metrics | empty ) }}
             - name: EMIT_KSM_V1_METRICS
-              value: {{ ( .Values.opencost.metrics.kubeStateMetrics.emitKsmV1Metrics) | quote }}
+              value: {{ .Values.opencost.metrics.kubeStateMetrics.emitKsmV1Metrics | quote }}
             {{- end }}
-            {{- if .Values.opencost.metrics.kubeStateMetrics.emitKsmV1MetricsOnly }}
+            {{- if not (quote .Values.opencost.metrics.kubeStateMetrics.emitKsmV1MetricsOnly | empty ) }}
             - name: EMIT_KSM_V1_METRICS_ONLY 
-              value: {{ ( .Values.opencost.metrics.kubeStateMetrics.emitKsmV1MetricsOnly) | quote }}
+              value: {{ .Values.opencost.metrics.kubeStateMetrics.emitKsmV1MetricsOnly | quote }}
             {{- end }}
             # Add any additional provided variables
             {{- range $key, $value := .Values.opencost.exporter.extraEnv }}

charts/k8s-monitoring/charts/opencost/values.yaml

@@ -259,14 +259,14 @@ opencost:
 
   metrics:
     kubeStateMetrics:
-      # -- Enable emission of pod annotations
-      emitPodAnnotations: ""
-      # -- Enable emission of namespace annotations
-      emitNamespaceAnnotations: ""
-      # -- Enable emission of KSM v1 metrics
-      emitKsmV1Metrics: ""
-      # -- Enable only emission of KSM v1 metrics that do not exist in KSM 2 by default
-      emitKsmV1MetricsOnly: ""
+      # -- (bool) Enable emission of pod annotations
+      emitPodAnnotations: ~
+      # -- (bool) Enable emission of namespace annotations
+      emitNamespaceAnnotations: ~
+      # -- (bool) Enable emission of KSM v1 metrics
+      emitKsmV1Metrics: ~
+      # -- (bool) Enable only emission of KSM v1 metrics that do not exist in KSM 2 by default
+      emitKsmV1MetricsOnly: ~
 
     serviceMonitor:
       # -- Create ServiceMonitor resource for scraping metrics using PrometheusOperator

charts/k8s-monitoring/charts/prometheus-operator-crds/Chart.lock

@@ -3,4 +3,4 @@ dependencies:
   repository: ""
   version: 0.0.0
 digest: sha256:aeada3fbffa2565a325406ad014001fd2685f7c0c9cfc1167da4f10c75a1bd65
-generated: "2024-03-12T09:59:01.434712516Z"
+generated: "2024-04-06T20:25:07.12586694Z"

charts/k8s-monitoring/charts/prometheus-operator-crds/Chart.yaml

@@ -10,7 +10,7 @@ annotations:
     - name: QuentinBisson
       email: quentin.bisson@gmail.com
 apiVersion: v2
-appVersion: v0.72.0
+appVersion: v0.73.0
 dependencies:
 - name: crds
   repository: ""
@@ -35,4 +35,4 @@ name: prometheus-operator-crds
 sources:
 - https://github.com/prometheus-community/helm-charts
 type: application
-version: 10.0.0
+version: 11.0.0

charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml

@@ -1,4 +1,4 @@
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.72.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.73.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -8,7 +8,7 @@ metadata:
 {{- toYaml . | nindent 4 }}
 {{- end }}
     controller-gen.kubebuilder.io/version: v0.13.0
-    operator.prometheus.io/version: 0.72.0
+    operator.prometheus.io/version: 0.73.0
   name: alertmanagerconfigs.monitoring.coreos.com
 spec:
   group: monitoring.coreos.com
@@ -169,7 +169,7 @@ spec:
                                 by name (e.g 'January') by numerical month (e.g '1')
                                 or as an inclusive range (e.g 'January:March', '1:3',
                                 '1:March')
-                              pattern: ^((?i)january|february|march|april|may|june|july|august|september|october|november|december|[1-12])(?:((:((?i)january|february|march|april|may|june|july|august|september|october|november|december|[1-12]))$)|$)
+                              pattern: ^((?i)january|february|march|april|may|june|july|august|september|october|november|december|1[0-2]|[1-9])(?:((:((?i)january|february|march|april|may|june|july|august|september|october|november|december|1[0-2]|[1-9]))$)|$)
                               type: string
                             type: array
                           times:
@@ -1199,6 +1199,10 @@ spec:
                           sendResolved:
                             description: Whether to notify about resolved alerts.
                             type: boolean
+                          summary:
+                            description: Message summary template. It requires Alertmanager
+                              >= 0.27.0.
+                            type: string
                           text:
                             description: Message body template.
                             type: string

charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml

@@ -1,4 +1,4 @@
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.72.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.73.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -8,7 +8,7 @@ metadata:
 {{- toYaml . | nindent 4 }}
 {{- end }}
     controller-gen.kubebuilder.io/version: v0.13.0
-    operator.prometheus.io/version: 0.72.0
+    operator.prometheus.io/version: 0.73.0
   name: alertmanagers.monitoring.coreos.com
 spec:
   group: monitoring.coreos.com
@@ -1168,9 +1168,10 @@ spec:
                 type: object
                 x-kubernetes-map-type: atomic
               alertmanagerConfiguration:
-                description: 'EXPERIMENTAL: alertmanagerConfiguration specifies the
-                  configuration of Alertmanager. If defined, it takes precedence over
-                  the `configSecret` field. This field may change in future releases.'
+                description: "alertmanagerConfiguration specifies the configuration
+                  of Alertmanager. \n If defined, it takes precedence over the `configSecret`
+                  field. \n This is an *experimental feature*, it may change in any
+                  upcoming release in a breaking way."
                 properties:
                   global:
                     description: Defines the global parameters of the Alertmanager
@@ -3093,6 +3094,15 @@ spec:
                   - name
                   type: object
                 type: array
+              enableFeatures:
+                description: "Enable access to Alertmanager feature flags. By default,
+                  no features are enabled. Enabling features which are disabled by
+                  default is entirely outside the scope of what the maintainers will
+                  support and by doing so, you accept that this behaviour may break
+                  at any time without notice. \n It requires Alertmanager >= 0.27.0."
+                items:
+                  type: string
+                type: array
               externalUrl:
                 description: The external URL the Alertmanager instances will be available
                   under. This is necessary to generate correct URLs. This is necessary

charts/k8s-monitoring/charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml

@@ -1,4 +1,4 @@
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.72.0/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.73.0/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -8,7 +8,7 @@ metadata:
 {{- toYaml . | nindent 4 }}
 {{- end }}
     controller-gen.kubebuilder.io/version: v0.13.0
-    operator.prometheus.io/version: 0.72.0
+    operator.prometheus.io/version: 0.73.0
   name: podmonitors.monitoring.coreos.com
 spec:
   group: monitoring.coreos.com
@@ -53,6 +53,12 @@ spec:
                       permission on the `Nodes` objects.
                     type: boolean
                 type: object
+              bodySizeLimit:
+                description: "When defined, bodySizeLimit specifies a job level limit
+                  on the size of uncompressed response body that will be accepted
+                  by Prometheus. \n It requires Prometheus >= v2.28.0."
+                pattern: (^0|([0-9]*[.])?[0-9]+((K|M|G|T|E|P)i?)?B)$
+                type: string
               jobLabel:
                 description: "The label to use to retrieve the job name from. `jobLabel`
                   selects the label from the associated Kubernetes `Pod` object which