diff --git a/dashboard/dashboard.json b/dashboard/dashboard.json
index 43695e8..c08f0dc 100644
--- a/dashboard/dashboard.json
+++ b/dashboard/dashboard.json
@@ -27,8 +27,8 @@
"overrides": []
},
"gridPos": {
- "h": 7,
- "w": 3,
+ "h": 6,
+ "w": 24,
"x": 0,
"y": 0
},
@@ -42,7 +42,7 @@
"content": "
\n
HMAC Dashboard
\n

\n
\n This dashboard monitors key metrics for the \n HMAC File Server.\n
\n
\n",
"mode": "html"
},
- "pluginVersion": "11.4.0",
+ "pluginVersion": "12.0.1",
"title": "HMAC Dashboard",
"type": "text"
},
@@ -61,8 +61,7 @@
"mode": "absolute",
"steps": [
{
- "color": "green",
- "value": null
+ "color": "green"
},
{
"color": "red",
@@ -76,9 +75,9 @@
},
"gridPos": {
"h": 7,
- "w": 6,
- "x": 3,
- "y": 0
+ "w": 4,
+ "x": 0,
+ "y": 6
},
"id": 14,
"options": {
@@ -105,7 +104,7 @@
"sizing": "auto",
"valueMode": "color"
},
- "pluginVersion": "11.4.0",
+ "pluginVersion": "12.0.1",
"targets": [
{
"editorMode": "code",
@@ -131,20 +130,19 @@
"mode": "absolute",
"steps": [
{
- "color": "green",
- "value": null
+ "color": "green"
}
]
},
- "unit": "bytes"
+ "unit": "percent"
},
"overrides": []
},
"gridPos": {
"h": 7,
- "w": 6,
- "x": 9,
- "y": 0
+ "w": 3,
+ "x": 4,
+ "y": 6
},
"id": 18,
"options": {
@@ -164,11 +162,11 @@
"textMode": "auto",
"wideLayout": true
},
- "pluginVersion": "11.4.0",
+ "pluginVersion": "12.0.1",
"targets": [
{
"editorMode": "code",
- "expr": "hmac_memory_usage_bytes",
+ "expr": "memory_usage_percent",
"legendFormat": "Download Errors",
"range": true,
"refId": "A"
@@ -189,8 +187,7 @@
"mode": "absolute",
"steps": [
{
- "color": "green",
- "value": null
+ "color": "green"
},
{
"color": "red",
@@ -203,9 +200,9 @@
},
"gridPos": {
"h": 7,
- "w": 5,
- "x": 15,
- "y": 0
+ "w": 3,
+ "x": 7,
+ "y": 6
},
"id": 10,
"options": {
@@ -225,7 +222,7 @@
"textMode": "value",
"wideLayout": true
},
- "pluginVersion": "11.4.0",
+ "pluginVersion": "12.0.1",
"targets": [
{
"editorMode": "code",
@@ -251,66 +248,7 @@
"mode": "absolute",
"steps": [
{
- "color": "green",
- "value": null
- }
- ]
- }
- },
- "overrides": []
- },
- "gridPos": {
- "h": 7,
- "w": 4,
- "x": 20,
- "y": 0
- },
- "id": 17,
- "options": {
- "colorMode": "value",
- "graphMode": "area",
- "justifyMode": "auto",
- "orientation": "auto",
- "percentChangeColorMode": "standard",
- "reduceOptions": {
- "calcs": [
- "lastNotNull"
- ],
- "fields": "",
- "values": false
- },
- "showPercentChange": false,
- "textMode": "auto",
- "wideLayout": true
- },
- "pluginVersion": "11.4.0",
- "targets": [
- {
- "editorMode": "code",
- "expr": "hmac_goroutines_count",
- "format": "table",
- "legendFormat": "Download Errors",
- "range": true,
- "refId": "A"
- }
- ],
- "title": "HMAC GoRoutines",
- "type": "stat"
- },
- {
- "datasource": {
- "default": true,
- "type": "prometheus"
- },
- "fieldConfig": {
- "defaults": {
- "mappings": [],
- "thresholds": {
- "mode": "absolute",
- "steps": [
- {
- "color": "green",
- "value": null
+ "color": "green"
},
{
"color": "red",
@@ -324,9 +262,9 @@
},
"gridPos": {
"h": 7,
- "w": 5,
- "x": 0,
- "y": 7
+ "w": 3,
+ "x": 10,
+ "y": 6
},
"id": 11,
"options": {
@@ -346,11 +284,11 @@
"textMode": "value",
"wideLayout": true
},
- "pluginVersion": "11.4.0",
+ "pluginVersion": "12.0.1",
"targets": [
{
"editorMode": "code",
- "expr": "increase(hmac_file_server_uploads_total[1h])",
+ "expr": "increase(uploads_total[1h]) ",
"format": "table",
"legendFormat": "Uploads",
"range": true,
@@ -372,8 +310,162 @@
"mode": "absolute",
"steps": [
{
- "color": "green",
- "value": null
+ "color": "green"
+ }
+ ]
+ }
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 7,
+ "w": 3,
+ "x": 13,
+ "y": 6
+ },
+ "id": 17,
+ "options": {
+ "colorMode": "value",
+ "graphMode": "area",
+ "justifyMode": "auto",
+ "orientation": "auto",
+ "percentChangeColorMode": "standard",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "showPercentChange": false,
+ "textMode": "auto",
+ "wideLayout": true
+ },
+ "pluginVersion": "12.0.1",
+ "targets": [
+ {
+ "editorMode": "code",
+ "expr": "goroutines_total",
+ "format": "table",
+ "legendFormat": "Download Errors",
+ "range": true,
+ "refId": "A"
+ }
+ ],
+ "title": "HMAC GoRoutines",
+ "type": "stat"
+ },
+ {
+ "datasource": {
+ "default": true,
+ "type": "prometheus"
+ },
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "palette-classic"
+ },
+ "custom": {
+ "axisBorderShow": false,
+ "axisCenteredZero": false,
+ "axisColorMode": "text",
+ "axisLabel": "",
+ "axisPlacement": "auto",
+ "barAlignment": 0,
+ "barWidthFactor": 0.6,
+ "drawStyle": "line",
+ "fillOpacity": 0,
+ "gradientMode": "none",
+ "hideFrom": {
+ "legend": false,
+ "tooltip": false,
+ "viz": false
+ },
+ "insertNulls": false,
+ "lineInterpolation": "linear",
+ "lineWidth": 1,
+ "pointSize": 5,
+ "scaleDistribution": {
+ "type": "linear"
+ },
+ "showPoints": "auto",
+ "spanNulls": false,
+ "stacking": {
+ "group": "A",
+ "mode": "none"
+ },
+ "thresholdsStyle": {
+ "mode": "off"
+ }
+ },
+ "fieldMinMax": false,
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green"
+ },
+ {
+ "color": "red",
+ "value": 80
+ }
+ ]
+ },
+ "unit": "files"
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 7,
+ "w": 8,
+ "x": 16,
+ "y": 6
+ },
+ "id": 23,
+ "options": {
+ "legend": {
+ "calcs": [],
+ "displayMode": "list",
+ "placement": "bottom",
+ "showLegend": true
+ },
+ "tooltip": {
+ "hideZeros": false,
+ "mode": "single",
+ "sort": "none"
+ }
+ },
+ "pluginVersion": "12.0.1",
+ "targets": [
+ {
+ "editorMode": "code",
+ "exemplar": false,
+ "expr": "deduplication_errors_total",
+ "format": "time_series",
+ "instant": true,
+ "interval": "",
+ "legendFormat": "__auto",
+ "range": true,
+ "refId": "A"
+ }
+ ],
+ "title": "HMAC Duplication Error",
+ "type": "timeseries"
+ },
+ {
+ "datasource": {
+ "default": true,
+ "type": "prometheus"
+ },
+ "fieldConfig": {
+ "defaults": {
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green"
},
{
"color": "red",
@@ -387,9 +479,9 @@
},
"gridPos": {
"h": 7,
- "w": 5,
- "x": 5,
- "y": 7
+ "w": 4,
+ "x": 0,
+ "y": 13
},
"id": 12,
"options": {
@@ -409,88 +501,17 @@
"textMode": "value",
"wideLayout": true
},
- "pluginVersion": "11.4.0",
+ "pluginVersion": "12.0.1",
"targets": [
{
"editorMode": "code",
- "expr": "hmac_file_server_downloads_total",
+ "expr": "increase(downloads_total[48h])",
"legendFormat": "Downloads",
"range": true,
"refId": "A"
}
],
- "title": "HMAC Downloads",
- "type": "stat"
- },
- {
- "datasource": {
- "default": true,
- "type": "prometheus"
- },
- "fieldConfig": {
- "defaults": {
- "color": {
- "mode": "thresholds"
- },
- "mappings": [],
- "thresholds": {
- "mode": "absolute",
- "steps": [
- {
- "color": "green",
- "value": null
- },
- {
- "color": "red",
- "value": 80
- }
- ]
- },
- "unit": "s"
- },
- "overrides": []
- },
- "gridPos": {
- "h": 7,
- "w": 3,
- "x": 10,
- "y": 7
- },
- "id": 15,
- "options": {
- "colorMode": "value",
- "graphMode": "area",
- "justifyMode": "auto",
- "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": "bduehd5vqv1moa"
- },
- "editorMode": "code",
- "expr": "hmac_file_server_upload_duration_seconds_sum + hmac_file_server_download_duration_seconds_sum",
- "hide": false,
- "instant": false,
- "legendFormat": "__auto",
- "range": true,
- "refId": "B"
- }
- ],
- "title": "HMAC Up/Down Duration",
+ "title": "HMAC Downloads (48Hrs)",
"type": "stat"
},
{
@@ -505,25 +526,25 @@
"mode": "absolute",
"steps": [
{
- "color": "green",
- "value": null
+ "color": "green"
},
{
"color": "red",
"value": 80
}
]
- }
+ },
+ "unit": "short"
},
"overrides": []
},
"gridPos": {
"h": 7,
- "w": 3,
- "x": 13,
- "y": 7
+ "w": 4,
+ "x": 4,
+ "y": 13
},
- "id": 13,
+ "id": 24,
"options": {
"colorMode": "value",
"graphMode": "area",
@@ -538,20 +559,20 @@
"values": false
},
"showPercentChange": false,
- "textMode": "auto",
+ "textMode": "value",
"wideLayout": true
},
- "pluginVersion": "11.4.0",
+ "pluginVersion": "12.0.1",
"targets": [
{
"editorMode": "code",
- "expr": "hmac_file_server_download_errors_total",
- "legendFormat": "Download Errors",
+ "expr": "increase(uploads_total[48h]) ",
+ "legendFormat": "Downloads",
"range": true,
"refId": "A"
}
],
- "title": "HMAC Download Errors",
+ "title": "HMAC Uploads (48Hrs)",
"type": "stat"
},
{
@@ -566,8 +587,7 @@
"mode": "absolute",
"steps": [
{
- "color": "green",
- "value": null
+ "color": "green"
},
{
"color": "red",
@@ -580,9 +600,9 @@
},
"gridPos": {
"h": 7,
- "w": 3,
- "x": 16,
- "y": 7
+ "w": 4,
+ "x": 8,
+ "y": 13
},
"id": 2,
"options": {
@@ -602,11 +622,11 @@
"textMode": "auto",
"wideLayout": true
},
- "pluginVersion": "11.4.0",
+ "pluginVersion": "12.0.1",
"targets": [
{
"editorMode": "code",
- "expr": "hmac_file_server_upload_errors_total",
+ "expr": "increase(upload_errors_total[48h])",
"legendFormat": "Upload Errors",
"range": true,
"refId": "A"
@@ -622,13 +642,16 @@
},
"fieldConfig": {
"defaults": {
+ "color": {
+ "mode": "thresholds"
+ },
+ "fieldMinMax": false,
"mappings": [],
"thresholds": {
"mode": "absolute",
"steps": [
{
- "color": "green",
- "value": null
+ "color": "green"
},
{
"color": "red",
@@ -641,72 +664,11 @@
},
"gridPos": {
"h": 7,
- "w": 5,
- "x": 19,
- "y": 7
+ "w": 4,
+ "x": 12,
+ "y": 13
},
- "id": 21,
- "options": {
- "colorMode": "value",
- "graphMode": "none",
- "justifyMode": "auto",
- "orientation": "auto",
- "percentChangeColorMode": "standard",
- "reduceOptions": {
- "calcs": [
- "lastNotNull"
- ],
- "fields": "",
- "values": false
- },
- "showPercentChange": false,
- "textMode": "value",
- "wideLayout": true
- },
- "pluginVersion": "11.4.0",
- "targets": [
- {
- "editorMode": "code",
- "expr": "hm",
- "format": "table",
- "legendFormat": "__auto",
- "range": true,
- "refId": "A"
- }
- ],
- "title": "HMAC FileTTL Deletion(s)",
- "type": "stat"
- },
- {
- "datasource": {
- "default": true,
- "type": "prometheus"
- },
- "fieldConfig": {
- "defaults": {
- "color": {
- "mode": "thresholds"
- },
- "mappings": [],
- "thresholds": {
- "mode": "absolute",
- "steps": [
- {
- "color": "green",
- "value": null
- }
- ]
- }
- },
- "overrides": []
- },
- "gridPos": {
- "h": 7,
- "w": 3,
- "x": 0,
- "y": 14
- },
- "id": 19,
+ "id": 22,
"options": {
"colorMode": "value",
"graphMode": "area",
@@ -724,18 +686,21 @@
"textMode": "auto",
"wideLayout": true
},
- "pluginVersion": "11.4.0",
+ "pluginVersion": "12.0.1",
"targets": [
{
"editorMode": "code",
- "expr": "hmac_infected_files_total",
- "format": "table",
+ "exemplar": false,
+ "expr": "active_connections_total",
+ "format": "time_series",
+ "instant": false,
+ "interval": "",
"legendFormat": "__auto",
"range": true,
"refId": "A"
}
],
- "title": "HMAC infected file(s)",
+ "title": "HMAC Active Connection(s)",
"type": "stat"
},
{
@@ -745,188 +710,12 @@
},
"fieldConfig": {
"defaults": {
- "color": {
- "mode": "palette-classic"
- },
- "custom": {
- "fillOpacity": 80,
- "gradientMode": "none",
- "hideFrom": {
- "legend": false,
- "tooltip": false,
- "viz": false
- },
- "lineWidth": 1,
- "stacking": {
- "group": "A",
- "mode": "none"
- }
- },
- "fieldMinMax": false,
"mappings": [],
"thresholds": {
"mode": "absolute",
"steps": [
{
- "color": "green",
- "value": null
- },
- {
- "color": "red",
- "value": 80
- }
- ]
- },
- "unit": "files"
- },
- "overrides": []
- },
- "gridPos": {
- "h": 7,
- "w": 7,
- "x": 3,
- "y": 14
- },
- "id": 22,
- "options": {
- "legend": {
- "calcs": [],
- "displayMode": "list",
- "placement": "bottom",
- "showLegend": true
- },
- "tooltip": {
- "mode": "single",
- "sort": "none"
- }
- },
- "pluginVersion": "11.4.0",
- "targets": [
- {
- "editorMode": "code",
- "exemplar": false,
- "expr": "increase(hmac_file_server_clamav_scans_total[24h])",
- "format": "time_series",
- "instant": true,
- "interval": "",
- "legendFormat": "__auto",
- "range": true,
- "refId": "A"
- }
- ],
- "title": "HMAC ClamAV San (24h)",
- "type": "histogram"
- },
- {
- "datasource": {
- "default": true,
- "type": "prometheus"
- },
- "fieldConfig": {
- "defaults": {
- "color": {
- "mode": "palette-classic"
- },
- "custom": {
- "fillOpacity": 80,
- "gradientMode": "none",
- "hideFrom": {
- "legend": false,
- "tooltip": false,
- "viz": false
- },
- "lineWidth": 1,
- "stacking": {
- "group": "A",
- "mode": "none"
- }
- },
- "fieldMinMax": false,
- "mappings": [],
- "thresholds": {
- "mode": "absolute",
- "steps": [
- {
- "color": "green",
- "value": null
- },
- {
- "color": "red",
- "value": 80
- }
- ]
- },
- "unit": "files"
- },
- "overrides": []
- },
- "gridPos": {
- "h": 7,
- "w": 7,
- "x": 10,
- "y": 14
- },
- "id": 23,
- "options": {
- "legend": {
- "calcs": [],
- "displayMode": "list",
- "placement": "bottom",
- "showLegend": true
- },
- "tooltip": {
- "mode": "single",
- "sort": "none"
- }
- },
- "pluginVersion": "11.4.0",
- "targets": [
- {
- "editorMode": "code",
- "exemplar": false,
- "expr": "increase(hmac_file_server_clamav_errors_total[24h])",
- "format": "time_series",
- "instant": true,
- "interval": "",
- "legendFormat": "__auto",
- "range": true,
- "refId": "A"
- }
- ],
- "title": "HMAC ClamAV SanError(s) (24h)",
- "type": "histogram"
- },
- {
- "datasource": {
- "default": true,
- "type": "prometheus"
- },
- "fieldConfig": {
- "defaults": {
- "color": {
- "mode": "palette-classic"
- },
- "custom": {
- "fillOpacity": 80,
- "gradientMode": "none",
- "hideFrom": {
- "legend": false,
- "tooltip": false,
- "viz": false
- },
- "lineWidth": 1,
- "stacking": {
- "group": "A",
- "mode": "none"
- }
- },
- "mappings": [],
- "thresholds": {
- "mode": "absolute",
- "steps": [
- {
- "color": "green",
- "value": null
+ "color": "green"
},
{
"color": "red",
@@ -939,55 +728,137 @@
},
"gridPos": {
"h": 7,
- "w": 7,
- "x": 17,
- "y": 14
+ "w": 4,
+ "x": 16,
+ "y": 13
},
- "id": 16,
+ "id": 13,
"options": {
- "legend": {
- "calcs": [],
- "displayMode": "list",
- "placement": "bottom",
- "showLegend": true
+ "colorMode": "value",
+ "graphMode": "area",
+ "justifyMode": "auto",
+ "orientation": "auto",
+ "percentChangeColorMode": "standard",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
},
- "tooltip": {
- "mode": "single",
- "sort": "none"
- }
+ "showPercentChange": false,
+ "textMode": "auto",
+ "wideLayout": true
},
- "pluginVersion": "11.4.0",
+ "pluginVersion": "12.0.1",
"targets": [
{
"editorMode": "code",
- "exemplar": false,
- "expr": "histogram_quantile(0.95, sum(rate(hmac_file_server_request_duration_seconds_bucket[5m])) by (le))",
- "format": "time_series",
- "instant": true,
- "interval": "",
- "legendFormat": "__auto",
+ "expr": "increase(download_errors_total[48h])",
+ "legendFormat": "Download Errors",
"range": true,
"refId": "A"
}
],
- "title": "HMAC Request Duration",
- "type": "histogram"
+ "title": "HMAC Download Errors",
+ "type": "stat"
+ },
+ {
+ "datasource": {
+ "default": true,
+ "type": "prometheus"
+ },
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "thresholds"
+ },
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green"
+ },
+ {
+ "color": "red",
+ "value": 80
+ }
+ ]
+ },
+ "unit": "s"
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 7,
+ "w": 4,
+ "x": 20,
+ "y": 13
+ },
+ "id": 15,
+ "options": {
+ "colorMode": "value",
+ "graphMode": "area",
+ "justifyMode": "auto",
+ "orientation": "auto",
+ "percentChangeColorMode": "standard",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "showPercentChange": false,
+ "textMode": "auto",
+ "wideLayout": true
+ },
+ "pluginVersion": "12.0.1",
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "bduehd5vqv1moa"
+ },
+ "editorMode": "code",
+ "expr": "upload_duration_seconds_sum + download_duration_seconds_sum",
+ "hide": false,
+ "instant": false,
+ "legendFormat": "__auto",
+ "range": true,
+ "refId": "B"
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "bduehd5vqv1moa"
+ },
+ "expr": "",
+ "hide": false,
+ "instant": false,
+ "range": true,
+ "refId": "A"
+ }
+ ],
+ "title": "HMAC Up/Down Duration",
+ "type": "stat"
}
],
"preload": false,
- "schemaVersion": 40,
+ "refresh": "10s",
+ "schemaVersion": 41,
"tags": [],
"templating": {
"list": []
},
"time": {
- "from": "now-24h",
+ "from": "now-5m",
"to": "now"
},
"timepicker": {},
"timezone": "",
"title": "HMAC File Server Metrics",
"uid": "de0ye5t0hzq4ge",
- "version": 153,
- "weekStart": ""
+ "version": 170
}