From 0c821f86a466cf22fb19ad13ac18c9b38eb56a39 Mon Sep 17 00:00:00 2001 From: Dominik Rosiek Date: Tue, 17 Mar 2020 10:55:25 +0100 Subject: [PATCH 1/3] Bump version to 0.17.0 --- README.md | 1 + deploy/docs/Helm3.md | 4 ++-- deploy/docs/Installation_with_Helm.md | 2 +- deploy/docs/Non_Helm_Installation.md | 12 ++++++------ deploy/docs/Upgrading_with_Helm.md | 2 +- deploy/docs/existingPrometheusDoc.md | 4 ++-- deploy/helm/sumologic/Chart.yaml | 4 ++-- deploy/helm/sumologic/values.yaml | 2 +- 8 files changed, 16 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 7ba22a85be..9e7248c6d4 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ Detailed instructions are available in our Installation Guides below. Sumo Logic Helm Chart Version |:-------- +[0.17.0](https://github.com/SumoLogic/sumologic-kubernetes-collection/blob/v0.17.0/deploy/README.md) [0.16.0](https://github.com/SumoLogic/sumologic-kubernetes-collection/blob/v0.16.0/deploy/README.md) [0.15.0](https://github.com/SumoLogic/sumologic-kubernetes-collection/blob/v0.15.0/deploy/README.md) [0.14.0](https://github.com/SumoLogic/sumologic-kubernetes-collection/blob/v0.14.0/deploy/README.md) diff --git a/deploy/docs/Helm3.md b/deploy/docs/Helm3.md index a6c6caac63..511bb0ca22 100644 --- a/deploy/docs/Helm3.md +++ b/deploy/docs/Helm3.md @@ -43,7 +43,7 @@ manifest_sorter.go:175: info: skipping unknown hook: "crd-install" NOTE: If you need to install the chart with a different release name or namespace you will need to override some configuration fields for both Prometheus and fluent-bit. We recommend using an override file due to the number of fields that need to be overridden. In the following command, replace the `` and `` variables with your values and then run it to download the override file with your replaced values: ```bash -curl https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/v0.16.0/deploy/helm/sumologic/values.yaml | \ +curl https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/v0.17.0/deploy/helm/sumologic/values.yaml | \ sed 's/\-sumologic.sumologic'"/-sumologic./g" | \ sed 's/\- sumologic'"/- /g" | \ sed 's/\collection'"//g" > values.yaml @@ -51,7 +51,7 @@ sed 's/\collection'"//g" > values.yaml For example, if your release name is `my-release` and namespace is `my-namespace`: ```bash -curl https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/v0.16.0/deploy/helm/sumologic/values.yaml | \ +curl https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/v0.17.0/deploy/helm/sumologic/values.yaml | \ sed 's/\-sumologic.sumologic'"/-sumologic.my-namespace/g" | \ sed 's/\collection'"/my-release/g" > values.yaml ``` diff --git a/deploy/docs/Installation_with_Helm.md b/deploy/docs/Installation_with_Helm.md index d2b548d0d1..104485b164 100644 --- a/deploy/docs/Installation_with_Helm.md +++ b/deploy/docs/Installation_with_Helm.md @@ -66,7 +66,7 @@ ebpf: To customize your configuration, download the values.yaml file by running ```bash -curl https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/v0.16.0/deploy/helm/sumologic/values.yaml +curl https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/v0.17.0/deploy/helm/sumologic/values.yaml ``` #### To install the chart with a different release name or namespace: diff --git a/deploy/docs/Non_Helm_Installation.md b/deploy/docs/Non_Helm_Installation.md index 6d9a2971d7..b2165ae557 100644 --- a/deploy/docs/Non_Helm_Installation.md +++ b/deploy/docs/Non_Helm_Installation.md @@ -72,7 +72,7 @@ kubectl create namespace sumologic Run the following command to download and apply the YAML file containing all the Kubernetes resources. Replace the ``, ``, ``, `` and `` variables with your values. ```sh -curl -s https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/v0.16.0/deploy/kubernetes/setup-sumologic.yaml.tmpl | \ +curl -s https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/v0.17.0/deploy/kubernetes/setup-sumologic.yaml.tmpl | \ sed 's/\$NAMESPACE'"//g" | \ sed 's/\$SUMOLOGIC_ACCESSID'"//g" | \ sed 's/\$SUMOLOGIC_ACCESSKEY'"//g" | \ @@ -153,7 +153,7 @@ In this step you will deploy Fluentd using a Sumo-provided .yaml manifest. If you don't need to customize the configuration apply the `fluentd-sumologic.yaml` manifest with the following command: ```sh -curl https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/v0.16.0/deploy/kubernetes/fluentd-sumologic.yaml.tmpl | \ +curl https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/v0.17.0/deploy/kubernetes/fluentd-sumologic.yaml.tmpl | \ sed 's/\$NAMESPACE'"/sumologic/g" | \ kubectl -n sumologic apply -f - ``` @@ -163,7 +163,7 @@ kubectl -n sumologic apply -f - If you need to customize the configuration there are two commands to run. First, get the `fluentd-sumologic.yaml` manifest with following command: ```sh -curl https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/v0.16.0/deploy/kubernetes/fluentd-sumologic.yaml.tmpl | \ +curl https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/v0.17.0/deploy/kubernetes/fluentd-sumologic.yaml.tmpl | \ sed 's/\$NAMESPACE'"/sumologic/g" >> fluentd-sumologic.yaml ``` @@ -191,7 +191,7 @@ In this step, you will configure the Prometheus server to write metrics to Fluen Download the Prometheus Operator `prometheus-overrides.yaml` by running ```bash -$ curl -LJO https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/v0.16.0/deploy/helm/prometheus-overrides.yaml +$ curl -LJO https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/v0.17.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. @@ -247,7 +247,7 @@ In this step, you will deploy FluentBit to forward logs to Fluentd. Run the following commands to download the FluentBit `fluent-bit-overrides.yaml` file and install `fluent-bit` ```bash -$ curl -LJO https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/v0.16.0/deploy/helm/fluent-bit-overrides.yaml +$ curl -LJO https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/v0.17.0/deploy/helm/fluent-bit-overrides.yaml $ helm fetch stable/fluent-bit --version 2.8.1 $ helm template fluent-bit-2.8.1.tgz --name fluent-bit --namespace=sumologic -f fluent-bit-overrides.yaml > fluent-bit.yaml $ kubectl apply -f fluent-bit.yaml @@ -262,7 +262,7 @@ In this step, you will deploy [Falco](https://falco.org/) to detect anomalous ac Download the file `falco-overrides.yaml` from GitHub: ```bash -$ curl -LJO https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/v0.16.0/deploy/helm/falco-overrides.yaml +$ curl -LJO https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/v0.17.0/deploy/helm/falco-overrides.yaml $ helm fetch stable/falco --version 1.0.9 $ helm template falco-1.0.9.tgz --name falco --namespace=sumologic -f falco-overrides.yaml > falco.yaml $ kubectl apply -f falco.yaml diff --git a/deploy/docs/Upgrading_with_Helm.md b/deploy/docs/Upgrading_with_Helm.md index f11621e69f..e7ce2f1f53 100644 --- a/deploy/docs/Upgrading_with_Helm.md +++ b/deploy/docs/Upgrading_with_Helm.md @@ -29,7 +29,7 @@ In the above command, since no arguments were specified, the `--reuse-values` fl **Always download the latest version of `values.yaml` from the following link and synchronize it based on your existing `values.yaml` file before running the upgrade.** ```bash -curl https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/v0.16.0/deploy/helm/sumologic/values.yaml +curl https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/v0.17.0/deploy/helm/sumologic/values.yaml ``` ### Example to upgrade using the `--version` flag: diff --git a/deploy/docs/existingPrometheusDoc.md b/deploy/docs/existingPrometheusDoc.md index ca8eb2dca2..a3585bf09d 100644 --- a/deploy/docs/existingPrometheusDoc.md +++ b/deploy/docs/existingPrometheusDoc.md @@ -13,7 +13,7 @@ Run the following to download the `values.yaml` file ```bash -curl -LJO https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/v0.16.0/deploy/helm/sumologic/values.yaml +curl -LJO https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/v0.17.0/deploy/helm/sumologic/values.yaml ``` Edit the `values.yaml` file to `prometheus-operator.enabled = false`, and run @@ -38,7 +38,7 @@ Run the following to update the [remote write configuration](https://prometheus. In the below command, replace `` with the actual namespace where the sumologic helm chart is installed. This is done to point the prometheus remote write URL to the Fluentd endpoints correctly. ```bash -curl -LJO https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/v0.16.0/deploy/helm/prometheus-overrides.yaml| \ +curl -LJO https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/v0.17.0/deploy/helm/prometheus-overrides.yaml| \ sed 's/\$(NAMESPACE)//g' prometheus-overrides.yaml > prometheus-overrides.yaml ``` diff --git a/deploy/helm/sumologic/Chart.yaml b/deploy/helm/sumologic/Chart.yaml index e83815fd39..eab57b4656 100644 --- a/deploy/helm/sumologic/Chart.yaml +++ b/deploy/helm/sumologic/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: sumologic -version: 0.16.0 -appVersion: 0.16.0 +version: 0.17.0 +appVersion: 0.17.0 description: A Helm chart for collecting Kubernetes logs, metrics and events into Sumo Logic. keywords: - monitoring diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index 175c1b8cc3..407cfc1351 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -1,6 +1,6 @@ image: repository: sumologic/kubernetes-fluentd - tag: 0.16.0 + tag: 0.17.0 pullPolicy: IfNotPresent nameOverride: "" From c6656b3e5fdb4dda710950c4a80c0aa2ad9aed84 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Tue, 17 Mar 2020 14:04:47 +0000 Subject: [PATCH 2/3] Generate new 'fluentd-sumologic.yaml.tmpl' --- deploy/kubernetes/fluentd-sumologic.yaml.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/kubernetes/fluentd-sumologic.yaml.tmpl b/deploy/kubernetes/fluentd-sumologic.yaml.tmpl index c9aa77346d..af82261793 100644 --- a/deploy/kubernetes/fluentd-sumologic.yaml.tmpl +++ b/deploy/kubernetes/fluentd-sumologic.yaml.tmpl @@ -548,7 +548,7 @@ spec: name: collection-sumologic containers: - name: fluentd - image: sumologic/kubernetes-fluentd:0.16.0 + image: sumologic/kubernetes-fluentd:0.17.0 imagePullPolicy: IfNotPresent resources: limits: @@ -707,7 +707,7 @@ spec: name: collection-sumologic-events containers: - name: fluentd-events - image: sumologic/kubernetes-fluentd:0.16.0 + image: sumologic/kubernetes-fluentd:0.17.0 imagePullPolicy: IfNotPresent resources: limits: From ff70e741799a32f95ec8be7cf2da2df97cf92ceb Mon Sep 17 00:00:00 2001 From: Travis CI Date: Tue, 17 Mar 2020 14:04:50 +0000 Subject: [PATCH 3/3] Generate new 'setup-sumologic.yaml.tmpl' --- deploy/kubernetes/setup-sumologic.yaml.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/kubernetes/setup-sumologic.yaml.tmpl b/deploy/kubernetes/setup-sumologic.yaml.tmpl index 888a3641f4..2a0c2f4804 100644 --- a/deploy/kubernetes/setup-sumologic.yaml.tmpl +++ b/deploy/kubernetes/setup-sumologic.yaml.tmpl @@ -250,7 +250,7 @@ spec: defaultMode: 0777 containers: - name: setup - image: sumologic/kubernetes-fluentd:0.16.0 + image: sumologic/kubernetes-fluentd:0.17.0 imagePullPolicy: IfNotPresent command: ["/etc/terraform/setup.sh"] volumeMounts: