lmadsen/stf 1093 (#397)

* Update Makefile to build multiple version builds

* Fix up CRC deployment instructions

Clean up the CRC development environment deployment instructions.
Enabling the cluster monitoring within the environment is required due
to use of oauth-proxy, which is provided as part of the built in cluster
monitoring.

I also cleaned up the procedure a bit to not duplicate information and
remove procedure steps from the concept portion of the documentation.

This only affects the upstream documentation as this section is not
rendered downstream.

* Update doc-Service-Telemetry-Framework/modules/con_development-environment-resource-requirements.adoc

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

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

Author: leifmadsen

Makefile

@@ -11,10 +11,10 @@ clean: all-clean
 browser: all-browser
 
 all-html:
-	cd doc-Service-Telemetry-Framework && $(MAKE) html && $(MAKE) html13
+	cd doc-Service-Telemetry-Framework && $(MAKE) html
 
 all-html-downstream:
-	cd doc-Service-Telemetry-Framework && $(MAKE) html BUILD=downstream && $(MAKE) html13 BUILD=downstream
+	cd doc-Service-Telemetry-Framework && $(MAKE) html BUILD=downstream
 
 all-pdf:
 	cd doc-Service-Telemetry-Framework && $(MAKE) pdf

doc-Service-Telemetry-Framework/Makefile

@@ -4,6 +4,8 @@ ROOTDIR = $(realpath .)
 NAME = $(notdir $(ROOTDIR))
 DEST_DIR = $(BUILD_DIR)/$(NAME)
 DEST_HTML = $(DEST_DIR)/index-$(BUILD).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
@@ -21,7 +23,13 @@ endif
 
 all: html
 
-html: prepare $(IMAGES_TS) $(DEST_HTML)
+html: html-latest html170 html162 html13
+
+html-latest: prepare $(IMAGES_TS) $(DEST_HTML)
+
+html170: prepare $(IMAGES_TS) $(DEST_HTML_170)
+
+html162: prepare $(IMAGES_TS) $(DEST_HTML_162)
 
 html13: prepare $(IMAGES_TS) $(DEST_HTML_13)
 
@@ -45,7 +53,13 @@ $(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) -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.0 -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 $@ $<
+
+$(DEST_HTML_162): $(SOURCES)
+	asciidoctor -a source-highlighter=highlightjs -a highlightjs-languages="yaml,bash" -a highlightjs-theme="monokai" --failure-level WARN -a build=$(BUILD) -a vernum=16.2 -b xhtml5 -d book -o $@ $<
 
 $(DEST_HTML_13): $(SOURCES)
 	asciidoctor -a source-highlighter=highlightjs -a highlightjs-languages="yaml,bash" -a highlightjs-theme="monokai" --failure-level WARN -a build=$(BUILD) -a vernum=13 -b xhtml5 -d book -o $@ $<

doc-Service-Telemetry-Framework/modules/con_development-environment-resource-requirements.adoc

@@ -27,7 +27,6 @@ ifeval::["{build}" == "upstream"]
 [id="development-environment-resource-requirements_{context}"]
 = Development environment resource requirements
 
-
 [role="_abstract"]
 You can create an all-in-one development environment for {ProjectShort} locally by using https://code-ready.github.io/crc/[CodeReady Containers]. The installation process of CodeReady Containers (CRC) is available at https://code-ready.github.io/crc/#installation_gsg.
 
@@ -37,25 +36,24 @@ The https://code-ready.github.io/crc/#minimum-system-requirements-hardware_gsg[m
 * 64 GB of memory
 * 80 GB of storage space
 
-After you complete the installation of CRC, use the `crc start` command to start your environment. The recommended minimum system resources for running {ProjectShort} in CodeReady Containers is 48 GB of memory and 8 virtual CPU cores:
+.Procedure
 
-[source,bash]
+. After you complete the installation of CRC, you must enable cluster monitoring in the CRC environment:
++
+[source,bash,options="nowrap"]
 ----
-crc start --memory=49152 --cpus=8
+$ 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.
-
-.Procedure
-
-. Enter the `crc delete` command.
+. 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]
 ----
 crc delete
 ----
 
-. Run the `crc start` command to create your environment:
+. Use the `crc start` command to start your environment. The recommended minimum system resources for running {ProjectShort} in CRC is 48 GB of memory and 8 virtual CPU cores:
 +
 [source,bash]
 ----

doc-Service-Telemetry-Framework/modules/proc_deploying-to-non-standard-network-topologies.adoc

@@ -6,7 +6,7 @@ If your nodes are on a separate network from the default `InternalApi` network,
 
 
 // TODO: remove this after OSP13 z13 since it will no longer be necessary.
-If you use {ProjectShort} with {OpenStack} ({OpenStackShort}) {OpenStackVersion}  and plan to monitor your Ceph, Block, or Object Storage nodes, you must make configuration changes that are similar to the configuration changes that you make to the spine-leaf and DCN network configuration. To monitor Ceph nodes, use the `CephStorageExtraConfig` parameter to define which network interface to load into the {MessageBus} and collectd configuration files.
+If you use {ProjectShort} with {OpenStack} ({OpenStackShort}) {OpenStackVersion} and plan to monitor your Ceph, Block, or Object Storage nodes, you must make configuration changes that are similar to the configuration changes that you make to the spine-leaf and DCN network configuration. To monitor Ceph nodes, use the `CephStorageExtraConfig` parameter to define which network interface to load into the {MessageBus} and collectd configuration files.
 
 [source,yaml,options="nowrap",role="white-space-pre"]
 ----