Merge pull request #44 from Helene/v7.0.3

prepare release version 7.0.3

Author: Helene

.circleci/config.yml

@@ -30,7 +30,6 @@ jobs:
           name: Build Docker image
           command: |
             . venv/bin/activate
-            cd source
             docker build -t bridge_image:latest .
 
 

source/Dockerfile renamed to Dockerfile

@@ -1,27 +1,24 @@
-FROM registry.access.redhat.com/ubi8/ubi
+FROM registry.access.redhat.com/ubi8/ubi:8.4-206
 
-RUN yum install -y python36 python36-devel
+COPY ./requirements/requirements_ubi8.txt  /root/requirements_ubi8.txt
 
+RUN yum install -y python36 python36-devel
 RUN /usr/bin/pip3 install --upgrade pip
-RUN /usr/bin/pip3 install setuptools
-RUN /usr/bin/pip3 install cherrypy
-RUN /usr/bin/pip3 install urllib3
-RUN /usr/bin/pip3 install requests
 
+RUN /usr/bin/pip3 install -r /root/requirements_ubi8.txt
 RUN echo "Installed python version: $(/usr/bin/python3 -V)"
 RUN echo "Installed python packages: $(/usr/bin/pip3 list)"
 
 USER root
 
 RUN mkdir -p /opt/IBM/bridge
-ADD . /opt/IBM/bridge
-
+COPY ./source/ /opt/IBM/bridge
+COPY LICENSE /opt/IBM/bridge
 
 RUN mkdir -p /var/mmfs/gen
 RUN mkdir -p /opt/IBM/zimon
-COPY ./gpfsConfig/mmsdrfs* /var/mmfs/gen/
-COPY ./gpfsConfig/ZIMon* /opt/IBM/zimon/
-
+COPY ./source/gpfsConfig/mmsdrfs* /var/mmfs/gen/
+COPY ./source/gpfsConfig/ZIMon* /opt/IBM/zimon/
 
 ARG HTTPPROTOCOL=http
 ENV PROTOCOL=$HTTPPROTOCOL

docs/CHANGELOG.md

@@ -1,8 +1,18 @@
+# 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
+
+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.2 (08/02/2021)
 Changed the Dockerfile parent image to the registry.access.redhat.com/ubi8/ubi
 Changed the sleep time = 60 seconds for re-attempting to get the MetaData from the pmcollector in case no data have been returned during the bridge start instead of stopping the process directly
 
 Tested with Grafana version 7.5.1 and 8.0.3
+Tested with RedHat community-powered Grafana operator v.3.10.3
 
 
 

docs/SUPPORT_MATRIX.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.3 (08/13/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.1
+- Grafana 8.0.0 and above
+
 # Version 7.0.2 (08/02/2021)
 - Python 3.6
 - CherryPy 18.6.1

requirements.txt

@@ -1,11 +1,13 @@
-nose
-pytest
-coverage
-coveralls
-PyYAML
-github3.py
-flake8
-six
-cherrypy
-requests
-urllib3
+#nose
+#pytest
+#coverage
+#coveralls
+#PyYAML
+#github3.py
+#flake8
+#six
+#cherrypy
+#requests
+#urllib3
+-r requirements/requirements_test.in
+-r requirements/requirements_ubi8.in

requirements/requirements_test.in

@@ -0,0 +1,16 @@
+# This file is used for generating python requirements list "requirements_test.txt".
+# It includes the additional packages needed to be installed to run nose/pytests for 
+# the IBM Spectrum Scale Performance Monitoring bridge for Grafana using CI/CD circleci workflows.
+#
+# To update, run:
+#
+#  $ pip-compile requirements_test.in  --output-file requirements_test.txt
+#
+nose
+pytest
+coverage
+coveralls
+PyYAML
+github3.py
+flake8
+six

requirements/requirements_ubi8.in

@@ -0,0 +1,12 @@
+# This file is used for generating python requirements list "requirements_ubi8.txt".
+# It includes the packages needed to be installed to run the IBM Spectrum Scale Performance Monitoring bridge for Grafana
+# in an OpenShift production environment, on top of the redhat UBI8 image.
+#
+# To update, run:
+#
+#  $ pip-compile requirements_ubi8.in  --output-file requirements_ubi8.txt
+#
+setuptools
+cherrypy
+urllib3
+requests

requirements/requirements_ubi8.txt

@@ -0,0 +1,56 @@
+#
+# This file is autogenerated by pip-compile with python 3.6
+# To update, run:
+#
+#    pip-compile requirements_ubi8.in --output-file=requirements_ubi8.txt 
+#
+certifi==2021.5.30
+    # via requests
+charset-normalizer==2.0.4
+    # via requests
+cheroot==8.5.2
+    # via cherrypy
+cherrypy==18.6.1
+    # via -r /root/requirements_ubi8.in
+idna==3.2
+    # via requests
+importlib-resources==5.2.2
+    # via jaraco.text
+jaraco.classes==3.2.1
+    # via jaraco.collections
+jaraco.collections==3.4.0
+    # via cherrypy
+jaraco.functools==3.3.0
+    # via
+    #   cheroot
+    #   jaraco.text
+    #   tempora
+jaraco.text==3.5.1
+    # via jaraco.collections
+more-itertools==8.8.0
+    # via
+    #   cheroot
+    #   cherrypy
+    #   jaraco.classes
+    #   jaraco.functools
+portend==2.7.1
+    # via cherrypy
+pytz==2021.1
+    # via tempora
+requests==2.26.0
+    # via -r /root/requirements_ubi8.in
+six==1.16.0
+    # via cheroot
+tempora==4.1.1
+    # via portend
+urllib3==1.26.6
+    # via
+    #   -r /root/requirements_ubi8.in
+    #   requests
+zc.lockfile==2.0
+    # via cherrypy
+zipp==3.5.0
+    # via importlib-resources
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools

source/__version__.py

@@ -20,4 +20,4 @@
 @author: HWASSMAN
 '''
 
-__version__ = '7.0.2'
+__version__ = '7.0.3'