From 3ba099011a4bd5574334ea38360dd2743001c34b Mon Sep 17 00:00:00 2001 From: Kjeld Schouten Date: Tue, 27 Feb 2024 18:17:01 +0100 Subject: [PATCH] fix: correct grafana dashboard label --- charts/enterprise/blocky/Chart.yaml | 2 +- charts/enterprise/blocky/values.yaml | 17 ++++++++++++-- charts/enterprise/traefik/Chart.yaml | 2 +- charts/enterprise/traefik/values.yaml | 13 ++++++++++- charts/operators/cert-manager/Chart.yaml | 2 +- charts/operators/cert-manager/values.yaml | 27 +++++++++++----------- charts/operators/cloudnative-pg/Chart.yaml | 2 +- charts/stable/prowlarr/Chart.yaml | 2 +- charts/stable/prowlarr/values.yaml | 8 +++++++ 9 files changed, 54 insertions(+), 21 deletions(-) diff --git a/charts/enterprise/blocky/Chart.yaml b/charts/enterprise/blocky/Chart.yaml index bcf27aa7925..692b45d3b93 100644 --- a/charts/enterprise/blocky/Chart.yaml +++ b/charts/enterprise/blocky/Chart.yaml @@ -44,4 +44,4 @@ sources: - https://hub.docker.com/r/spx01/blocky - https://quay.io/oriedge/k8s_gateway type: application -version: 13.1.3 +version: 13.2.1 diff --git a/charts/enterprise/blocky/values.yaml b/charts/enterprise/blocky/values.yaml index ab99e82e840..81b12205dae 100644 --- a/charts/enterprise/blocky/values.yaml +++ b/charts/enterprise/blocky/values.yaml @@ -296,11 +296,21 @@ k8sgateway: options: - name: tls_servername value: cloudflare-dns.com + +configmap: + dashboard: + enabled: true + labels: + grafana_dashboard: '1' + data: + blocky.json: >- + {{ .Files.Get "dashboard.json" | indent 8 }} + metrics: main: # -- Enable and configure a Prometheus serviceMonitor for the chart under this key. # @default -- See values.yaml - enabled: false + enabled: true type: "servicemonitor" endpoints: - port: main @@ -322,6 +332,9 @@ metrics: # for: 5m # labels: # severity: critical + + + redis: enabled: true # CANNOT be defined in above yaml section @@ -342,4 +355,4 @@ cnpg: enabled: false user: blocky database: blocky -updated: true + diff --git a/charts/enterprise/traefik/Chart.yaml b/charts/enterprise/traefik/Chart.yaml index 9ef4d0bd01c..283edf1eb98 100644 --- a/charts/enterprise/traefik/Chart.yaml +++ b/charts/enterprise/traefik/Chart.yaml @@ -36,4 +36,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/enterprise/traefik - https://github.com/truecharts/containers/tree/master/apps/traefik type: application -version: 26.1.3 +version: 26.2.1 diff --git a/charts/enterprise/traefik/values.yaml b/charts/enterprise/traefik/values.yaml index 26c2803abc7..890c35b68de 100644 --- a/charts/enterprise/traefik/values.yaml +++ b/charts/enterprise/traefik/values.yaml @@ -119,14 +119,25 @@ logs: format: common metrics: main: - enabled: false + enabled: true type: servicemonitor endpoints: - port: metrics path: /metrics targetSelector: metrics + globalArguments: - "--global.checknewversion" + +configmap: + dashboard: + enabled: true + labels: + grafana_dashboard: '1' + data: + traefik.json: >- + {{ .Files.Get "dashboard.json" | indent 8 }} + ## # -- Additional arguments to be passed at Traefik's binary # All available options available on https://docs.traefik.io/reference/static-configuration/cli/ diff --git a/charts/operators/cert-manager/Chart.yaml b/charts/operators/cert-manager/Chart.yaml index b29790ed811..8775bdf7bb5 100644 --- a/charts/operators/cert-manager/Chart.yaml +++ b/charts/operators/cert-manager/Chart.yaml @@ -43,4 +43,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/operators/cert-manager - https://github.com/truecharts/containers/tree/master/apps/alpine type: application -version: 4.1.4 +version: 4.1.6 diff --git a/charts/operators/cert-manager/values.yaml b/charts/operators/cert-manager/values.yaml index 28b18caf84c..f8409389d61 100644 --- a/charts/operators/cert-manager/values.yaml +++ b/charts/operators/cert-manager/values.yaml @@ -1,5 +1,5 @@ image: - repository: tccr.io/tccr/alpine + repository: tccr.io/tccr/scratch pullPolicy: IfNotPresent tag: latest@sha256:ade0065e19edaa4f6903d464ee70605111a48394536deb94f31b661264704558 @@ -21,22 +21,23 @@ portal: operator: register: true +configmap: + dashboard: + enabled: true + labels: + grafana_dashboard: '1' + data: + cert-manager.json: >- + {{ .Files.Get "dashboard.json" | indent 8 }} + certmanager: dns01RecursiveNameservers: "1.1.1.1:53,1.0.0.1:53" dns01RecursiveNameserversOnly: false installCRDs: true enableCertificateOwnerRef: true + prometheus: + enabled: true + servicemonitor: + enabled: true -metrics: - main: - enabled: false - type: "podmonitor" - endpoints: - - port: main - interval: 5s - scrapeTimeout: 5s - path: / - honorLabels: false -manifestManager: - enabled: false diff --git a/charts/operators/cloudnative-pg/Chart.yaml b/charts/operators/cloudnative-pg/Chart.yaml index 0e6532c051a..c68fa8227fc 100644 --- a/charts/operators/cloudnative-pg/Chart.yaml +++ b/charts/operators/cloudnative-pg/Chart.yaml @@ -43,4 +43,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/operators/cloudnative-pg - https://github.com/truecharts/containers/tree/master/apps/alpine type: application -version: 6.1.3 +version: 6.2.1 diff --git a/charts/stable/prowlarr/Chart.yaml b/charts/stable/prowlarr/Chart.yaml index 5dd639cd8ef..d9f5c9d24c6 100644 --- a/charts/stable/prowlarr/Chart.yaml +++ b/charts/stable/prowlarr/Chart.yaml @@ -37,4 +37,4 @@ sources: - https://ghcr.io/onedr0p/prowlarr-develop - https://ghcr.io/onedr0p/exportarr type: application -version: 15.2.1 +version: 15.3.1 diff --git a/charts/stable/prowlarr/values.yaml b/charts/stable/prowlarr/values.yaml index 57cedc2656f..1fb134fc17f 100644 --- a/charts/stable/prowlarr/values.yaml +++ b/charts/stable/prowlarr/values.yaml @@ -91,6 +91,14 @@ persistence: exportarr: mountPath: /config readOnly: true +configmap: + dashboard: + enabled: true + labels: + grafana_dashboard: '1' + data: + prowlarr.json: >- + {{ .Files.Get "dashboard.json" | indent 8 }} metrics: main: enabled: true