Merge branch 'main' into rsi/loki-distributed-force-nginx-resolve-dns…

…-proxy-pass
grafana · Jul 8, 2024 · 72238a5 · 72238a5
2 parents dcb512f + e733d04
commit 72238a5
Show file tree

Hide file tree

Showing 14 changed files with 34 additions and 23 deletions.
diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: grafana
-version: 8.3.1
+version: 8.3.2
 appVersion: 11.1.0
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.

diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml
@@ -242,7 +242,7 @@ service:
   appProtocol: ""
 
 serviceMonitor:
-  ## If true, a ServiceMonitor CRD is created for a prometheus operator
+  ## If true, a ServiceMonitor CR is created for a prometheus operator
   ## https://github.com/coreos/prometheus-operator
   ##
   enabled: false

diff --git a/charts/lgtm-distributed/Chart.yaml b/charts/lgtm-distributed/Chart.yaml
@@ -3,7 +3,7 @@ apiVersion: v2
 name: lgtm-distributed
 description: Umbrella chart for a distributed Loki, Grafana, Tempo and Mimir stack
 type: application
-version: 2.0.0
+version: 2.1.0
 appVersion: "^7.3.9"
 
 home: https://grafana.com/oss/
@@ -60,3 +60,8 @@ dependencies:
     condition: tempo.enabled
     repository: "https://grafana.github.io/helm-charts"
     version: "^1.9.2"
+  - name: oncall
+    alias: grafana-oncall
+    condition: grafana-oncall.enabled
+    repository: "https://grafana.github.io/helm-charts"
+    version: "^1.3.114"
diff --git a/charts/lgtm-distributed/README.md b/charts/lgtm-distributed/README.md
@@ -1,6 +1,6 @@
 # lgtm-distributed
 
