feat(es-otel): Add elasticsearch otel definitions for prod (#2581)

* feat(es-otel): Add elasticsearch otel definations for prod

* fix(es-otel): Update golden metrics function for validation failure

* fix(es-otel): Update rel name for staging

* fix(es-otel): Remove unused staging file

* fix(es-otel): Update owner for entity definations

Author: vagrawal-newrelic

entity-types/infra-elasticsearchcluster/definition.stg.yml

@@ -24,6 +24,8 @@ synthesis:
       value: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/elasticsearchreceiver"  
     - attribute: elasticsearch.cluster.name
       present: true
+    - attribute: elasticsearch.node.name
+      present: false
     tags:
       otel.library.name:
         entityTagName: instrumentation.name
@@ -42,6 +44,8 @@ synthesis:
       value: "otelcol/elasticsearchreceiver"  
     - attribute: elasticsearch.cluster.name
       present: true
+    - attribute: elasticsearch.node.name
+      present: false  
     tags:
       otel.library.name:
         entityTagName: instrumentation.name
@@ -60,6 +64,8 @@ synthesis:
       value: 'api.logs.otlp'  
     - attribute: elasticsearch.cluster.name
       present: true
+    - attribute: elasticsearch.node.name
+      present: false  
     tags:
       instrumentation.provider:
         entityTagName: instrumentation.name
@@ -84,8 +90,8 @@ dashboardTemplates:
   newRelic:
       template: newrelic_dashboard.stg.json
   opentelemetry:
-    template: opentelemetry_dashboard.stg.json
+    template: opentelemetry_dashboard.json
 
 ownership:
   primaryOwner:
-    teamName: "no owner"
+    teamName: "OnHost Agent and Integrations"

entity-types/infra-elasticsearchcluster/definition.yml

@@ -0,0 +1,81 @@
+domain: INFRA
+type: ELASTICSEARCHCLUSTER
+
+goldenTags:
+- elasticsearch.cluster.name
+- host.name
+
+configuration:
+  entityExpirationTime: DAILY
+  alertable: true
+
+synthesis:
+  rules:
+  - ruleName: infra_elasticsearchcluster_elasticsearch_cluster_name
+    identifier: elasticsearch.cluster.name
+    name: elasticsearch.cluster.name
+    encodeIdentifierInGUID: true
+    conditions:
+    - attribute: eventType
+      value: Metric
+    - attribute: instrumentation.provider
+      value: opentelemetry
+    - attribute: otel.library.name
+      value: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/elasticsearchreceiver"  
+    - attribute: elasticsearch.cluster.name
+      present: true
+    - attribute: elasticsearch.node.name
+      present: false
+    tags:
+      otel.library.name:
+        entityTagName: instrumentation.name
+      elasticsearch.cluster.name:
+      host.name:
+  - ruleName: infra_elasticsearchcluster_elasticsearch_cluster_name_2
+    identifier: elasticsearch.cluster.name
+    name: elasticsearch.cluster.name
+    encodeIdentifierInGUID: true
+    conditions:
+    - attribute: eventType
+      value: Metric
+    - attribute: instrumentation.provider
+      value: opentelemetry
+    - attribute: otel.library.name
+      value: "otelcol/elasticsearchreceiver"  
+    - attribute: elasticsearch.cluster.name
+      present: true
+    - attribute: elasticsearch.node.name
+      present: false  
+    tags:
+      otel.library.name:
+        entityTagName: instrumentation.name
+      elasticsearch.cluster.name:
+      host.name:
+  - ruleName: infra_elasticsearchcluster_elasticsearch_cluster_name_3
+    identifier: elasticsearch.cluster.name
+    name: elasticsearch.cluster.name
+    encodeIdentifierInGUID: true
+    conditions:
+    - attribute: eventType
+      value: Log
+    - attribute: instrumentation.provider
+      value: opentelemetry
+    - attribute: newrelic.source
+      value: 'api.logs.otlp'  
+    - attribute: elasticsearch.cluster.name
+      present: true
+    - attribute: elasticsearch.node.name
+      present: false  
+    tags:
+      instrumentation.provider:
+        entityTagName: instrumentation.name
+      elasticsearch.cluster.name:
+      host.name:
+
+dashboardTemplates:
+  opentelemetry:
+    template: opentelemetry_dashboard.json
+
+ownership:
+  primaryOwner:
+    teamName: "OnHost Agent and Integrations"

entity-types/infra-elasticsearchcluster/golden_metrics.stg.yml

@@ -1,10 +1,11 @@
 clusterHealth:
   title: Cluster Health
-  displayAsValue: true
   queries:
     opentelemetry:
-      select: latest(status)
+      select: latest(elasticsearch.cluster.health)
       from: Metric
+      where: metricName = 'elasticsearch.cluster.health'
+      facet: status
       eventId: entity.guid
       eventName: entity.name
     newRelic:
@@ -18,6 +19,7 @@ clusterDataNode:
     opentelemetry:
       select: average(elasticsearch.cluster.data_nodes)
       from: Metric
+      where: metricName = 'elasticsearch.cluster.data_nodes'
       eventId: entity.guid
       eventName: entity.name
     newRelic:
@@ -31,6 +33,7 @@ clusterNode:
     opentelemetry:
       select: average(elasticsearch.cluster.nodes)
       from: Metric
+      where: metricName = 'elasticsearch.cluster.nodes'
       eventId: entity.guid
       eventName: entity.name 
     newRelic:
@@ -44,7 +47,7 @@ clusterActiveShard:
     opentelemetry:
       select: average(elasticsearch.cluster.shards)
       from: Metric
-      where: state='active'
+      where: metricName = 'elasticsearch.cluster.shards' AND state='active'
       eventId: entity.guid
       eventName: entity.name
 clusterInitializingShard:
@@ -53,7 +56,7 @@ clusterInitializingShard:
     opentelemetry:
       select: average(elasticsearch.cluster.shards)
       from: Metric
-      where: state='initializing'
+      where: metricName = 'elasticsearch.cluster.shards' AND state='initializing'
       eventId: entity.guid
       eventName: entity.name
 clusterPrimaryActiveShard:
@@ -62,7 +65,7 @@ clusterPrimaryActiveShard:
     opentelemetry:
       select: average(elasticsearch.cluster.shards)
       from: Metric
-      where: state='active_primary'
+      where: metricName = 'elasticsearch.cluster.shards' AND state='active_primary'
       eventId: entity.guid
       eventName: entity.name
 clusterRelocatingShard:
@@ -71,7 +74,7 @@ clusterRelocatingShard:
     opentelemetry:
       select: average(elasticsearch.cluster.shards)
       from: Metric
-      where: state='relocating'
+      where: metricName = 'elasticsearch.cluster.shards' AND state='relocating'
       eventId: entity.guid
       eventName: entity.name
 clusterUnassignedShard:
@@ -80,7 +83,7 @@ clusterUnassignedShard:
     opentelemetry:
       select: average(elasticsearch.cluster.shards)
       from: Metric
-      where: state='unassigned'
+      where: metricName = 'elasticsearch.cluster.shards' AND state='unassigned'
       eventId: entity.guid
       eventName: entity.name
     newRelic:
@@ -89,10 +92,11 @@ clusterUnassignedShard:
       eventId: entityGuid
       eventName: entityName
 clusterPendingTask:
-  title: Cluster Pending Task
+  title: Cluster Pending Tasks
   queries:
     opentelemetry:
       select: latest(elasticsearch.cluster.pending_tasks)
       from: Metric
+      where: metricName = 'elasticsearch.cluster.pending_tasks'
       eventId: entity.guid
       eventName: entity.name      

entity-types/infra-elasticsearchcluster/golden_metrics.yml

@@ -0,0 +1,82 @@
+clusterHealth:
+  title: Cluster Health
+  queries:
+    opentelemetry:
+      select: latest(elasticsearch.cluster.health)
+      from: Metric
+      where: metricName = 'elasticsearch.cluster.health'
+      facet: status
+      eventId: entity.guid
+      eventName: entity.name
+clusterDataNode:
+  title: Cluster Data Node
+  queries:
+    opentelemetry:
+      select: average(elasticsearch.cluster.data_nodes)
+      from: Metric
+      where: metricName = 'elasticsearch.cluster.data_nodes'
+      eventId: entity.guid
+      eventName: entity.name
+clusterNode:
+  title: Cluster Node
+  queries:
+    opentelemetry:
+      select: average(elasticsearch.cluster.nodes)
+      from: Metric
+      where: metricName = 'elasticsearch.cluster.nodes'
+      eventId: entity.guid
+      eventName: entity.name
+clusterActiveShard:
+  title: Cluster Active Shard
+  queries:
+    opentelemetry:
+      select: average(elasticsearch.cluster.shards)
+      from: Metric
+      where: metricName = 'elasticsearch.cluster.shards' AND state='active'
+      eventId: entity.guid
+      eventName: entity.name
+clusterInitializingShard:
+  title: Cluster Initializing Shard
+  queries:
+    opentelemetry:
+      select: average(elasticsearch.cluster.shards)
+      from: Metric
+      where: metricName = 'elasticsearch.cluster.shards' AND state='initializing'
+      eventId: entity.guid
+      eventName: entity.name
+clusterPrimaryActiveShard:
+  title: Cluster Primary Active Shard
+  queries:
+    opentelemetry:
+      select: average(elasticsearch.cluster.shards)
+      from: Metric
+      where: metricName = 'elasticsearch.cluster.shards' AND state='active_primary'
+      eventId: entity.guid
+      eventName: entity.name
+clusterRelocatingShard:
+  title: Cluster Relocating Shard
+  queries:
+    opentelemetry:
+      select: average(elasticsearch.cluster.shards)
+      from: Metric
+      where: metricName = 'elasticsearch.cluster.shards' AND state='relocating'
+      eventId: entity.guid
+      eventName: entity.name
+clusterUnassignedShard:
+  title: Cluster Unassigned Shard
+  queries:
+    opentelemetry:
+      select: average(elasticsearch.cluster.shards)
+      from: Metric
+      where: metricName = 'elasticsearch.cluster.shards' AND state='unassigned'
+      eventId: entity.guid
+      eventName: entity.name
+clusterPendingTask:
+  title: Cluster Pending Tasks
+  queries:
+    opentelemetry:
+      select: latest(elasticsearch.cluster.pending_tasks)
+      from: Metric
+      where: metricName = 'elasticsearch.cluster.pending_tasks'
+      eventId: entity.guid
+      eventName: entity.name