Revert "merge ubi9.3 changes"

Author: Helene

Dockerfile

@@ -1,9 +1,9 @@
-ARG BASE=registry.access.redhat.com/ubi9/ubi:9.3
+ARG BASE=registry.access.redhat.com/ubi9/ubi:9.2
 FROM $BASE
 
 LABEL com.ibm.name="IBM Storage Scale bridge for Grafana"
 LABEL com.ibm.vendor="IBM"
-LABEL com.ibm.version="7.1.1"
+LABEL com.ibm.version="7.1.0"
 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"

docs/RELEASE_NOTES.md

@@ -1,11 +1,3 @@
-# Version 7.1.1 (01/18/2024)
-Changed the Dockerfile parent image to the registry.access.redhat.com/ubi9/ubi:9.3 \
-
-Tested with Grafana version 9.5
-Tested with RedHat community-powered Grafana operator v.5
-
-
-
 # Version 7.1.0 (11/20/2023)
 Added a watch function observing changes in zimon sensor configuration and initiating the metadata refresh. \
 Added methods to get metric attributes

docs/SUPPORT_MATRIX.md

@@ -1,11 +1,4 @@
 The following matrix gives a quick overview of the supported software for the IBM Storage Scale bridge for Grafana packages by version number:
-# Version 7.1.1 (01/18/2024)
-Classic Scale:
- - Python 3.9
- - CherryPy 18.9.0
- - IBM Storage Scale system must run 5.1.9 and above
- - Grafana 9.5.0 and above
-
 # Version 7.1.0 (11/20/2023)
 Classic Scale:
  - Python 3.9

requirements/requirements_ubi9.txt

@@ -3,44 +3,44 @@
 #
 #    pip-compile --output-file=/root/requirements_ubi9.txt /root/requirements_ubi.in
 #
-annotated-types==0.6.0
+annotated-types==0.5.0
     # via pydantic
 autocommand==2.2.2
     # via jaraco-text
 cheroot==10.0.0
     # via cherrypy
-cherrypy==18.9.0
+cherrypy==18.8.0
     # via -r /root/requirements_ubi.in
 inflect==7.0.0
     # via jaraco-text
-jaraco-collections==5.0.0
+jaraco-collections==4.3.0
     # via cherrypy
 jaraco-context==4.3.0
     # via jaraco-text
-jaraco-functools==4.0.0
+jaraco-functools==3.8.0
     # via
     #   cheroot
     #   jaraco-text
     #   tempora
-jaraco-text==3.12.0
+jaraco-text==3.11.1
     # via jaraco-collections
-more-itertools==10.2.0
+more-itertools==10.0.0
     # via
     #   cheroot
     #   cherrypy
     #   jaraco-functools
     #   jaraco-text
 portend==3.2.0
     # via cherrypy
-pydantic==2.5.3
+pydantic==2.1.0
     # via inflect
-pydantic-core==2.14.6
+pydantic-core==2.4.0
     # via pydantic
-pytz==2023.3.post1
+pytz==2023.3
     # via tempora
 tempora==5.5.0
     # via portend
-typing-extensions==4.9.0
+typing-extensions==4.7.1
     # via
     #   inflect
     #   pydantic