diff --git a/config/install/monitoring.sensor_config.core_cron_last_run_age.yml b/config/install/monitoring.sensor_config.core_cron_last_run_age.yml
index c449948..947a473 100644
--- a/config/install/monitoring.sensor_config.core_cron_last_run_age.yml
+++ b/config/install/monitoring.sensor_config.core_cron_last_run_age.yml
@@ -1,7 +1,7 @@
 id: core_cron_last_run_age
 label: 'Last cron run age'
 description: 'Time since last cron run'
-sensor_id: cron_last_run_time
+plugin_id: cron_last_run_time
 value_type: time_interval
 category: 'Cron'
 status: TRUE
diff --git a/config/install/monitoring.sensor_config.core_cron_safe_threshold.yml b/config/install/monitoring.sensor_config.core_cron_safe_threshold.yml
index af630c6..2456d9d 100644
--- a/config/install/monitoring.sensor_config.core_cron_safe_threshold.yml
+++ b/config/install/monitoring.sensor_config.core_cron_safe_threshold.yml
@@ -1,7 +1,7 @@
 id: core_cron_safe_threshold
 label: 'Cron safe threshold enabled'
 description: 'Cron safe threshold (Poormanscron) is enabled'
-sensor_id: config_value
+plugin_id: config_value
 value_type: 'bool'
 category: 'Cron'
 status: TRUE
diff --git a/config/install/monitoring.sensor_config.core_maintenance_mode.yml b/config/install/monitoring.sensor_config.core_maintenance_mode.yml
index d9c1899..2f30aba 100644
--- a/config/install/monitoring.sensor_config.core_maintenance_mode.yml
+++ b/config/install/monitoring.sensor_config.core_maintenance_mode.yml
@@ -1,7 +1,7 @@
 id: core_maintenance_mode
 label: 'Maintenance mode'
 description: 'Site maintenance mode'
-sensor_id: state_value
+plugin_id: state_value
 value_type: 'bool'
 category: 'Other'
 status: TRUE
diff --git a/config/install/monitoring.sensor_config.core_theme_default.yml b/config/install/monitoring.sensor_config.core_theme_default.yml
index 7b41e40..e5f946c 100644
--- a/config/install/monitoring.sensor_config.core_theme_default.yml
+++ b/config/install/monitoring.sensor_config.core_theme_default.yml
@@ -1,7 +1,7 @@
 id: core_theme_default
 label: 'Default theme'
 description: 'Site default theme'
-sensor_id: config_value
+plugin_id: config_value
 value_type: 'string'
 category: 'Other'
 status: FALSE
diff --git a/config/install/monitoring.sensor_config.monitoring_disappeared_sensors.yml b/config/install/monitoring.sensor_config.monitoring_disappeared_sensors.yml
index 59fb1e0..543209f 100644
--- a/config/install/monitoring.sensor_config.monitoring_disappeared_sensors.yml
+++ b/config/install/monitoring.sensor_config.monitoring_disappeared_sensors.yml
@@ -2,6 +2,6 @@ id: monitoring_disappeared_sensors
 label: 'Disappeared sensors'
 description: 'Keeps track of active sensors and reports if a sensor disappears'
 category: System
-sensor_id: monitoring_disappeared_sensors
+plugin_id: monitoring_disappeared_sensors
 value_type: 'number'
 status: TRUE
diff --git a/config/install/monitoring.sensor_config.monitoring_enabled_modules.yml b/config/install/monitoring.sensor_config.monitoring_enabled_modules.yml
index 26a336c..ca01112 100644
--- a/config/install/monitoring.sensor_config.monitoring_enabled_modules.yml
+++ b/config/install/monitoring.sensor_config.monitoring_enabled_modules.yml
@@ -2,7 +2,7 @@ id: monitoring_enabled_modules
 label: 'Enabled modules'
 description: 'Enabled only expected modules'
 category: 'System'
-sensor_id: monitoring_enabled_modules
+plugin_id: monitoring_enabled_modules
 value_type: 'number'
 value_label: 'Modules delta'
 status: FALSE
diff --git a/config/install/monitoring.sensor_config.monitoring_git_dirty_tree.yml b/config/install/monitoring.sensor_config.monitoring_git_dirty_tree.yml
index 63451b9..9d4d9b6 100644
--- a/config/install/monitoring.sensor_config.monitoring_git_dirty_tree.yml
+++ b/config/install/monitoring.sensor_config.monitoring_git_dirty_tree.yml
@@ -1,7 +1,7 @@
 id: monitoring_git_dirty_tree
 label: 'Git dirty working tree'
 description: 'Repository local file changes'
