Skip to content

Commit 66d255c

Browse files
committed
Fix used memory in dashboards
1 parent ca30c11 commit 66d255c

File tree

2 files changed

+82
-22
lines changed

2 files changed

+82
-22
lines changed

infra/grafana/dashboards/bukkit_metrics.json

Lines changed: 37 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"editable": true,
2020
"fiscalYearStartMonth": 0,
2121
"graphTooltip": 0,
22-
"id": 5,
22+
"id": 2,
2323
"links": [],
2424
"panels": [
2525
{
@@ -39,6 +39,7 @@
3939
"axisLabel": "",
4040
"axisPlacement": "auto",
4141
"barAlignment": 0,
42+
"barWidthFactor": 0.6,
4243
"drawStyle": "line",
4344
"fillOpacity": 10,
4445
"gradientMode": "none",
@@ -47,6 +48,7 @@
4748
"tooltip": false,
4849
"viz": false
4950
},
51+
"insertNulls": false,
5052
"lineInterpolation": "linear",
5153
"lineWidth": 2,
5254
"pointSize": 5,
@@ -95,10 +97,12 @@
9597
"showLegend": true
9698
},
9799
"tooltip": {
100+
"hideZeros": false,
98101
"mode": "single",
99102
"sort": "none"
100103
}
101104
},
105+
"pluginVersion": "11.6.1",
102106
"targets": [
103107
{
104108
"datasource": {
@@ -129,8 +133,7 @@
129133
"mode": "absolute",
130134
"steps": [
131135
{
132-
"color": "red",
133-
"value": null
136+
"color": "red"
134137
},
135138
{
136139
"color": "orange",
@@ -158,6 +161,8 @@
158161
},
159162
"id": 2,
160163
"options": {
164+
"minVizHeight": 75,
165+
"minVizWidth": 75,
161166
"orientation": "auto",
162167
"reduceOptions": {
163168
"calcs": [
@@ -167,9 +172,10 @@
167172
"values": false
168173
},
169174
"showThresholdLabels": false,
170-
"showThresholdMarkers": true
175+
"showThresholdMarkers": true,
176+
"sizing": "auto"
171177
},
172-
"pluginVersion": "11.6.0",
178+
"pluginVersion": "11.6.1",
173179
"targets": [
174180
{
175181
"datasource": {
@@ -200,6 +206,7 @@
200206
"axisLabel": "",
201207
"axisPlacement": "auto",
202208
"barAlignment": 0,
209+
"barWidthFactor": 0.6,
203210
"drawStyle": "line",
204211
"fillOpacity": 10,
205212
"gradientMode": "none",
@@ -208,6 +215,7 @@
208215
"tooltip": false,
209216
"viz": false
210217
},
218+
"insertNulls": false,
211219
"lineInterpolation": "linear",
212220
"lineWidth": 2,
213221
"pointSize": 5,
@@ -256,17 +264,19 @@
256264
"showLegend": true
257265
},
258266
"tooltip": {
267+
"hideZeros": false,
259268
"mode": "single",
260269
"sort": "none"
261270
}
262271
},
272+
"pluginVersion": "11.6.1",
263273
"targets": [
264274
{
265275
"datasource": {
266276
"type": "influxdb",
267277
"uid": "P5697886F9CA74929"
268278
},
269-
"query": "from(bucket: \"metrics_db\")\r\n |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\r\n |> filter(fn: (r) => r._measurement == \"minecraft_stats\")\r\n |> filter(fn: (r) => r._field == \"players_online\")\r\n |> filter(fn: (r) => r.server == \"bed1\")\r\n |> aggregateWindow(every: v.windowPeriod, fn: mean, createEmpty: false)\r\n |> yield(name: \"mean\")",
279+
"query": "from(bucket: \"metrics_db\")\r\n |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\r\n |> filter(fn: (r) => r._measurement == \"minecraft_stats\")\r\n |> filter(fn: (r) => r._field == \"used_memory\")\r\n |> filter(fn: (r) => r.server == \"bed1\")\r\n |> aggregateWindow(every: v.windowPeriod, fn: mean, createEmpty: false)\r\n |> yield(name: \"mean\")",
270280
"refId": "A"
271281
}
272282
],
@@ -290,6 +300,7 @@
290300
"axisLabel": "",
291301
"axisPlacement": "auto",
292302
"barAlignment": 0,
303+
"barWidthFactor": 0.6,
293304
"drawStyle": "line",
294305
"fillOpacity": 10,
295306
"gradientMode": "none",
@@ -298,6 +309,7 @@
298309
"tooltip": false,
299310
"viz": false
300311
},
312+
"insertNulls": false,
301313
"lineInterpolation": "linear",
302314
"lineWidth": 2,
303315
"pointSize": 5,
@@ -346,10 +358,12 @@
346358
"showLegend": true
347359
},
348360
"tooltip": {
361+
"hideZeros": false,
349362
"mode": "single",
350363
"sort": "none"
351364
}
352365
},
366+
"pluginVersion": "11.6.1",
353367
"targets": [
354368
{
355369
"datasource": {
@@ -380,6 +394,7 @@
380394
"axisLabel": "",
381395
"axisPlacement": "auto",
382396
"barAlignment": 0,
397+
"barWidthFactor": 0.6,
383398
"drawStyle": "line",
384399
"fillOpacity": 10,
385400
"gradientMode": "none",
@@ -388,6 +403,7 @@
388403
"tooltip": false,
389404
"viz": false
390405
},
406+
"insertNulls": false,
391407
"lineInterpolation": "linear",
392408
"lineWidth": 2,
393409
"pointSize": 5,
@@ -436,10 +452,12 @@
436452
"showLegend": true
437453
},
438454
"tooltip": {
455+
"hideZeros": false,
439456
"mode": "single",
440457
"sort": "none"
441458
}
442459
},
460+
"pluginVersion": "11.6.1",
443461
"targets": [
444462
{
445463
"datasource": {
@@ -470,6 +488,7 @@
470488
"axisLabel": "",
471489
"axisPlacement": "auto",
472490
"barAlignment": 0,
491+
"barWidthFactor": 0.6,
473492
"drawStyle": "line",
474493
"fillOpacity": 10,
475494
"gradientMode": "none",
@@ -478,6 +497,7 @@
478497
"tooltip": false,
479498
"viz": false
480499
},
500+
"insertNulls": false,
481501
"lineInterpolation": "linear",
482502
"lineWidth": 2,
483503
"pointSize": 5,
@@ -526,10 +546,12 @@
526546
"showLegend": true
527547
},
528548
"tooltip": {
549+
"hideZeros": false,
529550
"mode": "single",
530551
"sort": "none"
531552
}
532553
},
554+
"pluginVersion": "11.6.1",
533555
"targets": [
534556
{
535557
"datasource": {
@@ -726,10 +748,15 @@
726748
"type": "timeseries"
727749
}
728750
],
751+
"preload": false,
729752
"refresh": "5s",
730-
"schemaVersion": 39,
731-
"style": "dark",
732-
"tags": ["bukkit", "minecraft", "serverpulse", "server"],
753+
"schemaVersion": 41,
754+
"tags": [
755+
"bukkit",
756+
"minecraft",
757+
"serverpulse",
758+
"server"
759+
],
733760
"templating": {
734761
"list": []
735762
},
@@ -741,6 +768,5 @@
741768
"timezone": "browser",
742769
"title": "Bukkit Server Metrics",
743770
"uid": "bukkit-server-metrics",
744-
"version": 1,
745-
"weekStart": ""
771+
"version": 1
746772
}

0 commit comments

Comments
 (0)