diff --git a/.s2i/httpd-cfg/01-commercial.conf b/.s2i/httpd-cfg/01-commercial.conf index ba65b5c84e..588816f49f 100644 --- a/.s2i/httpd-cfg/01-commercial.conf +++ b/.s2i/httpd-cfg/01-commercial.conf @@ -353,4 +353,4 @@ AddCharset utf-8 .atom .css .js .json .rss .vtt .xml Order allow,deny Deny from all Satisfy All - + \ No newline at end of file diff --git a/_topic_maps/_topic_map_osd.yml b/_topic_maps/_topic_map_osd.yml index dcb3bf3a55..df0e4883e5 100644 --- a/_topic_maps/_topic_map_osd.yml +++ b/_topic_maps/_topic_map_osd.yml @@ -130,28 +130,15 @@ Topics: Topics: - Name: Accessing the service logs File: osd-accessing-the-service-logs -- Name: Monitoring user-defined projects - Dir: osd_monitoring - Distros: openshift-dedicated - Topics: - - Name: Understanding the monitoring stack - File: osd-understanding-the-monitoring-stack - - Name: Accessing monitoring for user-defined projects - File: osd-accessing-monitoring-for-user-defined-projects - - Name: Configuring the monitoring stack - File: osd-configuring-the-monitoring-stack - - Name: Enabling alert routing for user-defined projects - File: osd-enabling-alert-routing-for-user-defined-projects - - Name: Managing metrics - File: osd-managing-metrics - - Name: Managing alerts - File: osd-managing-alerts - - Name: Reviewing monitoring dashboards - File: osd-reviewing-monitoring-dashboards - - Name: Troubleshooting monitoring issues - File: osd-troubleshooting-monitoring-issues --- -Name: Cluster security +Name: Security and compliance +Dir: security +Distros: openshift-dedicated +Topics: +- Name: Viewing audit logs + File: audit-log-view +--- +Name: Authentication and authorization Dir: authentication Distros: openshift-dedicated Topics: @@ -346,6 +333,27 @@ Topics: - Name: Exported fields File: cluster-logging-exported-fields --- +Name: Monitoring user-defined projects +Dir: monitoring +Distros: openshift-dedicated +Topics: +- Name: Understanding the monitoring stack + File: osd-understanding-the-monitoring-stack +- Name: Accessing monitoring for user-defined projects + File: osd-accessing-monitoring-for-user-defined-projects +- Name: Configuring the monitoring stack + File: osd-configuring-the-monitoring-stack +- Name: Enabling alert routing for user-defined projects + File: osd-enabling-alert-routing-for-user-defined-projects +- Name: Managing metrics + File: osd-managing-metrics +- Name: Managing alerts + File: managing-alerts +- Name: Reviewing monitoring dashboards + File: osd-reviewing-monitoring-dashboards +- Name: Troubleshooting monitoring issues + File: osd-troubleshooting-monitoring-issues +--- Name: Serverless Dir: serverless Distros: openshift-dedicated diff --git a/_topic_maps/_topic_map_rosa.yml b/_topic_maps/_topic_map_rosa.yml index 5b2d479118..1f82c2bee2 100644 --- a/_topic_maps/_topic_map_rosa.yml +++ b/_topic_maps/_topic_map_rosa.yml @@ -219,26 +219,17 @@ Topics: Distros: openshift-rosa - Name: About autoscaling nodes on a cluster File: rosa-nodes-about-autoscaling-nodes -- Name: Monitoring user-defined projects - Dir: rosa_monitoring - Distros: openshift-rosa - Topics: - - Name: Understanding the monitoring stack - File: rosa-understanding-the-monitoring-stack - - Name: Accessing monitoring for user-defined projects - File: rosa-accessing-monitoring-for-user-defined-projects - - Name: Configuring the monitoring stack - File: rosa-configuring-the-monitoring-stack - - Name: Enabling alert routing for user-defined projects - File: rosa-enabling-alert-routing-for-user-defined-projects - - Name: Managing metrics - File: rosa-managing-metrics - - Name: Managing alerts - File: rosa-managing-alerts - - Name: Reviewing monitoring dashboards - File: rosa-reviewing-monitoring-dashboards - - Name: Troubleshooting monitoring issues - File: rosa-troubleshooting-monitoring-issues +--- +Name: Security and compliance +Dir: security +Distros: openshift-rosa +Topics: +- Name: Viewing audit logs + File: audit-log-view +# - Name: Security +# File: rosa-security +# - Name: Application and cluster compliance +# File: rosa-app-security-compliance --- Name: Authentication and authorization Dir: authentication @@ -248,10 +239,6 @@ Topics: File: assuming-an-aws-iam-role-for-a-service-account - Name: Managing security context constraints File: managing-security-context-constraints -# - Name: Security -# File: rosa-security -# - Name: Application and cluster compliance -# File: rosa-app-security-compliance --- Name: Upgrading Dir: upgrading @@ -454,6 +441,27 @@ Topics: - Name: Exported fields File: cluster-logging-exported-fields --- +Name: Monitoring user-defined projects +Dir: monitoring +Distros: openshift-rosa +Topics: +- Name: Understanding the monitoring stack + File: rosa-understanding-the-monitoring-stack +- Name: Accessing monitoring for user-defined projects + File: rosa-accessing-monitoring-for-user-defined-projects +- Name: Configuring the monitoring stack + File: rosa-configuring-the-monitoring-stack +- Name: Enabling alert routing for user-defined projects + File: rosa-enabling-alert-routing-for-user-defined-projects +- Name: Managing metrics + File: rosa-managing-metrics +- Name: Managing alerts + File: managing-alerts +- Name: Reviewing monitoring dashboards + File: rosa-reviewing-monitoring-dashboards +- Name: Troubleshooting monitoring issues + File: rosa-troubleshooting-monitoring-issues +--- Name: Service Mesh Dir: service_mesh Distros: openshift-rosa @@ -939,6 +947,11 @@ Name: Troubleshooting Dir: rosa_support Distros: openshift-rosa Topics: +- Name: Remote health monitoring with connected clusters + Dir: remote_health_monitoring + Topics: + - Name: Showing data collected by remote health monitoring + File: showing-data-collected-by-remote-health-monitoring - Name: Troubleshooting expired offline access tokens File: rosa-troubleshooting-expired-tokens - Name: Troubleshooting installations diff --git a/modules/monitoring-applying-a-custom-configuration-to-alertmanager-for-user-defined-alert-routing.adoc b/modules/monitoring-applying-a-custom-configuration-to-alertmanager-for-user-defined-alert-routing.adoc index 0f85e2c33c..a4c34ba4c9 100644 --- a/modules/monitoring-applying-a-custom-configuration-to-alertmanager-for-user-defined-alert-routing.adoc +++ b/modules/monitoring-applying-a-custom-configuration-to-alertmanager-for-user-defined-alert-routing.adoc @@ -1,9 +1,6 @@ // Module included in the following assemblies: // // * monitoring/managing-alerts.adoc -// * monitoring/osd-managing-alerts.adoc -// * osd_cluster_admin/osd_monitoring/osd-managing-alerts.adoc -// * rosa_cluster_admin/rosa_monitoring/rosa-managing-alerts.adoc :_content-type: PROCEDURE [id="applying-a-custom-configuration-to-alertmanager-for-user-defined-alert-routing_{context}"] diff --git a/modules/monitoring-enabling-a-separate-alertmanager-instance-for-user-defined-alert-routing.adoc b/modules/monitoring-enabling-a-separate-alertmanager-instance-for-user-defined-alert-routing.adoc index c9630e6340..c7acc23632 100644 --- a/modules/monitoring-enabling-a-separate-alertmanager-instance-for-user-defined-alert-routing.adoc +++ b/modules/monitoring-enabling-a-separate-alertmanager-instance-for-user-defined-alert-routing.adoc @@ -2,8 +2,8 @@ // // * monitoring/enabling-alert-routing-for-user-defined-projects.adoc // * monitoring/osd-enabling-alert-routing-for-user-defined-projects.adoc -// * osd_cluster_admin/osd_monitoring/osd-enabling-alert-routing-for-user-defined-projects.adoc -// * rosa_cluster_admin/rosa_monitoring/rosa-enabling-alert-routing-for-user-defined-projects.adoc +// * monitoring/osd-enabling-alert-routing-for-user-defined-projects.adoc +// * monitoring/rosa-enabling-alert-routing-for-user-defined-projects.adoc :_content-type: PROCEDURE [id="enabling-a-separate-alertmanager-instance-for-user-defined-alert-routing_{context}"] diff --git a/modules/monitoring-granting-users-permission-to-configure-alert-routing-for-user-defined-projects.adoc b/modules/monitoring-granting-users-permission-to-configure-alert-routing-for-user-defined-projects.adoc index 582dae0770..0032bd3a2f 100644 --- a/modules/monitoring-granting-users-permission-to-configure-alert-routing-for-user-defined-projects.adoc +++ b/modules/monitoring-granting-users-permission-to-configure-alert-routing-for-user-defined-projects.adoc @@ -2,8 +2,8 @@ // // * monitoring/enabling-alert-routing-for-user-defined-projects.adoc // * monitoring/osd-enabling-alert-routing-for-user-defined-projects.adoc -// * osd_cluster_admin/osd_monitoring/osd-enabling-alert-routing-for-user-defined-projects.adoc -// * rosa_cluster_admin/rosa_monitoring/rosa-enabling-alert-routing-for-user-defined-projects.adoc +// * monitoring/osd-enabling-alert-routing-for-user-defined-projects.adoc +// * monitoring/rosa-enabling-alert-routing-for-user-defined-projects.adoc :_content-type: PROCEDURE [id="granting-users-permission-to-configure-alert-routing-for-user-defined-projects_{context}"] diff --git a/modules/monitoring-listing-alerting-rules-for-all-projects-in-a-single-view.adoc b/modules/monitoring-listing-alerting-rules-for-all-projects-in-a-single-view.adoc index bc4469078e..72b0a9773f 100644 --- a/modules/monitoring-listing-alerting-rules-for-all-projects-in-a-single-view.adoc +++ b/modules/monitoring-listing-alerting-rules-for-all-projects-in-a-single-view.adoc @@ -1,9 +1,6 @@ // Module included in the following assemblies: // // * monitoring/managing-alerts.adoc -// * monitoring/osd-managing-alerts.adoc -// * osd_cluster_admin/osd_monitoring/osd-managing-alerts.adoc -// * rosa_cluster_admin/rosa_monitoring/rosa-managing-alerts.adoc :_content-type: PROCEDURE [id="listing-alerting-rules-for-all-projects-in-a-single-view_{context}"] diff --git a/modules/monitoring-managing-alerting-rules-for-user-defined-projects.adoc b/modules/monitoring-managing-alerting-rules-for-user-defined-projects.adoc index 5c4e34be90..df6bdca8be 100644 --- a/modules/monitoring-managing-alerting-rules-for-user-defined-projects.adoc +++ b/modules/monitoring-managing-alerting-rules-for-user-defined-projects.adoc @@ -14,7 +14,7 @@ In {product-title} {product-version}, you can create, view, edit, and remove ale ifdef::openshift-rosa,openshift-dedicated[] [IMPORTANT] ==== -Managing alerting rules for user-defined projects is only available in {product-title} version 4.11 and up. +Managing alerting rules for user-defined projects is only available in {product-title} version 4.11 and later. ==== endif::[] diff --git a/modules/osd-monitoring-understanding-alert-routing-for-user-defined-projects.adoc b/modules/osd-monitoring-understanding-alert-routing-for-user-defined-projects.adoc index 069b5d50a0..84b0ebb1b3 100644 --- a/modules/osd-monitoring-understanding-alert-routing-for-user-defined-projects.adoc +++ b/modules/osd-monitoring-understanding-alert-routing-for-user-defined-projects.adoc @@ -1,8 +1,8 @@ // Module included in the following assemblies: // // * monitoring/osd-enabling-alert-routing-for-user-defined-projects.adoc -// * osd_cluster_admin/osd_monitoring/osd-enabling-alert-routing-for-user-defined-projects.adoc -// * rosa_cluster_admin/rosa_monitoring/rosa-enabling-alert-routing-for-user-defined-projects.adoc +// * monitoring/osd-enabling-alert-routing-for-user-defined-projects.adoc +// * monitoring/rosa-enabling-alert-routing-for-user-defined-projects.adoc :_content-type: CONCEPT [id="osd-understanding-alert-routing-for-user-defined-projects_{context}"] diff --git a/modules/telemetry-showing-data-collected-from-the-cluster.adoc b/modules/telemetry-showing-data-collected-from-the-cluster.adoc index 7194493934..5b6541b7b5 100644 --- a/modules/telemetry-showing-data-collected-from-the-cluster.adoc +++ b/modules/telemetry-showing-data-collected-from-the-cluster.adoc @@ -10,7 +10,14 @@ You can view the cluster and components time series data captured by Telemetry. .Prerequisites -* You have installed the {product-title} CLI (`oc`). +* You have installed the +ifdef::openshift-enterprise,openshift-webscale,openshift-origin[] +{product-title} +endif::openshift-enterprise,openshift-webscale,openshift-origin[] +ifndef::openshift-enterprise,openshift-webscale,openshift-origin[] +OpenShift Container Platform +endif::openshift-enterprise,openshift-webscale,openshift-origin[] +CLI (`oc`). * You have access to the cluster as a user with the `cluster-admin` role or the `cluster-monitoring-view` role. .Procedure diff --git a/monitoring/managing-alerts.adoc b/monitoring/managing-alerts.adoc index 10e76d7b78..492f31a036 100644 --- a/monitoring/managing-alerts.adoc +++ b/monitoring/managing-alerts.adoc @@ -49,12 +49,16 @@ include::modules/monitoring-optimizing-alerting-for-user-defined-projects.adoc[l [role="_additional-resources"] .Additional resources * See the link:https://prometheus.io/docs/practices/alerting/[Prometheus alerting documentation] for further guidelines on optimizing alerts +ifndef::openshift-rosa,openshift-dedicated[] * See xref:../monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview] for details about {product-title} {product-version} monitoring architecture +endif::[] include::modules/monitoring-creating-alerting-rules-for-user-defined-projects.adoc[leveloffset=+2] include::modules/monitoring-reducing-latency-for-alerting-rules-that-do-not-query-platform-metrics.adoc[leveloffset=+2] +ifndef::openshift-rosa,openshift-dedicated[] * See xref:../monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview] for details about {product-title} {product-version} monitoring architecture. +endif::[] include::modules/monitoring-accessing-alerting-rules-for-your-project.adoc[leveloffset=+2] include::modules/monitoring-listing-alerting-rules-for-all-projects-in-a-single-view.adoc[leveloffset=+2] @@ -72,7 +76,9 @@ include::modules/monitoring-creating-new-alerting-rules.adoc[leveloffset=+2] [role="_additional-resources"] .Additional resources +ifndef::openshift-rosa,openshift-dedicated[] * See xref:../monitoring/monitoring-overview.adoc#monitoring-overview[Monitoring overview] for details about {product-title} {product-version} monitoring architecture. +endif::[] * See the link:https://prometheus.io/docs/alerting/alertmanager/[Alertmanager documentation] for information about alerting rules. * See the link:https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config[Prometheus relabeling documentation] for information about how relabeling works. * See the link:https://prometheus.io/docs/practices/alerting/[Prometheus alerting documentation] for further guidelines on optimizing alerts. @@ -98,9 +104,11 @@ include::modules/monitoring-applying-a-custom-configuration-to-alertmanager-for- * See link:https://www.pagerduty.com/[the PagerDuty official site] for more information on PagerDuty. * See link:https://www.pagerduty.com/docs/guides/prometheus-integration-guide/[the PagerDuty Prometheus Integration Guide] to learn how to retrieve the `service_key`. * See link:https://prometheus.io/docs/alerting/configuration/[Alertmanager configuration] for configuring alerting through different alert receivers. +ifndef::openshift-rosa,openshift-dedicated[] * See xref:../monitoring/enabling-alert-routing-for-user-defined-projects.adoc#enabling-alert-routing-for-user-defined-projects[Enabling alert routing for user-defined projects] to learn how to enable a dedicated instance of Alertmanager for user-defined alert routing. == Next steps * xref:../monitoring/reviewing-monitoring-dashboards.adoc#reviewing-monitoring-dashboards[Reviewing monitoring dashboards] +endif::[] diff --git a/monitoring/osd-accessing-monitoring-for-user-defined-projects.adoc b/monitoring/osd-accessing-monitoring-for-user-defined-projects.adoc index 1e1d8b3a42..e0043e6e2c 100644 --- a/monitoring/osd-accessing-monitoring-for-user-defined-projects.adoc +++ b/monitoring/osd-accessing-monitoring-for-user-defined-projects.adoc @@ -6,9 +6,7 @@ include::_attributes/attributes-openshift-dedicated.adoc[] toc::[] -By default, centralized monitoring for user-defined projects and platform monitoring are enabled. You can monitor your own projects in {product-title} without the need for an additional monitoring solution. - -The monitoring of user-defined projects cannot be disabled. +When you install an {product-title} cluster, monitoring for user-defined projects is enabled by default. With monitoring for user-defined projects enabled, you can monitor your own {product-title} projects without the need for an additional monitoring solution. The `dedicated-admin` user has default permissions to configure and access monitoring for user-defined projects. @@ -17,7 +15,9 @@ The `dedicated-admin` user has default permissions to configure and access monit Custom Prometheus instances and the Prometheus Operator installed through Operator Lifecycle Manager (OLM) can cause issues with user-defined project monitoring if it is enabled. Custom Prometheus instances are not supported. ==== +Optionally, you can disable monitoring for user-defined projects during or after a cluster installation. + [id="accessing-user-defined-monitoring-next-steps"] == Next steps -* xref:../monitoring/osd-managing-metrics.adoc#osd-managing-metrics[Managing metrics] +* xref:../monitoring/osd-configuring-the-monitoring-stack.adoc#osd-configuring-the-monitoring-stack[Configuring the monitoring stack] diff --git a/monitoring/osd-configuring-the-monitoring-stack.adoc b/monitoring/osd-configuring-the-monitoring-stack.adoc index 2e054bfedb..312900c092 100644 --- a/monitoring/osd-configuring-the-monitoring-stack.adoc +++ b/monitoring/osd-configuring-the-monitoring-stack.adoc @@ -79,4 +79,4 @@ include::modules/osd-monitoring-setting-log-levels-for-monitoring-components.ado [id="configuring-the-monitoring-stack-next-steps"] == Next steps -* xref:../monitoring/osd-accessing-monitoring-for-user-defined-projects.adoc#osd-accessing-monitoring-for-user-defined-projects[Accessing monitoring for user-defined projects] +* xref:../monitoring/osd-managing-metrics.adoc#osd-managing-metrics[Managing metrics] diff --git a/monitoring/osd-enabling-alert-routing-for-user-defined-projects.adoc b/monitoring/osd-enabling-alert-routing-for-user-defined-projects.adoc index 5f7ad96bfb..90fea2985d 100644 --- a/monitoring/osd-enabling-alert-routing-for-user-defined-projects.adoc +++ b/monitoring/osd-enabling-alert-routing-for-user-defined-projects.adoc @@ -7,7 +7,14 @@ include::_attributes/attributes-openshift-dedicated.adoc[] toc::[] [role="_abstract"] -In {product-title}, a cluster administrator can enable alert routing for user-defined projects. This process consists of two general steps: +In {product-title}, a cluster administrator can enable alert routing for user-defined projects. + +[IMPORTANT] +==== +Managing alerting rules for user-defined projects is only available in {product-title} version 4.11 and later. +==== + +This process consists of two general steps: * Enable alert routing for user-defined projects to use a separate Alertmanager instance. * Grant additional users permission to configure alert routing for user-defined projects. @@ -26,5 +33,5 @@ include::modules/monitoring-granting-users-permission-to-configure-alert-routing [role="_additional-resources"] .Additional resources -* xref:../monitoring/osd-accessing-monitoring-for-user-defined-projects.adoc[Accessing monitoring for user-defined projects] -* xref:../monitoring/osd-managing-alerts.adoc#creating-alert-routing-for-user-defined-projects_managing-alerts.adoc#creating-alerting-rules-for-user-defined-projects_osd-managing-alerts[Creating alert routing for user-defined projects] +* xref:../monitoring/osd-accessing-monitoring-for-user-defined-projects.adoc#osd-accessing-monitoring-for-user-defined-projects[Accessing monitoring for user-defined projects] +* xref:../monitoring/managing-alerts.adoc#creating-alerting-rules-for-user-defined-projects_managing-alerts[Creating alert routing for user-defined projects] diff --git a/osd_cluster_admin/osd_monitoring/osd-managing-metrics.adoc b/monitoring/osd-managing-metrics.adoc similarity index 63% rename from osd_cluster_admin/osd_monitoring/osd-managing-metrics.adoc rename to monitoring/osd-managing-metrics.adoc index f1627dbf10..63ad0a37a6 100644 --- a/osd_cluster_admin/osd_monitoring/osd-managing-metrics.adoc +++ b/monitoring/osd-managing-metrics.adoc @@ -20,7 +20,7 @@ include::modules/osd-monitoring-specifying-how-a-service-is-monitored.adoc[level .Additional resources * See the link:https://github.com/openshift/prometheus-operator/blob/release-4.7/Documentation/api.md[Prometheus Operator API documentation] for more information on `ServiceMonitor` and `PodMonitor` resources. -* xref:../../osd_cluster_admin/osd_monitoring/osd-accessing-monitoring-for-user-defined-projects.adoc#osd-accessing-monitoring-for-user-defined-projects[Accessing monitoring for user-defined projects]. +* xref:../monitoring/osd-accessing-monitoring-for-user-defined-projects.adoc#osd-accessing-monitoring-for-user-defined-projects[Accessing monitoring for user-defined projects]. // Querying metrics include::modules/osd-monitoring-querying-metrics.adoc[leveloffset=+1] @@ -31,7 +31,7 @@ include::modules/osd-monitoring-querying-metrics-for-user-defined-projects-as-a- .Additional resources * See the link:https://prometheus.io/docs/prometheus/latest/querying/basics/[Prometheus query documentation] for more information about creating PromQL queries. -* See the xref:../../osd_cluster_admin/osd_monitoring/osd-managing-metrics.adoc#querying-metrics-for-user-defined-projects-as-a-developer_osd-managing-metrics[Querying metrics for user-defined projects as a developer] for details on accessing non-cluster metrics as a developer or a privileged user +* See the xref:../monitoring/osd-managing-metrics.adoc#querying-metrics-for-user-defined-projects-as-a-developer_osd-managing-metrics[Querying metrics for user-defined projects as a developer] for details on accessing non-cluster metrics as a developer or a privileged user // TODO: The above additional resource points to the same module that it's an additional resource of include::modules/osd-monitoring-exploring-the-visualized-metrics.adoc[leveloffset=+2] @@ -39,11 +39,10 @@ include::modules/osd-monitoring-exploring-the-visualized-metrics.adoc[leveloffse [role="_additional-resources"] .Additional resources -* See the xref:../../osd_cluster_admin/osd_monitoring/osd-managing-metrics.adoc#querying-metrics_osd-managing-metrics[Querying metrics] section on using the PromQL interface -* xref:../../osd_cluster_admin/osd_monitoring/osd-troubleshooting-monitoring-issues.adoc#osd-troubleshooting-monitoring-issues[Troubleshooting monitoring issues] +* See the xref:../monitoring/osd-managing-metrics.adoc#querying-metrics_osd-managing-metrics[Querying metrics] section on using the PromQL interface +* xref:../monitoring/osd-troubleshooting-monitoring-issues.adoc#osd-troubleshooting-monitoring-issues[Troubleshooting monitoring issues] [id="managing-metrics-next-steps"] == Next steps -* xref:../../osd_cluster_admin/osd_monitoring/osd-managing-alerts.adoc#osd-managing-alerts[Alerts] +* xref:../monitoring/managing-alerts.adoc#managing-alerts[Alerts] -// TODO: Why is alerts a next step if alerts aren't supported? Can this be removed? diff --git a/monitoring/osd-understanding-the-monitoring-stack.adoc b/monitoring/osd-understanding-the-monitoring-stack.adoc index 98a224f432..a1e0207836 100644 --- a/monitoring/osd-understanding-the-monitoring-stack.adoc +++ b/monitoring/osd-understanding-the-monitoring-stack.adoc @@ -30,4 +30,4 @@ include::modules/osd-monitoring-targets-for-user-defined-projects.adoc[leveloffs [id="understanding-the-monitoring-stack-next-steps"] == Next steps -* xref:../monitoring/osd-configuring-the-monitoring-stack.adoc#osd-configuring-the-monitoring-stack[Configuring the monitoring stack] +* xref:../monitoring/osd-accessing-monitoring-for-user-defined-projects.adoc#osd-accessing-monitoring-for-user-defined-projects[Accessing monitoring for user-defined projects] diff --git a/rosa_cluster_admin/rosa_monitoring/rosa-accessing-monitoring-for-user-defined-projects.adoc b/monitoring/rosa-accessing-monitoring-for-user-defined-projects.adoc similarity index 86% rename from rosa_cluster_admin/rosa_monitoring/rosa-accessing-monitoring-for-user-defined-projects.adoc rename to monitoring/rosa-accessing-monitoring-for-user-defined-projects.adoc index a985c3d179..b95ddafa8a 100644 --- a/rosa_cluster_admin/rosa_monitoring/rosa-accessing-monitoring-for-user-defined-projects.adoc +++ b/monitoring/rosa-accessing-monitoring-for-user-defined-projects.adoc @@ -20,4 +20,4 @@ Optionally, you can disable monitoring for user-defined projects during or after [id="accessing-user-defined-monitoring-next-steps"] == Next steps -* xref:../../rosa_cluster_admin/rosa_monitoring/rosa-configuring-the-monitoring-stack.adoc#rosa-configuring-the-monitoring-stack[Configuring the monitoring stack] +* xref:../monitoring/rosa-configuring-the-monitoring-stack.adoc#rosa-configuring-the-monitoring-stack[Configuring the monitoring stack] diff --git a/rosa_cluster_admin/rosa_monitoring/rosa-configuring-the-monitoring-stack.adoc b/monitoring/rosa-configuring-the-monitoring-stack.adoc similarity index 97% rename from rosa_cluster_admin/rosa_monitoring/rosa-configuring-the-monitoring-stack.adoc rename to monitoring/rosa-configuring-the-monitoring-stack.adoc index b4547f06f3..bfe7bdfbc9 100644 --- a/rosa_cluster_admin/rosa_monitoring/rosa-configuring-the-monitoring-stack.adoc +++ b/monitoring/rosa-configuring-the-monitoring-stack.adoc @@ -80,4 +80,4 @@ include::modules/osd-monitoring-setting-log-levels-for-monitoring-components.ado [id="configuring-the-monitoring-stack-next-steps"] == Next steps -* xref:../../rosa_cluster_admin/rosa_monitoring/rosa-managing-metrics.adoc#rosa-managing-metrics[Managing metrics] +* xref:../monitoring/rosa-managing-metrics.adoc#rosa-managing-metrics[Managing metrics] diff --git a/rosa_cluster_admin/rosa_monitoring/rosa-enabling-alert-routing-for-user-defined-projects.adoc b/monitoring/rosa-enabling-alert-routing-for-user-defined-projects.adoc similarity index 76% rename from rosa_cluster_admin/rosa_monitoring/rosa-enabling-alert-routing-for-user-defined-projects.adoc rename to monitoring/rosa-enabling-alert-routing-for-user-defined-projects.adoc index 8667403126..e26fd5b015 100644 --- a/rosa_cluster_admin/rosa_monitoring/rosa-enabling-alert-routing-for-user-defined-projects.adoc +++ b/monitoring/rosa-enabling-alert-routing-for-user-defined-projects.adoc @@ -11,7 +11,7 @@ In {product-title}, a cluster administrator can enable alert routing for user-de [IMPORTANT] ==== -Managing alerting rules for user-defined projects is only available in {product-title} version 4.11 and up. +Managing alerting rules for user-defined projects is only available in {product-title} version 4.11 and later. ==== This process consists of two general steps: @@ -33,5 +33,5 @@ include::modules/monitoring-granting-users-permission-to-configure-alert-routing [role="_additional-resources"] .Additional resources -* xref:../../rosa_cluster_admin/rosa_monitoring/rosa-accessing-monitoring-for-user-defined-projects.adoc#rosa-accessing-monitoring-for-user-defined-projects[Accessing monitoring for user-defined projects] -* xref:../../rosa_cluster_admin/rosa_monitoring/rosa-managing-alerts.adoc#creating-alerting-rules-for-user-defined-projects_rosa-managing-alerts[Creating alert routing for user-defined projects] +* xref:../monitoring/rosa-accessing-monitoring-for-user-defined-projects.adoc#rosa-accessing-monitoring-for-user-defined-projects[Accessing monitoring for user-defined projects] +* xref:../monitoring/managing-alerts.adoc#creating-alerting-rules-for-user-defined-projects_managing-alerts[Creating alert routing for user-defined projects] diff --git a/rosa_cluster_admin/rosa_monitoring/rosa-managing-alerts.adoc b/monitoring/rosa-managing-alerts.adoc similarity index 83% rename from rosa_cluster_admin/rosa_monitoring/rosa-managing-alerts.adoc rename to monitoring/rosa-managing-alerts.adoc index b61f802fdd..82a74dd966 100644 --- a/rosa_cluster_admin/rosa_monitoring/rosa-managing-alerts.adoc +++ b/monitoring/rosa-managing-alerts.adoc @@ -39,12 +39,12 @@ include::modules/monitoring-optimizing-alerting-for-user-defined-projects.adoc[l [role="_additional-resources"] .Additional resources * See the link:https://prometheus.io/docs/practices/alerting/[Prometheus alerting documentation] for further guidelines on optimizing alerts -* See xref:../../rosa_cluster_admin/rosa_monitoring/rosa-understanding-the-monitoring-stack.adoc#rosa-understanding-the-monitoring-stack[Monitoring overview] for details about {product-title} {product-version} monitoring architecture +* See xref:../monitoring/rosa-understanding-the-monitoring-stack.adoc#rosa-understanding-the-monitoring-stack[Monitoring overview] for details about {product-title} {product-version} monitoring architecture include::modules/monitoring-creating-alerting-rules-for-user-defined-projects.adoc[leveloffset=+2] include::modules/monitoring-reducing-latency-for-alerting-rules-that-do-not-query-platform-metrics.adoc[leveloffset=+2] -* See xref:../../rosa_cluster_admin/rosa_monitoring/rosa-understanding-the-monitoring-stack.adoc#rosa-understanding-the-monitoring-stack[Monitoring overview] for details about {product-title} {product-version} monitoring architecture. +* See xref:../monitoring/rosa-understanding-the-monitoring-stack.adoc#rosa-understanding-the-monitoring-stack[Monitoring overview] for details about {product-title} {product-version} monitoring architecture. include::modules/monitoring-accessing-alerting-rules-for-your-project.adoc[leveloffset=+2] include::modules/monitoring-listing-alerting-rules-for-all-projects-in-a-single-view.adoc[leveloffset=+2] @@ -57,7 +57,7 @@ include::modules/monitoring-removing-alerting-rules-for-user-defined-projects.ad [role="_additional-resources"] .Additional resources -* See xref:../../rosa_cluster_admin/rosa_monitoring/rosa-understanding-the-monitoring-stack.adoc#rosa-understanding-the-monitoring-stack[Monitoring overview] for details about {product-title} monitoring architecture. +* See xref:../monitoring/rosa-understanding-the-monitoring-stack.adoc#rosa-understanding-the-monitoring-stack[Monitoring overview] for details about {product-title} monitoring architecture. * See the link:https://prometheus.io/docs/alerting/alertmanager/[Alertmanager documentation] for information about alerting rules. * See the link:https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config[Prometheus relabeling documentation] for information about how relabeling works. * See the link:https://prometheus.io/docs/practices/alerting/[Prometheus alerting documentation] for further guidelines on optimizing alerts. @@ -74,4 +74,4 @@ include::modules/monitoring-applying-a-custom-configuration-to-alertmanager-for- [id="alerts-next-steps"] == Next steps -* xref:../../rosa_cluster_admin/rosa_monitoring/rosa-reviewing-monitoring-dashboards.adoc#rosa-reviewing-monitoring-dashboards[Reviewing monitoring dashboards] \ No newline at end of file +* xref:../monitoring/rosa-reviewing-monitoring-dashboards.adoc#rosa-reviewing-monitoring-dashboards[Reviewing monitoring dashboards] \ No newline at end of file diff --git a/rosa_cluster_admin/rosa_monitoring/rosa-managing-metrics.adoc b/monitoring/rosa-managing-metrics.adoc similarity index 65% rename from rosa_cluster_admin/rosa_monitoring/rosa-managing-metrics.adoc rename to monitoring/rosa-managing-metrics.adoc index 4ff47f89f7..11e6bee57c 100644 --- a/rosa_cluster_admin/rosa_monitoring/rosa-managing-metrics.adoc +++ b/monitoring/rosa-managing-metrics.adoc @@ -19,7 +19,7 @@ include::modules/osd-monitoring-specifying-how-a-service-is-monitored.adoc[level .Additional resources // * See the link:https://github.com/openshift/prometheus-operator/blob/release-4.7/Documentation/api.md[Prometheus Operator API documentation] for more information on `ServiceMonitor` and `PodMonitor` resources. -* xref:../../rosa_cluster_admin/rosa_monitoring/rosa-accessing-monitoring-for-user-defined-projects.adoc#rosa-accessing-monitoring-for-user-defined-projects[Accessing monitoring for user-defined projects]. +* xref:../monitoring/rosa-accessing-monitoring-for-user-defined-projects.adoc#rosa-accessing-monitoring-for-user-defined-projects[Accessing monitoring for user-defined projects]. // Querying metrics include::modules/osd-monitoring-querying-metrics.adoc[leveloffset=+1] @@ -29,18 +29,18 @@ include::modules/osd-monitoring-querying-metrics-for-user-defined-projects-as-a- .Additional resources * See the link:https://prometheus.io/docs/prometheus/latest/querying/basics/[Prometheus query documentation] for more information about creating PromQL queries. -* See xref:../../rosa_cluster_admin/rosa_monitoring/rosa-managing-metrics.adoc#querying-metrics-for-user-defined-projects-as-a-developer_rosa-managing-metrics[Querying metrics for user-defined projects as a developer] for details on accessing non-cluster metrics as a developer or a privileged user +* See xref:../monitoring/rosa-managing-metrics.adoc#querying-metrics-for-user-defined-projects-as-a-developer_rosa-managing-metrics[Querying metrics for user-defined projects as a developer] for details on accessing non-cluster metrics as a developer or a privileged user // TODO: The above additional resource points to the same module that it's an additional resource of include::modules/osd-monitoring-exploring-the-visualized-metrics.adoc[leveloffset=+2] .Additional resources -* See the xref:../../rosa_cluster_admin/rosa_monitoring/rosa-managing-metrics.adoc#querying-metrics_rosa-managing-metrics[Querying metrics] section on using the PromQL interface -* xref:../../rosa_cluster_admin/rosa_monitoring/rosa-troubleshooting-monitoring-issues.adoc#rosa-troubleshooting-monitoring-issues[Troubleshooting monitoring issues] +* See the xref:../monitoring/rosa-managing-metrics.adoc#querying-metrics_rosa-managing-metrics[Querying metrics] section on using the PromQL interface +* xref:../monitoring/rosa-troubleshooting-monitoring-issues.adoc#rosa-troubleshooting-monitoring-issues[Troubleshooting monitoring issues] [id="managing-metrics-next-steps"] == Next steps -* xref:../../rosa_cluster_admin/rosa_monitoring/rosa-managing-alerts.adoc#rosa-managing-alerts[Alerts] +* xref:../monitoring/managing-alerts.adoc#managing-alerts[Alerts] // TODO: Why is alerts a next step if alerts aren't supported? Can this be removed? diff --git a/rosa_cluster_admin/rosa_monitoring/rosa-reviewing-monitoring-dashboards.adoc b/monitoring/rosa-reviewing-monitoring-dashboards.adoc similarity index 84% rename from rosa_cluster_admin/rosa_monitoring/rosa-reviewing-monitoring-dashboards.adoc rename to monitoring/rosa-reviewing-monitoring-dashboards.adoc index 1ec61c6a78..f572096b68 100644 --- a/rosa_cluster_admin/rosa_monitoring/rosa-reviewing-monitoring-dashboards.adoc +++ b/monitoring/rosa-reviewing-monitoring-dashboards.adoc @@ -29,4 +29,4 @@ include::modules/osd-monitoring-reviewing-monitoring-dashboards-developer.adoc[l [id="monitoring-dashboards-next-steps"] == Next steps -* xref:../../rosa_cluster_admin/rosa_monitoring/rosa-troubleshooting-monitoring-issues.adoc#rosa-troubleshooting-monitoring-issues[Troubleshooting monitoring issues] +* xref:../monitoring/rosa-troubleshooting-monitoring-issues.adoc#rosa-troubleshooting-monitoring-issues[Troubleshooting monitoring issues] diff --git a/rosa_cluster_admin/rosa_monitoring/rosa-troubleshooting-monitoring-issues.adoc b/monitoring/rosa-troubleshooting-monitoring-issues.adoc similarity index 100% rename from rosa_cluster_admin/rosa_monitoring/rosa-troubleshooting-monitoring-issues.adoc rename to monitoring/rosa-troubleshooting-monitoring-issues.adoc diff --git a/rosa_cluster_admin/rosa_monitoring/rosa-understanding-the-monitoring-stack.adoc b/monitoring/rosa-understanding-the-monitoring-stack.adoc similarity index 81% rename from rosa_cluster_admin/rosa_monitoring/rosa-understanding-the-monitoring-stack.adoc rename to monitoring/rosa-understanding-the-monitoring-stack.adoc index 667e07fb79..f04757db90 100644 --- a/rosa_cluster_admin/rosa_monitoring/rosa-understanding-the-monitoring-stack.adoc +++ b/monitoring/rosa-understanding-the-monitoring-stack.adoc @@ -23,7 +23,7 @@ include::modules/osd-monitoring-targets-for-user-defined-projects.adoc[leveloffs //Because this is a duplicate file only referenced in the ROSA topic map, the xref links in this section will differ from the osd-understanding-the-monitoring-stack.adoc file. -* xref:../../rosa_cluster_admin/rosa_monitoring/rosa-accessing-monitoring-for-user-defined-projects.adoc#rosa-accessing-monitoring-for-user-defined-projects[Accessing monitoring for user-defined projects] +* xref:../monitoring/rosa-accessing-monitoring-for-user-defined-projects.adoc#rosa-accessing-monitoring-for-user-defined-projects[Accessing monitoring for user-defined projects] * link:https://access.redhat.com/documentation/en-us/openshift_container_platform/4.10/html-single/monitoring/index#default-monitoring-components_monitoring-overview[Default monitoring components] * link:https://access.redhat.com/documentation/en-us/openshift_container_platform/4.10/html-single/monitoring/index#default-monitoring-targets_monitoring-overview[Default monitoring targets] // TODO: When there is a link to the OCP docs, should that be explicit, so they're not surprised when they find themselves in another doc set? @@ -31,4 +31,4 @@ include::modules/osd-monitoring-targets-for-user-defined-projects.adoc[leveloffs [id="understanding-the-monitoring-stack-next-steps"] == Next steps -* xref:../../rosa_cluster_admin/rosa_monitoring/rosa-accessing-monitoring-for-user-defined-projects.adoc#rosa-accessing-monitoring-for-user-defined-projects[Accessing monitoring for user-defined projects] +* xref:../monitoring/rosa-accessing-monitoring-for-user-defined-projects.adoc#rosa-accessing-monitoring-for-user-defined-projects[Accessing monitoring for user-defined projects] diff --git a/osd_cluster_admin/osd_monitoring/_attributes b/osd_cluster_admin/osd_monitoring/_attributes deleted file mode 120000 index f27fd275ea..0000000000 --- a/osd_cluster_admin/osd_monitoring/_attributes +++ /dev/null @@ -1 +0,0 @@ -../_attributes/ \ No newline at end of file diff --git a/osd_cluster_admin/osd_monitoring/images b/osd_cluster_admin/osd_monitoring/images deleted file mode 120000 index e4c5bd02a1..0000000000 --- a/osd_cluster_admin/osd_monitoring/images +++ /dev/null @@ -1 +0,0 @@ -../images/ \ No newline at end of file diff --git a/osd_cluster_admin/osd_monitoring/modules b/osd_cluster_admin/osd_monitoring/modules deleted file mode 120000 index 43aab75b53..0000000000 --- a/osd_cluster_admin/osd_monitoring/modules +++ /dev/null @@ -1 +0,0 @@ -../modules/ \ No newline at end of file diff --git a/osd_cluster_admin/osd_monitoring/osd-accessing-monitoring-for-user-defined-projects.adoc b/osd_cluster_admin/osd_monitoring/osd-accessing-monitoring-for-user-defined-projects.adoc deleted file mode 100644 index a85f111120..0000000000 --- a/osd_cluster_admin/osd_monitoring/osd-accessing-monitoring-for-user-defined-projects.adoc +++ /dev/null @@ -1,23 +0,0 @@ -:_content-type: ASSEMBLY -[id="osd-accessing-monitoring-for-user-defined-projects"] -= Accessing monitoring for user-defined projects -include::_attributes/attributes-openshift-dedicated.adoc[] -:context: osd-accessing-monitoring-for-user-defined-projects - -toc::[] - -When you install an {product-title} cluster, monitoring for user-defined projects is enabled by default. With monitoring for user-defined projects enabled, you can monitor your own {product-title} projects without the need for an additional monitoring solution. - -The `dedicated-admin` user has default permissions to configure and access monitoring for user-defined projects. - -[NOTE] -==== -Custom Prometheus instances and the Prometheus Operator installed through Operator Lifecycle Manager (OLM) can cause issues with user-defined project monitoring if it is enabled. Custom Prometheus instances are not supported. -==== - -Optionally, you can disable monitoring for user-defined projects during or after a cluster installation. - -[id="accessing-user-defined-monitoring-next-steps"] -== Next steps - -* xref:../../osd_cluster_admin/osd_monitoring/osd-configuring-the-monitoring-stack.adoc#osd-configuring-the-monitoring-stack[Configuring the monitoring stack] diff --git a/osd_cluster_admin/osd_monitoring/osd-configuring-the-monitoring-stack.adoc b/osd_cluster_admin/osd_monitoring/osd-configuring-the-monitoring-stack.adoc deleted file mode 100644 index 922f705aba..0000000000 --- a/osd_cluster_admin/osd_monitoring/osd-configuring-the-monitoring-stack.adoc +++ /dev/null @@ -1,82 +0,0 @@ -:_content-type: ASSEMBLY -[id="osd-configuring-the-monitoring-stack"] -= Configuring the monitoring stack -include::_attributes/attributes-openshift-dedicated.adoc[] -:context: osd-configuring-the-monitoring-stack - -toc::[] - -After you configure the monitoring stack, you can review common configuration scenarios and configure monitoring of user-defined projects. - -// Maintenance and support for monitoring -include::modules/osd-monitoring-maintenance-and-support.adoc[leveloffset=+1] -include::modules/osd-monitoring-support-considerations.adoc[leveloffset=+2] - -// Configuring the monitoring stack -include::modules/osd-monitoring-configuring-the-monitoring-stack.adoc[leveloffset=+1] - -// Configurable monitoring components -include::modules/osd-monitoring-configurable-monitoring-components.adoc[leveloffset=+1] - -// Moving monitoring components to different nodes -include::modules/osd-monitoring-moving-monitoring-components-to-different-nodes.adoc[leveloffset=+1] - -[role="_additional-resources"] -.Additional resources - -* link:https://docs.openshift.com/container-platform/4.7/nodes/nodes/nodes-nodes-working.html#nodes-nodes-working-updating_nodes-nodes-working[Understanding how to update labels on nodes] -* link:https://docs.openshift.com/container-platform/4.7/nodes/scheduling/nodes-scheduler-node-selectors.html[Placing pods on specific nodes using node selectors] -* See the link:https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector[Kubernetes documentation] for details on the `nodeSelector` constraint - -// TODO: Same question about whether links out to OCP docs should explicitly mention that? (I won't point out any more, but could easily search to find other instances in the repo). - -// Assigning tolerations to monitoring components -include::modules/osd-monitoring-assigning-tolerations-to-monitoring-components.adoc[leveloffset=+1] - -[role="_additional-resources"] -.Additional resources - -* See the link:https://docs.openshift.com/container-platform/4.7/nodes/scheduling/nodes-scheduler-taints-tolerations.html#nodes-scheduler-taints-tolerations[OpenShift Container Platform documentation] on taints and tolerations -* See the link:https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/[Kubernetes documentation] on taints and tolerations - -// Configuring persistent storage -[id="configuring-persistent-storage"] -== Configuring persistent storage - -Running cluster monitoring with persistent storage means that your metrics are stored to a persistent volume (PV) and can survive a pod being restarted or recreated. This is ideal if you require your metrics data to be guarded from data loss. For production environments, it is highly recommended to configure persistent storage. Because of the high IO demands, it is advantageous to use local storage. - -[IMPORTANT] -==== -See link:https://docs.openshift.com/container-platform/4.7/scalability_and_performance/optimizing-storage.html#recommended-configurable-storage-technology_persistent-storage[Recommended configurable storage technology]. -==== - -[id="persistent-storage-prerequisites"] -=== Persistent storage prerequisites - -* Use the block type of storage. - -include::modules/osd-monitoring-configuring-a-local-persistent-volume-claim.adoc[leveloffset=+2] -include::modules/osd-monitoring-modifying-retention-time-for-prometheus-metrics-data.adoc[leveloffset=+2] - -[role="_additional-resources"] -.Additional resources - -* link:https://docs.openshift.com/container-platform/4.7/storage/understanding-persistent-storage.html[Understanding persistent storage] -* link:https://docs.openshift.com/container-platform/4.7/scalability_and_performance/optimizing-storage.html[Optimizing storage] - -// Managing scrape sample limits for user-defined projects -include::modules/osd-monitoring-limiting-scrape-samples-in-user-defined-projects.adoc[leveloffset=+1] -include::modules/osd-monitoring-setting-a-scrape-sample-limit-for-user-defined-projects.adoc[leveloffset=+2] - -[role="_additional-resources"] -.Additional resources - -* link:https://docs.openshift.com/container-platform/4.7/monitoring/troubleshooting-monitoring-issues.html#determining-why-prometheus-is-consuming-disk-space_troubleshooting-monitoring-issues[Determining why Prometheus is consuming a lot of disk space] for steps to query which metrics have the highest number of scrape samples - -// Setting log levels for monitoring components -include::modules/osd-monitoring-setting-log-levels-for-monitoring-components.adoc[leveloffset=+1] - -[id="configuring-the-monitoring-stack-next-steps"] -== Next steps - -* xref:../../osd_cluster_admin/osd_monitoring/osd-managing-metrics.adoc#osd-managing-metrics[Managing metrics] diff --git a/osd_cluster_admin/osd_monitoring/osd-enabling-alert-routing-for-user-defined-projects.adoc b/osd_cluster_admin/osd_monitoring/osd-enabling-alert-routing-for-user-defined-projects.adoc deleted file mode 100644 index 0b32999c47..0000000000 --- a/osd_cluster_admin/osd_monitoring/osd-enabling-alert-routing-for-user-defined-projects.adoc +++ /dev/null @@ -1,37 +0,0 @@ -:_content-type: ASSEMBLY -[id="osd-enabling-alert-routing-for-user-defined-projects"] -= Enabling alert routing for user-defined projects -include::_attributes/attributes-openshift-dedicated.adoc[] -:context: osd-enabling-alert-routing-for-user-defined-projects - -toc::[] - -[role="_abstract"] -In {product-title}, a cluster administrator can enable alert routing for user-defined projects. - -[IMPORTANT] -==== -Managing alerting rules for user-defined projects is only available in {product-title} version 4.11 and up. -==== - -This process consists of two general steps: - -* Enable alert routing for user-defined projects to use a separate Alertmanager instance. -* Grant additional users permission to configure alert routing for user-defined projects. - -After you complete these steps, developers and other users can configure custom alerts and alert routing for their user-defined projects. - -//Overview of setting up alert routing for user-defined projects -include::modules/osd-monitoring-understanding-alert-routing-for-user-defined-projects.adoc[leveloffset=+1] - -// Enabling a dedicated Alertmanager instance for use in user-defined projects -include::modules/monitoring-enabling-a-separate-alertmanager-instance-for-user-defined-alert-routing.adoc[leveloffset=+1] - -// Granting users permission to configure alert routing for user-defined projects -include::modules/monitoring-granting-users-permission-to-configure-alert-routing-for-user-defined-projects.adoc[leveloffset=+1] - -[role="_additional-resources"] -.Additional resources - -* xref:../../osd_cluster_admin/osd_monitoring/osd-accessing-monitoring-for-user-defined-projects.adoc#osd-accessing-monitoring-for-user-defined-projects[Accessing monitoring for user-defined projects] -* xref:../../osd_cluster_admin/osd_monitoring/osd-managing-alerts.adoc#creating-alerting-rules-for-user-defined-projects_osd-managing-alerts[Creating alert routing for user-defined projects] diff --git a/osd_cluster_admin/osd_monitoring/osd-managing-alerts.adoc b/osd_cluster_admin/osd_monitoring/osd-managing-alerts.adoc deleted file mode 100644 index e440cb994c..0000000000 --- a/osd_cluster_admin/osd_monitoring/osd-managing-alerts.adoc +++ /dev/null @@ -1,77 +0,0 @@ -:_content-type: ASSEMBLY -[id="osd-managing-alerts"] -= Alerts -include::_attributes/attributes-openshift-dedicated.adoc[] -:context: osd-managing-alerts - -toc::[] - -In {product-title}, the Alerting UI enables you to manage alerts, silences, and alerting rules. - -* *Alerting rules*. Alerting rules contain a set of conditions that outline a particular state within a cluster. Alerts are triggered when those conditions are true. An alerting rule can be assigned a severity that defines how the alerts are routed. -* *Alerts*. An alert is fired when the conditions defined in an alerting rule are true. Alerts provide a notification that a set of circumstances are apparent within an {product-title} cluster. -* *Silences*. A silence can be applied to an alert to prevent notifications from being sent when the conditions for an alert are true. You can mute an alert after the initial notification, while you work on resolving the underlying issue. - -[NOTE] -==== -The alerts, silences, and alerting rules that are available in the Alerting UI relate to the projects that you have access to. For example, if you are logged in with `cluster-admin` or `dedicated-admin` privileges, all alerts, silences, and alerting rules are accessible. -==== - -// Accessing the Alerting UI in the Administrator and Developer perspectives -include::modules/monitoring-accessing-the-alerting-ui.adoc[leveloffset=+1] - -// Searching and filtering alerts, silences, and alerting rules -include::modules/monitoring-searching-alerts-silences-and-alerting-rules.adoc[leveloffset=+1] - -// Getting information about alerts, silences and alerting rules -include::modules/monitoring-getting-information-about-alerts-silences-and-alerting-rules.adoc[leveloffset=+1] - -// Managing silences -include::modules/monitoring-managing-silences.adoc[leveloffset=+1] -include::modules/monitoring-silencing-alerts.adoc[leveloffset=+2] -include::modules/monitoring-editing-silences.adoc[leveloffset=+2] -include::modules/monitoring-expiring-silences.adoc[leveloffset=+2] - -// Managing alerting rules for user-defined projects -include::modules/monitoring-managing-alerting-rules-for-user-defined-projects.adoc[leveloffset=+1] -include::modules/monitoring-optimizing-alerting-for-user-defined-projects.adoc[leveloffset=+2] - -[role="_additional-resources"] -.Additional resources -* See the link:https://prometheus.io/docs/practices/alerting/[Prometheus alerting documentation] for further guidelines on optimizing alerts -* See xref:../../osd_cluster_admin/osd_monitoring/osd-understanding-the-monitoring-stack.adoc#osd-understanding-the-monitoring-stack[Monitoring overview] for details about {product-title} {product-version} monitoring architecture - -include::modules/monitoring-creating-alerting-rules-for-user-defined-projects.adoc[leveloffset=+2] -include::modules/monitoring-reducing-latency-for-alerting-rules-that-do-not-query-platform-metrics.adoc[leveloffset=+2] - -* See xref:../../osd_cluster_admin/osd_monitoring/osd-understanding-the-monitoring-stack.adoc#osd-understanding-the-monitoring-stack[Monitoring overview] for details about {product-title} {product-version} monitoring architecture. - -include::modules/monitoring-accessing-alerting-rules-for-your-project.adoc[leveloffset=+2] -include::modules/monitoring-listing-alerting-rules-for-all-projects-in-a-single-view.adoc[leveloffset=+2] -include::modules/monitoring-removing-alerting-rules-for-user-defined-projects.adoc[leveloffset=+2] - -[role="_additional-resources"] -.Additional resources - -* See the link:https://prometheus.io/docs/alerting/alertmanager/[Alertmanager documentation] - -[role="_additional-resources"] -.Additional resources -* See xref:../../osd_cluster_admin/osd_monitoring/osd-understanding-the-monitoring-stack.adoc#osd-understanding-the-monitoring-stack[Monitoring overview] for details about {product-title} monitoring architecture. -* See the link:https://prometheus.io/docs/alerting/alertmanager/[Alertmanager documentation] for information about alerting rules. -* See the link:https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config[Prometheus relabeling documentation] for information about how relabeling works. -* See the link:https://prometheus.io/docs/practices/alerting/[Prometheus alerting documentation] for further guidelines on optimizing alerts. - -// Applying a custom configuration to Alertmanager for user-defined alert routing -include::modules/monitoring-applying-a-custom-configuration-to-alertmanager-for-user-defined-alert-routing.adoc[leveloffset=+1] - -[role="_additional-resources"] -.Additional resources - -* See link:https://www.pagerduty.com/[the PagerDuty official site] for more information on PagerDuty. -* See link:https://www.pagerduty.com/docs/guides/prometheus-integration-guide/[the PagerDuty Prometheus Integration Guide] to learn how to retrieve the `service_key`. -* See link:https://prometheus.io/docs/alerting/configuration/[Alertmanager configuration] for configuring alerting through different alert receivers. - -[id="alerts-next-steps"] -== Next steps -* xref:../../osd_cluster_admin/osd_monitoring/osd-reviewing-monitoring-dashboards.adoc#osd-reviewing-monitoring-dashboards[Reviewing monitoring dashboards] \ No newline at end of file diff --git a/osd_cluster_admin/osd_monitoring/osd-reviewing-monitoring-dashboards.adoc b/osd_cluster_admin/osd_monitoring/osd-reviewing-monitoring-dashboards.adoc deleted file mode 100644 index 411fcec833..0000000000 --- a/osd_cluster_admin/osd_monitoring/osd-reviewing-monitoring-dashboards.adoc +++ /dev/null @@ -1,32 +0,0 @@ -:_content-type: ASSEMBLY -[id="osd-reviewing-monitoring-dashboards"] -= Reviewing monitoring dashboards -include::_attributes/common-attributes.adoc[] -:context: osd-reviewing-monitoring-dashboards - -toc::[] - -{product-title} provides monitoring dashboards that help you understand the state of user-defined projects. - -In the *Developer* perspective, you can access dashboards that provide the following statistics for a selected project: - -* CPU usage -* Memory usage -* Bandwidth information -* Packet rate information - -.Example dashboard in the Developer perspective -image::monitoring-dashboard-developer.png[] - -[NOTE] -==== -In the *Developer* perspective, you can view dashboards for only one project at a time. -==== - -// Reviewing monitoring dashboards as a developer -include::modules/osd-monitoring-reviewing-monitoring-dashboards-developer.adoc[leveloffset=+1] - -[id="monitoring-dashboards-next-steps"] -== Next steps - -* xref:../../osd_cluster_admin/osd_monitoring/osd-troubleshooting-monitoring-issues.adoc#osd-troubleshooting-monitoring-issues[Troubleshooting monitoring issues] diff --git a/osd_cluster_admin/osd_monitoring/osd-troubleshooting-monitoring-issues.adoc b/osd_cluster_admin/osd_monitoring/osd-troubleshooting-monitoring-issues.adoc deleted file mode 100644 index 3610f6c0ec..0000000000 --- a/osd_cluster_admin/osd_monitoring/osd-troubleshooting-monitoring-issues.adoc +++ /dev/null @@ -1,11 +0,0 @@ -:_content-type: ASSEMBLY -[id="osd-troubleshooting-monitoring-issues"] -= Troubleshooting monitoring issues -include::_attributes/attributes-openshift-dedicated.adoc[] -:context: osd-troubleshooting-monitoring-issues - -toc::[] - -Find troubleshooting steps for common monitoring issues with user-defined projects. - -include::modules/osd-monitoring-troubleshooting-issues.adoc[leveloffset=+1] diff --git a/osd_cluster_admin/osd_monitoring/osd-understanding-the-monitoring-stack.adoc b/osd_cluster_admin/osd_monitoring/osd-understanding-the-monitoring-stack.adoc deleted file mode 100644 index 1017bd1182..0000000000 --- a/osd_cluster_admin/osd_monitoring/osd-understanding-the-monitoring-stack.adoc +++ /dev/null @@ -1,33 +0,0 @@ -:_content-type: ASSEMBLY -[id="osd-understanding-the-monitoring-stack"] -= Understanding the monitoring stack -include::_attributes/attributes-openshift-dedicated.adoc[] -:context: osd-understanding-the-monitoring-stack - -toc::[] - -In {product-title}, you can monitor your own projects in isolation from Red Hat Site Reliability Engineer (SRE) platform metrics. You can monitor your own projects without the need for an additional monitoring solution. - -[NOTE] -==== -Follow the instructions in this document carefully to configure a supported Prometheus instance for monitoring user-defined projects. Custom Prometheus instances are not supported by {product-title}. -==== - -// Understanding the monitoring stack -include::modules/osd-monitoring-understanding-the-monitoring-stack.adoc[leveloffset=+1] -include::modules/osd-monitoring-components-for-monitoring-user-defined-projects.adoc[leveloffset=+2] -include::modules/osd-monitoring-targets-for-user-defined-projects.adoc[leveloffset=+2] - -[role="_additional-resources"] -[id="understanding-the-monitoring-stack-additional-resources"] -== Additional resources - -* xref:../../osd_cluster_admin/osd_monitoring/osd-accessing-monitoring-for-user-defined-projects.adoc#osd-accessing-monitoring-for-user-defined-projects[Accessing monitoring for user-defined projects] -* link:https://access.redhat.com/documentation/en-us/openshift_container_platform/4.7/html/monitoring/monitoring-overview#default-monitoring-components_monitoring-overview[Default monitoring components] -* link:https://access.redhat.com/documentation/en-us/openshift_container_platform/4.7/html/monitoring/monitoring-overview#default-monitoring-targets_monitoring-overview[Default monitoring targets] -// TODO: When there is a link to the OCP docs, should that be explicit, so they're not surprised when they find themselves in another doc set? - -[id="understanding-the-monitoring-stack-next-steps"] -== Next steps - -* xref:../../osd_cluster_admin/osd_monitoring/osd-accessing-monitoring-for-user-defined-projects.adoc#osd-accessing-monitoring-for-user-defined-projects[Accessing monitoring for user-defined projects] diff --git a/osd_cluster_admin/osd_monitoring/snippets b/osd_cluster_admin/osd_monitoring/snippets deleted file mode 120000 index 9f5bc7e4dd..0000000000 --- a/osd_cluster_admin/osd_monitoring/snippets +++ /dev/null @@ -1 +0,0 @@ -../snippets \ No newline at end of file diff --git a/osd_getting_started/osd-getting-started.adoc b/osd_getting_started/osd-getting-started.adoc index a013e79cc1..46005f5670 100644 --- a/osd_getting_started/osd-getting-started.adoc +++ b/osd_getting_started/osd-getting-started.adoc @@ -66,7 +66,7 @@ include::modules/deleting-cluster.adoc[leveloffset=+1] * xref:../adding_service_cluster/adding-service.adoc#adding-service[Adding services to a cluster using the {cluster-manager} console] * xref:../osd_cluster_admin/osd_nodes/osd-nodes-machinepools-about.adoc#osd-machine-pools-about[About machine pools] * xref:../osd_cluster_admin/osd_nodes/osd-nodes-about-autoscaling-nodes.adoc#nodes-about-autoscaling-nodes[About autoscaling nodes on a cluster] -* xref:../osd_cluster_admin/osd_monitoring/osd-configuring-the-monitoring-stack.adoc#osd-configuring-the-monitoring-stack[Configuring the monitoring stack] +* xref:../monitoring/osd-configuring-the-monitoring-stack.adoc#osd-configuring-the-monitoring-stack[Configuring the monitoring stack] [id="additional-resources_{context}"] == Additional resources diff --git a/rosa_cluster_admin/rosa_monitoring/_attributes b/rosa_cluster_admin/rosa_monitoring/_attributes deleted file mode 120000 index 20cc1dcb77..0000000000 --- a/rosa_cluster_admin/rosa_monitoring/_attributes +++ /dev/null @@ -1 +0,0 @@ -../../_attributes/ \ No newline at end of file diff --git a/rosa_cluster_admin/rosa_monitoring/images b/rosa_cluster_admin/rosa_monitoring/images deleted file mode 120000 index e4c5bd02a1..0000000000 --- a/rosa_cluster_admin/rosa_monitoring/images +++ /dev/null @@ -1 +0,0 @@ -../images/ \ No newline at end of file diff --git a/rosa_cluster_admin/rosa_monitoring/modules b/rosa_cluster_admin/rosa_monitoring/modules deleted file mode 120000 index 43aab75b53..0000000000 --- a/rosa_cluster_admin/rosa_monitoring/modules +++ /dev/null @@ -1 +0,0 @@ -../modules/ \ No newline at end of file diff --git a/rosa_cluster_admin/rosa_monitoring/snippets b/rosa_cluster_admin/rosa_monitoring/snippets deleted file mode 120000 index 9f5bc7e4dd..0000000000 --- a/rosa_cluster_admin/rosa_monitoring/snippets +++ /dev/null @@ -1 +0,0 @@ -../snippets \ No newline at end of file diff --git a/rosa_getting_started/rosa-getting-started.adoc b/rosa_getting_started/rosa-getting-started.adoc index d286fa6ce4..4097a9b94c 100644 --- a/rosa_getting_started/rosa-getting-started.adoc +++ b/rosa_getting_started/rosa-getting-started.adoc @@ -73,7 +73,7 @@ include::modules/rosa-getting-started-deleting-a-cluster.adoc[leveloffset=+1] * xref:../adding_service_cluster/adding-service.adoc#adding-service[Adding services to a cluster using the {cluster-manager} console] * xref:../rosa_cluster_admin/rosa_nodes/rosa-managing-worker-nodes.adoc#rosa-managing-worker-nodes[Managing compute nodes] -* xref:../rosa_cluster_admin/rosa_monitoring/rosa-configuring-the-monitoring-stack.adoc#rosa-configuring-the-monitoring-stack[Configuring the monitoring stack] +* xref:../monitoring/rosa-configuring-the-monitoring-stack.adoc#rosa-configuring-the-monitoring-stack[Configuring the monitoring stack] [role="_additional-resources"] [id="additional-resources_{context}"] diff --git a/rosa_getting_started/rosa-quickstart-guide-ui.adoc b/rosa_getting_started/rosa-quickstart-guide-ui.adoc index 428d3d2f85..e7a5eafebc 100644 --- a/rosa_getting_started/rosa-quickstart-guide-ui.adoc +++ b/rosa_getting_started/rosa-quickstart-guide-ui.adoc @@ -149,7 +149,7 @@ include::modules/rosa-getting-started-deleting-a-cluster.adoc[leveloffset=+1] * xref:../adding_service_cluster/adding-service.adoc#adding-service[Adding services to a cluster using the {cluster-manager} console] * xref:../rosa_cluster_admin/rosa_nodes/rosa-managing-worker-nodes.adoc#rosa-managing-worker-nodes[Managing compute nodes] -* xref:../rosa_cluster_admin/rosa_monitoring/rosa-configuring-the-monitoring-stack.adoc#rosa-configuring-the-monitoring-stack[Configuring the monitoring stack] +* xref:../monitoring/rosa-configuring-the-monitoring-stack.adoc#rosa-configuring-the-monitoring-stack[Configuring the monitoring stack] [role="_additional-resources"] [id="additional-resources_{context}"] diff --git a/rosa_support/remote_health_monitoring/showing-data-collected-by-remote-health-monitoring.adoc b/rosa_support/remote_health_monitoring/showing-data-collected-by-remote-health-monitoring.adoc new file mode 100644 index 0000000000..d4ac74ca6e --- /dev/null +++ b/rosa_support/remote_health_monitoring/showing-data-collected-by-remote-health-monitoring.adoc @@ -0,0 +1,16 @@ +:_content-type: ASSEMBLY +[id="showing-data-collected-by-remote-health-monitoring"] += Showing data collected by remote health monitoring +include::_attributes/common-attributes.adoc[] +ifdef::openshift-dedicated[] +include::_attributes/attributes-openshift-dedicated.adoc[] +endif::[] +:context: showing-data-collected-by-remote-health-monitoring + +toc::[] + +As an administrator, you can review the metrics collected by Telemetry and the Insights Operator. + +include::modules/telemetry-showing-data-collected-from-the-cluster.adoc[leveloffset=+1] + +include::modules/insights-operator-showing-data-collected-from-the-cluster.adoc[leveloffset=+1] diff --git a/security/audit-log-view.adoc b/security/audit-log-view.adoc index 218140d83a..e0702ad05d 100644 --- a/security/audit-log-view.adoc +++ b/security/audit-log-view.adoc @@ -20,6 +20,7 @@ include::modules/security-audit-log-filtering.adoc[leveloffset=+1] // Gathering audit logs include::modules/gathering-data-audit-logs.adoc[leveloffset=+1] +ifndef::openshift-rosa,openshift-dedicated[] [id="viewing-audit-logs-additional-resources"] [role="_additional-resources"] == Additional resources @@ -28,3 +29,4 @@ include::modules/gathering-data-audit-logs.adoc[leveloffset=+1] * link:https://github.com/kubernetes/apiserver/blob/master/pkg/apis/audit/v1/types.go#L72[API audit log event structure] * xref:../security/audit-log-policy-config.adoc#audit-log-policy-config[Configuring the audit log policy] * xref:../logging/cluster-logging-external.adoc#cluster-logging-external[Forwarding logs to third party systems] +endif::[]