diff --git a/src/etc/inc/plugins.inc.d/dpinger.inc b/src/etc/inc/plugins.inc.d/dpinger.inc index a8f90a017..1800b2cf3 100644 --- a/src/etc/inc/plugins.inc.d/dpinger.inc +++ b/src/etc/inc/plugins.inc.d/dpinger.inc @@ -69,12 +69,11 @@ function dpinger_services() function dpinger_defaults() { return [ - 'alert_interval' => '1', 'data_length' => '0', 'interval' => '1', 'latencyhigh' => '500', 'latencylow' => '200', - 'loss_interval' => '2', + 'loss_interval' => '4', 'losshigh' => '20', 'losslow' => '10', 'time_period' => '60', @@ -286,9 +285,6 @@ function dpinger_configure_do($verbose = false, $gwname = null, $bootup = false) 'interval' => '-s %ss ', 'loss_interval' => '-l %ss ', 'time_period' => '-t %ss ', - 'alert_interval' => '-A %ss ', - 'latencyhigh' => '-D %s ', - 'losshigh' => '-L %s ', 'data_length' => '-d %s ' ] as $pname => $ppattern ) { diff --git a/src/www/system_gateways_edit.php b/src/www/system_gateways_edit.php index 05fe10685..daadd3ae3 100644 --- a/src/www/system_gateways_edit.php +++ b/src/www/system_gateways_edit.php @@ -249,12 +249,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { $input_errors[] = gettext("The probe interval needs to be positive."); } - if (!is_numeric($dpinger_config['alert_interval'])) { - $input_errors[] = gettext("The alert interval needs to be a numeric value."); - } elseif ($dpinger_config['alert_interval'] < 1) { - $input_errors[] = gettext("The alert interval needs to be positive."); - } - if (!is_numeric($dpinger_config['data_length'])) { $input_errors[] = gettext("The data length needs to be a numeric value."); } elseif ($dpinger_config['data_length'] < 0) { @@ -324,7 +318,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { $gateway['defaultgw'] = ($pconfig['defaultgw'] == "yes" || $pconfig['defaultgw'] == "on"); - foreach (array('alert_interval', 'latencylow', 'latencyhigh', 'loss_interval', 'losslow', 'losshigh', 'time_period', 'data_length') as $fieldname) { + foreach (['latencylow', 'latencyhigh', 'loss_interval', 'losslow', 'losshigh', 'time_period', 'data_length'] as $fieldname) { if (!empty($pconfig[$fieldname])) { $gateway[$fieldname] = $pconfig[$fieldname]; } @@ -404,7 +398,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { 'monitor_noroute', 'name', 'weight', - 'alert_interval', 'data_length', 'time_period', 'loss_interval', @@ -451,7 +444,7 @@ $( document ).ready(function() { // (un)hide advanced on form load when any advanced setting is provided 1) || (!empty($pconfig['interval']) && ($pconfig['interval'] > $dpinger_default['interval'])) || (!empty($pconfig['alert_interval']) && ($pconfig['alert_interval'] > $dpinger_default['alert_interval'])) || (!empty($pconfig['time_period']) && ($pconfig['time_period'] > $dpinger_default['time_period'])) || (!empty($pconfig['loss_interval']) && ($pconfig['loss_interval'] > $dpinger_default['loss_interval'])))): ?> + if ((!empty($pconfig['latencylow']) || !empty($pconfig['latencyhigh']) || !empty($pconfig['data_length']) || !empty($pconfig['losslow']) || !empty($pconfig['losshigh']) || (isset($pconfig['weight']) && $pconfig['weight'] > 1) || (!empty($pconfig['interval']) && ($pconfig['interval'] > $dpinger_default['interval'])) || (!empty($pconfig['time_period']) && ($pconfig['time_period'] > $dpinger_default['time_period'])) || (!empty($pconfig['loss_interval']) && ($pconfig['loss_interval'] > $dpinger_default['loss_interval'])))): ?> $("#btn_advanced").click(); @@ -701,15 +694,6 @@ $( document ).ready(function() { - - - - - - - @@ -725,7 +709,7 @@ $( document ).ready(function() {