Skip to content

Commit 9239c8e

Browse files
HeleneHelene
authored
Merge pull request #319 from Helene/v8.0.6_prep
Publish v8.0.6 release
2 parents d479283 + 9846f94 commit 9239c8e

File tree

14 files changed

+424
-7
lines changed

14 files changed

+424
-7
lines changed

‎Dockerfile‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG BUILD_ENV=prod
2-
ARG BASE=registry.access.redhat.com/ubi9/ubi:9.5-1745854298
2+
ARG BASE=registry.access.redhat.com/ubi9/ubi:9.6-1747219013
33

44
FROM $BASE AS build_prod
55
ONBUILD COPY ./requirements/requirements_ubi9.txt /root/requirements_ubi9.txt
@@ -17,7 +17,7 @@ ARG BASE
1717

1818
LABEL com.ibm.name="IBM Storage Scale bridge for Grafana"
1919
LABEL com.ibm.vendor="IBM"
20-
LABEL com.ibm.version="8.0.5"
20+
LABEL com.ibm.version="8.0.6"
2121
LABEL com.ibm.url="https://github.com/IBM/ibm-spectrum-scale-bridge-for-grafana"
2222
LABEL com.ibm.description="This tool translates the IBM Storage Scale performance data collected internally \
2323
to the query requests acceptable by the Grafana integrated openTSDB plugin"
@@ -83,6 +83,9 @@ ENV LOGPATH=$DEFAULTLOGPATH
8383
ARG DEFAULTLOGLEVEL=15
8484
ENV LOGLEVEL=$DEFAULTLOGLEVEL
8585

86+
ARG RAWDATA=True
87+
ENV RAWCOUNTERS=$RAWDATA
88+
8689
RUN echo "the HTTP/S protocol is set to $PROTOCOL" && \
8790
echo "the HTTP/S basic authentication is set to $BASICAUTH" && \
8891
echo "the OpentTSDB API HTTP/S port is set to $PORT" && \
@@ -157,7 +160,7 @@ RUN chown -R $UID:$GID /opt/IBM/bridge && \
157160
# Switch user
158161
USER $GID
159162

160-
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"]
163+
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 -w $RAWCOUNTERS"]
161164

162165
EXPOSE 4242 8443 9250
163166

‎docs/RELEASE_NOTES.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# Version 8.0.6 (05/28/2025)
2+
Published example dashboard for observing high level health status of all gpfs devices rgistered and managed with Grafana\
3+
Improved rawCounters setting management by PrometheusExporter\
4+
Added RAWDATA to the Dockerfile editable command line arguments\
5+
Added HTTP Api REST endpoint for querying sensor metrics details\
6+
7+
Changed the Dockerfile parent image to the registry.access.redhat.com/ubi9/ubi:9.6-1747219013 \
8+
9+
Tested with OpenTSDB version 2.4
10+
Tested with Grafana version 12.0.0
11+
Tested with RedHat community-powered Grafana operator v.5
12+
13+
14+
115
# Version 8.0.5 (05/10/2025)
216
Published example dashboards for monitoring ESS Hardware metrics: \
317
- ESS Hardware Performance overview \

‎docs/SUPPORT_MATRIX.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
11
The following matrix gives a quick overview of the supported software for the IBM Storage Scale bridge for Grafana packages by version number:
2+
# Version 8.0.6 (05/28/2025)
3+
Classic Scale:
4+
- Python 3.9
5+
- CherryPy 18.10.0
6+
- IBM Storage Scale system must run 5.2.2 and above
7+
- Grafana 12.0.0 and above
8+
- OpenTSDB 2.4
9+
10+
Cloud native:
11+
- IBM Storage Scale Container Native Storage Access(CNSA) devices having minReleaseLevel 5.2.3
12+
- RedHat community-powered Grafana-Operator v5
13+
214
# Version 8.0.5 (05/10/2025)
315
Classic Scale:
416
- Python 3.9

‎examples/grafana_dashboards/GPFS Clusters overview-1747665435687.json‎

