Add grafana-agent-logging-secret in the chart to store logging write …

…credentials (#21) * Add grafana-agent-logging-secret in the chart to store logging write credentials * EOF * Fix tpl * Fix values to handle loggingSecret * Fix secret * Rename default secret name * Update schema
giantswarm · Oct 26, 2023 · 56e8cf0 · 56e8cf0
1 parent 7fc92a7
commit 56e8cf0
Show file tree

Hide file tree

Showing 5 changed files with 88 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Add grafana-agent-secret in the chart to store logging write credentials.
+
+### Changed
+
+- Upgrade upstream chart to 0.27.0 and agent to 0.37.0.
+
 ## [0.2.0] - 2023-10-03
 
 ### Changed

diff --git a/helm/grafana-agent/Chart.yaml b/helm/grafana-agent/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: "v0.36.2"
+appVersion: "v0.37.0"
 name: grafana-agent
 description: Giant Swarm's Grafana Agent Deployment
 icon: https://s.giantswarm.io/app-icons/grafana/1/light.svg

diff --git a/helm/grafana-agent/templates/logging-credentials-secret.yaml b/helm/grafana-agent/templates/logging-credentials-secret.yaml
@@ -0,0 +1,14 @@
+{{- if .Values.loggingSecret.enabled }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ .Values.loggingSecret.secretName | default "grafana-agent-secret" }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "grafana-agent.labels" . | nindent 4 }}
+stringData:
+  logging-url: {{ .Values.loggingSecret.url }}
+  logging-tenant-id: {{ .Values.loggingSecret.tenantId }}
+  logging-username: {{ .Values.loggingSecret.username }}
+  logging-password: {{ .Values.loggingSecret.password }}
+{{- end }}
diff --git a/helm/grafana-agent/values.schema.json b/helm/grafana-agent/values.schema.json
@@ -5,29 +5,81 @@
         "global": {
             "type": "object",
             "properties": {
-                "imageRegistry": {
-                    "type": "string"
+                "image": {
+                    "type": "object",
+                    "properties": {
+                        "registry": {
+                            "type": "string"
+                        }
+                    }
                 }
             }
         },
         "grafana-agent": {
             "type": "object",
             "properties": {
+                "configReloader": {
+                    "type": "object",
+                    "properties": {
+                        "image": {
+                            "type": "object",
+                            "properties": {
+                                "repository": {
+                                    "type": "string"
+                                }
+                            }
+                        }
+                    }
+                },
                 "image": {
                     "type": "object",
                     "properties": {
                         "repository": {
                             "type": "string"
                         }
                     }
+                },
+                "serviceMonitor": {
+                    "type": "object",
+                    "properties": {
+                        "enabled": {
+                            "type": "boolean"
+                        }
+                    }
+                }
+            }
+        },
+        "kyvernoPolicyExceptions": {
+            "type": "object",
+            "properties": {
+                "enabled": {
+                    "type": "boolean"
+                },
+                "namespace": {
+                    "type": "string"
                 }
             }
         },
-        "serviceMonitor": {
+        "loggingSecret": {
             "type": "object",
             "properties": {
                 "enabled": {
                     "type": "boolean"
+                },
+                "password": {
+                    "type": "string"
+                },
+                "secretName": {
+                    "type": "string"
+                },
+                "tenantId": {
+                    "type": "string"
+                },
+                "url": {
+                    "type": "string"
+                },
+                "username": {
+                    "type": "string"
                 }
             }
         }

diff --git a/helm/grafana-agent/values.yaml b/helm/grafana-agent/values.yaml
@@ -7,6 +7,16 @@ kyvernoPolicyExceptions:
   enabled: true
   namespace: giantswarm
 
+# Block to manage a secret with logging credentials in order to push data to logging system
+loggingSecret:
+  enabled: false
+  ## Those values are set by the logging-operator because there are related to the cluster
+  # secretName: <secret name where are stored those credentials>
+  # url: <Loki url where to send data>
+  # tenantId: <Tenant ID>
+  # username: <user with write access>
+  # password: <user password>
+
 grafana-agent:
   image:
     # -- Grafana Agent image repository.