Skip to content

Commit 072d2a6

Browse files
HeleneHelene
authored
Merge pull request #292 from Helene/v8.0.4-prep
Publish V8.0.4 release
2 parents 8357758 + 63f7447 commit 072d2a6

23 files changed

+5358
-35
lines changed

‎Dockerfile

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
ARG BUILD_ENV=prod
2-
ARG BASE=registry.access.redhat.com/ubi9/ubi:9.5-1736404036
2+
ARG BASE=registry.access.redhat.com/ubi9/ubi:9.5-1742918310
33

4-
FROM $BASE as build_prod
4+
FROM $BASE AS build_prod
55
ONBUILD COPY ./requirements/requirements_ubi9.txt /root/requirements_ubi9.txt
66

7-
FROM $BASE as build_test
7+
FROM $BASE AS build_test
88
ONBUILD COPY ./requirements/requirements_ubi.in /root/requirements_ubi.in
99

10-
FROM $BASE as build_custom
10+
FROM $BASE AS build_custom
1111
ONBUILD COPY ./requirements/requirements.in /root/requirements.in
1212

1313
FROM build_${BUILD_ENV}
@@ -17,14 +17,14 @@ 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.4-dev"
20+
LABEL com.ibm.version="8.0.4"
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"
2424
LABEL com.ibm.summary="It allows the IBM Storage Scale users to perform performance monitoring for IBM Storage Scale devices using Grafana"
2525

26-
ENV PYTHONDONTWRITEBYTECODE 1
27-
ENV PYTHONUNBUFFERED 1
26+
ENV PYTHONDONTWRITEBYTECODE=1
27+
ENV PYTHONUNBUFFERED=1
2828

2929
ARG USERNAME=bridge
3030
ENV USER=$USERNAME
@@ -90,19 +90,19 @@ RUN echo "the HTTP/S protocol is set to $PROTOCOL" && \
9090
echo "the PERFMONPORT port is set to $SERVERPORT" && \
9191
echo "the pmcollector server ip is set to $SERVER" && \
9292
echo "the log will use $LOGPATH"
93-
93+
9494
RUN if [ $(expr "$BASE" : '.*python.*') -eq 0 ]; then \
95-
yum install -y python39 python3-pip; \
96-
if [ "$BUILD_ENV" = "build_test" ]; then \
97-
python3 -m pip install pip-tools && \
98-
python3 -m piptools compile /root/requirements_ubi.in --output-file /root/requirements_ubi9.txt && \
99-
echo "Compiled python packages: $(cat /root/requirements_ubi9.txt)"; fi && \
100-
python3 -m pip install -r /root/requirements_ubi9.txt && \
101-
echo "Installed python version: $(python3 -V)" && \
102-
echo "Installed python packages: $(python3 -m pip list)"; else \
103-
echo "Already using python container as base image. No need to install it." && \
104-
python3 -m pip install -r /root/requirements.in && \
105-
echo "Installed python packages: $(python3 -m pip list)"; fi
95+
yum install -y python39 python3-pip; \
96+
if [ "$BUILD_ENV" = "test" ]; then \
97+
python3 -m pip install pip-tools && \
98+
python3 -m piptools compile /root/requirements_ubi.in --output-file /root/requirements_ubi9.txt && \
99+
echo "Compiled python packages: $(cat /root/requirements_ubi9.txt)"; fi && \
100+
python3 -m pip install -r /root/requirements_ubi9.txt && \
101+
echo "Installed python version: $(python3 -V)" && \
102+
echo "Installed python packages: $(python3 -m pip list)"; else \
103+
echo "Already using python container as base image. No need to install it." && \
104+
python3 -m pip install -r /root/requirements.in && \
105+
echo "Installed python packages: $(python3 -m pip list)"; fi
106106

107107
USER root
108108

