Skip to content

Commit

Permalink
Minor clean up and user experience updates
Browse files Browse the repository at this point in the history
Some minor clean up items and convert some commands to be a bit more
user friendly and generic

Resolves STF-1533
  • Loading branch information
leifmadsen committed Sep 26, 2023
1 parent 720ac91 commit 6a32663
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ $ oc project service-telemetry
+
[source,bash,options="nowrap"]
----
$ oc exec -it $(oc get po -l application=default-interconnect -o jsonpath='{.items[0].metadata.name}') -- qdstat --connections | grep Router | wc
$ oc exec -it deploy/default-interconnect -- qdstat --connections | grep Router | wc
0 0 0
----

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ $ oc project service-telemetry

. Create a `PrometheusRule` object that contains the alert rule and an `oid` label that contains the SNMP trap OID override value:
+
[source,bash]
[source,yaml]
----
$ oc apply -f - <<EOF
apiVersion: monitoring.coreos.com/v1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ EOF
+
[source,bash,options="nowrap",role="white-space-pre"]
----
oc get csv --namespace=openshift-operators --selector=operators.coreos.com/observability-operator.openshift-operators
$ oc wait --for jsonpath="{.status.phase}"=Succeeded csv --namespace=openshift-operators -l operators.coreos.com/observability-operator.openshift-operators
NAME DISPLAY VERSION REPLACES PHASE
observability-operator.v0.0.25 Observability Operator 0.0.25 observability-operator.v0.0.22 Succeeded
clusterserviceversion.operators.coreos.com/observability-operator.v0.0.26-230906073415 condition met
----
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ EOF
----
endif::[]

. Validate the Service Telemetry Operator and the dependent operators have their phase as Succeeded:
. Validate the Service Telemetry Operator and the dependent operators have their phase as Succeeded. You may need to re-run the command several times until all Operators are available:
+
[source,bash,options="nowrap",role="white-space-pre"]
----
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,9 @@ EOF
+
[source,bash,options="nowrap"]
----
$ oc get csv --selector operators.coreos.com/grafana-operator.service-telemetry
$ oc wait --for jsonpath="{.status.phase}"=Running csv -l operators.coreos.com/grafana-operator.service-telemetry --timeout=600s
NAME DISPLAY VERSION REPLACES PHASE
grafana-operator.v4.10.1 Grafana Operator 4.10.1 grafana-operator.v4.10.0 Succeeded
clusterserviceversion.operators.coreos.com/grafana-operator.v4.10.1 condition met
----

. To launch a Grafana instance, create or modify the `ServiceTelemetry` object. Set `graphing.enabled` and `graphing.grafana.ingressEnabled` to `true`. Optionally, set the value of `graphing.grafana.baseImage` to the Grafana workload container image that will be deployed:
Expand All @@ -74,10 +73,9 @@ spec:
+
[source,bash]
----
$ oc get pod -l app=grafana
$ oc wait --for jsonpath="{.status.phase}"=Running pod -l app=grafana --timeout=600s
NAME READY STATUS RESTARTS AGE
grafana-deployment-7fc7848b56-sbkhv 1/1 Running 0 1m
pod/grafana-deployment-7566475c56-jlkjp condition met
----

. Verify that the Grafana data sources installed correctly:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ default-interconnect-7458fd4d69-bgzfb 1/1 Running 0 6d21h
+
[source,bash,options="nowrap"]
----
$ oc exec -it default-interconnect-7458fd4d69-bgzfb -- qdstat --connections
$ oc exec -it deploy/default-interconnect -- qdstat --connections
2020-04-21 18:25:47.243852 UTC
default-interconnect-7458fd4d69-bgzfb
Expand All @@ -125,7 +125,7 @@ Connections
+
[source,bash,options="nowrap"]
----
$ oc exec -it default-interconnect-7458fd4d69-bgzfb -- qdstat --address
$ oc exec -it deploy/default-interconnect -- qdstat --address
2020-04-21 18:20:10.293258 UTC
default-interconnect-7458fd4d69-bgzfb
Expand Down

0 comments on commit 6a32663

Please sign in to comment.