Skip to content

Commit 4bcb1b6

Browse files
authored
Merge pull request #97115 from eromanova97/manual-cp-97059-to-4.18
[enterprise-4.18] OBSDOCS-2252: Vale dita compatibility assessment - verify assemblies
2 parents 1513860 + 6c382de commit 4bcb1b6

11 files changed

+27
-7
lines changed

observability/monitoring/about-ocp-monitoring/key-concepts.adoc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ include::modules/monitoring-understanding-metrics.adoc[leveloffset=+1]
7171
* xref:../../../observability/monitoring/accessing-metrics/accessing-metrics-as-a-developer.adoc#accessing-metrics-as-a-developer[Accessing metrics as a developer]
7272

7373
include::modules/monitoring-controlling-the-impact-of-unbound-attributes-in-user-defined-projects.adoc[leveloffset=+2]
74+
7475
include::modules/monitoring-adding-cluster-id-labels-to-metrics.adoc[leveloffset=+2]
7576

7677
//About monitoring dashboards
@@ -102,15 +103,17 @@ include::modules/monitoring-about-managing-alerts.adoc[leveloffset=+1]
102103
include::modules/monitoring-managing-silences.adoc[leveloffset=+2]
103104

104105
include::modules/monitoring-managing-core-platform-alerting-rules.adoc[leveloffset=+2]
106+
105107
include::modules/monitoring-tips-for-optimizing-alerting-rules-for-core-platform-monitoring.adoc[leveloffset=+2]
106108

107109
include::modules/monitoring-about-creating-alerting-rules-for-user-defined-projects.adoc[leveloffset=+2]
110+
108111
include::modules/monitoring-managing-alerting-rules-for-user-defined-projects.adoc[leveloffset=+2]
112+
109113
include::modules/monitoring-optimizing-alerting-for-user-defined-projects.adoc[leveloffset=+2]
110114

111115
include::modules/monitoring-searching-alerts-silences-and-alerting-rules.adoc[leveloffset=+2]
112116

113-
114117
// Overview of setting up alert routing for user-defined projects
115118
include::modules/monitoring-understanding-alert-routing-for-user-defined-projects.adoc[leveloffset=+1]
116119

observability/monitoring/about-ocp-monitoring/monitoring-stack-architecture.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,12 @@ endif::openshift-dedicated,openshift-rosa[]
2525
2626
//Components for monitoring user-defined projects
2727
include::modules/monitoring-components-for-monitoring-user-defined-projects.adoc[leveloffset=+1]
28+
2829
include::modules/monitoring-targets-for-user-defined-projects.adoc[leveloffset=+2]
2930
3031
//The monitoring stack in high-availability clusters
3132
include::modules/monitoring-monitoring-stack-in-ha-clusters.adoc[leveloffset=+1]
33+
3234
[role="_additional-resources"]
3335
.Additional resources
3436
* xref:../../../operators/operator_sdk/osdk-ha-sno.adoc#osdk-ha-sno[High-availability or single-node cluster detection and support]

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ toc::[]
88

99
You can configure the monitoring stack to optimize the performance and scale of your clusters. The following documentation provides information about how to distribute the monitoring components and control the impact of the monitoring stack on CPU and memory resources.
1010

11+
[role="_additional-resources"]
12+
.Additional resources
13+
1114
* xref:../../../observability/monitoring/about-ocp-monitoring/key-concepts.adoc#about-performance-and-scalability_key-concepts[About performance and scalability]
1215
1316
[id="controlling-placement-and-distribution-of-monitoing-components_{context}"]

observability/monitoring/configuring-core-platform-monitoring/preparing-to-configure-the-monitoring-stack.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
:_mod-docs-content-type: ASSEMBLY
22
include::_attributes/common-attributes.adoc[]
3-
43
[id="preparing-to-configure-the-monitoring-stack"]
54
= Preparing to configure core platform monitoring stack
65
:context: preparing-to-configure-the-monitoring-stack
@@ -35,5 +34,6 @@ include::modules/monitoring-granting-users-permissions-for-core-platform-monitor
3534
* xref:../../../observability/monitoring/accessing-metrics/accessing-monitoring-apis-by-using-the-cli.adoc#cmo-services-resources_accessing-monitoring-apis-by-using-the-cli[CMO services resources]
3635
3736
include::modules/monitoring-granting-user-permissions-using-the-web-console.adoc[leveloffset=+2]
37+
3838
include::modules/monitoring-granting-user-permissions-using-the-cli.adoc[leveloffset=+2,tags=**;CPM;!UWM]
3939

