From 8142239786573bb8804b8123b5a90ad755e1f385 Mon Sep 17 00:00:00 2001
From: mbolla22 <mbolla@newrelic.com>
Date: Mon, 20 Jul 2026 15:50:47 +0530
Subject: [PATCH] Add Consul OpenTelemetry production definition support

Enable OpenTelemetry synthesis and dashboard template for the Consul production definition, and remove the redundant OTel dashboard coverage widget.
---
 entity-types/infra-consulagent/definition.yml | 33 +++++++++++++++++++
 .../opentelemetry_dashboard.json              | 19 -----------
 2 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/entity-types/infra-consulagent/definition.yml b/entity-types/infra-consulagent/definition.yml
index e7294b016b..18a33db82a 100644
--- a/entity-types/infra-consulagent/definition.yml
+++ b/entity-types/infra-consulagent/definition.yml
@@ -1,5 +1,36 @@
 domain: INFRA
 type: CONSULAGENT
+
+synthesis:
+  rules:
+  # OpenTelemetry synthesis rule for Consul metrics from OTel Prometheus receiver
+  - ruleName: infra_consulagent_otel_instance
+    identifier: service.instance.id
+    name: service.instance.id
+    encodeIdentifierInGUID: true
+    conditions:
+      - attribute: eventType
+        value: Metric
+      - attribute: metricName
+        prefix: consul_
+      - attribute: instrumentation.provider
+        value: opentelemetry
+      - attribute: service.instance.id
+    tags:
+      instance:
+      job:
+      service.instance.id:
+      service.name:
+      node:
+      datacenter:
+      otel.library.name:
+        entityTagName: instrumentation.name
+
+  tags:
+    # For OpenTelemetry
+    telemetry.sdk.name:
+      entityTagName: instrumentation.provider
+
 configuration:
   entityExpirationTime: DAILY
   alertable: true
@@ -8,6 +39,8 @@ dashboardTemplates:
   # This should match the entity created from the ohi in the infra pipeline
   newRelic:
     template: newrelic_dashboard.json
+  opentelemetry:
+    template: opentelemetry_dashboard.json
 
 ownership:
   primaryOwner:
diff --git a/entity-types/infra-consulagent/opentelemetry_dashboard.json b/entity-types/infra-consulagent/opentelemetry_dashboard.json
index e128cdddf6..c8ac1c63ee 100644
--- a/entity-types/infra-consulagent/opentelemetry_dashboard.json
+++ b/entity-types/infra-consulagent/opentelemetry_dashboard.json
@@ -174,25 +174,6 @@
                 "accountId": 0}
             ]
           }
-        },
-        {
-          "visualization": {
-            "id": "viz.table"
-          },
-          "layout": {
-            "column": 1,
-            "row": 13,
-            "height": 3,
-            "width": 12
-          },
-          "title": "Node and Datacenter Coverage",
-          "rawConfiguration": {
-            "nrqlQueries": [
-              {
-                "query": "FROM Metric SELECT count(*) WHERE instrumentation.provider = 'opentelemetry' AND metricName LIKE 'consul_%' FACET consul.node.name, consul.datacenter LIMIT 100",
-                "accountId": 0}
-            ]
-          }
         }
       ]
     }