diff --git a/README.txt b/README.txt
index 34224b7..ccd0d37 100644
--- a/README.txt
+++ b/README.txt
@@ -20,7 +20,7 @@
* * Watchdog
* * Cron execution
* * Content and User activity
- * Sensor interface that can be easily implemented to provide custom sensors.
+ * SensorPlugin interface that can be easily implemented to provide custom sensors.
* Integration with Munin.
* Integration with Icinga/Nagios
@@ -50,6 +50,6 @@
variable, for example in settings.php. This allows to enforce environment
specific settings, like disabling a certain sensor.
- $conf['monitoring_sensor_info']['name_of_the_sensor']['settings']['enabled'] = FALSE;
+ $conf['monitoring_sensor']['name_of_the_sensor']['settings']['enabled'] = FALSE;
Anything defined through the hook can be overridden.
diff --git a/config/install/views.view.monitoring_sensor_results.yml b/config/install/views.view.monitoring_sensor_results.yml
index 77c8253..55f0c6e 100644
--- a/config/install/views.view.monitoring_sensor_results.yml
+++ b/config/install/views.view.monitoring_sensor_results.yml
@@ -87,7 +87,7 @@ display:
relationship: none
group_type: group
admin_label: ''
- label: 'Sensor name'
+ label: 'SensorPlugin name'
exclude: false
alter:
alter_text: false
diff --git a/config/schema/monitoring.schema.yml b/config/schema/monitoring.schema.yml
index f6910fa..6196097 100644
--- a/config/schema/monitoring.schema.yml
+++ b/config/schema/monitoring.schema.yml
@@ -2,14 +2,14 @@
monitoring.sensor_config.*:
type: config_entity
- label: 'Monitoring Sensor'
+ label: 'Monitoring SensorPlugin'
mapping:
id:
type: string
label: 'Machine-readable name'
label:
type: label
- label: 'Sensor Label'
+ label: 'SensorPlugin Label'
description:
type: text
label: 'Description'
@@ -18,7 +18,7 @@ monitoring.sensor_config.*:
label: 'Category'
sensor_id:
type: string
- label: 'Sensor ID'
+ label: 'SensorPlugin ID'
result_class:
type: string
label: 'Result Class'
@@ -33,14 +33,14 @@ monitoring.sensor_config.*:
label: 'Enabled'
caching_time:
type: integer
- label: 'Sensor Caching Time'
+ label: 'SensorPlugin Caching Time'
settings:
type: monitoring.settings.[sensor_id]
label: 'Settings'
monitoring.settings.monitoring_git_dirty_tree:
type: mapping
- label: 'Sensor settings'
+ label: 'SensorPlugin settings'
mapping:
repo_path:
type: string
@@ -51,7 +51,7 @@ monitoring.settings.monitoring_git_dirty_tree:
monitoring.settings.config_value:
type: mapping
- label: 'Sensor settings'
+ label: 'SensorPlugin settings'
mapping:
config:
type: string
@@ -65,7 +65,7 @@ monitoring.settings.config_value:
monitoring.settings.cron_last_run_time:
type: mapping
- label: 'Sensor settings'
+ label: 'SensorPlugin settings'
mapping:
thresholds:
type: mapping
@@ -83,7 +83,7 @@ monitoring.settings.cron_last_run_time:
monitoring.settings.database_aggregator:
type: mapping
- label: 'Sensor settings'
+ label: 'SensorPlugin settings'
mapping:
table:
type: string
diff --git a/config/schema/monitoring.views.schema.yml b/config/schema/monitoring.views.schema.yml
index fdd708a..77869af 100644
--- a/config/schema/monitoring.views.schema.yml
+++ b/config/schema/monitoring.views.schema.yml
@@ -2,4 +2,4 @@
views.field.monitoring_sensor_name:
type: views_field
- label: 'Sensor name'
+ label: 'SensorPlugin name'
diff --git a/modules/demo/monitoring_demo.install b/modules/demo/monitoring_demo.install
index 5b088a1..a0ee536 100644
--- a/modules/demo/monitoring_demo.install
+++ b/modules/demo/monitoring_demo.install
@@ -19,7 +19,7 @@ function monitoring_demo_install() {
// Enable REST API for monitoring resources.
$settings = array(
- 'monitoring-sensor-info' => array(
+ 'monitoring-sensor' => array(
'GET' => array(
'supported_formats' => array('hal_json'),
'supported_auth' => array('cookie'),
diff --git a/modules/demo/src/Controller/FrontPage.php b/modules/demo/src/Controller/FrontPage.php
index 430e341..d32a5c0 100644
--- a/modules/demo/src/Controller/FrontPage.php
+++ b/modules/demo/src/Controller/FrontPage.php
@@ -31,7 +31,7 @@ class FrontPage extends ControllerBase {
),
'sensor_enabled_modules' => array(
'#type' => 'item',
- '#title' => t('Sensor example: "Enabled modules"'),
+ '#title' => t('SensorPlugin example: "Enabled modules"'),
'#description' => t('Monitors which modules are supposed to be enabled. In case there is a needed module disabled or excess module enabled you will be noticed.'),
'list' => array(
'#theme' => 'item_list',
@@ -44,7 +44,7 @@ class FrontPage extends ControllerBase {
),
'sensor_disappeared_sensors' => array(
'#type' => 'item',
- '#title' => t('Sensor example: "Disappeared sensors"'),
+ '#title' => t('SensorPlugin example: "Disappeared sensors"'),
'#description' => t('Additionally to disabling modules, configuration changes like removing content types or search API indexes could lead to sensors that silently disappear.'),
'list' => array(
'#theme' => 'item_list',
@@ -61,8 +61,8 @@ class FrontPage extends ControllerBase {
'list' => array(
'#theme' => 'item_list',
'#items' => array(
- t('Drush integration - open up your console and type in # drush monitoring-info or # drush monitoring-run. See the drush help for more info and commands.'),
- t('REST resource for both the info about sensors and running the sensors via the service. Open up your REST client and visit /monitoring-sensor-info/{sensor_name} and /monitoring-sensor-result/{sensor_name}'),
+ t('Drush integration - open up your console and type in # drush monitoring-sensor or # drush monitoring-run. See the drush help for more info and commands.'),
+ t('REST resource for both the info about sensors and running the sensors via the service. Open up your REST client and visit /monitoring-sensor/{sensor_name} and /monitoring-sensor-result/{sensor_name}'),
)
),
),
diff --git a/modules/monitoring_icinga/monitoring_icinga.drush.inc b/modules/monitoring_icinga/monitoring_icinga.drush.inc
index b72b1d5..cdb884e 100644
--- a/modules/monitoring_icinga/monitoring_icinga.drush.inc
+++ b/modules/monitoring_icinga/monitoring_icinga.drush.inc
@@ -18,7 +18,7 @@ function monitoring_icinga_drush_command() {
$items['monitoring-icinga'] = array(
'callback' => 'monitoring_icinga_drush_callback',
'options' => array(
- 'sensor_name' => 'Sensor name to invoke.',
+ 'sensor_name' => 'SensorPlugin name to invoke.',
),
'description' => 'Run munin plugins.',
'examples' => array(
@@ -34,7 +34,7 @@ function monitoring_icinga_drush_command() {
* Drush callback to get the sensor config.
*
* @param string $sensor_name
- * Sensor name.
+ * SensorPlugin name.
*/
function monitoring_icinga_drush_callback($sensor_name = NULL) {
@@ -70,7 +70,7 @@ function monitoring_icinga_drush_callback($sensor_name = NULL) {
* invokes the sensor and expects printed output and exit code.
*
* @param string $sensor_name
- * Sensor name to run.
+ * SensorPlugin name to run.
*/
function monitoring_icinga_active_check($sensor_name) {
$statuses = monitoring_icinga_status_codes();
@@ -79,11 +79,11 @@ function monitoring_icinga_active_check($sensor_name) {
$result = monitoring_sensor_run($sensor_name);
}
catch (NonExistingSensorException $e) {
- drush_set_error('MONITORING_SENSOR_INVALID_NAME', dt('Sensor "@name" does not exist.', array('@name' => $sensor_name)));
+ drush_set_error('MONITORING_SENSOR_INVALID_NAME', dt('SensorPlugin "@name" does not exist.', array('@name' => $sensor_name)));
return $statuses[SensorResultInterface::STATUS_CRITICAL];
}
catch (DisabledSensorException $e) {
- drush_set_error('MONITORING_SENSOR_DISABLED', dt('Sensor "@name" is not enabled.', array('@name' => $sensor_name)));
+ drush_set_error('MONITORING_SENSOR_DISABLED', dt('SensorPlugin "@name" is not enabled.', array('@name' => $sensor_name)));
return $statuses[SensorResultInterface::STATUS_CRITICAL];
}
diff --git a/modules/monitoring_icinga/monitoring_icinga.module b/modules/monitoring_icinga/monitoring_icinga.module
index 7b93da3..a1082e9 100644
--- a/modules/monitoring_icinga/monitoring_icinga.module
+++ b/modules/monitoring_icinga/monitoring_icinga.module
@@ -44,7 +44,7 @@ function monitoring_icinga_menu() {
* submitting passive check.
*
* @param SensorConfig $sensor_config
- * Sensor config object.
+ * SensorPlugin config object.
*
* @return string
* Icinga service description.
diff --git a/modules/monitoring_munin/monitoring_munin.api.php b/modules/monitoring_munin/monitoring_munin.api.php
index d96bbeb..01df155 100644
--- a/modules/monitoring_munin/monitoring_munin.api.php
+++ b/modules/monitoring_munin/monitoring_munin.api.php
@@ -11,7 +11,7 @@ function hook_munin_default_multigraphs() {
// Munin vertical label for units. This is required only if you want the
// multigraph get created.
'vlabel' => 'My units',
- // Sensor categories from which all sensors should belong to the defined
+ // SensorPlugin categories from which all sensors should belong to the defined
// multigraph.
'categories' => array(),
// Individual sensors that should belong to the multigraph.
diff --git a/modules/monitoring_munin/monitoring_munin.module b/modules/monitoring_munin/monitoring_munin.module
index d4c7821..e518173 100644
--- a/modules/monitoring_munin/monitoring_munin.module
+++ b/modules/monitoring_munin/monitoring_munin.module
@@ -256,10 +256,10 @@ function monitoring_munin_config() {
* @param string $host
* Current site host.
* @param string $sensor_name
- * Sensor name
+ * SensorPlugin name
*
* @return string
- * Sensor identifier.
+ * SensorPlugin identifier.
*/
function monitoring_munin_sensor_identifier($sensor_name) {
return str_replace('-', '_', monitoring_host_key() . '__' . $sensor_name);
diff --git a/modules/multigraph/src/Entity/Multigraph.php b/modules/multigraph/src/Entity/Multigraph.php
index 2818952..98c5f22 100644
--- a/modules/multigraph/src/Entity/Multigraph.php
+++ b/modules/multigraph/src/Entity/Multigraph.php
@@ -169,7 +169,7 @@ class Multigraph extends ConfigEntityBase implements MultigraphInterface {
* Loads the entity of a sensor and adds it to the end of the internal array.
*
* @param string $name
- * Sensor machine name.
+ * SensorPlugin machine name.
* @param string $label
* (optional) Custom sensor label for this Multigraph.
*/
diff --git a/modules/multigraph/src/Form/MultigraphForm.php b/modules/multigraph/src/Form/MultigraphForm.php
index 72f0301..87086bf 100644
--- a/modules/multigraph/src/Form/MultigraphForm.php
+++ b/modules/multigraph/src/Form/MultigraphForm.php
@@ -104,9 +104,9 @@ class MultigraphForm extends EntityForm {
'#type' => 'table',
'#header' => array(
'category' => $this->t('Category'),
- 'label' => $this->t('Sensor label'),
+ 'label' => $this->t('SensorPlugin label'),
'description' => $this->t('Description'),
- 'message' => $this->t('Sensor message'),
+ 'message' => $this->t('SensorPlugin message'),
'weight' => $this->t('Weight'),
'operations' => $this->t('Operations'),
),
@@ -220,7 +220,7 @@ class MultigraphForm extends EntityForm {
if ($sensor_name = $form_state->getValue(array('sensor_add', 'sensor_add_select'))) {
$sensor_label = \Drupal::entityManager()->getStorage('monitoring_sensor_config')->load($sensor_name)->getLabel();
$multigraph->addSensor($sensor_name);
- drupal_set_message($this->t('Sensor "@sensor_label" added. You have unsaved changes.', array('@sensor_label' => $sensor_label)), 'warning');
+ drupal_set_message($this->t('SensorPlugin "@sensor_label" added. You have unsaved changes.', array('@sensor_label' => $sensor_label)), 'warning');
}
}
@@ -243,7 +243,7 @@ class MultigraphForm extends EntityForm {
$sensor_name = substr($button_name, strlen('remove_'));
$sensor_label = \Drupal::entityManager()->getStorage('monitoring_sensor_config')->load($sensor_name)->getLabel();
$multigraph->removeSensor($sensor_name);
- drupal_set_message($this->t('Sensor "@sensor_label" removed. You have unsaved changes.', array('@sensor_label' => $sensor_label)), 'warning');
+ drupal_set_message($this->t('SensorPlugin "@sensor_label" removed. You have unsaved changes.', array('@sensor_label' => $sensor_label)), 'warning');
}
/**
diff --git a/modules/multigraph/src/MultigraphInterface.php b/modules/multigraph/src/MultigraphInterface.php
index ddf76b7..dc6bd4c 100644
--- a/modules/multigraph/src/MultigraphInterface.php
+++ b/modules/multigraph/src/MultigraphInterface.php
@@ -56,7 +56,7 @@ interface MultigraphInterface extends ConfigEntityInterface {
* Gets the multigraph description.
*
* @return string
- * Sensor description.
+ * SensorPlugin description.
*/
public function getDescription();
}
diff --git a/modules/multigraph/src/Tests/MultigraphServicesTest.php b/modules/multigraph/src/Tests/MultigraphServicesTest.php
index 7cc2ac8..9452124 100644
--- a/modules/multigraph/src/Tests/MultigraphServicesTest.php
+++ b/modules/multigraph/src/Tests/MultigraphServicesTest.php
@@ -87,7 +87,7 @@ class MultigraphServicesTest extends RESTTestBase {
// Test response for non-existing multigraph.
$name = 'multigraph_that_does_not_exist';
- $this->doRequest('monitoring-sensor-info/' . $name);
+ $this->doRequest('monitoring-sensor/' . $name);
$this->assertResponse(404);
// Test the predefined multigraph.
diff --git a/modules/multigraph/src/Tests/MultigraphWebTest.php b/modules/multigraph/src/Tests/MultigraphWebTest.php
index 03cba95..b605e1f 100644
--- a/modules/multigraph/src/Tests/MultigraphWebTest.php
+++ b/modules/multigraph/src/Tests/MultigraphWebTest.php
@@ -83,17 +83,17 @@ class MultigraphWebTest extends WebTestBase {
'sensor_add[sensor_add_select]' => 'dblog_404',
);
$this->drupalPostForm('admin/config/system/monitoring/multigraphs/add', $values, t('Add'));
- $this->assertText(t('Sensor "Page not found errors" added. You have unsaved changes.'));
+ $this->assertText(t('SensorPlugin "Page not found errors" added. You have unsaved changes.'));
$this->drupalPostForm(NULL, array(
'sensor_add[sensor_add_select]' => 'monitoring_disappeared_sensors',
), t('Add'));
- $this->assertText(t('Sensor "Disappeared sensors" added. You have unsaved changes.'));
+ $this->assertText(t('SensorPlugin "Disappeared sensors" added. You have unsaved changes.'));
$this->drupalPostForm(NULL, array(
'sensor_add[sensor_add_select]' => 'user_successful_logins',
), t('Add'));
- $this->assertText(t('Sensor "Successful user logins" added. You have unsaved changes.'));
+ $this->assertText(t('SensorPlugin "Successful user logins" added. You have unsaved changes.'));
// And last but not least, change all sensor label values and save form.
$this->drupalPostForm(NULL, array(
@@ -127,12 +127,12 @@ class MultigraphWebTest extends WebTestBase {
'sensor_add[sensor_add_select]' => 'user_successful_logins',
);
$this->drupalPostForm(NULL, $values, t('Add'));
- $this->assertText('Sensor "Successful user logins" added. You have unsaved changes.');
+ $this->assertText('SensorPlugin "Successful user logins" added. You have unsaved changes.');
// Remove a sensor.
// (drupalPostAjaxForm() lets us target the button precisely.)
$this->drupalPostAjaxForm(NULL, array(), array('remove_dblog_404' => t('Remove')));
- $this->assertText(t('Sensor "Page not found errors" removed. You have unsaved changes.'));
+ $this->assertText(t('SensorPlugin "Page not found errors" removed. You have unsaved changes.'));
$this->drupalPostForm(NULL, array(), t('Save'));
// Change weights and save form.
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 62c7f63..c85868d 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
@@ -5,4 +5,3 @@ sensor_id: test_sensor
value_type: 'number'
value_label: 'Test label'
settings:
-
diff --git a/modules/test/src/Plugin/monitoring/Sensor/TestSensor.php b/modules/test/src/Plugin/monitoring/Sensor/TestSensor.php
index 00b3a97..ef974dd 100644
--- a/modules/test/src/Plugin/monitoring/Sensor/TestSensor.php
+++ b/modules/test/src/Plugin/monitoring/Sensor/TestSensor.php
@@ -1,28 +1,28 @@
'monitoring_drush_run',
'description' => 'Runs specific sensor and provides verbose data.',
'arguments' => array(
- 'sensor_name' => 'Sensor name to invoke.',
+ 'sensor_name' => 'SensorPlugin name to invoke.',
),
'options' => array(
'verbose' => 'Display verbose information.',
'force' => 'If the sensor execution should be forced in case cached result is available.',
'output' => 'The output format. Currently "table" and "json" available. Defaults to "table".',
- 'expand' => 'Relevant only for the json output. Currently "sensor_info" value supported.',
+ 'expand' => 'Relevant only for the json output. Currently "sensor" value supported.',
'show-exec-time' => 'Relevant for the table output listing all results. Will expand the table with execution time info.'
),
'examples' => array(
@@ -79,7 +79,7 @@ function monitoring_drush_command() {
'callback' => 'monitoring_drush_enable',
'description' => 'Enable specified monitoring sensor.',
'arguments' => array(
- 'sensor_name' => 'Sensor name to enable.',
+ 'sensor_name' => 'SensorPlugin name to enable.',
),
'required-arguments' => TRUE,
'examples' => array(
@@ -92,7 +92,7 @@ function monitoring_drush_command() {
'callback' => 'monitoring_drush_disable',
'description' => 'Disable specified monitoring sensor.',
'arguments' => array(
- 'sensor_name' => 'Sensor name to disable.',
+ 'sensor_name' => 'SensorPlugin name to disable.',
),
'required-arguments' => TRUE,
'examples' => array(
@@ -105,7 +105,7 @@ function monitoring_drush_command() {
'callback' => 'monitoring_drush_purge_settings',
'description' => 'Purges settings for a specific sensor, or all sensors.',
'arguments' => array(
- 'sensor_name' => 'Sensor name for which to purge settings.',
+ 'sensor_name' => 'SensorPlugin name for which to purge settings.',
),
'examples' => array(
'drush monitoring-purge-settings monitoring_git_dirty_tree' => 'Enables monitoring_git_dirty_tree sensor.',
@@ -122,7 +122,7 @@ function monitoring_drush_command() {
* Shows either all sensors as a table or a specific one.
*
* @param string $sensor_name
- * Sensor name for which to print info.
+ * SensorPlugin name for which to print info.
*/
function monitoring_drush_info($sensor_name = NULL) {
if (empty($sensor_name)) {
@@ -158,7 +158,7 @@ function monitoring_drush_info_all() {
* Prints detailed info about the given sensor $sensor_name.
*
* @param string $sensor_name
- * Sensor name for which to print info.
+ * SensorPlugin name for which to print info.
*/
function monitoring_drush_info_single($sensor_name) {
$sensor_config = NULL;
@@ -166,7 +166,7 @@ function monitoring_drush_info_single($sensor_name) {
$sensor_config = monitoring_sensor_manager()->getSensorConfigByName($sensor_name);
}
catch (NonExistingSensorException $e) {
- return drush_set_error('MONITORING_SENSOR_INVALID_NAME', dt('Sensor "@name" does not exist.', array('@name' => $sensor_name)));
+ return drush_set_error('MONITORING_SENSOR_INVALID_NAME', dt('SensorPlugin "@name" does not exist.', array('@name' => $sensor_name)));
}
$rows[] = array(String::format("@label (@name)", array('@label' => $sensor_config->getLabel(), '@name' => $sensor_config->getName())), '====================');
@@ -188,7 +188,7 @@ function monitoring_drush_info_single($sensor_name) {
* Drush callback to get sensor results.
*
* @param string $sensor_name
- * Sensor name to run.
+ * SensorPlugin name to run.
*
* @return int
* The most escalated sensor status.
@@ -212,11 +212,11 @@ function monitoring_drush_run($sensor_name = NULL) {
$results = monitoring_sensor_run_multiple($sensor_names, $force_run, $verbose);
}
catch (NonExistingSensorException $e) {
- drush_set_error('MONITORING_SENSOR_INVALID_NAME', dt('Sensor "@name" does not exist.', array('@name' => $sensor_name)));
+ drush_set_error('MONITORING_SENSOR_INVALID_NAME', dt('SensorPlugin "@name" does not exist.', array('@name' => $sensor_name)));
return MONITORING_DRUSH_SENSOR_STATUS_UNKNOWN;
}
catch (DisabledSensorException $e) {
- drush_set_error('MONITORING_SENSOR_DISABLED', dt('Sensor "@name" is not enabled.', array('@name' => $sensor_name)));
+ drush_set_error('MONITORING_SENSOR_DISABLED', dt('SensorPlugin "@name" is not enabled.', array('@name' => $sensor_name)));
return MONITORING_DRUSH_SENSOR_STATUS_UNKNOWN;
}
@@ -259,9 +259,10 @@ function monitoring_drush_run($sensor_name = NULL) {
function monitoring_drush_result_output_json(array $results, $expand = NULL) {
$json_output = array();
foreach ($results as $result) {
- $json_output[$result->getSensorName()] = $result->toArray();
- if ($expand == 'sensor_info') {
- $json_output[$result->getSensorName()]['sensor_info'] = $result->getSensorConfig()->toArray();
+ $sensor_name = $result->getSensorName();
+ $json_output[$sensor_name] = $result->toArray();
+ if ($expand == 'sensor') {
+ $json_output[$sensor_name]['sensor'] = $result->getSensorConfig()->toArray();
}
}
drush_print(Json::encode($json_output));
@@ -288,7 +289,7 @@ function monitoring_drush_result_output_table(array $results, $show_exec_time =
* Outputs single sensor result.
*
* @param \Drupal\monitoring\Result\SensorResultInterface $result
- * Sensor result object.
+ * SensorPlugin result object.
*/
function monitoring_drush_result_output_table_single(SensorResultInterface $result) {
$rows[] = array(dt('Name'), $result->getSensorConfig()->getName());
@@ -315,7 +316,7 @@ function monitoring_drush_result_output_table_single(SensorResultInterface $resu
* If TRUE the multi results view will display also execution time.
*/
function monitoring_drush_result_output_table_multiple(array $results, $show_exec_time = FALSE) {
- $rows['header'] = array(dt('Sensor'), dt('Status'), dt('Message'), dt('Result age'));
+ $rows['header'] = array(dt('SensorPlugin'), dt('Status'), dt('Message'), dt('Result age'));
if ($show_exec_time) {
$rows['header'][] = dt('Execution time');
}
@@ -340,7 +341,7 @@ function monitoring_drush_result_output_table_multiple(array $results, $show_exe
* Drush callback to enable a sensor.
*
* @param string $sensor_name
- * Sensor name.
+ * SensorPlugin name.
*/
function monitoring_drush_enable($sensor_name) {
$sensor_manager = monitoring_sensor_manager();
@@ -356,7 +357,7 @@ function monitoring_drush_enable($sensor_name) {
}
catch (NonExistingSensorException $e) {
- drush_set_error('MONITORING_SENSOR_INVALID_NAME', dt('Sensor "@name" does not exist.', array('@name' => $sensor_name)));
+ drush_set_error('MONITORING_SENSOR_INVALID_NAME', dt('SensorPlugin "@name" does not exist.', array('@name' => $sensor_name)));
}
}
@@ -364,7 +365,7 @@ function monitoring_drush_enable($sensor_name) {
* Drush callback to disable a sensor.
*
* @param string $sensor_name
- * Sensor name.
+ * SensorPlugin name.
*/
function monitoring_drush_disable($sensor_name) {
$sensor_manager = monitoring_sensor_manager();
@@ -379,7 +380,7 @@ function monitoring_drush_disable($sensor_name) {
}
}
catch (NonExistingSensorException $e) {
- drush_set_error('MONITORING_SENSOR_INVALID_NAME', dt('Sensor "@name" does not exist.', array('@name' => $sensor_name)));
+ drush_set_error('MONITORING_SENSOR_INVALID_NAME', dt('SensorPlugin "@name" does not exist.', array('@name' => $sensor_name)));
}
}
@@ -387,7 +388,7 @@ function monitoring_drush_disable($sensor_name) {
* Drush callback to purge sensor settings.
*
* @param string $sensor_name
- * Sensor name for which to purge settings.
+ * SensorPlugin name for which to purge settings.
*/
function monitoring_drush_purge_settings($sensor_name = NULL) {
if (empty($sensor_name)) {
diff --git a/monitoring.links.action.yml b/monitoring.links.action.yml
index f7cbca5..b82f275 100644
--- a/monitoring.links.action.yml
+++ b/monitoring.links.action.yml
@@ -1,6 +1,6 @@
monitoring.sensor_add:
route_name: monitoring.sensor_add
- title: 'Add Sensor'
+ title: 'Add SensorPlugin'
weight: 1
appears_on:
- monitoring.sensors_overview_settings
diff --git a/monitoring.module b/monitoring.module
index fcdf498..aee3933 100644
--- a/monitoring.module
+++ b/monitoring.module
@@ -45,10 +45,10 @@ function monitoring_sensor_config() {
* Gets sensor config grouped by categories.
*
* @param bool $enabled
- * Sensor isEnabled flag.
+ * SensorPlugin isEnabled flag.
*
* @return \Drupal\monitoring\Entity\SensorConfig[]
- * Sensor config.
+ * SensorPlugin config.
*/
function monitoring_sensor_config_by_categories($enabled = TRUE) {
return monitoring_sensor_manager()->getSensorConfigByCategories($enabled);
@@ -84,7 +84,7 @@ function monitoring_sensor_run($sensor_name, $force_run = FALSE, $verbose = FALS
* Runs sensors.
*
* @param array $sensor_names
- * Sensor names to run.
+ * SensorPlugin names to run.
* @param bool $force_run
* Flag to force run.
* @param bool $verbose
@@ -149,12 +149,12 @@ function monitoring_preprocess_views_view_table(&$vars) {
}
/**
- * Sensor pages title callback.
+ * SensorPlugin pages title callback.
*
* @param string $action
* View/page action.
* @param \Drupal\monitoring\Entity\SensorConfig $sensor_config
- * Sensor config.
+ * SensorPlugin config.
*
* @return string
* Title.
@@ -173,7 +173,7 @@ function monitoring_sensor_action_title($action, SensorConfig $sensor_config) {
* Saves sensor settings.
*
* @param string $sensor_name
- * Sensor name.
+ * SensorPlugin name.
* @param array $values
* Settings to be saved.
*/
@@ -189,10 +189,10 @@ function monitoring_sensor_settings_save($sensor_name, $values) {
* Gets sensor settings.
*
* @param string $sensor_name
- * Sensor name.
+ * SensorPlugin name.
*
* @return array
- * Sensor saved settings.
+ * SensorPlugin saved settings.
*/
function monitoring_sensor_settings_get($sensor_name) {
return (array)\Drupal::config('monitoring.settings')->get($sensor_name);
@@ -202,10 +202,10 @@ function monitoring_sensor_settings_get($sensor_name) {
* Saves the sensor result.
*
* @param SensorResultInterface $result
- * Sensor call result.
+ * SensorPlugin call result.
*
* @return \Drupal\monitoring\Entity\SensorResultEntity
- * Sensor result entity.
+ * SensorPlugin result entity.
*/
function monitoring_sensor_result_save(SensorResultInterface $result) {
$values = array(
@@ -356,7 +356,7 @@ function theme_monitoring_overview_summary($variables) {
$output .= '' . \Drupal::l(t('Force execute all'), Url::fromRoute('monitoring.force_run_all')) . '
';
}
if (!empty($variables['oldest_sensor_label'])) {
- $output .= '' . t('Sensor %sensor (%category) cached before %before.', array('%sensor' => $variables['oldest_sensor_label'], '%before' => $variables['oldest_sensor_called_before'], '%category' => $variables['oldest_sensor_category'])) . '
';
+ $output .= '' . t('SensorPlugin %sensor (%category) cached before %before.', array('%sensor' => $variables['oldest_sensor_label'], '%before' => $variables['oldest_sensor_called_before'], '%category' => $variables['oldest_sensor_category'])) . '
';
}
else {
$output .= '' . t('No sensor cached.') . '
';
diff --git a/monitoring.monitoring_sensors.inc b/monitoring.monitoring_sensors.inc
index 59bd055..3be8bb4 100644
--- a/monitoring.monitoring_sensors.inc
+++ b/monitoring.monitoring_sensors.inc
@@ -4,23 +4,23 @@
* Define default sensors for core and contrib modules.
*
* Default sensors provide sensors for core and contrib modules with
- * monitoring_MODULE_monitoring_sensor_info()
+ * monitoring_MODULE_monitoring_sensor()
*
* The default integration for MODULE is omitted if a module implements
* hook_monitoring_sensor_info() on its own.
*
- * @see hook_monitoring_sensor_info()
+ * @see hook_monitoring_sensor()
*/
use Drupal\Component\Utility\String;
/**
- * Implements monitoring_MODULE_monitoring_sensor_info().
+ * Implements monitoring_MODULE_monitoring_sensor().
*
* @todo-Convert below sensors to config entities after these modules are ported in 8.x
* Module: past_db
*/
-function monitoring_past_db_monitoring_sensor_info() {
+function monitoring_past_db_monitoring_sensor() {
$info = array();
$severities = monitoring_event_severities();
@@ -55,11 +55,11 @@ function monitoring_past_db_monitoring_sensor_info() {
}
/**
- * Implements monitoring_MODULE_monitoring_sensor_info().
+ * Implements monitoring_MODULE_monitoring_sensor().
*
* Module: elysia_cron
*/
-function monitoring_elysia_cron_monitoring_sensor_info() {
+function monitoring_elysia_cron_monitoring_sensor() {
$info = array();
$result = db_select('elysia_cron', 'e')->fields('e', array('name'))->execute()->fetchAll();
@@ -97,11 +97,11 @@ function monitoring_elysia_cron_monitoring_sensor_info() {
}
/**
- * Implements monitoring_MODULE_monitoring_sensor_info().
+ * Implements monitoring_MODULE_monitoring_sensor().
*
* Module: commerce_order
*/
-function monitoring_commerce_order_monitoring_sensor_info() {
+function monitoring_commerce_order_monitoring_sensor() {
$info = array();
// Expose a sensor for each order status, disabled by default.
diff --git a/monitoring.routing.yml b/monitoring.routing.yml
index ecc9e14..9295301 100644
--- a/monitoring.routing.yml
+++ b/monitoring.routing.yml
@@ -2,7 +2,7 @@ monitoring.sensors_overview_settings:
path: '/admin/config/system/monitoring/sensors'
defaults:
_entity_list: 'monitoring_sensor_config'
- _title: 'Sensor Overview'
+ _title: 'SensorPlugin Overview'
requirements:
_permission: 'administer monitoring'
@@ -25,14 +25,14 @@ monitoring.detail_form:
monitoring.force_run_all:
path: 'monitoring/sensors/force'
defaults:
- _controller: '\Drupal\monitoring\Controller\ForceRunController::forceRunAll'
+ _controller: '\Drupal\monitoring\Controller\SensorForceRunController::forceRunAll'
requirements:
_permission: 'monitoring force run'
monitoring.force_run_sensor:
path: 'monitoring/sensors/force/{monitoring_sensor_config}'
defaults:
- _controller: '\Drupal\monitoring\Controller\ForceRunController::forceRunSensor'
+ _controller: '\Drupal\monitoring\Controller\SensorForceRunController::forceRunSensor'
requirements:
_permission: 'monitoring force run'
@@ -56,13 +56,13 @@ monitoring.sensor_add:
path: '/admin/config/system/monitoring/sensors/add'
defaults:
_entity_form: 'monitoring_sensor_config.add'
- _title: 'Add Sensor'
+ _title: 'Add SensorPlugin'
requirements:
_permission: 'administer monitoring'
monitoring.config_autocomplete:
path: '/monitoring-config/autocomplete'
defaults:
- _controller: '\Drupal\monitoring\Controller\ConfigAutocompleteController::autocomplete'
+ _controller: '\Drupal\monitoring\Controller\SensorConfigAutocompleteController::autocomplete'
requirements:
_permission: 'administer monitoring'
diff --git a/monitoring.services.yml b/monitoring.services.yml
index a9484a4..4471864 100644
--- a/monitoring.services.yml
+++ b/monitoring.services.yml
@@ -1,6 +1,6 @@
services:
monitoring.sensor_manager:
- class: Drupal\monitoring\Sensor\SensorManager
+ class: Drupal\monitoring\SensorPlugin\SensorManager
arguments: ['@container.namespaces', '@cache.discovery', '@module_handler', '@config.factory']
tags:
- { name: plugin_manager_cache_clear }
diff --git a/monitoring.views.inc b/monitoring.views.inc
index 13f339d..39823e7 100644
--- a/monitoring.views.inc
+++ b/monitoring.views.inc
@@ -12,7 +12,7 @@ function monitoring_views_data() {
// Advertise this table as a possible base table.
$data['monitoring_sensor_result']['table']['base'] = array(
'field' => 'record_id',
- 'title' => t('Sensor result log'),
+ 'title' => t('SensorPlugin result log'),
);
$data['monitoring_sensor_result']['table']['entity type'] = 'monitoring_sensor_result';
@@ -32,7 +32,7 @@ function monitoring_views_data() {
);
$data['monitoring_sensor_result']['sensor_name'] = array(
- 'title' => t('Sensor name'),
+ 'title' => t('SensorPlugin name'),
'help' => t('The machine name of the sensor.'),
'field' => array(
'id' => 'monitoring_sensor_name',
@@ -93,7 +93,7 @@ function monitoring_views_data() {
),
);
$data['monitoring_sensor_result']['sensor_value'] = array(
- 'title' => t('Sensor value'),
+ 'title' => t('SensorPlugin value'),
'help' => t('The value at the moment when the sensor triggered.'),
'field' => array(
'id' => 'standard',
@@ -110,7 +110,7 @@ function monitoring_views_data() {
);
$data['monitoring_sensor_result']['execution_time'] = array(
'title' => t('Execution time'),
- 'help' => t('Sensor execution time in ms.'),
+ 'help' => t('SensorPlugin execution time in ms.'),
'field' => array(
'id' => 'standard',
),
diff --git a/review.txt b/review.txt
index 23c4918..916ece9 100644
--- a/review.txt
+++ b/review.txt
@@ -1,2 +1,2 @@
- Wondering if we should add a SensorConfig::getSensor() (factory to create a sensor based on getSensorClass()), to a) solve the type hint problem and b), support container service injection like plugins with the create() method. See ContainerFactory, you would just inline that logic. Advantage: Easier to convert to plugins later.
-- the status message in CronLastRunAgeSensor is now almost duplicated due to the value type formatting, but that's an existing problem in 7.x.
+- the status message in CronLastRunAgeSensorPlugin is now almost duplicated due to the value type formatting, but that's an existing problem in 7.x.
diff --git a/src/Annotation/Sensor.php b/src/Annotation/SensorPlugin.php
similarity index 79%
rename from src/Annotation/Sensor.php
rename to src/Annotation/SensorPlugin.php
index 19e8660..f09637d 100644
--- a/src/Annotation/Sensor.php
+++ b/src/Annotation/SensorPlugin.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\monitoring\Annotation\Sensor.
+ * Contains \Drupal\monitoring\Annotation\SensorPlugin.
*/
namespace Drupal\monitoring\Annotation;
@@ -10,11 +10,11 @@ namespace Drupal\monitoring\Annotation;
use Drupal\Component\Annotation\Plugin;
/**
- * Defines Sensor annotation object for reference by Sensor Plugins.
+ * Defines SensorPlugin annotation object for reference by SensorPlugin Plugins.
*
* @Annotation
*/
-class Sensor extends Plugin {
+class SensorPlugin extends Plugin {
/**
* The plugin ID.
diff --git a/src/Controller/ConfigAutocompleteController.php b/src/Controller/SensorConfigAutocompleteController.php
similarity index 80%
rename from src/Controller/ConfigAutocompleteController.php
rename to src/Controller/SensorConfigAutocompleteController.php
index 4b87343..0a3cfc0 100644
--- a/src/Controller/ConfigAutocompleteController.php
+++ b/src/Controller/SensorConfigAutocompleteController.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\monitoring\Controller\ConfigAutocompleteController.
+ * Contains \Drupal\monitoring\Controller\SensorConfigAutocompleteController.
*/
namespace Drupal\monitoring\Controller;
@@ -14,12 +14,12 @@ use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request;
/**
- * Returns autocomplete responses for config.
+ * Returns auto complete responses for config.
*/
-class ConfigAutocompleteController {
+class SensorConfigAutocompleteController {
/**
- * Retrieves suggestions for config autocompletion.
+ * Retrieves suggestions for config auto completion.
*
* @param \Symfony\Component\HttpFoundation\Request $request
* The current request.
diff --git a/src/Controller/ForceRunController.php b/src/Controller/SensorForceRunController.php
similarity index 97%
rename from src/Controller/ForceRunController.php
rename to src/Controller/SensorForceRunController.php
index 257915a..8be792a 100644
--- a/src/Controller/ForceRunController.php
+++ b/src/Controller/SensorForceRunController.php
@@ -10,7 +10,7 @@ use Drupal\monitoring\SensorRunner;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\RedirectResponse;
-class ForceRunController extends ControllerBase {
+class SensorForceRunController extends ControllerBase {
/**
* Stores the sensor manager.
diff --git a/src/Controller/SensorList.php b/src/Controller/SensorList.php
index 7510e49..6290fa9 100644
--- a/src/Controller/SensorList.php
+++ b/src/Controller/SensorList.php
@@ -4,6 +4,7 @@ namespace Drupal\monitoring\Controller;
use Drupal\Component\Utility\Unicode;
use Drupal\Core\Controller\ControllerBase;
+use Drupal\monitoring\Entity\SensorConfig;
use Drupal\monitoring\Result\SensorResultInterface;
use Drupal\monitoring\Sensor\SensorManager;
use Drupal\monitoring\SensorRunner;
@@ -66,7 +67,7 @@ class SensorList extends ControllerBase {
// Oldest sensor config.
$oldest_sensor_config = NULL;
- foreach ($this->sensorManager->getSensorConfigByCategories() as $category => $category_sensor_info) {
+ foreach ($this->sensorManager->getSensorConfigByCategories() as $category => $category_sensor_config) {
// Category grouping row.
$rows[] = array(
@@ -79,7 +80,8 @@ class SensorList extends ControllerBase {
);
$ok_row_count = 0;
- foreach ($category_sensor_info as $sensor_name => $sensor_config) {
+ /** @var SensorConfig $sensor_config */
+ foreach ($category_sensor_config as $sensor_name => $sensor_config) {
if (!isset($results[$sensor_name])) {
continue;
}
@@ -170,7 +172,7 @@ class SensorList extends ControllerBase {
}
$header = array(
- t('Sensor name'),
+ t('SensorPlugin name'),
array('data' => t('Status'), 'class' => array('status')),
t('Called before'),
t('Execution time'),
diff --git a/src/Entity/SensorConfig.php b/src/Entity/SensorConfig.php
index 93bc990..8379c20 100644
--- a/src/Entity/SensorConfig.php
+++ b/src/Entity/SensorConfig.php
@@ -14,9 +14,10 @@ use Drupal\Core\Entity\EntityStorageInterface;
* Represents a sensor config entity class.
*
* @todo more
+ *
* @ConfigEntityType(
* id = "monitoring_sensor_config",
- * label = @Translation("Monitoring Sensor"),
+ * label = @Translation("Monitoring SensorPlugin"),
* handlers = {
* "access" = "Drupal\monitoring\SensorConfigAccessControlHandler",
* "list_builder" = "Drupal\monitoring\SensorListBuilder",
@@ -138,7 +139,7 @@ class SensorConfig extends ConfigEntityBase {
* displayed.
*
* @return string
- * Sensor label.
+ * SensorPlugin label.
*/
public function getLabel() {
return $this->label;
@@ -148,7 +149,7 @@ class SensorConfig extends ConfigEntityBase {
* Gets sensor description.
*
* @return string
- * Sensor description.
+ * SensorPlugin description.
*/
public function getDescription() {
return $this->description;
@@ -158,7 +159,7 @@ class SensorConfig extends ConfigEntityBase {
* Gets sensor class.
*
* @return string
- * Sensor class
+ * SensorPlugin class
*/
public function getSensorClass() {
$definition = monitoring_sensor_manager()->getDefinition($this->sensor_id);
@@ -168,11 +169,11 @@ class SensorConfig extends ConfigEntityBase {
/**
* Gets the sensor plugin.
*
- * @return \Drupal\monitoring\Sensor\SensorInterface
+ * @return \Drupal\monitoring\Sensor\SensorPluginInterface
* Instantiated sensor.
*/
public function getPlugin() {
- $configuration = array('sensor_info' => $this);
+ $configuration = array('sensor_config' => $this);
$sensor = monitoring_sensor_manager()->createInstance($this->sensor_id, $configuration);
return $sensor;
}
@@ -198,7 +199,7 @@ class SensorConfig extends ConfigEntityBase {
* If nothing is defined, it returns NULL.
*
* @return string|null
- * Sensor value label.
+ * SensorPlugin value label.
*/
public function getValueLabel() {
if ($this->value_label) {
@@ -217,7 +218,7 @@ class SensorConfig extends ConfigEntityBase {
* Gets sensor value type.
*
* @return string|null
- * Sensor value type.
+ * SensorPlugin value type.
*
* @see monitoring_value_types().
*/
@@ -341,7 +342,7 @@ class SensorConfig extends ConfigEntityBase {
* @return bool
*/
public function isExtendedInfo() {
- return in_array('Drupal\monitoring\Sensor\SensorExtendedInfoInterface', class_implements($this->getSensorClass()));
+ return in_array('Drupal\monitoring\Sensor\ExtendedInfoSensorPluginInterface', class_implements($this->getSensorClass()));
}
/**
@@ -350,14 +351,14 @@ class SensorConfig extends ConfigEntityBase {
* @return bool
*/
public function isDefiningThresholds() {
- return in_array('Drupal\monitoring\Sensor\ThresholdsSensorInterface', class_implements($this->getSensorClass()));
+ return in_array('Drupal\monitoring\Sensor\ThresholdsSensorPluginInterface', class_implements($this->getSensorClass()));
}
/**
* Compiles sensor values to an associative array.
*
* @return array
- * Sensor config associative array.
+ * SensorPlugin config associative array.
*/
public function getDefinition() {
$config = array(
@@ -383,6 +384,10 @@ class SensorConfig extends ConfigEntityBase {
* {@inheritdoc}
*/
public static function sort(ConfigEntityInterface $a, ConfigEntityInterface $b) {
+ /**
+ * @var SensorConfig $a
+ * @var SensorConfig $b
+ */
// Checks whether both labels and categories are equal.
if ($a->getLabel() == $b->getLabel() && $a->getCategory() == $b->getCategory()) {
return 0;
diff --git a/src/Entity/SensorResultEntity.php b/src/Entity/SensorResultEntity.php
index 0e7d5fb..7d6ecb0 100644
--- a/src/Entity/SensorResultEntity.php
+++ b/src/Entity/SensorResultEntity.php
@@ -43,19 +43,19 @@ class SensorResultEntity extends ContentEntityBase {
->setReadOnly(TRUE);
$fields['sensor_name'] = BaseFieldDefinition::create('string')
- ->setLabel(t('Sensor name'))
+ ->setLabel(t('SensorPlugin name'))
->setDescription(t('The machine name of the sensor.'));
$fields['sensor_status'] = BaseFieldDefinition::create('string')
- ->setLabel(t('Sensor status'))
+ ->setLabel(t('SensorPlugin status'))
->setDescription(t('The sensor status at the moment of the sensor run.'));
$fields['sensor_value'] = BaseFieldDefinition::create('string')
- ->setLabel(t('Sensor value'))
+ ->setLabel(t('SensorPlugin value'))
->setDescription(t('The sensor value at the moment of the sensor run.'));
$fields['sensor_message'] = BaseFieldDefinition::create('string_long')
- ->setLabel(t('Sensor message'))
+ ->setLabel(t('SensorPlugin message'))
->setDescription(t('The sensor message reported by the sensor.'));
$fields['timestamp'] = BaseFieldDefinition::create('created')
diff --git a/src/Form/SensorDetailForm.php b/src/Form/SensorDetailForm.php
index af6d8ef..3ae4429 100644
--- a/src/Form/SensorDetailForm.php
+++ b/src/Form/SensorDetailForm.php
@@ -79,7 +79,7 @@ class SensorDetailForm extends EntityForm {
}
if ($sensor_config->getDescription()) {
- $form['sensor_info']['description'] = array(
+ $form['sensor_config']['description'] = array(
'#type' => 'item',
'#title' => $this->t('Description'),
'#markup' => $sensor_config->getDescription(),
@@ -87,7 +87,7 @@ class SensorDetailForm extends EntityForm {
}
if ($sensor_config->getCategory()) {
- $form['sensor_info']['category'] = array(
+ $form['sensor_config']['category'] = array(
'#type' => 'item',
'#title' => $this->t('Category'),
'#markup' => $sensor_config->getCategory(),
diff --git a/src/Form/SensorForm.php b/src/Form/SensorForm.php
index 28ae259..5b1ea54 100644
--- a/src/Form/SensorForm.php
+++ b/src/Form/SensorForm.php
@@ -10,8 +10,8 @@ use Drupal\Core\Entity\EntityForm;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Url;
use Drupal\monitoring\Entity\SensorConfig;
-use Drupal\monitoring\Sensor\SensorBase;
-use Drupal\monitoring\Sensor\SensorInterface;
+use Drupal\monitoring\Sensor\SensorPluginBase;
+use Drupal\monitoring\Sensor\SensorPluginInterface;
/**
* Sensor settings form controller.
@@ -142,7 +142,7 @@ class SensorForm extends EntityForm {
);
if (isset($sensor_config->sensor_id) && $sensor = $sensor_config->getPlugin()) {
- /** @var SensorBase $sensor */
+ /** @var SensorPluginBase $sensor */
$form['settings'] = array(
'#type' => 'details',
'#open' => TRUE,
@@ -200,10 +200,10 @@ class SensorForm extends EntityForm {
/* @var SensorConfig $sensor_config */
$sensor_config = $this->entity;
- /** @var SensorInterface $sensor */
+ /** @var SensorPluginInterface $sensor */
if ($sensor_config->isNew()) {
$plugin = $form_state->getValue('sensor_id');
- $sensor = monitoring_sensor_manager()->createInstance($plugin, array('sensor_info' => $this->entity));
+ $sensor = monitoring_sensor_manager()->createInstance($plugin, array('sensor_config' => $this->entity));
}
else {
$sensor = $sensor_config->getPlugin();
@@ -220,7 +220,7 @@ class SensorForm extends EntityForm {
/** @var SensorConfig $sensor_config */
$sensor_config = $this->entity;
- /** @var SensorInterface $sensor */
+ /** @var SensorPluginInterface $sensor */
$sensor = $sensor_config->getPlugin();
$sensor->submitConfigurationForm($form, $form_state);
diff --git a/src/Plugin/monitoring/Sensor/CommerceTurnoverSensor.php b/src/Plugin/monitoring/Sensor/CommerceTurnoverSensorPlugin.php
similarity index 94%
rename from src/Plugin/monitoring/Sensor/CommerceTurnoverSensor.php
rename to src/Plugin/monitoring/Sensor/CommerceTurnoverSensorPlugin.php
index 89d58c6..ea27c75 100644
--- a/src/Plugin/monitoring/Sensor/CommerceTurnoverSensor.php
+++ b/src/Plugin/monitoring/Sensor/CommerceTurnoverSensorPlugin.php
@@ -1,7 +1,7 @@
'item',
- '#title' => t('Sensor message'),
+ '#title' => t('SensorPlugin message'),
'#markup' => $result->getMessage(),
);
$form['clear_missing_sensors_wrapper']['clear_missing_sensor'] = array(
diff --git a/src/Plugin/monitoring/Sensor/ElysiaCronSensor.php b/src/Plugin/monitoring/Sensor/ElysiaCronSensorPlugin.php
similarity index 84%
rename from src/Plugin/monitoring/Sensor/ElysiaCronSensor.php
rename to src/Plugin/monitoring/Sensor/ElysiaCronSensorPlugin.php
index 052fcd7..8601a7f 100644
--- a/src/Plugin/monitoring/Sensor/ElysiaCronSensor.php
+++ b/src/Plugin/monitoring/Sensor/ElysiaCronSensorPlugin.php
@@ -1,18 +1,18 @@
getEntityType();
if (!$entity_type_id) {
- throw new \Exception(String::format('Sensor @id is missing the required entity_type setting.', array('@id' => $this->id())));
+ throw new \Exception(String::format('SensorPlugin @id is missing the required entity_type setting.', array('@id' => $this->id())));
}
$entity_type = $this->entityManager->getDefinition($entity_type_id);
$this->addDependency('module', $entity_type->getProvider());
diff --git a/src/Plugin/monitoring/Sensor/GitDirtyTreeSensor.php b/src/Plugin/monitoring/Sensor/GitDirtyTreeSensorPlugin.php
similarity index 85%
rename from src/Plugin/monitoring/Sensor/GitDirtyTreeSensor.php
rename to src/Plugin/monitoring/Sensor/GitDirtyTreeSensorPlugin.php
index c6e0d69..776b449 100644
--- a/src/Plugin/monitoring/Sensor/GitDirtyTreeSensor.php
+++ b/src/Plugin/monitoring/Sensor/GitDirtyTreeSensorPlugin.php
@@ -1,19 +1,19 @@
getMessage(), $e);
}
$response = $sensor_config->getDefinition();
- $response['uri'] = \Drupal::request()->getUriForPath('/monitoring-sensor-info/' . $sensor_name);
+ $response['uri'] = \Drupal::request()->getUriForPath('/monitoring-sensor/' . $sensor_name);
return new ResourceResponse($response);
}
$list = array();
foreach ($this->sensorManager->getAllSensorConfig() as $sensor_name => $sensor_config) {
$list[$sensor_name] = $sensor_config->getDefinition();
- $list[$sensor_name]['uri'] = \Drupal::request()->getUriForPath('/monitoring-sensor-info/' . $sensor_name);
+ $list[$sensor_name]['uri'] = \Drupal::request()->getUriForPath('/monitoring-sensor/' . $sensor_name);
}
return new ResourceResponse($list);
}
diff --git a/src/Plugin/rest/resource/MonitoringSensorResultResource.php b/src/Plugin/rest/resource/MonitoringSensorResultResource.php
index ca069a7..9a7993c 100644
--- a/src/Plugin/rest/resource/MonitoringSensorResultResource.php
+++ b/src/Plugin/rest/resource/MonitoringSensorResultResource.php
@@ -112,8 +112,8 @@ class MonitoringSensorResultResource extends ResourceBase {
$result = $this->sensorRunner->runSensors($sensor_config);
$response = $result[$sensor_name]->toArray();
$response['uri'] = $request->getUriForPath('/monitoring-sensor-result/' . $sensor_name);
- if ($request->get('expand') == 'sensor_info') {
- $response['sensor_info'] = $result[$sensor_name]->getSensorConfig()->toArray();
+ if ($request->get('expand') == 'sensor') {
+ $response['sensor'] = $result[$sensor_name]->getSensorConfig()->toArray();
}
return new ResourceResponse($response);
}
@@ -129,8 +129,8 @@ class MonitoringSensorResultResource extends ResourceBase {
foreach ($this->sensorRunner->runSensors() as $sensor_name => $result) {
$list[$sensor_name] = $result->toArray();
$list[$sensor_name]['uri'] = $request->getUriForPath('/monitoring-sensor-result/' . $sensor_name);
- if ($request->get('expand') == 'sensor_info') {
- $list[$sensor_name]['sensor_info'] = $result->getSensorConfig()->toArray();
+ if ($request->get('expand') == 'sensor') {
+ $list[$sensor_name]['sensor'] = $result->getSensorConfig()->toArray();
}
}
return new ResourceResponse($list);
diff --git a/src/Result/SensorResult.php b/src/Result/SensorResult.php
index 10fbbb9..5f40efd 100644
--- a/src/Result/SensorResult.php
+++ b/src/Result/SensorResult.php
@@ -70,7 +70,7 @@ class SensorResult implements SensorResultInterface {
* By default, the sensor status is STATUS_UNKNOWN with empty message.
*
* @param SensorConfig $sensor_config
- * Sensor config object.
+ * SensorPlugin config object.
* @param array $cached_data
* Result data obtained from a cache.
*/
@@ -288,7 +288,7 @@ class SensorResult implements SensorResultInterface {
* Formats the value to be human readable.
*
* @param mixed $value
- * Sensor result value.
+ * SensorPlugin result value.
*
* @return string
* Formatted value.
@@ -501,5 +501,4 @@ class SensorResult implements SensorResultInterface {
return $this->verboseOutput;
}
-
}
diff --git a/src/Result/SensorResultInterface.php b/src/Result/SensorResultInterface.php
index 8cfb749..5c321af 100644
--- a/src/Result/SensorResultInterface.php
+++ b/src/Result/SensorResultInterface.php
@@ -16,35 +16,35 @@ use Drupal\monitoring\Entity\SensorConfig;
interface SensorResultInterface {
/**
- * Sensor status OK.
+ * SensorPlugin status OK.
*
* @var string
*/
const STATUS_OK = 'OK';
/**
- * Sensor status INFO.
+ * SensorPlugin status INFO.
*
* @var string
*/
const STATUS_INFO = 'INFO';
/**
- * Sensor status WARNING.
+ * SensorPlugin status WARNING.
*
* @var string
*/
const STATUS_WARNING = 'WARNING';
/**
- * Sensor status CRITICAL.
+ * SensorPlugin status CRITICAL.
*
* @var string
*/
const STATUS_CRITICAL = 'CRITICAL';
/**
- * Sensor status UNKNOWN.
+ * SensorPlugin status UNKNOWN.
*
* @var string
*/
@@ -54,7 +54,7 @@ interface SensorResultInterface {
* Gets sensor status.
*
* @return string
- * Sensor status.
+ * SensorPlugin status.
*/
public function getStatus();
@@ -62,7 +62,7 @@ interface SensorResultInterface {
* Gets a human readable label for the sensor status.
*
* @return string
- * Sensor status label.
+ * SensorPlugin status label.
*/
public function getStatusLabel();
@@ -80,7 +80,7 @@ interface SensorResultInterface {
* Must not be called on an uncompiled result.
*
* @return string
- * Sensor status message.
+ * SensorPlugin status message.
*/
public function getMessage();
@@ -120,7 +120,7 @@ interface SensorResultInterface {
*
* If the status is STATUS_UNKNOWN, this will attempt to set the status
* based on expected value and threshold configurations. See
- * \Drupal\monitoring\Sensor\SensorInterface::runSensor() for details.
+ * \Drupal\monitoring\SensorPlugin\SensorPluginInterface::runSensor() for details.
*
* @throws \Drupal\monitoring\Sensor\SensorCompilationException
* Thrown if an error occurs during the sensor result compilation.
@@ -139,7 +139,7 @@ interface SensorResultInterface {
* Gets the sensor metric value formatted for UI output.
*
* @param mixed $value
- * Sensor result value.
+ * SensorPlugin result value.
*
* @return mixed
* Whatever value the sensor is supposed to return.
@@ -187,7 +187,7 @@ interface SensorResultInterface {
* Sets sensor execution time in ms.
*
* @param float $time
- * Sensor execution time in ms
+ * SensorPlugin execution time in ms
*/
public function setExecutionTime($time);
@@ -219,7 +219,7 @@ interface SensorResultInterface {
* Gets sensor result data as array.
*
* @return array
- * Sensor result data as array.
+ * SensorPlugin result data as array.
*/
public function toArray();
diff --git a/src/Sensor/DatabaseAggregatorSensorBase.php b/src/Sensor/DatabaseAggregatorSensorPluginBase.php
similarity index 95%
rename from src/Sensor/DatabaseAggregatorSensorBase.php
rename to src/Sensor/DatabaseAggregatorSensorPluginBase.php
index 57018c7..130b9aa 100644
--- a/src/Sensor/DatabaseAggregatorSensorBase.php
+++ b/src/Sensor/DatabaseAggregatorSensorPluginBase.php
@@ -1,7 +1,7 @@
alterInfo('block');
$this->setCacheBackend($cache_backend, 'monitoring_sensor_plugins');
$this->config = $config;
@@ -66,13 +66,14 @@ class SensorManager extends DefaultPluginManager {
* {@inheritdoc}
*/
public function createInstance($plugin_id, array $configuration = array()) {
- // Configuration contains sensor_info object. Extracting
+ // Configuration contains sensor_config object. Extracting
// it to use for sensor object creation.
- $sensor_config = $configuration['sensor_info'];
+ $sensor_config = $configuration['sensor_config'];
$definition = $this->getDefinition($plugin_id);
- // Sensor class from the sensor definition.
+ // SensorPlugin class from the sensor definition.
+ /** @var SensorPluginInterface $class */
$class = $definition['class'];
- // Creating instance of the sensor. Refer Sensor.php for arguments.
+ // Creating instance of the sensor. Refer SensorPlugin.php for arguments.
return $class::create(\Drupal::getContainer(), $sensor_config, $plugin_id, $definition);
}
@@ -113,7 +114,7 @@ class SensorManager extends DefaultPluginManager {
* Directly use SensorConfig::load($name) if sensor existence assured.
*
* @param string $sensor_name
- * Sensor id.
+ * SensorPlugin id.
*
* @return \Drupal\monitoring\Entity\SensorConfig
* A single SensorConfig instance.
@@ -137,7 +138,7 @@ class SensorManager extends DefaultPluginManager {
* @param bool $enabled
* Sensor isEnabled flag.
*
- * @return \Drupal\monitoring\Entity\SensorConfig[]
+ * @return \Drupal\monitoring\Entity\SensorConfig[][]
* Sensor config.
*/
public function getSensorConfigByCategories($enabled = TRUE) {
@@ -166,7 +167,7 @@ class SensorManager extends DefaultPluginManager {
* Checks if the sensor is enabled and enables it if not.
*
* @param string $sensor_name
- * Sensor name to be enabled.
+ * SensorPlugin name to be enabled.
*
* @throws \Drupal\monitoring\Sensor\NonExistingSensorException
* Thrown if the requested sensor does not exist.
diff --git a/src/Sensor/SensorBase.php b/src/Sensor/SensorPluginBase.php
similarity index 90%
rename from src/Sensor/SensorBase.php
rename to src/Sensor/SensorPluginBase.php
index a81533a..3bfc5f0 100644
--- a/src/Sensor/SensorBase.php
+++ b/src/Sensor/SensorPluginBase.php
@@ -1,7 +1,7 @@
'fieldset',
- '#title' => t('Sensor thresholds'),
+ '#title' => t('SensorPlugin thresholds'),
'#description' => t('Here you can set limit values that switch the sensor to a given status.'),
'#prefix' => '',
'#suffix' => '
',
diff --git a/src/Sensor/ThresholdsSensorInterface.php b/src/Sensor/ThresholdsSensorPluginInterface.php
similarity index 84%
rename from src/Sensor/ThresholdsSensorInterface.php
rename to src/Sensor/ThresholdsSensorPluginInterface.php
index ea82c48..8e3f762 100644
--- a/src/Sensor/ThresholdsSensorInterface.php
+++ b/src/Sensor/ThresholdsSensorPluginInterface.php
@@ -11,6 +11,6 @@ namespace Drupal\monitoring\Sensor;
*
* Sensors implementing this interface can have thresholds.
*/
-interface ThresholdsSensorInterface {
+interface ThresholdsSensorPluginInterface {
}
diff --git a/src/Sensor/ValueComparisonSensorBase.php b/src/Sensor/ValueComparisonSensorPluginBase.php
similarity index 93%
rename from src/Sensor/ValueComparisonSensorBase.php
rename to src/Sensor/ValueComparisonSensorPluginBase.php
index 9fe727e..86906ed 100644
--- a/src/Sensor/ValueComparisonSensorBase.php
+++ b/src/Sensor/ValueComparisonSensorPluginBase.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\monitoring\Sensor\ValueComparisonSensorBase
+ * Contains \Drupal\monitoring\SensorPlugin\ValueComparisonSensorPluginBase
*/
namespace Drupal\monitoring\Sensor;
@@ -17,7 +17,7 @@ use Drupal\monitoring\Result\SensorResultInterface;
* value will be compared to. You can prepopulate this offset with initial
* value that will be used as the expected one on the sensor enable.
*/
-abstract class ValueComparisonSensorBase extends SensorBase {
+abstract class ValueComparisonSensorPluginBase extends SensorPluginBase {
/**
* Gets the value description that will be shown in the settings form.
diff --git a/src/SensorRunner.php b/src/SensorRunner.php
index 057164a..d11bdfd 100644
--- a/src/SensorRunner.php
+++ b/src/SensorRunner.php
@@ -24,7 +24,7 @@ use Drupal\monitoring\Sensor\SensorManager;
class SensorRunner {
/**
- * Sensor manager.
+ * SensorPlugin manager.
*
* @var \Drupal\monitoring\Sensor\SensorManager
*/
@@ -145,10 +145,10 @@ class SensorRunner {
* Run a single given sensor.
*
* @param SensorConfig $sensor_config
- * Sensor config
+ * SensorPlugin config
*
* @return SensorResultInterface
- * Sensor result.
+ * SensorPlugin result.
*
* @throws \Drupal\monitoring\Sensor\DisabledSensorException
* Thrown if the passed sensor is not enabled.
@@ -185,6 +185,7 @@ class SensorRunner {
// Capture verbose output if requested and if we are able to do so.
if ($this->verbose && $sensor_config->isExtendedInfo()) {
+ /** @var Drupal\monitoring\Sensor\ExtendedInfoSensorPluginInterface $sensor */
$result->setVerboseOutput($sensor->resultVerbose($result));
}
@@ -290,7 +291,7 @@ class SensorRunner {
* Instantiates sensor result object.
*
* @param SensorConfig $sensor_config
- * Sensor config.
+ * SensorPlugin config.
*
* @return \Drupal\monitoring\Result\SensorResultInterface
* Instantiated sensor result object.
diff --git a/src/Tests/MonitoringCoreTest.php b/src/Tests/MonitoringCoreTest.php
index 16dff98..5e3e504 100644
--- a/src/Tests/MonitoringCoreTest.php
+++ b/src/Tests/MonitoringCoreTest.php
@@ -37,7 +37,7 @@ class MonitoringCoreTest extends MonitoringTestBase {
*/
public function testSensors() {
- // ======= CronLastRunAgeSensor tests ======= //
+ // ======= CronLastRunAgeSensorPlugin tests ======= //
$time_shift = (60 * 60 * 24 + 1);
\Drupal::state()->set('system.cron_last', REQUEST_TIME - $time_shift);
@@ -94,7 +94,7 @@ class MonitoringCoreTest extends MonitoringTestBase {
$result = $this->runSensor('core_queue_monitoring_test');
$this->assertEqual($result->getValue(), 2);
- // ======= CoreRequirementsSensor tests ======= //
+ // ======= CoreRequirementsSensorPlugin tests ======= //
// @todo - This should not be necessary after sensor requirements are updated.
$sensor_config = SensorConfig::create(array(
@@ -189,7 +189,7 @@ class MonitoringCoreTest extends MonitoringTestBase {
$this->assertEqual($result->getValue(), 101);
$this->assertTrue($result->isCritical());
- // ======= ImageMissingStyleSensor tests ======= //
+ // ======= ImageMissingStyleSensorPlugin tests ======= //
$file = file_save_data($this->randomMachineName());
/** @var FileUsageInterface $usage */
@@ -232,7 +232,7 @@ class MonitoringCoreTest extends MonitoringTestBase {
$result = $this->runSensor('dblog_event_severity_' . $severities[RfcLogLevel::ALERT]);
$this->assertEqual($result->getValue(), 1);
- // ======= UserFailedLoginsSensor tests ======= //
+ // ======= UserFailedLoginsSensorPlugin tests ======= //
\Drupal::logger('user')->notice('Login attempt failed for %user.', array('%user' => 'user1'));
\Drupal::logger('user')->notice('Login attempt failed for %user.', array('%user' => 'user1'));
@@ -243,7 +243,7 @@ class MonitoringCoreTest extends MonitoringTestBase {
$this->assertTrue(strpos($result->getMessage(), 'user1: 2') !== FALSE);
$this->assertTrue(strpos($result->getMessage(), 'user2: 1') !== FALSE);
- // ======= Sensor user_session_logouts tests ======= //
+ // ======= SensorPlugin user_session_logouts tests ======= //
\Drupal::logger('user')->notice('Session closed for %name.', array('%user' => 'user1'));
\Drupal::logger('user')->notice('Session closed for %name.', array('%user' => 'user1'));
@@ -253,7 +253,7 @@ class MonitoringCoreTest extends MonitoringTestBase {
$this->assertEqual($result->getValue(), 3);
$this->assertEqual($result->getMessage(), '3 logouts in 1 day');
- // ======= GitDirtyTreeSensor tests ======= //
+ // ======= GitDirtyTreeSensorPlugin tests ======= //
// Enable the sensor and set cmd to output something
$sensor_config = SensorConfig::load('monitoring_git_dirty_tree');
@@ -325,9 +325,9 @@ class MonitoringCoreTest extends MonitoringTestBase {
}
/**
- * Tests for DisappearedSensorsSensor.
+ * Tests for DisappearedSensorsSensorPlugin.
*
- * We provide a separate test method for the DisappearedSensorsSensor as we
+ * We provide a separate test method for the DisappearedSensorsSensorPlugin as we
* need to enable and disable additional modules.
*/
public function testSensorDisappearedSensors() {
@@ -492,7 +492,7 @@ class MonitoringCoreTest extends MonitoringTestBase {
}
/**
- * Test cases for EnabledModulesSensor sensor.
+ * Test cases for EnabledModulesSensorPlugin sensor.
*
* We use separate test method as we need to enable/disable modules.
*/
diff --git a/src/Tests/MonitoringServicesTest.php b/src/Tests/MonitoringServicesTest.php
index 9b8040e..084e40a 100644
--- a/src/Tests/MonitoringServicesTest.php
+++ b/src/Tests/MonitoringServicesTest.php
@@ -48,7 +48,7 @@ class MonitoringServicesTest extends RESTTestBase {
// Enable REST API for monitoring resources.
$config = \Drupal::config('rest.settings');
$settings = array(
- 'monitoring-sensor-info' => array(
+ 'monitoring-sensor' => array(
'GET' => array(
'supported_formats' => array($this->defaultFormat),
'supported_auth' => $this->defaultAuth,
@@ -65,7 +65,7 @@ class MonitoringServicesTest extends RESTTestBase {
$config->save();
$this->rebuildCache();
- $this->servicesAccount = $this->drupalCreateUser(array('restful get monitoring-sensor-info', 'restful get monitoring-sensor-result'));
+ $this->servicesAccount = $this->drupalCreateUser(array('restful get monitoring-sensor', 'restful get monitoring-sensor-result'));
}
/**
@@ -74,7 +74,7 @@ class MonitoringServicesTest extends RESTTestBase {
public function testSensorConfig() {
$this->drupalLogin($this->servicesAccount);
- $response_data = $this->doRequest('monitoring-sensor-info');
+ $response_data = $this->doRequest('monitoring-sensor');
$this->assertResponse(200);
foreach (monitoring_sensor_manager()->getAllSensorConfig() as $sensor_name => $sensor_config) {
@@ -87,7 +87,7 @@ class MonitoringServicesTest extends RESTTestBase {
$this->assertEqual($response_data[$sensor_name]['caching_time'], $sensor_config->getCachingTime());
$this->assertEqual($response_data[$sensor_name]['time_interval'], $sensor_config->getTimeIntervalValue());
$this->assertEqual($response_data[$sensor_name]['enabled'], $sensor_config->isEnabled());
- $this->assertEqual($response_data[$sensor_name]['uri'], Url::fromUri('base://monitoring-sensor-info/' . $sensor_config->getName(), array('absolute' => TRUE))->toString());
+ $this->assertEqual($response_data[$sensor_name]['uri'], Url::fromUri('base://monitoring-sensor/' . $sensor_config->getName(), array('absolute' => TRUE))->toString());
if ($sensor_config->isDefiningThresholds()) {
$this->assertEqual($response_data[$sensor_name]['thresholds'], $sensor_config->getSetting('thresholds'));
@@ -95,11 +95,11 @@ class MonitoringServicesTest extends RESTTestBase {
}
$sensor_name = 'sensor_that_does_not_exist';
- $this->doRequest('monitoring-sensor-info/' . $sensor_name);
+ $this->doRequest('monitoring-sensor/' . $sensor_name);
$this->assertResponse(404);
$sensor_name = 'dblog_event_severity_error';
- $response_data = $this->doRequest('monitoring-sensor-info/' . $sensor_name);
+ $response_data = $this->doRequest('monitoring-sensor/' . $sensor_name);
$this->assertResponse(200);
$sensor_config = SensorConfig::load($sensor_name);
$this->assertEqual($response_data['sensor'], $sensor_config->getName());
@@ -111,7 +111,7 @@ class MonitoringServicesTest extends RESTTestBase {
$this->assertEqual($response_data['caching_time'], $sensor_config->getCachingTime());
$this->assertEqual($response_data['time_interval'], $sensor_config->getTimeIntervalValue());
$this->assertEqual($response_data['enabled'], $sensor_config->isEnabled());
- $this->assertEqual($response_data['uri'], Url::fromUri('base://monitoring-sensor-info/' . $sensor_config->getName(), array('absolute' => TRUE))->toString());
+ $this->assertEqual($response_data['uri'], Url::fromUri('base://monitoring-sensor/' . $sensor_config->getName(), array('absolute' => TRUE))->toString());
if ($sensor_config->isDefiningThresholds()) {
$this->assertEqual($response_data['thresholds'], $sensor_config->getSetting('thresholds'));
@@ -125,10 +125,10 @@ class MonitoringServicesTest extends RESTTestBase {
$this->drupalLogin($this->servicesAccount);
// Test request for sensor results with expanded sensor config.
- $response_data = $this->doRequest('monitoring-sensor-result', array('expand' => 'sensor_info'));
+ $response_data = $this->doRequest('monitoring-sensor-result', array('expand' => 'sensor'));
$this->assertResponse(200);
foreach (monitoring_sensor_manager()->getEnabledSensorConfig() as $sensor_name => $sensor_config) {
- $this->assertTrue(isset($response_data[$sensor_name]['sensor_info']));
+ $this->assertTrue(isset($response_data[$sensor_name]['sensor']));
$this->assertSensorResult($response_data[$sensor_name], $sensor_config);
}
@@ -137,7 +137,7 @@ class MonitoringServicesTest extends RESTTestBase {
$response_data = $this->doRequest('monitoring-sensor-result');
$this->assertResponse(200);
$sensor_result = reset($response_data);
- $this->assertTrue(!isset($sensor_result['sensor_info']));
+ $this->assertTrue(!isset($sensor_result['sensor']));
// Make sure the response contains expected count of results.
$this->assertEqual(count($response_data), count(monitoring_sensor_manager()->getEnabledSensorConfig()));
@@ -154,17 +154,17 @@ class MonitoringServicesTest extends RESTTestBase {
$this->assertResponse(404);
$sensor_name = 'dblog_event_severity_error';
- $response_data = $this->doRequest('monitoring-sensor-result/' . $sensor_name, array('expand' => 'sensor_info'));
+ $response_data = $this->doRequest('monitoring-sensor-result/' . $sensor_name, array('expand' => 'sensor'));
$this->assertResponse(200);
- // The response must contain the sensor_info.
- $this->assertTrue(isset($response_data['sensor_info']));
+ // The response must contain the sensor_config.
+ $this->assertTrue(isset($response_data['sensor']));
$this->assertSensorResult($response_data, SensorConfig::load($sensor_name));
// Try a request without expanding the sensor config and check that it is not
// present.
$response_data = $this->doRequest('monitoring-sensor-result/' . $sensor_name);
$this->assertResponse(200);
- $this->assertTrue(!isset($response_data['sensor_info']));
+ $this->assertTrue(!isset($response_data['sensor']));
}
/**
@@ -173,7 +173,7 @@ class MonitoringServicesTest extends RESTTestBase {
* @param array $response_result
* Result received via response.
* @param \Drupal\monitoring\Entity\SensorConfig $sensor_config
- * Sensor config for which we have the result.
+ * SensorPlugin config for which we have the result.
*/
protected function assertSensorResult($response_result, SensorConfig $sensor_config) {
$this->assertEqual($response_result['sensor_name'], $sensor_config->getName());
@@ -195,8 +195,8 @@ class MonitoringServicesTest extends RESTTestBase {
$this->assertEqual($response_result['execution_time'], $result->getExecutionTime());
}
- if (isset($response_result['sensor_info'])) {
- $this->assertEqual($response_result['sensor_info'], $sensor_config->toArray());
+ if (isset($response_result['sensor'])) {
+ $this->assertEqual($response_result['sensor'], $sensor_config->toArray());
}
}
diff --git a/src/Tests/MonitoringUITest.php b/src/Tests/MonitoringUITest.php
index 33bd380..a8052ac 100644
--- a/src/Tests/MonitoringUITest.php
+++ b/src/Tests/MonitoringUITest.php
@@ -61,10 +61,10 @@ class MonitoringUITest extends MonitoringTestBase {
$this->drupalGet('admin/config/system/monitoring/sensors/non_existing_sensor');
$this->assertResponse(404);
- // Tests the fields 'Sensor Plugin' & 'Entity Type' appear.
+ // Tests the fields 'SensorPlugin Plugin' & 'Entity Type' appear.
$this->drupalGet('admin/config/system/monitoring/sensors/user_new');
$this->assertOptionSelected('edit-settings-old-entity-type', 'user');
- $this->assertText('Sensor Plugin');
+ $this->assertText('SensorPlugin Plugin');
$this->assertText('Entity Aggregator');
}
@@ -80,22 +80,22 @@ class MonitoringUITest extends MonitoringTestBase {
$this->assertFieldByName('status', TRUE);
$this->drupalPostForm('admin/config/system/monitoring/sensors/add', array(
- 'label' => 'UI created Sensor',
- 'description' => 'Sensor created to test UI',
+ 'label' => 'UI created SensorPlugin',
+ 'description' => 'SensorPlugin created to test UI',
'id' => 'ui_test_sensor',
'value_label' => 'Test Value',
'caching_time' => 100,
'sensor_id' => 'entity_aggregator',
), t('Select sensor'));
- $this->assertText('Sensor plugin settings');
+ $this->assertText('SensorPlugin plugin settings');
$this->drupalPostForm(NULL, array(
'settings[aggregation][time_interval_value]' => 86400,
'settings[entity_type]' => 'field_storage_config',
'settings[conditions][0][field]' => 'type',
'settings[conditions][0][value]' => 'message',
), t('Save'));
- $this->assertText('Sensor settings saved.');
+ $this->assertText('SensorPlugin settings saved.');
$this->drupalGet('admin/config/system/monitoring/sensors/ui_test_sensor');
$this->assertFieldByName('caching_time', 100);
@@ -104,13 +104,13 @@ class MonitoringUITest extends MonitoringTestBase {
$this->drupalGet('admin/config/system/monitoring/sensors/ui_test_sensor/delete');
$this->assertText('This action cannot be undone.');
$this->drupalPostForm(NULL, array(), t('Delete'));
- $this->assertText('Sensor UI created Sensor has been deleted.');
+ $this->assertText('SensorPlugin UI created SensorPlugin has been deleted.');
$this->drupalGet('admin/config/system/monitoring/sensors/add');
$this->drupalPostForm('admin/config/system/monitoring/sensors/add', array(
- 'label' => 'UI created Sensor config',
- 'description' => 'Sensor created to test UI',
+ 'label' => 'UI created SensorPlugin config',
+ 'description' => 'SensorPlugin created to test UI',
'id' => 'ui_test_sensor_config',
'value_label' => 'Test Value',
'caching_time' => 100,
@@ -120,12 +120,12 @@ class MonitoringUITest extends MonitoringTestBase {
$this->assertText('Expected value');
- $this->assertText('Sensor plugin settings');
+ $this->assertText('SensorPlugin plugin settings');
$this->drupalPostForm(NULL, array(
'settings[key]' => 'threshold.autorun',
'settings[config]' => 'system.cron',
), t('Save'));
- $this->assertText('Sensor settings saved.');
+ $this->assertText('SensorPlugin settings saved.');
// Go back to the sensor edit page,
// Check the value type is properly selected.
@@ -197,7 +197,7 @@ class MonitoringUITest extends MonitoringTestBase {
}
/**
- * Sensor over page tests coverage.
+ * SensorPlugin over page tests coverage.
*/
public function testSensorOverviewPage() {
$account = $this->drupalCreateUser(array('monitoring reports'));
@@ -220,7 +220,7 @@ class MonitoringUITest extends MonitoringTestBase {
// Test if the Test sensor is listed as the oldest cached. We do not test
// for the cached time as such test contains a risk of random fail.
- $this->assertRaw(String::format('Sensor %sensor (%category) cached before', array('%sensor' => 'Test sensor', '%category' => 'Test')));
+ $this->assertRaw(String::format('SensorPlugin %sensor (%category) cached before', array('%sensor' => 'Test sensor', '%category' => 'Test')));
// Test the action buttons are clickable.
$this->assertLink(t('Details'));
@@ -449,7 +449,7 @@ class MonitoringUITest extends MonitoringTestBase {
'warning' => 6,
);
$this->submitThresholdSettings('test_sensor_exceeds', $thresholds);
- $this->assertText(t('Sensor settings saved.'));
+ $this->assertText(t('SensorPlugin settings saved.'));
$this->assertThresholdSettingsUIDefaults('test_sensor_exceeds', $thresholds);
// Make sure that it is possible to save empty thresholds.
@@ -458,7 +458,7 @@ class MonitoringUITest extends MonitoringTestBase {
'warning' => '',
);
$this->submitThresholdSettings('test_sensor_exceeds', $thresholds);
- $this->assertText(t('Sensor settings saved.'));
+ $this->assertText(t('SensorPlugin settings saved.'));
$this->assertThresholdSettingsUIDefaults('test_sensor_exceeds', $thresholds);
monitoring_sensor_manager()->resetCache();
@@ -501,7 +501,7 @@ class MonitoringUITest extends MonitoringTestBase {
'warning' => 11,
);
$this->submitThresholdSettings('test_sensor_falls', $thresholds);
- $this->assertText(t('Sensor settings saved.'));
+ $this->assertText(t('SensorPlugin settings saved.'));
$this->assertThresholdSettingsUIDefaults('test_sensor_falls', $thresholds);
// Make sure that it is possible to save empty thresholds.
@@ -510,7 +510,7 @@ class MonitoringUITest extends MonitoringTestBase {
'warning' => '',
);
$this->submitThresholdSettings('test_sensor_falls', $thresholds);
- $this->assertText(t('Sensor settings saved.'));
+ $this->assertText(t('SensorPlugin settings saved.'));
$this->assertThresholdSettingsUIDefaults('test_sensor_falls', $thresholds);
// Test validation.
@@ -550,7 +550,7 @@ class MonitoringUITest extends MonitoringTestBase {
'warning_high' => 15,
);
$this->submitThresholdSettings('test_sensor_inner', $thresholds);
- $this->assertText(t('Sensor settings saved.'));
+ $this->assertText(t('SensorPlugin settings saved.'));
$this->assertThresholdSettingsUIDefaults('test_sensor_inner', $thresholds);
// Make sure that it is possible to save empty inner thresholds.
@@ -561,7 +561,7 @@ class MonitoringUITest extends MonitoringTestBase {
'warning_high' => '',
);
$this->submitThresholdSettings('test_sensor_inner', $thresholds);
- $this->assertText(t('Sensor settings saved.'));
+ $this->assertText(t('SensorPlugin settings saved.'));
$this->assertThresholdSettingsUIDefaults('test_sensor_inner', $thresholds);
// Test validation.
@@ -627,7 +627,7 @@ class MonitoringUITest extends MonitoringTestBase {
'warning_high' => 14,
);
$this->submitThresholdSettings('test_sensor_outer', $thresholds);
- $this->assertText(t('Sensor settings saved.'));
+ $this->assertText(t('SensorPlugin settings saved.'));
$this->assertThresholdSettingsUIDefaults('test_sensor_outer', $thresholds);
// Make sure that it is possible to save empty outer thresholds.
@@ -638,7 +638,7 @@ class MonitoringUITest extends MonitoringTestBase {
'warning_high' => '',
);
$this->submitThresholdSettings('test_sensor_outer', $thresholds);
- $this->assertText(t('Sensor settings saved.'));
+ $this->assertText(t('SensorPlugin settings saved.'));
$this->assertThresholdSettingsUIDefaults('test_sensor_outer', $thresholds);
// Test validation.