From 0b4ed7781815d614934cd666c1cdb0e307ec3fbc Mon Sep 17 00:00:00 2001 From: loganhz Date: Thu, 21 Mar 2019 13:55:08 +0800 Subject: [PATCH] Update nav for alerting and logging --- content/rancher/v2.x/en/tools/logging/custom/_index.md | 2 ++ .../v2.x/en/tools/logging/elasticsearch/_index.md | 2 +- content/rancher/v2.x/en/tools/logging/fluentd/_index.md | 2 +- content/rancher/v2.x/en/tools/logging/kafka/_index.md | 2 +- content/rancher/v2.x/en/tools/logging/splunk/_index.md | 2 +- content/rancher/v2.x/en/tools/logging/syslog/_index.md | 2 +- .../rancher/v2.x/en/tools/notifiers-and-alerts/_index.md | 9 +++++++-- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/content/rancher/v2.x/en/tools/logging/custom/_index.md b/content/rancher/v2.x/en/tools/logging/custom/_index.md index c1d0e20a5c1..573a8fc845a 100644 --- a/content/rancher/v2.x/en/tools/logging/custom/_index.md +++ b/content/rancher/v2.x/en/tools/logging/custom/_index.md @@ -3,6 +3,8 @@ title: Custom weight: 700 --- +_Available as of v2.2.0_ + You can configure Rancher to send Kubernetes logs to Elasticsearch, Splunk, Kafka, Syslog or Fluentd. ## Configuring Advance Mode diff --git a/content/rancher/v2.x/en/tools/logging/elasticsearch/_index.md b/content/rancher/v2.x/en/tools/logging/elasticsearch/_index.md index cca0cd9cc05..66929ec2b24 100644 --- a/content/rancher/v2.x/en/tools/logging/elasticsearch/_index.md +++ b/content/rancher/v2.x/en/tools/logging/elasticsearch/_index.md @@ -24,7 +24,7 @@ If you're a [project owner or member]({{< baseurl >}}/rancher/v2.x/en/admin-sett 1. From the **Global** view, open the project that you want to configure logging for. -1. From the main menu, select **Tools > Logging**. +1. From the main menu, select **Tools > Logging**. In versions prior to v2.2.0, you can choose **Resources > Logging**. {{% /accordion %}} 1. Select **Elasticsearch**. diff --git a/content/rancher/v2.x/en/tools/logging/fluentd/_index.md b/content/rancher/v2.x/en/tools/logging/fluentd/_index.md index 1983043ec7b..a52867e00c9 100755 --- a/content/rancher/v2.x/en/tools/logging/fluentd/_index.md +++ b/content/rancher/v2.x/en/tools/logging/fluentd/_index.md @@ -26,7 +26,7 @@ If you're a [project owner or member]({{< baseurl >}}/rancher/v2.x/en/admin-sett 1. From the **Global** view, open the project that you want to configure logging for. -1. From the main menu, select **Tools > Logging**. +1. From the main menu, select **Tools > Logging**. In versions prior to v2.2.0, you can choose **Resources > Logging**. {{% /accordion %}} 1. Select **Fluentd**. diff --git a/content/rancher/v2.x/en/tools/logging/kafka/_index.md b/content/rancher/v2.x/en/tools/logging/kafka/_index.md index eec86b541d3..2237e99f6ce 100644 --- a/content/rancher/v2.x/en/tools/logging/kafka/_index.md +++ b/content/rancher/v2.x/en/tools/logging/kafka/_index.md @@ -22,7 +22,7 @@ If you're a [project owner or member]({{< baseurl >}}/rancher/v2.x/en/admin-sett 1. From the **Global** view, open the project that you want to configure logging for. -1. From the main menu, select **Tools > Logging**. +1. From the main menu, select **Tools > Logging**. In versions prior to v2.2.0, you can choose **Resources > Logging**. {{% /accordion %}} 1. Select **Kafka**. diff --git a/content/rancher/v2.x/en/tools/logging/splunk/_index.md b/content/rancher/v2.x/en/tools/logging/splunk/_index.md index fa12846df7e..1765a0080b4 100755 --- a/content/rancher/v2.x/en/tools/logging/splunk/_index.md +++ b/content/rancher/v2.x/en/tools/logging/splunk/_index.md @@ -31,7 +31,7 @@ If you're a [project owner or member]({{< baseurl >}}/rancher/v2.x/en/admin-sett 1. From the **Global** view, open the project that you want to configure logging for. -1. From the main menu, select **Tools > Logging**. +1. From the main menu, select **Tools > Logging**. In versions prior to v2.2.0, you can choose **Resources > Logging**. {{% /accordion %}} 1. Select **Splunk**. diff --git a/content/rancher/v2.x/en/tools/logging/syslog/_index.md b/content/rancher/v2.x/en/tools/logging/syslog/_index.md index 96c6d1e50d0..6b9d3c22668 100644 --- a/content/rancher/v2.x/en/tools/logging/syslog/_index.md +++ b/content/rancher/v2.x/en/tools/logging/syslog/_index.md @@ -25,7 +25,7 @@ If you're a [project owner or member]({{< baseurl >}}/rancher/v2.x/en/admin-sett 1. From the **Global** view, open the project that you want to configure logging for. -1. From the main menu, select **Tools > Logging**. +1. From the main menu, select **Tools > Logging**. In versions prior to v2.2.0, you can choose **Resources > Logging**. {{% /accordion %}} diff --git a/content/rancher/v2.x/en/tools/notifiers-and-alerts/_index.md b/content/rancher/v2.x/en/tools/notifiers-and-alerts/_index.md index 6da0e7c051b..4b2f5e41ab9 100644 --- a/content/rancher/v2.x/en/tools/notifiers-and-alerts/_index.md +++ b/content/rancher/v2.x/en/tools/notifiers-and-alerts/_index.md @@ -66,6 +66,9 @@ Set up a notifier so that you can begin configuring and sending alerts. 1. Click **Test**. If the test is successful, the URL you're configuring as a notifier outputs `Webhook setting validated`. {{% /accordion %}} {{% accordion id="WeChat" label="WeChat" %}} + +_Available as of v2.2.0_ + 1. Enter a **Name** for the notifier. 1. In the **Corporation ID** field, enter the "EnterpriseID" of your corporation, you could get it from [Profile page](https://work.weixin.qq.com/wework_admin/frame#profile). 1. From Enterprise WeChat, create an application in the [Application page](https://work.weixin.qq.com/wework_admin/frame#apps), and then enter the "AgentId" and "Secret" of this application to the **Application Agent ID** and **Application Secret** fields. @@ -315,7 +318,9 @@ After you set up cluster alerts, you can manage each alert object. To manage ale 1. From the **Global** view, open the project that you want to configure alerts for. -1. From the main menu, select **Tools > Alerts**. Then click **Add Alert Group**. +1. From the main menu, select **Tools > Alerts**. In versions prior to v2.2.0, you can choose **Resources > Alerts**. + +1. Click **Add Alert Group**. 1. Enter a **Name** for the alert that describes its purpose, you could group alert rules for the different purpose. @@ -441,7 +446,7 @@ This alert type monitors for the overload from Prometheus expression querying, i #### Managing Project Alerts -To manage project alerts, browse to the project that alerts you want to manage. Then select **Tools > Alerts**. You can: +To manage project alerts, browse to the project that alerts you want to manage. Then select **Tools > Alerts**. In versions prior to v2.2.0, you can choose **Resources > Alerts**. You can: - Deactivate/Reactive alerts - Edit alert settings