Update config models

Author: rajkamalhm

postgres/datadog_checks/postgres/config_models/defaults.py

@@ -138,3 +138,7 @@ def instance_table_count_limit():
 
 def instance_tag_replication_role():
     return False
+
+
+def instance_use_global_custom_queries():
+    return 'extend'

postgres/datadog_checks/postgres/config_models/instance.py

@@ -25,7 +25,7 @@ class ManagedAuthentication(BaseModel):
         arbitrary_types_allowed=True,
         frozen=True,
     )
-    enabled: Optional[bool] = Field(None, examples=[False])
+    enabled: Optional[bool] = Field(None, example=False)
 
 
 class Aws(BaseModel):
@@ -44,8 +44,8 @@ class ManagedAuthentication1(BaseModel):
         frozen=True,
     )
     client_id: Optional[str] = None
-    enabled: Optional[bool] = Field(None, examples=[False])
-    identity_scope: Optional[str] = Field(None, examples=['https://ossrdbms-aad.database.windows.net/.default'])
+    enabled: Optional[bool] = Field(None, example=False)
+    identity_scope: Optional[str] = Field(None, example='https://ossrdbms-aad.database.windows.net/.default')
 
 
 class Azure(BaseModel):
@@ -176,7 +176,7 @@ class QuerySamples(BaseModel):
     seen_samples_cache_maxsize: Optional[int] = None
 
 
-class Relations(BaseModel):
+class Relation(BaseModel):
     model_config = ConfigDict(
         arbitrary_types_allowed=True,
         frozen=True,
@@ -238,7 +238,7 @@ class InstanceConfig(BaseModel):
     query_metrics: Optional[QueryMetrics] = None
     query_samples: Optional[QuerySamples] = None
     query_timeout: Optional[int] = None
-    relations: Optional[tuple[Union[str, Relations], ...]] = None
+    relations: Optional[tuple[Union[str, Relation], ...]] = None
     reported_hostname: Optional[str] = None
     service: Optional[str] = None
     ssl: Optional[str] = None
@@ -249,6 +249,7 @@ class InstanceConfig(BaseModel):
     table_count_limit: Optional[int] = None
     tag_replication_role: Optional[bool] = None
     tags: Optional[tuple[str, ...]] = None
+    use_global_custom_queries: Optional[str] = None
     username: str
 
     @model_validator(mode='before')

postgres/datadog_checks/postgres/config_models/shared.py

@@ -9,7 +9,8 @@
 
 from __future__ import annotations
 
-from typing import Optional
+from types import MappingProxyType
+from typing import Any, Optional
 
 from pydantic import BaseModel, ConfigDict, field_validator, model_validator
 
@@ -25,6 +26,7 @@ class SharedConfig(BaseModel):
         arbitrary_types_allowed=True,
         frozen=True,
     )
+    global_custom_queries: Optional[tuple[MappingProxyType[str, Any], ...]] = None
     propagate_agent_tags: Optional[bool] = None
     service: Optional[str] = None
 

postgres/tests/test_custom_metrics.py

@@ -119,7 +119,7 @@ def test_only_global_custom_queries(aggregator, pg_instance):
                     'tags': ['query:custom'],
                 },
             ],
-            'use_global_custom_queries': 'true'
+            'use_global_custom_queries': 'true',
         }
     )
     pg_init_config = {
@@ -158,7 +158,7 @@ def test_only_instance_custom_queries(aggregator, pg_instance):
                     'tags': ['query:custom'],
                 },
             ],
-            'use_global_custom_queries': 'false'
+            'use_global_custom_queries': 'false',
         }
     )
     pg_init_config = {
@@ -181,4 +181,4 @@ def test_only_instance_custom_queries(aggregator, pg_instance):
         custom_tags.extend(tags)
 
         aggregator.assert_metric('custom.num', value=value, tags=custom_tags + ['query:custom'])
-        aggregator.assert_metric('global_custom.num', value=value, tags=custom_tags + ['query:global_custom'], count=0)
+        aggregator.assert_metric('global_custom.num', value=value, tags=custom_tags + ['query:global_custom'], count=0)