-sensor_id: monitoring_git_dirty_tree
+plugin_id: monitoring_git_dirty_tree
 category: 'System'
 value_type: 'string'
 status: FALSE
diff --git a/config/install/monitoring.sensor_config.user_active.yml b/config/install/monitoring.sensor_config.user_active.yml
index 04036d5..eae7f24 100644
--- a/config/install/monitoring.sensor_config.user_active.yml
+++ b/config/install/monitoring.sensor_config.user_active.yml
@@ -2,7 +2,7 @@ id: user_active
 label: 'Active users'
 description: ''
 category: 'User activity'
-sensor_id: entity_aggregator
+plugin_id: entity_aggregator
 value_label: 'Users'
 value_type: 'number'
 status: FALSE
diff --git a/config/install/monitoring.sensor_config.user_failed_logins.yml b/config/install/monitoring.sensor_config.user_failed_logins.yml
index c8f774d..b19c7ea 100644
--- a/config/install/monitoring.sensor_config.user_failed_logins.yml
+++ b/config/install/monitoring.sensor_config.user_failed_logins.yml
@@ -2,7 +2,7 @@ id: user_failed_logins
 label: 'Failed user logins'
 description: 'Failed user logins by Watchdog'
 category: 'User activity'
-sensor_id: user_failed_logins
+plugin_id: user_failed_logins
 value_type: 'number'
 value_label: 'Login attempts'
 status: TRUE
diff --git a/config/install/monitoring.sensor_config.user_new.yml b/config/install/monitoring.sensor_config.user_new.yml
index bfeb6ee..fa06d6a 100644
--- a/config/install/monitoring.sensor_config.user_new.yml
+++ b/config/install/monitoring.sensor_config.user_new.yml
@@ -2,7 +2,7 @@ id: user_new
 label: 'New users'
 description: ''
 category: 'User activity'
-sensor_id: entity_aggregator
+plugin_id: entity_aggregator
 value_label: 'Users'
 value_type: 'number'
 status: FALSE
diff --git a/config/install/monitoring.sensor_config.user_sessions_all.yml b/config/install/monitoring.sensor_config.user_sessions_all.yml
index bcab59d..6dbdff1 100644
--- a/config/install/monitoring.sensor_config.user_sessions_all.yml
+++ b/config/install/monitoring.sensor_config.user_sessions_all.yml
@@ -2,7 +2,7 @@ id: user_sessions_all
 label: 'All active sessions'
 description: 'All active sessions of logged in and anonymous users without logout'
 category: 'User activity'
-sensor_id: database_aggregator
+plugin_id: database_aggregator
 value_type: 'number'
 value_label: 'Active sessions'
 status: TRUE
diff --git a/config/install/monitoring.sensor_config.user_sessions_authenticated.yml b/config/install/monitoring.sensor_config.user_sessions_authenticated.yml
index a82fe40..0b19375 100644
--- a/config/install/monitoring.sensor_config.user_sessions_authenticated.yml
+++ b/config/install/monitoring.sensor_config.user_sessions_authenticated.yml
@@ -2,7 +2,7 @@ id: user_sessions_authenticated
 label: 'Authenticated user sessions'
 description: 'Authenticated user sessions without logout'
 category: 'User activity'
-sensor_id: database_aggregator
+plugin_id: database_aggregator
 value_type: 'number'
 value_label: 'Active sessions'
 status: TRUE
diff --git a/config/install/monitoring.sensor_config.user_sessions_logouts.yml b/config/install/monitoring.sensor_config.user_sessions_logouts.yml
index 7822f29..e2e125c 100644
--- a/config/install/monitoring.sensor_config.user_sessions_logouts.yml
+++ b/config/install/monitoring.sensor_config.user_sessions_logouts.yml
@@ -2,7 +2,7 @@ id: user_session_logouts
 label: 'User session logouts'
 description: 'User session logouts by Watchdog'
 category: 'User activity'
-sensor_id: database_aggregator
+plugin_id: database_aggregator
 value_type: 'number'
 value_label: 'Logouts'
 status: TRUE
