Skip to content

Commit bf7b739

Browse files
committed
OSDOCS-3136: Update Dedicated and ROSA troubleshooting content
1 parent 4c85ee8 commit bf7b739

File tree

6 files changed

+66
-9
lines changed

6 files changed

+66
-9
lines changed

_attributes/attributes-openshift-dedicated.adoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,6 @@
2424
:rhoda-short: RHODA
2525
:rhods: Red Hat OpenShift Data Science
2626
:osd: OpenShift Dedicated
27-
27+
//Formerly known as CodeReady Containers and CodeReady Workspaces
28+
:openshift-local-productname: Red Hat OpenShift Local
29+
:openshift-dev-spaces-productname: Red Hat OpenShift Dev Spaces

_topic_maps/_topic_map_osd.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,8 +401,8 @@ Topics:
401401
File: about-remote-health-monitoring
402402
- Name: Showing data collected by remote health monitoring
403403
File: showing-data-collected-by-remote-health-monitoring
404-
- Name: Opting out of remote health reporting
405-
File: opting-out-of-remote-health-reporting
404+
# - Name: Opting out of remote health reporting
405+
# File: opting-out-of-remote-health-reporting
406406
- Name: Using Insights to identify issues with your cluster
407407
File: using-insights-to-identify-issues-with-your-cluster
408408
- Name: Summarizing cluster specifications

_topic_maps/_topic_map_rosa.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -604,3 +604,5 @@ Topics:
604604
File: rosa-troubleshooting-iam-resources
605605
- Name: Troubleshooting cluster deployments
606606
File: rosa-troubleshooting-deployments
607+
- Name: Red Hat OpenShift Service on AWS managed resources
608+
File: rosa-managed-resources

osd_support/osd-managed-resources.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ include::https://raw.githubusercontent.com/openshift/managed-cluster-config/mast
2828
[id="osd-add-on-managed-namespaces"]
2929
== {product-title} add-on namespaces
3030

31-
{product-title} add-ons are services available for installation after cluster installation. These additional services include AWS CloudWatch, Red Hat CodeReady Workspaces, Red Hat OpenShift API Management, and Cluster Logging Operator. Any changes to resources within the following namespaces might be overridden by the add-on during upgrades, which can lead to unsupported configurations for the add-on functionality.
31+
{product-title} add-ons are services available for installation after cluster installation. These additional services include {openshift-dev-spaces-productname}, Red Hat OpenShift API Management, and Cluster Logging Operator. Any changes to resources within the following namespaces can be overridden by the add-on during upgrades, which can lead to unsupported configurations for the add-on functionality.
3232

3333
.List of add-on managed namespaces
3434
[%collapsible]
@@ -42,7 +42,7 @@ include::https://raw.githubusercontent.com/openshift/managed-cluster-config/mast
4242
[id="osd-validating-webhooks"]
4343
== {product-title} validating webhooks
4444

45-
{product-title} validating webhooks are a set of dynamic admission controls maintained by the OpenShift SRE team. These HTTP callbacks, also known as webhooks, are called for various types of requests to ensure cluster stability. Upon request the webhooks accept or reject the request. The following list describes the various webhooks with rules containing the registered operations and resources that are controlled. Any attempt to circumvent these validating webhooks could affect the stability and supportability of the cluster.
45+
{product-title} validating webhooks are a set of dynamic admission controls maintained by the OpenShift SRE team. These HTTP callbacks, also known as webhooks, are called for various types of requests to ensure cluster stability. The following list describes the various webhooks with rules containing the registered operations and resources that are controlled. Any attempt to circumvent these validating webhooks could affect the stability and supportability of the cluster.
4646

4747
.List of validating webhooks
4848
[%collapsible]

osd_support/remote_health_monitoring/about-remote-health-monitoring.adoc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@ ifndef::openshift-dedicated[]
5858
5959
* See the link:https://github.com/openshift/cluster-monitoring-operator/blob/master/manifests/0000_50_cluster-monitoring-operator_04-config.yaml[upstream cluster-monitoring-operator source code] for a list of the attributes that Telemetry gathers from Prometheus.
6060
61-
* Telemetry is installed and enabled by default. If you need to opt out of remote health reporting, see xref:../../osd_support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc#opting-out-remote-health-reporting[Opting out of remote health reporting].
61+
* Telemetry is installed and enabled by default.
6262
endif::[]
6363
6464
include::modules/insights-operator-about.adoc[leveloffset=+1]
6565

