diff --git a/config/schema/monitoring.schema.yml b/config/schema/monitoring.schema.yml
index a5153de..58a2fbb 100644
--- a/config/schema/monitoring.schema.yml
+++ b/config/schema/monitoring.schema.yml
@@ -122,6 +122,24 @@ monitoring.settings.entity_aggregator:
     entity_type:
       type: string
       label: 'Table'
+    conditions:
+      type: sequence
+      label: Conditions
+      sequence:
+        type: mapping
+        mapping:
+          field:
+            type: string
+          value:
+            type: string
+          operator:
+            type: string
+    fields:
+      type: sequence
+      label: Fields
+      sequence:
+        type: string
+        label: 'Field'
 
 monitoring.settings.monitoring_git_dirty_tree:
   type: mapping
diff --git a/modules/test/config/install/monitoring.sensor_config.watchdog_aggregate_test.yml b/modules/test/config/install/monitoring.sensor_config.watchdog_aggregate_test.yml
index f98d471..ac7c529 100644
--- a/modules/test/config/install/monitoring.sensor_config.watchdog_aggregate_test.yml
+++ b/modules/test/config/install/monitoring.sensor_config.watchdog_aggregate_test.yml
@@ -9,7 +9,7 @@ settings:
   table: watchdog
   time_interval_field: 'timestamp'
   time_interval_value: 86400
-  keys:
+  verbose_fields:
     - 'wid'
     - 'message'
     - 'variables'
diff --git a/modules/test/config/optional/monitoring.sensor_config.entity_aggregate_test.yml b/modules/test/config/optional/monitoring.sensor_config.entity_aggregate_test.yml
index c5ea837..3c9019f 100644
--- a/modules/test/config/optional/monitoring.sensor_config.entity_aggregate_test.yml
+++ b/modules/test/config/optional/monitoring.sensor_config.entity_aggregate_test.yml
@@ -15,6 +15,9 @@ settings:
     -
       field: 'type'
       value: 'page'
+  fields:
+    - id
+    - label
 thresholds:
   type: 'falls'
   warning: 2