From 42f2f9426043d5ee6fe76ec490e74c9680fdd1b0 Mon Sep 17 00:00:00 2001
From: Maurizio Branca <maurizio.branca@elastic.co>
Date: Fri, 20 Oct 2023 10:54:01 +0200
Subject: [PATCH] [Azure Metrics] Fix CassandraConnectionClosures metric
 configuration (#34742)

* Move CassandraConnectionClosures metrics

The name of the metric, "CassandraConnectionClosures" is listed in the
wrong section of the metrics configuration.

It should be moved to a different section that includes metric names
which may or may not be available depending on the environment, with
the "ignore_unsupported" setting set to true.

* Update changelog

* Fix dimensions for CassandraConnectionClosures

The `CassandraConnectionClosures` metric only supports the following
dimensions:

- `ClosureReason`
- `Region`
---
 CHANGELOG.next.asciidoc                        |  1 +
 .../module/azure/database_account/manifest.yml | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
index 7c35197567b..7ca5ca55525 100644
--- a/CHANGELOG.next.asciidoc
+++ b/CHANGELOG.next.asciidoc
@@ -139,6 +139,7 @@ is collected by it.
 - Add remaining dimensions for azure storage account to make them available for tsdb enablement. {pull}36331[36331]
 - Add missing 'TransactionType' dimension for Azure Storage Account. {pull}36413[36413]
 - Add log error when statsd server fails to start {pull}36477[36477]
+- Fix CassandraConnectionClosures metric configuration {pull}34742[34742]
 
 *Osquerybeat*
 
diff --git a/x-pack/metricbeat/module/azure/database_account/manifest.yml b/x-pack/metricbeat/module/azure/database_account/manifest.yml
index 3436008db7e..1ef2ecb9b2c 100644
--- a/x-pack/metricbeat/module/azure/database_account/manifest.yml
+++ b/x-pack/metricbeat/module/azure/database_account/manifest.yml
@@ -9,7 +9,7 @@ input:
       resource_type: "Microsoft.DocumentDb/databaseAccounts"
       metrics:
       - name: ["AddRegion", "RemoveRegion", "UpdateAccountReplicationSettings", "UpdateAccountNetworkSettings", "UpdateAccountKeys", "ServiceAvailability", "ReplicationLatency",
-               "RegionFailover", "DeleteAccount", "CreateAccount", "CassandraConnectionClosures", "UpdateDiagnosticsSettings"]
+               "RegionFailover", "DeleteAccount", "CreateAccount", "UpdateDiagnosticsSettings"]
         namespace: "Microsoft.DocumentDb/databaseAccounts"
       - name: ["AvailableStorage", "DataUsage","DocumentCount", "DocumentQuota", "IndexUsage", "MetadataRequests", "MongoRequestCharge", "MongoRequests", "MongoRequestsCount",
                "MongoRequestsInsert", "MongoRequestsDelete", "MongoRequestsQuery", "MongoRequestsUpdate","ProvisionedThroughput", "NormalizedRUConsumption"]
@@ -35,6 +35,13 @@ input:
         dimensions:
         - name: "DatabaseName"
           value: "*"
+      - name: ["CassandraConnectionClosures"]
+        namespace: "Microsoft.DocumentDb/databaseAccounts"
+        ignore_unsupported: true
+        timegrain: "PT1M"
+        dimensions:
+          - name: "ClosureReason"
+            value: "*"
       - name: [ "GremlinDatabaseDelete", "GremlinDatabaseThroughputUpdate", "GremlinDatabaseUpdate", "GremlinGraphDelete","GremlinGraphThroughputUpdate", "GremlinGraphUpdate",
         "MongoCollectionDelete", "MongoCollectionThroughputUpdate", "MongoCollectionUpdate", "MongoDBDatabaseUpdate", "MongoDatabaseDelete", "MongoDatabaseThroughputUpdate",
         "CassandraKeyspaceDelete", "CassandraKeyspaceThroughputUpdate", "CassandraKeyspaceUpdate","CassandraTableDelete", "CassandraTableThroughputUpdate", "CassandraTableUpdate",
@@ -48,7 +55,7 @@ input:
     - resource_id: ""
       metrics:
       - name: ["AddRegion", "RemoveRegion", "UpdateAccountReplicationSettings", "UpdateAccountNetworkSettings", "UpdateAccountKeys", "ServiceAvailability", "ReplicationLatency",
-               "RegionFailover", "DeleteAccount", "CreateAccount", "CassandraConnectionClosures", "UpdateDiagnosticsSettings"]
+               "RegionFailover", "DeleteAccount", "CreateAccount", "UpdateDiagnosticsSettings"]
         namespace: "Microsoft.DocumentDb/databaseAccounts"
       - name: ["AvailableStorage", "DataUsage","DocumentCount", "DocumentQuota", "IndexUsage", "MetadataRequests", "MongoRequestCharge", "MongoRequests", "MongoRequestsCount",
                "MongoRequestsInsert", "MongoRequestsDelete", "MongoRequestsQuery", "MongoRequestsUpdate","ProvisionedThroughput", "NormalizedRUConsumption"]
@@ -74,6 +81,13 @@ input:
         dimensions:
         - name: "DatabaseName"
           value: "*"
+      - name: ["CassandraConnectionClosures"]
+        namespace: "Microsoft.DocumentDb/databaseAccounts"
+        ignore_unsupported: true
+        timegrain: "PT1M"
+        dimensions:
+        - name: "ClosureReason"
+          value: "*"
       - name: [ "GremlinDatabaseDelete", "GremlinDatabaseThroughputUpdate", "GremlinDatabaseUpdate", "GremlinGraphDelete","GremlinGraphThroughputUpdate", "GremlinGraphUpdate",
                 "MongoCollectionDelete", "MongoCollectionThroughputUpdate", "MongoCollectionUpdate", "MongoDBDatabaseUpdate", "MongoDatabaseDelete", "MongoDatabaseThroughputUpdate",
                 "CassandraKeyspaceDelete", "CassandraKeyspaceThroughputUpdate", "CassandraKeyspaceUpdate","CassandraTableDelete", "CassandraTableThroughputUpdate", "CassandraTableUpdate",