Adjustments based on production testing

doc-Service-Telemetry-Framework/assemblies/assembly_installing-the-core-components-of-stf.adoc

@@ -25,15 +25,17 @@ You can use Operators to load the various application components and objects. Ea
 
 .Prerequisites
 
-* {OpenShift} ({OpenShiftShort}) version {SupportedOpenShiftVersion} or {NextSupportedOpenShiftVersion} is running.
+* {OpenShift} ({OpenShiftShort}) version {SupportedOpenShiftVersion}
+// TODO: add back to previous line when NextSupportedOpenShiftVersion has been tested 
+// or {NextSupportedOpenShiftVersion} is running.
 * You have prepared your {OpenShift} ({OpenShiftShort}) environment and ensured that there is persistent storage and enough resources to run the {ProjectShort} components on top of the {OpenShiftShort} environment.
 
 
 ifeval::["{build}" == "downstream"]
 [IMPORTANT]
-{Project} ({ProjectShort}) is compatible with {OpenShift} versions {SupportedOpenShiftVersion} and {NextSupportedOpenShiftVersion}.
-
-//For more information about migrating, see https://access.redhat.com/articles/5477371[Migrating Service Telemetry Framework v1.0 from OperatorSource to CatalogSource].
+{Project} ({ProjectShort}) is compatible with {OpenShift} versions {SupportedOpenShiftVersion}
+// TODO: add back to previous line when OCP 4.7 has been tested and is supported
+// and {NextSupportedOpenShiftVersion}.
 endif::[]
 
 .Additional resources

doc-Service-Telemetry-Framework/assemblies/assembly_introduction-to-stf.adoc

@@ -23,7 +23,9 @@ ifdef::context[:parent-context: {context}]
 
 ifeval::["{build}" == "downstream"]
 [IMPORTANT]
-{Project} ({ProjectShort}) is compatible with {OpenShift} versions 4.5 and 4.6.
+{Project} ({ProjectShort}) is compatible with {OpenShift} versions {SupportedOpenShiftVersion}
+// TODO: add back to previous line when next version is supported
+// and {NextSupportedOpenShiftVersion}.
 
 //For more information about migrating, see https://access.redhat.com/articles/5477371[Migrating Service Telemetry Framework v1.0 from OperatorSource to CatalogSource].
 endif::[]

doc-Service-Telemetry-Framework/modules/con_stf-architecture.adoc

@@ -62,7 +62,9 @@ If you plan to collect and store events, collectd or Ceilometer delivers event d
 Server-side {ProjectShort} monitoring infrastructure consists of the following layers:
 
 * {Project} {ProductVersion} ({ProjectShort})
-* {OpenShift} {SupportedOpenShiftVersion} ({OpenShiftShort}) or {NextSupportedOpenShiftVersion}
+* {OpenShift} {SupportedOpenShiftVersion} ({OpenShiftShort}) 
+// TODO: add back to previous line when next version is supported
+// or {NextSupportedOpenShiftVersion}
 * Infrastructure platform
 
 [[osp-stf-server-side-monitoring]]

doc-Service-Telemetry-Framework/modules/proc_creating-an-operatorgroup.adoc

@@ -28,11 +28,11 @@ Create an OperatorGroup in the namespace so that you can schedule the Operator p
 
 .Procedure
 
-* Enter the following command:
+* Create the STF OperatorGroup:
 +
 [source,bash]
 ----
-$ oc apply -f - <<EOF
+$ oc create -f - <<EOF
 apiVersion: operators.coreos.com/v1
 kind: OperatorGroup
 metadata:

doc-Service-Telemetry-Framework/modules/proc_enabling-infrawatch-catalog-source.adoc

@@ -35,7 +35,7 @@ Before you deploy {ProjectShort} on {OpenShift}, you must enable the catalog sou
 +
 [source,bash]
 ----
-$ oc apply -f - <<EOF
+$ oc create -f - <<EOF
 apiVersion: operators.coreos.com/v1alpha1
 kind: CatalogSource
 metadata:

doc-Service-Telemetry-Framework/modules/proc_enabling-the-operatorhub-io-community-catalog-source.adoc

