Merge pull request #184 from Helene/master

Restore master repository

Author: Helene

Dockerfile

@@ -1,9 +1,9 @@
-ARG BASE=registry.access.redhat.com/ubi9/ubi:9.2
+ARG BASE=registry.access.redhat.com/ubi9/ubi:9.3
 FROM $BASE
 
 LABEL com.ibm.name="IBM Storage Scale bridge for Grafana"
 LABEL com.ibm.vendor="IBM"
-LABEL com.ibm.version="7.1.0"
+LABEL com.ibm.version="8.0.0-dev"
 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"
@@ -28,9 +28,13 @@ ARG HTTPPROTOCOL=http
 ENV PROTOCOL=$HTTPPROTOCOL
 RUN echo "the HTTP/S protocol is set to $PROTOCOL"
 
-ARG HTTPPORT=4242
+ARG HTTPPORT=None
 ENV PORT=$HTTPPORT
-RUN echo "the HTTP/S port is set to $PORT" 
+RUN echo "the OpentTSDB API HTTP/S port is set to $PORT"
+
+ARG PROMPORT=None
+ENV PROMETHEUS=$PROMPORT
+RUN echo "the Prometheus API HTTPS port is set to $PROMETHEUS" 
 
 ARG PERFMONPORT=9980
 ENV SERVERPORT=$PERFMONPORT
@@ -125,8 +129,8 @@ RUN chown -R $UID:$GID /opt/IBM/bridge && \
 # Switch user
 USER $GID
 
-CMD ["sh", "-c", "python3 zimonGrafanaIntf.py -c 10 -s $SERVER -r $PROTOCOL -p $PORT -P $SERVERPORT -t $TLSKEYPATH -l $LOGPATH --tlsKeyFile $TLSKEYFILE --tlsCertFile $TLSCERTFILE --apiKeyName $APIKEYNAME --apiKeyValue $APIKEYVALUE"]
+CMD ["sh", "-c", "python3 zimonGrafanaIntf.py -c 10 -s $SERVER -r $PROTOCOL -p $PORT -e $PROMETHEUS -P $SERVERPORT -t $TLSKEYPATH -l $LOGPATH --tlsKeyFile $TLSKEYFILE --tlsCertFile $TLSCERTFILE --apiKeyName $APIKEYNAME --apiKeyValue $APIKEYVALUE"]
 
-EXPOSE 4242 8443
+EXPOSE 4242 8443 9250
 
 #CMD ["tail", "-f", "/dev/null"]

README.md

@@ -8,7 +8,7 @@ Grafana Bridge is a standalone Python application. It translates the IBM Storage
 
 
 <p align="center">
-  <img src="/docs/grafana_bridge_prometheus_overview.png" />
+  <img src="/docs/grafana-bridge-overview.png" />
 </p>
 
 

docs/RELEASE_NOTES.md

@@ -1,3 +1,11 @@
+# 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,4 +1,11 @@
 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

docs/grafana-bridge-overview.png

@@ -62,3 +62,4 @@ You need to register the target in the prometheus.yml file to get the metrics fr
    systemctl enable prometheus
    ```
 
+For more configuration details, please read the content of the  'Prometheus setup' section in the project [wiki](https://github.com/IBM/ibm-spectrum-scale-bridge-for-grafana/wiki).

docs/grafana_bridge_prometheus_overview.png

@@ -65,18 +65,6 @@ scrape_configs:
     static_configs:
     - targets: ['<cluster1_grafana_bridge_ip>:9250']
 
-  - job_name: 'GPFSWaiters_cluster1'
-    scrape_interval: 10s
-    honor_timestamps: true
-    metrics_path: '/metrics_gpfs_waiters'
-    scheme: https
-    tls_config:
-      cert_file: /etc/prometheus/certs/cluster1/cert.pem
-      key_file: /etc/prometheus/certs/cluster1/privkey.pem
-      insecure_skip_verify: true
-    static_configs:
-    - targets: ['<cluster1_grafana_bridge_ip>:9250']
-
   - job_name: 'GPFSFilesystem_cluster2'
     scrape_interval: 300s
     honor_timestamps: true
@@ -111,16 +99,4 @@ scrape_configs:
       key_file: /etc/prometheus/certs/cluster2/privkey.pem
       insecure_skip_verify: true
     static_configs:
-    - targets: ['<cluster2_grafana_bridge_ip>:9250']
-
-  - job_name: 'GPFSWaiters_cluster2'
-    scrape_interval: 10s
-    honor_timestamps: true
-    metrics_path: '/metrics_gpfs_waiters'
-    scheme: https
-    tls_config:
-      cert_file: /etc/prometheus/certs/cluster2/cert.pem
-      key_file: /etc/prometheus/certs/cluster2/privkey.pem
-      insecure_skip_verify: true
-    static_configs:
     - targets: ['<cluster2_grafana_bridge_ip>:9250']

examples/prometheus_config_file/README.md

@@ -63,16 +63,4 @@ scrape_configs:
       key_file: /etc/prometheus/certs/privkey.pem
       insecure_skip_verify: true
     static_configs:
-    - targets: ['<grafana_bridge_ip>:9250']
-
-  - job_name: 'GPFSWaiters'
-    scrape_interval: 10s
-    honor_timestamps: true
-    metrics_path: '/metrics_gpfs_waiters'
-    scheme: https
-    tls_config:
-      cert_file: /etc/prometheus/certs/cert.pem
-      key_file: /etc/prometheus/certs/privkey.pem
-      insecure_skip_verify: true
-    static_configs:
-    - targets: ['<grafana_bridge_ip>:9250']
+    - targets: ['<grafana_bridge_ip>:9250']

examples/prometheus_config_file/multiple_targets/prometheus.yml renamed to examples/prometheus_config_file/multiple_gpfs_clusters/prometheus.yml

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