Skip to content

Commit 1b77dd3

Browse files
authored
Merge pull request #67856 from gwynnemonahan/OSSM-5357
OSSM-5357 [DOC] Openshift Userworkload Monitoring integration documentation bug
2 parents 54ec414 + 56f9c2f commit 1b77dd3

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

modules/ossm-integrating-with-user-workload-monitoring.adoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ spec:
5656
external_services:
5757
istio:
5858
url_service_version: 'http://istiod-basic.istio-system:15014/version'
59+
config_map_name: istio-basic # <1>
5960
prometheus:
6061
auth:
6162
token: secret:thanos-querier-web-token:token
@@ -68,6 +69,7 @@ spec:
6869
url: https://thanos-querier.openshift-monitoring.svc.cluster.local:9091
6970
version: v1.65
7071
----
72+
<1> Set the `ServiceMeshControlPlane` name prefixed with `istio-`.
7173

7274
. Configure the SMCP for external Prometheus:
7375
+
@@ -158,7 +160,7 @@ spec:
158160
replacement: "basic-istio-system" # <2>
159161
targetLabel: mesh_id
160162
----
161-
<1> Since {product-title} monitoring ignores the `namespaceSelector` spec in `ServiceMonitor` and `PodMonitor` objects, you must apply the `PodMonitor` object in all mesh namespaces, including the control plane namespace.
163+
<1> Create this `ServiceMonitor` object in the Istio control plane namespace because it monitors the Istiod service. In this example, the namespace is `istio-system`.
162164
<2> The string `"basic-istio-system"` is a combination of the SMCP name and its namespace, but any label can be used as long as it is unique for every mesh using user workload monitoring in the cluster. The `spec.prometheus.query_scope` of the Kiali resource configured in Step 2 needs to match this value.
163165
+
164166
[NOTE]

0 commit comments

Comments
 (0)