Skip to content

Commit

Permalink
import/stf 1 5 3 (#524)
Browse files Browse the repository at this point in the history
* Fix xrefs for director Operator (#481)

Fix the xrefs for the director Operator. The xrefs were referring to the
filename instead of the id+assembly value.

* Initial pass for external ES (#483)

* Initial pass for external ES

* Updates for external ES

* Notice about deprecated behaviour
* Mention how the migration works (automatically)
* Adjust comments about observabilityStrategy: none
** Events SGs will now deploy if events are enabled
** Adjusted relevant outputs

* Apply suggestions from code review

Co-authored-by: Leif Madsen <[email protected]>

* Minor adjustments from review

---------

Co-authored-by: Leif Madsen <[email protected]>

* Trivial leftover suggestions (#485)

* Trivial leftover suggestions

* Link ES section to KB article (#486)

* Link ES section to KB article

* Update doc-Service-Telemetry-Framework/modules/con_primary-parameters-of-the-servicetelemetry-object.adoc

---------

Co-authored-by: Leif Madsen <[email protected]>

* Initial changes to installation for STF 1.5.3 (#484)

* Initial changes to installation for STF 1.5.3

Make the initial changes to the installation documentation for STF
1.5.3, which uses observabilityStrategy: use_redhat by default along
with preferring to install Observability Operator. Uses the community
operators catalogsource for now until OBO is officially available from
redhat-operators CatalogSource.

Updates the Makefile as well to include Red Hat OpenStack Platform 17.1.

Signed-off-by: Leif Madsen <[email protected]>

* Update install guide for pre-installed Operators

Update the installation guide layout for pre-installed Operators that
cannot be managed with OLM (due to them being cluster-scoped Operators
vs namespace-scoped Operators).

Resolves: STF-1485
Signed-off-by: Leif Madsen <[email protected]>

* Update doc-Service-Telemetry-Framework/modules/proc_deploying-stf-to-the-openshift-environment.adoc

Co-authored-by: mickogeary <[email protected]>

* Update doc-Service-Telemetry-Framework/modules/proc_deploying-stf-to-the-openshift-environment.adoc

Co-authored-by: mickogeary <[email protected]>

* Update doc-Service-Telemetry-Framework/modules/proc_deploying-stf-to-the-openshift-environment.adoc

Co-authored-by: mickogeary <[email protected]>

* Update doc-Service-Telemetry-Framework/modules/proc_deploying-stf-to-the-openshift-environment.adoc

Co-authored-by: mickogeary <[email protected]>

* Adjust wording for cert-manager installation module

* Update doc-Service-Telemetry-Framework/modules/proc_deploying-stf-to-the-openshift-environment.adoc

Co-authored-by: mickogeary <[email protected]>

* Reword section that repeats itself

---------

Signed-off-by: Leif Madsen <[email protected]>
Co-authored-by: mickogeary <[email protected]>

* use_redhat and migration link (#462)

* use_redhat and migration link

* Update doc-Service-Telemetry-Framework/modules/con_observability-strategy.adoc

Co-authored-by: Leif Madsen <[email protected]>

* Update doc-Service-Telemetry-Framework/modules/con_observability-strategy.adoc

Co-authored-by: Leif Madsen <[email protected]>

* Update doc-Service-Telemetry-Framework/modules/con_observability-strategy.adoc

Co-authored-by: Leif Madsen <[email protected]>

* Apply suggestions from code review

Co-authored-by: Leif Madsen <[email protected]>

* Minor typo fix

* Visual tweak

* Update doc-Service-Telemetry-Framework/modules/con_observability-strategy.adoc

Co-authored-by: Leif Madsen <[email protected]>

* Update doc-Service-Telemetry-Framework/modules/con_observability-strategy.adoc

Co-authored-by: Leif Madsen <[email protected]>

---------

Co-authored-by: Leif Madsen <[email protected]>

* Override qdr::router_id defaults in stf-connectors (#487)

Update the documentation to provide an override to the FQDN in the
qdr::router_id configuration to avoid hostnames longer than 61 chars.

Closes rhbz#2208020

* Don't enable event collection by default on OSP (#488)

* Don't enable event collection by default on OSP

Closes STF-1498

* Remove events configurations and use defaults

The defaults for events pipeline and Ceilometer QDR publish events is
disabled and does not need to be called out specifically.

* No longer import the events dashboard (#490)

With a refocus on telemetry by default and without event usage, remove
the event dashboards as an event data store is optional and no longer
included by default.

Related STF-1498

* Installation of cluster monitoring is no longer necessary (#491)

Installation of cluster monitoring in CRC (and elsewhere) is no longer necessary for installation of STF.

Resolved by #465

* Adjust the default polling interval for collectd (#489)

Adjust the collectd polling interval to be 30 seconds instead of 5
seconds.

Related STF-1512

Co-authored-by: Victoria Martinez de la Cruz <[email protected]>

* Remove logs configuration from sample CR (#493)

Related STF-1504

* mg_master_RHOSPDOC-1380_chunk-installation-procedure (#492)

* mg_master_RHOSPDOC-1380_chunk-installation-procedure

* mg_master_RHOSPDOC-1380_chunk-installation-procedure 2nd commoit with further modularisation and chunkage

* Commit 3: renaming proc_deploying-stf-to-the-openshift-environment.adoc to con_deploying-stf-to-the-openshift-environment.adoc

* Reduce the number of Ceilometer pollsters (#497)

Reduce the number of Ceilometer pollsters to only those used by the
sample STF dashboards.

Closes: rhbz#2239390

* Deprecate the use of high availability mode in STF (#494)

* Deprecate the use of high availability mode in STF

Resolves STF-1507

* Update doc-Service-Telemetry-Framework/modules/con_high-availability.adoc

Co-authored-by: mickogeary <[email protected]>

---------

Co-authored-by: mickogeary <[email protected]>

* Fix up the table syntax in Observability Strategy (#495)

The existing table was in markdown format which isn't compatible with asciidoc syntax.

* Do not manage the event pipeline by default (#498)

We do not want events to be sent to QDR by default, as the STF 1.5.3
default configuration will deploy telemetry only

Related STF-1498

* Minor clean up and user experience updates (#496)

Some minor clean up items and convert some commands to be a bit more
user friendly and generic

Resolves STF-1533

* Creating an alert does not use curl (#500)

The Creating a standard alert route in Alertmanager section no longer
uses curl to verify the configuration was loaded, since it uses the
prometheus pod and the wget command instance. Removes an extra procedure
step that is no longer applicable.

* Eliminate duplicate line (#501)

* Adding details for QDR password auth (#502)

* Adding details for QDR password auth

* Move note about disabling auth to main section

* Update doc-Service-Telemetry-Framework/modules/proc_retrieving-the-qdr-password.adoc

Co-authored-by: Leif Madsen <[email protected]>

* Update doc-Service-Telemetry-Framework/modules/proc_retrieving-the-qdr-password.adoc

Co-authored-by: mickogeary <[email protected]>

---------

Co-authored-by: Leif Madsen <[email protected]>
Co-authored-by: mickogeary <[email protected]>

* Support OCP versions 4.12 through 4.14 (#503)

* Support OCP versions 4.12 through 4.14

Update the stf-attributes to cover OCP 4.12 through 4.14 as our default,
as OCP 4.10 is EOL. Update the Makefile for building to only cover RHOSP
17.1 and 16.2.

* Need html-latest for upstream publish script

* Summary: Replace incorrect stf-connectors.yaml filename with enable-stf.yaml (#504)

Tracker: https://bugzilla.redhat.com/show_bug.cgi?id=2239871

Branch: master-BZ-2239871

* Clean up the STF install (#505)

* Clean up the STF install for OCP 4.12 and later

Clean up the STF installation documentation along with a command that
will wait for the STO CSV to be ready and then automatically show the
dependencies.

Also hide contents that are no longer applicable when the supported base
version of OCP is greater than 4.10, since OCP 4.10 is now EOL.

* Adjust the ifeval to be < 4.12

* Provide the preferred STF object for deployment (#507)

Provide the preferred ServiceTelemetry object for deployments rather
than asking the administrator to build a configuration. The provided
object will result in a metrics-focused deployment without extra
configuration options, which will be a foundation for disconnected
installations in the future.

* Fix various RHOSP links and versions (#508)

Fix various links to RHOSP documentation as the paths are different between RHOSP 16.2 and 17.1. Guides were updated but there is no auto-redirect, so we'll need to verify every link that uses defaultURL parameter. This covers the initial ones while working through documentation.

Update some older version links and add a new parameter for 17.1 paths specifically.

* Update and adjust dashboard procedures (#509)

Update and adjust the dashboard installation procedures based on
testing.

* Add deprecation note for Grafana authentication (#510)

Deprecate the basic auth login parameters for Grafana login. Preference
is to use the Log in for OpenShift button going forward.

Fix syntax issues in asciidoc.

* Update deprecated Grafana login warning (#511)

Update the Grafana login deprecation warning with wording from the
documentation team.

* Add updated architecture diagrams (#499)

* Add updated architecture diagrams

* Use updated architecture diagrams

* Update architecture overview to focus on metrics

Update the architecture overview to make it clear STF is focused on
delivery of metrics from RHOSP. Provide information about use_redhat
observability strategy, and note that prior versions of STF would manage
Elasticsearch instances. Note that new installations use the
observability strategy of use_redhat, and that the guide will focus on
that deployment model. Provide a placeholder for a new xref that would
guide the user towards the deprecated architecture using events, where
our updated metrics-and-events architecture diagram would live.

* Link to observability strategy

* Remove community components from core overview

* Use ObservabilityOperator parameter to refer to OBO/COO

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

Co-authored-by: mickogeary <[email protected]>

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

Co-authored-by: mickogeary <[email protected]>

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

Co-authored-by: mickogeary <[email protected]>

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

Co-authored-by: mickogeary <[email protected]>

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

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

Co-authored-by: mickogeary <[email protected]>

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

Co-authored-by: mickogeary <[email protected]>

---------

Co-authored-by: mickogeary <[email protected]>

* Update install guide for dependent operators (#513)

* Update install guide for dependent operators

Update the installation guide for dependent operators. Adds installation
instructions for Cluster Observability Operator and cert-manager for Red
Hat OpenShift using the latest channels available for those Operators.
The result is that deployment of observabilityStrategy: use_redhat is
now possible as the default installation method.

Related: STF-1636

* Update doc-Service-Telemetry-Framework/modules/proc_deploying-certificate-manager-for-openshift-operator.adoc

Co-authored-by: Chris Sibbitt <[email protected]>

* Add prerequisites to STF deployment

* Adjust wording based on editorial feedback

---------

Co-authored-by: Chris Sibbitt <[email protected]>

* Clean up the prerequisites lists (#514)

The prerequisite lists were slightly wrong and have been adjusted for
correctness. Minor update of output in the same area to match latest
version of STF.

* Add removal instructions for COO (#516)

* Add removal instructions for COO

Add removal instructions for Cluster Observability Operator, pointing at
the existing product documentation.

Closes: STF-1643

* Update based on editor feedback

* Refer to cert-manager removal documentation (#515)

* Refer to cert-manager removal documentation

Update the STF removal guide to refer to the cert-manager uninstallation
procedure which is maintained by that team.

Closes: STF-1642

* Adjust cert-manager removal after editor review

* Pre-STF 1.5.3 Documentation Walkthrough and Cleanup (#517)

* Documentation walk-through and clean up

* Update architecture documentation, creating a new section describing
  the architecture changes in STF 1.5.3
* Update style for knowledge base article references based on editorial
  feedback

* Add links to COO and cert-manager

* Update cert-manager install to use oc wait

* Multi-Cloud: Add warning about unique domains

* HA: Move warning to top

* Params: Add warning about HA deprecation

* Obs Strat: Add link to migration KBA

* Multi-Cloud: Remove reference to Ansible-based deployments

* Dashboard: Fix links to collectd plugins

Add wrappers to the collectd plugins in the Dashboard guide because paths changed between 16.2 and 17.1.

* Update wording for CloudDomain overview

Update the wording in the CloudDomain overview since router connections
are controlled with router_id parameters now.

* Modularize STF architecture changes (#518)

* Update diagrams for Cluster Observability Operator (#519)

* mg_master_517_minor-style-edits (#521)

* mg_master_517_minor-style-edits

* Update doc-Service-Telemetry-Framework/modules/con_primary-parameters-of-the-servicetelemetry-object.adoc

---------

Co-authored-by: Leif Madsen <[email protected]>

* Reference 17.1 in docinfo.xml (#522)

* PrometheusRules must reference monitoring.rhobs (#523)

The PrometheusRules and editing must all reference the new
monitoring.rhobs CRD vs the old monitoring.coreos.com CRD which was
provided by the community Prometheus Operator (and potentially
conflicted with user-workload monitoring, and openshift-monitoring). All
references to PrometheusRules now refer to the monitoring.rhobs CRD and
any CLI commands are expanded for the full CRD path.

---------

Signed-off-by: Leif Madsen <[email protected]>
Co-authored-by: Chris Sibbitt <[email protected]>
Co-authored-by: mickogeary <[email protected]>
Co-authored-by: Victoria Martinez de la Cruz <[email protected]>
Co-authored-by: Roger Heslop <[email protected]>
  • Loading branch information
5 people authored Dec 7, 2023
1 parent 5857214 commit a33d4ac
Show file tree
Hide file tree
Showing 62 changed files with 703 additions and 814 deletions.
5 changes: 3 additions & 2 deletions common/global/rhosp_attributes.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

:osp_long: Red Hat OpenStack Platform
:osp_acro: RHOSP
:osp_curr_ver: 17.1-Beta
:osp_curr_ver: 17.1
:osp_curr_ver_no_beta: 17.1
:osp_z_stream: 0

Expand All @@ -29,5 +29,6 @@
:defaultURL: https://access.redhat.com/documentation/en-us/red_hat_openstack_platform/{osp_curr_ver}/html
:defaultCephURL: https://access.redhat.com/documentation/en-us/red_hat_ceph_storage/{CephVernum}/html

:setup-tlse: {defaultURL}/hardening_red_hat_openstack_platform/assembly_securing-rhos-with-tls-and-pki_security_and_hardening#proc_implementing-tls-e-with-ansible_encryption-and-key-management[Implementing TLS-e with Ansible]
// Specific links

:setup-tlse: {defaultURL}/hardening_red_hat_openstack_platform/assembly_securing-rhos-with-tls-and-pki_security_and_hardening#proc_implementing-tls-e-with-ansible_encryption-and-key-management[Implementing TLS-e with Ansible]
18 changes: 12 additions & 6 deletions common/global/stf-attributes.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,16 @@ ifeval::[{vernum} >= 17.0]
:include_when_17:
endif::[]

ifeval::[{vernum} == 17.1]
:include_when_17_1:
endif::[]

ifeval::[{ProductVersion} < 1.5]
:include_before_stf15:
endif::[]

ifeval::["{build}" == "upstream"]
:ObservabilityOperator: Observability{nbsp}Operator
:OpenShift: OpenShift
:OpenShiftShort: OKD
:OpenStack: OpenStack
Expand All @@ -45,24 +50,25 @@ ifeval::["{build}" == "upstream"]
:Project: Service{nbsp}Telemetry{nbsp}Framework
:ProjectShort: STF
:MessageBus: Apache{nbsp}Qpid{nbsp}Dispatch{nbsp}Router
:SupportedOpenShiftVersion: 4.10
:NextSupportedOpenShiftVersion: 4.12
:CodeReadyContainersVersion: 2.6.0
:SupportedOpenShiftVersion: 4.12
:NextSupportedOpenShiftVersion: 4.14
:CodeReadyContainersVersion: 2.19.0
endif::[]

ifeval::["{build}" == "downstream"]
:ObservabilityOperator: Cluster{nbsp}Observability{nbsp}Operator
:OpenShift: Red{nbsp}Hat{nbsp}OpenShift{nbsp}Container{nbsp}Platform
:OpenShiftShort: OCP
:OpenStack: Red{nbsp}Hat{nbsp}OpenStack{nbsp}Platform
:OpenStackShort: RHOSP
:OpenStackVersion: 17.0
:OpenStackVersion: 17.1
:OpenStackLong: {OpenStack}{nbsp}{OpenStackVersion}
:OpenStackInstaller: director
:OVirt: Red{nbsp}Hat{nbsp}Virtualization
:OVirtShort: RHV
:Project: Service{nbsp}Telemetry{nbsp}Framework
:ProjectShort: STF
:MessageBus: AMQ{nbsp}Interconnect
:SupportedOpenShiftVersion: 4.10
:NextSupportedOpenShiftVersion: 4.12
:SupportedOpenShiftVersion: 4.12
:NextSupportedOpenShiftVersion: 4.14
endif::[]
18 changes: 12 additions & 6 deletions doc-Service-Telemetry-Framework/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ BUILD_DIR = ../build
ROOTDIR = $(realpath .)
NAME = $(notdir $(ROOTDIR))
DEST_DIR = $(BUILD_DIR)/$(NAME)
DEST_HTML = $(DEST_DIR)/index-1-5-$(BUILD).html
DEST_HTML_170 = $(DEST_DIR)/index-1-5-$(BUILD)-170.html
DEST_HTML_162 = $(DEST_DIR)/index-1-5-$(BUILD)-162.html
DEST_HTML_13 = $(DEST_DIR)/index-1-5-$(BUILD)-13.html
DEST_HTML = $(DEST_DIR)/index-$(BUILD).html
DEST_HTML_171 = $(DEST_DIR)/index-$(BUILD)-171.html
DEST_HTML_170 = $(DEST_DIR)/index-$(BUILD)-170.html
DEST_HTML_162 = $(DEST_DIR)/index-$(BUILD)-162.html
DEST_HTML_13 = $(DEST_DIR)/index-$(BUILD)-13.html
DEST_PDF = $(BUILD_DIR)/$(NAME)-$(BUILD).pdf
IMAGES_DIR = $(DEST_DIR)/images
IMAGES_TS = $(DEST_DIR)/.timestamp-images
Expand All @@ -23,10 +24,12 @@ endif

all: html

html: html-latest html170 html162 html13
html: html-latest html171 html162

html-latest: prepare $(IMAGES_TS) $(DEST_HTML)

html171: prepare $(IMAGES_TS) $(DEST_HTML_171)

html170: prepare $(IMAGES_TS) $(DEST_HTML_170)

html162: prepare $(IMAGES_TS) $(DEST_HTML_162)
Expand All @@ -53,7 +56,10 @@ $(IMAGES_TS): $(IMAGES)
touch $(IMAGES_TS)

$(DEST_HTML): $(SOURCES)
asciidoctor -a source-highlighter=highlightjs -a highlightjs-languages="yaml,bash" -a highlightjs-theme="monokai" --failure-level WARN -a build=$(BUILD) -a vernum=17.0 -b xhtml5 -d book -o $@ $<
asciidoctor -a source-highlighter=highlightjs -a highlightjs-languages="yaml,bash" -a highlightjs-theme="monokai" --failure-level WARN -a build=$(BUILD) -a vernum=17.1 -b xhtml5 -d book -o $@ $<

$(DEST_HTML_171): $(SOURCES)
asciidoctor -a source-highlighter=highlightjs -a highlightjs-languages="yaml,bash" -a highlightjs-theme="monokai" --failure-level WARN -a build=$(BUILD) -a vernum=17.1 -b xhtml5 -d book -o $@ $<

$(DEST_HTML_170): $(SOURCES)
asciidoctor -a source-highlighter=highlightjs -a highlightjs-languages="yaml,bash" -a highlightjs-theme="monokai" --failure-level WARN -a build=$(BUILD) -a vernum=17.0 -b xhtml5 -d book -o $@ $<
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ include::../modules/proc_configuring-red-hat-openstack-platform-overcloud-for-st
ifdef::include_when_13,include_when_17[]
include::../modules/proc_getting-ca-certificate-from-stf-for-overcloud-configuration.adoc[leveloffset=+2]
endif::include_when_13,include_when_17[]
include::../modules/proc_retrieving-the-qdr-password.adoc[leveloffset=+2]
include::../modules/proc_retrieving-the-qdr-route-address.adoc[leveloffset=+2]
include::../modules/proc_creating-the-base-configuration-for-stf.adoc[leveloffset=+2]
include::../modules/proc_configuring-the-stf-connection-for-the-overcloud.adoc[leveloffset=+2]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ ifdef::context[:parent-context: {context}]
:context: assembly-installing-the-core-components-of-stf

[role="_abstract"]
You can use Operators to load the {Project} ({ProjectShort}) components and objects. Operators manage each of the following {ProjectShort} core and community components:
You can use Operators to load the {Project} ({ProjectShort}) components and objects. Operators manage each of the following {ProjectShort} core components:

* cert-manager
* Certificate Management
* {MessageBus}
* Smart Gateway
* Prometheus and AlertManager
* Elasticsearch
* Grafana
* Smart Gateways
* Prometheus and Alertmanager

{Project} ({ProjectShort}) uses other supporting Operators as part of the deployment. {ProjectShort} can resolve most dependencies automatically, but you need to pre-install some Operators, such as {ObservabilityOperator}, which provides an instance of Prometheus and Alertmanager, and cert-manager for Red Hat OpenShift, which provides management of certificates.

.Prerequisites

Expand All @@ -23,7 +23,7 @@ endif::[]
ifeval::["{SupportedOpenShiftVersion}" != "{NextSupportedOpenShiftVersion}"]
* An {OpenShift} version inclusive of {SupportedOpenShiftVersion} through {NextSupportedOpenShiftVersion} is running.
endif::[]
* You have prepared your {OpenShift} environment and ensured that there is persistent storage and enough resources to run the {ProjectShort} components on top of the {OpenShift} environment. For more information, see https://access.redhat.com/articles/4907241[Service Telemetry Framework Performance and Scaling].
* You have prepared your {OpenShift} environment and ensured that there is persistent storage and enough resources to run the {ProjectShort} components on top of the {OpenShift} environment. For more information about {ProjectShort} performance, see the Red Hat Knowledge Base article https://access.redhat.com/articles/4907241[Service Telemetry Framework Performance and Scaling].
* Your environment is fully connected. {ProjectShort} does not work in a {OpenShift}-disconnected environments or network proxy environments.

ifeval::["{build}" == "downstream"]
Expand All @@ -40,10 +40,16 @@ endif::[]

* For more information about Operators, see the https://docs.openshift.com/container-platform/{NextSupportedOpenShiftVersion}/operators/understanding/olm-what-operators-are.html[_Understanding Operators_] guide.
* For more information about Operator catalogs, see https://docs.openshift.com/container-platform/{NextSupportedOpenShiftVersion}/operators/understanding/olm-rh-catalogs.html[_Red Hat-provided Operator catalogs_].
//* For more information about how to remove {ProjectShort} from the {OpenShift} environment, see xref:assembly-removing-stf-from-the-openshift-environment_{}[].
* For more information about the cert-manager Operator for Red Hat, see https://docs.openshift.com/container-platform/{NextSupportedOpenShiftVersion}/security/cert_manager_operator/index.html[_cert-manager Operator for Red Hat OpenShift overview_].
* For more information about {ObservabilityOperator}, see https://docs.openshift.com/container-platform/{NextSupportedOpenShiftVersion}/monitoring/cluster_observability_operator/cluster-observability-operator-overview.html[_Cluster Observability Operator Overview_].

include::../modules/con_deploying-stf-to-the-openshift-environment.adoc[leveloffset=+1]

include::../modules/proc_deploying-stf-to-the-openshift-environment.adoc[leveloffset=+1]
include::../modules/proc_deploying-observability-operator.adoc[leveloffset=+2]
include::../modules/proc_deploying-certificate-manager-for-openshift-operator.adoc[leveloffset=+2]
include::../modules/proc_deploying-service-telemetry-operator.adoc[leveloffset=+2]
include::../modules/proc_creating-a-servicetelemetry-object-in-openshift.adoc[leveloffset=+1]

include::../modules/con_primary-parameters-of-the-servicetelemetry-object.adoc[leveloffset=+2]
include::../modules/proc_accessing-uis-for-stf-components.adoc[leveloffset=+1]
include::../modules/proc_configuring-observability-strategy.adoc[leveloffset=+1]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ include::../modules/con_support-for-stf.adoc[leveloffset=+1]
endif::[]

include::../modules/con_stf-architecture.adoc[leveloffset=+1]
include::../modules/con_stf-architecture-changes.adoc[leveloffset=+2]

include::../modules/con_installation-size-of-ocp.adoc[leveloffset=+1]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,12 @@ To prepare your {OpenShift} environment for {Project} ({ProjectShort}), you must
* Ensure that you have persistent storage available in your {OpenShift} cluster for a production-grade deployment. For more information, see <<persistent-volumes_assembly-preparing-your-ocp-environment-for-stf>>.
* Ensure that enough resources are available to run the Operators and the application containers. For more information, see <<resource-allocation_assembly-preparing-your-ocp-environment-for-stf>>.
* Ensure that you have a fully connected network environment. For more information, see xref:con-network-considerations-for-service-telemetry-framework_assembly-preparing-your-ocp-environment-for-stf[].
ifeval::["{build}" == "upstream"]
* {ProjectShort} uses Elasticsearch to store events, which requires a larger than normal `vm.max_map_count` value. The `vm.max_map_count` value is set by default in {OpenShift}. For more information about how to edit the value of `vm.max_map_count`, see <<node-tuning-operator_assembly-preparing-your-ocp-environment-for-stf>>.
endif::[]

include::../modules/con_observability-strategy.adoc[leveloffset=+1]
include::../modules/con_persistent-volumes.adoc[leveloffset=+1]
include::../modules/con_resource-allocation.adoc[leveloffset=+1]
include::../modules/con_network-considerations-for-service-telemetry-framework.adoc[leveloffset=+1]

ifeval::["{build}" == "upstream"]
include::../modules/con_node-tuning-operator.adoc[leveloffset=+1]
endif::[]

//reset the context
ifdef::parent-context[:context: {parent-context}]
ifndef::parent-context[:!context:]
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@ ifeval::["{build}" == "upstream"]
. Remove the catalog source.
endif::[]
. Remove the cert-manager Operator.
. Remove the {ObservabilityOperator}.

include::../modules/proc_deleting-the-namespace.adoc[leveloffset=+1]
ifeval::["{build}" == "upstream"]
include::../modules/proc_removing-the-catalogsource.adoc[leveloffset=+1]
endif::[]
include::../modules/proc_removing-the-cert-manager-operator.adoc[leveloffset=+1]
include::../modules/ref_removing-the-cert-manager-operator.adoc[leveloffset=+1]
include::../modules/ref_removing-the-observability-operator.adoc[leveloffset=+1]

//reset the context
ifdef::parent-context[:context: {parent-context}]
Expand Down
2 changes: 1 addition & 1 deletion doc-Service-Telemetry-Framework/docinfo.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<title>Service Telemetry Framework 1.5</title>
<subtitle>Installing and deploying Service Telemetry Framework 1.5</subtitle>
<productname>Red Hat OpenStack Platform</productname>
<productnumber>17.0</productnumber>
<productnumber>17.1</productnumber>
<pubsnumber>0</pubsnumber>
<abstract>
<para>
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions doc-Service-Telemetry-Framework/master.adoc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
= Service Telemetry Framework 1.5
OpenStack Documentation Team <rhos-docs@redhat.com>
:imagesdir: images
:vernum: 17.0
:vernum: 17.1
:toc: left
:toclevels: 3
:icons: font
Expand Down Expand Up @@ -32,9 +32,9 @@ include::assemblies/assembly_installing-the-core-components-of-stf.adoc[leveloff
include::assemblies/assembly_completing-the-stf-configuration.adoc[leveloffset=+1]

ifeval::["{build}" == "downstream"]
ifdef::include_when_16_2[]
ifdef::include_when_16_2,include_when_17_1[]
include::assemblies/assembly_completing-the-stf-configuration-using-director-operator.adoc[leveloffset=+1]
endif::include_when_16_2[]
endif::include_when_16_2,include_when_17_1[]
endif::[]

//advanced features
Expand All @@ -46,7 +46,7 @@ include::assemblies/assembly_renewing-the-amq-interconnect-certificate.adoc[leve
// removing
include::assemblies/assembly_removing-stf-from-the-openshift-environment.adoc[leveloffset=+1]

//collectd plugins

// upgrading to 1.5
include::assemblies/assembly_upgrading-service-telemetry-framework-to-version-1-5.adoc[leveloffset=+1]
// NOTE: this is no longer being rendered because the expectation is to move from STF 1.4 on OCP 4.8 to STF 1.5 on OCP 4.10, both of which are EOL now.
// if this affects you, please open a customer case to help manage the upgrade, or simply perform a greenfield deployment of STF 1.5 on OCP 4.14.
//include::assemblies/assembly_upgrading-service-telemetry-framework-to-version-1-5.adoc[leveloffset=+1]
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,14 @@
[role="_abstract"]
You can configure multiple {OpenStack} ({OpenStackShort}) clouds to target a single instance of {Project} ({ProjectShort}). When you configure multiple clouds, every cloud must send metrics and events on their own unique message bus topic. In the {ProjectShort} deployment, Smart Gateway instances listen on these topics to save information to the common data store. Data that is stored by the Smart Gateway in the data storage domain is filtered by using the metadata that each of Smart Gateways creates.

[WARNING]
====
Ensure that you deploy each cloud with a unique cloud domain configuration. For more information about configuring the domain for your cloud deployment, see xref:setting-a-unique-cloud-domain_assembly-completing-the-stf-configuration[].
====

[[osp-stf-multiple-clouds]]
.Two {OpenStackShort} clouds connect to {ProjectShort}
image::OpenStack_STF_Overview_37_0919_topology.png[An example of two {OpenStackShort} clouds connecting to {ProjectShort}]
image::363_OpenStack_STF_updates_0923_topology_2.png[An example of two {OpenStackShort} clouds connecting to {ProjectShort}]

To configure the {OpenStackShort} overcloud for a multiple cloud scenario, complete the following tasks:

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[id="deploying-stf-to-the-openshift-environment_{context}"]
= Deploying {Project} to the {OpenShift} environment

[role="_abstract"]
Deploy {Project} ({ProjectShort}) to collect and store {OpenStack} ({OpenStackShort}) telemetry.
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,6 @@ The https://code-ready.github.io/crc/#minimum-system-requirements-hardware_gsg[m
.Procedure

. After you complete the installation of CRC, you must enable cluster monitoring in the CRC environment:
+
[source,bash,options="nowrap"]
----
$ crc config set enable-cluster-monitoring true
Successfully configured enable-cluster-monitoring to true
----

. If you have an existing environment, delete it, and recreate it to ensure that the resource requests have an effect. Enter the `crc delete` command:
+
[source,bash]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@

[id="high-availability_{context}"]
= High availability

[role="_abstract"]
With high availability, {Project} ({ProjectShort}) can rapidly recover from failures in its component services. Although {OpenShift} restarts a failed pod if nodes are available to schedule the workload, this recovery process might take more than one minute, during which time events and metrics are lost. A high availability configuration includes multiple copies of {ProjectShort} components, which reduces recovery time to approximately 2 seconds. To protect against failure of an {OpenShift} node, deploy {ProjectShort} to an {OpenShift} cluster with three or more nodes.

[WARNING]
{ProjectShort} is not yet a fully fault tolerant system. Delivery of metrics and events during the recovery period is not guaranteed.
====
{ProjectShort} high availability (HA) mode is deprecated and is not supported in production environments. {OpenShift} is a highly-available platform, and you can cause issues and complicate debugging in {ProjectShort} if you enable HA mode.
====

With high availability, {Project} ({ProjectShort}) can rapidly recover from failures in its component services. Although {OpenShift} restarts a failed pod if nodes are available to schedule the workload, this recovery process might take more than one minute, during which time events and metrics are lost. A high availability configuration includes multiple copies of {ProjectShort} components, which reduces recovery time to approximately 2 seconds. To protect against failure of an {OpenShift} node, deploy {ProjectShort} to an {OpenShift} cluster with three or more nodes.

Enabling high availability has the following effects:

* Three Elasticsearch pods run instead of the default one.
* The following components run two pods instead of the default one:
** {MessageBus}
** Alertmanager
Expand Down
Loading

0 comments on commit a33d4ac

Please sign in to comment.