Skip to content

Commit f1d3bfd

Browse files
sap-coutantmsap-coutantm
committed
Updated dashboards
- The Cluster inspector now displays a job count graph of the same size as the ressources graphs. Should be easiest to use. - Changed folders architecture in order to respect the old one, it could have make the automatic build fail
1 parent 7befeba commit f1d3bfd

11 files changed

Lines changed: 160 additions & 87 deletions

deploy/infrabox/grafana/local/dashboards/build_inspector.json renamed to deploy/infrabox/grafana/dashboards/build_inspector.json

File renamed without changes.

deploy/infrabox/grafana/local/dashboards/cluster_inspector.json renamed to deploy/infrabox/grafana/dashboards/cluster_inspector.json

Lines changed: 160 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"editable": true,
1818
"gnetId": null,
1919
"graphTooltip": 0,
20-
"id": 4,
21-
"iteration": 1531295137023,
20+
"id": 2,
21+
"iteration": 1531746409662,
2222
"links": [],
2323
"panels": [
2424
{
@@ -32,89 +32,6 @@
3232
"title": "Basic Information",
3333
"type": "row"
3434
},
35-
{
36-
"cacheTimeout": null,
37-
"colorBackground": false,
38-
"colorValue": false,
39-
"colors": [
40-
"#299c46",
41-
"rgba(237, 129, 40, 0.89)",
42-
"#d44a3a"
43-
],
44-
"datasource": "infrabox",
45-
"description": "The number of nodes connected to the inspected cluster.",
46-
"format": "none",
47-
"gauge": {
48-
"maxValue": 100,
49-
"minValue": 0,
50-
"show": false,
51-
"thresholdLabels": false,
52-
"thresholdMarkers": true
53-
},
54-
"gridPos": {
55-
"h": 7,
56-
"w": 3,
57-
"x": 0,
58-
"y": 1
59-
},
60-
"id": 6,
61-
"interval": null,
62-
"links": [],
63-
"mappingType": 1,
64-
"mappingTypes": [
65-
{
66-
"name": "value to text",
67-
"value": 1
68-
},
69-
{
70-
"name": "range to text",
71-
"value": 2
72-
}
73-
],
74-
"maxDataPoints": 100,
75-
"nullPointMode": "connected",
76-
"nullText": null,
77-
"postfix": " nodes",
78-
"postfixFontSize": "50%",
79-
"prefix": "",
80-
"prefixFontSize": "50%",
81-
"rangeMaps": [
82-
{
83-
"from": "null",
84-
"text": "N/A",
85-
"to": "null"
86-
}
87-
],
88-
"sparkline": {
89-
"fillColor": "rgba(31, 118, 189, 0.18)",
90-
"full": false,
91-
"lineColor": "rgb(31, 120, 193)",
92-
"show": false
93-
},
94-
"tableColumn": "nodes",
95-
"targets": [
96-
{
97-
"$$hashKey": "object:3854",
98-
"alias": "",
99-
"format": "table",
100-
"hide": false,
101-
"rawSql": "SELECT nodes FROM cluster WHERE name = '[[cluster]]'",
102-
"refId": "A"
103-
}
104-
],
105-
"thresholds": "",
106-
"title": "Connected nodes",
107-
"type": "singlestat",
108-
"valueFontSize": "80%",
109-
"valueMaps": [
110-
{
111-
"op": "=",
112-
"text": "N/A",
113-
"value": "null"
114-
}
115-
],
116-
"valueName": "avg"
117-
},
11835
{
11936
"aliasColors": {},
12037
"bars": false,
@@ -126,8 +43,8 @@
12643
"fill": 1,
12744
"gridPos": {
12845
"h": 7,
129-
"w": 21,
130-
"x": 3,
46+
"w": 16,
47+
"x": 0,
13148
"y": 1
13249
},
13350
"id": 23,
@@ -211,6 +128,162 @@
211128
"alignLevel": null
212129
}
213130
},
131+
{
132+
"cacheTimeout": null,
133+
"colorBackground": false,
134+
"colorValue": false,
135+
"colors": [
136+
"#299c46",
137+
"rgba(237, 129, 40, 0.89)",
138+
"#d44a3a"
139+
],
140+
"datasource": "infrabox",
141+
"description": "The number of nodes connected to the inspected cluster.",
142+
"format": "none",
143+
"gauge": {
144+
"maxValue": 100,
145+
"minValue": 0,
146+
"show": false,
147+
"thresholdLabels": false,
148+
"thresholdMarkers": true
149+
},
150+
"gridPos": {
151+
"h": 7,
152+
"w": 2,
153+
"x": 16,
154+
"y": 1
155+
},
156+
"id": 6,
157+
"interval": null,
158+
"links": [],
159+
"mappingType": 1,
160+
"mappingTypes": [
161+
{
162+
"name": "value to text",
163+
"value": 1
164+
},
165+
{
166+
"name": "range to text",
167+
"value": 2
168+
}
169+
],
170+
"maxDataPoints": 100,
171+
"nullPointMode": "connected",
172+
"nullText": null,
173+
"postfix": " nodes",
174+
"postfixFontSize": "50%",
175+
"prefix": "",
176+
"prefixFontSize": "50%",
177+
"rangeMaps": [
178+
{
179+
"from": "null",
180+
"text": "N/A",
181+
"to": "null"
182+
}
183+
],
184+
"sparkline": {
185+
"fillColor": "rgba(31, 118, 189, 0.18)",
186+
"full": false,
187+
"lineColor": "rgb(31, 120, 193)",
188+
"show": false
189+
},
190+
"tableColumn": "nodes",
191+
"targets": [
192+
{
193+
"$$hashKey": "object:3854",
194+
"alias": "",
195+
"format": "table",
196+
"hide": false,
197+
"rawSql": "SELECT nodes FROM cluster WHERE name = '[[cluster]]'",
198+
"refId": "A"
199+
}
200+
],
201+
"thresholds": "",
202+
"title": "Connected nodes",
203+
"type": "singlestat",
204+
"valueFontSize": "80%",
205+
"valueMaps": [
206+
{
207+
"op": "=",
208+
"text": "N/A",
209+
"value": "null"
210+
}
211+
],
212+
"valueName": "avg"
213+
},
214+
{
215+
"columns": [],
216+
"datasource": "infrabox",
217+
"description": "List of the node_name referenced by the job table for this cluster.\n\nIf the Node has never been associated to any job, it can't be seen.",
218+
"fontSize": "100%",
219+
"gridPos": {
220+
"h": 7,
221+
"w": 6,
222+
"x": 18,
223+
"y": 1
224+
},
225+
"id": 25,
226+
"links": [],
227+
"pageSize": null,
228+
"scroll": true,
229+
"showHeader": true,
230+
"sort": {
231+
"col": 0,
232+
"desc": true
233+
},
234+
"styles": [
235+
{
236+
"$$hashKey": "object:535",
237+
"alias": "Node",
238+
"colorMode": null,
239+
"colors": [
240+
"rgba(245, 54, 54, 0.9)",
241+
"rgba(237, 129, 40, 0.89)",
242+
"rgba(50, 172, 45, 0.97)"
243+
],
244+
"dateFormat": "YYYY-MM-DD HH:mm:ss",
245+
"decimals": 2,
246+
"link": true,
247+
"linkTooltip": "Inspect",
248+
"linkUrl": "d/09c0DMdiz/node-inspector?orgId=1&var-node_name=${__cell}",
249+
"mappingType": 1,
250+
"pattern": "node_name",
251+
"thresholds": [],
252+
"type": "string",
253+
"unit": "short"
254+
},
255+
{
256+
"$$hashKey": "object:565",
257+
"alias": "Running Jobs",
258+
"colorMode": null,
259+
"colors": [
260+
"rgba(245, 54, 54, 0.9)",
261+
"rgba(237, 129, 40, 0.89)",
262+
"rgba(50, 172, 45, 0.97)"
263+
],
264+
"dateFormat": "YYYY-MM-DD HH:mm:ss",
265+
"decimals": 0,
266+
"mappingType": 1,
267+
"pattern": "count",
268+
"thresholds": [],
269+
"type": "number",
270+
"unit": "short"
271+
}
272+
],
273+
"targets": [
274+
{
275+
"$$hashKey": "object:282",
276+
"alias": "",
277+
"format": "table",
278+
"hide": false,
279+
"rawSql": "SELECT node_name, count(id) FILTER(WHERE state = 'running') FROM job WHERE node_name is not null AND cluster_name = '[[cluster]]' GROUP BY node_name",
280+
"refId": "A"
281+
}
282+
],
283+
"title": "Node List",
284+
"transform": "table",
285+
"type": "table"
286+
},
214287
{
215288
"collapsed": false,
216289
"gridPos": {

deploy/infrabox/grafana/local/dashboards/dashboards.yaml renamed to deploy/infrabox/grafana/dashboards/dashboards.yaml

File renamed without changes.

deploy/infrabox/grafana/local/dashboards/global_dashboard.json renamed to deploy/infrabox/grafana/dashboards/global_dashboard.json

File renamed without changes.

deploy/infrabox/grafana/local/dashboards/job_inspector.json renamed to deploy/infrabox/grafana/dashboards/job_inspector.json

File renamed without changes.

deploy/infrabox/grafana/local/dashboards/node_inspector.json renamed to deploy/infrabox/grafana/dashboards/node_inspector.json

File renamed without changes.

deploy/infrabox/grafana/local/dashboards/nodes_overview.json renamed to deploy/infrabox/grafana/dashboards/nodes_overview.json

File renamed without changes.

deploy/infrabox/grafana/local/dashboards/project_inspector.json renamed to deploy/infrabox/grafana/dashboards/project_inspector.json

File renamed without changes.

deploy/infrabox/grafana/local/dashboards/projects_overview.json renamed to deploy/infrabox/grafana/dashboards/projects_overview.json

File renamed without changes.

deploy/infrabox/grafana/remote/dashboards/dashboards.yaml renamed to deploy/infrabox/grafana/remote_dashboards/dashboards/dashboards.yaml

File renamed without changes.

0 commit comments

Comments
 (0)