Merge pull request #263 from Helene/prepare_8.0.2-prod

Publish v8.0.2 release
IBM · Dec 18, 2024 · 2d5ba83 · 2d5ba83
2 parents e92b10a + 490eefb
commit 2d5ba83
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@ FROM $BASE
 
 LABEL com.ibm.name="IBM Storage Scale bridge for Grafana"
 LABEL com.ibm.vendor="IBM"
-LABEL com.ibm.version="8.0.1"
+LABEL com.ibm.version="8.0.2"
 LABEL com.ibm.url="https://github.com/IBM/ibm-spectrum-scale-bridge-for-grafana"
 LABEL com.ibm.description="This tool translates the IBM Storage Scale performance data collected internally \
 to the query requests acceptable by the Grafana integrated openTSDB plugin"
@@ -73,6 +73,9 @@ ARG DEFAULTLOGPATH='/var/log/ibm_bridge_for_grafana'
 ENV LOGPATH=$DEFAULTLOGPATH
 RUN echo "the log will use $LOGPATH"
 
+ARG DEFAULTLOGLEVEL=15
+ENV LOGLEVEL=$DEFAULTLOGLEVEL
+
 COPY ./requirements/requirements_ubi9.txt  /root/requirements_ubi9.txt
 # COPY ./requirements/requirements_ubi.in  /root/requirements_ubi.in
 
@@ -139,7 +142,7 @@ RUN chown -R $UID:$GID /opt/IBM/bridge && \
 # Switch user
 USER $GID
 
-CMD ["sh", "-c", "python3 zimonGrafanaIntf.py -c 10 -s $SERVER -r $PROTOCOL -b $BASICAUTH -u $BASICAUTHUSER -a $BASICAUTHPASSW -p $PORT -e $PROMETHEUS -P $SERVERPORT -t $TLSKEYPATH -l $LOGPATH -k $TLSKEYFILE -m $TLSCERTFILE -n $APIKEYNAME -v $APIKEYVALUE"]
+CMD ["sh", "-c", "python3 zimonGrafanaIntf.py -c $LOGLEVEL -s $SERVER -r $PROTOCOL -b $BASICAUTH -u $BASICAUTHUSER -a $BASICAUTHPASSW -p $PORT -e $PROMETHEUS -P $SERVERPORT -t $TLSKEYPATH -l $LOGPATH -k $TLSKEYFILE -m $TLSCERTFILE -n $APIKEYNAME -v $APIKEYVALUE"]
 
 EXPOSE 4242 8443 9250
 

diff --git a/docs/RELEASE_NOTES.md b/docs/RELEASE_NOTES.md
@@ -1,3 +1,13 @@
+# Version 8.0.2 (12/18/2024)
+Added GPFSNSDPool, GPFSNSDFS sensors to the supported PrometheusExporter endpoints
+Added LOGLEVEL to the Dockerfile editable command line arguments
+Removed psutil package from Python requirements list 
+
+Tested with Grafana version 11.0.0
+Tested with RedHat community-powered Grafana operator v.5
+
+
+
 # Version 8.0.1 (12/10/2024)
 Added HTTP Api REST endpoints allowing to query: \
 -  Performance Monitoring Tool sensors configuration in use \

diff --git a/docs/SUPPORT_MATRIX.md b/docs/SUPPORT_MATRIX.md
@@ -1,4 +1,15 @@
 The following matrix gives a quick overview of the supported software for the IBM Storage Scale bridge for Grafana packages by version number:
+# Version 8.0.2 (12/18/2024)
+Classic Scale:
+ - Python 3.9
+ - CherryPy 18.10.0
+ - IBM Storage Scale system must run 5.2.2 and above
+ - Grafana 11.0.0 and above
+
+ Cloud native:
+ - IBM Storage Scale Container Native Storage Access(CNSA) devices having minReleaseLevel 5.2.0
+ - RedHat community-powered Grafana-Operator v5
+
 # Version 8.0.1 (12/10/2024)
 Classic Scale:
  - Python 3.9

diff --git a/requirements/requirements_ubi.in b/requirements/requirements_ubi.in
@@ -9,6 +9,6 @@
 # setuptools
 cherrypy
 PyYAML
-psutil
+# psutil
 # urllib3
 # requests
diff --git a/requirements/requirements_ubi9.txt b/requirements/requirements_ubi9.txt
@@ -30,8 +30,6 @@ more-itertools==10.5.0
     #   jaraco-text
 portend==3.2.0
     # via cherrypy
-psutil==6.1.0
-    # via -r /root/requirements_ubi.in
 python-dateutil==2.9.0.post0
     # via tempora
 pyyaml==6.0.2

diff --git a/source/__version__.py b/source/__version__.py
@@ -20,4 +20,4 @@
 @author: HWASSMAN
 '''
 
-__version__ = '8.0.1'
+__version__ = '8.0.2'
diff --git a/source/prometheus_endpoints.json b/source/prometheus_endpoints.json
@@ -2,6 +2,8 @@
     "/metrics_gpfs_disk": "GPFSDisk",
     "/metrics_gpfs_filesystem": "GPFSFilesystem",
     "/metrics_gpfs_nsddisk": "GPFSNSDDisk",
+    "/metrics_gpfs_nsdpool": "GPFSNSDPool",
+    "/metrics_gpfs_nsdfs": "GPFSNSDFS",
     "/metrics_gpfs_poolio": "GPFSPoolIO",
     "/metrics_gpfs_vfsx": "GPFSVFSX",
     "/metrics_gpfsioc": "GPFSIOC",