Lines changed: 317 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,317 @@
1+
{
2+
"__inputs": [
3+
{
4+
"name": "DS_SWAT_SSS6000",
5+
"label": "SWAT SSS6000",
6+
"description": "",
7+
"type": "datasource",
8+
"pluginId": "opentsdb",
9+
"pluginName": "OpenTSDB"
10+
},
11+
{
12+
"name": "DS_PROMETHEUS-HWASSMANN2-VM",
13+
"label": "Prometheus-hwassmann2-vm",
14+
"description": "",
15+
"type": "datasource",
16+
"pluginId": "prometheus",
17+
"pluginName": "Prometheus"
18+
}
19+
],
20+
"__elements": {},
21+
"__requires": [
22+
{
23+
"type": "grafana",
24+
"id": "grafana",
25+
"name": "Grafana",
26+
"version": "12.0.0"
27+
},
28+
{
29+
"type": "datasource",
30+
"id": "opentsdb",
31+
"name": "OpenTSDB",
32+
"version": "1.0.0"
33+
},
34+
{
35+
"type": "datasource",
36+
"id": "prometheus",
37+
"name": "Prometheus",
38+
"version": "1.0.0"
39+
},
40+
{
41+
"type": "panel",
42+
"id": "stat",
43+
"name": "Stat",
44+
"version": ""
45+
}
46+
],
47+
"annotations": {
48+
"list": [
49+
{
50+
"builtIn": 1,
51+
"datasource": {
52+
"type": "grafana",
53+
"uid": "-- Grafana --"
54+
},
55+
"enable": true,
56+
"hide": true,
57+
"iconColor": "rgba(0, 211, 255, 1)",
58+
"name": "Annotations & Alerts",
59+
"type": "dashboard"
60+
}
61+
]
62+
},
63+
"editable": true,
64+
"fiscalYearStartMonth": 0,
65+
"graphTooltip": 0,
66+
"id": null,
67+
"links": [],
68+
"panels": [
69+
{
70+
"datasource": {
71+
"type": "opentsdb",
72+
"uid": "${Datasource_a}"
73+
},
74+
"fieldConfig": {
75+
"defaults": {
76+
"color": {
77+
"mode": "thresholds"
78+
},
79+
"links": [
80+
{
81+
"targetBlank": true,
82+
"title": "show details",
83+
"url": "../d/ee6h4z9seyosgc/gpfs-cluster-overview?orgId=1&from=now-24h&to=now&timezone=browser&var-Datasource=${Datasource_a}&refresh=15m"
84+
}
85+
],
86+
"mappings": [
87+
{
88+
"options": {
89+
"0": {
90+
"color": "#808080",
91+
"index": 0,
92+
"text": "UNKNOWN"
93+
},
94+
"10": {
95+
"color": "dark-green",
96+
"index": 1,
97+
"text": "HEALTHY"
98+
},
99+
"20": {
100+
"color": "dark-yellow",
101+
"index": 2,
102+
"text": "DEGRADED"
103+
},
104+
"40": {
105+
"color": "dark-red",
106+
"index": 3,
107+
"text": "FAILED"
108+
}
109+
},
110+
"type": "value"
111+
}
112+
],
113+
"thresholds": {
114+
"mode": "absolute",
115+
"steps": [
116+
{
117+
"color": "text"
118+
}
119+
]
120+
}
121+
},
122+
"overrides": []
123+
},
124+
"gridPos": {
125+
"h": 5,
126+
"w": 24,
127+
"x": 0,
128+
"y": 0
129+
},
130+
"id": 1,
131+
"options": {
132+
"colorMode": "value",
133+
"graphMode": "none",
134+
"justifyMode": "auto",
135+
"orientation": "auto",
136+
"percentChangeColorMode": "standard",
137+
"reduceOptions": {
138+
"calcs": [
139+
"lastNotNull"
140+
],
141+
"fields": "",
142+
"values": false
143+
},
144+
"showPercentChange": false,
145+
"text": {
146+
"valueSize": 40
147+
},
148+
"textMode": "auto",
149+
"wideLayout": true
150+
},
151+
"pluginVersion": "12.0.0",
152+
"repeat": "Datasource_a",
153+
"repeatDirection": "h",
154+
"targets": [
155+
{
156+
"aggregator": "max",
157+
"datasource": {
158+
"type": "opentsdb",
159+
"uid": "${DS_SWAT_SSS6000}"
160+
},
161+
"disableDownsampling": true,
162+
"downsampleAggregator": "noop",
163+
"downsampleFillPolicy": "none",
164+
"metric": "gpfs_health_status",
165+
"refId": "A"
166+
}
167+
],
168+
"title": "Status $Datasource_a",
169+
"type": "stat"
170+
},
171+
{
172+
"datasource": {
173+
"type": "prometheus",
174+
"uid": "${Datasource_b}"
175+
},
176+
"fieldConfig": {
177+
"defaults": {
178+
"color": {
179+
"mode": "thresholds"
180+
},
181+
"links": [
182+
{
183+
"targetBlank": true,
184+
"title": "show details",
185+
"url": "../d/777/gpfs-cluster-overview-prometheus?orgId=1&from=now-24h&to=now&timezone=browser&&var-Datasource=${Datasource_b}&refresh=15m"
186+
}
187+
],
188+
"mappings": [
189+
{
190+
"options": {
191+
"0": {
192+
"color": "#808080",
193+
"index": 0,
194+
"text": "UNKNOWN"
195+
},
196+
"10": {
197+
"color": "dark-green",
198+
"index": 1,
199+
"text": "HEALTHY"
200+
},
201+
"20": {
202+
"color": "dark-yellow",
203+
"index": 2,
204+
"text": "DEGRADED"
205+
},
206+
"40": {
207+
"color": "dark-red",
208+
"index": 3,
209+
"text": "FAILED"
210+
}
211+
},
212+
"type": "value"
213+
}
214+
],
215+
"thresholds": {
216+
"mode": "absolute",
217+
"steps": [
218+
{
219+
"color": "text"
220+
}
221+
]
222+
}
223+
},
224+
"overrides": []
225+
},
226+
"gridPos": {
227+
"h": 5,
228+
"w": 24,
229+
"x": 0,
230+
"y": 10
231+
},
232+
"id": 2,
233+
"options": {
234+
"colorMode": "value",
235+
"graphMode": "none",
236+
"justifyMode": "auto",
237+
"orientation": "auto",
238+
"percentChangeColorMode": "standard",
239+
"reduceOptions": {
240+
"calcs": [
241+
"lastNotNull"
242+
],
243+
"fields": "",
244+
"values": false
245+
},
246+
"showPercentChange": false,
247+
"text": {
248+
"valueSize": 40
249+
},
250+
"textMode": "auto",
251+
"wideLayout": true
252+
},
253+
"pluginVersion": "12.0.0",
254+
"repeat": "Datasource_b",
255+
"repeatDirection": "h",
256+
"targets": [
257+
{
258+
"datasource": {
259+
"type": "prometheus",
260+
"uid": "${DS_PROMETHEUS-HWASSMANN2-VM}"
261+
},
262+
"editorMode": "code",
263+
"expr": "max (max_over_time(gpfs_health_status[15m]))",
264+
"instant": false,
265+
"legendFormat": "__auto",
266+
"range": true,
267+
"refId": "A"
268+
}
269+
],
270+
"title": "Status $Datasource_b",
271+
"type": "stat"
272+
}
273+
],
274+
"refresh": "15m",
275+
"schemaVersion": 41,
276+
"tags": [],
277+
"templating": {
278+
"list": [
279+
{
280+
"allowCustomValue": false,
281+
"current": {},
282+
"includeAll": true,
283+
"label": "OpenTSDB Datasource",
284+
"multi": true,
285+
"name": "Datasource_a",
286+
"options": [],
287+
"query": "opentsdb",
288+
"refresh": 1,
289+
"regex": "",
290+
"type": "datasource"
291+
},
292+
{
293+
"allowCustomValue": false,
294+
"current": {},
295+
"includeAll": true,
296+
"label": "Prometheus Datasource",
297+
"multi": true,
298+
"name": "Datasource_b",
299+
"options": [],
300+
"query": "prometheus",
301+
"refresh": 1,
302+
"regex": "",
303+
"type": "datasource"
304+
}
305+
]
306+
},
307+
"time": {
308+
"from": "now-24h",
309+
"to": "now"
310+
},
311+
"timepicker": {},
312+
"timezone": "browser",
313+
"title": "GPFS Clusters overview",
314+
"uid": "2871c6b3-cd5d-4305-a220-067e671b597e",
315+
"version": 2,
316+
"weekStart": ""
317+
}

‎source/__version__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@
2020
@author: HWASSMAN
2121
'''
2222

23-
__version__ = '8.0.5'
23+
__version__ = '8.0.6'

0 commit comments

Comments
 (0)