diff --git a/config/install/monitoring.sensor_config.user_successful_logins.yml b/config/install/monitoring.sensor_config.user_successful_logins.yml
index 421706e..3e814eb 100644
--- a/config/install/monitoring.sensor_config.user_successful_logins.yml
+++ b/config/install/monitoring.sensor_config.user_successful_logins.yml
@@ -2,7 +2,7 @@ id: user_successful_logins
 label: 'Successful user logins'
 description: 'Successful user logins by Watchdog'
 category: 'User activity'
-sensor_id: database_aggregator
+plugin_id: database_aggregator
 value_type : 'number'
 value_label: 'Login attempts'
 status: TRUE
diff --git a/config/optional/comment/monitoring.sensor_config.comment_new.yml b/config/optional/comment/monitoring.sensor_config.comment_new.yml
index 877fafc..8647c9b 100644
--- a/config/optional/comment/monitoring.sensor_config.comment_new.yml
+++ b/config/optional/comment/monitoring.sensor_config.comment_new.yml
@@ -2,7 +2,7 @@ id: comment_new
 label: 'New Comments'
 description: ''
 category: Content
-sensor_id: entity_aggregator
+plugin_id: entity_aggregator
 value_label: Comments
 value_type: 'number'
 status: FALSE
diff --git a/config/optional/dblog/monitoring.sensor_config.dblog_404.yml b/config/optional/dblog/monitoring.sensor_config.dblog_404.yml
index 186253f..bc575ea 100644
--- a/config/optional/dblog/monitoring.sensor_config.dblog_404.yml
+++ b/config/optional/dblog/monitoring.sensor_config.dblog_404.yml
@@ -2,7 +2,7 @@ id: dblog_404
 label: 'Page not found errors'
 description: 'Page not found errors logged by watchdog'
 category: Watchdog
-sensor_id: dblog_404
+plugin_id: dblog_404
 result_class: null
 value_label: 'Watchdog events'
 value_type: 'number'
diff --git a/config/optional/maillog/monitoring.sensor_config.maillog_records_count.yml b/config/optional/maillog/monitoring.sensor_config.maillog_records_count.yml
index 7de1173..14930ef 100644
--- a/config/optional/maillog/monitoring.sensor_config.maillog_records_count.yml
+++ b/config/optional/maillog/monitoring.sensor_config.maillog_records_count.yml
@@ -1,6 +1,6 @@
 id: maillog_records_count
 label: 'Maillog records count'
-sensor_id: database_aggregator
+plugin_id: database_aggregator
 value_label: 'Mail records'
 value_type: 'number'
 category: 'Other'
diff --git a/config/optional/node/monitoring.sensor_config.node_new_all.yml b/config/optional/node/monitoring.sensor_config.node_new_all.yml
index feae35f..e75e3f4 100644
--- a/config/optional/node/monitoring.sensor_config.node_new_all.yml
+++ b/config/optional/node/monitoring.sensor_config.node_new_all.yml
@@ -1,7 +1,7 @@
 id: node_new_all
 label: 'All new nodes'
 description: 'All new nodes'
-sensor_id: entity_aggregator
+plugin_id: entity_aggregator
 value_type : 'number'
 value_label: 'Nodes'
 category: 'Content'
diff --git a/config/optional/past/monitoring.sensor_config.past_form.yml b/config/optional/past/monitoring.sensor_config.past_form.yml
index e797991..5e35f0d 100644
--- a/config/optional/past/monitoring.sensor_config.past_form.yml
+++ b/config/optional/past/monitoring.sensor_config.past_form.yml
@@ -2,7 +2,7 @@ id: past_form
 label: 'Logged form submissions'
 description: 'Past event logging form submissions'
 category: Past
-sensor_id: database_aggregator
+plugin_id: database_aggregator
 value_label: 'Past events'
 value_type: 'number'
 status: TRUE
diff --git a/config/optional/update/monitoring.sensor_config.update_contrib.yml b/config/optional/update/monitoring.sensor_config.update_contrib.yml
index e59f290..ccb66b8 100644
--- a/config/optional/update/monitoring.sensor_config.update_contrib.yml
+++ b/config/optional/update/monitoring.sensor_config.update_contrib.yml
@@ -2,7 +2,7 @@ id: update_contrib
 label: 'Modules and themes'
 description: 'Available updates for contrib modules and themes'
 category: 'Update'
-sensor_id: update_status
+plugin_id: update_status
 value_type : 'number'
 value_label: 'Outdated modules'
 status: true
