From 7672f462ededc339dab529a13bd876a87bcf837c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=27Perk=27=20Sto=C5=BCek?= Date: Fri, 28 Aug 2020 16:59:30 +0200 Subject: [PATCH 1/3] Add FluentD version info to documentation --- deploy/README.md | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/deploy/README.md b/deploy/README.md index d13bddebc6..e411fc0b24 100644 --- a/deploy/README.md +++ b/deploy/README.md @@ -54,13 +54,14 @@ kubectl | 1.15.0 The following matrix displays the tested package versions for our Helm chart. -Sumo Logic Helm Chart | Prometheus Operator | Fluent Bit | Falco | Metrics Server -|:-------- |:-------- |:-------- |:-------- |:-------- -1.1.0 - Latest | 8.13.8 | 2.8.14 | 1.1.8 | 2.11.1 -1.0.0 | 8.2.0 | 2.8.1 | 1.1.6 | 2.7.0 -0.17.0 - 0.17.1 | 8.2.0 | 2.8.1 | 1.1.0 | 2.7.0 -0.14.0 - 0.16.0 | 8.2.0 | 2.8.1 | 1.1.1 | 2.7.0 -0.13.0 | 8.2.0 | 2.8.1 | 1.0.11 | 2.7.0 -0.12.0 | 8.2.0 | 2.8.1 | 1.0.9 | - -0.9.0 - 0.11.0 | 6.2.1 | 2.4.4 | 1.0.8 | - -0.6.0 - 0.8.0 | 6.2.1 | 2.4.4 | 1.0.5 | - +Sumo Logic Helm Chart | Prometheus Operator | FluentD | Fluent Bit | Falco | Metrics Server +|:-------- |:-------- |:-------- |:-------- |:-------- |:-------- +1.2.0 - Latest | 8.13.8 | 1.11.1 | 2.8.14 | 1.1.8 | 2.11.1 +1.1.0 | 8.13.8 | 1.8.1 | 2.8.14 | 1.1.8 | 2.11.1 +1.0.0 | 8.2.0 | 1.8.1 | 2.8.1 | 1.1.6 | 2.7.0 +0.17.0 - 0.17.1 | 8.2.0 | 1.6.3 | 2.8.1 | 1.1.0 | 2.7.0 +0.14.0 - 0.16.0 | 8.2.0 | 1.6.3 | 2.8.1 | 1.1.1 | 2.7.0 +0.13.0 | 8.2.0 | 1.6.3 | 2.8.1 | 1.0.11 | 2.7.0 +0.12.0 | 8.2.0 | 1.6.3 | 2.8.1 | 1.0.9 | - +0.9.0 - 0.11.0 | 6.2.1 | 1.6.3 | 2.4.4 | 1.0.8 | - +0.6.0 - 0.8.0 | 6.2.1 | 1.6.3 | 2.4.4 | 1.0.5 | - From 30c57dc5e64c8ded92f090dff8721c59a5b21bcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=27Perk=27=20Sto=C5=BCek?= Date: Fri, 28 Aug 2020 17:06:28 +0200 Subject: [PATCH 2/3] Bump documentation version to 1.2 --- README.md | 3 ++- deploy/docs/Upgrading_with_Helm.md | 2 +- deploy/docs/existingPrometheusDoc.md | 2 +- deploy/docs/standAlonePrometheus.md | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ef545b5bad..bdae3b28ec 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,8 @@ Detailed instructions are available in our Installation Guides below. Sumo Logic Helm Chart Version | version | status | |--|--| -|[v1.1](https://github.com/SumoLogic/sumologic-kubernetes-collection/tree/release-v1.1/deploy/README.md) | current / supported | +|[v1.2](https://github.com/SumoLogic/sumologic-kubernetes-collection/tree/release-v1.2/deploy/README.md) | current / supported | +|[v1.1](https://github.com/SumoLogic/sumologic-kubernetes-collection/tree/release-v1.1/deploy/README.md) | deprecated | |[v1.0](https://github.com/SumoLogic/sumologic-kubernetes-collection/tree/release-v1.0/deploy/README.md) | deprecated | |[v0.17](https://github.com/SumoLogic/sumologic-kubernetes-collection/tree/release-v0.17/deploy/README.md) | deprecated / supported | diff --git a/deploy/docs/Upgrading_with_Helm.md b/deploy/docs/Upgrading_with_Helm.md index 192f70038d..855e7e5200 100644 --- a/deploy/docs/Upgrading_with_Helm.md +++ b/deploy/docs/Upgrading_with_Helm.md @@ -34,7 +34,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/release-v1.1/deploy/helm/sumologic/values.yaml +curl https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/release-v1.2/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 041da4b5a2..8a80a50fda 100644 --- a/deploy/docs/existingPrometheusDoc.md +++ b/deploy/docs/existingPrometheusDoc.md @@ -90,7 +90,7 @@ Run the following commands to update the [remote write configuration](https://pr Run the following command to download our prometheus-overrides.yaml file. Please review our configuration as it will be applied to your existing operator configuration. ```bash -curl -LJO https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/release-v1.1/deploy/helm/prometheus-overrides.yaml +curl -LJO https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/release-v1.2/deploy/helm/prometheus-overrides.yaml ``` Next you can upgrade your Prometheus-Operator. The following command assumes it is installed with the release name `prometheus-operator`. Remember, this command will update your Prometheus Operator to be configured with our default settings. If you wish to preserve your settings and merge with what is required for Sumo logic, then please look at the section on [how to merge the configuration](#merge-prometheus-configuration). diff --git a/deploy/docs/standAlonePrometheus.md b/deploy/docs/standAlonePrometheus.md index a530c6f1e5..51279e701c 100644 --- a/deploy/docs/standAlonePrometheus.md +++ b/deploy/docs/standAlonePrometheus.md @@ -70,7 +70,7 @@ helm upgrade --install my-release sumologic/sumologic --set sumologic.accessId=< First, Download the Prometheus Operator `prometheus-overrides.yaml` by running ```bash -$ curl -LJO https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/release-v1.1/deploy/helm/prometheus-overrides.yaml +$ curl -LJO https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/release-v1.2/deploy/helm/prometheus-overrides.yaml ``` Next, make the following modifications to the `remoteWrite` section of the `prometheus-overrides.yaml` file: From 811be0e3bc5d42fa6e64f63276e1f81a6f3210ba Mon Sep 17 00:00:00 2001 From: Marcin Stozek <58700054+perk-sumo@users.noreply.github.com> Date: Fri, 28 Aug 2020 18:15:42 +0200 Subject: [PATCH 3/3] Update deploy/README.md (0.17.1 -> 0.17.4) Co-authored-by: Dominik Rosiek <58699848+sumo-drosiek@users.noreply.github.com> --- deploy/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/README.md b/deploy/README.md index e411fc0b24..43a7af8e65 100644 --- a/deploy/README.md +++ b/deploy/README.md @@ -59,7 +59,7 @@ Sumo Logic Helm Chart | Prometheus Operator | FluentD | Fluent Bit | Falco | Me 1.2.0 - Latest | 8.13.8 | 1.11.1 | 2.8.14 | 1.1.8 | 2.11.1 1.1.0 | 8.13.8 | 1.8.1 | 2.8.14 | 1.1.8 | 2.11.1 1.0.0 | 8.2.0 | 1.8.1 | 2.8.1 | 1.1.6 | 2.7.0 -0.17.0 - 0.17.1 | 8.2.0 | 1.6.3 | 2.8.1 | 1.1.0 | 2.7.0 +0.17.0 - 0.17.4 | 8.2.0 | 1.6.3 | 2.8.1 | 1.1.0 | 2.7.0 0.14.0 - 0.16.0 | 8.2.0 | 1.6.3 | 2.8.1 | 1.1.1 | 2.7.0 0.13.0 | 8.2.0 | 1.6.3 | 2.8.1 | 1.0.11 | 2.7.0 0.12.0 | 8.2.0 | 1.6.3 | 2.8.1 | 1.0.9 | -