This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new d30361d6bd Apply MQE on Virtual_MQ and Infra Linux layer UI-templates
(#11127)
d30361d6bd is described below
commit d30361d6bd326ee003d3408a599d617802978764
Author: block666 <[email protected]>
AuthorDate: Wed Aug 9 13:00:43 2023 +0800
Apply MQE on Virtual_MQ and Infra Linux layer UI-templates (#11127)
---
docs/en/changes/changes.md | 2 +
.../resources/ui-initialized-templates/menu.yaml | 6 +-
.../os_linux/linux-root.json | 18 ++-
.../os_linux/linux-service.json | 151 ++++++++++-----------
.../virtual_mq/virtual-mq-endpoint.json | 76 +++++++----
.../virtual_mq/virtual-mq-root.json | 48 ++++---
.../virtual_mq/virtual-mq-service.json | 119 ++++++++--------
test/e2e-v2/cases/menu/expected/menu.yml | 2 +-
.../virtual-mq/expected/metrics-has-value.yml | 26 ++--
test/e2e-v2/cases/virtual-mq/mq-cases.yaml | 4 +-
...lue.yml => metrics-has-average-value-label.yml} | 41 ++++--
....yml => metrics-has-mountpoint-value-label.yml} | 41 ++++--
.../e2e-v2/cases/vm/expected/metrics-has-value.yml | 26 ++--
...e-label.yml => metrics-has-vfs-value-label.yml} | 32 +++--
.../cases/vm/prometheus-node-exporter/e2e.yaml | 16 +--
test/e2e-v2/cases/vm/telegraf/e2e.yaml | 14 +-
test/e2e-v2/cases/vm/vm-cases.yaml | 10 +-
test/e2e-v2/cases/vm/zabbix/e2e.yaml | 4 +-
18 files changed, 372 insertions(+), 264 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 9b3d23f433..c2a2066994 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -68,6 +68,8 @@
* Apply MQE on RabbitMQ Dashboards.
* Use listening mode for apollo implementation of dynamic configuration.
* Add `view_as_seq` function in MQE for listing metrics in the given
prioritized sequence.
+* Apply MQE on Virtual-MQ layer UI-templates
+* Apply MQE on Infra-Linux layer UI-templates
#### UI
diff --git
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/menu.yaml
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/menu.yaml
index c0244c3ccd..0ba044653d 100644
---
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/menu.yaml
+++
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/menu.yaml
@@ -32,17 +32,17 @@ menus:
description: Observe services through telemetry data collected from
SkyWalking Agent.
documentLink:
https://skywalking.apache.org/docs/main/next/en/setup/service-agent/server-agents/
i18nKey: general_service_services
- - title: Visual Database
+ - title: Virtual Database
layer: VIRTUAL_DATABASE
description: Observe the virtual databases which are conjectured by
language agents through various plugins.
documentLink:
https://skywalking.apache.org/docs/main/next/en/setup/service-agent/virtual-database/
i18nKey: general_service_virtual_database
- - title: Visual Cache
+ - title: Virtual Cache
layer: VIRTUAL_CACHE
description: Observe the virtual cache servers which are conjectured
by language agents through various plugins.
documentLink:
https://skywalking.apache.org/docs/main/next/en/setup/service-agent/virtual-cache/
i18nKey: general_service_virtual_cache
- - title: Visual MQ
+ - title: Virtual MQ
layer: VIRTUAL_MQ
description: Observe the virtual message queue servers which are
conjectured by language agents through various plugins.
documentLink:
https://skywalking.apache.org/docs/main/next/en/setup/service-agent/virtual-mq/
diff --git
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/os_linux/linux-root.json
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/os_linux/linux-root.json
index f88ed062af..1e320e2083 100644
---
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/os_linux/linux-root.json
+++
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/os_linux/linux-root.json
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-[
+ [
{
"id": "Linux-Root",
"configuration": {
@@ -38,18 +38,24 @@
"showYAxis": false,
"showGroup": false
},
- "metrics": [
+ "expressions": [
+ "avg(meter_vm_cpu_total_percentage)"
+ ],
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
+ ],
+ "subExpressions": [
"meter_vm_cpu_total_percentage"
],
- "metricTypes": [
- "readMetricsValues"
+ "subTypesOfMQE": [
+ "TIME_SERIES_VALUES"
],
"moved": false,
"metricConfig": [
{
"label": "CPU Usage",
- "unit": "%",
- "calculation": "average"
+ "unit": "%"
}
]
},
diff --git
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/os_linux/linux-service.json
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/os_linux/linux-service.json
index 48dd7304ee..32f3accfce 100644
---
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/os_linux/linux-service.json
+++
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/os_linux/linux-service.json
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-[
+ [
{
"id": "Linux-Service",
"configuration": {
@@ -38,11 +38,12 @@
"showXAxis": true,
"showYAxis": true
},
- "metrics": [
+ "expressions": [
"meter_vm_filefd_allocated"
],
- "metricTypes": [
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
"metricConfig": [
{
@@ -66,19 +67,20 @@
"showXAxis": true,
"showYAxis": true
},
- "metrics": [
+ "expressions": [
"meter_vm_tcp_curr_estab",
"meter_vm_tcp_tw",
"meter_vm_tcp_alloc",
"meter_vm_sockets_used",
"meter_vm_udp_inuse"
],
- "metricTypes": [
- "readMetricsValues",
- "readMetricsValues",
- "readMetricsValues",
- "readMetricsValues",
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES"
],
"metricConfig": [
{
@@ -114,13 +116,14 @@
"showXAxis": true,
"showYAxis": true
},
- "metrics": [
+ "expressions": [
"meter_vm_network_receive",
"meter_vm_network_transmit"
],
- "metricTypes": [
- "readMetricsValues",
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES"
],
"metricConfig": [
{
@@ -147,21 +150,20 @@
"showXAxis": true,
"showYAxis": true
},
- "metrics": [
- "meter_vm_disk_read",
- "meter_vm_disk_written"
+ "expressions": [
+ "meter_vm_disk_read/1024",
+ "meter_vm_disk_written/1024"
],
- "metricTypes": [
- "readMetricsValues",
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES"
],
"metricConfig": [
{
- "calculation": "byteToKB",
"label": "read"
},
{
- "calculation": "byteToKB",
"label": "written"
}
]
@@ -183,11 +185,12 @@
"showXAxis": true,
"showYAxis": true
},
- "metrics": [
+ "expressions": [
"meter_vm_filesystem_percentage"
],
- "metricTypes": [
- "readLabeledMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
]
},
{
@@ -208,11 +211,12 @@
"showXAxis": true,
"showYAxis": true
},
- "metrics": [
+ "expressions": [
"meter_vm_cpu_average_used"
],
- "metricTypes": [
- "readLabeledMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
]
},
{
@@ -231,33 +235,30 @@
"showXAxis": true,
"showYAxis": true
},
- "metrics": [
- "meter_vm_memory_used",
- "meter_vm_memory_total",
- "meter_vm_memory_available",
- "meter_vm_memory_buff_cache"
+ "expressions": [
+ "meter_vm_memory_used/1024/1024",
+ "meter_vm_memory_total/1024/1024",
+ "meter_vm_memory_available/1024/1024",
+ "meter_vm_memory_buff_cache/1024/1024"
],
- "metricTypes": [
- "readMetricsValues",
- "readMetricsValues",
- "readMetricsValues",
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES"
],
"metricConfig": [
{
- "calculation": "byteToMB",
"label": "used"
},
{
- "calculation": "byteToMB",
"label": "total"
},
{
- "calculation": "byteToMB",
"label": "available"
},
{
- "calculation": "byteToMB",
"label": "buffer_cache"
}
]
@@ -280,27 +281,25 @@
"showXAxis": true,
"showYAxis": true
},
- "metrics": [
- "meter_vm_cpu_load5",
- "meter_vm_cpu_load1",
- "meter_vm_cpu_load15"
+ "expressions": [
+ "meter_vm_cpu_load5/100",
+ "meter_vm_cpu_load1/100",
+ "meter_vm_cpu_load15/100"
],
- "metricTypes": [
- "readMetricsValues",
- "readMetricsValues",
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES"
],
"metricConfig": [
{
- "calculation": "percentage",
"label": "load5"
},
{
- "calculation": "percentage",
"label": "load1"
},
{
- "calculation": "percentage",
"label": "load15"
}
]
@@ -321,21 +320,20 @@
"showXAxis": true,
"showYAxis": true
},
- "metrics": [
- "meter_vm_memory_swap_free",
- "meter_vm_memory_swap_total"
+ "expressions": [
+ "meter_vm_memory_swap_free/1024/1024",
+ "meter_vm_memory_swap_total/1024/1024"
],
- "metricTypes": [
- "readMetricsValues",
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES"
],
"metricConfig": [
{
- "calculation": "byteToMB",
"label": "free"
},
{
- "calculation": "byteToMB",
"label": "total"
}
]
@@ -356,15 +354,15 @@
"textAlign": "center",
"showUnit": true
},
- "metrics": [
- "meter_vm_memory_swap_percentage"
+ "expressions": [
+ "meter_vm_memory_swap_percentage/100"
],
- "metricTypes": [
- "readMetricsValue"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
"metricConfig": [
{
- "calculation": "percentage",
"unit": "%"
}
]
@@ -385,15 +383,15 @@
"textAlign": "center",
"showUnit": true
},
- "metrics": [
- "meter_vm_memory_used"
+ "expressions": [
+ "meter_vm_memory_used/1024/1024"
],
- "metricTypes": [
- "readMetricsValue"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
"metricConfig": [
{
- "calculation": "byteToMB",
"unit": "MB"
}
]
@@ -414,11 +412,12 @@
"textAlign": "center",
"showUnit": true
},
- "metrics": [
- "meter_vm_cpu_total_percentage"
+ "expressions": [
+ "avg(meter_vm_cpu_total_percentage)"
],
- "metricTypes": [
- "readMetricsValue"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
"metricConfig": [
{
diff --git
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_mq/virtual-mq-endpoint.json
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_mq/virtual-mq-endpoint.json
index 4899df2ab4..05e185e1f3 100644
---
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_mq/virtual-mq-endpoint.json
+++
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_mq/virtual-mq-endpoint.json
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-[
+ [
{
"id": "Virtual-MQ-Endpoint",
"configuration": {
@@ -38,11 +38,18 @@
"showXAxis": true,
"showYAxis": true
},
- "metrics": [
+ "expressions": [
"mq_endpoint_consume_cpm"
],
- "metricTypes": [
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
+ ],
+ "metricConfig": [
+ {
+ "unit": "calls / min",
+ "label": "Consume Traffic"
+ }
],
"associate": [
{
@@ -84,15 +91,17 @@
"showXAxis": true,
"showYAxis": true
},
- "metrics": [
- "mq_endpoint_consume_sla"
+ "expressions": [
+ "mq_endpoint_consume_sla/100"
],
- "metricTypes": [
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
"metricConfig": [
{
- "calculation": "percentage"
+ "unit": "%",
+ "label": "Successful Rate"
}
],
"associate": [
@@ -134,16 +143,17 @@
"showXAxis": true,
"showYAxis": true
},
- "metrics": [
- "mq_endpoint_consume_percentile"
+ "expressions": [
+
"relabels(mq_endpoint_consume_percentile{_='0,1,2,3,4'},_='P50,P75,P90,P95,P99')"
],
- "metricTypes": [
- "readLabeledMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "SINGLE_VALUE"
],
"metricConfig": [
{
- "label": "P50, P75, P90, P95, P99",
- "labelsIndex": "0,1,2,3,4"
+ "unit": "ms",
+ "label": "Latency Percentile"
}
],
"associate": [
@@ -186,16 +196,17 @@
"showXAxis": true,
"showYAxis": true
},
- "metrics": [
+ "expressions": [
"mq_endpoint_consume_latency"
],
- "metricTypes": [
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
"metricConfig": [
{
- "label": "P50, P75, P90, P95, P99",
- "labelsIndex": "0,1,2,3,4"
+ "unit": "ms",
+ "label": "AVG Latency"
}
],
"associate": [
@@ -238,11 +249,18 @@
"showXAxis": true,
"showYAxis": true
},
- "metrics": [
+ "expressions": [
"mq_endpoint_produce_cpm"
],
- "metricTypes": [
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
+ ],
+ "metricConfig": [
+ {
+ "unit": "calls / min",
+ "label": "Produce Traffic"
+ }
],
"associate": [
{
@@ -284,15 +302,17 @@
"showXAxis": true,
"showYAxis": true
},
- "metrics": [
- "mq_endpoint_produce_sla"
+ "expressions": [
+ "mq_endpoint_produce_sla/100"
],
- "metricTypes": [
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
"metricConfig": [
{
- "calculation": "percentage"
+ "unit": "%",
+ "label": "Successful Rate"
}
],
"associate": [
diff --git
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_mq/virtual-mq-root.json
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_mq/virtual-mq-root.json
index 97d00bab7f..cad7f83be3 100644
---
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_mq/virtual-mq-root.json
+++
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_mq/virtual-mq-root.json
@@ -38,46 +38,56 @@
"showYAxis": false,
"showGroup": false
},
- "metrics": [
+ "expressions": [
+ "avg(mq_service_consume_latency)",
+ "avg(mq_service_consume_sla)/100",
+ "avg(mq_service_consume_cpm)",
+ "avg(mq_service_produce_sla)/100",
+ "avg(mq_service_produce_cpm)"
+ ],
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES"
+ ],
+ "subExpressions": [
"mq_service_consume_latency",
- "mq_service_consume_sla",
+ "mq_service_consume_sla/100",
"mq_service_consume_cpm",
- "mq_service_produce_sla",
+ "mq_service_produce_sla/100",
"mq_service_produce_cpm"
],
- "metricTypes": [
- "readMetricsValues",
- "readMetricsValues",
- "readMetricsValues",
- "readMetricsValues",
- "readMetricsValues"
+ "subTypesOfMQE": [
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES"
],
"moved": false,
"metricConfig": [
{
"unit": "ms",
- "label": "Transmission Latency",
- "calculation": "average"
+ "label": "Transmission Latency"
},
{
"label": "Consume Successful Rate",
- "unit": "%",
- "calculation": "percentageAvg"
+ "unit": "%"
},
{
"label": "Consume Traffic",
- "unit": "calls / min",
- "calculation": "average"
+ "unit": "calls / min"
},
{
"label": "Produce Successful Rate",
- "unit": "%",
- "calculation": "percentageAvg"
+ "unit": "%"
},
{
"label": "Produce Traffic",
- "unit": "calls / min",
- "calculation": "average"
+ "unit": "calls / min"
}
]
}
diff --git
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_mq/virtual-mq-service.json
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_mq/virtual-mq-service.json
index 97928fae16..e524eb6db1 100644
---
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_mq/virtual-mq-service.json
+++
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_mq/virtual-mq-service.json
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-[
+ [
{
"id": "Virtual-MQ-Service",
"configuration": {
@@ -38,11 +38,18 @@
"showXAxis": true,
"showYAxis": true
},
- "metrics": [
+ "expressions": [
"mq_service_consume_cpm"
],
- "metricTypes": [
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
+ ],
+ "metricConfig": [
+ {
+ "unit": "calls / min",
+ "label": "Consume Traffic"
+ }
],
"associate": [
{
@@ -84,15 +91,17 @@
"showXAxis": true,
"showYAxis": true
},
- "metrics": [
- "mq_service_consume_sla"
+ "expressions": [
+ "mq_service_consume_sla/100"
],
- "metricTypes": [
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
"metricConfig": [
{
- "calculation": "percentage"
+ "unit": "%",
+ "label": "Successful Rate"
}
],
"associate": [
@@ -134,16 +143,17 @@
"showXAxis": true,
"showYAxis": true
},
- "metrics": [
- "mq_service_consume_percentile"
+ "expressions": [
+
"relabels(mq_service_consume_percentile{_='0,1,2,3,4'},_='P50,P75,P90,P95,P99')"
],
- "metricTypes": [
- "readLabeledMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "SINGLE_VALUE"
],
"metricConfig": [
{
- "label": "P50, P75, P90, P95, P99",
- "labelsIndex": "0,1,2,3,4"
+ "unit": "ms",
+ "label": "Latency Percentile"
}
],
"associate": [
@@ -167,7 +177,6 @@
}
]
},
-
{
"x": 18,
"y": 0,
@@ -186,16 +195,17 @@
"showXAxis": true,
"showYAxis": true
},
- "metrics": [
+ "expressions": [
"mq_service_consume_latency"
],
- "metricTypes": [
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
"metricConfig": [
{
- "label": "P50, P75, P90, P95, P99",
- "labelsIndex": "0,1,2,3,4"
+ "unit": "ms",
+ "label": "AVG Latency"
}
],
"associate": [
@@ -219,7 +229,6 @@
}
]
},
-
{
"x": 0,
"y": 13,
@@ -238,11 +247,18 @@
"showXAxis": true,
"showYAxis": true
},
- "metrics": [
+ "expressions": [
"mq_service_produce_cpm"
],
- "metricTypes": [
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
+ ],
+ "metricConfig": [
+ {
+ "unit": "calls / min",
+ "label": "Produce Traffic"
+ }
],
"associate": [
{
@@ -284,15 +300,17 @@
"showXAxis": true,
"showYAxis": true
},
- "metrics": [
- "mq_service_produce_sla"
+ "expressions": [
+ "mq_service_produce_sla/100"
],
- "metricTypes": [
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
"metricConfig": [
{
- "calculation": "percentage"
+ "unit": "%",
+ "label": "Successful Rate"
}
],
"associate": [
@@ -316,7 +334,6 @@
}
]
},
-
{
"x": 0,
"y": 26,
@@ -332,46 +349,42 @@
"showYAxis": false,
"showGroup": true
},
- "metrics": [
- "mq_endpoint_consume_latency",
- "mq_endpoint_consume_sla",
- "mq_endpoint_consume_cpm",
- "mq_endpoint_produce_sla",
- "mq_endpoint_produce_cpm"
+ "expressions": [
+ "avg(mq_endpoint_consume_latency)",
+ "avg(mq_endpoint_consume_sla)/100",
+ "avg(mq_endpoint_consume_cpm)",
+ "avg(mq_endpoint_produce_sla)/100",
+ "avg(mq_endpoint_produce_cpm)"
],
- "metricTypes": [
- "readMetricsValues",
- "readMetricsValues",
- "readMetricsValues",
- "readMetricsValues",
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES"
],
"moved": false,
"metricConfig": [
{
"unit": "ms",
- "label": "Transmission Latency",
- "calculation": "average"
+ "label": "Transmission Latency"
},
{
"label": "Consume Successful Rate",
- "unit": "%",
- "calculation": "percentageAvg"
+ "unit": "%"
},
{
"label": "Consume Traffic",
- "unit": "calls / min",
- "calculation": "average"
+ "unit": "calls / min"
},
{
"label": "Produce Successful Rate",
- "unit": "%",
- "calculation": "percentageAvg"
+ "unit": "%"
},
{
"label": "Produce Traffic",
- "unit": "calls / min",
- "calculation": "average"
+ "unit": "calls / min"
}
]
}
diff --git a/test/e2e-v2/cases/menu/expected/menu.yml
b/test/e2e-v2/cases/menu/expected/menu.yml
index 1c6304ccee..acaeb21b09 100644
--- a/test/e2e-v2/cases/menu/expected/menu.yml
+++ b/test/e2e-v2/cases/menu/expected/menu.yml
@@ -33,7 +33,7 @@
Agent.
documentlink:
https://skywalking.apache.org/docs/main/next/en/setup/service-agent/server-agents/
i18nkey: general_service_services
- - title: Visual Database
+ - title: Virtual Database
icon: null
layer: VIRTUAL_DATABASE
activate: true
diff --git a/test/e2e-v2/cases/virtual-mq/expected/metrics-has-value.yml
b/test/e2e-v2/cases/virtual-mq/expected/metrics-has-value.yml
index 04b077dd98..c4bbbafa3b 100644
--- a/test/e2e-v2/cases/virtual-mq/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/virtual-mq/expected/metrics-has-value.yml
@@ -13,13 +13,19 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-{{- contains . }}
-- key: {{ notEmpty .key }}
- value:
- value: 0
- isemptyvalue: true
-- key: {{ notEmpty .key }}
- value:
- value: {{ ge .value.value 1 }}
- isemptyvalue: false
-{{- end }}
+type: TIME_SERIES_VALUES
+results:
+ {{- contains .results }}
+ - metric:
+ labels: []
+ values:
+ {{- contains .values }}
+ - id: {{ notEmpty .id }}
+ value: {{ .value }}
+ traceid: null
+ - id: {{ notEmpty .id }}
+ value: null
+ traceid: null
+ {{- end}}
+ {{- end}}
+error: null
\ No newline at end of file
diff --git a/test/e2e-v2/cases/virtual-mq/mq-cases.yaml
b/test/e2e-v2/cases/virtual-mq/mq-cases.yaml
index 3d6708688d..d7b59a700a 100644
--- a/test/e2e-v2/cases/virtual-mq/mq-cases.yaml
+++ b/test/e2e-v2/cases/virtual-mq/mq-cases.yaml
@@ -21,8 +21,8 @@
- query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql endpoint list
--service-id=a2Fma2E6OTA5Mg==.0
expected: expected/service-endpoint.yml
# endpoint metrics
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=mq_service_consume_latency --service-id=a2Fma2E6OTA5Mg==.0 |yq e
'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=mq_service_consume_latency --service-id=a2Fma2E6OTA5Mg==.0
expected: expected/metrics-has-value.yml
# endpoint metrics
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=mq_endpoint_consume_cpm --endpoint-name='topic'
--service-id=a2Fma2E6OTA5Mg==.0 |yq e 'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=mq_endpoint_consume_cpm --endpoint-name='topic'
--service-id=a2Fma2E6OTA5Mg==.0
expected: expected/metrics-has-value.yml
\ No newline at end of file
diff --git a/test/e2e-v2/cases/vm/expected/metrics-has-value.yml
b/test/e2e-v2/cases/vm/expected/metrics-has-average-value-label.yml
similarity index 54%
copy from test/e2e-v2/cases/vm/expected/metrics-has-value.yml
copy to test/e2e-v2/cases/vm/expected/metrics-has-average-value-label.yml
index 04b077dd98..df8a117821 100644
--- a/test/e2e-v2/cases/vm/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/vm/expected/metrics-has-average-value-label.yml
@@ -13,13 +13,34 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-{{- contains . }}
-- key: {{ notEmpty .key }}
- value:
- value: 0
- isemptyvalue: true
-- key: {{ notEmpty .key }}
- value:
- value: {{ ge .value.value 1 }}
- isemptyvalue: false
-{{- end }}
+type: TIME_SERIES_VALUES
+results:
+ {{- contains .results }}
+ - metric:
+ labels:
+ - key: _
+ value: "idle"
+ values:
+ {{- contains .values }}
+ - id: {{ notEmpty .id }}
+ value: {{ .value }}
+ traceid: null
+ - id: {{ notEmpty .id }}
+ value: null
+ traceid: null
+ {{- end}}
+ - metric:
+ labels:
+ - key: _
+ value: "user"
+ values:
+ {{- contains .values }}
+ - id: {{ notEmpty .id }}
+ value: {{ .value }}
+ traceid: null
+ - id: {{ notEmpty .id }}
+ value: null
+ traceid: null
+ {{- end}}
+ {{- end}}
+error: null
\ No newline at end of file
diff --git a/test/e2e-v2/cases/vm/expected/metrics-has-value.yml
b/test/e2e-v2/cases/vm/expected/metrics-has-mountpoint-value-label.yml
similarity index 54%
copy from test/e2e-v2/cases/vm/expected/metrics-has-value.yml
copy to test/e2e-v2/cases/vm/expected/metrics-has-mountpoint-value-label.yml
index 04b077dd98..52f90c0a68 100644
--- a/test/e2e-v2/cases/vm/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/vm/expected/metrics-has-mountpoint-value-label.yml
@@ -13,13 +13,34 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-{{- contains . }}
-- key: {{ notEmpty .key }}
- value:
- value: 0
- isemptyvalue: true
-- key: {{ notEmpty .key }}
- value:
- value: {{ ge .value.value 1 }}
- isemptyvalue: false
-{{- end }}
+type: TIME_SERIES_VALUES
+results:
+ {{- contains .results }}
+ - metric:
+ labels:
+ - key: _
+ value: "/etc/hosts"
+ values:
+ {{- contains .values }}
+ - id: {{ notEmpty .id }}
+ value: {{ .value }}
+ traceid: null
+ - id: {{ notEmpty .id }}
+ value: null
+ traceid: null
+ {{- end}}
+ - metric:
+ labels:
+ - key: _
+ value: "/etc/hostname"
+ values:
+ {{- contains .values }}
+ - id: {{ notEmpty .id }}
+ value: {{ .value }}
+ traceid: null
+ - id: {{ notEmpty .id }}
+ value: null
+ traceid: null
+ {{- end}}
+ {{- end}}
+error: null
\ No newline at end of file
diff --git a/test/e2e-v2/cases/vm/expected/metrics-has-value.yml
b/test/e2e-v2/cases/vm/expected/metrics-has-value.yml
index 04b077dd98..dc71f56632 100644
--- a/test/e2e-v2/cases/vm/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/vm/expected/metrics-has-value.yml
@@ -13,13 +13,19 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-{{- contains . }}
-- key: {{ notEmpty .key }}
- value:
- value: 0
- isemptyvalue: true
-- key: {{ notEmpty .key }}
- value:
- value: {{ ge .value.value 1 }}
- isemptyvalue: false
-{{- end }}
+type: TIME_SERIES_VALUES
+results:
+ {{- contains .results }}
+ - metric:
+ labels: []
+ values:
+ {{- contains .values }}
+ - id: {{ notEmpty .id }}
+ value: {{ .value }}
+ traceid: null
+ - id: {{ notEmpty .id }}
+ value: null
+ traceid: null
+ {{- end}}
+ {{- end}}
+error: null
diff --git a/test/e2e-v2/cases/vm/expected/metrics-has-value-label.yml
b/test/e2e-v2/cases/vm/expected/metrics-has-vfs-value-label.yml
similarity index 68%
rename from test/e2e-v2/cases/vm/expected/metrics-has-value-label.yml
rename to test/e2e-v2/cases/vm/expected/metrics-has-vfs-value-label.yml
index fb38843650..f94f2417f9 100644
--- a/test/e2e-v2/cases/vm/expected/metrics-has-value-label.yml
+++ b/test/e2e-v2/cases/vm/expected/metrics-has-vfs-value-label.yml
@@ -13,17 +13,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-{{- contains . }}
-- key: {{ notEmpty .key }}
- value:
- {{- contains .value }}
- - key: {{ notEmpty .key }}
- value:
- value: 0
- isemptyvalue: true
- - key: {{ notEmpty .key }}
- value:
- value: {{ ge .value.value 1 }}
- isemptyvalue: false
- {{- end }}
-{{- end }}
+type: TIME_SERIES_VALUES
+results:
+ {{- contains .results }}
+ - metric:
+ labels:
+ - key: _
+ value: "/-total"
+ values:
+ {{- contains .values }}
+ - id: {{ notEmpty .id }}
+ value: {{ .value }}
+ traceid: null
+ - id: {{ notEmpty .id }}
+ value: null
+ traceid: null
+ {{- end}}
+ {{- end}}
+error: null
\ No newline at end of file
diff --git a/test/e2e-v2/cases/vm/prometheus-node-exporter/e2e.yaml
b/test/e2e-v2/cases/vm/prometheus-node-exporter/e2e.yaml
index ff7f52ee95..bc74e963bc 100644
--- a/test/e2e-v2/cases/vm/prometheus-node-exporter/e2e.yaml
+++ b/test/e2e-v2/cases/vm/prometheus-node-exporter/e2e.yaml
@@ -35,17 +35,17 @@ verify:
cases:
- includes:
- ../vm-cases.yaml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=meter_vm_network_transmit --service-name=vm-service |yq e 'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_vm_network_transmit --service-name=vm-service
expected: ../expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=meter_vm_tcp_curr_estab --service-name=vm-service |yq e 'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_vm_tcp_curr_estab --service-name=vm-service
expected: ../expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=meter_vm_tcp_alloc --service-name=vm-service |yq e 'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_vm_tcp_alloc --service-name=vm-service
expected: ../expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=meter_vm_sockets_used --service-name=vm-service |yq e 'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_vm_sockets_used --service-name=vm-service
expected: ../expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=meter_vm_udp_inuse --service-name=vm-service |yq e 'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_vm_udp_inuse --service-name=vm-service
expected: ../expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=meter_vm_filefd_allocated --service-name=vm-service |yq e 'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_vm_filefd_allocated --service-name=vm-service
expected: ../expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics multiple-linear
--name=meter_vm_filesystem_percentage --labels=/etc/hosts
--service-name=vm-service |yq e 'to_entries | with(.[] ; .value=(.value |
to_entries))' -
- expected: ../expected/metrics-has-value-label.yml
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_vm_filesystem_percentage --service-name=vm-service
+ expected: ../expected/metrics-has-mountpoint-value-label.yml
\ No newline at end of file
diff --git a/test/e2e-v2/cases/vm/telegraf/e2e.yaml
b/test/e2e-v2/cases/vm/telegraf/e2e.yaml
index a897c556cc..8bed24f463 100644
--- a/test/e2e-v2/cases/vm/telegraf/e2e.yaml
+++ b/test/e2e-v2/cases/vm/telegraf/e2e.yaml
@@ -37,17 +37,17 @@ verify:
- query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql service ls
expected: ../expected/service.yml
# linear metrics
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=meter_vm_memory_used --service-name=vm-service |yq e 'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_vm_memory_used --service-name=vm-service
expected: ../expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=meter_vm_memory_total --service-name=vm-service |yq e 'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_vm_memory_total --service-name=vm-service
expected: ../expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=meter_vm_memory_available --service-name=vm-service |yq e 'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_vm_memory_available --service-name=vm-service
expected: ../expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=meter_vm_cpu_total_percentage --service-name=vm-service |yq e
'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_vm_cpu_total_percentage --service-name=vm-service
expected: ../expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=meter_vm_cpu_load1 --service-name=vm-service |yq e 'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_vm_cpu_load1 --service-name=vm-service
expected: ../expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=meter_vm_cpu_load5 --service-name=vm-service |yq e 'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_vm_cpu_load5 --service-name=vm-service
expected: ../expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=meter_vm_cpu_load15 --service-name=vm-service |yq e 'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_vm_cpu_load15 --service-name=vm-service
expected: ../expected/metrics-has-value.yml
\ No newline at end of file
diff --git a/test/e2e-v2/cases/vm/vm-cases.yaml
b/test/e2e-v2/cases/vm/vm-cases.yaml
index 20abb8e343..faeb35778f 100644
--- a/test/e2e-v2/cases/vm/vm-cases.yaml
+++ b/test/e2e-v2/cases/vm/vm-cases.yaml
@@ -20,12 +20,12 @@
- query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql service ls
expected: expected/service.yml
# linear metrics
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=meter_vm_memory_used --service-name=vm-service |yq e 'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_vm_memory_used --service-name=vm-service
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=meter_vm_memory_total --service-name=vm-service |yq e 'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_vm_memory_total --service-name=vm-service
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=meter_vm_memory_available --service-name=vm-service |yq e 'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_vm_memory_available --service-name=vm-service
expected: expected/metrics-has-value.yml
# multiple-linear metrics
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics multiple-linear
--name=meter_vm_cpu_average_used --labels=idle --service-name=vm-service |yq e
'to_entries | with(.[] ; .value=(.value | to_entries))' -
- expected: expected/metrics-has-value-label.yml
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_vm_cpu_average_used --service-name=vm-service
+ expected: expected/metrics-has-average-value-label.yml
diff --git a/test/e2e-v2/cases/vm/zabbix/e2e.yaml
b/test/e2e-v2/cases/vm/zabbix/e2e.yaml
index cc02407a91..e5a3785fff 100644
--- a/test/e2e-v2/cases/vm/zabbix/e2e.yaml
+++ b/test/e2e-v2/cases/vm/zabbix/e2e.yaml
@@ -35,5 +35,5 @@ verify:
cases:
- includes:
- ../vm-cases.yaml
- - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics multiple-linear
--name=meter_vm_vfs_fs_size --labels=/-total --service-name=vm-service |yq e
'to_entries | with(.[] ; .value=(.value | to_entries))' -
- expected: ../expected/metrics-has-value-label.yml
+ - query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics exec
--expression=meter_vm_vfs_fs_size --service-name=vm-service
+ expected: ../expected/metrics-has-vfs-value-label.yml
