fix(kube-monitoring): ensure unique file names in plutono (#329)

cloudoperators · Aug 20, 2024 · e06397d · e06397d
1 parent 9a23086
commit e06397d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/kube-monitoring/charts/Chart.yaml b/kube-monitoring/charts/Chart.yaml
@@ -8,7 +8,7 @@ maintainers:
 name: kube-monitoring
 sources:
   - https://github.com/cloudoperators/greenhouse-extensions
-version: 0.12.1
+version: 0.12.2
 # prometheus-operator app version
 appVersion: v0.75.1
 keywords:

diff --git a/kube-monitoring/charts/templates/_datasource.tpl b/kube-monitoring/charts/templates/_datasource.tpl
@@ -41,7 +41,7 @@ datasources:
     # <bool> Toggles whether the data source is pre-selected
     # for new panels. You can set only one default
     # data source per organization.
-    isDefault: true
+    isDefault: false
     # <map> Fields to convert to JSON and store in jsonData.
     jsonData:
       httpMethod: 'POST'

diff --git a/kube-monitoring/charts/templates/datasource-secret.yaml b/kube-monitoring/charts/templates/datasource-secret.yaml
@@ -8,5 +8,5 @@ metadata:
     plutono-datasource: "true"
 {{- include "kube-prometheus-stack.labels" . | indent 4 }}
 data:
-  datasource.yaml: {{ include (print $.Template.BasePath "/_datasource.tpl") . | b64enc }}
+  {{ printf "%s-%s" $.Release.Name "datasource.yaml" }}: {{ include (print $.Template.BasePath "/_datasource.tpl") . | b64enc }}
 {{- end }}
diff --git a/kube-monitoring/plugindefinition.yaml b/kube-monitoring/plugindefinition.yaml
@@ -6,15 +6,15 @@ kind: PluginDefinition
 metadata:
   name: kube-monitoring
 spec:
-  version: 2.1.0
+  version: 2.1.1
   displayName: Kubernetes monitoring
   description: Native deployment and management of Prometheus along with Kubernetes cluster monitoring components.
   docMarkDownUrl: https://raw.githubusercontent.com/cloudoperators/greenhouse-extensions/main/kube-monitoring/README.md
   icon: https://raw.githubusercontent.com/cloudoperators/greenhouse-extensions/main/kube-monitoring/logo.png
   helmChart:
     name: kube-monitoring
     repository: oci://ghcr.io/cloudoperators/greenhouse-extensions/charts
-    version: 0.12.0
+    version: 0.12.2
   options:
     - name: kubeMonitoring.prometheus.ingress.enabled
       description: Ingress exposes prometheus outside the cluster