From 5e4471ad921c42c25f7eb30b302f38a1eef98027 Mon Sep 17 00:00:00 2001 From: Leif Madsen Date: Wed, 13 Oct 2021 17:22:37 -0400 Subject: [PATCH 1/4] Clean up after installation walk through Do a bit of clean up and verification refactoring after doing a documentation walk through. --- ...-servicetelemetry-object-in-openshift.adoc | 11 +++++----- ...eratorhub-io-community-catalog-source.adoc | 20 +++++++++++++++++++ ...-elastic-cloud-on-kubernetes-operator.adoc | 8 +++----- ...ing-to-the-service-telemetry-operator.adoc | 8 ++++---- 4 files changed, 33 insertions(+), 14 deletions(-) diff --git a/doc-Service-Telemetry-Framework/modules/proc_creating-a-servicetelemetry-object-in-openshift.adoc b/doc-Service-Telemetry-Framework/modules/proc_creating-a-servicetelemetry-object-in-openshift.adoc index b899b40e..cdb70f29 100644 --- a/doc-Service-Telemetry-Framework/modules/proc_creating-a-servicetelemetry-object-in-openshift.adoc +++ b/doc-Service-Telemetry-Framework/modules/proc_creating-a-servicetelemetry-object-in-openshift.adoc @@ -72,10 +72,8 @@ metadata: name: default spec: alerting: - enabled: true alertmanager: storage: - strategy: persistent persistent: pvcStorageRequest: 20G storageSelector: {} @@ -83,25 +81,27 @@ spec: snmpTraps: enabled: false target: 192.168.24.254 + strategy: persistent + enabled: true backends: events: elasticsearch: enabled: false storage: - strategy: persistent persistent: pvcStorageRequest: 20Gi storageSelector: {} + strategy: persistent metrics: prometheus: enabled: true scrapeInterval: 10s storage: - strategy: persistent persistent: pvcStorageRequest: 20G storageSelector: {} retention: 24h + strategy: persistent graphing: enabled: false grafana: @@ -109,6 +109,7 @@ spec: adminUser: root disableSignoutMenu: false ingressEnabled: false + baseImage: docker.io/grafana/grafana:8.1.2 highAvailability: enabled: false transports: @@ -152,7 +153,7 @@ $ oc logs --selector name=service-telemetry-operator --------------------------- Ansible Task Status Event StdOut ----------------- PLAY RECAP ********************************************************************* -localhost : ok=54 changed=0 unreachable=0 failed=0 skipped=19 rescued=0 ignored=0 +localhost : ok=57 changed=0 unreachable=0 failed=0 skipped=20 rescued=0 ignored=0 ---- .Verification diff --git a/doc-Service-Telemetry-Framework/modules/proc_enabling-the-operatorhub-io-community-catalog-source.adoc b/doc-Service-Telemetry-Framework/modules/proc_enabling-the-operatorhub-io-community-catalog-source.adoc index fe5bd090..50b37c53 100644 --- a/doc-Service-Telemetry-Framework/modules/proc_enabling-the-operatorhub-io-community-catalog-source.adoc +++ b/doc-Service-Telemetry-Framework/modules/proc_enabling-the-operatorhub-io-community-catalog-source.adoc @@ -50,3 +50,23 @@ spec: publisher: OperatorHub.io EOF ---- + +* Validate your `CatalogSource`: ++ +[source,bash] +---- +$ oc get catalogsource -nopenshift-marketplace operatorhubio-operators + +NAME DISPLAY TYPE PUBLISHER AGE +operatorhubio-operators OperatorHub.io Operators grpc OperatorHub.io 2m21s +---- + +* Verify the `operatorhubio-operators` pod is running: ++ +[source,bash] +---- +$ oc get pods -nopenshift-marketplace --selector olm.catalogSource=operatorhubio-operators + +NAME READY STATUS RESTARTS AGE +operatorhubio-operators-2cmm4 1/1 Running 0 3m12s +---- diff --git a/doc-Service-Telemetry-Framework/modules/proc_subscribing-to-the-elastic-cloud-on-kubernetes-operator.adoc b/doc-Service-Telemetry-Framework/modules/proc_subscribing-to-the-elastic-cloud-on-kubernetes-operator.adoc index 5fa46bce..431d880b 100644 --- a/doc-Service-Telemetry-Framework/modules/proc_subscribing-to-the-elastic-cloud-on-kubernetes-operator.adoc +++ b/doc-Service-Telemetry-Framework/modules/proc_subscribing-to-the-elastic-cloud-on-kubernetes-operator.adoc @@ -51,10 +51,8 @@ EOF + [source,options="nowrap"] ---- -$ oc get csv +$ oc get csv --selector operators.coreos.com/elasticsearch-eck-operator-certified.service-telemetry -NAME DISPLAY VERSION REPLACES PHASE -... -elasticsearch-eck-operator-certified.v1.8.0 Elasticsearch (ECK) Operator 1.8.0 elasticsearch-eck-operator-certified.v1.7.1 Succeeded -... +NAME DISPLAY VERSION REPLACES PHASE +elasticsearch-eck-operator-certified.v1.8.0 Elasticsearch (ECK) Operator 1.8.0 elasticsearch-eck-operator-certified.v1.7.1 Succeeded ---- diff --git a/doc-Service-Telemetry-Framework/modules/proc_subscribing-to-the-service-telemetry-operator.adoc b/doc-Service-Telemetry-Framework/modules/proc_subscribing-to-the-service-telemetry-operator.adoc index d0912f4e..4d02ed10 100644 --- a/doc-Service-Telemetry-Framework/modules/proc_subscribing-to-the-service-telemetry-operator.adoc +++ b/doc-Service-Telemetry-Framework/modules/proc_subscribing-to-the-service-telemetry-operator.adoc @@ -74,11 +74,11 @@ endif::[] ---- $ oc get csv --namespace service-telemetry -NAME DISPLAY VERSION REPLACES PHASE +NAME DISPLAY VERSION REPLACES PHASE amq7-cert-manager.v1.0.1 Red Hat Integration - AMQ Certificate Manager 1.0.1 Succeeded -amq7-interconnect-operator.v1.10.1 Red Hat Integration - AMQ Interconnect 1.10.1 amq7-interconnect-operator.v1.2.4 Succeeded +amq7-interconnect-operator.v1.10.2 Red Hat Integration - AMQ Interconnect 1.10.2 Succeeded elasticsearch-eck-operator-certified.v1.8.0 Elasticsearch (ECK) Operator 1.8.0 elasticsearch-eck-operator-certified.v1.7.1 Succeeded prometheusoperator.0.47.0 Prometheus Operator 0.47.0 prometheusoperator.0.37.0 Succeeded -service-telemetry-operator.v1.4.1632856033 Service Telemetry Operator 1.4.1632856033 Succeeded -smart-gateway-operator.v4.0.1632856027 Smart Gateway Operator 4.0.1632856027 Succeeded +service-telemetry-operator.v1.3.1632277596 Service Telemetry Operator 1.3.1632277596 Succeeded +smart-gateway-operator.v3.0.1632277599 Smart Gateway Operator 3.0.1632277599 Succeeded ---- From 2edecfca7ab45a9245e32f57b085a8b98da1a1e1 Mon Sep 17 00:00:00 2001 From: Leif Madsen Date: Wed, 13 Oct 2021 17:25:21 -0400 Subject: [PATCH 2/4] Grafana Operator CSV check clean up --- .../proc_setting-up-grafana-to-host-the-dashboard.adoc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/doc-Service-Telemetry-Framework/modules/proc_setting-up-grafana-to-host-the-dashboard.adoc b/doc-Service-Telemetry-Framework/modules/proc_setting-up-grafana-to-host-the-dashboard.adoc index b828119e..d4fb37c5 100644 --- a/doc-Service-Telemetry-Framework/modules/proc_setting-up-grafana-to-host-the-dashboard.adoc +++ b/doc-Service-Telemetry-Framework/modules/proc_setting-up-grafana-to-host-the-dashboard.adoc @@ -63,11 +63,10 @@ EOF + [source,bash,options="nowrap"] ---- -$ oc get csv +$ oc get csv --selector operators.coreos.com/grafana-operator.service-telemetry -NAME DISPLAY VERSION REPLACES PHASE -grafana-operator.v3.10.3 Grafana Operator 3.10.3 grafana-operator.v3.10.2 Succeeded -... +NAME DISPLAY VERSION REPLACES PHASE +grafana-operator.v3.10.3 Grafana Operator 3.10.3 grafana-operator.v3.10.2 Succeeded ---- . To launch a Grafana instance, create or modify the `ServiceTelemetry` object. Set `graphing.enabled` and `graphing.grafana.ingressEnabled` to `true`. From e32bcf05ac3827c0483012da036fb30c28afa463 Mon Sep 17 00:00:00 2001 From: JoanneOFlynn2018 <45287002+JoanneOFlynn2018@users.noreply.github.com> Date: Wed, 13 Oct 2021 22:38:35 +0100 Subject: [PATCH 3/4] Update doc-Service-Telemetry-Framework/modules/proc_enabling-the-operatorhub-io-community-catalog-source.adoc --- ...oc_enabling-the-operatorhub-io-community-catalog-source.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc-Service-Telemetry-Framework/modules/proc_enabling-the-operatorhub-io-community-catalog-source.adoc b/doc-Service-Telemetry-Framework/modules/proc_enabling-the-operatorhub-io-community-catalog-source.adoc index 50b37c53..d80450f0 100644 --- a/doc-Service-Telemetry-Framework/modules/proc_enabling-the-operatorhub-io-community-catalog-source.adoc +++ b/doc-Service-Telemetry-Framework/modules/proc_enabling-the-operatorhub-io-community-catalog-source.adoc @@ -61,7 +61,7 @@ NAME DISPLAY TYPE PUBLISHER AGE operatorhubio-operators OperatorHub.io Operators grpc OperatorHub.io 2m21s ---- -* Verify the `operatorhubio-operators` pod is running: +* Verify that the `operatorhubio-operators` pod is running: + [source,bash] ---- From bd9ea1ef74366dcea1c56b6d6c49ab820b0e9684 Mon Sep 17 00:00:00 2001 From: Leif Madsen Date: Wed, 13 Oct 2021 18:52:17 -0400 Subject: [PATCH 4/4] Update doc-Service-Telemetry-Framework/modules/proc_subscribing-to-the-service-telemetry-operator.adoc --- .../proc_subscribing-to-the-service-telemetry-operator.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc-Service-Telemetry-Framework/modules/proc_subscribing-to-the-service-telemetry-operator.adoc b/doc-Service-Telemetry-Framework/modules/proc_subscribing-to-the-service-telemetry-operator.adoc index 4d02ed10..7d1badc3 100644 --- a/doc-Service-Telemetry-Framework/modules/proc_subscribing-to-the-service-telemetry-operator.adoc +++ b/doc-Service-Telemetry-Framework/modules/proc_subscribing-to-the-service-telemetry-operator.adoc @@ -79,6 +79,6 @@ amq7-cert-manager.v1.0.1 Red Hat Integration - AMQ Certific amq7-interconnect-operator.v1.10.2 Red Hat Integration - AMQ Interconnect 1.10.2 Succeeded elasticsearch-eck-operator-certified.v1.8.0 Elasticsearch (ECK) Operator 1.8.0 elasticsearch-eck-operator-certified.v1.7.1 Succeeded prometheusoperator.0.47.0 Prometheus Operator 0.47.0 prometheusoperator.0.37.0 Succeeded -service-telemetry-operator.v1.3.1632277596 Service Telemetry Operator 1.3.1632277596 Succeeded -smart-gateway-operator.v3.0.1632277599 Smart Gateway Operator 3.0.1632277599 Succeeded +service-telemetry-operator.v1.4.1632856033 Service Telemetry Operator 1.4.1632856033 Succeeded +smart-gateway-operator.v4.0.1632856027 Smart Gateway Operator 4.0.1632856027 Succeeded ----