From cd20b05eaff4e4950333f256fd73d191a87971d0 Mon Sep 17 00:00:00 2001 From: Maxim Svistunov Date: Tue, 26 Mar 2019 23:56:28 +0100 Subject: [PATCH] Multiple structure fixes --- modules/monitoring-alerting-rules.adoc | 2 +- .../configuring-the-monitoring-stack.adoc | 27 ++++++------------- ...managing-alerts-using-alertmanager-ui.adoc | 13 +++++++++ monitoring/monitoring.adoc | 8 +++--- 4 files changed, 27 insertions(+), 23 deletions(-) create mode 100644 monitoring/managing-alerts-using-alertmanager-ui.adoc diff --git a/modules/monitoring-alerting-rules.adoc b/modules/monitoring-alerting-rules.adoc index 041dc1414a..422d09b913 100644 --- a/modules/monitoring-alerting-rules.adoc +++ b/modules/monitoring-alerting-rules.adoc @@ -3,7 +3,7 @@ // * monitoring/configuring-the-monitoring-stack.adoc [id="alerting-rules-{context}"] -== Alerting rules += Alerting rules {product-title} Cluster Monitoring by default ships with a set of pre-defined alerting rules. diff --git a/monitoring/configuring-the-monitoring-stack.adoc b/monitoring/configuring-the-monitoring-stack.adoc index 857f3d663d..396dd5a1fa 100644 --- a/monitoring/configuring-the-monitoring-stack.adoc +++ b/monitoring/configuring-the-monitoring-stack.adoc @@ -32,6 +32,14 @@ Running cluster monitoring with persistent storage means that your metrics are s include::modules/monitoring-configuring-a-persistent-volume-claim.adoc[leveloffset=+2] +// .Additional resources + +// * See LINK for details. +// FIXME link to the persistent storage docs once they are available +// used to link to ../architecture/additional_concepts/storage.adoc#persistent-volumes[Persistent Storage] +// * See LINK for storage recommendations. +// FIXME add link to storage recommendations + [id="configuring-alertmanager"] == Configuring Alertmanager @@ -52,22 +60,3 @@ include::modules/monitoring-alerting-rules.adoc[leveloffset=+2] * See also link:https://prometheus.io/docs/alerting/alertmanager/[the Alertmanager documentation]. -[id='managing-alerts-using-alertmanager-ui-{context}'] -== Managing alerts using Alertmanager UI - -{product-title} 4 provides a Web interface to the Alertmanager, which enables you to manage alerts. This section demonstrates how to use the Alertmanager UI. - -include::modules/monitoring-contents-of-alertmanager-ui.adoc[leveloffset=+2] -include::modules/monitoring-getting-information-about-alerts-and-alerting-rules.adoc[leveloffset=+2] -include::modules/monitoring-silencing-alerts.adoc[leveloffset=+2] -include::modules/monitoring-getting-information-about-silences.adoc[leveloffset=+2] -include::modules/monitoring-editing-silences.adoc[leveloffset=+2] -include::modules/monitoring-expiring-silences.adoc[leveloffset=+2] - -// .Additional resources - -// * See LINK for details. -// FIXME link to the persistent storage docs once they are available -// used to link to ../architecture/additional_concepts/storage.adoc#persistent-volumes[Persistent Storage] -// * See LINK for storage recommendations. -// FIXME add link to storage recommendations diff --git a/monitoring/managing-alerts-using-alertmanager-ui.adoc b/monitoring/managing-alerts-using-alertmanager-ui.adoc new file mode 100644 index 0000000000..86d3ca4f52 --- /dev/null +++ b/monitoring/managing-alerts-using-alertmanager-ui.adoc @@ -0,0 +1,13 @@ +[id='managing-alerts-using-alertmanager-ui-{context}'] += Managing alerts using Alertmanager UI +include::../modules/common-attributes.adoc[] + +{product-title} 4 provides a Web interface to the Alertmanager, which enables you to manage alerts. This section demonstrates how to use the Alertmanager UI. + +include::modules/monitoring-contents-of-alertmanager-ui.adoc[leveloffset=+1] +include::modules/monitoring-getting-information-about-alerts-and-alerting-rules.adoc[leveloffset=+1] +include::modules/monitoring-silencing-alerts.adoc[leveloffset=+1] +include::modules/monitoring-getting-information-about-silences.adoc[leveloffset=+1] +include::modules/monitoring-editing-silences.adoc[leveloffset=+1] +include::modules/monitoring-expiring-silences.adoc[leveloffset=+1] + diff --git a/monitoring/monitoring.adoc b/monitoring/monitoring.adoc index d67e585e15..1b84ba13a5 100644 --- a/monitoring/monitoring.adoc +++ b/monitoring/monitoring.adoc @@ -3,6 +3,7 @@ include::modules/common-attributes.adoc[] :context: monitoring +:toclevels: 3 toc::[] {product-title} uses the Prometheus open source monitoring system. The stack built around Prometheus provides {product-title} cluster monitoring by default. It also provides custom-configured application monitoring as a technology preview. The cluster monitoring stack is only supported for monitoring {product-title} clusters. @@ -10,9 +11,10 @@ toc::[] [id='cluster-monitoring'] == Cluster monitoring -include::modules/monitoring-about-cluster-monitoring.adoc[leveloffset=+1] -include::monitoring/configuring-the-monitoring-stack.adoc[leveloffset=+1] -include::modules/monitoring-accessing-prometheus-alertmanager-grafana.adoc[leveloffset=+1] +include::modules/monitoring-about-cluster-monitoring.adoc[leveloffset=+2] +include::monitoring/configuring-the-monitoring-stack.adoc[leveloffset=+2] +include::monitoring/managing-alerts-using-alertmanager-ui.adoc[leveloffset=+2] +include::modules/monitoring-accessing-prometheus-alertmanager-grafana.adoc[leveloffset=+2] include::monitoring/application-monitoring.adoc[leveloffset=+1]