diff --git a/dbrepo-ui/test/test_heap.sh b/dbrepo-ui/test/test_heap.sh
index 51acc0cf295d63ed794cb655ca8b44184b27e9b4..d468c47e8734ebe49d06f70066ab82d9b1fa6bec 100755
--- a/dbrepo-ui/test/test_heap.sh
+++ b/dbrepo-ui/test/test_heap.sh
@@ -3,6 +3,7 @@ CALLS=1000
CONCURRENCY=10
ENDPOINT=http://localhost
+sleep 10
ab -n "${CALLS}" -c "${CONCURRENCY}" "${ENDPOINT}/"
ab -n "${CALLS}" -c "${CONCURRENCY}" "${ENDPOINT}/search"
ab -n "${CALLS}" -c "${CONCURRENCY}" "${ENDPOINT}/login"
diff --git a/helm/dbrepo/files/system.json b/helm/dbrepo/files/system.json
index 4eb40a1a2ea5311ed634f406f0603e82d4c1ee91..e37d7be19f66f2b9b39928d85fe1741e45db760f 100644
--- a/helm/dbrepo/files/system.json
+++ b/helm/dbrepo/files/system.json
@@ -92,7 +92,7 @@
"textMode": "auto",
"wideLayout": true
},
- "pluginVersion": "11.2.2",
+ "pluginVersion": "10.4.9",
"targets": [
{
"datasource": {
@@ -160,7 +160,7 @@
"textMode": "auto",
"wideLayout": true
},
- "pluginVersion": "11.2.2",
+ "pluginVersion": "10.4.9",
"targets": [
{
"datasource": {
@@ -276,7 +276,7 @@
"textMode": "auto",
"wideLayout": true
},
- "pluginVersion": "11.2.2",
+ "pluginVersion": "10.4.9",
"targets": [
{
"datasource": {
@@ -306,18 +306,17 @@
"x": 0,
"y": 4
},
- "id": 2,
+ "id": 22,
"panels": [],
- "title": "Services",
+ "title": "UI",
"type": "row"
},
{
"datasource": {
- "default": true,
"type": "prometheus",
"uid": "P18F45E9DC7E75912"
},
- "description": "Quality of Service",
+ "description": "",
"fieldConfig": {
"defaults": {
"mappings": [],
@@ -327,38 +326,34 @@
"mode": "absolute",
"steps": [
{
- "color": "purple",
+ "color": "green",
"value": null
},
{
- "color": "red",
- "value": 0
+ "color": "#EAB839",
+ "value": 300
},
{
"color": "orange",
- "value": 60
- },
- {
- "color": "#EAB839",
- "value": 80
+ "value": 600
},
{
- "color": "green",
- "value": 100
+ "color": "red",
+ "value": 900
}
]
},
- "unit": "percent"
+ "unit": "ms"
},
"overrides": []
},
"gridPos": {
- "h": 4,
+ "h": 3,
"w": 4,
"x": 0,
"y": 5
},
- "id": 9,
+ "id": 17,
"options": {
"colorMode": "background",
"graphMode": "none",
@@ -376,7 +371,7 @@
"textMode": "auto",
"wideLayout": true
},
- "pluginVersion": "11.2.2",
+ "pluginVersion": "10.4.9",
"targets": [
{
"datasource": {
@@ -385,17 +380,17 @@
},
"disableTextWrap": false,
"editorMode": "code",
- "expr": "sum(up)*100/count(up)",
+ "expr": "avg(page_render_time)",
"fullMetaSearch": false,
"includeNullMetadata": true,
"instant": false,
- "legendFormat": "Services Running",
+ "legendFormat": "__auto",
"range": true,
"refId": "A",
"useBackend": false
}
],
- "title": "QoS",
+ "title": "UI Response Time (avg)",
"type": "stat"
},
{
@@ -403,72 +398,132 @@
"type": "prometheus",
"uid": "P18F45E9DC7E75912"
},
+ "description": "",
"fieldConfig": {
"defaults": {
- "color": {
- "mode": "thresholds"
- },
- "custom": {
- "fillOpacity": 70,
- "hideFrom": {
- "legend": false,
- "tooltip": false,
- "viz": false
- },
- "lineWidth": 1
- },
- "mappings": [
- {
- "options": {
- "0": {
- "index": 0,
- "text": "DOWN"
- },
- "1": {
- "index": 1,
- "text": "UP"
- }
- },
- "type": "value"
- }
- ],
+ "mappings": [],
+ "max": 100,
+ "min": 0,
"thresholds": {
"mode": "absolute",
"steps": [
{
- "color": "red",
+ "color": "green",
"value": null
},
{
- "color": "green",
- "value": 1
+ "color": "#EAB839",
+ "value": 0.02
+ },
+ {
+ "color": "orange",
+ "value": 0.05
+ },
+ {
+ "color": "red",
+ "value": 0.1
}
]
- }
+ },
+ "unit": "s"
},
"overrides": []
},
"gridPos": {
- "h": 8,
- "w": 20,
+ "h": 3,
+ "w": 4,
"x": 4,
"y": 5
},
- "id": 16,
+ "id": 24,
"options": {
- "colWidth": 0.9,
- "legend": {
- "displayMode": "list",
- "placement": "bottom",
- "showLegend": false
+ "colorMode": "background",
+ "graphMode": "none",
+ "justifyMode": "auto",
+ "orientation": "auto",
+ "percentChangeColorMode": "standard",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
},
- "rowHeight": 0.9,
- "showValue": "auto",
- "tooltip": {
- "mode": "single",
- "sort": "none"
+ "showPercentChange": false,
+ "textMode": "auto",
+ "wideLayout": true
+ },
+ "pluginVersion": "10.4.9",
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "disableTextWrap": false,
+ "editorMode": "code",
+ "expr": "nodejs_eventloop_lag_mean_seconds",
+ "fullMetaSearch": false,
+ "includeNullMetadata": true,
+ "instant": false,
+ "legendFormat": "__auto",
+ "range": true,
+ "refId": "A",
+ "useBackend": false
}
+ ],
+ "title": "UI Event Lag (avg)",
+ "type": "stat"
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "description": "",
+ "fieldConfig": {
+ "defaults": {
+ "mappings": [],
+ "max": 100,
+ "min": 0,
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "blue",
+ "value": null
+ }
+ ]
+ },
+ "unit": "none"
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 3,
+ "w": 4,
+ "x": 8,
+ "y": 5
+ },
+ "id": 25,
+ "options": {
+ "colorMode": "background",
+ "graphMode": "none",
+ "justifyMode": "auto",
+ "orientation": "auto",
+ "percentChangeColorMode": "standard",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "showPercentChange": false,
+ "textMode": "auto",
+ "wideLayout": true
},
+ "pluginVersion": "10.4.9",
"targets": [
{
"datasource": {
@@ -476,26 +531,26 @@
"uid": "P18F45E9DC7E75912"
},
"disableTextWrap": false,
- "editorMode": "builder",
- "expr": "up",
+ "editorMode": "code",
+ "expr": "nodejs_active_handles{type=\"Server\"}",
"fullMetaSearch": false,
"includeNullMetadata": true,
"instant": false,
- "legendFormat": "{{instance}}",
+ "legendFormat": "__auto",
"range": true,
"refId": "A",
"useBackend": false
}
],
- "title": "Service QoS",
- "type": "status-history"
+ "title": "UI Servers",
+ "type": "stat"
},
{
"datasource": {
"type": "prometheus",
"uid": "P18F45E9DC7E75912"
},
- "description": "Total used disk space in Storage Service",
+ "description": "",
"fieldConfig": {
"defaults": {
"mappings": [],
@@ -510,17 +565,17 @@
}
]
},
- "unit": "decbytes"
+ "unit": "none"
},
"overrides": []
},
"gridPos": {
- "h": 4,
+ "h": 3,
"w": 4,
- "x": 0,
- "y": 9
+ "x": 12,
+ "y": 5
},
- "id": 17,
+ "id": 26,
"options": {
"colorMode": "background",
"graphMode": "none",
@@ -534,11 +589,527 @@
"fields": "",
"values": false
},
- "showPercentChange": false,
- "textMode": "auto",
- "wideLayout": true
+ "showPercentChange": false,
+ "textMode": "auto",
+ "wideLayout": true
+ },
+ "pluginVersion": "10.4.9",
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "disableTextWrap": false,
+ "editorMode": "code",
+ "expr": "nodejs_active_handles{type=\"Socket\"}",
+ "fullMetaSearch": false,
+ "includeNullMetadata": true,
+ "instant": false,
+ "legendFormat": "__auto",
+ "range": true,
+ "refId": "A",
+ "useBackend": false
+ }
+ ],
+ "title": "UI Sockets",
+ "type": "stat"
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "description": "",
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "fixedColor": "blue",
+ "mode": "fixed"
+ },
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "blue",
+ "value": null
+ }
+ ]
+ },
+ "unit": "none"
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 3,
+ "w": 4,
+ "x": 16,
+ "y": 5
+ },
+ "id": 27,
+ "options": {
+ "colorMode": "background",
+ "graphMode": "none",
+ "justifyMode": "auto",
+ "orientation": "auto",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "showPercentChange": false,
+ "textMode": "auto",
+ "wideLayout": true
+ },
+ "pluginVersion": "10.4.9",
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "disableTextWrap": false,
+ "editorMode": "code",
+ "expr": "nodejs_active_requests_total",
+ "fullMetaSearch": false,
+ "includeNullMetadata": true,
+ "instant": false,
+ "legendFormat": "__auto",
+ "range": true,
+ "refId": "A",
+ "useBackend": false
+ }
+ ],
+ "title": "Active Requests",
+ "type": "stat"
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "thresholds"
+ },
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ },
+ {
+ "color": "yellow",
+ "value": 300
+ },
+ {
+ "color": "orange",
+ "value": 600
+ },
+ {
+ "color": "red",
+ "value": 900
+ }
+ ]
+ },
+ "unit": "ms"
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 7,
+ "w": 12,
+ "x": 0,
+ "y": 8
+ },
+ "id": 20,
+ "options": {
+ "displayMode": "basic",
+ "maxVizHeight": 300,
+ "minVizHeight": 16,
+ "minVizWidth": 8,
+ "namePlacement": "auto",
+ "orientation": "horizontal",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "showUnfilled": true,
+ "sizing": "auto",
+ "valueMode": "color"
+ },
+ "pluginVersion": "10.4.9",
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "disableTextWrap": false,
+ "editorMode": "builder",
+ "expr": "page_render_time",
+ "fullMetaSearch": false,
+ "includeNullMetadata": true,
+ "instant": false,
+ "legendFormat": "{{path}}",
+ "range": true,
+ "refId": "A",
+ "useBackend": false
+ }
+ ],
+ "title": "UI Response Time per Path (avg)",
+ "type": "bargauge"
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "palette-classic"
+ },
+ "custom": {
+ "axisBorderShow": false,
+ "axisCenteredZero": false,
+ "axisColorMode": "text",
+ "axisLabel": "",
+ "axisPlacement": "auto",
+ "barAlignment": 0,
+ "drawStyle": "line",
+ "fillOpacity": 0,
+ "gradientMode": "none",
+ "hideFrom": {
+ "legend": false,
+ "tooltip": false,
+ "viz": false
+ },
+ "insertNulls": false,
+ "lineInterpolation": "smooth",
+ "lineWidth": 2,
+ "pointSize": 5,
+ "scaleDistribution": {
+ "type": "linear"
+ },
+ "showPoints": "auto",
+ "spanNulls": false,
+ "stacking": {
+ "group": "A",
+ "mode": "none"
+ },
+ "thresholdsStyle": {
+ "mode": "dashed"
+ }
+ },
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ },
+ {
+ "color": "red",
+ "value": 256000000
+ }
+ ]
+ },
+ "unit": "decbytes"
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 7,
+ "w": 12,
+ "x": 12,
+ "y": 8
+ },
+ "id": 21,
+ "options": {
+ "legend": {
+ "calcs": [],
+ "displayMode": "list",
+ "placement": "bottom",
+ "showLegend": true
+ },
+ "tooltip": {
+ "mode": "multi",
+ "sort": "none"
+ }
+ },
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "disableTextWrap": false,
+ "editorMode": "builder",
+ "expr": "nodejs_heap_space_size_total_bytes",
+ "fullMetaSearch": false,
+ "includeNullMetadata": true,
+ "instant": false,
+ "legendFormat": "{{space}}",
+ "range": true,
+ "refId": "A",
+ "useBackend": false
+ }
+ ],
+ "title": "NodeJS Heap Bytes",
+ "type": "timeseries"
+ },
+ {
+ "collapsed": false,
+ "gridPos": {
+ "h": 1,
+ "w": 24,
+ "x": 0,
+ "y": 15
+ },
+ "id": 2,
+ "panels": [],
+ "title": "Services",
+ "type": "row"
+ },
+ {
+ "datasource": {
+ "default": true,
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "description": "Quality of Service",
+ "fieldConfig": {
+ "defaults": {
+ "mappings": [],
+ "max": 100,
+ "min": 0,
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "purple",
+ "value": null
+ },
+ {
+ "color": "red",
+ "value": 0
+ },
+ {
+ "color": "orange",
+ "value": 60
+ },
+ {
+ "color": "#EAB839",
+ "value": 80
+ },
+ {
+ "color": "green",
+ "value": 100
+ }
+ ]
+ },
+ "unit": "percent"
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 3,
+ "w": 4,
+ "x": 0,
+ "y": 16
+ },
+ "id": 9,
+ "options": {
+ "colorMode": "background",
+ "graphMode": "none",
+ "justifyMode": "auto",
+ "orientation": "auto",
+ "percentChangeColorMode": "standard",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "showPercentChange": false,
+ "textMode": "auto",
+ "wideLayout": true
+ },
+ "pluginVersion": "10.4.9",
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "disableTextWrap": false,
+ "editorMode": "code",
+ "expr": "sum(up)*100/count(up)",
+ "fullMetaSearch": false,
+ "includeNullMetadata": true,
+ "instant": false,
+ "legendFormat": "Services Running",
+ "range": true,
+ "refId": "A",
+ "useBackend": false
+ }
+ ],
+ "title": "QoS",
+ "type": "stat"
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "description": "",
+ "fieldConfig": {
+ "defaults": {
+ "mappings": [],
+ "max": 100,
+ "min": 0,
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "blue",
+ "value": null
+ }
+ ]
+ },
+ "unit": "s"
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 3,
+ "w": 4,
+ "x": 4,
+ "y": 16
+ },
+ "id": 28,
+ "options": {
+ "colorMode": "background",
+ "graphMode": "none",
+ "justifyMode": "auto",
+ "orientation": "auto",
+ "percentChangeColorMode": "standard",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "showPercentChange": false,
+ "textMode": "auto",
+ "wideLayout": true
+ },
+ "pluginVersion": "10.4.9",
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "disableTextWrap": false,
+ "editorMode": "code",
+ "expr": "min(process_uptime_seconds)",
+ "fullMetaSearch": false,
+ "includeNullMetadata": true,
+ "instant": false,
+ "legendFormat": "__auto",
+ "range": true,
+ "refId": "A",
+ "useBackend": false
+ }
+ ],
+ "title": "Uptime",
+ "type": "stat"
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "thresholds"
+ },
+ "custom": {
+ "fillOpacity": 70,
+ "hideFrom": {
+ "legend": false,
+ "tooltip": false,
+ "viz": false
+ },
+ "lineWidth": 1
+ },
+ "mappings": [
+ {
+ "options": {
+ "0": {
+ "index": 0,
+ "text": "DOWN"
+ },
+ "1": {
+ "index": 1,
+ "text": "UP"
+ }
+ },
+ "type": "value"
+ }
+ ],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "red",
+ "value": null
+ },
+ {
+ "color": "green",
+ "value": 1
+ }
+ ]
+ }
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 7,
+ "w": 12,
+ "x": 12,
+ "y": 16
+ },
+ "id": 16,
+ "options": {
+ "colWidth": 0.9,
+ "legend": {
+ "displayMode": "list",
+ "placement": "bottom",
+ "showLegend": false
+ },
+ "rowHeight": 0.9,
+ "showValue": "auto",
+ "tooltip": {
+ "mode": "single",
+ "sort": "none"
+ }
},
- "pluginVersion": "11.2.2",
"targets": [
{
"datasource": {
@@ -546,25 +1117,26 @@
"uid": "P18F45E9DC7E75912"
},
"disableTextWrap": false,
- "editorMode": "code",
- "expr": "SeaweedFS_volumeServer_total_disk_size",
+ "editorMode": "builder",
+ "expr": "up",
"fullMetaSearch": false,
"includeNullMetadata": true,
"instant": false,
- "legendFormat": "__auto",
+ "legendFormat": "{{instance}}",
"range": true,
"refId": "A",
"useBackend": false
}
],
- "title": "S3 Volume",
- "type": "stat"
+ "title": "Service QoS",
+ "type": "status-history"
},
{
"datasource": {
"type": "prometheus",
"uid": "P18F45E9DC7E75912"
},
+ "description": "",
"fieldConfig": {
"defaults": {
"color": {
@@ -577,9 +1149,8 @@
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
- "barWidthFactor": 0.6,
"drawStyle": "line",
- "fillOpacity": 25,
+ "fillOpacity": 0,
"gradientMode": "none",
"hideFrom": {
"legend": false,
@@ -597,7 +1168,7 @@
"spanNulls": false,
"stacking": {
"group": "A",
- "mode": "normal"
+ "mode": "none"
},
"thresholdsStyle": {
"mode": "off"
@@ -616,79 +1187,17 @@
"value": 80
}
]
- },
- "unit": "none"
- },
- "overrides": [
- {
- "matcher": {
- "id": "byName",
- "options": "auth-service:8080"
- },
- "properties": [
- {
- "id": "color",
- "value": {
- "fixedColor": "yellow",
- "mode": "fixed"
- }
- }
- ]
- },
- {
- "matcher": {
- "id": "byName",
- "options": "data-service:8080"
- },
- "properties": [
- {
- "id": "color",
- "value": {
- "fixedColor": "blue",
- "mode": "fixed"
- }
- }
- ]
- },
- {
- "matcher": {
- "id": "byName",
- "options": "metadata-service:8080"
- },
- "properties": [
- {
- "id": "color",
- "value": {
- "fixedColor": "purple",
- "mode": "fixed"
- }
- }
- ]
- },
- {
- "matcher": {
- "id": "byName",
- "options": "metadata-service:80"
- },
- "properties": [
- {
- "id": "color",
- "value": {
- "fixedColor": "blue",
- "mode": "fixed"
- }
- }
- ]
}
- ]
+ },
+ "overrides": []
},
"gridPos": {
"h": 7,
"w": 12,
"x": 0,
- "y": 13
+ "y": 19
},
- "id": 6,
+ "id": 23,
"options": {
"legend": {
"calcs": [],
@@ -701,7 +1210,7 @@
"sort": "none"
}
},
- "pluginVersion": "11.2.0",
+ "pluginVersion": "10.4.9",
"targets": [
{
"datasource": {
@@ -709,19 +1218,18 @@
"uid": "P18F45E9DC7E75912"
},
"disableTextWrap": false,
- "editorMode": "builder",
- "expr": "process_cpu_usage",
+ "editorMode": "code",
+ "expr": "process_open_fds\n",
"fullMetaSearch": false,
- "hide": false,
"includeNullMetadata": true,
"instant": false,
"legendFormat": "{{instance}}",
"range": true,
- "refId": "process_cpu_usage",
+ "refId": "process_open_fds",
"useBackend": false
}
],
- "title": "CPU Usage",
+ "title": "File Descriptors",
"type": "timeseries"
},
{
@@ -743,7 +1251,6 @@
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
- "barWidthFactor": 0.6,
"drawStyle": "line",
"fillOpacity": 25,
"gradientMode": "none",
@@ -848,7 +1355,7 @@
"h": 7,
"w": 12,
"x": 12,
- "y": 13
+ "y": 23
},
"id": 7,
"options": {
@@ -903,7 +1410,6 @@
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
- "barWidthFactor": 0.6,
"drawStyle": "line",
"fillOpacity": 25,
"gradientMode": "none",
@@ -923,7 +1429,7 @@
"spanNulls": false,
"stacking": {
"group": "A",
- "mode": "none"
+ "mode": "normal"
},
"thresholdsStyle": {
"mode": "off"
@@ -936,22 +1442,26 @@
{
"color": "green",
"value": null
+ },
+ {
+ "color": "red",
+ "value": 80
}
]
},
- "unit": "reqps"
+ "unit": "none"
},
"overrides": [
{
"matcher": {
- "id": "byRegexp",
- "options": "/.*search-service.*/"
+ "id": "byName",
+ "options": "auth-service:8080"
},
"properties": [
{
"id": "color",
"value": {
- "fixedColor": "orange",
+ "fixedColor": "yellow",
"mode": "fixed"
}
}
@@ -959,14 +1469,44 @@
},
{
"matcher": {
- "id": "byRegexp",
- "options": "/.*analyse-service.*/"
+ "id": "byName",
+ "options": "data-service:8080"
},
"properties": [
{
"id": "color",
"value": {
- "fixedColor": "super-light-orange",
+ "fixedColor": "blue",
+ "mode": "fixed"
+ }
+ }
+ ]
+ },
+ {
+ "matcher": {
+ "id": "byName",
+ "options": "metadata-service:8080"
+ },
+ "properties": [
+ {
+ "id": "color",
+ "value": {
+ "fixedColor": "purple",
+ "mode": "fixed"
+ }
+ }
+ ]
+ },
+ {
+ "matcher": {
+ "id": "byName",
+ "options": "metadata-service:80"
+ },
+ "properties": [
+ {
+ "id": "color",
+ "value": {
+ "fixedColor": "blue",
"mode": "fixed"
}
}
@@ -978,9 +1518,9 @@
"h": 7,
"w": 12,
"x": 0,
- "y": 20
+ "y": 26
},
- "id": 18,
+ "id": 6,
"options": {
"legend": {
"calcs": [],
@@ -993,21 +1533,27 @@
"sort": "none"
}
},
+ "pluginVersion": "11.2.0",
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "P18F45E9DC7E75912"
},
- "editorMode": "code",
- "expr": "rate(flask_http_request_duration_seconds_count{status=~\"200|201|202\",path!=\"/health\"}[$__rate_interval])",
+ "disableTextWrap": false,
+ "editorMode": "builder",
+ "expr": "process_cpu_usage",
+ "fullMetaSearch": false,
+ "hide": false,
+ "includeNullMetadata": true,
"instant": false,
- "legendFormat": "{{method}} {{instance}} {{path}} ({{status}})",
+ "legendFormat": "{{instance}}",
"range": true,
- "refId": "A"
+ "refId": "process_cpu_usage",
+ "useBackend": false
}
],
- "title": "Successful API Requests",
+ "title": "CPU Usage",
"type": "timeseries"
},
{
@@ -1027,7 +1573,6 @@
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
- "barWidthFactor": 0.6,
"drawStyle": "line",
"fillOpacity": 25,
"gradientMode": "none",
@@ -1102,7 +1647,7 @@
"h": 7,
"w": 12,
"x": 12,
- "y": 20
+ "y": 30
},
"id": 19,
"options": {
@@ -1136,7 +1681,6 @@
},
{
"datasource": {
- "default": true,
"type": "prometheus",
"uid": "P18F45E9DC7E75912"
},
@@ -1152,9 +1696,8 @@
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
- "barWidthFactor": 0.6,
"drawStyle": "line",
- "fillOpacity": 0,
+ "fillOpacity": 25,
"gradientMode": "none",
"hideFrom": {
"legend": false,
@@ -1162,8 +1705,8 @@
"viz": false
},
"insertNulls": false,
- "lineInterpolation": "linear",
- "lineWidth": 1,
+ "lineInterpolation": "smooth",
+ "lineWidth": 2,
"pointSize": 5,
"scaleDistribution": {
"type": "linear"
@@ -1187,58 +1730,14 @@
"value": null
}
]
- }
+ },
+ "unit": "reqps"
},
"overrides": [
{
"matcher": {
- "id": "byName",
- "options": "DELETE"
- },
- "properties": [
- {
- "id": "color",
- "value": {
- "fixedColor": "red",
- "mode": "fixed"
- }
- }
- ]
- },
- {
- "matcher": {
- "id": "byName",
- "options": "GET"
- },
- "properties": [
- {
- "id": "color",
- "value": {
- "fixedColor": "blue",
- "mode": "fixed"
- }
- }
- ]
- },
- {
- "matcher": {
- "id": "byName",
- "options": "HEAD"
- },
- "properties": [
- {
- "id": "color",
- "value": {
- "fixedColor": "purple",
- "mode": "fixed"
- }
- }
- ]
- },
- {
- "matcher": {
- "id": "byName",
- "options": "PATCH"
+ "id": "byRegexp",
+ "options": "/.*search-service.*/"
},
"properties": [
{
@@ -1252,28 +1751,14 @@
},
{
"matcher": {
- "id": "byName",
- "options": "OPTIONS"
- },
- "properties": [
- {
- "id": "color",
- "value": {
- "mode": "fixed"
- }
- }
- ]
- },
- {
- "matcher": {
- "id": "byName",
- "options": "POST"
+ "id": "byRegexp",
+ "options": "/.*analyse-service.*/"
},
"properties": [
{
"id": "color",
"value": {
- "fixedColor": "green",
+ "fixedColor": "super-light-orange",
"mode": "fixed"
}
}
@@ -1285,9 +1770,9 @@
"h": 7,
"w": 12,
"x": 0,
- "y": 27
+ "y": 33
},
- "id": 20,
+ "id": 18,
"options": {
"legend": {
"calcs": [],
@@ -1296,7 +1781,7 @@
"showLegend": true
},
"tooltip": {
- "mode": "single",
+ "mode": "multi",
"sort": "none"
}
},
@@ -1306,23 +1791,19 @@
"type": "prometheus",
"uid": "P18F45E9DC7E75912"
},
- "disableTextWrap": false,
- "editorMode": "builder",
- "expr": "tusd_requests_total",
- "fullMetaSearch": false,
- "includeNullMetadata": true,
+ "editorMode": "code",
+ "expr": "rate(flask_http_request_duration_seconds_count{status=~\"200|201|202\",path!=\"/health\"}[$__rate_interval])",
"instant": false,
- "legendFormat": "{{method}}",
+ "legendFormat": "{{method}} {{instance}} {{path}} ({{status}})",
"range": true,
- "refId": "A",
- "useBackend": false
+ "refId": "A"
}
],
- "title": "Storage Service Requests",
+ "title": "Successful API Requests",
"type": "timeseries"
}
],
- "refresh": "10s",
+ "refresh": "5s",
"schemaVersion": 39,
"tags": [
"provisioned",
@@ -1332,13 +1813,13 @@
"list": []
},
"time": {
- "from": "now-1h",
+ "from": "now-30m",
"to": "now"
},
"timepicker": {},
"timezone": "browser",
- "title": "DBRepo - Overview",
- "uid": "bdz20owu8zn5se",
+ "title": "NEW",
+ "uid": "bdz20owu8zn5se1",
"version": 1,
"weekStart": ""
}
\ No newline at end of file