update change log and support matirix for the release version 6.1.4

Author: Helene

docs/CHANGELOG.md

@@ -1,3 +1,14 @@
+# Version 6.1.4 (07/21/2021)
+
+Added support for the 'protocol' command line argument.
+Removed fixed port numbers for HTTP/HTTPS connections.
+
+Expanded test module with more unit tests
+
+Tested with Grafana 8.0.3 version
+
+
+
 # Version 6.1.3 (05/21/2021)
 
 Added support for the 'includeDiskData' command line argument.

docs/CLASSIC_SETUP.md

@@ -75,6 +75,9 @@ Define a new data source (Data Sources -> Add New)
 
 ![](/docs/Example_Add_DataSource.png)
 
-**NOTE**: The IBM Spectrum Scale bridge listens on port 4242 for HTTP connections, and on port 8443 for HTTPS(SSL) connections. Follow the instructions [Generate SSL certificates](https://github.com/IBM/ibm-spectrum-scale-bridge-for-grafana/wiki/How-to-setup-HTTPS%28SSL%29-connection-for-the-IBM-Spectrum-Scale-bridge-for-Grafana#generate-ssl-certificates) to generate a private ssl key and a ssl certificate
+**NOTE**: Per default the IBM Spectrum Scale bridge listens on port 4242 for HTTP connections. For HTTPS(SSL) connections you need to set the appropriate protocol settings on the bridge start.
+          Follow the instructions [Generate SSL certificates](https://github.com/IBM/ibm-spectrum-scale-bridge-for-grafana/wiki/How-to-setup-HTTPS%28SSL%29-connection-for-the-IBM-Spectrum-Scale-bridge-for-Grafana#generate-ssl-certificates) to generate a private ssl key and a ssl certificate
+
+
 
 Grafana now can talk to Spectrum Scale Performance Monitoring tool via the bridge. Follow the grafana instructions to create dashboards.

docs/RUNNING_AS_DOCKER_CONTAINER.md

@@ -69,7 +69,7 @@ Now you can add the host running the bridge container to the Grafana monitoring
 2. Start the bridge running in a container:
 
 ```shell
-# podman run -dt -p 4242:4242,8443:8443 -e "SERVER=9.XXX.XXX.XXX" -e "PORT=8443" -e "TLSKEYPATH=/etc/bridge_ssl/certs" -e "TLSKEYFILE=privkey.pem" -e "TLSCERTFILE=cert.pem" \ -v /tmp:/var/log/ibm_bridge_for_grafana -v /etc/bridge_ssl/certs:/etc/bridge_ssl/certs \ --pod new:my-bridge-ssl-test-pod --name bridge-ssl-test bridge_image:latest 
+# podman run -dt -p 4242:4242,8443:8443 -e "SERVER=9.XXX.XXX.XXX" -e "PORT=8443" -e "PROTOCOL=https" -e "TLSKEYPATH=/etc/bridge_ssl/certs" -e "TLSKEYFILE=privkey.pem" -e "TLSCERTFILE=cert.pem" \ -v /tmp:/var/log/ibm_bridge_for_grafana -v /etc/bridge_ssl/certs:/etc/bridge_ssl/certs \ --pod new:my-bridge-ssl-test-pod --name bridge-ssl-test bridge_image:latest 
 
 # podman logs bridge-ssl-test
 Connection to the collector server established successfully

docs/SETUP_SSL_CONNECTION.md

@@ -21,10 +21,10 @@ Openssl will then ask you a series of questions. You can enter whatever values a
 Note: The file names for the key and the certificate should be ‘privkey.pem’ and ‘cert.pem’.
 
 
-3. Start the bridge listening on the socket port 8443. Don't forget to provide the location and the file name of the tls private key and the tls certificate:
+3. Start the bridge listening on the socket port 8443 using HTTPS protocol. Don't forget to provide the location and the file name of the tls private key and the tls certificate:
 
 ```shell
-# python3 zimonGrafanaIntf.py -p 8443 -t /etc/bridge_ssl/certs -k privkey.pem -m cert.pem
+# python3 zimonGrafanaIntf.py -p 8443 -r https -t /etc/bridge_ssl/certs -k privkey.pem -m cert.pem
 ```
 
 

docs/SUPPORT_MATRIX.md

@@ -1,5 +1,12 @@
 The following matrix gives a quick overview of the supported software for the IBM Spectrum Scale bridge for Grafana packages by version number:
 
+# Version 6.1.4 (07/21/2021)
+- Python 3.6
+- CherryPy 18.6.0
+- IBM Spectrum Scale system must run 5.1.0.3 and above or
+- IBM Spectrum Scale Container Native Storage Access(CNSA) devices having minReleaseLevel 5.1.0.1
+- Grafana 8.0.0 and above
+
 # Version 6.1.3 (05/21/2021)
 - Python 3.6
 - CherryPy 18.6.0

source/__version__.py

@@ -20,4 +20,4 @@
 @author: HWASSMAN
 '''
 
-__version__ = '6.1.3'
+__version__ = '6.1.4'