[postgres] add alloydbadmin & alloydbmetadata to default exclusion li…

…st (#19061) * exclude alloydbadmin & alloydbmetadata * add changelog
DataDog · Nov 15, 2024 · 4161d4d · 4161d4d
1 parent ec26732
commit 4161d4d
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 2 deletions.
diff --git a/postgres/assets/configuration/spec.yaml b/postgres/assets/configuration/spec.yaml
@@ -76,12 +76,16 @@ files:
           - rdsadmin
           - azure_maintenance
           - cloudsqladmin
+          - alloydbadmin
+          - alloydbmetadata
         default:
           - 'template0'
           - 'template1'
           - rdsadmin
           - azure_maintenance
           - cloudsqladmin
+          - alloydbadmin
+          - alloydbmetadata
     - name: ssl
       description: |
         This option determines whether or not and with what priority a secure SSL TCP/IP connection

diff --git a/postgres/changelog.d/19061.fixed b/postgres/changelog.d/19061.fixed
@@ -0,0 +1 @@
+Add alloydbadmin & alloydbmetadata to default list of databases to exclude from autodiscovery and databases to ignore to prevent failures on GCP AlloyDB for PostgreSQL.
diff --git a/postgres/datadog_checks/postgres/config.py b/postgres/datadog_checks/postgres/config.py
@@ -17,6 +17,8 @@
     'rdsadmin',
     'azure_maintenance',
     'cloudsqladmin',
+    'alloydbadmin',
+    'alloydbmetadata',
     'postgres',
 ]
 

diff --git a/postgres/datadog_checks/postgres/config_models/defaults.py b/postgres/datadog_checks/postgres/config_models/defaults.py
@@ -89,7 +89,15 @@ def instance_idle_connection_timeout():
 
 
 def instance_ignore_databases():
-    return ['template0', 'template1', 'rdsadmin', 'azure_maintenance', 'cloudsqladmin']
+    return [
+        'template0',
+        'template1',
+        'rdsadmin',
+        'azure_maintenance',
+        'cloudsqladmin',
+        'alloydbadmin',
+        'alloydbmetadata',
+    ]
 
 
 def instance_log_unobfuscated_plans():

diff --git a/postgres/datadog_checks/postgres/data/conf.yaml.example b/postgres/datadog_checks/postgres/data/conf.yaml.example
@@ -83,6 +83,8 @@ instances:
     #   - rdsadmin
     #   - azure_maintenance
     #   - cloudsqladmin
+    #   - alloydbadmin
+    #   - alloydbmetadata
 
     ## @param ssl - string - optional - default: allow
     ## This option determines whether or not and with what priority a secure SSL TCP/IP connection

diff --git a/postgres/datadog_checks/postgres/discovery.py b/postgres/datadog_checks/postgres/discovery.py
@@ -10,7 +10,7 @@
 from datadog_checks.postgres.util import DatabaseConfigurationError, warning_with_tags
 
 AUTODISCOVERY_QUERY: str = """select datname from pg_catalog.pg_database where datistemplate = false;"""
-DEFAULT_EXCLUDES = ["cloudsqladmin", "rdsadmin"]
+DEFAULT_EXCLUDES = ["cloudsqladmin", "rdsadmin", "alloydbadmin", "alloydbmetadata"]
 DEFAULT_MAX_DATABASES = 100
 DEFAULT_REFRESH = 600
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Add alloydbadmin & alloydbmetadata to default list of databases to exclude from autodiscovery and databases to ignore to prevent failures on GCP AlloyDB for PostgreSQL.