From bb25d2036ebe57dafbdb1188a40ee54924249727 Mon Sep 17 00:00:00 2001
From: Ujwal Sah <usah@newrelic.com>
Date: Thu, 23 Oct 2025 02:47:29 +0530
Subject: [PATCH] Updated rabbitmq golden metrics

---
 .../golden_metrics.stg.yml                    |  88 ++++++++
 .../newrelic_dashboard.stg.json               | 189 ++++++++++++++++++
 .../opentelemetry_dashboard.stg.json          |   2 +-
 3 files changed, 278 insertions(+), 1 deletion(-)
 create mode 100644 entity-types/infra-rabbitmqexchange/golden_metrics.stg.yml
 create mode 100644 entity-types/infra-rabbitmqexchange/newrelic_dashboard.stg.json

diff --git a/entity-types/infra-rabbitmqexchange/golden_metrics.stg.yml b/entity-types/infra-rabbitmqexchange/golden_metrics.stg.yml
new file mode 100644
index 0000000000..e2177b590c
--- /dev/null
+++ b/entity-types/infra-rabbitmqexchange/golden_metrics.stg.yml
@@ -0,0 +1,88 @@
+messagesPublishedPerChannel:
+  title: Messages published per channel
+  unit: COUNT
+  queries:
+    newRelic:
+      select: sum(exchange.messagesPublishedPerChannel)
+      from: RabbitmqExchangeSample
+      eventId: entityGuid
+      eventName: entityName
+    opentelemetry:
+      select: sum(rabbitmq.message.published)
+      from: Metric
+      where: instrumentation.provider = 'opentelemetry'
+      eventId: entity.guid
+      eventName: entity.name
+
+messagesPublishedPerChannelPerSecond:
+  title: Messages published per channel per second
+  unit: OPERATIONS_PER_SECOND
+  queries:
+    newRelic:
+      select: average(exchange.messagesPublishedPerChannelPerSecond)
+      from: RabbitmqExchangeSample
+      eventId: entityGuid
+      eventName: entityName
+
+messagesPublishedQueue:
+  title: Messages published queue
+  unit: COUNT
+  queries:
+    newRelic:
+      select: sum(exchange.messagesPublishedQueue)
+      from: RabbitmqExchangeSample
+      eventId: entityGuid
+      eventName: entityName
+    opentelemetry:
+      select: sum(rabbitmq.message.published)
+      from: Metric
+      where: instrumentation.provider = 'opentelemetry'
+      eventId: entity.guid
+      eventName: entity.name
+
+messagesPublishedQueuePerSecond:
+  title: Messages published queue per second
+  unit: OPERATIONS_PER_SECOND
+  queries:
+    newRelic:
+      select: average(exchange.messagesPublishedQueuePerSecond)
+      from: RabbitmqExchangeSample
+      eventId: entityGuid
+      eventName: entityName
+
+messagesPublished:
+  title: Messages Published
+  unit: COUNT
+  queries:
+    newRelic:
+      select: sum(exchange.messagesPublishedPerChannel)
+      from: RabbitmqExchangeSample
+      eventId: entityGuid
+      eventName: entityName
+    opentelemetry:
+      select: sum(rabbitmq.message.published)
+      from: Metric
+      where: instrumentation.provider = 'opentelemetry'
+      eventId: entity.guid
+      eventName: entity.name
+
+bindings:
+  title: Bindings
+  unit: COUNT
+  queries:
+    newRelic:
+      select: average(exchange.bindings)
+      from: RabbitmqExchangeSample
+      eventId: entityGuid
+      eventName: entityName
+
+totalMessages:
+  title: Total Messages
+  unit: COUNT
+  queries:
+    opentelemetry:
+      select: sum(rabbitmq.message.current)
+      from: Metric
+      where: instrumentation.provider = 'opentelemetry'
+      eventId: entity.guid
+      eventName: entity.name
\ No newline at end of file
diff --git a/entity-types/infra-rabbitmqexchange/newrelic_dashboard.stg.json b/entity-types/infra-rabbitmqexchange/newrelic_dashboard.stg.json
new file mode 100644
index 0000000000..c584ac13b1
--- /dev/null
+++ b/entity-types/infra-rabbitmqexchange/newrelic_dashboard.stg.json
@@ -0,0 +1,189 @@
+{
+    "name": "RabbitmqExchangeSample",
+    "pages": [
+        {
+            "name": "RabbitmqExchangeSample",
+            "widgets": [
+                {
+                    "visualization": {
+                        "id": "viz.line"
+                    },
+                    "layout": {
+                        "column": 1,
+                        "row": 1,
+                        "height": 3,
+                        "width": 4
+                    },
+                    "title": "Number of bindings",
+                    "rawConfiguration": {
+                        "nrqlQueries": [
+                            {
+                                "query": "SELECT average(exchange.bindings) FROM RabbitmqExchangeSample TIMESERIES AUTO",
+                                "accountId": 0
+                            }
+                        ],
+                        "yAxisLeft": {
+                            "zero": true
+                        }
+                    }
+                },
+                {
+                    "visualization": {
+                        "id": "viz.line"
+                    },
+                    "layout": {
+                        "column": 5,
+                        "row": 1,
+                        "height": 3,
+                        "width": 4
+                    },
+                    "title": "Messages published per channel",
+                    "rawConfiguration": {
+                        "nrqlQueries": [
+                            {
+                                "query": "SELECT sum(exchange.messagesPublishedPerChannel) FROM RabbitmqExchangeSample TIMESERIES AUTO",
+                                "accountId": 0
+                            }
+                        ],
+                        "yAxisLeft": {
+                            "zero": true
+                        }
+                    }
+                },
+                {
+                    "visualization": {
+                        "id": "viz.line"
+                    },
+                    "layout": {
+                        "column": 9,
+                        "row": 1,
+                        "height": 3,
+                        "width": 4
+                    },
+                    "title": "Messages published per channel throughput",
+                    "rawConfiguration": {
+                        "nrqlQueries": [
+                            {
+                                "query": "SELECT average(exchange.messagesPublishedPerChannelPerSecond) FROM RabbitmqExchangeSample TIMESERIES AUTO",
+                                "accountId": 0
+                            }
+                        ],
+                        "yAxisLeft": {
+                            "zero": true
+                        }
+                    }
+                },
+                {
+                    "visualization": {
+                        "id": "viz.line"
+                    },
+                    "layout": {
+                        "column": 1,
+                        "row": 4,
+                        "height": 3,
+                        "width": 4
+                    },
+                    "title": "Messages published to queues",
+                    "rawConfiguration": {
+                        "nrqlQueries": [
+                            {
+                                "query": "SELECT sum(exchange.messagesPublishedQueue) FROM RabbitmqExchangeSample TIMESERIES AUTO",
+                                "accountId": 0
+                            }
+                        ],
+                        "yAxisLeft": {
+                            "zero": true
+                        }
+                    }
+                },
+                {
+                    "visualization": {
+                        "id": "viz.line"
+                    },
+                    "layout": {
+                        "column": 5,
+                        "row": 4,
+                        "height": 3,
+                        "width": 4
+                    },
+                    "title": "Messages published to queues throughput",
+                    "rawConfiguration": {
+                        "nrqlQueries": [
+                            {
+                                "query": "SELECT average(exchange.messagesPublishedQueuePerSecond) FROM RabbitmqExchangeSample TIMESERIES AUTO",
+                                "accountId": 0
+                            }
+                        ],
+                        "yAxisLeft": {
+                            "zero": true
+                        }
+                    }
+                },
+                {
+                    "visualization": {
+                        "id": "viz.billboard"
+                    },
+                    "layout": {
+                        "column": 9,
+                        "row": 4,
+                        "height": 3,
+                        "width": 4
+                    },
+                    "title": "Exchange Health Summary",
+                    "rawConfiguration": {
+                        "nrqlQueries": [
+                            {
+                                "query": "SELECT latest(exchange.bindings) AS 'Bindings', sum(exchange.messagesPublishedPerChannel) AS 'Messages Published (Channel)', sum(exchange.messagesPublishedQueue) AS 'Messages Published (Queue)' FROM RabbitmqExchangeSample",
+                                "accountId": 0
+                            }
+                        ],
+                        "thresholds": []
+                    }
+                },
+                {
+                    "visualization": {
+                        "id": "viz.line"
+                    },
+                    "layout": {
+                        "column": 1,
+                        "row": 7,
+                        "height": 3,
+                        "width": 6
+                    },
+                    "title": "Message Publishing Overview",
+                    "rawConfiguration": {
+                        "nrqlQueries": [
+                            {
+                                "query": "SELECT sum(exchange.messagesPublishedPerChannel) AS 'Published (Channel)', sum(exchange.messagesPublishedQueue) AS 'Published (Queue)' FROM RabbitmqExchangeSample TIMESERIES AUTO",
+                                "accountId": 0
+                            }
+                        ],
+                        "yAxisLeft": {
+                            "zero": true
+                        }
+                    }
+                },
+                {
+                    "visualization": {
+                        "id": "viz.table"
+                    },
+                    "layout": {
+                        "column": 7,
+                        "row": 7,
+                        "height": 3,
+                        "width": 6
+                    },
+                    "title": "Exchange Details",
+                    "rawConfiguration": {
+                        "nrqlQueries": [
+                            {
+                                "query": "SELECT latest(exchange.bindings) AS 'Bindings', sum(exchange.messagesPublishedPerChannel) AS 'Messages Published (Channel)', sum(exchange.messagesPublishedQueue) AS 'Messages Published (Queue)', average(exchange.messagesPublishedPerChannelPerSecond) AS 'Throughput (Channel/sec)', average(exchange.messagesPublishedQueuePerSecond) AS 'Throughput (Queue/sec)' FROM RabbitmqExchangeSample FACET entityName",
+                                "accountId": 0
+                            }
+                        ]
+                    }
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/entity-types/infra-rabbitmqqueue/opentelemetry_dashboard.stg.json b/entity-types/infra-rabbitmqqueue/opentelemetry_dashboard.stg.json
index d29fba50f4..b355433b86 100644
--- a/entity-types/infra-rabbitmqqueue/opentelemetry_dashboard.stg.json
+++ b/entity-types/infra-rabbitmqqueue/opentelemetry_dashboard.stg.json
@@ -37,7 +37,7 @@
           "rawConfiguration": {
             "nrqlQueries": [
               {
-                "query": "FROM Metric SELECT latest(rabbitmq.message.current) WHERE AND state = 'unacknowledged' AND instrumentation.provider = 'opentelemetry' TIMESERIES AUTO",
+                "query": "FROM Metric SELECT latest(rabbitmq.message.current) WHERE state = 'unacknowledged' AND instrumentation.provider = 'opentelemetry' TIMESERIES AUTO",
                 "accountId": 0}
             ]
           }