Skip to content

Commit ff52c47

Browse files
authored
Update user-guide-v1beta2.adoc
1 parent bfedbd3 commit ff52c47

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

doc/user-guide-v1beta2.adoc

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -443,15 +443,11 @@ Once a `RuntimeComponent` application is exposed as a Provisioned Service, a ser
443443

444444
=== Monitoring
445445

446-
Runtime Component Operator can create a `ServiceMonitor` resource to integrate with `Prometheus Operator`.
446+
Runtime Component Operator can create a Prometheus `ServiceMonitor` resource to integrate with `Prometheus Operator` once installed.
447447

448-
Monitoring can be leveraged by users on Red Hat OpenShift Container Platform. Before using the feature, you must install `Prometheus Operator` by following our link:++https://github.com/OpenLiberty/open-liberty-operator/blob/main/doc/openshift-monitoring.adoc++[Application Monitoring] guide.
448+
Monitoring can be leveraged by users on Red Hat OpenShift Container Platform v4.6+. Before using the feature, you must install `Prometheus Operator` by following our link:++https://github.com/OpenLiberty/open-liberty-operator/blob/main/doc/openshift-monitoring.adoc#application-monitoring-on-rhocp-46++[Application Monitoring on RHOCP 4.6+] guide. Configure the `RuntimeComponent` CR instance with the basic or advanced monitoring specification below, then view Prometheus Metrics through the OpenShift UI as "Administrator" under the `Observe` > `Metrics` tab.
449449

450-
_The community edition of Prometheus Operator is not supported for users on Red Hat OpenShift Container Platform._
451-
452-
_This feature does not support integration with Knative Service._
453-
454-
_Prometheus Operator is required to use ServiceMonitor._
450+
_This feature does not support community versions of Prometheus Operator and integration with Knative Service._
455451

456452
==== Basic monitoring specification
457453

@@ -472,7 +468,7 @@ spec:
472468

473469
==== Advanced monitoring specification
474470

475-
For advanced scenarios, it is possible to set many `ServiceMonitor` settings such as authentication secret using link:++https://github.com/coreos/prometheus-operator/blob/main/Documentation/api.md#endpoint++[Prometheus Endpoint]
471+
For advanced scenarios, it is possible to set many `ServiceMonitor` settings such as authentication secret using link:++https://github.com/coreos/prometheus-operator/blob/main/Documentation/api.md#endpoint++[Prometheus Endpoint]. Ensure that the `basicAuth` secrets (i.e. `metrics-secret`) are created and visible to Runtime Component Operator.
476472

477473
[source,yaml]
478474
----
@@ -498,8 +494,6 @@ spec:
498494
insecureSkipVerify: true
499495
----
500496

501-
Runtime Component Operator will not create/update the `ServiceMonitor` if the `basicAuth` secrets are not defined.
502-
503497
=== Knative support
504498

505499
Runtime Component Operator can deploy serverless applications with link:++https://knative.dev/docs/++[Knative] on a Kubernetes cluster. To achieve this, the operator creates a link:++https://github.com/knative/serving/blob/main/docs/spec/spec.md#service++[Knative `Service`] resource which manages the whole life cycle of a workload.

0 commit comments

Comments
 (0)