observability/monitoring/configuring-user-workload-monitoring/preparing-to-configure-the-monitoring-stack-uwm.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ include::modules/monitoring-enabling-the-platform-alertmanager-instance-for-user
5050
endif::openshift-dedicated,openshift-rosa[]
5151

5252
include::modules/monitoring-enabling-a-separate-alertmanager-instance-for-user-defined-alert-routing.adoc[leveloffset=+2]
53+
5354
include::modules/monitoring-granting-users-permission-to-configure-alert-routing-for-user-defined-projects.adoc[leveloffset=+2]
5455

5556
[role="_additional-resources"]
@@ -67,6 +68,7 @@ include::modules/monitoring-granting-users-permission-to-monitor-user-defined-pr
6768
* xref:../../../observability/monitoring/configuring-user-workload-monitoring/preparing-to-configure-the-monitoring-stack-uwm.adoc#granting-users-permission-to-configure-alert-routing-for-user-defined-projects_preparing-to-configure-the-monitoring-stack-uwm[Granting users permission to configure alert routing for user-defined projects]
6869

6970
include::modules/monitoring-granting-user-permissions-using-the-web-console.adoc[leveloffset=+2]
71+
7072
include::modules/monitoring-granting-user-permissions-using-the-cli.adoc[leveloffset=+2,tags=**;UWM;!CPM]
7173

7274
// Excluding a user-defined project from monitoring

observability/monitoring/getting-started/maintenance-and-support-for-monitoring.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Installing another Prometheus instance is not supported by the Red Hat Site Reli
1818
endif::openshift-dedicated,openshift-rosa[]
1919

2020
include::modules/monitoring-support-considerations.adoc[leveloffset=+1]
21+
2122
ifndef::openshift-dedicated,openshift-rosa[]
2223
include::modules/monitoring-support-policy-for-monitoring-operators.adoc[leveloffset=+1]
2324
endif::openshift-dedicated,openshift-rosa[]

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,10 @@ When you create silences, they are replicated across Alertmanager pods. However,
4646
* xref:../../../observability/monitoring/configuring-core-platform-monitoring/storing-and-recording-data.adoc#configuring-persistent-storage_storing-and-recording-data[Configuring persistent storage]
4747

4848
include::modules/monitoring-silencing-alerts.adoc[leveloffset=+2,tags=**;DEV;!ADM]
49+
4950
include::modules/monitoring-editing-silences.adoc[leveloffset=+2,tags=**;DEV;!ADM]
50-
include::modules/monitoring-expiring-silences.adoc[leveloffset=+2,tags=**;DEV;!ADM]
5151

52+
include::modules/monitoring-expiring-silences.adoc[leveloffset=+2,tags=**;DEV;!ADM]
5253

5354
[id="managing-alerting-rules-for-user-defined-projects-uwm_{context}"]
5455
== Managing alerting rules for user-defined projects
@@ -63,6 +64,7 @@ In {product-title}, you can create, view, edit, and remove alerting rules for us
6364
* xref:../../../observability/monitoring/about-ocp-monitoring/key-concepts.adoc#optimizing-alerting-for-user-defined-projects_key-concepts[Optimizing alerting for user-defined projects]
6465

6566
include::modules/monitoring-creating-alerting-rules-for-user-defined-projects.adoc[leveloffset=+2]
67+
6668
include::modules/monitoring-creating-cross-project-alerting-rules-for-user-defined-projects.adoc[leveloffset=+2]
6769

6870
[role="_additional-resources"]
@@ -71,6 +73,7 @@ include::modules/monitoring-creating-cross-project-alerting-rules-for-user-defin
7173
* link:https://prometheus.io/docs/practices/alerting/[Alerting (Prometheus documentation)]
7274

