diff --git a/deploy/helm/sumologic/templates/events-configmap.yaml b/deploy/helm/sumologic/templates/events-configmap.yaml index 8c7e3ad7a4..2e0c736014 100644 --- a/deploy/helm/sumologic/templates/events-configmap.yaml +++ b/deploy/helm/sumologic/templates/events-configmap.yaml @@ -1,3 +1,4 @@ +{{- if eq .Values.sumologic.eventCollectionEnabled true }} apiVersion: v1 kind: ConfigMap metadata: @@ -8,4 +9,5 @@ metadata: data: fluent.conf: |- @include events.conf - {{- (tpl (.Files.Glob "conf/events/*.conf").AsConfig .) | nindent 2 }} \ No newline at end of file + {{- (tpl (.Files.Glob "conf/events/*.conf").AsConfig .) | nindent 2 }} +{{- end }} \ No newline at end of file diff --git a/deploy/helm/sumologic/templates/events-deployment.yaml b/deploy/helm/sumologic/templates/events-deployment.yaml index ff7e355000..4e5ec7793e 100644 --- a/deploy/helm/sumologic/templates/events-deployment.yaml +++ b/deploy/helm/sumologic/templates/events-deployment.yaml @@ -1,3 +1,4 @@ +{{- if eq .Values.sumologic.eventCollectionEnabled true }} apiVersion: apps/v1 kind: Deployment metadata: @@ -67,4 +68,4 @@ spec: value: {{ .Values.sumologic.chunkLimitSize | quote }} - name: TOTAL_LIMIT_SIZE value: {{ .Values.sumologic.totalLimitSize | quote }} - +{{- end }} \ No newline at end of file diff --git a/deploy/helm/sumologic/templates/events-service.yaml b/deploy/helm/sumologic/templates/events-service.yaml index 2a7a039354..c1d4bc4eee 100644 --- a/deploy/helm/sumologic/templates/events-service.yaml +++ b/deploy/helm/sumologic/templates/events-service.yaml @@ -1,3 +1,4 @@ +{{- if eq .Values.sumologic.eventCollectionEnabled true }} apiVersion: v1 kind: Service metadata: @@ -13,3 +14,4 @@ spec: port: 24231 targetPort: 24231 protocol: TCP +{{- end }} \ No newline at end of file diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index b8ae5fb5d9..4dd34568fb 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -46,6 +46,8 @@ sumologic: # Cluster name clusterName: "kubernetes" + # If enabled, collect K8s events + eventCollectionEnabled: true ## Format to post logs into Sumo. json, json_merge, or text logFormat: fields diff --git a/deploy/kubernetes/fluentd-sumologic.yaml.tmpl b/deploy/kubernetes/fluentd-sumologic.yaml.tmpl index afc1e10b18..289d4b4b4b 100644 --- a/deploy/kubernetes/fluentd-sumologic.yaml.tmpl +++ b/deploy/kubernetes/fluentd-sumologic.yaml.tmpl @@ -228,6 +228,7 @@ data: --- # Source: sumologic/templates/events-configmap.yaml + apiVersion: v1 kind: ConfigMap metadata: @@ -325,6 +326,7 @@ roleRef: apiGroup: rbac.authorization.k8s.io --- # Source: sumologic/templates/events-service.yaml + apiVersion: v1 kind: Service metadata: @@ -340,7 +342,6 @@ spec: port: 24231 targetPort: 24231 protocol: TCP - --- # Source: sumologic/templates/service.yaml apiVersion: v1 @@ -523,6 +524,7 @@ spec: value: "true" --- # Source: sumologic/templates/events-deployment.yaml + apiVersion: apps/v1 kind: Deployment metadata: @@ -598,5 +600,3 @@ spec: value: "100k" - name: TOTAL_LIMIT_SIZE value: "128m" - -