Merge pull request #46 from Helene/v7.0.4

V7.0.4 changes

Author: Helene

Dockerfile

@@ -1,4 +1,5 @@
-FROM registry.access.redhat.com/ubi8/ubi:8.4-206
+ARG BASE=registry.access.redhat.com/ubi8/ubi:8.4-209
+FROM $BASE
 
 COPY ./requirements/requirements_ubi8.txt  /root/requirements_ubi8.txt
 

README.md

@@ -16,12 +16,9 @@ Grafana Bridge is a standalone Python application. It translates the IBM Spectru
 
 ### Installation guides:
 
-* [Setup the grafana bridge on a classic IBM Spectrum Scale cluster](/docs/CLASSIC_SETUP.md)
-* [Run the grafana bridge in a docker container](/docs/RUNNING_AS_DOCKER_CONTAINER.md)
-* [Deploying the grafana bridge for an IBM CNSA project in a k8s/OCP environment](/docs/grafana_bridge_deployment_ocp.md)
-* [Deploying a Grafana instance for the IBM CNSA project in a k8s/OCP environment](/docs/grafana_deployment_ocp.md)
-* [Connecting the grafana-bridge datasource to the Grafana instance in a k8s/OCP environment](/docs/connect_bridge_to_grafana_ocp.md)
-* [Explore the Grafana WEB interface for the IBM CNSA project in a k8s/OCP environment](/docs/explore_grafana_ocp.md)
+* [Setup the grafana bridge on a classic IBM Spectrum Scale cluster](https://github.com/IBM/ibm-spectrum-scale-bridge-for-grafana/wiki/Setup-the-IBM-Spectrum-Scale-Performance-Monitoring-Bridge-for-classic-IBM-Spectrum-Scale-devices)
+* [Run the grafana bridge in a docker container](https://github.com/IBM/ibm-spectrum-scale-bridge-for-grafana/wiki/Running-the-IBM-Spectrum-Scale-Performance-Monitoring-Bridge-in-a-docker-container)
+* [Setup the grafana bridge for performance monitoring of a CNSA cluster in a k8s OCP environment](https://github.com/IBM/ibm-spectrum-scale-bridge-for-grafana/wiki/Setup-Grafana-for-monitoring-a-CNSA-cluster--in-a-k8s-OCP-environment)
 
 Find more helpful information about the bridge usage in the project [Wiki](https://github.com/IBM/ibm-spectrum-scale-bridge-for-grafana/wiki)
 

docs/BUILDING_DOCKER_IMAGE.md

@@ -1,3 +1,12 @@
+# Version 7.0.4 (09/22/2021)
+Changed the Dockerfile parent image to the registry.access.redhat.com/ubi8/ubi:8.4-209
+Moved out the documentation files from the repository content. They have been placed on the [project Wiki](https://github.com/IBM/ibm-spectrum-scale-bridge-for-grafana/wiki).
+
+Tested with Grafana version 7.5.1 and 8.0.3
+Tested with RedHat community-powered Grafana operator v.3.10.3
+
+
+
 # Version 7.0.3 (08/13/2021)
 Changed the Dockerfile parent image to the registry.access.redhat.com/ubi8/ubi:8.4-206
 Added requirements_ubi8.txt file including the python versions packages needed to be installed to run the bridge in an OpenShift production environment, on top of the redhat UBI8 image

docs/CHANGELOG.md

@@ -1,4 +1,11 @@
 The following matrix gives a quick overview of the supported software for the IBM Spectrum Scale bridge for Grafana packages by version number:
+# Version 7.0.4 (09/22/2021)
+- Python 3.6
+- CherryPy 18.6.1
+- IBM Spectrum Scale system must run 5.1.1 and above or
+- IBM Spectrum Scale Container Native Storage Access(CNSA) devices having minReleaseLevel 5.1.1.4
+- Grafana 8.0.0 and above
+
 # Version 7.0.3 (08/13/2021)
 - Python 3.6
 - CherryPy 18.6.1