From 0d0c2df00fbea82a8ab27109f8d29a378d676d85 Mon Sep 17 00:00:00 2001
From: Maisie Wang <maisie@sumologic.com>
Date: Mon, 27 Jan 2020 14:30:59 -0800
Subject: [PATCH 1/3] Add back and expose source category for events source

---
 deploy/helm/sumologic/templates/setup/setup-configmap.yaml | 1 +
 deploy/helm/sumologic/values.yaml                          | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/deploy/helm/sumologic/templates/setup/setup-configmap.yaml b/deploy/helm/sumologic/templates/setup/setup-configmap.yaml
index 49dc594bc9..61962df5d7 100644
--- a/deploy/helm/sumologic/templates/setup/setup-configmap.yaml
+++ b/deploy/helm/sumologic/templates/setup/setup-configmap.yaml
@@ -94,6 +94,7 @@ data:
 
     resource "sumologic_http_source" "events_source" {
         name         = local.events-source-name
+        category     = {{ if .Values.sumologic.eventsSourceCategory }}{{ .Values.sumologic.eventsSourceCategory }}{{- else}}{{ "${var.cluster_name}/${local.events-source-name}" }}{{- end}}
         collector_id = "${sumologic_collector.collector.id}"
     }
 
diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml
index 03c6cf325e..49edf8c288 100644
--- a/deploy/helm/sumologic/values.yaml
+++ b/deploy/helm/sumologic/values.yaml
@@ -85,6 +85,9 @@ sumologic:
   # If enabled, collect K8s events
   eventCollectionEnabled: true
 
+  # Source category for the Events source. Default: "{clusterName}/events"
+  #eventsSourceCategory: ""
+
   ## Format to post logs into Sumo. json, json_merge, or text
   logFormat: fields
 

From f5b141cfde7ba5a6f2d297e3d2e672cd8bb78cbd Mon Sep 17 00:00:00 2001
From: Maisie Wang <maisie@sumologic.com>
Date: Mon, 27 Jan 2020 15:00:09 -0800
Subject: [PATCH 2/3] Rename

---
 deploy/helm/sumologic/templates/setup/setup-configmap.yaml | 2 +-
 deploy/helm/sumologic/values.yaml                          | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/deploy/helm/sumologic/templates/setup/setup-configmap.yaml b/deploy/helm/sumologic/templates/setup/setup-configmap.yaml
index 61962df5d7..9d3ff46b9d 100644
--- a/deploy/helm/sumologic/templates/setup/setup-configmap.yaml
+++ b/deploy/helm/sumologic/templates/setup/setup-configmap.yaml
@@ -94,7 +94,7 @@ data:
 
     resource "sumologic_http_source" "events_source" {
         name         = local.events-source-name
-        category     = {{ if .Values.sumologic.eventsSourceCategory }}{{ .Values.sumologic.eventsSourceCategory }}{{- else}}{{ "${var.cluster_name}/${local.events-source-name}" }}{{- end}}
+        category     = {{ if .Values.sumologic.events.sourceCategory }}{{ .Values.sumologic.events.sourceCategory }}{{- else}}{{ "${var.cluster_name}/${local.events-source-name}" }}{{- end}}
         collector_id = "${sumologic_collector.collector.id}"
     }
 
diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml
index 49edf8c288..0aab647521 100644
--- a/deploy/helm/sumologic/values.yaml
+++ b/deploy/helm/sumologic/values.yaml
@@ -85,8 +85,9 @@ sumologic:
   # If enabled, collect K8s events
   eventCollectionEnabled: true
 
-  # Source category for the Events source. Default: "{clusterName}/events"
-  #eventsSourceCategory: ""
+  events:
+    # Source category for the Events source. Default: "{clusterName}/events"
+    sourceCategory: ""
 
   ## Format to post logs into Sumo. json, json_merge, or text
   logFormat: fields

From 68fc8d5faf4f2906434c276353c5135ac317ab35 Mon Sep 17 00:00:00 2001
From: Travis CI <travis@travis-ci.org>
Date: Mon, 27 Jan 2020 23:06:31 +0000
Subject: [PATCH 3/3] Generate new 'setup-sumologic.yaml.tmpl'

---
 deploy/kubernetes/setup-sumologic.yaml.tmpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/deploy/kubernetes/setup-sumologic.yaml.tmpl b/deploy/kubernetes/setup-sumologic.yaml.tmpl
index 743274de07..6b0d92004b 100644
--- a/deploy/kubernetes/setup-sumologic.yaml.tmpl
+++ b/deploy/kubernetes/setup-sumologic.yaml.tmpl
@@ -92,6 +92,7 @@ data:
 
     resource "sumologic_http_source" "events_source" {
         name         = local.events-source-name
+        category     = ${var.cluster_name}/${local.events-source-name}
         collector_id = "${sumologic_collector.collector.id}"
     }