Skip to content
Snippets Groups Projects
Verified Commit 117b8363 authored by Martin Weise's avatar Martin Weise
Browse files

Working prototype

parent 48433676
No related branches found
No related tags found
6 merge requests!345Updated docs and endpoints:,!341Fixed mapping problem where UK and FK share columns they are inserted,!339Fixed mapping problem where UK and FK share columns they are inserted,!338Fixed mapping problem where UK and FK share columns they are inserted,!334Fixed mapping problem where UK and FK share columns they are inserted,!333Fixed mapping problem where UK and FK share columns they are inserted
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
"editable": true, "editable": true,
"fiscalYearStartMonth": 0, "fiscalYearStartMonth": 0,
"graphTooltip": 1, "graphTooltip": 1,
"id": 3,
"links": [ "links": [
{ {
"asDropdown": false, "asDropdown": false,
...@@ -92,7 +93,7 @@ ...@@ -92,7 +93,7 @@
"textMode": "auto", "textMode": "auto",
"wideLayout": true "wideLayout": true
}, },
"pluginVersion": "11.2.2", "pluginVersion": "10.4.9",
"targets": [ "targets": [
{ {
"datasource": { "datasource": {
...@@ -160,7 +161,7 @@ ...@@ -160,7 +161,7 @@
"textMode": "auto", "textMode": "auto",
"wideLayout": true "wideLayout": true
}, },
"pluginVersion": "11.2.2", "pluginVersion": "10.4.9",
"targets": [ "targets": [
{ {
"datasource": { "datasource": {
...@@ -276,7 +277,7 @@ ...@@ -276,7 +277,7 @@
"textMode": "auto", "textMode": "auto",
"wideLayout": true "wideLayout": true
}, },
"pluginVersion": "11.2.2", "pluginVersion": "10.4.9",
"targets": [ "targets": [
{ {
"datasource": { "datasource": {
...@@ -306,18 +307,17 @@ ...@@ -306,18 +307,17 @@
"x": 0, "x": 0,
"y": 4 "y": 4
}, },
"id": 2, "id": 22,
"panels": [], "panels": [],
"title": "Services", "title": "UI",
"type": "row" "type": "row"
}, },
{ {
"datasource": { "datasource": {
"default": true,
"type": "prometheus", "type": "prometheus",
"uid": "P18F45E9DC7E75912" "uid": "P18F45E9DC7E75912"
}, },
"description": "Quality of Service", "description": "",
"fieldConfig": { "fieldConfig": {
"defaults": { "defaults": {
"mappings": [], "mappings": [],
...@@ -327,38 +327,34 @@ ...@@ -327,38 +327,34 @@
"mode": "absolute", "mode": "absolute",
"steps": [ "steps": [
{ {
"color": "purple", "color": "green",
"value": null "value": null
}, },
{ {
"color": "red", "color": "#EAB839",
"value": 0 "value": 300
}, },
{ {
"color": "orange", "color": "orange",
"value": 60 "value": 600
},
{
"color": "#EAB839",
"value": 80
}, },
{ {
"color": "green", "color": "red",
"value": 100 "value": 900
} }
] ]
}, },
"unit": "percent" "unit": "ms"
}, },
"overrides": [] "overrides": []
}, },
"gridPos": { "gridPos": {
"h": 4, "h": 3,
"w": 4, "w": 4,
"x": 0, "x": 0,
"y": 5 "y": 5
}, },
"id": 9, "id": 17,
"options": { "options": {
"colorMode": "background", "colorMode": "background",
"graphMode": "none", "graphMode": "none",
...@@ -376,7 +372,7 @@ ...@@ -376,7 +372,7 @@
"textMode": "auto", "textMode": "auto",
"wideLayout": true "wideLayout": true
}, },
"pluginVersion": "11.2.2", "pluginVersion": "10.4.9",
"targets": [ "targets": [
{ {
"datasource": { "datasource": {
...@@ -385,17 +381,17 @@ ...@@ -385,17 +381,17 @@
}, },
"disableTextWrap": false, "disableTextWrap": false,
"editorMode": "code", "editorMode": "code",
"expr": "sum(up)*100/count(up)", "expr": "avg(page_render_time)",
"fullMetaSearch": false, "fullMetaSearch": false,
"includeNullMetadata": true, "includeNullMetadata": true,
"instant": false, "instant": false,
"legendFormat": "Services Running", "legendFormat": "__auto",
"range": true, "range": true,
"refId": "A", "refId": "A",
"useBackend": false "useBackend": false
} }
], ],
"title": "QoS", "title": "UI Response Time (avg)",
"type": "stat" "type": "stat"
}, },
{ {
...@@ -403,72 +399,132 @@ ...@@ -403,72 +399,132 @@
"type": "prometheus", "type": "prometheus",
"uid": "P18F45E9DC7E75912" "uid": "P18F45E9DC7E75912"
}, },
"description": "",
"fieldConfig": { "fieldConfig": {
"defaults": { "defaults": {
"color": { "mappings": [],
"mode": "thresholds" "max": 100,
"min": 0,
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
}, },
"custom": { {
"fillOpacity": 70, "color": "#EAB839",
"hideFrom": { "value": 0.02
"legend": false,
"tooltip": false,
"viz": false
}, },
"lineWidth": 1 {
"color": "orange",
"value": 0.05
}, },
"mappings": [
{ {
"color": "red",
"value": 0.1
}
]
},
"unit": "s"
},
"overrides": []
},
"gridPos": {
"h": 3,
"w": 4,
"x": 4,
"y": 5
},
"id": 24,
"options": { "options": {
"0": { "colorMode": "background",
"index": 0, "graphMode": "none",
"text": "DOWN" "justifyMode": "auto",
"orientation": "auto",
"percentChangeColorMode": "standard",
"reduceOptions": {
"calcs": [
"lastNotNull"
],
"fields": "",
"values": false
}, },
"1": { "showPercentChange": false,
"index": 1, "textMode": "auto",
"text": "UP" "wideLayout": true
}
}, },
"type": "value" "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": { "thresholds": {
"mode": "absolute", "mode": "absolute",
"steps": [ "steps": [
{ {
"color": "red", "color": "blue",
"value": null "value": null
},
{
"color": "green",
"value": 1
} }
] ]
} },
"unit": "none"
}, },
"overrides": [] "overrides": []
}, },
"gridPos": { "gridPos": {
"h": 8, "h": 3,
"w": 20, "w": 4,
"x": 4, "x": 8,
"y": 5 "y": 5
}, },
"id": 16, "id": 25,
"options": { "options": {
"colWidth": 0.9, "colorMode": "background",
"legend": { "graphMode": "none",
"displayMode": "list", "justifyMode": "auto",
"placement": "bottom", "orientation": "auto",
"showLegend": false "percentChangeColorMode": "standard",
"reduceOptions": {
"calcs": [
"lastNotNull"
],
"fields": "",
"values": false
}, },
"rowHeight": 0.9, "showPercentChange": false,
"showValue": "auto", "textMode": "auto",
"tooltip": { "wideLayout": true
"mode": "single",
"sort": "none"
}
}, },
"pluginVersion": "10.4.9",
"targets": [ "targets": [
{ {
"datasource": { "datasource": {
...@@ -476,26 +532,26 @@ ...@@ -476,26 +532,26 @@
"uid": "P18F45E9DC7E75912" "uid": "P18F45E9DC7E75912"
}, },
"disableTextWrap": false, "disableTextWrap": false,
"editorMode": "builder", "editorMode": "code",
"expr": "up", "expr": "nodejs_active_handles{type=\"Server\"}",
"fullMetaSearch": false, "fullMetaSearch": false,
"includeNullMetadata": true, "includeNullMetadata": true,
"instant": false, "instant": false,
"legendFormat": "{{instance}}", "legendFormat": "__auto",
"range": true, "range": true,
"refId": "A", "refId": "A",
"useBackend": false "useBackend": false
} }
], ],
"title": "Service QoS", "title": "UI Servers",
"type": "status-history" "type": "stat"
}, },
{ {
"datasource": { "datasource": {
"type": "prometheus", "type": "prometheus",
"uid": "P18F45E9DC7E75912" "uid": "P18F45E9DC7E75912"
}, },
"description": "Total used disk space in Storage Service", "description": "",
"fieldConfig": { "fieldConfig": {
"defaults": { "defaults": {
"mappings": [], "mappings": [],
...@@ -510,17 +566,17 @@ ...@@ -510,17 +566,17 @@
} }
] ]
}, },
"unit": "decbytes" "unit": "none"
}, },
"overrides": [] "overrides": []
}, },
"gridPos": { "gridPos": {
"h": 4, "h": 3,
"w": 4, "w": 4,
"x": 0, "x": 12,
"y": 9 "y": 5
}, },
"id": 17, "id": 26,
"options": { "options": {
"colorMode": "background", "colorMode": "background",
"graphMode": "none", "graphMode": "none",
...@@ -534,11 +590,527 @@ ...@@ -534,11 +590,527 @@
"fields": "", "fields": "",
"values": false "values": false
}, },
"showPercentChange": false, "showPercentChange": false,
"textMode": "auto", "textMode": "auto",
"wideLayout": true "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": [ "targets": [
{ {
"datasource": { "datasource": {
...@@ -546,25 +1118,26 @@ ...@@ -546,25 +1118,26 @@
"uid": "P18F45E9DC7E75912" "uid": "P18F45E9DC7E75912"
}, },
"disableTextWrap": false, "disableTextWrap": false,
"editorMode": "code", "editorMode": "builder",
"expr": "SeaweedFS_volumeServer_total_disk_size", "expr": "up",
"fullMetaSearch": false, "fullMetaSearch": false,
"includeNullMetadata": true, "includeNullMetadata": true,
"instant": false, "instant": false,
"legendFormat": "__auto", "legendFormat": "{{instance}}",
"range": true, "range": true,
"refId": "A", "refId": "A",
"useBackend": false "useBackend": false
} }
], ],
"title": "S3 Volume", "title": "Service QoS",
"type": "stat" "type": "status-history"
}, },
{ {
"datasource": { "datasource": {
"type": "prometheus", "type": "prometheus",
"uid": "P18F45E9DC7E75912" "uid": "P18F45E9DC7E75912"
}, },
"description": "",
"fieldConfig": { "fieldConfig": {
"defaults": { "defaults": {
"color": { "color": {
...@@ -577,9 +1150,8 @@ ...@@ -577,9 +1150,8 @@
"axisLabel": "", "axisLabel": "",
"axisPlacement": "auto", "axisPlacement": "auto",
"barAlignment": 0, "barAlignment": 0,
"barWidthFactor": 0.6,
"drawStyle": "line", "drawStyle": "line",
"fillOpacity": 25, "fillOpacity": 0,
"gradientMode": "none", "gradientMode": "none",
"hideFrom": { "hideFrom": {
"legend": false, "legend": false,
...@@ -597,7 +1169,7 @@ ...@@ -597,7 +1169,7 @@
"spanNulls": false, "spanNulls": false,
"stacking": { "stacking": {
"group": "A", "group": "A",
"mode": "normal" "mode": "none"
}, },
"thresholdsStyle": { "thresholdsStyle": {
"mode": "off" "mode": "off"
...@@ -616,79 +1188,17 @@ ...@@ -616,79 +1188,17 @@
"value": 80 "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": [ "overrides": []
{
"id": "color",
"value": {
"fixedColor": "blue",
"mode": "fixed"
}
}
]
}
]
}, },
"gridPos": { "gridPos": {
"h": 7, "h": 7,
"w": 12, "w": 12,
"x": 0, "x": 0,
"y": 13 "y": 19
}, },
"id": 6, "id": 23,
"options": { "options": {
"legend": { "legend": {
"calcs": [], "calcs": [],
...@@ -701,7 +1211,7 @@ ...@@ -701,7 +1211,7 @@
"sort": "none" "sort": "none"
} }
}, },
"pluginVersion": "11.2.0", "pluginVersion": "10.4.9",
"targets": [ "targets": [
{ {
"datasource": { "datasource": {
...@@ -709,19 +1219,18 @@ ...@@ -709,19 +1219,18 @@
"uid": "P18F45E9DC7E75912" "uid": "P18F45E9DC7E75912"
}, },
"disableTextWrap": false, "disableTextWrap": false,
"editorMode": "builder", "editorMode": "code",
"expr": "process_cpu_usage", "expr": "process_open_fds\n",
"fullMetaSearch": false, "fullMetaSearch": false,
"hide": false,
"includeNullMetadata": true, "includeNullMetadata": true,
"instant": false, "instant": false,
"legendFormat": "{{instance}}", "legendFormat": "{{instance}}",
"range": true, "range": true,
"refId": "process_cpu_usage", "refId": "process_open_fds",
"useBackend": false "useBackend": false
} }
], ],
"title": "CPU Usage", "title": "File Descriptors",
"type": "timeseries" "type": "timeseries"
}, },
{ {
...@@ -743,7 +1252,6 @@ ...@@ -743,7 +1252,6 @@
"axisLabel": "", "axisLabel": "",
"axisPlacement": "auto", "axisPlacement": "auto",
"barAlignment": 0, "barAlignment": 0,
"barWidthFactor": 0.6,
"drawStyle": "line", "drawStyle": "line",
"fillOpacity": 25, "fillOpacity": 25,
"gradientMode": "none", "gradientMode": "none",
...@@ -774,8 +1282,7 @@ ...@@ -774,8 +1282,7 @@
"mode": "absolute", "mode": "absolute",
"steps": [ "steps": [
{ {
"color": "green", "color": "green"
"value": null
} }
] ]
}, },
...@@ -848,7 +1355,7 @@ ...@@ -848,7 +1355,7 @@
"h": 7, "h": 7,
"w": 12, "w": 12,
"x": 12, "x": 12,
"y": 13 "y": 23
}, },
"id": 7, "id": 7,
"options": { "options": {
...@@ -903,7 +1410,6 @@ ...@@ -903,7 +1410,6 @@
"axisLabel": "", "axisLabel": "",
"axisPlacement": "auto", "axisPlacement": "auto",
"barAlignment": 0, "barAlignment": 0,
"barWidthFactor": 0.6,
"drawStyle": "line", "drawStyle": "line",
"fillOpacity": 25, "fillOpacity": 25,
"gradientMode": "none", "gradientMode": "none",
...@@ -923,7 +1429,7 @@ ...@@ -923,7 +1429,7 @@
"spanNulls": false, "spanNulls": false,
"stacking": { "stacking": {
"group": "A", "group": "A",
"mode": "none" "mode": "normal"
}, },
"thresholdsStyle": { "thresholdsStyle": {
"mode": "off" "mode": "off"
...@@ -934,24 +1440,27 @@ ...@@ -934,24 +1440,27 @@
"mode": "absolute", "mode": "absolute",
"steps": [ "steps": [
{ {
"color": "green", "color": "green"
"value": null },
{
"color": "red",
"value": 80
} }
] ]
}, },
"unit": "reqps" "unit": "none"
}, },
"overrides": [ "overrides": [
{ {
"matcher": { "matcher": {
"id": "byRegexp", "id": "byName",
"options": "/.*search-service.*/" "options": "auth-service:8080"
}, },
"properties": [ "properties": [
{ {
"id": "color", "id": "color",
"value": { "value": {
"fixedColor": "orange", "fixedColor": "yellow",
"mode": "fixed" "mode": "fixed"
} }
} }
...@@ -959,14 +1468,44 @@ ...@@ -959,14 +1468,44 @@
}, },
{ {
"matcher": { "matcher": {
"id": "byRegexp", "id": "byName",
"options": "/.*analyse-service.*/" "options": "data-service:8080"
}, },
"properties": [ "properties": [
{ {
"id": "color", "id": "color",
"value": { "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" "mode": "fixed"
} }
} }
...@@ -978,9 +1517,9 @@ ...@@ -978,9 +1517,9 @@
"h": 7, "h": 7,
"w": 12, "w": 12,
"x": 0, "x": 0,
"y": 20 "y": 26
}, },
"id": 18, "id": 6,
"options": { "options": {
"legend": { "legend": {
"calcs": [], "calcs": [],
...@@ -993,21 +1532,27 @@ ...@@ -993,21 +1532,27 @@
"sort": "none" "sort": "none"
} }
}, },
"pluginVersion": "11.2.0",
"targets": [ "targets": [
{ {
"datasource": { "datasource": {
"type": "prometheus", "type": "prometheus",
"uid": "P18F45E9DC7E75912" "uid": "P18F45E9DC7E75912"
}, },
"editorMode": "code", "disableTextWrap": false,
"expr": "rate(flask_http_request_duration_seconds_count{status=~\"200|201|202\",path!=\"/health\"}[$__rate_interval])", "editorMode": "builder",
"expr": "process_cpu_usage",
"fullMetaSearch": false,
"hide": false,
"includeNullMetadata": true,
"instant": false, "instant": false,
"legendFormat": "{{method}} {{instance}} {{path}} ({{status}})", "legendFormat": "{{instance}}",
"range": true, "range": true,
"refId": "A" "refId": "process_cpu_usage",
"useBackend": false
} }
], ],
"title": "Successful API Requests", "title": "CPU Usage",
"type": "timeseries" "type": "timeseries"
}, },
{ {
...@@ -1027,7 +1572,6 @@ ...@@ -1027,7 +1572,6 @@
"axisLabel": "", "axisLabel": "",
"axisPlacement": "auto", "axisPlacement": "auto",
"barAlignment": 0, "barAlignment": 0,
"barWidthFactor": 0.6,
"drawStyle": "line", "drawStyle": "line",
"fillOpacity": 25, "fillOpacity": 25,
"gradientMode": "none", "gradientMode": "none",
...@@ -1058,8 +1602,7 @@ ...@@ -1058,8 +1602,7 @@
"mode": "absolute", "mode": "absolute",
"steps": [ "steps": [
{ {
"color": "green", "color": "green"
"value": null
} }
] ]
}, },
...@@ -1102,7 +1645,7 @@ ...@@ -1102,7 +1645,7 @@
"h": 7, "h": 7,
"w": 12, "w": 12,
"x": 12, "x": 12,
"y": 20 "y": 30
}, },
"id": 19, "id": 19,
"options": { "options": {
...@@ -1136,7 +1679,6 @@ ...@@ -1136,7 +1679,6 @@
}, },
{ {
"datasource": { "datasource": {
"default": true,
"type": "prometheus", "type": "prometheus",
"uid": "P18F45E9DC7E75912" "uid": "P18F45E9DC7E75912"
}, },
...@@ -1152,9 +1694,8 @@ ...@@ -1152,9 +1694,8 @@
"axisLabel": "", "axisLabel": "",
"axisPlacement": "auto", "axisPlacement": "auto",
"barAlignment": 0, "barAlignment": 0,
"barWidthFactor": 0.6,
"drawStyle": "line", "drawStyle": "line",
"fillOpacity": 0, "fillOpacity": 25,
"gradientMode": "none", "gradientMode": "none",
"hideFrom": { "hideFrom": {
"legend": false, "legend": false,
...@@ -1162,8 +1703,8 @@ ...@@ -1162,8 +1703,8 @@
"viz": false "viz": false
}, },
"insertNulls": false, "insertNulls": false,
"lineInterpolation": "linear", "lineInterpolation": "smooth",
"lineWidth": 1, "lineWidth": 2,
"pointSize": 5, "pointSize": 5,
"scaleDistribution": { "scaleDistribution": {
"type": "linear" "type": "linear"
...@@ -1183,62 +1724,17 @@ ...@@ -1183,62 +1724,17 @@
"mode": "absolute", "mode": "absolute",
"steps": [ "steps": [
{ {
"color": "green", "color": "green"
"value": null
}
]
}
},
"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"
}
} }
] ]
}, },
{ "unit": "reqps"
"matcher": {
"id": "byName",
"options": "HEAD"
},
"properties": [
{
"id": "color",
"value": {
"fixedColor": "purple",
"mode": "fixed"
}
}
]
}, },
"overrides": [
{ {
"matcher": { "matcher": {
"id": "byName", "id": "byRegexp",
"options": "PATCH" "options": "/.*search-service.*/"
}, },
"properties": [ "properties": [
{ {
...@@ -1252,28 +1748,14 @@ ...@@ -1252,28 +1748,14 @@
}, },
{ {
"matcher": { "matcher": {
"id": "byName", "id": "byRegexp",
"options": "OPTIONS" "options": "/.*analyse-service.*/"
},
"properties": [
{
"id": "color",
"value": {
"mode": "fixed"
}
}
]
},
{
"matcher": {
"id": "byName",
"options": "POST"
}, },
"properties": [ "properties": [
{ {
"id": "color", "id": "color",
"value": { "value": {
"fixedColor": "green", "fixedColor": "super-light-orange",
"mode": "fixed" "mode": "fixed"
} }
} }
...@@ -1285,9 +1767,9 @@ ...@@ -1285,9 +1767,9 @@
"h": 7, "h": 7,
"w": 12, "w": 12,
"x": 0, "x": 0,
"y": 27 "y": 33
}, },
"id": 20, "id": 18,
"options": { "options": {
"legend": { "legend": {
"calcs": [], "calcs": [],
...@@ -1296,7 +1778,7 @@ ...@@ -1296,7 +1778,7 @@
"showLegend": true "showLegend": true
}, },
"tooltip": { "tooltip": {
"mode": "single", "mode": "multi",
"sort": "none" "sort": "none"
} }
}, },
...@@ -1306,23 +1788,19 @@ ...@@ -1306,23 +1788,19 @@
"type": "prometheus", "type": "prometheus",
"uid": "P18F45E9DC7E75912" "uid": "P18F45E9DC7E75912"
}, },
"disableTextWrap": false, "editorMode": "code",
"editorMode": "builder", "expr": "rate(flask_http_request_duration_seconds_count{status=~\"200|201|202\",path!=\"/health\"}[$__rate_interval])",
"expr": "tusd_requests_total",
"fullMetaSearch": false,
"includeNullMetadata": true,
"instant": false, "instant": false,
"legendFormat": "{{method}}", "legendFormat": "{{method}} {{instance}} {{path}} ({{status}})",
"range": true, "range": true,
"refId": "A", "refId": "A"
"useBackend": false
} }
], ],
"title": "Storage Service Requests", "title": "Successful API Requests",
"type": "timeseries" "type": "timeseries"
} }
], ],
"refresh": "10s", "refresh": "5s",
"schemaVersion": 39, "schemaVersion": 39,
"tags": [ "tags": [
"provisioned", "provisioned",
...@@ -1332,13 +1810,13 @@ ...@@ -1332,13 +1810,13 @@
"list": [] "list": []
}, },
"time": { "time": {
"from": "now-1h", "from": "now-30m",
"to": "now" "to": "now"
}, },
"timepicker": {}, "timepicker": {},
"timezone": "browser", "timezone": "browser",
"title": "DBRepo - Overview", "title": "NEW",
"uid": "bdz20owu8zn5se", "uid": "bdz20owu8zn5se1",
"version": 1, "version": 31,
"weekStart": "" "weekStart": ""
} }
\ No newline at end of file
...@@ -12,8 +12,8 @@ scrape_configs: ...@@ -12,8 +12,8 @@ scrape_configs:
- job_name: 'actuator scrape' - job_name: 'actuator scrape'
metrics_path: '/actuator/prometheus' metrics_path: '/actuator/prometheus'
static_configs: static_configs:
- targets: ['data-service:8080', 'metadata-service:8080', 'ui:3000'] - targets: ['data-service:8080', 'metadata-service:8080']
- job_name: 'metrics scrape' - job_name: 'metrics scrape'
metrics_path: '/metrics' metrics_path: '/metrics'
static_configs: static_configs:
- targets: ['auth-service:8080', 'analyse-service:8080', 'search-service:8080', 'data-db-sidecar:8080', 'broker-service:15692', 'storage-service:9090', 'upload-service:8080', 'dashboard-service:3000'] - targets: ['ui:3000', 'auth-service:8080', 'analyse-service:8080', 'search-service:8080', 'data-db-sidecar:8080', 'broker-service:15692', 'storage-service:9090', 'upload-service:8080', 'dashboard-service:3000']
...@@ -2,6 +2,7 @@ FROM oven/bun:1.1.20-alpine AS build ...@@ -2,6 +2,7 @@ FROM oven/bun:1.1.20-alpine AS build
WORKDIR /app WORKDIR /app
COPY ./bun.lockb ./bun.lockb
COPY ./package.json ./package.json COPY ./package.json ./package.json
RUN bun install RUN bun install
...@@ -24,11 +25,13 @@ COPY ./nuxt.config.ts ./nuxt.config.ts ...@@ -24,11 +25,13 @@ COPY ./nuxt.config.ts ./nuxt.config.ts
RUN bun run build RUN bun run build
FROM oven/bun:1.1.20-alpine AS runtime FROM node:18.19.0-alpine3.19 AS runtime
ARG APP_VERSION="latest" ARG APP_VERSION="latest"
ARG COMMIT="" ARG COMMIT=""
RUN apk add --no-cache curl bash
USER 1000 USER 1000
WORKDIR /app WORKDIR /app
...@@ -39,8 +42,8 @@ RUN chmod -R 755 /app/.output ...@@ -39,8 +42,8 @@ RUN chmod -R 755 /app/.output
ENV NUXT_PUBLIC_VERSION="${APP_VERSION:-}" ENV NUXT_PUBLIC_VERSION="${APP_VERSION:-}"
ENV NUXT_PUBLIC_COMMIT="${COMMIT:-}" ENV NUXT_PUBLIC_COMMIT="${COMMIT:-}"
ENV NODE_OPTIONS="--max_old_space_size=4096" ENV NODE_OPTIONS="--max_old_space_size=256"
EXPOSE 3000 EXPOSE 3000
ENTRYPOINT [ "bun", "run", ".output/server/index.mjs" ] ENTRYPOINT [ "node", ".output/server/index.mjs" ]
a { a {
color: var(--v-theme-primary); } color: var(--v-theme-primary); }
label.native,
select.native {
display: block; }
select.native {
-webkit-appearance: listbox;
border-style: solid;
width: 100%; }
/*# sourceMappingURL=globals.css.map */ /*# sourceMappingURL=globals.css.map */
{ {
"version": 3, "version": 3,
"mappings": "AAAA,CAAE;EACA,KAAK,EAAE,sBAAsB", "mappings": "AAAA,CAAE;EACA,KAAK,EAAE,sBAAsB;;AAG/B;aACc;EACZ,OAAO,EAAE,KAAK;;AAGhB,aAAc;EACZ,kBAAkB,EAAE,OAAO;EAC3B,YAAY,EAAE,KAAK;EACnB,KAAK,EAAE,IAAI",
"sources": ["globals.scss"], "sources": ["globals.scss"],
"names": [], "names": [],
"file": "globals.css" "file": "globals.css"
......
a { a {
color: var(--v-theme-primary); color: var(--v-theme-primary);
} }
label.native,
select.native {
display: block;
}
select.native {
-webkit-appearance: listbox;
border-style: solid;
width: 100%;
}
No preview for this file type
...@@ -19,8 +19,7 @@ if (process.env.NODE_ENV === 'development') { ...@@ -19,8 +19,7 @@ if (process.env.NODE_ENV === 'development') {
/** /**
* https://nuxt.com/docs/guide/concepts/rendering#hybrid-rendering * https://nuxt.com/docs/guide/concepts/rendering#hybrid-rendering
*/ */
const routeRules = { const routeRules = {}
}
export default defineNuxtConfig({ export default defineNuxtConfig({
app: { app: {
...@@ -40,6 +39,8 @@ export default defineNuxtConfig({ ...@@ -40,6 +39,8 @@ export default defineNuxtConfig({
transpile: ['vuetify'], transpile: ['vuetify'],
}, },
builder: 'vite',
css: [ css: [
'vuetify/lib/styles/main.sass', 'vuetify/lib/styles/main.sass',
'@mdi/font/css/materialdesignicons.min.css', '@mdi/font/css/materialdesignicons.min.css',
...@@ -121,9 +122,10 @@ export default defineNuxtConfig({ ...@@ -121,9 +122,10 @@ export default defineNuxtConfig({
}, },
modules: [ modules: [
'@artmizu/nuxt-prometheus',
'@nuxtjs/i18n',
'@pinia/nuxt', '@pinia/nuxt',
'@pinia-plugin-persistedstate/nuxt', '@pinia-plugin-persistedstate/nuxt'
'@nuxtjs/i18n'
], ],
pinia: { pinia: {
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
"prod": "bun run .output/server/index.mjs" "prod": "bun run .output/server/index.mjs"
}, },
"dependencies": { "dependencies": {
"@artmizu/nuxt-prometheus": "^2.4.0",
"@fontsource/open-sans": "^5.0.24", "@fontsource/open-sans": "^5.0.24",
"@mdi/font": "^7.4.47", "@mdi/font": "^7.4.47",
"@nuxtjs/robots": "^3.0.0", "@nuxtjs/robots": "^3.0.0",
...@@ -36,7 +37,7 @@ ...@@ -36,7 +37,7 @@
"vue-meta": "^2.4.0", "vue-meta": "^2.4.0",
"vue-toast-notification": "^3.1.2", "vue-toast-notification": "^3.1.2",
"vue3-ace-editor": "^2.2.4", "vue3-ace-editor": "^2.2.4",
"vuetify": "^3.5.7" "vuetify": "^3.7.2"
}, },
"devDependencies": { "devDependencies": {
"@nuxtjs/i18n": "^8.1.1", "@nuxtjs/i18n": "^8.1.1",
......
export default defineEventHandler((event) => {
event.node.res.setHeader('Content-Type', 'text/plain');
return 'service_started 1'
})
...@@ -329,7 +329,7 @@ services: ...@@ -329,7 +329,7 @@ services:
dbrepo-storage-service: dbrepo-storage-service:
condition: service_healthy condition: service_healthy
healthcheck: healthcheck:
test: wget -qO- localhost:3000 | grep "Database Repository" || exit 1 test: curl -fsSL http://127.0.0.1:3000 && curl -fsSL http://127.0.0.1:3000/health
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 12 retries: 12
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment