From 38189a52daca9e2ab8b350cdff12ef246fe768cc Mon Sep 17 00:00:00 2001 From: Chris Sibbitt Date: Tue, 9 May 2023 12:19:43 -0400 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Leif Madsen --- .../modules/con_observability-strategy.adoc | 8 ++++---- .../modules/con_support-for-stf.adoc | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc-Service-Telemetry-Framework/modules/con_observability-strategy.adoc b/doc-Service-Telemetry-Framework/modules/con_observability-strategy.adoc index 33dca5cb..093643fb 100644 --- a/doc-Service-Telemetry-Framework/modules/con_observability-strategy.adoc +++ b/doc-Service-Telemetry-Framework/modules/con_observability-strategy.adoc @@ -14,11 +14,11 @@ The following values are available: |-------|---------| | use_redhat | Only Red Hat supported components are requested by {ProjectShort}. This includes Prometheus and Alertmanager from the Observability Operator, but no resource requests to Elasticsearch Operator or Grafana Operator. | | use_hybrid | In addition to the Red Hat supported components, Elasticsearch and Grafana resources are also requested (if specified in the ServiceTelemetry object) | -| use_community | The community version of Prometheus Operator is used instead of Observability Operator. Elasticsearch and Grafana resources are also requested (if specified in the STF object) | +| use_community | The community version of Prometheus Operator is used instead of Observability Operator. Elasticsearch and Grafana resources are also requested (if specified in the ServiceTelemetry object) | | none | No storage or alerting components are deployed | -Newly deployed STF environments as of 1.5.3 default to `use_redhat`. +Newly deployed {ProjectShort} environments as of 1.5.3 default to `use_redhat`. -Existing STF deployments created before 1.5.3 default to `use_community`. +Existing {ProjectShort} deployments created before 1.5.3 default to `use_community`. -To migrate an existing STF deployment to `use_redhat`, see https://access.redhat.com/articles/7011708[Migrating STF to fully supported operators] +To migrate an existing {ProjectShort} deployment to `use_redhat`, see https://access.redhat.com/articles/7011708[Migrating STF to fully supported operators] diff --git a/doc-Service-Telemetry-Framework/modules/con_support-for-stf.adoc b/doc-Service-Telemetry-Framework/modules/con_support-for-stf.adoc index acc401aa..79a0bf9d 100644 --- a/doc-Service-Telemetry-Framework/modules/con_support-for-stf.adoc +++ b/doc-Service-Telemetry-Framework/modules/con_support-for-stf.adoc @@ -2,7 +2,7 @@ = Support for {Project} [role="_abstract"] -Red Hat supports the core Operators and workloads, including {MessageBus}, Prometheus Operator, Service Telemetry Operator, and Smart Gateway Operator. Red Hat does not support the community Operators or workload components, inclusive of Elasticsearch, Grafana, and their Operators. +Red Hat supports the core Operators and workloads, including {MessageBus}, Observability Operator (Prometheus, Alertmanager), Service Telemetry Operator, and Smart Gateway Operator. Red Hat does not support the community Operators or workload components, inclusive of Elasticsearch, Grafana, and their Operators. You can only deploy {ProjectShort} in a fully connected network environment. You cannot deploy {ProjectShort} in {OpenShift}-disconnected environments or network proxy environments.