This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch ui-polish in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 4c0d59355859a9b9eff3e31d95aa5aceedf46eeb Author: Wu Sheng <[email protected]> AuthorDate: Tue Jun 9 21:25:42 2020 +0800 Add database page dashboard and UI update. --- .../main/resources/ui-initialized-templates.yml | 122 +++++++++++++++++++++ skywalking-ui | 2 +- 2 files changed, 123 insertions(+), 1 deletion(-) diff --git a/oap-server/server-bootstrap/src/main/resources/ui-initialized-templates.yml b/oap-server/server-bootstrap/src/main/resources/ui-initialized-templates.yml index 3ede001..8163ccd 100644 --- a/oap-server/server-bootstrap/src/main/resources/ui-initialized-templates.yml +++ b/oap-server/server-bootstrap/src/main/resources/ui-initialized-templates.yml @@ -514,6 +514,128 @@ templates: # True means wouldn't show up on the dashboard. Only keeps the definition in the storage. disabled: false + - name: "Database" + # The type includes DASHBOARD, TOPOLOGY_INSTANCE, TOPOLOGY_ENDPOINT. + # DASHBOARD type templates could have multiple definitions, by using different names. + # TOPOLOGY_INSTANCE, TOPOLOGY_ENDPOINT type templates should be defined once, as they are used in the topology page only. + type: "DASHBOARD" + # Configuration could be defined through UI, and use `export` to format in the standard JSON. + configuration: |- + [ + { + "name": "Database", + "type": "database", + "children": [ + { + "name": "Database", + "children": [ + { + "width": 3, + "title": "Database Avg Response Time", + "height": 350, + "entityType": "Service", + "independentSelector": false, + "metricType": "REGULAR_VALUE", + "metricName": "database_access_resp_time", + "queryMetricType": "readMetricsValues", + "chartType": "ChartLine", + "unit": "ms" + }, + { + "width": 3, + "title": "Database Access Successful Rate", + "height": 350, + "entityType": "Service", + "independentSelector": false, + "metricType": "REGULAR_VALUE", + "metricName": "database_access_sla", + "queryMetricType": "readMetricsValues", + "chartType": "ChartLine", + "unit": "%", + "aggregation": "/", + "aggregationNum": "100" + }, + { + "width": 3, + "title": "Database Traffic", + "height": 350, + "entityType": "Service", + "independentSelector": false, + "metricType": "REGULAR_VALUE", + "metricName": "database_access_cpm", + "queryMetricType": "readMetricsValues", + "chartType": "ChartLine", + "unit": "CPM - calls per minute" + }, + { + "width": 3, + "title": "Database Access Latency Percentile", + "height": 350, + "entityType": "Service", + "independentSelector": false, + "metricType": "LABELED_VALUE", + "metricName": "database_access_percentile", + "queryMetricType": "readLabeledMetricsValues", + "chartType": "ChartLine", + "metricLabels": "P50, P75, P90, P95, P99", + "labelsIndex": "0, 1, 2, 3, 4", + "unit": "ms" + }, + { + "width": "6", + "title": "Slow Statements", + "height": 350, + "entityType": "Service", + "independentSelector": false, + "metricType": "SAMPLED_RECORD", + "metricName": "top_n_database_statement", + "queryMetricType": "readSampledRecords", + "chartType": "ChartSlow", + "parentService": true, + "sortOrder": "DES", + "unit": "ms" + }, + { + "width": 3, + "title": "All Database Loads", + "height": 350, + "entityType": "Service", + "independentSelector": false, + "metricType": "REGULAR_VALUE", + "metricName": "database_access_cpm", + "queryMetricType": "sortMetrics", + "chartType": "ChartSlow", + "parentService": false, + "sortOrder": "DES", + "unit": "CPM - calls per minute" + }, + { + "width": 3, + "title": "Un-Health Databases (Successful Rate)", + "height": 350, + "entityType": "Service", + "independentSelector": false, + "metricType": "REGULAR_VALUE", + "metricName": "database_access_sla", + "queryMetricType": "sortMetrics", + "chartType": "ChartSlow", + "parentService": false, + "sortOrder": "ASC", + "unit": "%", + "aggregation": "/", + "aggregationNum": "100" + } + ] + } + ] + } + ] + # Activated as the DASHBOARD type, makes this templates added into the UI page automatically. + # False means providing a basic template, user needs to add it manually. + activated: true + # True means wouldn't show up on the dashboard. Only keeps the definition in the storage. + disabled: false + - name: "Topology Instance" # The type includes DASHBOARD, TOPOLOGY_INSTANCE, TOPOLOGY_ENDPOINT. # DASHBOARD type templates could have multiple definitions, by using different names. diff --git a/skywalking-ui b/skywalking-ui index 903a3e8..b0e4726 160000 --- a/skywalking-ui +++ b/skywalking-ui @@ -1 +1 @@ -Subproject commit 903a3e856f62bfa68e790d2d1263244900d14f62 +Subproject commit b0e47262fa76b39b8fe58bff1f737892e84e7709
