Merge pull request #3183 from Sheikh-Abubaker/oncall-pr

[lgtm-distributed] Add Grafana OnCall to the chart dependencies. Co-authored-by: Sheikh-Abubaker <sheikhabubaker761@gmail.com>
grafana · Jul 5, 2024 · 0cd31ea · 0cd31ea
2 parents 8b5ec7d + 001102f
commit 0cd31ea
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
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