diff --git a/config/optional/update/monitoring.sensor_config.update_core.yml b/config/optional/update/monitoring.sensor_config.update_core.yml
index e7311ae..1455376 100644
--- a/config/optional/update/monitoring.sensor_config.update_core.yml
+++ b/config/optional/update/monitoring.sensor_config.update_core.yml
@@ -3,7 +3,7 @@ status: true
 label: 'Core'
 description: 'Available updates for Drupal core'
 category: 'Update'
-sensor_id: update_status
+plugin_id: update_status
 value_type : 'number'
 value_label: 'Outdated modules'
 caching_time: '86400'
diff --git a/config/schema/monitoring.schema.yml b/config/schema/monitoring.schema.yml
index 615b460..08064f1 100644
--- a/config/schema/monitoring.schema.yml
+++ b/config/schema/monitoring.schema.yml
@@ -16,7 +16,7 @@ monitoring.sensor_config.*:
     category:
       type: string
       label: 'Category'
-    sensor_id:
+    plugin_id:
       type: string
       label: 'Sensor plugin ID'
     result_class:
@@ -35,7 +35,7 @@ monitoring.sensor_config.*:
       type: integer
       label: 'Sensor Caching Time'
     settings:
-      type: monitoring.settings.[sensor_id]
+      type: monitoring.settings.[plugin_id]
       label: 'Settings'
 
 monitoring.settings.monitoring_git_dirty_tree:
diff --git a/modules/test/config/install/monitoring.sensor_config.test_sensor.yml b/modules/test/config/install/monitoring.sensor_config.test_sensor.yml
index 6f5683c..c354988 100644
--- a/modules/test/config/install/monitoring.sensor_config.test_sensor.yml
+++ b/modules/test/config/install/monitoring.sensor_config.test_sensor.yml
@@ -3,7 +3,7 @@ label: 'Test sensor'
 description: 'Test sensor status.'
 category: 'Test'
 value_type : 'number'
-sensor_id: test_sensor
+plugin_id: test_sensor
 caching_time: 3600
 settings:
   result_logging: TRUE
diff --git a/modules/test/config/install/monitoring.sensor_config.test_sensor_cat_watchdog.yml b/modules/test/config/install/monitoring.sensor_config.test_sensor_cat_watchdog.yml
index f3405fe..8a796de 100644
--- a/modules/test/config/install/monitoring.sensor_config.test_sensor_cat_watchdog.yml
+++ b/modules/test/config/install/monitoring.sensor_config.test_sensor_cat_watchdog.yml
@@ -1,7 +1,7 @@
 id: test_sensor_cat_watchdog
 label: 'Test sensor category Watchdog'
 description: 'Test sensor with Watchdog category to test the watchdog logging'
-sensor_id: test_sensor
+plugin_id: test_sensor
 value_type : 'number'
 category: 'Watchdog'
 settings:
diff --git a/modules/test/config/install/monitoring.sensor_config.test_sensor_exceeds.yml b/modules/test/config/install/monitoring.sensor_config.test_sensor_exceeds.yml
index 5266bde..25abc5b 100644
--- a/modules/test/config/install/monitoring.sensor_config.test_sensor_exceeds.yml
+++ b/modules/test/config/install/monitoring.sensor_config.test_sensor_exceeds.yml
@@ -2,7 +2,7 @@ id: test_sensor_exceeds
 label: 'Test sensor exceeds'
 description: 'Test sensor that sets error interval above give value.'
 category: 'Test'
-sensor_id: test_sensor
+plugin_id: test_sensor
 value_type : 'number'
 settings:
   result_logging: TRUE
diff --git a/modules/test/config/install/monitoring.sensor_config.test_sensor_falls.yml b/modules/test/config/install/monitoring.sensor_config.test_sensor_falls.yml
index b6c9a92..619ca47 100644
--- a/modules/test/config/install/monitoring.sensor_config.test_sensor_falls.yml
+++ b/modules/test/config/install/monitoring.sensor_config.test_sensor_falls.yml
@@ -2,7 +2,7 @@ id: test_sensor_falls
 label: 'Test sensor falls'
 description: 'Test sensor that sets error interval below give value.'
 category: 'Test'
-sensor_id: test_sensor
+plugin_id: test_sensor
 value_type : 'number'
 settings:
   result_logging: TRUE
diff --git a/modules/test/config/install/monitoring.sensor_config.test_sensor_info.yml b/modules/test/config/install/monitoring.sensor_config.test_sensor_info.yml
index c85868d..d13bd4e 100644
--- a/modules/test/config/install/monitoring.sensor_config.test_sensor_info.yml
+++ b/modules/test/config/install/monitoring.sensor_config.test_sensor_info.yml
@@ -1,7 +1,7 @@
 id: test_sensor_info
 label: 'Test sensor config'
 description: 'To test correct sensor config hook implementation precedence.'
