fix and make options configurable (#17)

* fix and make options configurable

* update dep

chart/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: kepler
   repository: https://sustainable-computing-io.github.io/kepler-helm-chart
-  version: 0.5.7
-digest: sha256:06e69896b39d58fa3bb05a05062f4cab4af4975cbe770d29baa3d17b63b4b1f5
-generated: "2024-07-31T08:52:31.96331+02:00"
+  version: 0.5.12
+digest: sha256:f9d92b78b165920760a8107aeff9e6d52908b552828464221ac6a1c417ffbb2e
+generated: "2024-12-09T08:43:28.946969+01:00"

chart/Chart.yaml

@@ -3,14 +3,15 @@ annotations:
   catalog.cattle.io/display-name: CaaS Carbon Footprint
 name: caas-carbon-footprint
 description: A Helm chart for carbon footprint measurement
-version: "0.0.14"
-appVersion: "0.0.14"
+version: "0.0.15"
+appVersion: "0.0.15"
 keywords:
   - monitoring
 dependencies:
   - name: kepler
-    version: "0.5.7"
+    version: "0.5.12"
     repository: "https://sustainable-computing-io.github.io/kepler-helm-chart"
+    condition: kepler.enabled
 sources:
   - https://github.com/sustainable-computing-io/kepler
 maintainers:

chart/templates/entsoe-secret.yaml

@@ -1,3 +1,4 @@
+{{ if .Values.entsoe.enabled }}
 {{- if .Values.entsoe.entsoe_api_key}}
 apiVersion: v1
 kind: Secret
@@ -12,4 +13,4 @@ metadata:
 data:
   entsoe_api_key: {{ .Values.entsoe.entsoe_api_key | b64enc | quote }}
 {{- end }}
-
+{{- end }}

chart/templates/entsoe-servicemonitor.yaml

@@ -1,4 +1,5 @@
 {{ if .Values.entsoe.enabled }}
+{{ if .Values.entsoe.serviceMonitor.enabled }}
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
@@ -27,3 +28,4 @@ spec:
       app.kubernetes.io/component: entsoe
       {{- include "caas-carbon-footprint.selectorLabels" . | nindent 6 }}
 {{ end }}
+{{ end }}

chart/templates/grafana-dashboards.yaml

@@ -8,6 +8,8 @@ metadata:
   {{- end }}
   labels:
     grafana_dashboard: "1"
+    {{- if .Values.rancher.cattleDashboards }}
     release: rancher-monitoring
+    {{- end }}
 data:
 {{ (.Files.Glob "files/*").AsConfig | indent 2 }}

chart/values.yaml

@@ -1,8 +1,9 @@
 # Install Kepler Exporter from Kepler Chart
 kepler:
+  enabled: true
   # dashboard setting remark: https://www.eia.gov/tools/faqs/faq.php?id=74&t=11
-  global:
-    namespace: cattle-monitoring-system
+  #global:
+  #  namespace: cattle-monitoring-system
   selectorLabels:
       app.kubernetes.io/name: caas-carbon-footprint
   image:
@@ -16,6 +17,13 @@ kepler:
     requests:
       cpu: 200m
       memory: 128Mi
+  rbac:
+    create: true
+  serviceAccount:
+    create: true
+    # name:
+  serviceMonitor:
+    enabled: true
 
 # Install Entsoe Exporter
 entsoe:
@@ -55,6 +63,7 @@ entsoe:
   # beware of the API request limit 
   # sec. 1.8 https://transparency.entsoe.eu/content/static_content/Static%20content/web%20api/Guide.html
   serviceMonitor:
+    enabled: true
     interval: 10m
   # hours back when entsoe metrics should collected
   # note: sometimes no real time data for Germany, must be at least one day back 
@@ -63,5 +72,5 @@ entsoe:
 # install app in Rancher environment
 # this will user Rancher defined namespaces and labels
 rancher:
-  enabled: true
+  enabled: false
   cattleDashboards: false