7375
include::modules/monitoring-accessing-alerting-rules-for-your-project.adoc[leveloffset=+2]
76+
7477
include::modules/monitoring-removing-alerting-rules-for-user-defined-projects.adoc[leveloffset=+2]
7578

7679
[role="_additional-resources"]

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,10 @@ When you create silences, they are replicated across Alertmanager pods. However,
4646
* xref:../../../observability/monitoring/configuring-core-platform-monitoring/storing-and-recording-data.adoc#configuring-persistent-storage_storing-and-recording-data[Configuring persistent storage]
4747

4848
include::modules/monitoring-silencing-alerts.adoc[leveloffset=+2,tags=**;ADM;!DEV]
49+
4950
include::modules/monitoring-editing-silences.adoc[leveloffset=+2,tags=**;ADM;!DEV]
50-
include::modules/monitoring-expiring-silences.adoc[leveloffset=+2,tags=**;ADM;!DEV]
5151

52+
include::modules/monitoring-expiring-silences.adoc[leveloffset=+2,tags=**;ADM;!DEV]
5253

5354
[id="managing-alerting-rules-for-core-platform-monitoring_{context}"]
5455
== Managing alerting rules for core platform monitoring
@@ -68,6 +69,7 @@ For example, you can change the `severity` label for an alert from `warning` to
6869
* xref:../../../observability/monitoring/about-ocp-monitoring/key-concepts.adoc#tips-for-optimizing-alerting-rules-for-core-platform-monitoring_key-concepts[Tips for optimizing alerting rules for core platform monitoring]
6970

7071
include::modules/monitoring-creating-new-alerting-rules.adoc[leveloffset=+2]
72+
7173
include::modules/monitoring-modifying-core-platform-alerting-rules.adoc[leveloffset=+2]
7274

7375
[role="_additional-resources"]
@@ -90,6 +92,7 @@ In {product-title}, you can create, view, edit, and remove alerting rules for us
9092
* xref:../../../observability/monitoring/about-ocp-monitoring/key-concepts.adoc#optimizing-alerting-for-user-defined-projects_key-concepts[Optimizing alerting for user-defined projects]
9193

9294
include::modules/monitoring-creating-alerting-rules-for-user-defined-projects.adoc[leveloffset=+2]
95+
9396
include::modules/monitoring-creating-cross-project-alerting-rules-for-user-defined-projects.adoc[leveloffset=+2]
9497

9598
[role="_additional-resources"]
@@ -99,7 +102,9 @@ include::modules/monitoring-creating-cross-project-alerting-rules-for-user-defin
99102
* link:https://prometheus.io/docs/practices/alerting/[Alerting (Prometheus documentation)]
100103

101104
include::modules/monitoring-listing-alerting-rules-for-all-projects-in-a-single-view.adoc[leveloffset=+2]
105+
102106
include::modules/monitoring-removing-alerting-rules-for-user-defined-projects.adoc[leveloffset=+2]
107+
103108
include::modules/monitoring-disabling-cross-project-alerting-rules-for-user-defined-projects.adoc[leveloffset=+2]
104109

105110
[role="_additional-resources"]

observability/monitoring/sd-accessing-monitoring-for-user-defined-projects.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
:_mod-docs-content-type: ASSEMBLY
2+
include::_attributes/attributes-openshift-dedicated.adoc[]
23
[id="sd-accessing-monitoring-for-user-defined-projects"]
34
= Accessing monitoring for user-defined projects
4-
include::_attributes/attributes-openshift-dedicated.adoc[]
55
:context: sd-accessing-monitoring-for-user-defined-projects
66

77
toc::[]

observability/monitoring/sd-disabling-monitoring-for-user-defined-projects.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
:_mod-docs-content-type: ASSEMBLY
2+
include::_attributes/attributes-openshift-dedicated.adoc[]
23
[id="sd-disabling-monitoring-for-user-defined-projects"]
34
= Disabling monitoring for user-defined projects
4-
include::_attributes/attributes-openshift-dedicated.adoc[]
55
:context: sd-disabling-monitoring-for-user-defined-projects
66

77
toc::[]

0 commit comments

Comments
 (0)