From 4bc5b90289b394ecb80eae102217c8d4ecd51ed7 Mon Sep 17 00:00:00 2001 From: Maisie Wang Date: Wed, 28 Aug 2019 10:25:29 -0700 Subject: [PATCH 1/3] Use branch versions for overrides download URLs --- deploy/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/README.md b/deploy/README.md index 0cfecb035b..67a728c32c 100644 --- a/deploy/README.md +++ b/deploy/README.md @@ -224,7 +224,7 @@ This manifest binds the default `cluster-admin` ClusterRole in your Kubernetes c Download the Prometheus Operator `prometheus-overrides.yaml` from GitHub: ```sh -curl -LJO https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/master/deploy/helm/prometheus-overrides.yaml +curl -LJO https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/v0.1.0/deploy/helm/prometheus-overrides.yaml ``` Before installing `prometheus-operator`, edit `prometheus-overrides.yaml` to define a unique cluster identifier. The default value of the `cluster` field in the `externalLabels` section of `prometheus-overrides.yaml` is `kubernetes`. If you will be deploying the metric collection solution on multiple Kubernetes clusters, you will want to use a unique identifier for each. For example, you might use “Dev”, “Prod”, and so on. @@ -393,7 +393,7 @@ In this step, you will deploy FluentBit to forward logs to Fluentd. Download the FluentBit `fluent-bit-overrides.yaml` from GitHub: ```sh -curl -LJO https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/master/deploy/helm/fluent-bit-overrides.yaml +curl -LJO https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/v0.1.0/deploy/helm/fluent-bit-overrides.yaml ``` Install `fluent-bit` using Helm: From 4a0fdd233a8011f349e6f0961da3f594f790dca9 Mon Sep 17 00:00:00 2001 From: Maisie Wang Date: Wed, 28 Aug 2019 10:30:04 -0700 Subject: [PATCH 2/3] Fix labels in prometheus overrides --- deploy/helm/sumologic/values.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index ddf1324422..0c0bc8d05c 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -222,7 +222,7 @@ prometheus-operator: additionalServiceMonitors: - name: collection-sumologic additionalLabels: - k8s-app: fluentd-sumologic + app: sumologic release: prometheus-operator endpoints: - port: metrics @@ -231,10 +231,10 @@ prometheus-operator: - sumologic selector: matchLabels: - k8s-app: fluentd-sumologic + app: sumologic - name: collection-sumologic-events additionalLabels: - k8s-app: fluentd-sumologic-events + app: sumologic-events release: prometheus-operator endpoints: - port: metrics @@ -243,7 +243,7 @@ prometheus-operator: - sumologic selector: matchLabels: - k8s-app: fluentd-sumologic-events + app: sumologic-events prometheusSpec: externalLabels: # Set this to a value to distinguish between different k8s clusters From 81f9c1dba9a1939adceaf93746645ae564aab660 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Wed, 28 Aug 2019 17:35:21 +0000 Subject: [PATCH 3/3] Generate new overrides yaml file(s). --- deploy/helm/prometheus-overrides.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/deploy/helm/prometheus-overrides.yaml b/deploy/helm/prometheus-overrides.yaml index 327e3fa8e6..3b0fcd1c97 100644 --- a/deploy/helm/prometheus-overrides.yaml +++ b/deploy/helm/prometheus-overrides.yaml @@ -7,7 +7,7 @@ prometheus: additionalServiceMonitors: - name: fluentd additionalLabels: - k8s-app: fluentd-sumologic + app: sumologic release: prometheus-operator endpoints: - port: metrics @@ -16,10 +16,10 @@ prometheus: - sumologic selector: matchLabels: - k8s-app: fluentd-sumologic + app: sumologic - name: fluentd-events additionalLabels: - k8s-app: fluentd-sumologic-events + app: sumologic-events release: prometheus-operator endpoints: - port: metrics @@ -28,7 +28,7 @@ prometheus: - sumologic selector: matchLabels: - k8s-app: fluentd-sumologic-events + app: sumologic-events prometheusSpec: externalLabels: # Set this to a value to distinguish between different k8s clusters