Commit 7ec98e40 authored by sleitner's avatar sleitner Committed by Christian Bläul
Browse files

Issue #3295094 by Ben Coleman,sleitner: Way to ignore certain requirements test

parent a2b68b96

config/install/nagios.settings.yml

+3 −0
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ nagios: 
    controller: '\Drupal\nagios\Controller\StatuspageController::content'

    getparam: FALSE

  show_outdated_names: TRUE

  experimental_modules: TRUE

  deprecated_modules: TRUE

  deprecated_themes: TRUE

  limit_watchdog:

    display: FALSE

    channel_filter:

config/schema/nagios.schema.yml

+9 −0
Original line number Diff line number Diff line
@@ -49,6 +49,15 @@ nagios.settings: 
        show_outdated_names:

          type: boolean

          label: 'Show outdated module/theme name?'

        experimental_modules:

          type: boolean

          label: 'Show experimental modules enabled message'

        deprecated_modules:

          type: boolean

          label: 'Show deprecated modules enabled message'

        deprecated_themes:

          type: boolean

          label: 'Show deprecated themes enabled message'

        limit_watchdog:

          type: mapping

          label: 'Watchdog settings'

nagios.module

+19 −0
Original line number Diff line number Diff line
@@ -151,6 +151,25 @@ function nagios_nagios_settings() { 
    '#states' => ['disabled' => ['#edit-nagios-func-requirements' => ['checked' => FALSE]]],

  ];

  

  $form['nagios_experimental_modules'] = [

    '#type' => 'checkbox',

    '#title' => t('Show experimental modules enabled message'),

    '#default_value' => $config->get('nagios.experimental_modules'),

    '#configname' => 'experimental_modules',

  ];

  $form['nagios_deprecated_modules'] = [

    '#type' => 'checkbox',

    '#title' => t('Show deprecated modules enabled message'),

    '#default_value' => $config->get('nagios.deprecated_modules'),

    '#configname' => 'deprecated_modules',

  ];

  $form['nagios_deprecated_themes'] = [

    '#type' => 'checkbox',

    '#title' => t('Show deprecated themes enabled message'),

    '#default_value' => $config->get('nagios.deprecated_themes'),

    '#configname' => 'deprecated_themes',

  ];



  $group = 'thresholds';

  $form[$group] = [

    '#type' => 'fieldset',

src/Controller/RequirementsController.php

+9 −0
Original line number Diff line number Diff line
@@ -58,8 +58,17 @@ class RequirementsController { 
  public function findMostSevereProblem(): array {

    $descriptions = [];

    $min_severity = $this->config->get('nagios.min_report_severity');

    $experimental_modules = $this->config->get('nagios.experimental_modules');

    $deprecated_modules = $this->config->get('nagios.deprecated_modules');

    $deprecated_themes = $this->config->get('nagios.deprecated_themes');

    foreach ($this->reqs as $key => $requirement) {

      if (isset($requirement['severity'])) {

        if (($key == 'experimental_modules' && !$experimental_modules) 

        || ($key == 'deprecated_modules' && !$deprecated_modules) 

        || ($key == 'deprecated_themes' && !$deprecated_themes)) {

          continue;

        }



        // Ignore update_core warning if update check is pending:

        if (($key == 'update_core' || $key == 'update_contrib') && $requirement['severity'] == REQUIREMENT_ERROR && $requirement['reason'] == UpdateFetcherInterface::FETCH_PENDING) {

          continue;