[skywalking] 01/01: Remove filter for Istiod monitor to reduce the prerequisites of job name matching

[ke...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kezhenxu94 pushed a commit to branch enhance-mal
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit 1c097e98de5a3a5ffdb498ec0a52dff18975435f
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Sun Nov 21 19:19:59 2021 +0800

    Remove filter for Istiod monitor to reduce the prerequisites of job name matching
---
 .../src/main/resources/otel-oc-rules/istio-controlplane.yaml     | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/oap-server/server-starter/src/main/resources/otel-oc-rules/istio-controlplane.yaml b/oap-server/server-starter/src/main/resources/otel-oc-rules/istio-controlplane.yaml
index cbd7752..175d4a8 100644
--- a/oap-server/server-starter/src/main/resources/otel-oc-rules/istio-controlplane.yaml
+++ b/oap-server/server-starter/src/main/resources/otel-oc-rules/istio-controlplane.yaml
@@ -28,7 +28,6 @@
 #    "-P6H3M"    -- parses as "-6 hours and -3 minutes"
 #    "-P-6H+3M"  -- parses as "+6 hours and -3 minutes"
 # </pre>
-filter: "{ tags -> tags.job_name == 'kubernetes-pods' }" # The OpenTelemetry job name
 expSuffix: tag({tags -> tags.cluster = 'istio-ctrl::' + tags.cluster}).service(['cluster', 'app'])
 metricPrefix: meter_istio
 metricsRules:
@@ -99,11 +98,11 @@ metricsRules:
   ## Webhooks
   # Configuration Validation
   - name: galley_validation_passed
-    exp: galley_validation_passed.sum(['cluster', 'app']).rate('PT1M')
+    exp: galley_validation_passed.tagEqual('app', 'istiod').sum(['cluster', 'app']).rate('PT1M')
   - name: galley_validation_failed
-    exp: galley_validation_failed.sum(['cluster', 'app']).rate('PT1M')
+    exp: galley_validation_failed.tagEqual('app', 'istiod').sum(['cluster', 'app']).rate('PT1M')
   # Sidecar Injection
   - name: sidecar_injection_success_total
-    exp: sidecar_injection_success_total.sum(['cluster', 'app']).rate('PT1M')
+    exp: sidecar_injection_success_total.tagEqual('app', 'istiod').sum(['cluster', 'app']).rate('PT1M')
   - name: sidecar_injection_failure_total
-    exp: sidecar_injection_failure_total.sum(['cluster', 'app']).rate('PT1M')
+    exp: sidecar_injection_failure_total.tagEqual('app', 'istiod').sum(['cluster', 'app']).rate('PT1M')