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 7ff7d73642 Apply MQE on K8s layer UI-templates (#11350)
7ff7d73642 is described below
commit 7ff7d73642f2a2b1bf2a79efc019c3fa00106c60
Author: block666 <47653926+smartboy37...@users.noreply.github.com>
AuthorDate: Sun Sep 24 12:37:14 2023 +0800
Apply MQE on K8s layer UI-templates (#11350)
---
docs/en/changes/changes.md | 1 +
.../ui-initialized-templates/k8s/k8s-cluster.json | 184 +++++-----
.../ui-initialized-templates/k8s/k8s-node.json | 115 +++----
.../ui-initialized-templates/k8s/k8s-root.json | 51 ++-
.../k8s_service/k8s-process-relation.json | 373 +++++++++++----------
.../k8s_service/k8s-service-pod.json | 16 -
.../k8s_service/k8s-service-root.json | 44 +--
.../k8s_service/k8s-service-service.json | 85 ++---
...abel.yml => metrics-has-client-value-label.yml} | 35 +-
.../expected/metrics-has-http1-value-label.yml | 73 ++++
...abel.yml => metrics-has-server-value-label.yml} | 35 +-
.../ebpf/network/expected/metrics-has-value.yml | 26 +-
.../profiling/ebpf/network/network-cases.yaml | 79 ++---
13 files changed, 568 insertions(+), 549 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 7495c6878d..5e5916a3e7 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -11,6 +11,7 @@
* [Breaking Change] Elasticsearch storage merge all management data indices
into one index `management`,
including `ui_template，ui_menu，continuous_profiling_policy`.
* Add a release mechanism for alarm windows when it is expired in case of OOM.
+* Apply MQE on K8s layer UI-templates
#### UI
diff --git
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s/k8s-cluster.json
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s/k8s-cluster.json
index 4abe90c4f7..36cc9aab0a 100644
---
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s/k8s-cluster.json
+++
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s/k8s-cluster.json
@@ -1,19 +1,3 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
[
{
@@ -47,17 +31,18 @@
"showXAxis": true,
"showYAxis": true
},
- "metrics": [
+ "expressions": [
"k8s_cluster_cpu_cores",
"k8s_cluster_cpu_cores_requests",
"k8s_cluster_cpu_cores_limits",
"k8s_cluster_cpu_cores_allocatable"
],
- "metricTypes": [
- "readMetricsValues",
- "readMetricsValues",
- "readMetricsValues",
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES"
],
"metricConfig": [
{
@@ -90,33 +75,30 @@
"showXAxis": true,
"showYAxis": true
},
- "metrics": [
- "k8s_cluster_memory_requests",
- "k8s_cluster_memory_allocatable",
- "k8s_cluster_memory_limits",
- "k8s_cluster_memory_total"
+ "expressions": [
+ "k8s_cluster_memory_requests/1024/1024/1024",
+ "k8s_cluster_memory_allocatable/1024/1024/1024",
+ "k8s_cluster_memory_limits/1024/1024/1024",
+ "k8s_cluster_memory_total/1024/1024/1024"
],
- "metricTypes": [
- "readMetricsValues",
- "readMetricsValues",
- "readMetricsValues",
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES"
],
"metricConfig": [
{
- "calculation": "byteToGB",
"label": "request"
},
{
- "calculation": "byteToGB",
"label": "allocatable"
},
{
- "calculation": "byteToGB",
"label": "limits"
},
{
- "calculation": "byteToGB",
"label": "total"
}
]
@@ -137,21 +119,20 @@
"showXAxis": true,
"showYAxis": true
},
- "metrics": [
- "k8s_cluster_storage_total",
- "k8s_cluster_storage_allocatable"
+ "expressions": [
+ "k8s_cluster_storage_total/1024/1024/1024",
+ "k8s_cluster_storage_allocatable/1024/1024/1024"
],
- "metricTypes": [
- "readMetricsValues",
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES"
],
"metricConfig": [
{
- "calculation": "byteToGB",
"label": "total"
},
{
- "calculation": "byteToGB",
"label": "allocatable"
}
]
@@ -172,11 +153,12 @@
"tableHeaderCol1": "Container-Pod-Waiting Reason",
"tableHeaderCol2": ""
},
- "metrics": [
+ "expressions": [
"k8s_cluster_pod_status_waiting"
],
- "metricTypes": [
- "readLabeledMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
]
},
{
@@ -195,11 +177,12 @@
"tableHeaderCol1": "Status-Service",
"tableHeaderCol2": ""
},
- "metrics": [
+ "expressions": [
"k8s_cluster_service_pod_status"
],
- "metricTypes": [
- "readLabeledMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
]
},
{
@@ -218,11 +201,12 @@
"tableHeaderCol1": "Status-Pod",
"tableHeaderCol2": ""
},
- "metrics": [
+ "expressions": [
"k8s_cluster_pod_status_not_running"
],
- "metricTypes": [
- "readLabeledMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
]
},
{
@@ -241,11 +225,12 @@
"tableHeaderCol1": "Status-Node",
"tableHeaderCol2": ""
},
- "metrics": [
+ "expressions": [
"k8s_cluster_node_status"
],
- "metricTypes": [
- "readLabeledMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
]
},
{
@@ -264,11 +249,12 @@
"tableHeaderCol1": "Deployment",
"tableHeaderCol2": "Replicas"
},
- "metrics": [
+ "expressions": [
"k8s_cluster_deployment_spec_replicas"
],
- "metricTypes": [
- "readLabeledMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
]
},
{
@@ -287,11 +273,12 @@
"tableHeaderCol1": "Deployment-Available",
"tableHeaderCol2": ""
},
- "metrics": [
+ "expressions": [
"k8s_cluster_deployment_status"
],
- "metricTypes": [
- "readLabeledMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
]
},
{
@@ -310,11 +297,12 @@
"textAlign": "center",
"showUint": true
},
- "metrics": [
+ "expressions": [
"k8s_cluster_container_total"
],
- "metricTypes": [
- "readMetricsValue"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
]
},
{
@@ -333,11 +321,12 @@
"textAlign": "center",
"showUint": true
},
- "metrics": [
+ "expressions": [
"k8s_cluster_pod_total"
],
- "metricTypes": [
- "readMetricsValue"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
]
},
{
@@ -356,11 +345,12 @@
"textAlign": "center",
"showUint": true
},
- "metrics": [
+ "expressions": [
"k8s_cluster_service_total"
],
- "metricTypes": [
- "readMetricsValue"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
]
},
{
@@ -379,11 +369,12 @@
"textAlign": "center",
"showUint": true
},
- "metrics": [
+ "expressions": [
"k8s_cluster_node_total"
],
- "metricTypes": [
- "readMetricsValue"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
]
},
{
@@ -402,11 +393,12 @@
"textAlign": "center",
"showUint": true
},
- "metrics": [
+ "expressions": [
"k8s_cluster_namespace_total"
],
- "metricTypes": [
- "readMetricsValue"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
]
},
{
@@ -425,11 +417,12 @@
"textAlign": "center",
"showUint": true
},
- "metrics": [
+ "expressions": [
"k8s_cluster_deployment_total"
],
- "metricTypes": [
- "readMetricsValue"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
]
},
{
@@ -448,11 +441,12 @@
"textAlign": "center",
"showUint": true
},
- "metrics": [
+ "expressions": [
"k8s_cluster_statefulset_total"
],
- "metricTypes": [
- "readMetricsValue"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
]
},
{
@@ -471,11 +465,12 @@
"textAlign": "center",
"showUint": true
},
- "metrics": [
+ "expressions": [
"k8s_cluster_daemonset_total"
],
- "metricTypes": [
- "readMetricsValue"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
]
}
]
@@ -495,22 +490,21 @@
"dashboardName": "K8S-Node",
"fontSize": 12
},
- "metrics": [
- "k8s_node_cpu_usage",
- "k8s_node_pod_total"
+ "expressions": [
+ "avg(k8s_node_cpu_usage)",
+ "avg(k8s_node_pod_total)"
],
- "metricTypes": [
- "readMetricsValues",
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES"
],
"metricConfig": [
{
"label": "CPU Usage",
- "unit": "m",
- "calculation": "average"
+ "unit": "m"
},
{
- "calculation": "average",
"label": "Pod"
}
]
diff --git
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s/k8s-node.json
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s/k8s-node.json
index 9e029935e6..6a755e0d20 100644
---
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s/k8s-node.json
+++
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s/k8s-node.json
@@ -1,19 +1,3 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
[
{
@@ -38,11 +22,12 @@
"showXAxis": true,
"showYAxis": true
},
- "metrics": [
+ "expressions": [
"k8s_node_cpu_usage"
],
- "metricTypes": [
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
]
},
{
@@ -63,21 +48,20 @@
"showXAxis": true,
"showYAxis": true
},
- "metrics": [
- "k8s_node_network_receive",
- "k8s_node_network_transmit"
+ "expressions": [
+ "k8s_node_network_receive/1024",
+ "k8s_node_network_transmit/1024"
],
- "metricTypes": [
- "readMetricsValues",
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES"
],
"metricConfig": [
{
- "calculation": "byteToKB",
"label": "receive"
},
{
- "calculation": "byteToKB",
"label": "transmit"
}
]
@@ -98,11 +82,12 @@
"tableHeaderCol1": "",
"tableHeaderCol2": ""
},
- "metrics": [
+ "expressions": [
"k8s_node_node_status"
],
- "metricTypes": [
- "readLabeledMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
]
},
{
@@ -121,21 +106,20 @@
"showXAxis": true,
"showYAxis": true
},
- "metrics": [
- "k8s_node_storage_total",
- "k8s_node_storage_allocatable"
+ "expressions": [
+ "k8s_node_storage_total/1024/1024/1024",
+ "k8s_node_storage_allocatable/1024/1024/1024"
],
- "metricTypes": [
- "readMetricsValues",
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES"
],
"metricConfig": [
{
- "calculation": "byteToGB",
"label": "total"
},
{
- "calculation": "byteToGB",
"label": "allocatable"
}
]
@@ -156,17 +140,18 @@
"showXAxis": true,
"showYAxis": true
},
- "metrics": [
+ "expressions": [
"k8s_node_cpu_cores_limits",
"k8s_node_cpu_cores_requests",
"k8s_node_cpu_cores",
"k8s_node_cpu_cores_allocatable"
],
- "metricTypes": [
- "readMetricsValues",
- "readMetricsValues",
- "readMetricsValues",
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES"
],
"metricConfig": [
{
@@ -199,33 +184,30 @@
"showXAxis": true,
"showYAxis": true
},
- "metrics": [
- "k8s_node_memory_total",
- "k8s_node_memory_limits",
- "k8s_node_memory_allocatable",
- "k8s_node_memory_requests"
+ "expressions": [
+ "k8s_node_memory_total/1024/1024/1024",
+ "k8s_node_memory_limits/1024/1024/1024",
+ "k8s_node_memory_allocatable/1024/1024/1024",
+ "k8s_node_memory_requests/1024/1024/1024"
],
- "metricTypes": [
- "readMetricsValues",
- "readMetricsValues",
- "readMetricsValues",
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES"
],
"metricConfig": [
{
- "calculation": "byteToGB",
"label": "total"
},
{
- "calculation": "byteToGB",
"label": "limits"
},
{
- "calculation": "byteToGB",
"label": "allocatable"
},
{
- "calculation": "byteToGB",
"label": "requests"
}
]
@@ -248,15 +230,15 @@
"showXAxis": true,
"showYAxis": true
},
- "metrics": [
- "k8s_node_memory_usage"
+ "expressions": [
+ "k8s_node_memory_usage/1024/1024/1024"
],
- "metricTypes": [
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
"metricConfig": [
{
- "calculation": "byteToGB"
}
]
},
@@ -278,11 +260,12 @@
"showXAxis": true,
"showYAxis": true
},
- "metrics": [
+ "expressions": [
"k8s_node_pod_total"
],
- "metricTypes": [
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
]
}
],
diff --git
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s/k8s-root.json
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s/k8s-root.json
index 1383779a71..5251ec8af7 100644
---
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s/k8s-root.json
+++
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s/k8s-root.json
@@ -1,20 +1,3 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
[
{
"id": "K8S-Root",
@@ -38,40 +21,50 @@
"showYAxis": false,
"showGroup": false
},
- "metrics": [
+ "expressions": [
+ "avg(k8s_cluster_node_total)",
+ "avg(k8s_cluster_namespace_total)",
+ "avg(k8s_cluster_deployment_total)",
+ "avg(k8s_cluster_service_total)",
+ "avg(k8s_cluster_pod_total)"
+ ],
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES"
+ ],
+ "subExpressions": [
"k8s_cluster_node_total",
"k8s_cluster_namespace_total",
"k8s_cluster_deployment_total",
"k8s_cluster_service_total",
"k8s_cluster_pod_total"
],
- "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": [
{
- "calculation": "average",
"label": "Node"
},
{
- "calculation": "average",
"label": "Namespace"
},
{
- "calculation": "average",
"label": "Deployment"
},
{
- "calculation": "average",
"label": "Service"
},
{
- "calculation": "average",
"label": "Pod"
}
]
diff --git
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-process-relation.json
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-process-relation.json
index 746f33a47d..b3deefc0a6 100644
---
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-process-relation.json
+++
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-process-relation.json
@@ -1,19 +1,3 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
[
{
@@ -38,10 +22,11 @@
"h":11,
"i":"0",
"type":"Widget",
- "metricTypes":[
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
+ "expressions":[
"process_relation_client_write_cpm"
],
"graph":{
@@ -103,10 +88,11 @@
"h":11,
"i":"1",
"type":"Widget",
- "metricTypes":[
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
+ "expressions":[
"process_relation_server_write_cpm"
],
"graph":{
@@ -168,10 +154,11 @@
"h":11,
"i":"2",
"type":"Widget",
- "metricTypes":[
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
+ "expressions":[
"process_relation_client_read_cpm"
],
"graph":{
@@ -221,10 +208,11 @@
"h":11,
"i":"3",
"type":"Widget",
- "metricTypes":[
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
+ "expressions":[
"process_relation_server_read_cpm"
],
"graph":{
@@ -273,11 +261,12 @@
"h":11,
"i":"4",
"type":"Widget",
- "metricTypes":[
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
- "process_relation_client_write_total_bytes"
+ "expressions":[
+ "process_relation_client_write_total_bytes/1024"
],
"graph":{
"type":"Line",
@@ -293,8 +282,7 @@
},
"metricConfig":[
{
- "unit":"KB",
- "calculation":"byteToKB"
+ "unit":"KB"
}
],
"associate":[
@@ -312,11 +300,12 @@
"h":11,
"i":"5",
"type":"Widget",
- "metricTypes":[
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
- "process_relation_client_read_total_bytes"
+ "expressions":[
+ "process_relation_client_read_total_bytes/1024"
],
"graph":{
"type":"Line",
@@ -332,8 +321,7 @@
},
"metricConfig":[
{
- "unit":"KB",
- "calculation":"byteToKB"
+ "unit":"KB"
}
],
"associate":[
@@ -371,11 +359,12 @@
"h":11,
"i":"6",
"type":"Widget",
- "metricTypes":[
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
- "process_relation_server_write_total_bytes"
+ "expressions":[
+ "process_relation_server_write_total_bytes/1024"
],
"graph":{
"type":"Line",
@@ -387,8 +376,7 @@
},
"metricConfig":[
{
- "unit":"KB",
- "calculation":"byteToKB"
+ "unit":"KB"
}
],
"widget":{
@@ -442,11 +430,12 @@
"h":11,
"i":"7",
"type":"Widget",
- "metricTypes":[
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
- "process_relation_server_read_total_bytes"
+ "expressions":[
+ "process_relation_server_read_total_bytes/1024"
],
"graph":{
"type":"Line",
@@ -458,8 +447,7 @@
},
"metricConfig":[
{
- "unit":"KB",
- "calculation":"byteToKB"
+ "unit":"KB"
}
],
"widget":{
@@ -501,11 +489,12 @@
"h":11,
"i":"8",
"type":"Widget",
- "metricTypes":[
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
- "process_relation_client_write_avg_exe_time"
+ "expressions":[
+ "process_relation_client_write_avg_exe_time/1000000"
],
"graph":{
"type":"Line",
@@ -521,7 +510,6 @@
},
"metricConfig":[
{
- "calculation":"nanosecondToMillisecond",
"unit":"ms"
}
],
@@ -572,11 +560,12 @@
"h":11,
"i":"9",
"type":"Widget",
- "metricTypes":[
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
- "process_relation_client_read_avg_exe_time"
+ "expressions":[
+ "process_relation_client_read_avg_exe_time/1000000"
],
"graph":{
"type":"Line",
@@ -592,7 +581,6 @@
},
"metricConfig":[
{
- "calculation":"nanosecondToMillisecond",
"unit":"ms"
}
],
@@ -631,11 +619,12 @@
"h":11,
"i":"10",
"type":"Widget",
- "metricTypes":[
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
- "process_relation_server_write_avg_exe_time"
+ "expressions":[
+ "process_relation_server_write_avg_exe_time/1000000"
],
"graph":{
"type":"Line",
@@ -651,8 +640,7 @@
},
"metricConfig":[
{
- "unit":"ms",
- "calculation":"nanosecondToMillisecond"
+ "unit":"ms"
}
],
"associate":[
@@ -670,11 +658,12 @@
"h":11,
"i":"11",
"type":"Widget",
- "metricTypes":[
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
- "process_relation_server_read_avg_exe_time"
+ "expressions":[
+ "process_relation_server_read_avg_exe_time/1000000"
],
"graph":{
"type":"Line",
@@ -690,7 +679,6 @@
},
"metricConfig":[
{
- "calculation":"nanosecondToMillisecond",
"unit":"ms"
}
],
@@ -729,10 +717,11 @@
"h":11,
"i":"12",
"type":"Widget",
- "metricTypes":[
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
+ "expressions":[
"process_relation_client_connect_cpm"
],
"graph":{
@@ -766,11 +755,12 @@
"h":11,
"i":"13",
"type":"Widget",
- "metricTypes":[
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
- "process_relation_client_connect_exe_time"
+ "expressions":[
+ "process_relation_client_connect_exe_time/1000000"
],
"graph":{
"type":"Line",
@@ -786,7 +776,6 @@
},
"metricConfig":[
{
- "calculation":"nanosecondToMillisecond",
"unit":"ms"
}
],
@@ -813,10 +802,11 @@
"h":11,
"i":"14",
"type":"Widget",
- "metricTypes":[
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
+ "expressions":[
"process_relation_server_connect_cpm"
],
"graph":{
@@ -854,11 +844,12 @@
"h":11,
"i":"15",
"type":"Widget",
- "metricTypes":[
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
- "process_relation_server_connect_avg_exe_time"
+ "expressions":[
+ "process_relation_server_connect_avg_exe_time/1000000"
],
"graph":{
"type":"Line",
@@ -874,7 +865,6 @@
},
"metricConfig":[
{
- "calculation":"nanosecondToMillisecond",
"unit":"ms"
}
],
@@ -901,10 +891,11 @@
"h":11,
"i":"16",
"type":"Widget",
- "metricTypes":[
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
+ "expressions":[
"process_relation_client_close_cpm"
],
"graph":{
@@ -938,11 +929,12 @@
"h":11,
"i":"17",
"type":"Widget",
- "metricTypes":[
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
- "process_relation_client_close_avg_exe_time"
+ "expressions":[
+ "process_relation_client_close_avg_exe_time/1000000"
],
"graph":{
"type":"Line",
@@ -958,7 +950,6 @@
},
"metricConfig":[
{
- "calculation":"nanosecondToMillisecond",
"unit":"ms"
}
],
@@ -985,10 +976,11 @@
"h":11,
"i":"18",
"type":"Widget",
- "metricTypes":[
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
+ "expressions":[
"process_relation_server_close_cpm"
],
"graph":{
@@ -1026,11 +1018,12 @@
"h":11,
"i":"19",
"type":"Widget",
- "metricTypes":[
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
- "process_relation_server_close_avg_exe_time"
+ "expressions":[
+ "process_relation_server_close_avg_exe_time/1000000"
],
"graph":{
"type":"Line",
@@ -1046,7 +1039,6 @@
},
"metricConfig":[
{
- "calculation":"nanosecondToMillisecond",
"unit":"ms"
}
],
@@ -1073,10 +1065,11 @@
"h":11,
"i":"20",
"type":"Widget",
- "metricTypes":[
- "readLabeledMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
+ "expressions":[
"process_relation_client_write_rtt_time_percentile"
],
"graph":{
@@ -1143,10 +1136,11 @@
"h":11,
"i":"21",
"type":"Widget",
- "metricTypes":[
- "readLabeledMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
+ "expressions":[
"process_relation_server_write_rtt_time_percentile"
],
"graph":{
@@ -1208,11 +1202,12 @@
"h":11,
"i":"22",
"type":"Widget",
- "metricTypes":[
- "readLabeledMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
- "process_relation_client_write_exe_time_percentile"
+ "expressions":[
+ "process_relation_client_write_exe_time_percentile/1000000"
],
"graph":{
"type":"Line",
@@ -1228,7 +1223,6 @@
},
"metricConfig":[
{
- "calculation":"nanosecondToMillisecond"
}
],
"associate":[
@@ -1278,11 +1272,12 @@
"h":11,
"i":"23",
"type":"Widget",
- "metricTypes":[
- "readLabeledMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
- "process_relation_server_write_exe_time_percentile"
+ "expressions":[
+ "process_relation_server_write_exe_time_percentile/1000000"
],
"graph":{
"type":"Line",
@@ -1298,7 +1293,6 @@
},
"metricConfig":[
{
- "calculation":"nanosecondToMillisecond"
}
],
"associate":[
@@ -1348,11 +1342,12 @@
"h":11,
"i":"24",
"type":"Widget",
- "metricTypes":[
- "readLabeledMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
- "process_relation_client_read_exe_time_percentile"
+ "expressions":[
+ "process_relation_client_read_exe_time_percentile/1000000"
],
"graph":{
"type":"Line",
@@ -1368,7 +1363,6 @@
},
"metricConfig":[
{
- "calculation":"nanosecondToMillisecond"
}
],
"associate":[
@@ -1406,11 +1400,12 @@
"h":11,
"i":"25",
"type":"Widget",
- "metricTypes":[
- "readLabeledMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
- "process_relation_server_read_exe_time_percentile"
+ "expressions":[
+ "process_relation_server_read_exe_time_percentile/1000000"
],
"graph":{
"type":"Line",
@@ -1426,7 +1421,6 @@
},
"metricConfig":[
{
- "calculation":"nanosecondToMillisecond"
}
],
"associate":[
@@ -1464,10 +1458,11 @@
"h":11,
"i":"28",
"type":"Widget",
- "metricTypes":[
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
+ "expressions":[
"process_relation_client_write_avg_rtt_time"
],
"graph":{
@@ -1529,10 +1524,11 @@
"h":11,
"i":"29",
"type":"Widget",
- "metricTypes":[
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
+ "expressions":[
"process_relation_server_write_avg_rtt_time"
],
"graph":{
@@ -1599,10 +1595,11 @@
"h":11,
"i":"0",
"type":"Widget",
- "metricTypes":[
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
+ "expressions":[
"process_relation_http1_request_cpm"
],
"graph":{
@@ -1658,10 +1655,11 @@
"h":11,
"i":"1",
"type":"Widget",
- "metricTypes":[
- "readLabeledMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
+ "expressions":[
"process_relation_http1_response_status_cpm"
],
"graph":{
@@ -1717,11 +1715,12 @@
"h":11,
"i":"2",
"type":"Widget",
- "metricTypes":[
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
- "process_relation_http1_request_package_size"
+ "expressions":[
+ "process_relation_http1_request_package_size/1024"
],
"graph":{
"type":"Line",
@@ -1737,7 +1736,6 @@
},
"metricConfig":[
{
- "calculation":"byteToKB"
}
],
"associate":[
@@ -1781,11 +1779,12 @@
"h":11,
"i":"3",
"type":"Widget",
- "metricTypes":[
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
- "process_relation_http1_response_package_size"
+ "expressions":[
+ "process_relation_http1_response_package_size/1024"
],
"graph":{
"type":"Line",
@@ -1801,7 +1800,6 @@
},
"metricConfig":[
{
- "calculation":"byteToKB"
}
],
"associate":[
@@ -1845,11 +1843,12 @@
"h":11,
"i":"4",
"type":"Widget",
- "metricTypes":[
- "readLabeledMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
- "process_relation_http1_request_package_size_percentile"
+ "expressions":[
+
"process_relation_http1_request_package_size_percentile/1024"
],
"graph":{
"type":"Line",
@@ -1865,7 +1864,6 @@
},
"metricConfig":[
{
- "calculation":"byteToKB"
}
],
"associate":[
@@ -1909,11 +1907,12 @@
"h":11,
"i":"5",
"type":"Widget",
- "metricTypes":[
- "readLabeledMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
- "process_relation_http1_response_package_size_percentile"
+ "expressions":[
+
"process_relation_http1_response_package_size_percentile/1024"
],
"graph":{
"type":"Line",
@@ -1929,7 +1928,6 @@
},
"metricConfig":[
{
- "calculation":"byteToKB"
}
],
"associate":[
@@ -1973,10 +1971,11 @@
"h":11,
"i":"6",
"type":"Widget",
- "metricTypes":[
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
+ "expressions":[
"process_relation_http1_client_duration"
],
"graph":{
@@ -2032,10 +2031,11 @@
"h":11,
"i":"7",
"type":"Widget",
- "metricTypes":[
- "readLabeledMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
+ "expressions":[
"process_relation_http1_client_duration_percentile"
],
"graph":{
@@ -2091,10 +2091,11 @@
"h":11,
"i":"8",
"type":"Widget",
- "metricTypes":[
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
+ "expressions":[
"process_relation_http1_server_duration"
],
"graph":{
@@ -2150,10 +2151,11 @@
"h":11,
"i":"9",
"type":"Widget",
- "metricTypes":[
- "readLabeledMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
+ "expressions":[
"process_relation_http1_server_duration_percentile"
],
"graph":{
@@ -2214,10 +2216,11 @@
"h":37,
"i":"0",
"type":"Widget",
- "metricTypes":[
- "readRecords"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "RECORD_LIST"
],
- "metrics":[
+ "expressions":[
"sampled_slow_trace_record"
],
"graph":{
@@ -2240,10 +2243,11 @@
"h":37,
"i":"1",
"type":"Widget",
- "metricTypes":[
- "readRecords"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "RECORD_LIST"
],
- "metrics":[
+ "expressions":[
"sampled_status_4xx_trace_record"
],
"graph":{
@@ -2266,10 +2270,11 @@
"h":37,
"i":"2",
"type":"Widget",
- "metricTypes":[
- "readRecords"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics":[
+ "expressions":[
"sampled_status_5xx_trace_record"
],
"graph":{
diff --git
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-service-pod.json
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-service-pod.json
index 1cbfc5e92a..732e709844 100644
---
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-service-pod.json
+++
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-service-pod.json
@@ -1,19 +1,3 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
[
{
diff --git
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-service-root.json
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-service-root.json
index f9b6963f49..5fe648df06 100644
---
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-service-root.json
+++
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-service-root.json
@@ -1,19 +1,3 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
[
{
@@ -27,15 +11,16 @@
"h": 50,
"i": "0",
"type": "Widget",
- "metricTypes": [
- "readMetricsValues",
- "readMetricsValues",
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES"
],
- "metrics": [
- "k8s_service_pod_total",
- "k8s_service_cpu_cores_requests",
- "k8s_service_cpu_cores_limits"
+ "expressions": [
+ "avg(k8s_service_pod_total)",
+ "avg(k8s_service_cpu_cores_requests)",
+ "avg(k8s_service_cpu_cores_limits)"
],
"moved": false,
"graph": {
@@ -48,18 +33,15 @@
},
"metricConfig": [
{
- "calculation": "average",
"label": "Pod"
},
{
"label": "CPU Requests",
- "calculation": "average",
"unit": "m"
},
{
"label": "CPU Limits",
- "unit": "m",
- "calculation": "average"
+ "unit": "m"
}
]
},
@@ -70,10 +52,10 @@
"h": 2,
"i": "100",
"type": "Text",
- "metricTypes": [
- ""
+ "metricMode": "Expression",
+ "typesOfMQE": [
],
- "metrics": [
+ "expressions": [
""
],
"graph": {
diff --git
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-service-service.json
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-service-service.json
index 44bd27f6ee..3393549376 100644
---
a/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-service-service.json
+++
b/oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-service-service.json
@@ -1,19 +1,3 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
[
{
@@ -38,10 +22,11 @@
"h": 15,
"i": "0",
"type": "Widget",
- "metricTypes": [
- "readLabeledMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics": [
+ "expressions": [
"k8s_service_pod_cpu_usage"
],
"widget": {
@@ -63,13 +48,14 @@
"h": 15,
"i": "1",
"type": "Widget",
- "metricTypes": [
- "readMetricsValues",
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES"
],
- "metrics": [
- "k8s_service_memory_requests",
- "k8s_service_memory_limits"
+ "expressions": [
+ "k8s_service_memory_requests/1024/1024",
+ "k8s_service_memory_limits/1024/1024"
],
"widget": {
"title": "Service Memory Resources (Mi)"
@@ -82,11 +68,9 @@
},
"metricConfig": [
{
- "calculation": "byteToMB",
"label": "requests"
},
{
- "calculation": "byteToMB",
"label": "limits"
}
]
@@ -98,11 +82,12 @@
"h": 15,
"i": "2",
"type": "Widget",
- "metricTypes": [
- "readMetricsValues",
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES",
+ "TIME_SERIES_VALUES"
],
- "metrics": [
+ "expressions": [
"k8s_service_cpu_cores_requests",
"k8s_service_cpu_cores_limits"
],
@@ -131,10 +116,11 @@
"h": 15,
"i": "3",
"type": "Widget",
- "metricTypes": [
- "readLabeledMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics": [
+ "expressions": [
"k8s_service_pod_status"
],
"widget": {
@@ -154,10 +140,11 @@
"h": 15,
"i": "4",
"type": "Widget",
- "metricTypes": [
- "readMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics": [
+ "expressions": [
"k8s_service_pod_total"
],
"widget": {
@@ -179,11 +166,12 @@
"h": 15,
"i": "5",
"type": "Widget",
- "metricTypes": [
- "readLabeledMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics": [
- "k8s_service_pod_memory_usage"
+ "expressions": [
+ "k8s_service_pod_memory_usage/1024/1024"
],
"widget": {
"title": "Pod Memory Usage (Mi)"
@@ -198,7 +186,6 @@
},
"metricConfig": [
{
- "calculation": "byteToMB"
}
]
},
@@ -209,10 +196,11 @@
"h": 15,
"i": "6",
"type": "Widget",
- "metricTypes": [
- "readLabeledMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics": [
+ "expressions": [
"k8s_service_pod_status_waiting"
],
"widget": {
@@ -232,10 +220,11 @@
"h": 15,
"i": "7",
"type": "Widget",
- "metricTypes": [
- "readLabeledMetricsValues"
+ "metricMode": "Expression",
+ "typesOfMQE": [
+ "TIME_SERIES_VALUES"
],
- "metrics": [
+ "expressions": [
"k8s_service_pod_status_restarts_total"
],
"widget": {
diff --git
a/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-value-label.yml
b/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-client-value-label.yml
similarity index 64%
copy from
test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-value-label.yml
copy to
test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-client-value-label.yml
index fb38843650..3d284ebd5a 100644
---
a/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-value-label.yml
+++
b/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-client-value-label.yml
@@ -13,17 +13,24 @@
# 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:
+ {{- contains .metric.labels }}
+ - key: _
+ value: {{ .value }}
+ {{- end}}
+ 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/profiling/ebpf/network/expected/metrics-has-http1-value-label.yml
b/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-http1-value-label.yml
new file mode 100644
index 0000000000..069b320b36
--- /dev/null
+++
b/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-http1-value-label.yml
@@ -0,0 +1,73 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+type: TIME_SERIES_VALUES
+results:
+ {{- contains .results }}
+ - metric:
+ labels:
+ - key: _
+ value: "50"
+ values:
+ {{- contains .values }}
+ - id: {{ notEmpty .id }}
+ value: {{ .value }}
+ traceid: null
+ - id: {{ notEmpty .id }}
+ value: null
+ traceid: null
+ {{- end}}
+ - metric:
+ labels:
+ - key: _
+ value: "70"
+ values:
+ {{- contains .values }}
+ - id: {{ notEmpty .id }}
+ value: {{ .value }}
+ traceid: null
+ - id: {{ notEmpty .id }}
+ value: null
+ traceid: null
+ {{- end}}
+ - metric:
+ labels:
+ - key: _
+ value: "90"
+ values:
+ {{- contains .values }}
+ - id: {{ notEmpty .id }}
+ value: {{ .value }}
+ traceid: null
+ - id: {{ notEmpty .id }}
+ value: null
+ traceid: null
+ {{- end}}
+ - metric:
+ labels:
+ - key: _
+ value: "99"
+ 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/profiling/ebpf/network/expected/metrics-has-value-label.yml
b/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-server-value-label.yml
similarity index 64%
rename from
test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-value-label.yml
rename to
test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-server-value-label.yml
index fb38843650..4ca39b22cf 100644
---
a/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-value-label.yml
+++
b/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-server-value-label.yml
@@ -13,17 +13,24 @@
# 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:
+ {{- contains .metric.labels }}
+ - key: _
+ value: {{ .value }}
+ {{- end}}
+ 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/profiling/ebpf/network/expected/metrics-has-value.yml
b/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-value.yml
index 04b077dd98..c4bbbafa3b 100644
--- a/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-value.yml
+++ b/test/e2e-v2/cases/profiling/ebpf/network/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/profiling/ebpf/network/network-cases.yaml
b/test/e2e-v2/cases/profiling/ebpf/network/network-cases.yaml
index af6bc805d7..0d24528c3a 100644
--- a/test/e2e-v2/cases/profiling/ebpf/network/network-cases.yaml
+++ b/test/e2e-v2/cases/profiling/ebpf/network/network-cases.yaml
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+
cases:
# service list
- query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql service ls
@@ -32,104 +33,98 @@ cases:
# single value of process relation, client/server side read/write
- query: |
- swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql
metrics linear \
+ swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql
metrics exec \
--service-name service --instance-name test --process-name service \
--dest-service-name service --dest-instance-name test
--dest-process-name UNKNOWN_REMOTE \
- --name process_relation_client_write_cpm|yq e 'to_entries' -
+ --expression=process_relation_client_write_cpm
expected: expected/metrics-has-value.yml
- query: |
- swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql
metrics linear \
+ swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql
metrics exec \
--service-name service --instance-name test --process-name service \
--dest-service-name service --dest-instance-name test
--dest-process-name UNKNOWN_REMOTE \
- --name process_relation_client_write_total_bytes|yq e 'to_entries' -
+ --expression=process_relation_client_write_total_bytes
expected: expected/metrics-has-value.yml
- query: |
- swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql
metrics linear \
+ swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql
metrics exec \
--service-name service --instance-name test --process-name service \
--dest-service-name service --dest-instance-name test
--dest-process-name UNKNOWN_REMOTE \
- --name process_relation_client_write_avg_exe_time|yq e 'to_entries' -
+ --expression=process_relation_client_write_avg_exe_time
expected: expected/metrics-has-value.yml
- query: |
- swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql
metrics linear \
+ swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql
metrics exec \
--service-name service --instance-name test --process-name service \
--dest-service-name service --dest-instance-name test
--dest-process-name UNKNOWN_REMOTE \
- --name process_relation_client_read_cpm|yq e 'to_entries' -
+ --expression=process_relation_client_read_cpm
expected: expected/metrics-has-value.yml
- query: |
- swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql
metrics linear \
+ swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql
metrics exec \
--service-name service --instance-name test --process-name
UNKNOWN_REMOTE \
--dest-service-name service --dest-instance-name test
--dest-process-name service \
- --name process_relation_server_write_cpm|yq e 'to_entries' -
+ --expression=process_relation_server_write_cpm
expected: expected/metrics-has-value.yml
# histogram value of process relation, client side write_rtt/write_exe/read
time
- query: |
- swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql
metrics multiple-linear \
+ swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql
metrics exec \
--service-name service --instance-name test --process-name service \
--dest-service-name service --dest-instance-name test
--dest-process-name UNKNOWN_REMOTE \
- --name=process_relation_client_write_rtt_time_percentile|yq e
'to_entries | with(.[] ; .value=(.value | to_entries))' -
- expected: expected/metrics-has-value-label.yml
+ --expression=process_relation_client_write_rtt_time_percentile
+ expected: expected/metrics-has-client-value-label.yml
- query: |
- swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql
metrics multiple-linear \
+ swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql
metrics exec \
--service-name service --instance-name test --process-name service \
--dest-service-name service --dest-instance-name test
--dest-process-name UNKNOWN_REMOTE \
- --name=process_relation_client_write_exe_time_percentile|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 multiple-linear \
- --service-name service --instance-name test --process-name
UNKNOWN_REMOTE \
- --dest-service-name service --dest-instance-name test
--dest-process-name service \
- --name=process_relation_server_write_rtt_time_percentile|yq e
'to_entries | with(.[] ; .value=(.value | to_entries))' -
- expected: expected/metrics-has-value-label.yml
+ --expression=process_relation_client_write_exe_time_percentile
+ expected: expected/metrics-has-client-value-label.yml
- query: |
- swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql
metrics multiple-linear \
+ swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql
metrics exec \
--service-name service --instance-name test --process-name
UNKNOWN_REMOTE \
--dest-service-name service --dest-instance-name test
--dest-process-name service \
- --name=process_relation_server_write_exe_time_percentile|yq e
'to_entries | with(.[] ; .value=(.value | to_entries))' -
- expected: expected/metrics-has-value-label.yml
+ --expression=process_relation_server_write_rtt_time_percentile
+ expected: expected/metrics-has-server-value-label.yml
- query: |
- swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql
metrics multiple-linear \
+ swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql
metrics exec \
--service-name service --instance-name test --process-name
UNKNOWN_REMOTE \
--dest-service-name service --dest-instance-name test
--dest-process-name service \
- --name=process_relation_server_write_exe_time_percentile|yq e
'to_entries | with(.[] ; .value=(.value | to_entries))' -
- expected: expected/metrics-has-value-label.yml
+ --expression=process_relation_server_write_exe_time_percentile
+ expected: expected/metrics-has-server-value-label.yml
# HTTP/1.x metrics
- query: |
- swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql
metrics linear \
+ swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql
metrics exec \
--service-name service --instance-name test --process-name service \
--dest-service-name service --dest-instance-name test
--dest-process-name UNKNOWN_REMOTE \
- --name process_relation_http1_request_cpm|yq e 'to_entries' -
+ --expression=process_relation_http1_request_cpm
expected: expected/metrics-has-value.yml
- query: |
- swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql
metrics linear \
+ swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql
metrics exec \
--service-name service --instance-name test --process-name service \
--dest-service-name service --dest-instance-name test
--dest-process-name UNKNOWN_REMOTE \
- --name process_relation_http1_request_package_size|yq e 'to_entries' -
+ --expression=process_relation_http1_request_package_size
expected: expected/metrics-has-value.yml
- query: |
- swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql
metrics linear \
+ swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql
metrics exec \
--service-name service --instance-name test --process-name service \
--dest-service-name service --dest-instance-name test
--dest-process-name UNKNOWN_REMOTE \
- --name process_relation_http1_response_package_size|yq e 'to_entries' -
+ --expression=process_relation_http1_response_package_size
expected: expected/metrics-has-value.yml
- query: |
- swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql
metrics multiple-linear \
+ swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql
metrics exec \
--service-name service --instance-name test --process-name service \
--dest-service-name service --dest-instance-name test
--dest-process-name UNKNOWN_REMOTE \
- --name process_relation_http1_request_package_size_percentile|yq e
'to_entries | with(.[] ; .value=(.value | to_entries))' -
- expected: expected/metrics-has-value-label.yml
+ --expression=process_relation_http1_request_package_size_percentile
+ expected: expected/metrics-has-http1-value-label.yml
- query: |
- swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql
metrics multiple-linear \
+ swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql
metrics exec \
--service-name service --instance-name test --process-name service \
--dest-service-name service --dest-instance-name test
--dest-process-name UNKNOWN_REMOTE \
- --name process_relation_http1_response_package_size_percentile|yq e
'to_entries | with(.[] ; .value=(.value | to_entries))' -
- expected: expected/metrics-has-value-label.yml
+ --expression=process_relation_http1_response_package_size_percentile
+ expected: expected/metrics-has-http1-value-label.yml
- query: |
- swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql
metrics linear \
+ swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql
metrics exec \
--service-name service --instance-name test --process-name service \
--dest-service-name service --dest-instance-name test
--dest-process-name UNKNOWN_REMOTE \
- --name process_relation_http1_client_duration|yq e 'to_entries' -
+ --expression=process_relation_http1_client_duration
expected: expected/metrics-has-value.yml
# slow traces