‎docs/RELEASE_NOTES.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
# Version 8.0.4 (04/10/2025)
2+
Added Deployment scripts to expose GPFS metrics to the Openshift Monitoring stack
3+
Published example dashboards for monitoring ESS devices: \
4+
- System load overview \
5+
- CPU utilization details \
6+
- Network Data transfer details \
7+
- InfiniBand Data transfer details \
8+
- Filesystem Data transfers rate \
9+
- Filesystem Data transfer rate per Node\
10+
- Filesystem Data transfers rate \
11+
Reworked Dockerfile allowing compile python requirements list during grafana-bridge image build \
12+
Changed the Dockerfile parent image to the registry.access.redhat.com/ubi9/ubi:9.5-1742918310 \
13+
14+
Tested with Grafana version 11.5.0
15+
Tested with RedHat community-powered Grafana operator v.5
16+
17+
18+
119
# Version 8.0.3 (01/20/2025)
220
Added GPFSPoolCap, GPFSInodeCap and GPFSFCMDA sensors to the supported PrometheusExporter endpoints \
321
Added HTTP Api REST endpoint for querying last metric sample (OpenTSDB plugin)

‎docs/SUPPORT_MATRIX.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
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.4 (04/10/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 11.5.0 and above
8+
9+
Cloud native:
10+
- IBM Storage Scale Container Native Storage Access(CNSA) devices having minReleaseLevel 5.2.3
11+
- RedHat community-powered Grafana-Operator v5
12+
213
# Version 8.0.3 (01/20/2025)
314
Classic Scale:
415
- Python 3.9
@@ -7,7 +18,6 @@ Classic Scale:
718
- Grafana 11.0.0 and above
819

920
Cloud native:
10-
- IBM Storage Scale Container Native Storage Access(CNSA) devices having minReleaseLevel 5.2.3
1121
- RedHat community-powered Grafana-Operator v5
1222

1323
# Version 8.0.2 (12/18/2024)
@@ -18,7 +28,6 @@ Classic Scale:
1828
- Grafana 11.0.0 and above
1929

2030
Cloud native:
21-
- IBM Storage Scale Container Native Storage Access(CNSA) devices having minReleaseLevel 5.2.3
2231
- RedHat community-powered Grafana-Operator v5
2332

2433
# Version 8.0.1 (12/10/2024)

‎examples/grafana_dashboards/Dashboards_to_use_with_Grafana_9.5_and_above/ESS/CPU utilization details-1744133919797.json

Lines changed: 233 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,233 @@
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+
"__elements": {},
13+
"__requires": [
14+
{
15+
"type": "grafana",
16+
"id": "grafana",
17+
"name": "Grafana",
18+
"version": "11.5.1"
19+
},
20+
{
21+
"type": "datasource",
22+
"id": "opentsdb",
23+
"name": "OpenTSDB",
24+
"version": "1.0.0"
25+
},
26+
{
27+
"type": "datasource",
28+
"id": "prometheus",
29+
"name": "Prometheus",
30+
"version": "1.0.0"
31+
},
32+
{
33+
"type": "panel",
34+
"id": "timeseries",
35+
"name": "Time series",
36+
"version": ""
37+
}
38+
],
39+
"annotations": {
40+
"list": [
41+
{
42+
"builtIn": 1,
43+
"datasource": {
44+
"type": "grafana",
45+
"uid": "-- Grafana --"
46+
},
47+
"enable": true,
48+
"hide": true,
49+
"iconColor": "rgba(0, 211, 255, 1)",
50+
"name": "Annotations & Alerts",
51+
"type": "dashboard"
52+
}
53+
]
54+
},
55+
"editable": true,
56+
"fiscalYearStartMonth": 0,
57+
"graphTooltip": 0,
58+
"id": null,
59+
"links": [],
60+
"panels": [
61+
{
62+
"datasource": {
63+
"type": "opentsdb",
64+
"uid": "${DS_SWAT_SSS6000}"
65+
},
66+
"fieldConfig": {
67+
"defaults": {
68+
"color": {
69+
"mode": "palette-classic"
70+
},
71+
"custom": {
72+
"axisBorderShow": false,
73+
"axisCenteredZero": false,
74+
"axisColorMode": "text",
75+
"axisLabel": "",
76+
"axisPlacement": "auto",
77+
"barAlignment": 0,
78+
"barWidthFactor": 0.6,
79+
"drawStyle": "line",
80+
"fillOpacity": 11,
81+
"gradientMode": "hue",
82+
"hideFrom": {
83+
"legend": false,
84+
"tooltip": false,
85+
"viz": false
86+
},
87+
"insertNulls": false,
88+
"lineInterpolation": "linear",
89+
"lineWidth": 1,
90+
"pointSize": 5,
91+
"scaleDistribution": {
92+
"type": "linear"
93+
},
94+
"showPoints": "auto",
95+
"spanNulls": false,
96+
"stacking": {
97+
"group": "A",
98+
"mode": "normal"
99+
},
100+
"thresholdsStyle": {
101+
"mode": "off"
102+
}
103+
},
104+
"mappings": [],
105+
"thresholds": {
106+
"mode": "absolute",
107+
"steps": [
108+
{
109+
"color": "green",
110+
"value": null
111+
},
112+
{
113+
"color": "red",
114+
"value": 80
115+
}
116+
]
117+
},
118+
"unit": "percent"
119+
},
120+
"overrides": []
121+
},
122+
"gridPos": {
123+
"h": 22,
124+
"w": 24,
125+
"x": 0,
126+
"y": 0
127+
},
128+
"id": 1,
129+
"options": {
130+
"legend": {
131+
"calcs": [],
132+
"displayMode": "list",
133+
"placement": "bottom",
134+
"showLegend": true
135+
},
136+
"tooltip": {
137+
"hideZeros": false,
138+
"mode": "single",
139+
"sort": "none"
140+
}
141+
},
142+
"pluginVersion": "11.5.1",
143+
"targets": [
144+
{
145+
"aggregator": "noop",
146+
"alias": "$tag_node",
147+
"datasource": {
148+
"type": "opentsdb",
149+
"uid": "${DS_SWAT_SSS6000}"
150+
},
151+
"disableDownsampling": true,
152+
"downsampleAggregator": "noop",
153+
"downsampleFillPolicy": "none",
154+
"filters": [
155+
{
156+
"filter": "$Node",
157+
"groupBy": true,
158+
"tagk": "node",
159+
"type": "pm_filter"
160+
}
161+
],
162+
"metric": "$Metric",
163+
"refId": "A"
164+
}
165+
],
166+
"title": "Shown graph metric: $Metric ",
167+
"type": "timeseries"
168+
}
169+
],
170+
"refresh": "10s",
171+
"schemaVersion": 40,
172+
"tags": [
173+
"test",
174+
"ess",
175+
"opentsdb"
176+
],
177+
"templating": {
178+
"list": [
179+
{
180+
"allowCustomValue": false,
181+
"current": {},
182+
"name": "Datasource",
183+
"options": [],
184+
"query": "opentsdb",
185+
"refresh": 1,
186+
"regex": "",
187+
"type": "datasource"
188+
},
189+
{
190+
"allowCustomValue": false,
191+
"current": {},
192+
"datasource": {
193+
"type": "opentsdb",
194+
"uid": "${Datasource}"
195+
},
196+
"definition": "metrics(cpu_*)",
197+
"name": "Metric",
198+
"options": [],
199+
"query": "metrics(cpu_*)",
200+
"refresh": 1,
201+
"regex": "",
202+
"type": "query"
203+
},
204+
{
205+
"allowCustomValue": false,
206+
"current": {},
207+
"datasource": {
208+
"type": "opentsdb",
209+
"uid": "${DS_SWAT_SSS6000}"
210+
},
211+
"definition": "tag_values(cpu_system, node)",
212+
"description": "",
213+
"includeAll": true,
214+
"name": "Node",
215+
"options": [],
216+
"query": "tag_values(cpu_system, node)",
217+
"refresh": 1,
218+
"regex": "",
219+
"type": "query"
220+
}
221+
]
222+
},
223+
"time": {
224+
"from": "now-1h",
225+
"to": "now"
226+
},
227+
"timepicker": {},
228+
"timezone": "browser",
229+
"title": "CPU utilization details",
230+
"uid": "degx14qeu8qv4c",
231+
"version": 13,
232+
"weekStart": ""
233+
}

0 commit comments

Comments
 (0)