Merge pull request #268 from Helene/gpfsfcmda

Add GPFSPoolCap, GPFSInodeCap and GPFSFCMDA sensors to the supported PrometheusExporter endpoints

Author: Helene

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.2"
+LABEL com.ibm.version="8.0.3-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"

source/__version__.py

@@ -20,4 +20,4 @@
 @author: HWASSMAN
 '''
 
-__version__ = '8.0.2'
+__version__ = '8.0.3-dev'

source/metadata.py

@@ -96,6 +96,8 @@ def getSensorPeriod(self, sensor):
             sensor = 'GPFSDiskCap'
         elif sensor in ('GPFSNSDFS', 'GPFSNSDPool'):
             sensor = 'GPFSNSDDisk'
+        elif sensor == 'GPFSFCM':
+            sensor = 'GPFSFCMDA'
         elif sensor == 'DomainStore':
             return 1
 

source/prometheus_endpoints.json

@@ -22,12 +22,15 @@
     "/metrics_gpfs_fileset": "GPFSFileset",
     "/metrics_gpfs_pool": "GPFSPool",
     "/metrics_gpfs_diskcap": "GPFSDiskCap",
+    "/metrics_gpfs_poolcap": "GPFSPoolCap",
+    "/metrics_gpfs_inodecap": "GPFSInodeCap",
     "/metrics_gpfs_event_producer": "GPFSEventProducer",
     "/metrics_gpfs_mmhealth": "GPFSmmhealth",
     "/metrics_gpfs_mutex": "GPFSMutex",
     "/metrics_gpfs_condvar": "GPFSCondvar",
     "/metrics_gpfs_qos": "GPFSQoS",
     "/metrics_gpfs_fcm": "GPFSFCM",
+    "/metrics_gpfs_fcmda": "GPFSFCMDA",
     "/metrics_nfsio": "NFSIO",
     "/metrics_smb_stats": "SMBStats",
     "/metrics_smb_globalstats": "SMBGlobalStats",