Merge branch 'master' into cleanup/dashboards-and-syntax

infrawatch · Oct 25, 2023 · 22bd3d2 · 22bd3d2
2 parents f7f7a4c + 0c88867
commit 22bd3d2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/doc-Service-Telemetry-Framework/assemblies/assembly_advanced-features.adoc b/doc-Service-Telemetry-Framework/assemblies/assembly_advanced-features.adoc
@@ -23,8 +23,8 @@ endif::include_when_16[]
 include::../modules/con_dashboards.adoc[leveloffset=+1]
 include::../modules/proc_setting-up-grafana-to-host-the-dashboard.adoc[leveloffset=+2]
 ifdef::include_when_16[]
-include::../modules/proc_overriding-the-default-grafana-container-image.adoc[leveloffset=+2]
-//TODO: Add dashboards back when we have working code for OSP13
+// TODO: either rewrite or drop this procedure. We now provide the preferred downstream RHEL Grafana workload image in the deployment procedure.
+//include::../modules/proc_overriding-the-default-grafana-container-image.adoc[leveloffset=+2]
 include::../modules/proc_importing-dashboards.adoc[leveloffset=+2]
 endif::include_when_16[]
 include::../modules/proc_retrieving-and-setting-grafana-login-credentials.adoc[leveloffset=+2]

diff --git a/...-Telemetry-Framework/modules/proc_setting-up-grafana-to-host-the-dashboard.adoc b/...-Telemetry-Framework/modules/proc_setting-up-grafana-to-host-the-dashboard.adoc
@@ -46,7 +46,7 @@ EOF
 +
 [source,bash,options="nowrap"]
 ----
-$ oc wait --for jsonpath="{.status.phase}"=Running csv -l operators.coreos.com/grafana-operator.service-telemetry --timeout=600s
+$ oc wait --for jsonpath="{.status.phase}"=Succeeded csv -l operators.coreos.com/grafana-operator.service-telemetry --timeout=600s
 
 clusterserviceversion.operators.coreos.com/grafana-operator.v4.10.1 condition met
 ----