-sensor_id: test_sensor
+plugin_id: test_sensor
 value_type: 'number'
 value_label: 'Test label'
 settings:
diff --git a/modules/test/config/install/monitoring.sensor_config.test_sensor_inner.yml b/modules/test/config/install/monitoring.sensor_config.test_sensor_inner.yml
index 3b48fe5..c8217a7 100644
--- a/modules/test/config/install/monitoring.sensor_config.test_sensor_inner.yml
+++ b/modules/test/config/install/monitoring.sensor_config.test_sensor_inner.yml
@@ -2,7 +2,7 @@ id: test_sensor_inner
 label: 'Test sensor inner'
 description: 'Test sensor that sets inner error intervals.'
 category: 'Test'
-sensor_id: test_sensor
+plugin_id: test_sensor
 value_type : 'number'
 settings:
   result_logging: TRUE
diff --git a/modules/test/config/install/monitoring.sensor_config.test_sensor_integration.yml b/modules/test/config/install/monitoring.sensor_config.test_sensor_integration.yml
index 4ce55e4..e3c8b4c 100644
--- a/modules/test/config/install/monitoring.sensor_config.test_sensor_integration.yml
+++ b/modules/test/config/install/monitoring.sensor_config.test_sensor_integration.yml
@@ -2,7 +2,7 @@ id: test_sensor_integration
 label: 'Test from integration hook'
 description: 'To test correct sensor config hook implementation precedence.'
 category: 'Test'
-sensor_id: test_sensor
+plugin_id: test_sensor
 value_type : 'number'
 settings:
   result_logging: FALSE
diff --git a/modules/test/config/install/monitoring.sensor_config.test_sensor_outer.yml b/modules/test/config/install/monitoring.sensor_config.test_sensor_outer.yml
index 19609d6..def7a88 100644
--- a/modules/test/config/install/monitoring.sensor_config.test_sensor_outer.yml
+++ b/modules/test/config/install/monitoring.sensor_config.test_sensor_outer.yml
@@ -2,7 +2,7 @@ id: test_sensor_outer
 label: 'Test sensor outer'
 description: 'Test sensor that sets outer error intervals.'
 category: 'Test'
-sensor_id: test_sensor
+plugin_id: test_sensor
 value_type : 'number'
 settings:
   result_logging: TRUE
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 8e0070e..1658c06 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
@@ -2,7 +2,7 @@ id: watchdog_aggregate_test
 label: 'Watchdog aggregate test'
 description: 'Test sensor for watchdog aggregate.'
 category: 'Test'
-sensor_id: database_aggregator
+plugin_id: database_aggregator
 value_type : 'number'
 settings:
   result_logging: FALSE
diff --git a/modules/test/config/optional/node/monitoring.sensor_config.db_aggregate_test.yml b/modules/test/config/optional/node/monitoring.sensor_config.db_aggregate_test.yml
index b1c3ea9..59110d1 100644
--- a/modules/test/config/optional/node/monitoring.sensor_config.db_aggregate_test.yml
+++ b/modules/test/config/optional/node/monitoring.sensor_config.db_aggregate_test.yml
@@ -2,7 +2,7 @@ id: db_aggregate_test
 label: 'DB Aggregate test'
 description: 'Tests the generic DB aggregate sensor.'
 category: 'Test'
-sensor_id: entity_aggregator
+plugin_id: entity_aggregator
 value_type : 'number'
 value_label: 'Druplicons'
 result_logging: TRUE
