diff --git a/docs/files/grafana-dashboard.json b/docs/files/grafana-dashboard.json index 563e94b9f4..cb28951f05 100644 --- a/docs/files/grafana-dashboard.json +++ b/docs/files/grafana-dashboard.json @@ -21,7 +21,7 @@ "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "9.3.1" + "version": "9.5.2" }, { "type": "datasource", @@ -129,7 +129,7 @@ }, "textMode": "auto" }, - "pluginVersion": "9.3.1", + "pluginVersion": "9.5.2", "targets": [ { "datasource": { @@ -195,7 +195,7 @@ "showThresholdLabels": false, "showThresholdMarkers": true }, - "pluginVersion": "9.3.1", + "pluginVersion": "9.5.2", "targets": [ { "datasource": { @@ -240,7 +240,7 @@ } ] }, - "unit": "bytes" + "unit": "percentunit" }, "overrides": [] }, @@ -250,12 +250,12 @@ "x": 11, "y": 1 }, - "id": 45, + "id": 24, "links": [], "maxDataPoints": 100, "options": { "colorMode": "value", - "graphMode": "none", + "graphMode": "area", "justifyMode": "auto", "orientation": "horizontal", "reduceOptions": { @@ -267,7 +267,7 @@ }, "textMode": "auto" }, - "pluginVersion": "9.3.1", + "pluginVersion": "9.5.2", "targets": [ { "datasource": { @@ -275,7 +275,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(jvm_memory_max_bytes{instance=\"$instance\", area=\"heap\"})", + "expr": "sum(jvm_memory_used_bytes{instance=\"$instance\", area=\"heap\"}) / sum(jvm_memory_max_bytes{instance=\"$instance\", area=\"heap\"})", "format": "time_series", "intervalFactor": 2, "legendFormat": "", @@ -284,7 +284,7 @@ "step": 14400 } ], - "title": "Total Heap Size", + "title": "Current Heap Usage", "type": "stat" }, { @@ -331,18 +331,20 @@ }, "textMode": "auto" }, - "pluginVersion": "9.3.1", + "pluginVersion": "9.5.2", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(increase(alpine_events_published_total{instance=\"$instance\"}[$__rate_interval]))", + "editorMode": "code", + "expr": "sum(rate(alpine_events_published_total{instance=\"$instance\"}[1m]))", + "range": true, "refId": "A" } ], - "title": "Total Published Events", + "title": "Avg. Events Published", "type": "stat" }, { @@ -389,18 +391,20 @@ }, "textMode": "auto" }, - "pluginVersion": "9.3.1", + "pluginVersion": "9.5.2", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "expr": "sum(increase(alpine_notifications_published_total{instance=\"$instance\"}[$__rate_interval]))", + "editorMode": "code", + "expr": "sum(rate(alpine_notifications_published_total{instance=\"$instance\"}[1m]))", + "range": true, "refId": "A" } ], - "title": "Total Published Notifications", + "title": "Avg. Notifications Published", "type": "stat" }, { @@ -447,7 +451,7 @@ }, "textMode": "name" }, - "pluginVersion": "9.3.1", + "pluginVersion": "9.5.2", "targets": [ { "datasource": { @@ -495,7 +499,7 @@ } ] }, - "unit": "bytes" + "unit": "percentunit" }, "overrides": [] }, @@ -505,7 +509,7 @@ "x": 11, "y": 4 }, - "id": 24, + "id": 45, "links": [], "maxDataPoints": 100, "options": { @@ -522,7 +526,7 @@ }, "textMode": "auto" }, - "pluginVersion": "9.3.1", + "pluginVersion": "9.5.2", "targets": [ { "datasource": { @@ -530,7 +534,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(jvm_memory_used_bytes{instance=\"$instance\", area=\"heap\"})", + "expr": "sum(jvm_memory_used_bytes{instance=\"$instance\", area=\"nonheap\"}) / sum(jvm_memory_max_bytes{instance=\"$instance\", area=\"nonheap\"})", "format": "time_series", "intervalFactor": 2, "legendFormat": "", @@ -539,7 +543,7 @@ "step": 14400 } ], - "title": "Current Heap Usage", + "title": "Current Non-Heap Usage", "type": "stat" }, { @@ -596,27 +600,30 @@ } }, "mappings": [], - "max": 1, "thresholds": { "mode": "absolute", "steps": [ { "color": "green", "value": null + }, + { + "color": "red", + "value": 80 } ] }, - "unit": "percentunit" + "unit": "decbytes" }, "overrides": [] }, "gridPos": { - "h": 8, + "h": 9, "w": 12, "x": 0, "y": 8 }, - "id": 34, + "id": 75, "options": { "legend": { "calcs": [ @@ -640,8 +647,8 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "process_cpu_usage{instance=\"$instance\"}", - "legendFormat": "Process", + "expr": "jvm_memory_used_bytes{instance=\"$instance\",area=\"heap\"} > 0", + "legendFormat": "{{id}}", "range": true, "refId": "A" }, @@ -651,14 +658,44 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "system_cpu_usage{instance=\"$instance\"}", + "expr": "sum(jvm_memory_used_bytes{instance=\"$instance\",area=\"heap\"}) > 0", "hide": false, - "legendFormat": "System", + "legendFormat": "Total", "range": true, "refId": "B" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "sum(jvm_memory_max_bytes{instance=\"$instance\",area=\"heap\"})", + "hide": false, + "legendFormat": "__auto", + "range": true, + "refId": "C" + } + ], + "title": "Heap Usage", + "transformations": [ + { + "id": "configFromData", + "options": { + "configRefId": "C", + "mappings": [ + { + "fieldName": "sum(jvm_memory_max_bytes{instance=\"172.20.0.5:8080\",area=\"heap\"})", + "handlerKey": "max" + }, + { + "fieldName": "Time", + "handlerKey": "__ignore" + } + ] + } } ], - "title": "CPU Usage", "type": "timeseries" }, { @@ -708,20 +745,24 @@ { "color": "green", "value": null + }, + { + "color": "red", + "value": 80 } ] }, - "unit": "bytes" + "unit": "decbytes" }, "overrides": [] }, "gridPos": { - "h": 8, + "h": 9, "w": 12, "x": 12, "y": 8 }, - "id": 36, + "id": 78, "options": { "legend": { "calcs": [ @@ -745,8 +786,8 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(jvm_memory_used_bytes{instance=\"$instance\", area=\"heap\"})", - "legendFormat": "Heap Usage", + "expr": "jvm_memory_used_bytes{instance=\"$instance\",area=\"nonheap\"} > 0", + "legendFormat": "{{id}}", "range": true, "refId": "A" }, @@ -756,9 +797,9 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(jvm_memory_used_bytes{instance=\"$instance\", area=\"nonheap\"})", + "expr": "sum(jvm_memory_used_bytes{instance=\"$instance\",area=\"nonheap\"}) > 0", "hide": false, - "legendFormat": "Non-Heap", + "legendFormat": "Total", "range": true, "refId": "B" }, @@ -768,14 +809,32 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(jvm_memory_max_bytes{instance=\"$instance\", area=\"heap\"})", + "expr": "sum(jvm_memory_max_bytes{instance=\"$instance\",area=\"nonheap\"})", "hide": false, - "legendFormat": "Heap Size", + "legendFormat": "__auto", "range": true, "refId": "C" } ], - "title": "Memory Usage", + "title": "Non-Heap Usage", + "transformations": [ + { + "id": "configFromData", + "options": { + "configRefId": "C", + "mappings": [ + { + "fieldName": "Time", + "handlerKey": "__ignore" + }, + { + "fieldName": "sum(jvm_memory_max_bytes{instance=\"172.20.0.5:8080\",area=\"nonheap\"})", + "handlerKey": "max" + } + ] + } + } + ], "type": "timeseries" }, { @@ -819,6 +878,7 @@ } }, "mappings": [], + "max": 1, "thresholds": { "mode": "absolute", "steps": [ @@ -827,15 +887,120 @@ "value": null } ] - } + }, + "unit": "percentunit" }, "overrides": [] }, "gridPos": { "h": 8, - "w": 12, + "w": 8, "x": 0, - "y": 16 + "y": 17 + }, + "id": 34, + "options": { + "legend": { + "calcs": [ + "lastNotNull", + "max", + "mean" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "multi", + "sort": "desc" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "process_cpu_usage{instance=\"$instance\"}", + "legendFormat": "Process", + "range": true, + "refId": "A" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "system_cpu_usage{instance=\"$instance\"}", + "hide": false, + "legendFormat": "System", + "range": true, + "refId": "B" + } + ], + "title": "CPU Usage", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 15, + "gradientMode": "opacity", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 8, + "x": 8, + "y": 17 }, "id": 26, "options": { @@ -936,9 +1101,9 @@ }, "gridPos": { "h": 8, - "w": 12, - "x": 12, - "y": 16 + "w": 8, + "x": 16, + "y": 17 }, "id": 28, "options": { @@ -972,24 +1137,12 @@ "title": "Thread States", "type": "timeseries" }, - { - "collapsed": false, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 24 - }, - "id": 49, - "panels": [], - "title": "Database", - "type": "row" - }, { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "description": "Average duration of garbage collection pauses caused by the JVM garbage collector.", "fieldConfig": { "defaults": { "color": { @@ -1001,7 +1154,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "line", + "drawStyle": "bars", "fillOpacity": 15, "gradientMode": "opacity", "hideFrom": { @@ -1038,7 +1191,8 @@ "value": 80 } ] - } + }, + "unit": "s" }, "overrides": [] }, @@ -1048,7 +1202,7 @@ "x": 0, "y": 25 }, - "id": 51, + "id": 59, "options": { "legend": { "calcs": [ @@ -1061,8 +1215,8 @@ "showLegend": true }, "tooltip": { - "mode": "multi", - "sort": "desc" + "mode": "single", + "sort": "none" } }, "targets": [ @@ -1072,49 +1226,13 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "hikaricp_connections{instance=\"$instance\",pool=\"transactional\"}", - "legendFormat": "Total", + "expr": "rate(jvm_gc_pause_seconds_sum{instance=\"$instance\"}[1m]) / rate(jvm_gc_pause_seconds_count{instance=\"$instance\"}[1m]) > 0", + "legendFormat": "{{action}} ({{cause}})", "range": true, "refId": "A" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "editorMode": "code", - "expr": "hikaricp_connections_active{instance=\"$instance\",pool=\"transactional\"}", - "hide": false, - "legendFormat": "Active", - "range": true, - "refId": "B" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "editorMode": "code", - "expr": "hikaricp_connections_idle{instance=\"$instance\",pool=\"transactional\"}", - "hide": false, - "legendFormat": "Idle", - "range": true, - "refId": "C" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "editorMode": "code", - "expr": "hikaricp_connections_pending{instance=\"$instance\",pool=\"transactional\"}", - "hide": false, - "legendFormat": "Pending", - "range": true, - "refId": "D" } ], - "title": "Database Connections: Transactional", + "title": "Average GC Pause Duration", "type": "timeseries" }, { @@ -1122,6 +1240,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "description": "Average amount of memory allocated by the JVM garbage collector.", "fieldConfig": { "defaults": { "color": { @@ -1170,17 +1289,1194 @@ "value": 80 } ] - } + }, + "unit": "decbytes" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 25 + }, + "id": 60, + "options": { + "legend": { + "calcs": [ + "lastNotNull", + "max", + "mean" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "rate(jvm_gc_memory_allocated_bytes_total{instance=\"$instance\"}[1m]) > 0", + "legendFormat": "{{instance}}", + "range": true, + "refId": "A" + } + ], + "title": "Average GC Memory Allocation", + "type": "timeseries" + }, + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 33 + }, + "id": 49, + "panels": [], + "title": "Database", + "type": "row" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "description": "Number of connections in the transactional connection pool.", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 15, + "gradientMode": "opacity", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 34 + }, + "id": 51, + "options": { + "legend": { + "calcs": [ + "lastNotNull", + "max", + "mean" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "multi", + "sort": "desc" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "hikaricp_connections{instance=\"$instance\",pool=\"transactional\"}", + "legendFormat": "Total", + "range": true, + "refId": "A" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "hikaricp_connections_active{instance=\"$instance\",pool=\"transactional\"}", + "hide": false, + "legendFormat": "Active", + "range": true, + "refId": "B" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "hikaricp_connections_idle{instance=\"$instance\",pool=\"transactional\"}", + "hide": false, + "legendFormat": "Idle", + "range": true, + "refId": "C" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "hikaricp_connections_pending{instance=\"$instance\",pool=\"transactional\"}", + "hide": false, + "legendFormat": "Pending", + "range": true, + "refId": "D" + } + ], + "title": "Database Connections: Transactional", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "description": "Number of connections in the non-transactional connection pool.", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 15, + "gradientMode": "opacity", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 34 + }, + "id": 52, + "options": { + "legend": { + "calcs": [ + "lastNotNull", + "max", + "mean" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "multi", + "sort": "desc" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "hikaricp_connections{instance=\"$instance\",pool=\"non-transactional\"}", + "legendFormat": "Total", + "range": true, + "refId": "A" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "hikaricp_connections_active{instance=\"$instance\",pool=\"non-transactional\"}", + "hide": false, + "legendFormat": "Active", + "range": true, + "refId": "B" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "hikaricp_connections_idle{instance=\"$instance\",pool=\"non-transactional\"}", + "hide": false, + "legendFormat": "Idle", + "range": true, + "refId": "C" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "hikaricp_connections_pending{instance=\"$instance\",pool=\"non-transactional\"}", + "hide": false, + "legendFormat": "Pending", + "range": true, + "refId": "D" + } + ], + "title": "Database Connections: Non-Transactional", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "description": "Average number of database operations per second.", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 15, + "gradientMode": "opacity", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "ops" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 8, + "x": 0, + "y": 42 + }, + "id": 54, + "options": { + "legend": { + "calcs": [ + "lastNotNull", + "max", + "mean" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "multi", + "sort": "desc" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "rate(datanucleus_datastore_writes_total{instance=\"$instance\"}[1m]) > 0", + "legendFormat": "Writes", + "range": true, + "refId": "A" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "rate(datanucleus_datastore_reads_total{instance=\"$instance\"}[1m]) > 0", + "hide": false, + "legendFormat": "Reads", + "range": true, + "refId": "B" + } + ], + "title": "Database Operations", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "description": "Average number of database queries per second.", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 15, + "gradientMode": "opacity", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "ops" + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "Failed" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "red", + "mode": "fixed" + } + } + ] + } + ] + }, + "gridPos": { + "h": 8, + "w": 8, + "x": 8, + "y": 42 + }, + "id": 56, + "options": { + "legend": { + "calcs": [ + "lastNotNull", + "max", + "mean" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "multi", + "sort": "desc" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "rate(datanucleus_queries_executed_total{instance=\"$instance\"}[1m]) > 0", + "legendFormat": "Total", + "range": true, + "refId": "A" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "rate(datanucleus_queries_failed_total{instance=\"$instance\"}[1m]) > 0", + "hide": false, + "legendFormat": "Failed", + "range": true, + "refId": "B" + } + ], + "title": "Database Queries", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "description": "Average number of database transactions per second.", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 15, + "gradientMode": "opacity", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "ops" + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "Rolled Back" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "red", + "mode": "fixed" + } + } + ] + } + ] + }, + "gridPos": { + "h": 8, + "w": 8, + "x": 16, + "y": 42 + }, + "id": 57, + "options": { + "legend": { + "calcs": [ + "lastNotNull", + "max", + "min" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "multi", + "sort": "desc" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "rate(datanucleus_transactions_total{instance=\"$instance\"}[1m]) > 0", + "legendFormat": "Total", + "range": true, + "refId": "A" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "rate(datanucleus_transactions_committed_total{instance=\"$instance\"}[1m]) > 0", + "hide": false, + "legendFormat": "Committed", + "range": true, + "refId": "B" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "rate(datanucleus_transactions_rolledback_total{instance=\"$instance\"}[1m]) > 0", + "hide": false, + "legendFormat": "Rolled Back", + "range": true, + "refId": "C" + } + ], + "title": "Database Transactions", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "description": "Average time it takes for a thread to acquire a connection from the database connection pool.", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 15, + "gradientMode": "opacity", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "s" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 8, + "x": 0, + "y": 50 + }, + "id": 62, + "options": { + "legend": { + "calcs": [ + "lastNotNull", + "max", + "mean" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "(rate(hikaricp_connections_acquire_seconds_sum{instance=\"$instance\"}[1m]) / rate(hikaricp_connections_acquire_seconds_count{instance=\"$instance\"}[1m])) > 0", + "legendFormat": "{{pool}}", + "range": true, + "refId": "A" + } + ], + "title": "Average Connection Acquisition Duration", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "description": "Average time of connections being used before being returned to the connection pool.", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 15, + "gradientMode": "opacity", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "s" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 8, + "x": 8, + "y": 50 + }, + "id": 76, + "options": { + "legend": { + "calcs": [ + "lastNotNull", + "max", + "mean" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "(rate(hikaricp_connections_usage_seconds_sum{instance=\"$instance\"}[1m]) / rate(hikaricp_connections_usage_seconds_count{instance=\"$instance\"}[1m])) > 0", + "legendFormat": "{{pool}}", + "range": true, + "refId": "A" + } + ], + "title": "Average Connection Usage Duration", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "description": "Average time it takes to create a new database connection.", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 15, + "gradientMode": "opacity", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "s" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 8, + "x": 16, + "y": 50 + }, + "id": 74, + "options": { + "legend": { + "calcs": [ + "lastNotNull", + "max", + "mean" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "(rate(hikaricp_connections_creation_seconds_sum{instance=\"$instance\"}[1m]) / rate(hikaricp_connections_creation_seconds_count{instance=\"$instance\"}[1m])) > 0", + "legendFormat": "{{pool}}", + "range": true, + "refId": "A" + } + ], + "title": "Average Connection Creation Duration", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "description": "Total number of entries in the caches used by the object relational mapper (ORM).", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 15, + "gradientMode": "opacity", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "none" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 58 + }, + "id": 63, + "options": { + "legend": { + "calcs": [ + "lastNotNull", + "max", + "mean" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "datanucleus_cache_second_level_entries{instance=\"$instance\"}", + "legendFormat": "L2", + "range": true, + "refId": "A" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "datanucleus_cache_query_generic_compilation_entries{instance=\"$instance\"}", + "hide": false, + "legendFormat": "Generic Query Compilation", + "range": true, + "refId": "B" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "datanucleus_cache_query_datastore_compilation_entries{instance=\"$instance\"}", + "hide": false, + "legendFormat": "Datastore Query Compilation", + "range": true, + "refId": "C" + } + ], + "title": "ORM Cache Entries", + "type": "timeseries" + }, + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 66 + }, + "id": 10, + "panels": [], + "title": "Event System", + "type": "row" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "description": "Number of events processed per second.", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 15, + "gradientMode": "opacity", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "unit": "ops" }, "overrides": [] }, "gridPos": { "h": 8, - "w": 12, - "x": 12, - "y": 25 + "w": 8, + "x": 0, + "y": 67 }, - "id": 52, + "id": 6, "options": { "legend": { "calcs": [ @@ -1204,8 +2500,8 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "hikaricp_connections{instance=\"$instance\",pool=\"non-transactional\"}", - "legendFormat": "Total", + "expr": "rate(executor_completed_tasks_total{instance=\"$instance\", name=\"Alpine-EventService\"}[1m]) > 0", + "legendFormat": "{{name}}", "range": true, "refId": "A" }, @@ -1215,38 +2511,14 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "hikaricp_connections_active{instance=\"$instance\",pool=\"non-transactional\"}", + "expr": "rate(executor_completed_tasks_total{instance=\"$instance\", name=\"Alpine-SingleThreadedEventService\"}[1m]) > 0", "hide": false, - "legendFormat": "Active", + "legendFormat": "{{name}}", "range": true, "refId": "B" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "editorMode": "code", - "expr": "hikaricp_connections_idle{instance=\"$instance\",pool=\"non-transactional\"}", - "hide": false, - "legendFormat": "Idle", - "range": true, - "refId": "C" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "editorMode": "code", - "expr": "hikaricp_connections_pending{instance=\"$instance\",pool=\"non-transactional\"}", - "hide": false, - "legendFormat": "Pending", - "range": true, - "refId": "D" } ], - "title": "Database Connections: Non-Transactional", + "title": "Events Processed", "type": "timeseries" }, { @@ -1254,6 +2526,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "description": "Total number of events queued for processing.", "fieldConfig": { "defaults": { "color": { @@ -1265,7 +2538,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "line", + "drawStyle": "bars", "fillOpacity": 15, "gradientMode": "opacity", "hideFrom": { @@ -1296,10 +2569,6 @@ { "color": "green", "value": null - }, - { - "color": "red", - "value": 80 } ] } @@ -1309,10 +2578,10 @@ "gridPos": { "h": 8, "w": 8, - "x": 0, - "y": 33 + "x": 8, + "y": 67 }, - "id": 54, + "id": 4, "options": { "legend": { "calcs": [ @@ -1336,8 +2605,8 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "increase(datanucleus_datastore_writes_total{instance=\"$instance\"}[$__rate_interval])", - "legendFormat": "Writes", + "expr": "executor_queued_tasks{instance=\"$instance\", name=\"Alpine-EventService\"} > 0", + "legendFormat": "{{name}}", "range": true, "refId": "A" }, @@ -1347,14 +2616,14 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "increase(datanucleus_datastore_reads_total{instance=\"$instance\"}[$__rate_interval])", + "expr": "executor_queued_tasks{instance=\"$instance\", name=\"Alpine-SingleThreadedEventService\"} > 0", "hide": false, - "legendFormat": "Reads", + "legendFormat": "{{name}}", "range": true, "refId": "B" } ], - "title": "Database Operations", + "title": "Events Queued", "type": "timeseries" }, { @@ -1362,6 +2631,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "description": "Number of active threads per worker pool.", "fieldConfig": { "defaults": { "color": { @@ -1373,7 +2643,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "line", + "drawStyle": "bars", "fillOpacity": 15, "gradientMode": "opacity", "hideFrom": { @@ -1412,31 +2682,15 @@ ] } }, - "overrides": [ - { - "matcher": { - "id": "byName", - "options": "Failed" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "red", - "mode": "fixed" - } - } - ] - } - ] + "overrides": [] }, "gridPos": { "h": 8, "w": 8, - "x": 8, - "y": 33 + "x": 16, + "y": 67 }, - "id": 56, + "id": 30, "options": { "legend": { "calcs": [ @@ -1460,8 +2714,8 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "increase(datanucleus_queries_executed_total{instance=\"$instance\"}[$__rate_interval])", - "legendFormat": "Total", + "expr": "executor_active_threads{instance=\"$instance\", name=\"Alpine-EventService\"} > 0", + "legendFormat": "{{name}}", "range": true, "refId": "A" }, @@ -1471,14 +2725,14 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "increase(datanucleus_queries_failed_total{instance=\"$instance\"}[$__rate_interval])", + "expr": "executor_active_threads{instance=\"$instance\", name=\"Alpine-SingleThreadedEventService\"} > 0", "hide": false, - "legendFormat": "Failed", + "legendFormat": "{{name}}", "range": true, "refId": "B" } ], - "title": "Database Queries", + "title": "Active Worker Threads", "type": "timeseries" }, { @@ -1486,6 +2740,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "description": "Average number of events published per second.", "fieldConfig": { "defaults": { "color": { @@ -1534,43 +2789,30 @@ "value": 80 } ] - } + }, + "unit": "ops" }, - "overrides": [ - { - "matcher": { - "id": "byName", - "options": "Rolled Back" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "red", - "mode": "fixed" - } - } - ] - } - ] + "overrides": [] }, "gridPos": { - "h": 8, - "w": 8, - "x": 16, - "y": 33 + "h": 10, + "w": 24, + "x": 0, + "y": 75 }, - "id": 57, + "id": 2, "options": { "legend": { "calcs": [ "lastNotNull", "max", - "min" + "mean" ], - "displayMode": "list", - "placement": "bottom", - "showLegend": true + "displayMode": "table", + "placement": "right", + "showLegend": true, + "sortBy": "Total", + "sortDesc": true }, "tooltip": { "mode": "multi", @@ -1584,37 +2826,13 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "increase(datanucleus_transactions_total{instance=\"$instance\"}[$__rate_interval])", - "legendFormat": "Total", + "expr": "rate(alpine_events_published_total{instance=\"$instance\"}[1m]) > 0", + "legendFormat": "{{event}}", "range": true, "refId": "A" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "editorMode": "code", - "expr": "increase(datanucleus_transactions_committed_total{instance=\"$instance\"}[$__rate_interval])", - "hide": false, - "legendFormat": "Committed", - "range": true, - "refId": "B" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "editorMode": "code", - "expr": "increase(datanucleus_transactions_rolledback_total{instance=\"$instance\"}[$__rate_interval])", - "hide": false, - "legendFormat": "Rolled Back", - "range": true, - "refId": "C" } ], - "title": "Database Transactions", + "title": "Events Published", "type": "timeseries" }, { @@ -1623,15 +2841,16 @@ "h": 1, "w": 24, "x": 0, - "y": 41 + "y": 85 }, - "id": 10, + "id": 12, "panels": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "description": "Number of notifications processed per second.", "fieldConfig": { "defaults": { "color": { @@ -1672,10 +2891,16 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 } ] - } + }, + "unit": "ops" }, "overrides": [] }, @@ -1683,14 +2908,14 @@ "h": 8, "w": 8, "x": 0, - "y": 12 + "y": 93 }, - "id": 6, + "id": 42, "options": { "legend": { "calcs": [ "lastNotNull", - "max", + "sum", "mean" ], "displayMode": "list", @@ -1709,25 +2934,13 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "increase(executor_completed_tasks_total{instance=\"$instance\", name=\"Alpine-EventService\"}[$__rate_interval])", + "expr": "rate(executor_completed_tasks_total{instance=\"$instance\", name=\"Alpine-NotificationService\"}[1m]) > 0", "legendFormat": "{{name}}", "range": true, "refId": "A" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "editorMode": "code", - "expr": "increase(executor_completed_tasks_total{instance=\"$instance\", name=\"Alpine-SingleThreadedEventService\"}[$__rate_interval])", - "hide": false, - "legendFormat": "{{name}}", - "range": true, - "refId": "B" } ], - "title": "Events Processed", + "title": "Notifications Processed", "type": "timeseries" }, { @@ -1735,6 +2948,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "description": "Total number of notifications queued for processing.", "fieldConfig": { "defaults": { "color": { @@ -1746,7 +2960,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "line", + "drawStyle": "bars", "fillOpacity": 15, "gradientMode": "opacity", "hideFrom": { @@ -1775,7 +2989,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] } @@ -1786,9 +3001,9 @@ "h": 8, "w": 8, "x": 8, - "y": 12 + "y": 93 }, - "id": 4, + "id": 43, "options": { "legend": { "calcs": [ @@ -1812,25 +3027,13 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "executor_queued_tasks{instance=\"$instance\", name=\"Alpine-EventService\"}", + "expr": "executor_queued_tasks{instance=\"$instance\", name=\"Alpine-NotificationService\"} > 0", "legendFormat": "{{name}}", "range": true, "refId": "A" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "editorMode": "code", - "expr": "executor_queued_tasks{instance=\"$instance\", name=\"Alpine-SingleThreadedEventService\"}", - "hide": false, - "legendFormat": "{{name}}", - "range": true, - "refId": "B" } ], - "title": "Events Queued", + "title": "Notifications Queued", "type": "timeseries" }, { @@ -1838,6 +3041,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "description": "Number of active threads per worker pool.", "fieldConfig": { "defaults": { "color": { @@ -1849,7 +3053,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "line", + "drawStyle": "bars", "fillOpacity": 15, "gradientMode": "opacity", "hideFrom": { @@ -1878,7 +3082,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1893,9 +3098,9 @@ "h": 8, "w": 8, "x": 16, - "y": 12 + "y": 93 }, - "id": 30, + "id": 44, "options": { "legend": { "calcs": [ @@ -1919,22 +3124,10 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "executor_active_threads{instance=\"$instance\", name=\"Alpine-EventService\"}", + "expr": "executor_active_threads{instance=\"$instance\", name=\"Alpine-NotificationService\"} > 0", "legendFormat": "{{name}}", "range": true, "refId": "A" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "editorMode": "code", - "expr": "executor_active_threads{instance=\"$instance\", name=\"Alpine-SingleThreadedEventService\"}", - "hide": false, - "legendFormat": "{{name}}", - "range": true, - "refId": "B" } ], "title": "Active Worker Threads", @@ -1945,7 +3138,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "description": "", + "description": "Average number of events published per second. Note that this includes ALL notifications, even those for which no alert was configured.", "fieldConfig": { "defaults": { "color": { @@ -1966,6 +3159,9 @@ "viz": false }, "lineInterpolation": "linear", + "lineStyle": { + "fill": "solid" + }, "lineWidth": 1, "pointSize": 5, "scaleDistribution": { @@ -1986,14 +3182,16 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", "value": 80 } ] - } + }, + "unit": "ops" }, "overrides": [] }, @@ -2001,14 +3199,14 @@ "h": 10, "w": 24, "x": 0, - "y": 20 + "y": 101 }, - "id": 2, + "id": 8, "options": { "legend": { "calcs": [ "lastNotNull", - "sum", + "max", "mean" ], "displayMode": "table", @@ -2029,17 +3227,17 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "increase(alpine_events_published_total{instance=\"$instance\"}[$__rate_interval])", - "legendFormat": "{{event}}", + "expr": "rate(alpine_notifications_published_total{instance=\"$instance\"}[1m]) > 0", + "legendFormat": "{{group}}", "range": true, "refId": "A" } ], - "title": "Events Published", + "title": "Notifications Published", "type": "timeseries" } ], - "title": "Event System", + "title": "Notifications", "type": "row" }, { @@ -2048,15 +3246,16 @@ "h": 1, "w": 24, "x": 0, - "y": 42 + "y": 86 }, - "id": 12, + "id": 67, "panels": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "description": "Average time taken to analyze the repository metadata for all components in a project.", "fieldConfig": { "defaults": { "color": { @@ -2104,22 +3303,23 @@ "value": 80 } ] - } + }, + "unit": "s" }, "overrides": [] }, "gridPos": { "h": 8, - "w": 8, + "w": 12, "x": 0, - "y": 35 + "y": 84 }, - "id": 42, + "id": 65, "options": { "legend": { "calcs": [ "lastNotNull", - "sum", + "max", "mean" ], "displayMode": "list", @@ -2127,8 +3327,8 @@ "showLegend": true }, "tooltip": { - "mode": "multi", - "sort": "desc" + "mode": "single", + "sort": "none" } }, "targets": [ @@ -2138,13 +3338,13 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "increase(executor_completed_tasks_total{instance=\"$instance\", name=\"Alpine-NotificationService\"}[$__rate_interval])", - "legendFormat": "{{name}}", + "expr": "(rate(repository_meta_analyzer_task_seconds_sum{instance=\"$instance\"}[1m]) / rate(repository_meta_analyzer_task_seconds_count{instance=\"$instance\"}[1m])) > 0", + "legendFormat": "{{instance}}", "range": true, "refId": "A" } ], - "title": "Notifications Processed", + "title": "Average Repository Metadata Analysis Duration", "type": "timeseries" }, { @@ -2152,6 +3352,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "description": "Average time taken to rebuild Lucene search indexes, per index type.", "fieldConfig": { "defaults": { "color": { @@ -2164,8 +3365,8 @@ "axisPlacement": "auto", "barAlignment": 0, "drawStyle": "line", - "fillOpacity": 15, - "gradientMode": "opacity", + "fillOpacity": 0, + "gradientMode": "none", "hideFrom": { "legend": false, "tooltip": false, @@ -2193,19 +3394,24 @@ "steps": [ { "color": "green" + }, + { + "color": "red", + "value": 80 } ] - } + }, + "unit": "s" }, "overrides": [] }, "gridPos": { "h": 8, - "w": 8, - "x": 8, - "y": 35 + "w": 12, + "x": 12, + "y": 84 }, - "id": 43, + "id": 69, "options": { "legend": { "calcs": [ @@ -2218,8 +3424,8 @@ "showLegend": true }, "tooltip": { - "mode": "multi", - "sort": "desc" + "mode": "single", + "sort": "none" } }, "targets": [ @@ -2229,13 +3435,13 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "executor_queued_tasks{instance=\"$instance\", name=\"Alpine-NotificationService\"}", - "legendFormat": "{{name}}", + "expr": "(rate(lucene_index_rebuild_seconds_sum{instance=\"$instance\"}[1m]) / rate(lucene_index_rebuild_seconds_count{instance=\"$instance\"}[1m])) > 0", + "legendFormat": "{{type}}", "range": true, "refId": "A" } ], - "title": "Notifications Queued", + "title": "Average Search Index Rebuild Duration", "type": "timeseries" }, { @@ -2243,6 +3449,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "description": "Average number of retries against the Sonatype OSS Index API.\n\nNote: If OSS Index is not enabled, no data will be displayed.", "fieldConfig": { "defaults": { "color": { @@ -2255,8 +3462,8 @@ "axisPlacement": "auto", "barAlignment": 0, "drawStyle": "line", - "fillOpacity": 15, - "gradientMode": "opacity", + "fillOpacity": 0, + "gradientMode": "none", "hideFrom": { "legend": false, "tooltip": false, @@ -2290,17 +3497,18 @@ "value": 80 } ] - } + }, + "unit": "ops" }, "overrides": [] }, "gridPos": { "h": 8, - "w": 8, - "x": 16, - "y": 35 + "w": 12, + "x": 0, + "y": 92 }, - "id": 44, + "id": 71, "options": { "legend": { "calcs": [ @@ -2313,8 +3521,8 @@ "showLegend": true }, "tooltip": { - "mode": "multi", - "sort": "desc" + "mode": "single", + "sort": "none" } }, "targets": [ @@ -2324,13 +3532,13 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "executor_active_threads{instance=\"$instance\", name=\"Alpine-NotificationService\"}", - "legendFormat": "{{name}}", + "expr": "rate(resilience4j_retry_calls_total{instance=\"$instance\",name=\"ossIndexRetryer\"}[1m]) > 0", + "legendFormat": "{{kind}}", "range": true, "refId": "A" } ], - "title": "Active Worker Threads", + "title": "Retries: Sonatype OSS Index API", "type": "timeseries" }, { @@ -2338,7 +3546,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "description": "Notifications published by the system. Note that this includes ALL notifications, even those for which no alert was configured.", + "description": "Average number of retries against the Snyk API.\n\nNote: If Snyk is not enabled, no data will be displayed.", "fieldConfig": { "defaults": { "color": { @@ -2351,17 +3559,14 @@ "axisPlacement": "auto", "barAlignment": 0, "drawStyle": "line", - "fillOpacity": 15, - "gradientMode": "opacity", + "fillOpacity": 0, + "gradientMode": "none", "hideFrom": { "legend": false, "tooltip": false, "viz": false }, "lineInterpolation": "linear", - "lineStyle": { - "fill": "solid" - }, "lineWidth": 1, "pointSize": 5, "scaleDistribution": { @@ -2389,31 +3594,32 @@ "value": 80 } ] - } + }, + "unit": "ops" }, "overrides": [] }, "gridPos": { - "h": 10, - "w": 24, - "x": 0, - "y": 43 + "h": 8, + "w": 12, + "x": 12, + "y": 92 }, - "id": 8, + "id": 72, "options": { "legend": { "calcs": [ "lastNotNull", - "sum", + "max", "mean" ], - "displayMode": "table", - "placement": "right", + "displayMode": "list", + "placement": "bottom", "showLegend": true }, "tooltip": { - "mode": "multi", - "sort": "desc" + "mode": "single", + "sort": "none" } }, "targets": [ @@ -2423,22 +3629,22 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "increase(alpine_notifications_published_total{instance=\"$instance\"}[$__rate_interval])", - "legendFormat": "{{group}}", + "expr": "rate(resilience4j_retry_calls_total{instance=\"$instance\",name=\"snyk-api\"}[1m]) > 0", + "legendFormat": "{{kind}}", "range": true, "refId": "A" } ], - "title": "Notifications Published", + "title": "Retries: Snyk", "type": "timeseries" } ], - "title": "Notifications", + "title": "Functional", "type": "row" } ], "refresh": "5s", - "schemaVersion": 37, + "schemaVersion": 38, "style": "dark", "tags": [], "templating": { @@ -2469,7 +3675,7 @@ ] }, "time": { - "from": "now-5m", + "from": "now-30m", "to": "now" }, "timepicker": {}, diff --git a/docs/images/screenshots/database-connection-pool-metrics.png b/docs/images/screenshots/database-connection-pool-metrics.png index 04f04fd705..181e7843d5 100644 Binary files a/docs/images/screenshots/database-connection-pool-metrics.png and b/docs/images/screenshots/database-connection-pool-metrics.png differ diff --git a/docs/images/screenshots/monitoring-metrics-events.png b/docs/images/screenshots/monitoring-metrics-events.png index a3b8d4b86f..e4d291eae1 100644 Binary files a/docs/images/screenshots/monitoring-metrics-events.png and b/docs/images/screenshots/monitoring-metrics-events.png differ diff --git a/docs/images/screenshots/monitoring-metrics-system.png b/docs/images/screenshots/monitoring-metrics-system.png index d70f28c6d8..f92af434a3 100644 Binary files a/docs/images/screenshots/monitoring-metrics-system.png and b/docs/images/screenshots/monitoring-metrics-system.png differ