Merge pull request #349 from SumoLogic/maisie-remove-source-categories

Remove source categories from source creation in terraform script
SumoLogic · Jan 10, 2020 · 1ad0302 · 1ad0302
2 parents 46ae8c0 + 30300c5
commit 1ad0302
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 18 deletions.
diff --git a/deploy/helm/sumologic/templates/setup/setup-configmap.yaml b/deploy/helm/sumologic/templates/setup/setup-configmap.yaml
@@ -84,55 +84,46 @@ data:
 
     resource "sumologic_http_source" "default_metrics_source" {
         name         = local.default-metrics-source-name
-        category     = "${var.cluster_name}/${local.default-metrics-source-name}"
         collector_id = "${sumologic_collector.collector.id}"
     }
 
     resource "sumologic_http_source" "apiserver_metrics_source" {
         name         = local.apiserver-metrics-source-name
-        category     = "${var.cluster_name}/${local.apiserver-metrics-source-name}"
         collector_id = "${sumologic_collector.collector.id}"
     }
 
     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}"
     }
 
     resource "sumologic_http_source" "kube_controller_manager_metrics_source" {
         name         = local.kube-controller-manager-metrics-source-name
-        category     = "${var.cluster_name}/${local.kube-controller-manager-metrics-source-name}"
         collector_id = "${sumologic_collector.collector.id}"
     }
 
     resource "sumologic_http_source" "kube_scheduler_metrics_source" {
         name         = local.kube-scheduler-metrics-source-name
-        category     = "${var.cluster_name}/${local.kube-scheduler-metrics-source-name}"
         collector_id = "${sumologic_collector.collector.id}"
     }
 
     resource "sumologic_http_source" "kube_state_metrics_source" {
         name         = local.kube-state-metrics-source-name
-        category     = "${var.cluster_name}/${local.kube-state-metrics-source-name}"
         collector_id = "${sumologic_collector.collector.id}"
     }
 
     resource "sumologic_http_source" "kubelet_metrics_source" {
         name         = local.kubelet-metrics-source-name
-        category     = "${var.cluster_name}/${local.kubelet-metrics-source-name}"
         collector_id = "${sumologic_collector.collector.id}"
     }
 
     resource "sumologic_http_source" "logs_source" {
         name         = local.logs-source-name
-        category     = "${var.cluster_name}/${local.logs-source-name}"
         collector_id = "${sumologic_collector.collector.id}"
     }
 
     resource "sumologic_http_source" "node_exporter_metrics_source" {
         name         = local.node-exporter-metrics-source-name
-        category     = "${var.cluster_name}/${local.node-exporter-metrics-source-name}"
         collector_id = "${sumologic_collector.collector.id}"
     }
 

diff --git a/deploy/kubernetes/setup-sumologic.yaml.tmpl b/deploy/kubernetes/setup-sumologic.yaml.tmpl
@@ -82,55 +82,46 @@ data:
 
     resource "sumologic_http_source" "default_metrics_source" {
         name         = local.default-metrics-source-name
-        category     = "${var.cluster_name}/${local.default-metrics-source-name}"
         collector_id = "${sumologic_collector.collector.id}"
     }
 
     resource "sumologic_http_source" "apiserver_metrics_source" {
         name         = local.apiserver-metrics-source-name
-        category     = "${var.cluster_name}/${local.apiserver-metrics-source-name}"
         collector_id = "${sumologic_collector.collector.id}"
     }
 
     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}"
     }
 
     resource "sumologic_http_source" "kube_controller_manager_metrics_source" {
         name         = local.kube-controller-manager-metrics-source-name
-        category     = "${var.cluster_name}/${local.kube-controller-manager-metrics-source-name}"
         collector_id = "${sumologic_collector.collector.id}"
     }
 
     resource "sumologic_http_source" "kube_scheduler_metrics_source" {
         name         = local.kube-scheduler-metrics-source-name
-        category     = "${var.cluster_name}/${local.kube-scheduler-metrics-source-name}"
         collector_id = "${sumologic_collector.collector.id}"
     }
 
     resource "sumologic_http_source" "kube_state_metrics_source" {
         name         = local.kube-state-metrics-source-name
-        category     = "${var.cluster_name}/${local.kube-state-metrics-source-name}"
         collector_id = "${sumologic_collector.collector.id}"
     }
 
     resource "sumologic_http_source" "kubelet_metrics_source" {
         name         = local.kubelet-metrics-source-name
-        category     = "${var.cluster_name}/${local.kubelet-metrics-source-name}"
         collector_id = "${sumologic_collector.collector.id}"
     }
 
     resource "sumologic_http_source" "logs_source" {
         name         = local.logs-source-name
-        category     = "${var.cluster_name}/${local.logs-source-name}"
         collector_id = "${sumologic_collector.collector.id}"
     }
 
     resource "sumologic_http_source" "node_exporter_metrics_source" {
         name         = local.node-exporter-metrics-source-name
-        category     = "${var.cluster_name}/${local.node-exporter-metrics-source-name}"
         collector_id = "${sumologic_collector.collector.id}"
     }