diff --git a/ArchiSteamFarm.OfficialPlugins.Monitoring/overlay/all/www/grafana-dashboard.json b/ArchiSteamFarm.OfficialPlugins.Monitoring/overlay/all/www/grafana-dashboard.json index d8230e4e6cc7c..2ad7508332679 100644 --- a/ArchiSteamFarm.OfficialPlugins.Monitoring/overlay/all/www/grafana-dashboard.json +++ b/ArchiSteamFarm.OfficialPlugins.Monitoring/overlay/all/www/grafana-dashboard.json @@ -21,7 +21,7 @@ "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "11.1.0" + "version": "11.4.0" }, { "type": "datasource", @@ -170,7 +170,7 @@ "textMode": "name", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "11.4.0", "targets": [ { "datasource": { @@ -240,7 +240,7 @@ "textMode": "name", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "11.4.0", "targets": [ { "datasource": { @@ -310,7 +310,7 @@ "textMode": "name", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "11.4.0", "targets": [ { "datasource": { @@ -380,7 +380,7 @@ "textMode": "name", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "11.4.0", "targets": [ { "datasource": { @@ -450,7 +450,7 @@ "textMode": "name", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "11.4.0", "targets": [ { "datasource": { @@ -470,7 +470,7 @@ "type": "stat" }, { - "collapsed": false, + "collapsed": true, "gridPos": { "h": 1, "w": 24, @@ -478,435 +478,441 @@ "y": 3 }, "id": 13, - "panels": [], - "title": "Global statistics", - "type": "row" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "thresholds" - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [] - }, - "gridPos": { - "h": 6, - "w": 3, - "x": 0, - "y": 4 - }, - "id": 11, - "options": { - "colorMode": "value", - "graphMode": "none", - "justifyMode": "center", - "orientation": "auto", - "percentChangeColorMode": "standard", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false - }, - "showPercentChange": false, - "textMode": "auto", - "wideLayout": true - }, - "pluginVersion": "11.1.0", - "targets": [ + "panels": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "editorMode": "code", - "expr": "avg(asf_bots{job=\"$job\", instance=\"$instance\", state=\"configured\"}) by (job, instance)", - "instant": false, - "legendFormat": "configured", - "range": true, - "refId": "A" - } - ], - "type": "stat" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "thresholds" - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] } - ] + }, + "overrides": [] }, - "unit": "short" - }, - "overrides": [] - }, - "gridPos": { - "h": 6, - "w": 6, - "x": 3, - "y": 4 - }, - "id": 51, - "options": { - "colorMode": "value", - "graphMode": "none", - "justifyMode": "center", - "orientation": "auto", - "percentChangeColorMode": "standard", - "reduceOptions": { - "calcs": [ - "lastNotNull" + "gridPos": { + "h": 6, + "w": 3, + "x": 0, + "y": 4 + }, + "id": 11, + "options": { + "colorMode": "value", + "graphMode": "none", + "justifyMode": "center", + "orientation": "auto", + "percentChangeColorMode": "standard", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true + }, + "pluginVersion": "11.4.0", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "avg(asf_bots{job=\"$job\", instance=\"$instance\", state=\"configured\"}) by (job, instance)", + "instant": false, + "legendFormat": "configured", + "range": true, + "refId": "A" + } ], - "fields": "", - "values": false + "title": "", + "type": "stat" }, - "showPercentChange": false, - "textMode": "auto", - "wideLayout": true - }, - "pluginVersion": "11.1.0", - "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "editorMode": "code", - "expr": "avg(asf_bots{job=\"$job\", instance=\"$instance\", state!=\"configured\", state!=\"farming\"}) by (job, instance, state)", - "instant": false, - "legendFormat": "{{state}}", - "range": true, - "refId": "A" - } - ], - "type": "stat" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "thresholds" + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "unit": "short" + }, + "overrides": [] }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null + "gridPos": { + "h": 6, + "w": 6, + "x": 3, + "y": 4 + }, + "id": 51, + "options": { + "colorMode": "value", + "graphMode": "none", + "justifyMode": "center", + "orientation": "auto", + "percentChangeColorMode": "standard", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true + }, + "pluginVersion": "11.4.0", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [] - }, - "gridPos": { - "h": 6, - "w": 3, - "x": 9, - "y": 4 - }, - "id": 62, - "options": { - "colorMode": "value", - "graphMode": "none", - "justifyMode": "center", - "orientation": "auto", - "percentChangeColorMode": "standard", - "reduceOptions": { - "calcs": [ - "lastNotNull" + "editorMode": "code", + "expr": "avg(asf_bots{job=\"$job\", instance=\"$instance\", state!=\"configured\", state!=\"farming\"}) by (job, instance, state)", + "instant": false, + "legendFormat": "{{state}}", + "range": true, + "refId": "A" + } ], - "fields": "", - "values": false + "title": "", + "type": "stat" }, - "showPercentChange": false, - "textMode": "auto", - "wideLayout": true - }, - "pluginVersion": "11.1.0", - "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "editorMode": "code", - "expr": "avg(asf_bots{job=\"$job\", instance=\"$instance\", state=\"farming\"}) by (job, instance)", - "instant": false, - "legendFormat": "farming", - "range": true, - "refId": "A" - } - ], - "type": "stat" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "thresholds" - }, - "mappings": [], - "min": 0, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" }, - { - "color": "red", - "value": 10 + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] } - ] - } - }, - "overrides": [] - }, - "gridPos": { - "h": 6, - "w": 3, - "x": 12, - "y": 4 - }, - "id": 2, - "options": { - "colorMode": "value", - "graphMode": "none", - "justifyMode": "center", - "orientation": "auto", - "percentChangeColorMode": "standard", - "reduceOptions": { - "calcs": [ - "lastNotNull" + }, + "overrides": [] + }, + "gridPos": { + "h": 6, + "w": 3, + "x": 9, + "y": 4 + }, + "id": 62, + "options": { + "colorMode": "value", + "graphMode": "none", + "justifyMode": "center", + "orientation": "auto", + "percentChangeColorMode": "standard", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true + }, + "pluginVersion": "11.4.0", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "avg(asf_bots{job=\"$job\", instance=\"$instance\", state=\"farming\"}) by (job, instance)", + "instant": false, + "legendFormat": "farming", + "range": true, + "refId": "A" + } ], - "fields": "", - "values": false + "title": "", + "type": "stat" }, - "showPercentChange": false, - "textMode": "auto", - "wideLayout": true - }, - "pluginVersion": "11.1.0", - "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "editorMode": "code", - "expr": "avg(asf_active_plugins{job=\"$job\", instance=\"$instance\", type=\"\"}) by (job, instance)", - "instant": false, - "legendFormat": "Plugins", - "range": true, - "refId": "A" - } - ], - "type": "stat" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "thresholds" - }, - "mappings": [], - "min": 0, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" }, - { - "color": "red", - "value": 10 + "mappings": [], + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 10 + } + ] } - ] - } - }, - "overrides": [] - }, - "gridPos": { - "h": 6, - "w": 6, - "x": 15, - "y": 4 - }, - "id": 63, - "options": { - "colorMode": "value", - "graphMode": "none", - "justifyMode": "center", - "orientation": "auto", - "percentChangeColorMode": "standard", - "reduceOptions": { - "calcs": [ - "lastNotNull" + }, + "overrides": [] + }, + "gridPos": { + "h": 6, + "w": 3, + "x": 12, + "y": 4 + }, + "id": 2, + "options": { + "colorMode": "value", + "graphMode": "none", + "justifyMode": "center", + "orientation": "auto", + "percentChangeColorMode": "standard", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true + }, + "pluginVersion": "11.4.0", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "avg(asf_active_plugins{job=\"$job\", instance=\"$instance\", type=\"\"}) by (job, instance)", + "instant": false, + "legendFormat": "Plugins", + "range": true, + "refId": "A" + } ], - "fields": "", - "values": false + "title": "", + "type": "stat" }, - "showPercentChange": false, - "textMode": "auto", - "wideLayout": true - }, - "pluginVersion": "11.1.0", - "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "editorMode": "code", - "expr": "avg(asf_active_plugins{job=\"$job\", instance=\"$instance\", type=\"official\"}) by (job, instance)", - "hide": false, - "instant": false, - "legendFormat": "Official Plugins", - "range": true, - "refId": "A" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "mappings": [], + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 10 + } + ] + } + }, + "overrides": [] }, - "editorMode": "code", - "expr": "avg(asf_active_plugins{job=\"$job\", instance=\"$instance\", type=\"custom\"}) by (job, instance)", - "hide": false, - "instant": false, - "legendFormat": "Custom Plugins", - "range": true, - "refId": "B" - } - ], - "type": "stat" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "fieldConfig": { - "defaults": { - "color": { - "fixedColor": "dark-red", - "mode": "fixed" + "gridPos": { + "h": 6, + "w": 6, + "x": 15, + "y": 4 }, - "mappings": [], - "noValue": "0", - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null + "id": 63, + "options": { + "colorMode": "value", + "graphMode": "none", + "justifyMode": "center", + "orientation": "auto", + "percentChangeColorMode": "standard", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true + }, + "pluginVersion": "11.4.0", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [] - }, - "gridPos": { - "h": 6, - "w": 3, - "x": 21, - "y": 4 - }, - "id": 52, - "options": { - "colorMode": "background", - "graphMode": "area", - "justifyMode": "center", - "orientation": "auto", - "percentChangeColorMode": "standard", - "reduceOptions": { - "calcs": [ - "lastNotNull" + "editorMode": "code", + "expr": "avg(asf_active_plugins{job=\"$job\", instance=\"$instance\", type=\"official\"}) by (job, instance)", + "hide": false, + "instant": false, + "legendFormat": "Official Plugins", + "range": true, + "refId": "A" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "avg(asf_active_plugins{job=\"$job\", instance=\"$instance\", type=\"custom\"}) by (job, instance)", + "hide": false, + "instant": false, + "legendFormat": "Custom Plugins", + "range": true, + "refId": "B" + } ], - "fields": "", - "values": false + "title": "", + "type": "stat" }, - "showPercentChange": false, - "text": {}, - "textMode": "value", - "wideLayout": true - }, - "pluginVersion": "11.1.0", - "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "editorMode": "code", - "exemplar": false, - "expr": "avg(asf_ipc_banned_ips{job=\"$job\", instance=\"$instance\"}) by (job, instance)", - "instant": false, - "legendFormat": "__auto", - "range": true, - "refId": "A" + "fieldConfig": { + "defaults": { + "color": { + "fixedColor": "dark-red", + "mode": "fixed" + }, + "mappings": [], + "noValue": "0", + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 6, + "w": 3, + "x": 21, + "y": 4 + }, + "id": 52, + "options": { + "colorMode": "background", + "graphMode": "area", + "justifyMode": "center", + "orientation": "auto", + "percentChangeColorMode": "standard", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "showPercentChange": false, + "text": {}, + "textMode": "value", + "wideLayout": true + }, + "pluginVersion": "11.4.0", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "exemplar": false, + "expr": "avg(asf_ipc_banned_ips{job=\"$job\", instance=\"$instance\"}) by (job, instance)", + "instant": false, + "legendFormat": "__auto", + "range": true, + "refId": "A" + } + ], + "title": "IPC banned IPs", + "type": "stat" } ], - "title": "IPC banned IPs", - "type": "stat" + "title": "Global statistics", + "type": "row" }, { "collapsed": true, @@ -914,7 +920,7 @@ "h": 1, "w": 24, "x": 0, - "y": 10 + "y": 4 }, "id": 8, "panels": [ @@ -935,6 +941,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -984,7 +991,7 @@ "h": 7, "w": 12, "x": 0, - "y": 11 + "y": 5 }, "id": 7, "options": { @@ -999,6 +1006,7 @@ "sort": "desc" } }, + "pluginVersion": "11.4.0", "targets": [ { "datasource": { @@ -1037,6 +1045,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1085,7 +1094,7 @@ "h": 7, "w": 12, "x": 12, - "y": 11 + "y": 5 }, "id": 4, "options": { @@ -1100,6 +1109,7 @@ "sort": "desc" } }, + "pluginVersion": "11.4.0", "targets": [ { "datasource": { @@ -1180,7 +1190,7 @@ "h": 6, "w": 12, "x": 0, - "y": 18 + "y": 85 }, "id": 9, "options": { @@ -1199,7 +1209,7 @@ "sizing": "auto", "text": {} }, - "pluginVersion": "11.1.0", + "pluginVersion": "11.4.0", "targets": [ { "datasource": { @@ -1250,7 +1260,7 @@ "h": 6, "w": 12, "x": 12, - "y": 18 + "y": 85 }, "id": 10, "options": { @@ -1269,7 +1279,7 @@ "sizing": "auto", "text": {} }, - "pluginVersion": "11.1.0", + "pluginVersion": "11.4.0", "targets": [ { "datasource": { @@ -1304,7 +1314,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] } @@ -1315,7 +1326,7 @@ "h": 6, "w": 12, "x": 0, - "y": 24 + "y": 91 }, "id": 6, "options": { @@ -1335,7 +1346,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "11.4.0", "targets": [ { "datasource": { @@ -1370,7 +1381,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1385,7 +1397,7 @@ "h": 6, "w": 12, "x": 12, - "y": 24 + "y": 91 }, "id": 5, "options": { @@ -1405,7 +1417,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "11.4.0", "targets": [ { "datasource": { @@ -1433,7 +1445,7 @@ "h": 1, "w": 24, "x": 0, - "y": 11 + "y": 5 }, "id": 36, "panels": [ @@ -1454,6 +1466,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "opacity", @@ -1485,7 +1498,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] }, @@ -1517,7 +1531,7 @@ "sort": "desc" } }, - "pluginVersion": "10.4.1", + "pluginVersion": "11.4.0", "targets": [ { "datasource": { @@ -1528,9 +1542,9 @@ "expr": "avg(max_over_time(process_runtime_dotnet_gc_committed_memory_size_bytes{job=\"$job\", instance=\"$instance\"}[$__rate_interval])) by (job, instance)", "hide": false, "instant": false, - "legendFormat": "GC Commited Memory Size", + "legendFormat": "GC Committed Memory Size", "range": true, - "refId": "A" + "refId": "Committed Memory - Pre ASF 6.1.1.0" }, { "datasource": { @@ -1543,7 +1557,7 @@ "instant": false, "legendFormat": "GC Objects size", "range": true, - "refId": "B" + "refId": "Object Memory - Pre ASF 6.1.1.0" }, { "datasource": { @@ -1551,12 +1565,12 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(rate(process_runtime_dotnet_gc_allocations_size_bytes{job=\"$job\", instance=\"$instance\"}[$__rate_interval])) by (job, instance)", + "expr": "avg(max_over_time(dotnet_gc_last_collection_memory_committed_size_bytes{job=\"$job\", instance=\"$instance\"}[$__rate_interval])) by (job, instance)", "hide": false, "instant": false, - "legendFormat": "GC Allocation Size", + "legendFormat": "GC Committed Memory Size", "range": true, - "refId": "C" + "refId": "Committed Memory - Post ASF 6.1.1.0" } ], "title": "GC Memory Usage", @@ -1579,6 +1593,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "opacity", @@ -1610,7 +1625,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] }, @@ -1642,6 +1658,7 @@ "sort": "desc" } }, + "pluginVersion": "11.4.0", "targets": [ { "datasource": { @@ -1653,7 +1670,20 @@ "instant": false, "legendFormat": "{{generation}}", "range": true, - "refId": "A" + "refId": "Heap Usage - Pre ASF 6.1.1.0" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "avg(max_over_time(dotnet_gc_last_collection_heap_size_bytes{job=\"$job\", instance=\"$instance\"}[$__rate_interval])) by (job, instance, gc_heap_generation)", + "hide": false, + "instant": false, + "legendFormat": "{{gc_heap_generation}}", + "range": true, + "refId": "Heap Usage - Post ASF 6.1.1.0" } ], "title": "Heap Usage", @@ -1676,6 +1706,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "opacity", @@ -1707,7 +1738,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] }, @@ -1739,6 +1771,7 @@ "sort": "desc" } }, + "pluginVersion": "11.4.0", "targets": [ { "datasource": { @@ -1750,7 +1783,20 @@ "instant": false, "legendFormat": "{{generation}}", "range": true, - "refId": "A" + "refId": "Heap Fragmentation - Pre ASF 6.1.1.0" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "avg(max_over_time(dotnet_gc_last_collection_heap_fragmentation_size_bytes{job=\"$job\", instance=\"$instance\"}[$__rate_interval])) by (job, instance, gc_heap_generation)", + "hide": false, + "instant": false, + "legendFormat": "{{gc_heap_generation}}", + "range": true, + "refId": "Heap Fragmentation - Post ASF 6.1.1.0" } ], "title": "Heap Fragmentation", @@ -1773,6 +1819,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "opacity", @@ -1804,7 +1851,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1820,7 +1868,7 @@ "h": 8, "w": 8, "x": 0, - "y": 14 + "y": 71 }, "id": 40, "interval": "2m", @@ -1841,6 +1889,7 @@ "sort": "desc" } }, + "pluginVersion": "11.4.0", "targets": [ { "datasource": { @@ -1852,7 +1901,20 @@ "instant": false, "legendFormat": "{{generation}}", "range": true, - "refId": "A" + "refId": "Garbage Collections - Pre ASF 6.1.1.0" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "avg(rate(dotnet_gc_collections_total{job=\"$job\", instance=\"$instance\"}[$__rate_interval])) by (job, instance, gc_heap_generation)", + "hide": false, + "instant": false, + "legendFormat": "{{gc_heap_generation}}", + "range": true, + "refId": "Garbage Collections - Post ASF 6.1.1.0" } ], "title": "Garbage Collections", @@ -1876,6 +1938,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "opacity", @@ -1907,7 +1970,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] }, @@ -1919,7 +1983,7 @@ "h": 8, "w": 8, "x": 8, - "y": 14 + "y": 71 }, "id": 41, "interval": "2m", @@ -1940,6 +2004,7 @@ "sort": "desc" } }, + "pluginVersion": "11.4.0", "targets": [ { "datasource": { @@ -1952,10 +2017,29 @@ "instant": false, "legendFormat": " Exceptions", "range": true, - "refId": "A" + "refId": "Exceptions - Pre ASF 6.1.1.0" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "avg(rate(dotnet_exceptions_total{job=\"$job\", instance=\"$instance\"}[$__rate_interval])) by (job, instance)", + "hide": false, + "instant": false, + "legendFormat": " Exceptions", + "range": true, + "refId": "Exceptions - Post ASF 6.1.1.0" } ], "title": "Exceptions", + "transformations": [ + { + "id": "merge", + "options": {} + } + ], "type": "timeseries" }, { @@ -1974,7 +2058,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] }, @@ -1986,7 +2071,7 @@ "h": 8, "w": 4, "x": 16, - "y": 14 + "y": 71 }, "id": 42, "options": { @@ -2006,7 +2091,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "11.4.0", "targets": [ { "datasource": { @@ -2018,10 +2103,29 @@ "instant": false, "legendFormat": "Thead Pool Threads", "range": true, - "refId": "A" + "refId": "Threads - Pre ASF 6.1.1.0" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "avg(max_over_time(dotnet_thread_pool_thread_count_total{job=\"$job\", instance=\"$instance\"}[$__rate_interval])) by (job, instance)", + "hide": false, + "instant": false, + "legendFormat": "Thead Pool Threads", + "range": true, + "refId": "Threads - Post ASF 6.1.1.0" } ], "title": "Thread Pool Threads", + "transformations": [ + { + "id": "merge", + "options": {} + } + ], "type": "stat" }, { @@ -2040,7 +2144,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] }, @@ -2052,7 +2157,7 @@ "h": 8, "w": 4, "x": 20, - "y": 14 + "y": 71 }, "id": 43, "options": { @@ -2072,7 +2177,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "11.4.0", "targets": [ { "datasource": { @@ -2084,10 +2189,29 @@ "instant": false, "legendFormat": "Thread Pool Queue Length", "range": true, - "refId": "A" + "refId": "Thread Queue - Pre ASF 6.1.1.0" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "avg(max_over_time(dotnet_thread_pool_queue_length_total{job=\"$job\", instance=\"$instance\"}[$__rate_interval])) by (job, instance)", + "hide": false, + "instant": false, + "legendFormat": "Thread Pool Queue Length", + "range": true, + "refId": "Thread Queue - Post ASF 6.1.1.0" } ], "title": "Thread Pool Queue Length", + "transformations": [ + { + "id": "merge", + "options": {} + } + ], "type": "stat" } ], @@ -2100,7 +2224,7 @@ "h": 1, "w": 24, "x": 0, - "y": 12 + "y": 6 }, "id": 23, "panels": [ @@ -2124,6 +2248,7 @@ "axisPlacement": "auto", "axisSoftMin": 0, "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 50, "gradientMode": "opacity", @@ -2166,7 +2291,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] }, @@ -2223,6 +2349,7 @@ "sort": "none" } }, + "pluginVersion": "11.4.0", "targets": [ { "datasource": { @@ -2329,6 +2456,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 50, "gradientMode": "opacity", @@ -2372,7 +2500,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] }, @@ -2450,6 +2579,7 @@ "sort": "none" } }, + "pluginVersion": "11.4.0", "targets": [ { "datasource": { @@ -2508,6 +2638,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -2539,7 +2670,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2554,7 +2686,7 @@ "h": 8, "w": 6, "x": 0, - "y": 16 + "y": 40 }, "id": 27, "options": { @@ -2569,6 +2701,7 @@ "sort": "none" } }, + "pluginVersion": "11.4.0", "targets": [ { "datasource": { @@ -2603,6 +2736,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -2634,7 +2768,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2649,7 +2784,7 @@ "h": 8, "w": 6, "x": 6, - "y": 16 + "y": 40 }, "id": 28, "options": { @@ -2664,6 +2799,7 @@ "sort": "none" } }, + "pluginVersion": "11.4.0", "targets": [ { "datasource": { @@ -2698,7 +2834,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2713,7 +2850,7 @@ "h": 4, "w": 6, "x": 12, - "y": 16 + "y": 40 }, "id": 29, "options": { @@ -2734,7 +2871,7 @@ "textMode": "value", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "11.4.0", "targets": [ { "datasource": { @@ -2771,7 +2908,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2786,7 +2924,7 @@ "h": 4, "w": 6, "x": 18, - "y": 16 + "y": 40 }, "id": 30, "options": { @@ -2807,7 +2945,7 @@ "textMode": "value", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "11.4.0", "targets": [ { "datasource": { @@ -2844,7 +2982,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2859,7 +2998,7 @@ "h": 4, "w": 6, "x": 12, - "y": 20 + "y": 44 }, "id": 31, "options": { @@ -2879,7 +3018,7 @@ "textMode": "value_and_name", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "11.4.0", "targets": [ { "datasource": { @@ -2914,7 +3053,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2929,7 +3069,7 @@ "h": 4, "w": 6, "x": 18, - "y": 20 + "y": 44 }, "id": 32, "options": { @@ -2949,7 +3089,7 @@ "textMode": "value_and_name", "wideLayout": true }, - "pluginVersion": "11.1.0", + "pluginVersion": "11.4.0", "targets": [ { "datasource": { @@ -2989,7 +3129,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3072,9 +3213,8 @@ "h": 8, "w": 12, "x": 0, - "y": 24 + "y": 48 }, - "hideTimeOverride": false, "id": 33, "options": { "cellHeight": "sm", @@ -3094,7 +3234,7 @@ } ] }, - "pluginVersion": "11.1.0", + "pluginVersion": "11.4.0", "targets": [ { "datasource": { @@ -3163,7 +3303,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3246,9 +3387,8 @@ "h": 8, "w": 12, "x": 12, - "y": 24 + "y": 48 }, - "hideTimeOverride": false, "id": 35, "options": { "cellHeight": "sm", @@ -3268,7 +3408,7 @@ } ] }, - "pluginVersion": "11.1.0", + "pluginVersion": "11.4.0", "targets": [ { "datasource": { @@ -3338,7 +3478,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3420,9 +3561,8 @@ "h": 8, "w": 12, "x": 0, - "y": 32 + "y": 56 }, - "hideTimeOverride": false, "id": 34, "options": { "cellHeight": "sm", @@ -3442,7 +3582,7 @@ } ] }, - "pluginVersion": "11.1.0", + "pluginVersion": "11.4.0", "targets": [ { "datasource": { @@ -3504,6 +3644,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -3535,7 +3676,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -3550,7 +3692,7 @@ "h": 8, "w": 12, "x": 12, - "y": 32 + "y": 56 }, "id": 15, "options": { @@ -3565,6 +3707,7 @@ "sort": "none" } }, + "pluginVersion": "11.4.0", "targets": [ { "datasource": { @@ -3593,7 +3736,7 @@ "h": 1, "w": 24, "x": 0, - "y": 13 + "y": 7 }, "id": 44, "panels": [ @@ -3614,6 +3757,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -3645,7 +3789,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] }, @@ -3677,6 +3822,7 @@ "sort": "desc" } }, + "pluginVersion": "11.4.0", "targets": [ { "datasource": { @@ -3711,6 +3857,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -3742,7 +3889,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] }, @@ -3774,6 +3922,7 @@ "sort": "desc" } }, + "pluginVersion": "11.4.0", "targets": [ { "datasource": { @@ -3808,6 +3957,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -3842,7 +3992,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] }, @@ -3875,6 +4026,7 @@ "sort": "desc" } }, + "pluginVersion": "11.4.0", "targets": [ { "datasource": { @@ -3910,6 +4062,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -3941,7 +4094,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] }, @@ -3974,6 +4128,7 @@ "sort": "desc" } }, + "pluginVersion": "11.4.0", "targets": [ { "datasource": { @@ -4043,7 +4198,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] }, @@ -4053,7 +4209,7 @@ }, "gridPos": { "h": 8, - "w": 8, + "w": 24, "x": 0, "y": 24 }, @@ -4102,37 +4258,30 @@ } ], "refresh": "30s", - "schemaVersion": 39, + "schemaVersion": 40, "tags": [], "templating": { "list": [ { "current": {}, - "hide": 0, "includeAll": false, "label": "datasource", - "multi": false, "name": "DS_PROMETHEUS", "options": [], "query": "prometheus", - "queryValue": "", "refresh": 1, "regex": "", - "skipUrlSync": false, "type": "datasource" }, { - "allValue": "", "current": {}, "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, "definition": "label_values(asf_bot_heartbeat_failures,job)", - "hide": 0, "includeAll": false, "label": "Job", - "multi": false, "name": "job", "options": [], "query": { @@ -4142,22 +4291,17 @@ }, "refresh": 1, "regex": "", - "skipUrlSync": false, - "sort": 0, "type": "query" }, { - "allValue": "", "current": {}, "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, "definition": "label_values(asf_bot_heartbeat_failures{job=\"$job\"},instance)", - "hide": 0, "includeAll": false, "label": "Instance", - "multi": false, "name": "instance", "options": [], "query": { @@ -4167,19 +4311,15 @@ }, "refresh": 1, "regex": "", - "skipUrlSync": false, - "sort": 0, "type": "query" }, { - "allValue": "", "current": {}, "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, "definition": "label_values(asf_bot_heartbeat_failures{job=\"$job\", instance=\"$instance\"},bot)", - "hide": 0, "includeAll": true, "label": "Bots", "multi": true, @@ -4192,19 +4332,15 @@ }, "refresh": 1, "regex": "", - "skipUrlSync": false, - "sort": 0, "type": "query" }, { - "allValue": "", "current": {}, "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, "definition": "label_values(asf_bot_heartbeat_failures{job=\"$job\", instance=\"$instance\", steamid!=\"0\"},steamid)", - "hide": 0, "includeAll": true, "label": "SteamIDs", "multi": true, @@ -4217,12 +4353,9 @@ }, "refresh": 1, "regex": "", - "skipUrlSync": false, - "sort": 0, "type": "query" }, { - "allValue": "", "current": {}, "datasource": { "type": "prometheus", @@ -4241,20 +4374,16 @@ }, "refresh": 2, "regex": "", - "skipUrlSync": false, "sort": 5, "type": "query" }, { "current": { - "selected": false, - "text": "yes", + "text": "/Api/metrics", "value": "/Api/metrics" }, - "hide": 0, "includeAll": false, "label": "ASP.NET: Exclude metrics endpoint", - "multi": false, "name": "excluded_endpoint", "options": [ { @@ -4269,26 +4398,21 @@ } ], "query": "yes : /Api/metrics, no : ''", - "queryValue": "", - "skipUrlSync": false, "type": "custom" }, { "current": { - "selected": false, - "text": "yes", - "value": "ext[0-9]+-[a-z]+[0-9]+\\.steamserver\\.net" + "text": "(cmp|ext)[0-9]+-[a-z]+[0-9]+\\.steamserver\\.net", + "value": "(cmp|ext)[0-9]+-[a-z]+[0-9]+\\.steamserver\\.net" }, - "hide": 0, "includeAll": false, "label": "HTTP Client: Exclude *.steamserver.net", - "multi": false, "name": "excluded_servers", "options": [ { "selected": true, "text": "yes", - "value": "ext[0-9]+-[a-z]+[0-9]+\\.steamserver\\.net" + "value": "(cmp|ext)[0-9]+-[a-z]+[0-9]+\\.steamserver\\.net" }, { "selected": false, @@ -4296,21 +4420,19 @@ "value": "''" } ], - "query": "yes : ext[0-9]+-[a-z]+[0-9]+\\.steamserver\\.net, no : ''", - "queryValue": "", - "skipUrlSync": false, + "query": "yes : (cmp|ext)[0-9]+-[a-z]+[0-9]+\\.steamserver\\.net, no : ''", "type": "custom" } ] }, "time": { - "from": "now-5m", + "from": "now-90d", "to": "now" }, "timepicker": {}, "timezone": "browser", "title": "ArchiSteamFarm", "uid": "archisteamfarm", - "version": 94, + "version": 108, "weekStart": "" }