fix: Revert changes to istio and envoy (#2335)

* Revert changes to istio and envoy

* Revert tests

* Update tests

* Update tests

* Write new tests

* Renove guid

* Make conditions more specific

---------

Co-authored-by: Adrian <[email protected]>

Author: dbudziwojskiNR

entity-types/ext-envoy/definition.stg.yml

@@ -7,27 +7,27 @@ synthesis:
         separator: ":"
         attributes:
           - cluster_name
-          - pod
+          - gateway_envoyproxy_io_owning_gateway_name
       encodeIdentifierInGUID: true
-      name: pod
+      name: gateway_envoyproxy_io_owning_gateway_name
       conditions:
         - attribute: metricName
           prefix: envoy_
         - attribute: instrumentation.provider
-          value: "prometheus"
+          value: prometheus
     # otel
     - compositeIdentifier:
         separator: ":"
         attributes:
           - k8s.cluster.name
-          - k8s.pod.name
+          - k8s.pod.label.gateway.envoyproxy.io/owning-gateway-name
       encodeIdentifierInGUID: true
-      name: k8s.pod.name
+      name: k8s.pod.label.gateway.envoyproxy.io/owning-gateway-name
       conditions:
         - attribute: metricName
           prefix: envoy_
         - attribute: instrumentation.provider
-          value: "opentelemetry"
+          value: opentelemetry
 
   tags:
     # prometheus

entity-types/ext-envoy/definition.yml

@@ -1,69 +1,21 @@
 domain: EXT
 type: ENVOY
-goldenTags:
-  - k8s.clusterName
-  - k8s.namespaceName
-
 synthesis:
   rules:
-    # prometheus
-    - compositeIdentifier:
-        separator: ":"
-        attributes:
-          - cluster_name
-          - pod
+    - identifier: host.hostname
+      name: host.hostname
       encodeIdentifierInGUID: true
-      name: pod
       conditions:
+        - attribute: eventType
+          value: Metric
         - attribute: metricName
-          prefix: envoy_
-    # otel
-    - compositeIdentifier:
-        separator: ":"
-        attributes:
-          - k8s.cluster.name
-          - k8s.pod.name
-      encodeIdentifierInGUID: true
-      name: k8s.pod.name
-      conditions:
-        - attribute: metricName
-          prefix: envoy_
-
-  tags:
-    # prometheus
-    cluster_name:
-      entityTagName: k8s.clusterName
-      ttl: P1D
-    namespace:
-      entityTagName: k8s.namespaceName
-      ttl: P1D
-    node:
-      entityTagName: k8s.nodeName
-      ttl: P1D
-    pod:
-      entityTagName: k8s.podName
-      ttl: P1D
-
-    # otel
-    k8s.cluster.name:
-      entityTagName: k8s.clusterName
-      ttl: P1D
-    k8s.namespace.name:
-      entityTagName: k8s.namespaceName
-      ttl: P1D
-    k8s.node.name:
-      entityTagName: k8s.nodeName
-      ttl: P1D
-    k8s.pod.name:
-      entityTagName: k8s.podName
-      ttl: P1D
-
+          value: "envoy_http_downstream_cx_total"
+      tags:
+        ip:
+        newrelic.agentVersion:
 dashboardTemplates:
-  newRelic:
-    template: dashboard.json
-  prometheus:
+  newrelic:
     template: dashboard.json
-
 configuration:
   entityExpirationTime: EIGHT_DAYS
   alertable: true

entity-types/ext-envoy/tests/Metric.json

@@ -25,6 +25,7 @@
     "namespace": "envoy-gateway-system",
     "newrelic.source": "prometheusAPI",
     "node": "ip-10-0-63-169.us-west-1.compute.internal",
+    "host.hostname": "ip-10-0-63-169.us-west-1.compute.internal",
     "pod": "envoy-default-eg-e41e7b31-56cbfb47d9-xw4zh",
     "pod_template_hash": "56cbfb47d9",
     "prometheus_server": "newrelic-prometheus-agent-0",

entity-types/ext-istio_service/definition.stg.yml

@@ -0,0 +1,106 @@
+domain: EXT
+type: ISTIO_SERVICE
+goldenTags:
+  - k8s.clusterName
+  - k8s.namespaceName
+
+synthesis:
+  rules:
+    # prometheus
+    - compositeIdentifier:
+        separator: ":"
+        attributes:
+          - cluster_name
+          - service_istio_io_canonical_name
+      encodeIdentifierInGUID: true
+      name: service_istio_io_canonical_name
+      conditions:
+        - attribute: metricName
+          prefix: istio_request
+        - attribute: instrumentation.provider
+          value: prometheus
+    - compositeIdentifier:
+        separator: ":"
+        attributes:
+          - cluster_name
+          - service_istio_io_canonical_name
+      encodeIdentifierInGUID: true
+      name: service_istio_io_canonical_name
+      conditions:
+        - attribute: metricName
+          prefix: istio_response
+        - attribute: instrumentation.provider
+          value: prometheus
+    # otel
+    - compositeIdentifier:
+        separator: ":"
+        attributes:
+          - k8s.cluster.name
+          - k8s.pod.label.service.istio.io/canonical-name
+      encodeIdentifierInGUID: true
+      name: k8s.pod.label.service.istio.io/canonical-name
+      conditions:
+        - attribute: metricName
+          prefix: istio_request
+        - attribute: instrumentation.provider
+          value: opentelemetry
+    - compositeIdentifier:
+        separator: ":"
+        attributes:
+          - k8s.cluster.name
+          - k8s.pod.label.service.istio.io/canonical-name
+      encodeIdentifierInGUID: true
+      name: k8s.pod.label.service.istio.io/canonical-name
+      conditions:
+        - attribute: metricName
+          prefix: istio_response
+        - attribute: instrumentation.provider
+          value: opentelemetry
+
+  tags:
+    # prometheus
+    cluster_name:
+      entityTagName: k8s.clusterName
+      ttl: P1D
+    deployment:
+      entityTagName: k8s.deploymentName
+      ttl: P1D
+    namespace:
+      entityTagName: k8s.namespaceName
+      ttl: P1D
+    pod:
+      entityTagName: k8s.podName
+      ttl: P1D
+
+    # otel
+    k8s.cluster.name:
+      entityTagName: k8s.clusterName
+      ttl: P1D
+    k8s.deployment.name:
+      entityTagName: k8s.deploymentName
+      ttl: P1D
+    k8s.namespace.name:
+      entityTagName: k8s.namespaceName
+      ttl: P1D
+    k8s.pod.name:
+      entityTagName: k8s.podName
+      ttl: P1D
+
+    service_istio_io_canonical_revision:
+    app:
+    version:
+    label.istio:
+    istio_io_rev:
+    operator_istio_io_component:
+
+dashboardTemplates:
+  newRelic:
+    template: dashboard.json
+  prometheus:
+    template: dashboard.json
+  opentelemetry:
+    template: opentelemetry_dashboard.json
+
+configuration:
+  entityExpirationTime: FOUR_HOURS
+  alertable: true