import/master to stable 1 5

build_tools/ci.sh

@@ -9,7 +9,7 @@ echo "--- installing dependencies"
 dnf install findutils git make ruby rubygems -y
 gem install --no-document --minimal-deps asciidoctor
 
-# get the current working branch, if we're master, we'll end up pushing new docs
+# get the current working branch, if we're stable-1.5, we'll end up pushing new docs
 echo "--- current working branch is $BRANCH"
 
 echo "--- building documentation"
@@ -29,30 +29,27 @@ git config --global user.email "$GH_EMAIL" > /dev/null 2>&1
 git config --global user.name "$GH_NAME" > /dev/null 2>&1
 
 # Remove all files that are not in the .git dir
-echo "--- removing all files related to HEAD"
-find . -maxdepth 1 -not -wholename ".git/*" -not -wholename "./index-1-5-upstream*" -type f -delete
+echo "--- removing all files related to stable-1.5"
+find . -maxdepth 1 -not -wholename ".git/*" -type f -not -wholename "./index.html" -not -wholename "./index-upstream*" -delete
 rm -rf images/
 
 # We need this empty file for git not to try to build a jekyll project.
 # If your project *is* Jekyll, then this doesn't apply to you...
 echo "--- moving built files into the top-level directory"
 touch .nojekyll
 mv build/doc-Service-Telemetry-Framework/* ./
-mv index-upstream.html index.html
 rm -rf build/
 
-# Add everything, get ready for commit. But only do it if we're on
-# master. If you want to deploy on different branches, you can change
-# this.
-if [[ "$BRANCH" =~ ^master$|^[0-9]+\.[0-9]+\.X$ ]]; then
-    echo "Branch is master, so pushing docs to gh-pages"
+# Build this for stable-1.5 branch and push custom paths to gh-pages
+if [[ "$BRANCH" =~ ^stable-1\.5$ ]]; then
+    echo "Branch is stable-1.5, so pushing docs to gh-pages"
     git add --all
-    git commit -am '[ci skip] publishing updated documentation...'
+    git commit -am '[ci skip] publishing updated documentation for STF 1.5...'
 
     git remote rm origin
     git remote add origin https://$GH_NAME:$GH_TOKEN@github.com/infrawatch/documentation.git
 
     git push origin gh-pages
 else
-    echo "Not on master, so won't push doc"
+    echo "Not on stable-1.5, so won't push doc"
 fi

doc-Service-Telemetry-Framework/Makefile

@@ -3,10 +3,10 @@ BUILD_DIR = ../build
 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_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_PDF = $(BUILD_DIR)/$(NAME)-$(BUILD).pdf
 IMAGES_DIR = $(DEST_DIR)/images
 IMAGES_TS = $(DEST_DIR)/.timestamp-images

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

@@ -44,7 +44,7 @@ metadata:
   namespace: openshift-marketplace
 spec:
   displayName: InfraWatch Operators
-  image: quay.io/infrawatch-operators/infrawatch-catalog:nightly
+  image: quay.io/infrawatch-operators/infrawatch-catalog:nightly-1.5
   publisher: InfraWatch
   sourceType: grpc
   updateStrategy:
@@ -245,7 +245,7 @@ metadata:
   name: smart-gateway-operator
   namespace: service-telemetry
 spec:
-  channel: unstable
+  channel: stable-1.5
   installPlanApproval: Automatic
   name: smart-gateway-operator
   source: infrawatch-operators
@@ -266,7 +266,7 @@ metadata:
   name: service-telemetry-operator
   namespace: service-telemetry
 spec:
-  channel: unstable
+  channel: stable-1.5
   installPlanApproval: Automatic
   name: service-telemetry-operator
   source: infrawatch-operators

doc-Service-Telemetry-Framework/modules/proc_importing-dashboards.adoc

@@ -7,6 +7,8 @@ The Grafana Operator can import and manage dashboards by creating `GrafanaDashbo
 
 .Procedure
 
+NOTE: The paths and dashboards names refer to STF 1.3 which is the earliest version of STF the dashboards are compatible and can be used with STF versions 1.3 through 1.5.
+
 . Import the infrastructure dashboard:
 +
 [source,bash,options="nowrap"]