From 7fe77713a944a0b395f5935078418ea2e0c7a5c0 Mon Sep 17 00:00:00 2001 From: Sebastian Karasek Date: Tue, 20 Oct 2020 09:45:56 +0200 Subject: [PATCH 1/2] Update link to monitoring v2.5 --- .../v2.x/en/monitoring-alerting/v2.5/migrating/_index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/rancher/v2.x/en/monitoring-alerting/v2.5/migrating/_index.md b/content/rancher/v2.x/en/monitoring-alerting/v2.5/migrating/_index.md index f28ba241414..09f97c13715 100644 --- a/content/rancher/v2.x/en/monitoring-alerting/v2.5/migrating/_index.md +++ b/content/rancher/v2.x/en/monitoring-alerting/v2.5/migrating/_index.md @@ -25,10 +25,10 @@ Unlike in Monitoring & Alerting V1, both features are packaged in a single Helm Monitoring V2 can only be configured on the cluster level. Project-level monitoring and alerting is no longer supported. -For more information on how to configure Monitoring & Alerting V2, see the [docs for monitoring in Rancher v2.5](/rancher/v2.x/en/monitoring-alerting). +For more information on how to configure Monitoring & Alerting V2, see the [docs for monitoring in Rancher v2.5](../). ### Changes to Role-based Access Control Project owners and members no longer get access to Grafana or Prometheus by default. If view-only users had access to Grafana, they would be able to see data from any namespace. For Kiali, any user can edit things they don’t own in any namespace. -For more information about role-based access control in `rancher-monitoring`, refer to [this page.](../rbac) \ No newline at end of file +For more information about role-based access control in `rancher-monitoring`, refer to [this page.](../rbac) From 43bddfbe6e4efe56e778793c7436475925a74d20 Mon Sep 17 00:00:00 2001 From: Catherine Luse Date: Tue, 20 Oct 2020 13:40:16 -0700 Subject: [PATCH 2/2] Change Rancher v2.5 monitoring configuration link --- .../v2.x/en/monitoring-alerting/v2.5/migrating/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/rancher/v2.x/en/monitoring-alerting/v2.5/migrating/_index.md b/content/rancher/v2.x/en/monitoring-alerting/v2.5/migrating/_index.md index 09f97c13715..28b629bb432 100644 --- a/content/rancher/v2.x/en/monitoring-alerting/v2.5/migrating/_index.md +++ b/content/rancher/v2.x/en/monitoring-alerting/v2.5/migrating/_index.md @@ -25,7 +25,7 @@ Unlike in Monitoring & Alerting V1, both features are packaged in a single Helm Monitoring V2 can only be configured on the cluster level. Project-level monitoring and alerting is no longer supported. -For more information on how to configure Monitoring & Alerting V2, see the [docs for monitoring in Rancher v2.5](../). +For more information on how to configure Monitoring & Alerting V2, see [this page.]({{}}/rancher/v2.x/en/monitoring-alerting/v2.5/configuration) ### Changes to Role-based Access Control