Merge pull request #9 from AndreZiviani/deployment-integrations

allow having separate integrations config for daemonset and deployment
AndreZiviani · May 27, 2021 · 97f4136 · 97f4136
2 parents dc0134b + acd6276
commit 97f4136
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/charts/grafana-agent/Chart.yaml b/charts/grafana-agent/Chart.yaml
@@ -3,7 +3,7 @@ name: grafana-agent
 description: Grafana Agent is a telemetry collector for sending metrics, logs, and trace data to the opinionated Grafana observability stack.
 type: application
 appVersion: 0.14.0
-version: 1.0.6
+version: 1.0.7
 home: https://github.com/grafana/agent/
 sources:
   - https://grafana.com/docs/grafana-cloud/agent/

diff --git a/charts/grafana-agent/README.md b/charts/grafana-agent/README.md
@@ -1,6 +1,6 @@
 # grafana-agent
 
-![Version: 1.0.6](https://img.shields.io/badge/Version-1.0.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.14.0](https://img.shields.io/badge/AppVersion-0.14.0-informational?style=flat-square)
+![Version: 1.0.7](https://img.shields.io/badge/Version-1.0.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.14.0](https://img.shields.io/badge/AppVersion-0.14.0-informational?style=flat-square)
 
 This chart is a temporary solution while the [Operator is not finished](https://github.com/grafana/agent/pull/549),
 after that this chart will be discontinued.
@@ -44,7 +44,8 @@ A major chart version change indicates that there is an incompatible breaking ch
 | image.repository | string | `"grafana/agent"` | Docker image repository |
 | image.tag | string | `nil` | Overrides the image tag whose default is the chart's appVersion |
 | imagePullSecrets | list | `[]` | Image pull secrets for Docker images |
-| integrationsConfig | string | See `values.yaml` | Section for configuring the integrations part of the agent |
+| integrationsConfig | string | See `values.yaml` | Section for configuring the integrations part of the daemonset agents |
+| integrationsDeploymentConfig | string | See `values.yaml` | Section for configuring the integrations part of the deployment agent |
 | loki.basicAuth | object | `{}` | Credentials of the remote endpoint |
 | loki.config | string | See `values.yaml` | Section for configuring the loki part of the agent |
 | loki.enabled | bool | `true` | Enable metrics collection in daemonset mode. automatically mount /var/log and /var/lib/docker/containers to the pod when enabled |

diff --git a/charts/grafana-agent/templates/secret.yaml b/charts/grafana-agent/templates/secret.yaml
@@ -27,7 +27,7 @@ stringData:
     server:
       {{- tpl .Values.agentServerConfig . | nindent 6 }}
     integrations:
-      {{- tpl .Values.integrationsConfig . | nindent 6 }}
+      {{- tpl .Values.integrationsDeploymentConfig . | nindent 6 }}
     prometheus:
       {{- tpl .Values.prometheusDeployment.config . | nindent 6 }}
     {{- end }}
diff --git a/charts/grafana-agent/values.yaml b/charts/grafana-agent/values.yaml
@@ -119,12 +119,18 @@ extraEnvFrom: []
 agentServerConfig: |
   log_level: info
 
-# -- Section for configuring the integrations part of the agent
+# -- Section for configuring the integrations part of the daemonset agents
 # @default -- See `values.yaml`
 integrationsConfig: |
   agent:
     enabled: true
 
+# -- Section for configuring the integrations part of the deployment agent
+# @default -- See `values.yaml`
+integrationsDeploymentConfig: |
+  agent:
+    enabled: true
+
 prometheusDaemonSet:
   # -- Enable metrics collection in daemonset mode
   enabled: true