diff --git a/stable/fluent-bit/Chart.yaml b/stable/fluent-bit/Chart.yaml index 600403d465..9e79d6a873 100755 --- a/stable/fluent-bit/Chart.yaml +++ b/stable/fluent-bit/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: fluent-bit -version: 2.7.2 +version: 2.7.3 appVersion: 1.2.2 description: Fast and Lightweight Log/Data Forwarder for Linux, BSD and OSX keywords: diff --git a/stable/fluent-bit/README.md b/stable/fluent-bit/README.md index 245e6b1b7f..0723d65890 100644 --- a/stable/fluent-bit/README.md +++ b/stable/fluent-bit/README.md @@ -77,6 +77,10 @@ The following table lists the configurable parameters of the Fluent-Bit chart an | `backend.splunk.tls_verify` | Force TLS certificate validation | `off` | | `backend.splunk.tls_debug` | Set TLS debug verbosity level. It accept the following values: 0-4 | `1` | | `backend.splunk.message_key` | Tag applied to all incoming logs | `kubernetes` | +| **Stackdriver Backend** | +| `backend.stackdriver.google_service_credentials` | Contents of a Google Cloud credentials JSON file. | `` | +| `backend.stackdriver.service_account_email` | Account email associated to the service. Only available if no credentials file has been provided. | `` | +| `backend.stackdriver.service_account_secret` | Private key content associated with the service account. Only available if no credentials file has been provided. | `` | | **Parsers** | | `parsers.enabled` | Enable custom parsers | `false` | | `parsers.regex` | List of regex parsers | `NULL` | diff --git a/stable/fluent-bit/templates/config.yaml b/stable/fluent-bit/templates/config.yaml index ebd941556b..534002f047 100644 --- a/stable/fluent-bit/templates/config.yaml +++ b/stable/fluent-bit/templates/config.yaml @@ -140,6 +140,17 @@ data: TLS.Verify {{ .Values.backend.splunk.tls_verify }} tls.debug {{ .Values.backend.splunk.tls_debug }} Message_Key {{ .Values.backend.splunk.message_key }} +{{ else if eq .Values.backend.type "stackdriver" }} + [OUTPUT] + Name stackdriver + Match * + resource global +{{- if .Values.backend.stackdriver.google_service_credentials }} + google_service_credentials /secure/google_service_credentials.json +{{- else }} + service_account_email {{ .Values.backend.stackdriver.service_account_email }} + service_account_secret {{ .Values.backend.stackdriver.service_account_secret }} +{{- end }} {{ else if eq .Values.backend.type "http" }} [OUTPUT] Name http diff --git a/stable/fluent-bit/templates/daemonset.yaml b/stable/fluent-bit/templates/daemonset.yaml index f69fe0ea1c..e9cbfe1562 100644 --- a/stable/fluent-bit/templates/daemonset.yaml +++ b/stable/fluent-bit/templates/daemonset.yaml @@ -114,6 +114,11 @@ spec: mountPath: /fluent-bit/etc/parsers_custom.conf subPath: parsers.conf {{- end }} +{{- if and .Values.backend.type "stackdriver" .Values.backend.stackdriver.google_service_credentials }} + - name: gcp-stackdriver-secret + mountPath: /secure/google_service_credentials.json + subPath: google_service_credentials.json +{{- end }} {{- end }} {{- if or .Values.backend.es.tls_ca .Values.backend.es.tls_secret }} - name: es-tls-secret @@ -163,6 +168,11 @@ spec: secret: secretName: {{ .Values.backend.es.tls_secret | default ( print ( include "fluent-bit.fullname" . ) "-es-tls-secret" ) | quote }} {{- end }} +{{- if and .Values.backend.type "stackdriver" .Values.backend.stackdriver.google_service_credentials }} + - name: gcp-stackdriver-secret + secret: + secretName: "{{ template "fluent-bit.fullname" . }}-gcp-stackdriver-secret" +{{- end }} {{- if .Values.trackOffsets }} - name: tail-db hostPath: diff --git a/stable/fluent-bit/templates/secret.yaml b/stable/fluent-bit/templates/secret.yaml index d08aebf8af..890747d4ef 100644 --- a/stable/fluent-bit/templates/secret.yaml +++ b/stable/fluent-bit/templates/secret.yaml @@ -1,4 +1,5 @@ {{- if not .Values.backend.es.tls_secret }} +--- apiVersion: v1 kind: Secret metadata: @@ -12,3 +13,18 @@ type: Opaque data: es-tls-ca.crt: {{ .Values.backend.es.tls_ca | b64enc | quote }} {{- end }} +{{- if eq .Values.backend.type "stackdriver" }} +--- +apiVersion: v1 +kind: Secret +metadata: + name: "{{ template "fluent-bit.fullname" . }}-gcp-stackdriver-secret" + labels: + app: {{ template "fluent-bit.name" . }} + chart: {{ .Chart.Name }}-{{ .Chart.Version }} + heritage: {{ .Release.Service }} + release: {{ .Release.Name }} +type: Opaque +data: + google_service_credentials.json: {{ .Values.backend.stackdriver.google_service_credentials | b64enc | quote }} +{{- end }} diff --git a/stable/fluent-bit/values.yaml b/stable/fluent-bit/values.yaml index 6bdcc33ce3..ff95499797 100644 --- a/stable/fluent-bit/values.yaml +++ b/stable/fluent-bit/values.yaml @@ -81,6 +81,7 @@ backend: tls_verify: "off" tls_debug: 1 message_key: "kubernetes" + stackdriver: {} ## ## Ref: http://fluentbit.io/documentation/current/output/http.html