update http(ssl) documentation

Author: Helene

docs/CLASSIC_SETUP.md

@@ -75,6 +75,6 @@ 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 connections
+**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
 
 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

@@ -44,14 +44,14 @@ cp grafana_bridge/source/gpfsConfig
 ```shell
 # cd grafana_bridge/source
 
-# podman build -t bridge_image:gpfs505 .
+# podman build -t bridge_image:latest .
 ```
 
 
 4. Start the bridge running in a container:
 
 ```shell
-# podman run -dt -p 4242:4242 -e "SERVER=9.XXX.XXX.XXX" --pod new:my-pod --name grafana_bridge bridge_image:gpfs505
+# podman run -dt -p 4242:4242 -e "SERVER=9.XXX.XXX.XXX" --pod new:my-pod --name grafana_bridge bridge_image:latest
 
 # podman logs grafana_bridge
 
@@ -64,12 +64,12 @@ Now you can add the host running the bridge container to the Grafana monitoring
 ### Using HTTPS(SSL) connection for the IBM Spectrum Scale Performance Monitoring Bridge running in a container
 
 
-1. Follow the instructions [How to setup HTTPS(SSL)](./SETUP_SSL_CONNECTION.md) to generate a private key and certificate for 
+1. 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
 
 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 "KEYPATH=/opt/registry/certs" \ -v /tmp:/opt/IBM/bridge/logs -v /opt/registry/certs:/opt/registry/certs \ --pod new:my-bridge-ssl-test-pod --name bridge-ssl-test bridge_ssl_test:grafana 
+# 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 logs bridge-ssl-test
 Connection to the collector server established successfully

docs/SETUP_SSL_CONNECTION.md

@@ -13,23 +13,18 @@ To set up SSL communication between the bridge and the Grafana complete the foll
 2. Generate a certificate.
 
 ```shell
-# openssl req -new -x509 -days 365 -key privkey.pem -out cert.pem
+# openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/bridge_ssl/certs/privkey.pem -out /etc/bridge_ssl/certs/cert.pem
 ```
 
 Openssl will then ask you a series of questions. You can enter whatever values are applicable, or leave most fields blank. The one field you must fill in is the ‘Common Name’: enter the hostname which will be used to access the bridge (where the Grafana server running).
 
-Note: The file names for key and the certificate should be ‘privkey.pem’ and ‘cert.pem’.
+Note: The file names for the key and the certificate should be ‘privkey.pem’ and ‘cert.pem’.
 
 
-3. Install CherryPy (version 5.0 or above)from the [CherryPy](https://cherrypy.org/) download page.
-
-Note: If you are using python3, please check which cherryPy version is compatible with your setup. In our lab, we have tested python version 3.4.3 with cherryPy version 8.2.0.
-
-
-4. Start the bridge listening on the socket port 8443. Don't forget to provide the location of ‘privkey.pem’ and ‘cert.pem’ (-k option), otherwise you will get the error message:
+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:
 
 ```shell
-# python3 zimonGrafanaIntf.py -p 8443 -k /opt/registry/certs
+# python3 zimonGrafanaIntf.py -p 8443 -t /etc/bridge_ssl/certs -k privkey.pem -m cert.pem
 ```
 
 

docs/grafana_bridge_deployment_ocp.md

@@ -50,18 +50,18 @@ Additionally perform the following modifications in the files before you start w
 4. Create the TLS certificate and the private key
 
 ```
-[root@mycluster-inf ~]# openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /tmp/privkey.pem -out /tmp/cert.pem -subj "/CN=grafana-bridge/O=grafana-bridge"
+[root@mycluster-inf ~]# openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/bridge_ssl/certs/privkey.pem -out /etc/bridge_ssl/certs/cert.pem -subj "/CN=grafana-bridge/O=grafana-bridge"
 Generating a 2048 bit RSA private key
 ........................+++
 ..............................................+++
-writing new private key to '/tmp/privkey.pem'
+writing new private key to '/etc/bridge_ssl/certs/privkey.pem'
 -----
 ```
 
 Check that the both .pem files are created in the /tmp directory
 
 ```
-[root@mycluster-inf ~]# cd /tmp
+[root@mycluster-inf ~]# cd /etc/bridge_ssl/certs
 [root@mycluster-inf tmp]# cat privkey.pem
 -----BEGIN PRIVATE KEY-----
 MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDZ7v0Oq9n9zx8T