-![Version: 2.0.0](https://img.shields.io/badge/Version-2.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: ^7.3.9](https://img.shields.io/badge/AppVersion-^7.3.9-informational?style=flat-square)
+![Version: 2.1.0](https://img.shields.io/badge/Version-2.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: ^7.3.9](https://img.shields.io/badge/AppVersion-^7.3.9-informational?style=flat-square)
 
 Umbrella chart for a distributed Loki, Grafana, Tempo and Mimir stack
 
@@ -27,12 +27,14 @@ Umbrella chart for a distributed Loki, Grafana, Tempo and Mimir stack
 | https://grafana.github.io/helm-charts | grafana(grafana) | ^7.3.9 |
 | https://grafana.github.io/helm-charts | loki(loki-distributed) | ^0.79.0 |
 | https://grafana.github.io/helm-charts | mimir(mimir-distributed) | ^5.3.0 |
+| https://grafana.github.io/helm-charts | grafana-oncall(oncall) | ^1.3.114 |
 | https://grafana.github.io/helm-charts | tempo(tempo-distributed) | ^1.9.2 |
 
 ## Values
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
+| grafana-oncall.enabled | bool | `false` | Deploy Grafana OnCall if enabled. See [upstream values.yaml](https://github.com/grafana/oncall/blob/dev/helm/oncall/values.yaml) for full values reference. |
 | grafana.datasources | object | `{"datasources.yaml":{"apiVersion":1,"datasources":[{"isDefault":false,"name":"Loki","type":"loki","uid":"loki","url":"http://{{ .Release.Name }}-loki-gateway"},{"isDefault":true,"name":"Mimir","type":"prometheus","uid":"prom","url":"http://{{ .Release.Name }}-mimir-nginx/prometheus"},{"isDefault":false,"jsonData":{"lokiSearch":{"datasourceUid":"loki"},"serviceMap":{"datasourceUid":"prom"},"tracesToLogsV2":{"datasourceUid":"loki"},"tracesToMetrics":{"datasourceUid":"prom"}},"name":"Tempo","type":"tempo","uid":"tempo","url":"http://{{ .Release.Name }}-tempo-query-frontend:3100"}]}}` | Grafana data sources config. Connects to all three by default |
 | grafana.datasources."datasources.yaml".datasources | list | `[{"isDefault":false,"name":"Loki","type":"loki","uid":"loki","url":"http://{{ .Release.Name }}-loki-gateway"},{"isDefault":true,"name":"Mimir","type":"prometheus","uid":"prom","url":"http://{{ .Release.Name }}-mimir-nginx/prometheus"},{"isDefault":false,"jsonData":{"lokiSearch":{"datasourceUid":"loki"},"serviceMap":{"datasourceUid":"prom"},"tracesToLogsV2":{"datasourceUid":"loki"},"tracesToMetrics":{"datasourceUid":"prom"}},"name":"Tempo","type":"tempo","uid":"tempo","url":"http://{{ .Release.Name }}-tempo-query-frontend:3100"}]` | Datasources linked to the Grafana instance. Override if you disable any components. |
 | grafana.enabled | bool | `true` | Deploy Grafana if enabled. See [upstream readme](https://github.com/grafana/helm-charts/tree/main/charts/grafana#configuration) for full values reference. |

diff --git a/charts/lgtm-distributed/values.yaml b/charts/lgtm-distributed/values.yaml
@@ -106,3 +106,7 @@ tempo:
   enabled: true
   ingester:
     replicas: 1
+
+grafana-oncall:
+  # -- Deploy Grafana OnCall if enabled. See [upstream values.yaml](https://github.com/grafana/oncall/blob/dev/helm/oncall/values.yaml) for full values reference.
+  enabled: false
diff --git a/charts/promtail/Chart.yaml b/charts/promtail/Chart.yaml
@@ -3,7 +3,7 @@ name: promtail
 description: Promtail is an agent which ships the contents of local logs to a Loki instance
 type: application
 appVersion: 3.0.0
-version: 6.16.2
+version: 6.16.3
 home: https://grafana.com/loki
 sources:
   - https://github.com/grafana/loki

diff --git a/charts/promtail/README.md b/charts/promtail/README.md
@@ -1,6 +1,6 @@
 # promtail
 
-![Version: 6.16.2](https://img.shields.io/badge/Version-6.16.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square)
+![Version: 6.16.3](https://img.shields.io/badge/Version-6.16.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square)
 
 Promtail is an agent which ships the contents of local logs to a Loki instance
 
@@ -119,7 +119,7 @@ The new release which will pick up again from the existing `positions.yaml`.
 | image.pullPolicy | string | `"IfNotPresent"` | Docker image pull policy |
 | image.registry | string | `"docker.io"` | The Docker registry |
 | image.repository | string | `"grafana/promtail"` | Docker image repository |
-| image.tag | string | `nil` | Overrides the image tag whose default is the chart's appVersion |
+| image.tag | string | `""` | Overrides the image tag whose default is the chart's appVersion |
 | imagePullSecrets | list | `[]` | Image pull secrets for Docker images |
 | initContainer | list | `[]` |  |
 | livenessProbe | object | `{}` | Liveness probe |

diff --git a/charts/promtail/templates/_helpers.tpl b/charts/promtail/templates/_helpers.tpl
@@ -36,8 +36,8 @@ Common labels
 {{- define "promtail.labels" -}}
 helm.sh/chart: {{ include "promtail.chart" . }}
 {{ include "promtail.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- if or .Chart.AppVersion .Values.image.tag }}
+app.kubernetes.io/version: {{ mustRegexReplaceAllLiteral "@sha.*" .Values.image.tag "" | default .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}

diff --git a/charts/promtail/values.yaml b/charts/promtail/values.yaml
@@ -100,7 +100,7 @@ image:
   # -- Docker image repository
   repository: grafana/promtail
   # -- Overrides the image tag whose default is the chart's appVersion
-  tag: null
+  tag: ""
   # -- Docker image pull policy
   pullPolicy: IfNotPresent
 

diff --git a/charts/tempo-distributed/Chart.lock b/charts/tempo-distributed/Chart.lock
@@ -4,9 +4,9 @@ dependencies:
   version: 4.0.12
 - name: grafana-agent-operator
   repository: https://grafana.github.io/helm-charts
-  version: 0.2.2
+  version: 0.4.0
 - name: rollout-operator
   repository: https://grafana.github.io/helm-charts
-  version: 0.15.0
-digest: sha256:7be5c7a4c0d1a71dc6de69b8e99ac5a61c1771d6241e7f9105393cc7117d4f0a
-generated: "2024-05-27T19:15:20.601670632+03:00"
+  version: 0.16.0
+digest: sha256:504a9bfa69a6d4130c496ed3382add7679b8aed30c1320a418831bdbea4e0ace
+generated: "2024-07-02T12:00:59.197303-04:00"
diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: tempo-distributed
 description: Grafana Tempo in MicroService mode
 type: application
-version: 1.13.2
+version: 1.14.0
 appVersion: 2.5.0
 engine: gotpl
 home: https://grafana.com/docs/tempo/latest/
@@ -30,11 +30,11 @@ dependencies:
     condition: minio.enabled
   - name: grafana-agent-operator
     alias: grafana-agent-operator
-    version: 0.2.2
+    version: 0.4.0
     repository: https://grafana.github.io/helm-charts
     condition: metaMonitoring.grafanaAgent.installOperator
   - name: rollout-operator
     alias: rollout_operator
     repository: https://grafana.github.io/helm-charts
-    version: 0.15.0
+    version: 0.16.0
     condition: rollout_operator.enabled
diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md
@@ -1,6 +1,6 @@
 # tempo-distributed
 
-![Version: 1.13.2](https://img.shields.io/badge/Version-1.13.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square)
+![Version: 1.14.0](https://img.shields.io/badge/Version-1.14.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square)
 
 Grafana Tempo in MicroService mode
 
@@ -13,8 +13,8 @@ Grafana Tempo in MicroService mode
 | Repository | Name | Version |
 |------------|------|---------|
 | https://charts.min.io/ | minio(minio) | 4.0.12 |
-| https://grafana.github.io/helm-charts | grafana-agent-operator(grafana-agent-operator) | 0.2.2 |
-| https://grafana.github.io/helm-charts | rollout_operator(rollout-operator) | 0.15.0 |
+| https://grafana.github.io/helm-charts | grafana-agent-operator(grafana-agent-operator) | 0.4.0 |
+| https://grafana.github.io/helm-charts | rollout_operator(rollout-operator) | 0.16.0 |
 
 ## Chart Repo
 

diff --git a/charts/tempo-vulture/Chart.yaml b/charts/tempo-vulture/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: tempo-vulture
 description: Grafana Tempo Vulture - A tool to monitor Tempo performance.
 type: application
-version: 0.4.1
-appVersion: 2.2.3
+version: 0.5.0
+appVersion: 2.5.0
 engine: gotpl
 home: https://grafana.com/docs/tempo/latest/
 icon: https://raw.githubusercontent.com/grafana/tempo/master/docs/tempo/website/logo_and_name.png

diff --git a/charts/tempo-vulture/README.md b/charts/tempo-vulture/README.md
@@ -1,6 +1,6 @@
 # tempo-vulture
 
-![Version: 0.4.1](https://img.shields.io/badge/Version-0.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.3](https://img.shields.io/badge/AppVersion-2.2.3-informational?style=flat-square)
+![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square)
 
 Grafana Tempo Vulture - A tool to monitor Tempo performance.