@@ -26,16 +26,18 @@
 [role="_abstract"]
 Before you install ElasticSearch, you must have access to the resources on the OperatorHub.io Community Catalog Source.
 
+ifeval::["{build}" == "downstream"]
 [NOTE]
-All operators installed from this Catalog source are not supported by Red Hat. 
+All operators installed from this CatalogSource are not supported by Red Hat.
+endif::[]
 
 .Procedure
 
-* Enter the following command:
+* Enable the OperatorHub.io CatalogSource:
 +
 [source,bash]
 ----
-$ oc apply -f - <<EOF
+$ oc create -f - <<EOF
 apiVersion: operators.coreos.com/v1alpha1
 kind: CatalogSource
 metadata:

doc-Service-Telemetry-Framework/modules/proc_subscribing-to-the-amq-certificate-manager-operator.adoc

@@ -35,7 +35,7 @@ The AMQ Certificate Manager is installed globally for all namespaces, so the `na
 +
 [source,bash]
 ----
-$ oc apply -f - <<EOF
+$ oc create -f - <<EOF
 apiVersion: operators.coreos.com/v1alpha1
 kind: CatalogSource
 metadata:
@@ -57,7 +57,7 @@ EOF
 +
 [source,bash]
 ----
-$ oc apply -f - <<EOF
+$ oc create -f - <<EOF
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:

doc-Service-Telemetry-Framework/modules/proc_subscribing-to-the-elastic-cloud-on-kubernetes-operator.adoc

@@ -28,11 +28,11 @@ Before you install the Service Telemetry Operator and if you plan to store event
 
 .Procedure
 
-. To enable the Elastic Cloud on Kubernetes Operator, apply the following manifest to your {OpenShiftShort} environment:
+. To enable the Elastic Cloud on Kubernetes Operator, create the following manifest in your {OpenShiftShort} environment:
 +
 [source,bash]
 ----
-$ oc apply -f - <<EOF
+$ oc create -f - <<EOF
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
@@ -47,12 +47,13 @@ spec:
 EOF
 ----
 
-. Verify that the `ClusterServiceVersion` for ElasticSearch Cloud on Kubernetes `succeeded`:
+. Verify that the `ClusterServiceVersion` for ElasticSearch Cloud on Kubernetes `Succeeded`:
 +
 [source,options="nowrap",subs="+quotes"]
 ----
 $ oc get csv
 
-NAME                       DISPLAY                                         VERSION   REPLACES   PHASE
-elastic-cloud-eck.v1.2.1   Elastic Cloud on Kubernetes                     1.2.1                Succeeded
+NAME                       DISPLAY                        VERSION   REPLACES                   PHASE
+...
+elastic-cloud-eck.v1.6.0   Elasticsearch (ECK) Operator   1.6.0     elastic-cloud-eck.v1.5.0   Succeeded
 ----

doc-Service-Telemetry-Framework/modules/proc_subscribing-to-the-service-telemetry-operator.adoc

@@ -28,19 +28,19 @@ You must subscribe to the Service Telemetry Operator, which manages the {Project
 
 .Procedure
 
-. To create the Service Telemetry Operator subscription, enter the `oc apply -f` command:
+. To create the Service Telemetry Operator subscription, enter the `oc create -f` command:
 +
 ifeval::["{build}" == "upstream"]
 [source,bash]
 ----
-$ oc apply -f - <<EOF
+$ oc create -f - <<EOF
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
   name: service-telemetry-operator
   namespace: service-telemetry
 spec:
-  channel: stable-1.2
+  channel: stable-1.3
   installPlanApproval: Automatic
   name: service-telemetry-operator
   source: infrawatch-operators
@@ -51,14 +51,14 @@ endif::[]
 ifeval::["{build}" == "downstream"]
 [source,bash]
 ----
-$ oc apply -f - <<EOF
+$ oc create -f - <<EOF
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
   name: service-telemetry-operator
   namespace: service-telemetry
 spec:
-  channel: stable-1.2
+  channel: stable-1.3
   installPlanApproval: Automatic
   name: service-telemetry-operator
   source: redhat-operators