Merge pull request #67633 from openshift-cherrypick-robot/cherry-pick…

…-67334-to-enterprise-4.15 [enterprise-4.15] OCPBUGS-07108: Adding disclaimer for Loki cluster-admin user role
openshift · Nov 9, 2023 · 8681662 · 8681662
2 parents d6c0ba8 + d4c2d84
commit 8681662
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/modules/network-observability-lokistack-create.adoc b/modules/network-observability-lokistack-create.adoc
@@ -7,6 +7,9 @@
 = Creating a LokiStack custom resource
 You can deploy a LokiStack using the web console or CLI to create a namespace, or new project.
 
+include::snippets/logging-clusteradmin-access-logs-snip.adoc[]
+For more information about creating a `cluster-admin` group, see the "Additional resources" section.  
+
 .Procedure
 
 . Navigate to *Operators* -> *Installed Operators*, viewing *All projects* from the *Project* dropdown.

diff --git a/network_observability/installing-operators.adoc b/network_observability/installing-operators.adoc
@@ -27,6 +27,10 @@ include::modules/network-observability-loki-secret.adoc[leveloffset=+2]
 * For more information about the option to use different namespaces for the separate components, see the `spec.loki.tls.caCert.namespace` specification in the xref:../network_observability/flowcollector-api.adoc#network-observability-flowcollector-api-specifications_network_observability[Flow Collector API Reference] and callout number 5 in the xref:../network_observability/configuring-operator.adoc#network-observability-flowcollector-view_network_observability[Flow Collector sample resource].
 
 include::modules/network-observability-lokistack-create.adoc[leveloffset=+2]
+[role="_additional-resources"]
+.Additional resources
+* xref:../logging/cluster-logging-loki.adoc#logging-creating-new-group-cluster-admin-user-role_cluster-logging-loki[Creating a new group for the cluster-admin user role]
+
 include::modules/network-observability-lokistack-ingestion-query.adoc[leveloffset=+2]
 include::modules/network-observability-auth-multi-tenancy.adoc[leveloffset=+2]
 include::modules/network-observability-multitenancy.adoc[leveloffset=+2]

diff --git a/snippets/logging-clusteradmin-access-logs-snip.adoc b/snippets/logging-clusteradmin-access-logs-snip.adoc
@@ -4,6 +4,7 @@
 // Text snippet included in the following modules:
 //
 // * modules/logging-creating-new-group-cluster-admin-user-role.adoc
+// * modules/network-observability-lokistack-create.adoc
 //
 :_mod-docs-content-type: SNIPPET