1
0
mirror of https://github.com/openshift/openshift-docs.git synced 2026-02-05 21:46:22 +01:00

Multiple structure fixes

This commit is contained in:
Maxim Svistunov
2019-03-26 23:56:28 +01:00
parent 17269dad09
commit cd20b05eaf
4 changed files with 27 additions and 23 deletions

View File

@@ -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.

View File

@@ -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

View File

@@ -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]

View File

@@ -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]