You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ha...@apache.org on 2021/01/12 15:16:33 UTC
[skywalking] branch istio-ctrl-patch updated (2589d6c -> 1705110)
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a change to branch istio-ctrl-patch
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
discard 2589d6c Remove redundant metrics and polish panel layout
new 1705110 Remove redundant metrics and polish panel layout
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (2589d6c)
\
N -- N -- N refs/heads/istio-ctrl-patch (1705110)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.md | 1 +
1 file changed, 1 insertion(+)
[skywalking] 01/01: Remove redundant metrics and polish panel layout
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch istio-ctrl-patch
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 170511024fd448b06300718a45adcd9ad78723f9
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Tue Jan 12 23:13:17 2021 +0800
Remove redundant metrics and polish panel layout
---
CHANGES.md | 1 +
.../src/main/resources/otel-oc-rules/istio-controlplane.yaml | 6 ------
.../src/main/resources/ui-initialized-templates/istio.yml | 10 +++++-----
3 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 4c6d3dc..49d4db1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -58,6 +58,7 @@ Release Notes.
* Fix bug that if use JSON as InfluxDB.ResponseFormat then NumberFormatException maybe occur.
* Fix `timeBucket` not taking effect in EqualsAndHashCode annotation of some relationship metrics.
* Fix `SharingServerConfig`'s propertie is not correct in the `application.yml`, contextPath -> restConnextPath.
+* Istio control plane: remove redundant metrics and polish panel layout.
#### UI
* Fix un-removed tags in trace query.
diff --git a/oap-server/server-bootstrap/src/main/resources/otel-oc-rules/istio-controlplane.yaml b/oap-server/server-bootstrap/src/main/resources/otel-oc-rules/istio-controlplane.yaml
index d32cf5a..0fed992 100644
--- a/oap-server/server-bootstrap/src/main/resources/otel-oc-rules/istio-controlplane.yaml
+++ b/oap-server/server-bootstrap/src/main/resources/otel-oc-rules/istio-controlplane.yaml
@@ -73,14 +73,8 @@ metricsRules:
exp: pilot_total_xds_rejects.tagEqual('app', 'istiod').sum(['cluster', 'app']).rate('PT1M')
- name: pilot_xds_push_context_errors
exp: pilot_xds_push_context_errors.tagEqual('app', 'istiod').sum(['cluster', 'app']).rate('PT1M')
- - name: pilot_xds_pushes_error
- exp: pilot_xds_pushes.tagEqual('app', 'istiod').tagNotMatch('type', 'lds|cds|rds|eds').sum(['cluster', 'app', 'type']).rate('PT1M')
- - name: pilot_xds_push_errors
- exp: pilot_xds_push_errors.tagEqual('app', 'istiod').sum(['cluster', 'app', 'type']).rate('PT1M')
- name: pilot_xds_push_timeout
exp: pilot_xds_push_timeout.tagEqual('app', 'istiod').sum(['cluster', 'app']).rate('PT1M')
- - name: pilot_xds_push_timeout_failures
- exp: pilot_xds_push_timeout_failures.tagEqual('app', 'istiod').sum(['cluster', 'app']).rate('PT1M')
# Proxy Push Time
- name: pilot_proxy_push_percentile
exp: pilot_proxy_convergence_time.sum(['cluster', 'app', 'le']).rate('PT1M').histogram().histogram_percentile([50,90,99])
diff --git a/oap-server/server-bootstrap/src/main/resources/ui-initialized-templates/istio.yml b/oap-server/server-bootstrap/src/main/resources/ui-initialized-templates/istio.yml
index d45122b..1993f09 100644
--- a/oap-server/server-bootstrap/src/main/resources/ui-initialized-templates/istio.yml
+++ b/oap-server/server-bootstrap/src/main/resources/ui-initialized-templates/istio.yml
@@ -100,8 +100,8 @@ templates:
"height": 350,
"entityType": "Service",
"independentSelector": false,
- "metricType": "UNKNOWN",
- "metricName": "meter_istio_pilot_xds_cds_reject,meter_pilot_xds_eds_reject,meter_pilot_xds_rds_reject,meter_pilot_xds_lds_reject,meter_pilot_xds_write_timeout,meter_pilot_total_xds_internal_errors,meter_pilot_total_xds_rejects,meter_pilot_xds_push_context_errors,meter_pilot_xds_pushes_error,meter_pilot_xds_push_errors,meter_pilot_xds_push_timeout,meter_pilot_xds_push_timeout_failures",
+ "metricType": "REGULAR_VALUE",
+ "metricName": "meter_pilot_xds_cds_reject,meter_pilot_xds_eds_reject,meter_pilot_xds_rds_reject,meter_pilot_xds_lds_reject,meter_pilot_xds_write_timeout,meter_pilot_total_xds_internal_errors,meter_pilot_total_xds_rejects,meter_pilot_xds_push_context_errors,meter_pilot_xds_push_timeout",
"queryMetricType": "readMetricsValues",
"chartType": "ChartArea"
},
@@ -120,7 +120,7 @@ templates:
"unit": "%"
},
{
- "width": "4",
+ "width": "6",
"title": "Conflicts",
"height": 350,
"entityType": "Service",
@@ -131,7 +131,7 @@ templates:
"chartType": "ChartBar"
},
{
- "width": "4",
+ "width": "6",
"title": "ADS Monitoring",
"height": 350,
"entityType": "Service",
@@ -146,7 +146,7 @@ templates:
"title": "Configuration Validation",
"height": 350,
"entityType": "Service",
- "independentSelector": true,
+ "independentSelector": false,
"metricType": "REGULAR_VALUE",
"queryMetricType": "readMetricsValues",
"chartType": "ChartLine",