Skip to content

Commit

Permalink
[Azure Metrics] Fix CassandraConnectionClosures metric configuration (#…
Browse files Browse the repository at this point in the history
…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`
  • Loading branch information
zmoog authored Oct 20, 2023
1 parent 0bd2d73 commit 42f2f94
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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*

Expand Down
18 changes: 16 additions & 2 deletions x-pack/metricbeat/module/azure/database_account/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand All @@ -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",
Expand All @@ -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"]
Expand All @@ -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",
Expand Down

0 comments on commit 42f2f94

Please sign in to comment.