diff --git a/monitoring.install b/monitoring.install
index 977436c..6f723f1 100644
--- a/monitoring.install
+++ b/monitoring.install
@@ -24,7 +24,7 @@ function monitoring_install() {
         'id' => 'node_new_' . $node_type->type,
         'label' => String::format('New @type nodes', array('@type' => $node_type->name)),
         'description' => String::format('New nodes of type @type', array('@type' => $node_type->name)),
-        'sensor_id' => 'entity_aggregator',
+        'plugin_id' => 'entity_aggregator',
         'value_label' => String::format('@type nodes', array('@type' => $node_type->name)),
         'value_type' => 'number',
         'category' => 'Content',
@@ -53,7 +53,7 @@ function monitoring_install() {
       $sensor = SensorConfig::create(array(
         'id' => 'search_api_' . $index->machine_name,
         'label' => String::format('Search index queue size of @index', array('@index' => $index->name)),
-        'sensor_id' => 'search_api_unindexed',
+        'plugin_id' => 'search_api_unindexed',
         'value_label' => 'Unindexed items',
         'category' => 'Search API',
         // Cache for 15 minutes.
@@ -91,7 +91,7 @@ function monitoring_install() {
       'id' => 'dblog_event_severity_' . $severities[$level],
       'label' => String::format('Severity @severity', array('@severity' => $name)),
       'description' => String::format('Watchdog entries of severity @severity',array('@severity' => $name)),
-      'sensor_id' => 'database_aggregator',
+      'plugin_id' => 'database_aggregator',
       'value_label' => 'Events',
       'value_type' => 'number',
       'category' => 'Watchdog',
@@ -120,7 +120,7 @@ function monitoring_install() {
       'id' => 'dblog_image_missing_style',
       'label' => 'Image derivative creation fail',
       'description' => 'Image derivative creation fails',
-      'sensor_id' => 'image_style_missing',
+      'plugin_id' => 'image_style_missing',
       'value_label' => 'Watchdog entries',
       'value_type' => 'number',
       'category' => 'Watchdog',
@@ -159,7 +159,7 @@ function monitoring_install() {
       'id' => 'core_requirements_' . $module,
       'label' => String::format('Module @module', array('@module' => $module)),
       'description' => String::format('Requirements of the @module module', array('@module' => $module)),
-      'sensor_id' => 'core_requirements',
+      'plugin_id' => 'core_requirements',
       'category' => 'Requirements',
       'caching_time' => 3600,
       'status' => TRUE,
diff --git a/monitoring.module b/monitoring.module
index fcdf498..dc17121 100644
--- a/monitoring.module
+++ b/monitoring.module
@@ -576,7 +576,7 @@ function monitoring_node_type_insert(NodeTypeInterface $type) {
     'id' => 'node_new_' . $type->id(),
     'label' => String::format('New @type nodes', array('@type' => $type->label())),
     'description' => String::format('New nodes of type @type', array('@type' => $type->label())),
-    'sensor_id' => 'entity_aggregator',
+    'plugin_id' => 'entity_aggregator',
     'value_label' => String::format('@type nodes', array('@type' => $type->label())),
     'category' => 'Content',
     'status' => FALSE,
@@ -643,7 +643,7 @@ function monitoring_search_api_index_insert(IndexInterface $index) {
   $sensor = SensorConfig::create(array(
     'id' => 'search_api_' . $index->id(),
     'label' => String::format('Search index queue size of @index', array('@index' => $index->label())),
-    'sensor_id' => 'search_api_unindexed',
+    'plugin_id' => 'search_api_unindexed',
     'value_label' => 'Unindexed items',
     'category' => 'Search API',
     'caching_time' => 900,
diff --git a/monitoring.monitoring_sensors.inc b/monitoring.monitoring_sensors.inc
index 59bd055..d4a7ad4 100644
--- a/monitoring.monitoring_sensors.inc
+++ b/monitoring.monitoring_sensors.inc
@@ -28,7 +28,7 @@ function monitoring_past_db_monitoring_sensor_info() {
     $info['past_db_event_severity_' . $severities[$severity]] = array(
       'label' => String::format('Severity @severity', array('@severity' => $name)),
       'description' => String::format('Past events with severity @severity', array('@severity' => $name)),
-      'sensor_id' => 'database_aggregator',
+      'plugin_id' => 'database_aggregator',
       'value_label' => 'Events',
       'services' => array('database'),
       'settings' => array(
@@ -70,7 +70,7 @@ function monitoring_elysia_cron_monitoring_sensor_info() {
     $info['elysia_cron_' . $name . '_last_execution'] = array(
       'label' => String::format('Elysia @name execution', array('@name' => $row->name)),
       'description' => String::format('Last execution duration for elysia @name cron', array('@name' => $row->name)),
-      'sensor_id' => 'elysia_cron',
+      'plugin_id' => 'elysia_cron',
       'value_type' => 'time_interval',
       'settings' => array(
         'category' => 'Elysia Cron',
@@ -82,7 +82,7 @@ function monitoring_elysia_cron_monitoring_sensor_info() {
     $info['elysia_cron_' . $name . '_last_run'] = array(
       'label' => String::format('Elysia @name run', array('@name' => $row->name)),
       'description' => String::format('Time since last elysia @name run', array('@name' => $row->name)),
-      'sensor_id' => 'elysia_cron',
+      'plugin_id' => 'elysia_cron',
       'value_type' => 'time_interval',
       'settings' => array(
         'category' => 'Elysia Cron',
@@ -108,7 +108,7 @@ function monitoring_commerce_order_monitoring_sensor_info() {
   foreach (commerce_order_statuses() as $status_name => $status_info) {
     $info['commerce_order_status_' . $status_name] = array(
       'label' => String::format('Orders in status @name', array('@name' => $status_info['title'])),
-      'sensor_id' => 'database_aggregator',
+      'plugin_id' => 'database_aggregator',
       'value_label' => 'Orders',
       'settings' => array(
         'enabled' => FALSE,
@@ -130,7 +130,7 @@ function monitoring_commerce_order_monitoring_sensor_info() {
     $info['commerce_order_turnover_' . strtolower($currency['code'])] = array(
       'label' => String::format('Turnover in @currency', array('@currency' => $currency['code'])),
       'description' => String::format('Turnover from completed orders in @currency', array('@currency' => $currency['code'])),
-      'sensor_id' => 'commerce_turnover',
+      'plugin_id' => 'commerce_turnover',
       'value_label' => $currency['code'],
       'value_type' => 'commerce_currency',
       'settings' => array(
@@ -156,7 +156,7 @@ function monitoring_commerce_order_monitoring_sensor_info() {
     $info['commerce_order_turnover_total'] = array(
       'label' => 'Total turnover',
       'description' => 'Total turnover from completed orders in all currencies',
-      'sensor_id' => 'commerce_turnover',
+      'plugin_id' => 'commerce_turnover',
       'value_label' => $currencies[commerce_default_currency()]['code'],
       'value_type' => 'commerce_currency',
       'settings' => array(
diff --git a/src/Entity/SensorConfig.php b/src/Entity/SensorConfig.php
index 3f175b6..85591f7 100644
--- a/src/Entity/SensorConfig.php
+++ b/src/Entity/SensorConfig.php
@@ -77,7 +77,7 @@ class SensorConfig extends ConfigEntityBase {
    *
    * @var string
    */
-  public $sensor_id;
+  public $plugin_id;
 
   /**
    * The sensor result class.
@@ -162,7 +162,7 @@ class SensorConfig extends ConfigEntityBase {
    *   SensorPlugin class
    */
   public function getSensorClass() {
-    $definition = monitoring_sensor_manager()->getDefinition($this->sensor_id);
+    $definition = monitoring_sensor_manager()->getDefinition($this->plugin_id);
     return $definition['class'];
   }
 
@@ -174,7 +174,7 @@ class SensorConfig extends ConfigEntityBase {
    */
   public function getPlugin() {
     $configuration = array('sensor_info' => $this);
-    $plugin = monitoring_sensor_manager()->createInstance($this->sensor_id, $configuration);
+    $plugin = monitoring_sensor_manager()->createInstance($this->plugin_id, $configuration);
     return $plugin;
   }
 
diff --git a/src/Form/SensorForm.php b/src/Form/SensorForm.php
index f0dd44f..b04d649 100644
--- a/src/Form/SensorForm.php
+++ b/src/Form/SensorForm.php
@@ -87,11 +87,11 @@ class SensorForm extends EntityForm {
         }
       }
       uasort($plugin_types, 'strnatcasecmp');
-      $form['sensor_id'] = array(
+      $form['plugin_id'] = array(
         '#type' => 'select',
         '#options' => $plugin_types,
         '#title' => $this->t('Sensor Plugin'),
-        '#limit_validation_errors' => array(array('sensor_id')),
+        '#limit_validation_errors' => array(array('plugin_id')),
         '#submit' => array('::submitSelectPlugin'),
         '#required' => TRUE,
         '#executes_submit_callback' => TRUE,
@@ -105,19 +105,19 @@ class SensorForm extends EntityForm {
       $form['update'] = array(
         '#type' => 'submit',
         '#value' => $this->t('Select sensor'),
-        '#limit_validation_errors' => array(array('sensor_id')),
+        '#limit_validation_errors' => array(array('plugin_id')),
         '#submit' => array('::submitSelectPlugin'),
         '#attributes' => array('class' => array('js-hide')),
       );
 
     }
     else {
-      // @todo odd name but this can not be set to sensor_id.
-      $form['old_sensor_id'] = array(
+      // @todo odd name but this can not be set to plugin_id.
+      $form['old_plugin_id'] = array(
         '#type' => 'item',
         '#title' => t('Sensor Plugin'),
         '#maxlength' => 255,
-        '#markup' => monitoring_sensor_manager()->getDefinition($sensor_config->sensor_id)['label']->render(),
+        '#markup' => monitoring_sensor_manager()->getDefinition($sensor_config->plugin_id)['label']->render(),
       );
     }
 
@@ -142,7 +142,7 @@ class SensorForm extends EntityForm {
       '#default_value' => $sensor_config->status(),
     );
 
-    if (isset($sensor_config->sensor_id) && $plugin = $sensor_config->getPlugin()) {
+    if (isset($sensor_config->plugin_id) && $plugin = $sensor_config->getPlugin()) {
       $form['settings'] = array(
         '#type' => 'details',
         '#open' => TRUE,
@@ -202,7 +202,7 @@ class SensorForm extends EntityForm {
     $sensor_config = $this->entity;
     /** @var SensorPluginInterface $plugin */
     if ($sensor_config->isNew()) {
-      $plugin = $form_state->getValue('sensor_id');
+      $plugin = $form_state->getValue('plugin_id');
       $plugin = monitoring_sensor_manager()->createInstance($plugin, array('sensor_info' => $this->entity));
     }
     else {
diff --git a/src/Tests/MonitoringCoreTest.php b/src/Tests/MonitoringCoreTest.php
index 6232b5f..ec728e5 100644
--- a/src/Tests/MonitoringCoreTest.php
+++ b/src/Tests/MonitoringCoreTest.php
@@ -83,7 +83,7 @@ class MonitoringCoreTest extends MonitoringTestBase {
 
     $sensor_config = SensorConfig::create(array(
       'id' => 'core_queue_monitoring_test',
-      'sensor_id' => 'queue_size',
+      'plugin_id' => 'queue_size',
       'settings' => array(
         'queue' => 'monitoring_test'
       )
@@ -100,7 +100,7 @@ class MonitoringCoreTest extends MonitoringTestBase {
     // @todo - This should not be necessary after sensor requirements are updated.
     $sensor_config = SensorConfig::create(array(
       'id' => 'core_requirements_monitoring_test',
-      'sensor_id' => 'core_requirements',
+      'plugin_id' => 'core_requirements',
       'settings' => array(
         'module' => 'monitoring_test'
       )
diff --git a/src/Tests/MonitoringPaymentTest.php b/src/Tests/MonitoringPaymentTest.php
index 5f65cd2..e283bbf 100644
--- a/src/Tests/MonitoringPaymentTest.php
+++ b/src/Tests/MonitoringPaymentTest.php
@@ -45,7 +45,7 @@ class MonitoringPaymentTest extends MonitoringUnitTestBase {
 
     $sensor_config = SensorConfig::create(array(
       'id' => 'payment_count',
-      'sensor_id' => 'payment_count',
+      'plugin_id' => 'payment_count',
       'value_label' => 'transactions',
       'caching_time' => 3600,
       'settings' => array(
@@ -59,7 +59,7 @@ class MonitoringPaymentTest extends MonitoringUnitTestBase {
 
     $sensor_config = SensorConfig::create(array(
       'id' => 'payment_turnover',
-      'sensor_id' => 'payment_turnover',
+      'plugin_id' => 'payment_turnover',
       'caching_time' => 3600,
       'value_label' => 'JPY',
       'settings' => array(
diff --git a/src/Tests/MonitoringUITest.php b/src/Tests/MonitoringUITest.php
index 5bfecbe..49c8606 100644
--- a/src/Tests/MonitoringUITest.php
+++ b/src/Tests/MonitoringUITest.php
@@ -84,7 +84,7 @@ class MonitoringUITest extends MonitoringTestBase {
       'id' => 'ui_test_sensor',
       'value_label' => 'Test Value',
       'caching_time' => 100,
-      'sensor_id' => 'entity_aggregator',
+      'plugin_id' => 'entity_aggregator',
     ), t('Select sensor'));
 
     $this->assertText('Sensor plugin settings');
@@ -113,7 +113,7 @@ class MonitoringUITest extends MonitoringTestBase {
       'id' => 'ui_test_sensor_config',
       'value_label' => 'Test Value',
       'caching_time' => 100,
-      'sensor_id' => 'config_value',
+      'plugin_id' => 'config_value',
       'value_type' => 'bool',
     ), t('Select sensor'));