Merge branch 'main' into ltpa-advanced

Author: kabicin

.one-pipeline-archive.yaml

@@ -27,6 +27,7 @@ setup:
       curl -X POST -H 'Content-type: application/json' --data '{"text":"The archive operation for '$REPO' has failed."}' $(get_env slack_web_hook_url) </dev/null
       curl -X POST -H 'Content-type: application/json' --data '{"text":"Failing pipeline: '$pipeline_url'"}' $(get_env slack_web_hook_url) </dev/null
       curl -X POST -H 'Content-type: application/json' --data '{"text":"Destination repository: '$ARCHIVE_DESTINATION_REPO'"}' $(get_env slack_web_hook_url) </dev/null
+      exit 1
     else
       echo "${REPO} has been archived successfully to ${ARCHIVE_DESTINATION_REPO}"
     fi
@@ -123,4 +124,4 @@ release:
   script: |
     #!/usr/bin/env bash
     echo "Skipping release"
-    exit 0
+    exit 0

deploy/dashboards/metrics/README.md

@@ -9,7 +9,6 @@ The following dashboards are for use with Open Liberty using mpMetrics-1.x or mp
 - Click the Create [+] icon > Click "Import" > Click "Upload .json file" > Upload.
 
 ### RHOCP and Grafana Operator with OLM
-
 - The YAML dashboard file can be installed using the `oc apply` command in the project containing Grafana Operator.
 - Switch to the project containing Grafana Operator i.e. `oc project grafana`.
 - Navigate this repository to the YAML dashboard file that you wish to install and copy the URL generated by the "Raw" button as an argument to the `-f` flag. For example, for RHOCP and Grafana Operator 3.0.2 running Open Liberty mpMetrics-2.x, you can run:
@@ -18,4 +17,6 @@ The following dashboards are for use with Open Liberty using mpMetrics-1.x or mp
     ```
 
 ### RHOCP and Grafana Operator without OLM
-- Users running Grafana Operator without OLM should refer to the installation steps and JSON dashboards provided for **OKD and Grafana**.
+- Download the JSON dashboard file that matches your mpMetrics version from the `RHOCP4.3-Grafana5.2` folder.
+- Open Grafana.
+- Click the Create [+] icon > Click "Import" > Click "Upload .json file" > Upload.