fixing unit test hopefully, maybe even fixing validator

Author: slorello89

redis_enterprise_prometheus/datadog_checks/redis_enterprise_prometheus/config_models/instance.py

@@ -37,21 +37,21 @@ class InstanceConfig(BaseModel):
     service: Optional[str] = None
     tags: Optional[tuple[str, ...]] = None
 
-    @model_validator(mode="before")
+    @model_validator(mode='before')
     def _initial_validation(cls, values):
-        return validation.core.initialize_config(getattr(validators, "initialize_instance", identity)(values))
+        return validation.core.initialize_config(getattr(validators, 'initialize_instance', identity)(values))
 
-    @field_validator("*", mode="before")
+    @field_validator('*', mode='before')
     def _validate(cls, value, info):
         field = cls.model_fields[info.field_name]
         field_name = field.alias or info.field_name
-        if field_name in info.context["configured_fields"]:
-            value = getattr(validators, f"instance_{info.field_name}", identity)(value, field=field)
+        if field_name in info.context['configured_fields']:
+            value = getattr(validators, f'instance_{info.field_name}', identity)(value, field=field)
         else:
-            value = getattr(defaults, f"instance_{info.field_name}", lambda: value)()
+            value = getattr(defaults, f'instance_{info.field_name}', lambda: value)()
 
         return validation.utils.make_immutable(value)
 
-    @model_validator(mode="after")
+    @model_validator(mode='after')
     def _final_validation(cls, model):
-        return validation.core.check_model(getattr(validators, "check_instance", identity)(model))
+        return validation.core.check_model(getattr(validators, 'check_instance', identity)(model))

redis_enterprise_prometheus/datadog_checks/redis_enterprise_prometheus/config_models/shared.py

@@ -23,19 +23,19 @@ class SharedConfig(BaseModel):
     )
     service: Optional[str] = None
 
-    @model_validator(mode="before")
+    @model_validator(mode='before')
     def _initial_validation(cls, values):
-        return validation.core.initialize_config(getattr(validators, "initialize_shared", identity)(values))
+        return validation.core.initialize_config(getattr(validators, 'initialize_shared', identity)(values))
 
-    @field_validator("*", mode="before")
+    @field_validator('*', mode='before')
     def _validate(cls, value, info):
         field = cls.model_fields[info.field_name]
         field_name = field.alias or info.field_name
-        if field_name in info.context["configured_fields"]:
-            value = getattr(validators, f"shared_{info.field_name}", identity)(value, field=field)
+        if field_name in info.context['configured_fields']:
+            value = getattr(validators, f'shared_{info.field_name}', identity)(value, field=field)
 
         return validation.utils.make_immutable(value)
 
-    @model_validator(mode="after")
+    @model_validator(mode='after')
     def _final_validation(cls, model):
-        return validation.core.check_model(getattr(validators, "check_shared", identity)(model))
+        return validation.core.check_model(getattr(validators, 'check_shared', identity)(model))

redis_enterprise_prometheus/tests/support.py

@@ -120,7 +120,7 @@
         # "rdse2.node_available_flash_no_overbooking_bytes", # MOVED TO FLASH
         "rdse2.node_available_memory_bytes",
         "rdse2.node_available_memory_no_overbooking_bytes",
-        "rdse2.node_cpu_seconds_total",
+        "rdse2.node_cpu_seconds_total.count",
         # "rdse2.node_bigstore_free_bytes", # MOVED TO FLASH
         "rdse2.x509_cert_expires_in_seconds",
         "rdse2.x509_exporter_build_info",