Merge branch 'main' into fix/gcp-prefix-fixes

Author: sparsi17

entity-types/infra-gcpcloudrunrevision/dashboard.json

@@ -1,5 +1,8 @@
 domain: INFRA
 type: GCPRUNREVISION
+goldenTags:
+- gcp.projectId
+- gcp.region
 configuration:
   entityExpirationTime: DAILY
   alertable: true

entity-types/infra-gcpcloudrunrevision/definition.yml

@@ -3,8 +3,7 @@ type: IBMMQ_MANAGER
 
 synthesis:
   rules:
-    # nri-mq rules: native identity = targetName:qmgr. OTel excluded via instrumentation.provider absent
-    # so nri-mq and OpenTelemetry never double-synthesize the same queue manager.
+    # nri-mq rules: identity targetName:qmgr.
     - ruleName: infra_ibmmq_manager_nri_1
       compositeIdentifier:
         separator: ":"
@@ -17,10 +16,9 @@ synthesis:
           value: Metric
         - attribute: metricName
           prefix: ibmmq_qmgr
-        - attribute: instrumentation.provider
-          present: false
       tags:
         clusterName:
+        instrumentation.provider:
 
     - ruleName: infra_ibmmq_manager_nri_2
       compositeIdentifier:
@@ -34,10 +32,9 @@ synthesis:
           value: Metric
         - attribute: metricName
           prefix: ibmmq_channel
-        - attribute: instrumentation.provider
-          present: false
       tags:
         clusterName:
+        instrumentation.provider:
 
     - ruleName: infra_ibmmq_manager_nri_3
       compositeIdentifier:
@@ -51,10 +48,9 @@ synthesis:
           value: Metric
         - attribute: metricName
           prefix: ibmmq_subscription
-        - attribute: instrumentation.provider
-          present: false
       tags:
         clusterName:
+        instrumentation.provider:
 
     # OpenTelemetry rule (Prometheus receiver): identity keyed on host.id (== target.name in OTel data).
     # target.name is the fallback when host.id is absent (see *_fallback); mutually exclusive via

entity-types/infra-gcprunrevision/definition.yml

@@ -6,6 +6,16 @@
     "qmgr": "QM1",
     "newrelic.source": "metricAPI"
   },
+  {
+    "host.name": "mq-host-01",
+    "metricName": "ibmmq_qmgr_status",
+    "targetName": "mq-host-01:9157",
+    "qmgr": "QM2",
+    "instrumentation.name": "ibmmq",
+    "instrumentation.provider": "newRelic",
+    "instrumentation.version": "0.4.3",
+    "newrelic.source": "metricAPI"
+  },
   {
     "metricName": "ibmmq_qmgr_connection_count",
     "instrumentation.provider": "opentelemetry",

…a-gcpcloudrunrevision/golden_metrics.yml …/infra-gcprunrevision/golden_metrics.ymlentity-types/infra-gcpcloudrunrevision/golden_metrics.yml renamed to entity-types/infra-gcprunrevision/golden_metrics.yml entity-types/infra-gcpcloudrunrevision/golden_metrics.yml renamed to entity-types/infra-gcprunrevision/golden_metrics.yml

@@ -5,8 +5,7 @@ goldenTags:
 
 synthesis:
   rules:
-    # nri-mq rule: native identity = targetName:qmgr:queue. OTel excluded via instrumentation.provider
-    # absent so nri-mq and OpenTelemetry never double-synthesize the same queue.
+    # nri-mq rule: identity targetName:qmgr:queue.
     - ruleName: infra_ibmmq_queue_nri_1
       compositeIdentifier:
         separator: ":"
@@ -26,10 +25,9 @@ synthesis:
           value: Metric
         - attribute: metricName
           prefix: ibmmq_queue
-        - attribute: instrumentation.provider
-          present: false
       tags:
         qmgr:
+        instrumentation.provider:
 
     # OpenTelemetry rule (Prometheus receiver): identity keyed on host.id:qmgr:queue (host.id ==
     # target.name in OTel data); target.name is the fallback when host.id is absent (see *_fallback);

…-gcpcloudrunrevision/summary_metrics.yml …infra-gcprunrevision/summary_metrics.ymlentity-types/infra-gcpcloudrunrevision/summary_metrics.yml renamed to entity-types/infra-gcprunrevision/summary_metrics.yml entity-types/infra-gcpcloudrunrevision/summary_metrics.yml renamed to entity-types/infra-gcprunrevision/summary_metrics.yml

@@ -7,6 +7,17 @@
     "queue": "DEV.QUEUE.1",
     "newrelic.source": "metricAPI"
   },
+  {
+    "host.name": "mq-host-01",
+    "metricName": "ibmmq_queue_depth",
+    "targetName": "mq-host-01:9157",
+    "qmgr": "QM2",
+    "queue": "DEV.QUEUE.2",
+    "instrumentation.name": "ibmmq",
+    "instrumentation.provider": "newRelic",
+    "instrumentation.version": "0.4.3",
+    "newrelic.source": "metricAPI"
+  },
   {
     "metricName": "ibmmq_queue_depth",
     "instrumentation.provider": "opentelemetry",