From 4b73f6b985600434de94379c0c3781cd12ef634e Mon Sep 17 00:00:00 2001 From: Colin Griffin Date: Sat, 1 May 2021 10:30:55 -0400 Subject: [PATCH 1/4] add clarification for RKE Template managed clusters --- content/rancher/v2.5/en/monitoring-alerting/migrating/_index.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/rancher/v2.5/en/monitoring-alerting/migrating/_index.md b/content/rancher/v2.5/en/monitoring-alerting/migrating/_index.md index 7d4253f8c64..8504249cda3 100644 --- a/content/rancher/v2.5/en/monitoring-alerting/migrating/_index.md +++ b/content/rancher/v2.5/en/monitoring-alerting/migrating/_index.md @@ -46,6 +46,8 @@ Before you can install Monitoring V2, Monitoring V1 needs to be uninstalled comp * Disable the cluster monitoring installation under Cluster -> Tools -> Monitoring * Ensure that the cluster-monitoring app and the monitoring-operator app in the System project have been removed and are not recreated after a few minutes +If your cluster is managed using an RKE template: To prevent legacy monitoring from being re-enabled, disable Monitoring in future RKE template revisions. + #### Migrating Grafana Dashboards You can migrate any dashboard added to Grafana in Monitoring V1 to Monitoring V2. In Monitoring V1 you can export an existing dashboard like this: From 3e7ed31dbbea515aeb7a2a183c064a7db9c46fdf Mon Sep 17 00:00:00 2001 From: Colin Griffin Date: Sat, 1 May 2021 10:33:58 -0400 Subject: [PATCH 2/4] verbiage for consistency --- content/rancher/v2.5/en/monitoring-alerting/migrating/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/rancher/v2.5/en/monitoring-alerting/migrating/_index.md b/content/rancher/v2.5/en/monitoring-alerting/migrating/_index.md index 8504249cda3..c3b5a444ce7 100644 --- a/content/rancher/v2.5/en/monitoring-alerting/migrating/_index.md +++ b/content/rancher/v2.5/en/monitoring-alerting/migrating/_index.md @@ -46,7 +46,7 @@ Before you can install Monitoring V2, Monitoring V1 needs to be uninstalled comp * Disable the cluster monitoring installation under Cluster -> Tools -> Monitoring * Ensure that the cluster-monitoring app and the monitoring-operator app in the System project have been removed and are not recreated after a few minutes -If your cluster is managed using an RKE template: To prevent legacy monitoring from being re-enabled, disable Monitoring in future RKE template revisions. +If the cluster is managed using an RKE template: To prevent legacy monitoring from being re-enabled, disable Monitoring in future RKE template revisions. #### Migrating Grafana Dashboards From 3a10cba498e12f745c8ef1287626d0f6929db2f5 Mon Sep 17 00:00:00 2001 From: Colin Griffin Date: Wed, 19 May 2021 14:27:03 -0400 Subject: [PATCH 3/4] Add variable examples for rke template requirements --- .../v2.5/en/monitoring-alerting/migrating/_index.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/content/rancher/v2.5/en/monitoring-alerting/migrating/_index.md b/content/rancher/v2.5/en/monitoring-alerting/migrating/_index.md index c3b5a444ce7..e5c077755ee 100644 --- a/content/rancher/v2.5/en/monitoring-alerting/migrating/_index.md +++ b/content/rancher/v2.5/en/monitoring-alerting/migrating/_index.md @@ -46,7 +46,14 @@ Before you can install Monitoring V2, Monitoring V1 needs to be uninstalled comp * Disable the cluster monitoring installation under Cluster -> Tools -> Monitoring * Ensure that the cluster-monitoring app and the monitoring-operator app in the System project have been removed and are not recreated after a few minutes -If the cluster is managed using an RKE template: To prevent legacy monitoring from being re-enabled, disable Monitoring in future RKE template revisions. +#### RKE Template Clusters + +To prevent v1 monitoring from being re-enabled, disable monitoring and in future RKE template revisions via modification of the RKE template yaml: + +```yaml +enable_cluster_alerting: true +enable_cluster_monitoring: true +``` #### Migrating Grafana Dashboards From 90fd25fe29c74d3cb2fdba8e986de6bc4955c102 Mon Sep 17 00:00:00 2001 From: Colin Griffin Date: Thu, 27 May 2021 11:12:19 -0400 Subject: [PATCH 4/4] update values to false --- .../rancher/v2.5/en/monitoring-alerting/migrating/_index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/rancher/v2.5/en/monitoring-alerting/migrating/_index.md b/content/rancher/v2.5/en/monitoring-alerting/migrating/_index.md index e5c077755ee..2dc21fd1374 100644 --- a/content/rancher/v2.5/en/monitoring-alerting/migrating/_index.md +++ b/content/rancher/v2.5/en/monitoring-alerting/migrating/_index.md @@ -51,8 +51,8 @@ Before you can install Monitoring V2, Monitoring V1 needs to be uninstalled comp To prevent v1 monitoring from being re-enabled, disable monitoring and in future RKE template revisions via modification of the RKE template yaml: ```yaml -enable_cluster_alerting: true -enable_cluster_monitoring: true +enable_cluster_alerting: false +enable_cluster_monitoring: false ``` #### Migrating Grafana Dashboards