Skip to content

Commit

Permalink
Merge branch 'master' into deprecate-ofn
Browse files Browse the repository at this point in the history
  • Loading branch information
@wu-sheng
wu-sheng authored Nov 22, 2023
2 parents 093b556 + df65048 commit b61a3cf
Show file tree
Hide file tree
Showing 74 changed files with 3,204 additions and 3,478 deletions.
2 changes: 2 additions & 0 deletions docs/en/changes/changes.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
* Support Nginx monitoring.
* Fix `BanyanDB Metadata Query`: make query single instance/process return full tags to avoid NPE.
* Repleace go2sky E2E to GO agent.
* Replace Metrics v2 protocol with MQE in UI templates and E2E Test.

#### UI

Expand All @@ -66,6 +67,7 @@
* Change UI templates for Text widgets.
* Add Nginx menu i18n.
* Fix the height for trace widget.
* Polish list style.
* Remove OpenFunction(FAAS layer) relative UI templates and menu item.

#### Documentation
Expand Down
2 changes: 1 addition & 1 deletion ...erver/server-starter/src/main/resources/ui-initialized-templates/browser/browser-app.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@
"h": 14,
"i": "14",
"type": "Widget",
"metrics": [
"expressions": [
"top_n(browser_app_single_version_error_sum,10,des)"
],
"metricMode": "Expression",
Expand Down
27 changes: 11 additions & 16 deletions .../server-starter/src/main/resources/ui-initialized-templates/general/general-instance.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -852,12 +852,6 @@
"h": 12,
"i": "2",
"type": "Widget",
"metricTypes": [
"readMetricsValues"
],
"metrics": [
"meter_process_cpu_usage"
],
"graph": {
"type": "Line",
"step": false,
Expand All @@ -868,7 +862,14 @@
},
"widget": {
"title": "Instance CPU Usage (%)"
}
},
"metricMode":"Expression",
"expressions":[
"meter_process_cpu_usage"
],
"typesOfMQE":[
"TIME_SERIES_VALUES"
]
},
{
"x": 0,
Expand Down Expand Up @@ -1258,18 +1259,12 @@
}
],
"expressions": [
"meter_instance_golang_live_goroutines_num"
"meter_instance_golang_live_goroutines_num",
"meter_instance_golang_os_threads_num"
],
"typesOfMQE": [
"TIME_SERIES_VALUES",
"TIME_SERIES_VALUES"
],
"metrics": [
"meter_instance_golang_os_threads_num",
"meter_instance_golang_live_goroutines_num"
],
"metricTypes": [
"readMetricsValues",
"readMetricsValues"
]
},
{
Expand Down
170 changes: 87 additions & 83 deletions ...server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-instance.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,11 +192,12 @@
"showXAxis": true,
"showYAxis": true
},
"metrics": [
"metricMode": "Expression",
"expressions": [
"envoy_cluster_up_rq_active"
],
"metricTypes": [
"readLabeledMetricsValues"
"typesOfMQE": [
"TIME_SERIES_VALUES"
]
},
{
Expand All @@ -217,21 +218,22 @@
"showXAxis": true,
"showYAxis": true
},
"metrics": [
"envoy_total_connections_used",
"envoy_parent_connections_used"
],
"metricTypes": [
"readMetricsValues",
"readMetricsValues"
],
"metricConfig": [
{
"label": "total"
},
{
"label": "parent"
}
],
"metricMode": "Expression",
"expressions": [
"envoy_total_connections_used",
"envoy_parent_connections_used"
],
"typesOfMQE": [
"TIME_SERIES_VALUES",
"TIME_SERIES_VALUES"
]
},
{
Expand All @@ -252,11 +254,12 @@
"showXAxis": true,
"showYAxis": true
},
"metrics": [
"metricMode": "Expression",
"expressions": [
"envoy_cluster_membership_healthy"
],
"metricTypes": [
"readLabeledMetricsValues"
"typesOfMQE": [
"TIME_SERIES_VALUES"
]
},
{
Expand All @@ -277,11 +280,12 @@
"showXAxis": true,
"showYAxis": true
},
"metrics": [
"metricMode": "Expression",
"expressions": [
"envoy_cluster_up_cx_incr"
],
"metricTypes": [
"readLabeledMetricsValues"
"typesOfMQE": [
"TIME_SERIES_VALUES"
]
},
{
Expand All @@ -302,11 +306,12 @@
"showXAxis": true,
"showYAxis": true
},
"metrics": [
"metricMode": "Expression",
"expressions": [
"envoy_cluster_up_rq_pending_active"
],
"metricTypes": [
"readLabeledMetricsValues"
"typesOfMQE": [
"TIME_SERIES_VALUES"
]
},
{
Expand All @@ -327,47 +332,48 @@
"showXAxis": true,
"showYAxis": true
},
"metrics": [
"envoy_memory_allocated_max",
"envoy_heap_memory_used",
"envoy_memory_allocated",
"envoy_memory_physical_size",
"envoy_memory_physical_size_max",
"envoy_heap_memory_max_used"
],
"metricTypes": [
"readMetricsValues",
"readMetricsValues",
"readMetricsValues",
"readMetricsValues",
"readMetricsValues",
"readMetricsValues"
],
"metricConfig": [
{
"calculation": "byteToMB",
"label": "allocated_max"
"label": "allocated_max",
"unit": "MB"
},
{
"calculation": "byteToMB",
"label": "heap_memory_used"
"label": "heap_memory_used",
"unit": "MB"
},
{
"calculation": "byteToMB",
"label": "allocated"
"label": "allocated",
"unit": "MB"
},
{
"calculation": "byteToMB",
"label": "physical_size"
"label": "physical_size",
"unit": "MB"
},
{
"calculation": "byteToMB",
"label": "physical_size_max"
"label": "physical_size_max",
"unit": "MB"
},
{
"calculation": "byteToMB",
"label": "max_used"
"label": "max_used",
"unit": "MB"
}
],
"metricMode": "Expression",
"expressions": [
"envoy_memory_allocated_max/1024/1024",
"envoy_heap_memory_used/1024/1024",
"envoy_memory_allocated/1024/1024",
"envoy_memory_physical_size/1024/1024",
"envoy_memory_physical_size_max/1024/1024",
"envoy_heap_memory_max_used/1024/1024"
],
"typesOfMQE": [
"TIME_SERIES_VALUES",
"TIME_SERIES_VALUES",
"TIME_SERIES_VALUES",
"TIME_SERIES_VALUES",
"TIME_SERIES_VALUES",
"TIME_SERIES_VALUES"
]
},
{
Expand All @@ -388,11 +394,12 @@
"showXAxis": true,
"showYAxis": true
},
"metrics": [
"metricMode": "Expression",
"expressions": [
"envoy_bug_failures"
],
"metricTypes": [
"readMetricsValues"
"typesOfMQE": [
"TIME_SERIES_VALUES"
]
},
{
Expand All @@ -413,21 +420,14 @@
"showXAxis": true,
"showYAxis": true
},
"metrics": [
"metricMode": "Expression",
"expressions": [
"envoy_worker_threads_max",
"envoy_worker_threads"
],
"metricTypes": [
"readMetricsValues",
"readMetricsValues"
],
"metricConfig": [
{
"label": "threads_max"
},
{
"label": "threads"
}
"typesOfMQE": [
"TIME_SERIES_VALUES",
"TIME_SERIES_VALUES"
]
},
{
Expand All @@ -448,11 +448,12 @@
"showXAxis": true,
"showYAxis": true
},
"metrics": [
"metricMode": "Expression",
"expressions": [
"envoy_cluster_up_cx_active"
],
"metricTypes": [
"readLabeledMetricsValues"
"typesOfMQE": [
"TIME_SERIES_VALUES"
]
},
{
Expand All @@ -473,11 +474,12 @@
"showXAxis": true,
"showYAxis": true
},
"metrics": [
"metricMode": "Expression",
"expressions": [
"envoy_cluster_up_rq_incr"
],
"metricTypes": [
"readLabeledMetricsValues"
"typesOfMQE": [
"TIME_SERIES_VALUES"
]
},
{
Expand All @@ -487,12 +489,6 @@
"h": 13,
"i": "20",
"type": "Widget",
"metricTypes": [
"readMetricsValues"
],
"metrics": [
"service_instance_sidecar_internal_req_latency_nanos"
],
"widget": {
"title": "Proxy Sidecar Internal Latency in Nanoseconds (Request)",
"tips": "For more details to understand this metrics, refer to https://www.envoyproxy.io/docs/envoy/v1.22.0/api-v3/data/accesslog/v3/accesslog.proto.html#data-accesslog-v3-accesslogcommon"
Expand All @@ -504,7 +500,14 @@
"showSymbol": true,
"showXAxis": true,
"showYAxis": true
}
},
"metricMode": "Expression",
"expressions": [
"service_instance_sidecar_internal_req_latency_nanos"
],
"typesOfMQE": [
"TIME_SERIES_VALUES"
]
},
{
"x": 18,
Expand All @@ -513,12 +516,6 @@
"h": 13,
"i": "21",
"type": "Widget",
"metricTypes": [
"readMetricsValues"
],
"metrics": [
"service_instance_sidecar_internal_resp_latency_nanos"
],
"widget": {
"tips": "For more details to understand this metrics, refer to https://www.envoyproxy.io/docs/envoy/v1.22.0/api-v3/data/accesslog/v3/accesslog.proto.html#data-accesslog-v3-accesslogcommon",
"title": "Proxy Sidecar Internal Latency in Nanoseconds (Response)"
Expand All @@ -530,7 +527,14 @@
"showSymbol": true,
"showXAxis": true,
"showYAxis": true
}
},
"metricMode": "Expression",
"expressions": [
"service_instance_sidecar_internal_resp_latency_nanos"
],
"typesOfMQE": [
"TIME_SERIES_VALUES"
]
}
]
},
Expand Down
Loading

0 comments on commit b61a3cf

Please sign in to comment.