From b6e265a3c4f1180ab21d66ef4232de12d2270574 Mon Sep 17 00:00:00 2001 From: Tejeev Date: Fri, 29 Oct 2021 19:10:04 +0100 Subject: [PATCH 1/2] I think these instructions were incorrect for 2.6 Since the instructions appeared to reference steps in the path that doesn't exist when installing from Apps & Marketplace, I updated with a path that is shorter and correct for 2.6.x --- .../guides/enable-monitoring/_index.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/content/rancher/v2.6/en/monitoring-alerting/guides/enable-monitoring/_index.md b/content/rancher/v2.6/en/monitoring-alerting/guides/enable-monitoring/_index.md index cf84b6cbf65..153c67c2eda 100644 --- a/content/rancher/v2.6/en/monitoring-alerting/guides/enable-monitoring/_index.md +++ b/content/rancher/v2.6/en/monitoring-alerting/guides/enable-monitoring/_index.md @@ -29,11 +29,9 @@ For more information about the default limits, see [this page.]({{}}/ra 1. Click **☰ > Cluster Management**. 1. Go to the cluster that you created and click **Explore**. -1. Click **Apps & Marketplace**. -1. Click **Charts**. -1. Click the **Monitoring** app. -1. Optional: Click **Chart Options** and configure alerting, Prometheus and Grafana. For help, refer to the [configuration reference.]({{}}/rancher/v2.6/en/monitoring-alerting/configuration/helm-chart-options/) -1. Scroll to the bottom of the Helm chart README and click **Install**. +1. Click **Cluster Tools** (bottom left corner). +1. Click **Install** by Monitoring. +1. Optional: Click **Customize Helm options before install** to configure alerting, Prometheus and Grafana. For help, refer to the [configuration reference.]({{}}/rancher/v2.6/en/monitoring-alerting/configuration/helm-chart-options/) **Result:** The monitoring app is deployed in the `cattle-monitoring-system` namespace. @@ -63,4 +61,4 @@ cert.pem=`base64-content` key.pfx=`base64-content` ``` -Then **Cert File Path** would be set to `/etc/alertmanager/secrets/cert.pem`. \ No newline at end of file +Then **Cert File Path** would be set to `/etc/alertmanager/secrets/cert.pem`. From a5ebfbd4358cb897d553e785d7708b254bb60394 Mon Sep 17 00:00:00 2001 From: Tejeev Date: Fri, 29 Oct 2021 19:16:47 +0100 Subject: [PATCH 2/2] Corrected the optional config step Corrected the optional config step as the Helm Options page is clearly not what it's talking about --- .../en/monitoring-alerting/guides/enable-monitoring/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/rancher/v2.6/en/monitoring-alerting/guides/enable-monitoring/_index.md b/content/rancher/v2.6/en/monitoring-alerting/guides/enable-monitoring/_index.md index 153c67c2eda..29c21812eb9 100644 --- a/content/rancher/v2.6/en/monitoring-alerting/guides/enable-monitoring/_index.md +++ b/content/rancher/v2.6/en/monitoring-alerting/guides/enable-monitoring/_index.md @@ -31,7 +31,7 @@ For more information about the default limits, see [this page.]({{}}/ra 1. Go to the cluster that you created and click **Explore**. 1. Click **Cluster Tools** (bottom left corner). 1. Click **Install** by Monitoring. -1. Optional: Click **Customize Helm options before install** to configure alerting, Prometheus and Grafana. For help, refer to the [configuration reference.]({{}}/rancher/v2.6/en/monitoring-alerting/configuration/helm-chart-options/) +1. Optional: Customize requests, limits and more for Alerting, Prometheus, and Grafana in the Values step. For help, refer to the [configuration reference.]({{}}/rancher/v2.6/en/monitoring-alerting/configuration/helm-chart-options/) **Result:** The monitoring app is deployed in the `cattle-monitoring-system` namespace.