diff --git a/status/lang/en b/status/lang/en index 325be0366..e5a03102c 100644 --- a/status/lang/en +++ b/status/lang/en @@ -63,7 +63,6 @@ type_raid=RAID Device Status type_iface=Network Interface Status type_init=Bootup Action type_sensors=LM Sensor Status -type_nut=NUT UPS Value type_mailq=Mail Queue Size type_dns=DNS Lookup type_query=SQL Query @@ -382,17 +381,6 @@ sensors_cur=$1 (currently $2 $3) sensors_emin=Missing or invalid minimum value sensors_emax=Missing or invalid maximum value -nut_ups=NUT UPS to check -nut_name=Attribute to check -nut_value=Failed when -nut_value1=Value is below $1 -nut_value2=Value is above $1 -nut_cmd=The command upsc is not installed on your system. This monitor requires the NUT package be installed and configured to operate. -nut_eups=No USP to check entered -nut_cur=$1 (currently $2) -nut_emin=Missing or invalid minimum value -nut_emax=Missing or invalid maximum value - mailq_system=Mail server mailq_qmailadmin=Qmail mailq_postfix=Postfix diff --git a/status/nut-monitor.pl b/status/nut-monitor.pl deleted file mode 100755 index d8d353ab6..000000000 --- a/status/nut-monitor.pl +++ /dev/null @@ -1,89 +0,0 @@ -# Check if some NUT value is too low or high - -sub get_nut_status -{ -return { 'up' => -1 } if (!&has_command("upsc")); -local @sens = &get_ups_values($_[0]->{'ups'}); -local ($sens) = grep { $_->{'name'} eq $_[0]->{'name'} } @sens; -return { 'up' => 1 } if (!$sens); -if ($_[0]->{'mode'} == 1) { - return $sens->{'value'} < $_[0]->{'min'} ? { 'up' => 0 } - : { 'up' => 1 }; - } -elsif ($_[0]->{'mode'} == 2) { - return $sens->{'value'} > $_[0]->{'max'} ? { 'up' => 0 } - : { 'up' => 1 }; - } -} - -sub show_nut_dialog -{ -if (!&has_command("upsc")) { - print &ui_table_row(undef, $text{'nut_cmd'}, 4); - } -else { - # UPS name - print &ui_table_row($text{'nut_ups'}, - &ui_textbox("ups", $_[0]->{'ups'}, 20)); - - # Value to check - local @sens = &get_ups_values(); - if (@sens) { - print &ui_table_row($text{'nut_name'}, - &ui_select("name", $_[0]->{'name'}, - [ map { [ $_->{'name'}, - &text('nut_cur', $_->{'name'}, $_->{'value'}) ] } - @sens ])); - } - else { - print &ui_table_row($text{'nut_name'}, - &ui_textbox("name", $_[0]->{'name'}, 20)); - } - - # Expected value - print &ui_table_row($text{'nut_value'}, - &ui_radio("mode", $_[0]->{'mode'} || 1, - [ [ 1, &text('sensors_value1', - &ui_textbox("min", $_[0]->{'min'}, 8)) ], - [ 2, &text('sensors_value2', - &ui_textbox("max", $_[0]->{'max'}, 8)) ] ]), - 3); - } -} - -sub parse_nut_dialog -{ -&has_command("upsc") || &error($text{'nut_cmd'}); -$in{'ups'} =~ /^\S+$/ || &error($text{'nut_eups'}); -$_[0]->{'ups'} = $in{'ups'}; -$_[0]->{'name'} = $in{'name'}; -$_[0]->{'mode'} = $in{'mode'}; -$_[0]->{'max'} = $in{'max'}; -$_[0]->{'min'} = $in{'min'}; -if ($in{'mode'} == 1) { - $in{'min'} =~ /^[0-9\.\+\-]+$/ || &error($text{'nut_emin'}); - } -elsif ($in{'mode'} == 2) { - $in{'max'} =~ /^[0-9\.\+\-]+$/ || &error($text{'nut_emax'}); - } -} - -# get_ups_values(ups) -# Returns a list of NUT attribute names and values for some UPS -sub get_ups_values -{ -if (!scalar(@get_ups_cache)) { - local @rv; - open(SENS, "upsc ".quotemeta($_[0])." 2>/dev/null |"); - while() { - if (/^(\S+):\s+(.*)/) { - push(@rv, { 'name' => $1, - 'value' => $2 }); - } - } - close(SENS); - @get_ups_cache = @rv; - } -return @get_ups_cache; -} -