From bafbb5ea01e0710286db2dd75fb2a5795dfe05c6 Mon Sep 17 00:00:00 2001 From: Joanne O'Flynn Date: Wed, 23 Jun 2021 16:45:29 +0100 Subject: [PATCH 1/2] first set of changes --- doc-Service-Telemetry-Framework/docinfo.xml | 2 +- doc-Service-Telemetry-Framework/master.adoc | 2 +- ...creating-openstack-environment-file-for-multiple-clouds.adoc | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc-Service-Telemetry-Framework/docinfo.xml b/doc-Service-Telemetry-Framework/docinfo.xml index 6a49308b..1bb9fd11 100644 --- a/doc-Service-Telemetry-Framework/docinfo.xml +++ b/doc-Service-Telemetry-Framework/docinfo.xml @@ -1,7 +1,7 @@ Service Telemetry Framework 1.3 Installing and deploying Service Telemetry Framework 1.3 Red Hat OpenStack Platform -16.1 +13 0 diff --git a/doc-Service-Telemetry-Framework/master.adoc b/doc-Service-Telemetry-Framework/master.adoc index 53c3d123..61dd0df8 100644 --- a/doc-Service-Telemetry-Framework/master.adoc +++ b/doc-Service-Telemetry-Framework/master.adoc @@ -1,7 +1,7 @@ = Service Telemetry Framework 1.3 OpenStack Documentation Team :imagesdir: images -:vernum: 16.1 +:vernum: 13 :toc: left :toclevels: 3 :icons: font diff --git a/doc-Service-Telemetry-Framework/modules/proc_creating-openstack-environment-file-for-multiple-clouds.adoc b/doc-Service-Telemetry-Framework/modules/proc_creating-openstack-environment-file-for-multiple-clouds.adoc index 2ba6ae8b..e75501ea 100644 --- a/doc-Service-Telemetry-Framework/modules/proc_creating-openstack-environment-file-for-multiple-clouds.adoc +++ b/doc-Service-Telemetry-Framework/modules/proc_creating-openstack-environment-file-for-multiple-clouds.adoc @@ -26,8 +26,10 @@ [role="_abstract"] To label traffic according to the cloud of origin, you must create a configuration with cloud-specific instance names. Create an `stf-connectors.yaml` file and adjust the values of `CeilometerQdrEventsConfig`, `CeilometerQdrMetricsConfig` and `CollectdAmqpInstances` to match the AMQP address prefix scheme. +ifdef::include_when_16[] [NOTE] If you enabled container health and API status monitoring, you must also modify the `CollectdSensubilityResultsChannel` parameter. For more information, see xref:monitoring-container-health-and-api-status_assembly-advanced-features[]. +endif::include_when_16[] .Prerequisites From 1896c2d93e095eea7d3b8c983e936d26515e4460 Mon Sep 17 00:00:00 2001 From: Joanne O'Flynn Date: Wed, 23 Jun 2021 16:58:18 +0100 Subject: [PATCH 2/2] Changes to assembly --- .../assemblies/assembly_advanced-features.adoc | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/doc-Service-Telemetry-Framework/assemblies/assembly_advanced-features.adoc b/doc-Service-Telemetry-Framework/assemblies/assembly_advanced-features.adoc index 8d4d8207..cc6089bd 100644 --- a/doc-Service-Telemetry-Framework/assemblies/assembly_advanced-features.adoc +++ b/doc-Service-Telemetry-Framework/assemblies/assembly_advanced-features.adoc @@ -1,16 +1,3 @@ -// This assembly is included in the following assemblies: -// -// - -//// -Retains the context of the parent assembly if this assembly is nested within another assembly. -For more information about nesting assemblies, see: https://redhat-documentation.github.io/modular-docs/#nesting-assemblies -See also the complementary step on the last line of this file. -//// - -ifdef::context[:parent-context: {context}] - - [id="assembly-advanced-features_{context}"] = Advanced features @@ -28,7 +15,9 @@ The following optional features can provide additional functionality to the {Pro * xref:high-availability_assembly-advanced-features[] * xref:dashboards_assembly-advanced-features[] * xref:ephemeral-storage_assembly-advanced-features[] +ifdef::include_when_16[] * xref:monitoring-resource-usage-of-openstack-services_assembly-advanced-features[] +endif::include_when_16[] * xref:creating-a-route-in-ocp_assembly-advanced-features[] // Customizing the deployment (manifest overrides)