6666
[role="_additional-resources"]
6767
.Additional resources
6868

69-
* The Insights Operator is installed and enabled by default. If you need to opt out of remote health reporting, see xref:../../osd_support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc#opting-out-remote-health-reporting[Opting out of remote health reporting].
69+
* The Insights Operator is installed and enabled by default.
7070
7171
ifdef::openshift-dedicated[]
7272
// TODO: When you click on that link, you actually can't opt out. Should this additional resources link be removed?
@@ -114,9 +114,8 @@ Red Hat may share the data collected through Telemetry and the Insights Operator
114114

115115
Red Hat may engage certain third parties to assist in the collection, analysis, and storage of the Telemetry and configuration data.
116116

117-
.User control / enabling and disabling telemetry and configuration data collection
117+
//.User control / enabling and disabling telemetry and configuration data collection
118118

119-
You may disable {product-title} Telemetry and the Insights Operator by following the instructions in xref:../../osd_support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc#opting-out-remote-health-reporting[Opting out of remote health reporting].
120119

121120
ifdef::openshift-dedicated[]
122121
// TODO: Same question about should this be removed or updated, since you can't actually opt out for dedicated?
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
:_content-type: ASSEMBLY
2+
[id="rosa-managed-resources"]
3+
= {product-title} managed resources
4+
include::_attributes/attributes-openshift-dedicated.adoc[]
5+
:context: rosa-managed-resources
6+
7+
toc::[]
8+
9+
[id="rosa-managed-resources-overview"]
10+
== Overview
11+
12+
The following covers all resources managed or protected by the Service Reliability Engineering Platform (SRE-P) Team. Customers should not attempt to modify these resources because doing so can lead to cluster instability.
13+
14+
[id="rosa-managed-resources-all"]
15+
== Hive managed resources
16+
17+
The following list displays the {product-title} resources managed by OpenShift Hive, the centralized fleet configuration management system. These resources are in addition to the OpenShift Container Platform resources created during installation. OpenShift Hive continually attempts to maintain consistency across all {product-title} clusters. Changes to {product-title} resources should be made through {cluster-manager} so that {cluster-manager} and Hive are synchronized. Contact [email protected] if {cluster-manager} does not support modifying the resources in question.
18+
19+
.List of Hive managed resources
20+
[%collapsible]
21+
====
22+
[source,yaml]
23+
----
24+
include::https://raw.githubusercontent.com/openshift/managed-cluster-config/master/resources/managed/all-osd-resources.yaml[]
25+
----
26+
====
27+
28+
[id="rosa-add-on-managed-namespaces"]
29+
== {product-title} add-on namespaces
30+
31+
{product-title} add-ons are services available for installation after cluster installation. These additional services include {openshift-dev-spaces-productname}, Red Hat OpenShift API Management, and Cluster Logging Operator. Any changes to resources within the following namespaces can be overridden by the add-on during upgrades, which can lead to unsupported configurations for the add-on functionality.
32+
33+
.List of add-on managed namespaces
34+
[%collapsible]
35+
====
36+
[source,yaml]
37+
----
38+
include::https://raw.githubusercontent.com/openshift/managed-cluster-config/master/resources/addons-namespaces/main.yaml[]
39+
----
40+
====
41+
42+
[id="rosa-validating-webhooks"]
43+
== {product-title} validating webhooks
44+
45+
{product-title} validating webhooks are a set of dynamic admission controls maintained by the OpenShift SRE team. These HTTP callbacks, also known as webhooks, are called for various types of requests to ensure cluster stability. The following list describes the various webhooks with rules containing the registered operations and resources that are controlled. Any attempt to circumvent these validating webhooks could affect the stability and supportability of the cluster.
46+
47+
.List of validating webhooks
48+
[%collapsible]
49+
====
50+
[source,json]
51+
----
52+
include::https://raw.githubusercontent.com/openshift/managed-cluster-validating-webhooks/master/docs/webhooks.json[]
53+
----
54+
====

0 commit comments

Comments
 (0)