diff --git a/CHANGES.md b/CHANGES.md index 7075dd94d6fcaf35712bf058dfd685c69402d138..8cfd907c9d520778d997585e7683f2a3550e4238 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 d32cf5a2373a9eefcb4edddbb97f9d2507e0a7cf..0fed992c7266b16ff827a4eb5bd70252deee868d 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 d45122bfbf5c7a1f8eac2994c4927cd5b154ffa8..1993f0923e7f4ed8fd9846e2939261fb7e9b1709 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",