Skip to content

Commit f3766f0

Browse files
authored
Merge pull request #89110 from eromanova97/OBSDOCS-1720a
Fix incorrect nesting of monitoring docs
2 parents 974124b + 630830d commit f3766f0

8 files changed

+21
-21
lines changed

observability/monitoring/configuring-core-platform-monitoring/configuring-alerts-and-notifications.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ toc::[]
99
You can configure a local or external Alertmanager instance to route alerts from Prometheus to endpoint receivers. You can also attach custom labels to all time series and alerts to add useful metadata information.
1010

1111
//Configuring external Alertmanager instances
12-
include::modules/monitoring-configuring-external-alertmanagers.adoc[leveloffset=1,tags=**;CPM;!UWM]
12+
include::modules/monitoring-configuring-external-alertmanagers.adoc[leveloffset=+1,tags=**;CPM;!UWM]
1313

1414
// Disabling the local Alertmanager
1515
include::modules/monitoring-disabling-the-local-alertmanager.adoc[leveloffset=+2]
@@ -21,9 +21,9 @@ include::modules/monitoring-disabling-the-local-alertmanager.adoc[leveloffset=+2
2121
* xref:../../../observability/monitoring/managing-alerts/managing-alerts-as-an-administrator.adoc#managing-alerts-as-an-administrator[Managing alerts as an Administrator]
2222
2323
//Configuring secrets for Alertmanager
24-
include::modules/monitoring-configuring-secrets-for-alertmanager.adoc[leveloffset=1]
24+
include::modules/monitoring-configuring-secrets-for-alertmanager.adoc[leveloffset=+1]
2525

26-
include::modules/monitoring-adding-a-secret-to-the-alertmanager-configuration.adoc[leveloffset=2,tags=**;CPM;!UWM]
26+
include::modules/monitoring-adding-a-secret-to-the-alertmanager-configuration.adoc[leveloffset=+2,tags=**;CPM;!UWM]
2727

2828
//Attaching additional labels to your time series and alerts
2929
include::modules/monitoring-attaching-additional-labels-to-your-time-series-and-alerts.adoc[leveloffset=+1,tags=**;CPM;!UWM]

observability/monitoring/configuring-core-platform-monitoring/configuring-performance-and-scalability.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ include::modules/monitoring-choosing-a-metrics-collection-profile.adoc[leveloffs
8080
* xref:../../../nodes/clusters/nodes-cluster-enabling-features.adoc#nodes-cluster-enabling[Enabling features using feature gates]
8181

8282
//Configuring pod topology spread constraints for core platform monitoring
83-
include::modules/monitoring-configuring-pod-topology-spread-constraints.adoc[leveloffset=1,tags=**;CPM;!UWM]
83+
include::modules/monitoring-configuring-pod-topology-spread-constraints.adoc[leveloffset=+1,tags=**;CPM;!UWM]
8484

8585
[role="_additional-resources"]
8686
.Additional resources

observability/monitoring/configuring-the-monitoring-stack.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -297,14 +297,14 @@ endif::openshift-dedicated,openshift-rosa[]
297297

298298
//Configuring external Alertmanager instances
299299
// The following module should only include monitoring for user-defined projects (UWM tags)
300-
include::modules/monitoring-configuring-external-alertmanagers.adoc[leveloffset=1,tags=**;!CPM;UWM]
300+
include::modules/monitoring-configuring-external-alertmanagers.adoc[leveloffset=+1,tags=**;!CPM;UWM]
301301

302302
//Configuring secrets for Alertmanager
303-
include::modules/monitoring-configuring-secrets-for-alertmanager.adoc[leveloffset=1]
303+
include::modules/monitoring-configuring-secrets-for-alertmanager.adoc[leveloffset=+1]
304304

305305
// Adding a secret to the Alertmanager configuration
306306
// The following module should only include monitoring for user-defined projects (UWM tags)
307-
include::modules/monitoring-adding-a-secret-to-the-alertmanager-configuration.adoc[leveloffset=2,tags=**;!CPM;UWM]
307+
include::modules/monitoring-adding-a-secret-to-the-alertmanager-configuration.adoc[leveloffset=+2,tags=**;!CPM;UWM]
308308

309309
//Attaching additional labels to your time series and alerts
310310
// The following module should only include monitoring for user-defined projects (UWM tags)
@@ -319,7 +319,7 @@ ifndef::openshift-dedicated,openshift-rosa[]
319319
endif::openshift-dedicated,openshift-rosa[]
320320

321321
// Using topology spread constraints for monitoring components
322-
include::modules/monitoring-using-pod-topology-spread-constraints-for-monitoring.adoc[leveloffset=1]
322+
include::modules/monitoring-using-pod-topology-spread-constraints-for-monitoring.adoc[leveloffset=+1]
323323

324324
[role="_additional-resources"]
325325
.Additional resources
@@ -332,7 +332,7 @@ endif::openshift-dedicated,openshift-rosa[]
332332

333333
// Configuring pod topology spread constraints
334334
// The following module should only include monitoring for user-defined projects (UWM tags)
335-
include::modules/monitoring-configuring-pod-topology-spread-constraints.adoc[leveloffset=2,tags=**;!CPM;UWM]
335+
include::modules/monitoring-configuring-pod-topology-spread-constraints.adoc[leveloffset=+2,tags=**;!CPM;UWM]
336336

337337
// Setting log levels for monitoring components
338338
// The following module should only include monitoring for user-defined projects (UWM tags)

observability/monitoring/configuring-user-workload-monitoring/configuring-alerts-and-notifications-uwm.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ toc::[]
99
You can configure a local or external Alertmanager instance to route alerts from Prometheus to endpoint receivers. You can also attach custom labels to all time series and alerts to add useful metadata information.
1010

1111
//Configuring external Alertmanager instances
12-
include::modules/monitoring-configuring-external-alertmanagers.adoc[leveloffset=1,tags=**;!CPM;UWM]
12+
include::modules/monitoring-configuring-external-alertmanagers.adoc[leveloffset=+1,tags=**;!CPM;UWM]
1313

1414
//Configuring secrets for Alertmanager
15-
include::modules/monitoring-configuring-secrets-for-alertmanager.adoc[leveloffset=1]
15+
include::modules/monitoring-configuring-secrets-for-alertmanager.adoc[leveloffset=+1]
1616

17-
include::modules/monitoring-adding-a-secret-to-the-alertmanager-configuration.adoc[leveloffset=2,tags=**;!CPM;UWM]
17+
include::modules/monitoring-adding-a-secret-to-the-alertmanager-configuration.adoc[leveloffset=+2,tags=**;!CPM;UWM]
1818

1919
//Attaching additional labels to your time series and alerts
2020
include::modules/monitoring-attaching-additional-labels-to-your-time-series-and-alerts.adoc[leveloffset=+1,tags=**;!CPM;UWM]

observability/monitoring/configuring-user-workload-monitoring/configuring-performance-and-scalability-uwm.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ include::modules/monitoring-setting-scrape-and-evaluation-intervals-limits-for-u
8888
include::modules/monitoring-creating-scrape-sample-alerts.adoc[leveloffset=+2]
8989

9090
//Configuring pod topology spread constraints for monitoring of user-defined projects
91-
include::modules/monitoring-configuring-pod-topology-spread-constraints.adoc[leveloffset=1,tags=**;!CPM;UWM]
91+
include::modules/monitoring-configuring-pod-topology-spread-constraints.adoc[leveloffset=+1,tags=**;!CPM;UWM]
9292

9393
[role="_additional-resources"]
9494
.Additional resources

observability/monitoring/managing-alerts.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ The alerts, silences, and alerting rules that are available in the Alerting UI r
1818
====
1919

2020
// Accessing the Alerting UI in the Administrator and Developer perspectives
21-
include::modules/monitoring-accessing-the-alerting-ui.adoc[leveloffset=1,tags=**;ADM;!DEV]
22-
include::modules/monitoring-accessing-the-alerting-ui.adoc[leveloffset=1,tags=**;DEV;!ADM]
21+
include::modules/monitoring-accessing-the-alerting-ui.adoc[leveloffset=+1,tags=**;ADM;!DEV]
22+
include::modules/monitoring-accessing-the-alerting-ui.adoc[leveloffset=+1,tags=**;DEV;!ADM]
2323

2424
// Searching and filtering alerts, silences, and alerting rules
2525
include::modules/monitoring-searching-alerts-silences-and-alerting-rules.adoc[leveloffset=+1]
2626

2727
// Getting information about alerts, silences and alerting rules
28-
include::modules/monitoring-getting-information-about-alerts-silences-and-alerting-rules.adoc[leveloffset=1,tags=**;ADM;!DEV]
29-
include::modules/monitoring-getting-information-about-alerts-silences-and-alerting-rules.adoc[leveloffset=1,tags=**;DEV;!ADM]
28+
include::modules/monitoring-getting-information-about-alerts-silences-and-alerting-rules.adoc[leveloffset=+1,tags=**;ADM;!DEV]
29+
include::modules/monitoring-getting-information-about-alerts-silences-and-alerting-rules.adoc[leveloffset=+1,tags=**;DEV;!ADM]
3030

3131
[role="_additional-resources"]
3232
.Additional resources

observability/monitoring/managing-alerts/managing-alerts-as-a-developer.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ The alerts, silences, and alerting rules that are available in the Alerting UI r
1414
====
1515

1616
// Accessing the Alerting UI from the Developer perspective
17-
include::modules/monitoring-accessing-the-alerting-ui.adoc[leveloffset=1,tags=**;DEV;!ADM]
17+
include::modules/monitoring-accessing-the-alerting-ui.adoc[leveloffset=+1,tags=**;DEV;!ADM]
1818

1919
[role="_additional-resources"]
2020
.Additional resources
2121

2222
* xref:../../../observability/monitoring/about-ocp-monitoring/key-concepts.adoc#searching-alerts-silences-and-alerting-rules_key-concepts[Searching and filtering alerts, silences, and alerting rules]
2323
2424
// Getting information about alerts, silences and alerting rules from the Developer perspective
25-
include::modules/monitoring-getting-information-about-alerts-silences-and-alerting-rules.adoc[leveloffset=1,tags=**;DEV;!ADM]
25+
include::modules/monitoring-getting-information-about-alerts-silences-and-alerting-rules.adoc[leveloffset=+1,tags=**;DEV;!ADM]
2626

2727
[role="_additional-resources"]
2828
.Additional resources

observability/monitoring/managing-alerts/managing-alerts-as-an-administrator.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ The alerts, silences, and alerting rules that are available in the Alerting UI r
1414
====
1515

1616
// Accessing the Alerting UI from the Administrator perspective
17-
include::modules/monitoring-accessing-the-alerting-ui.adoc[leveloffset=1,tags=**;ADM;!DEV]
17+
include::modules/monitoring-accessing-the-alerting-ui.adoc[leveloffset=+1,tags=**;ADM;!DEV]
1818

1919
[role="_additional-resources"]
2020
.Additional resources
2121

2222
* xref:../../../observability/monitoring/about-ocp-monitoring/key-concepts.adoc#searching-alerts-silences-and-alerting-rules_key-concepts[Searching and filtering alerts, silences, and alerting rules]
2323
2424
// Getting information about alerts, silences and alerting rules from the Administrator perspective
25-
include::modules/monitoring-getting-information-about-alerts-silences-and-alerting-rules.adoc[leveloffset=1,tags=**;ADM;!DEV]
25+
include::modules/monitoring-getting-information-about-alerts-silences-and-alerting-rules.adoc[leveloffset=+1,tags=**;ADM;!DEV]
2626

2727
[role="_additional-resources"]
2828
.Additional resources

0 commit comments

Comments
 (0)