From 08c9d63ca0eaa59cd6209e3c06394de466d42b50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Duret?=
 <sduret@MRTHS-PORT-A027.merethis.net>
Date: Wed, 9 Jul 2014 15:42:12 +0200
Subject: [PATCH] refs #5673 delete exclude option

---
 hardware/ups/eaton/mode/group.pm  | 11 +----------
 hardware/ups/eaton/mode/outlet.pm | 12 +-----------
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/hardware/ups/eaton/mode/group.pm b/hardware/ups/eaton/mode/group.pm
index 0c8e72711..fa0a4f8e7 100644
--- a/hardware/ups/eaton/mode/group.pm
+++ b/hardware/ups/eaton/mode/group.pm
@@ -80,7 +80,6 @@ sub new {
     $self->{version} = '1.0';
     $options{options}->add_options(arguments =>
                                 {
-				 "exclude:s"        => { name => 'exclude', }, 
                                 });
     foreach (keys %{$maps_counters}) {
         foreach my $name (keys %{$maps_counters->{$_}->{thresholds}}) {
@@ -152,7 +151,6 @@ sub run {
         my @exits;
         foreach (keys %{$maps_counters}) {
             foreach my $name (keys %{$maps_counters->{$_}->{thresholds}}) {
-	    	next if (defined($self->{option_results}->{exclude}) && $self->{option_results}->{exclude} ne '' && $_ =~ /$self->{option_results}->{exclude}/);
                 if (defined($self->{counters_value}->{$instance}->{$_}) && $self->{counters_value}->{$instance}->{$_} != 0) {
                     push @exits, $self->{perfdata}->threshold_check(value => $self->{counters_value}->{$instance}->{$_}*$maps_counters->{$_}->{factor}, threshold => [ { label => $maps_counters->{$_}->{thresholds}->{$name}->{label}, 'exit_litteral' => $maps_counters->{$_}->{thresholds}->{$name}->{exit_value} }]);
                 }
@@ -166,8 +164,7 @@ sub run {
         my $str_output = "Group '$instance_output' ";
         my $str_append = '';
         foreach (keys %{$maps_counters}) {
-            next if (!defined($self->{counters_value}->{$instance}->{$_}));
-	    next if (defined($self->{option_results}->{exclude}) && $self->{option_results}->{exclude} ne '' && $_ =~ /$self->{option_results}->{exclude}/);
+	    next if (!defined($self->{counters_value}->{$instance}->{$_}) || $self->{counters_value}->{$instance}->{$_} == 0);
             
             $str_output .= $str_append . sprintf($maps_counters->{$_}->{output_msg}, $self->{counters_value}->{$instance}->{$_} * $maps_counters->{$_}->{factor});
             $str_append = ', ';
@@ -210,12 +207,6 @@ Can be: 'voltage', 'current', 'power'.
 Threshold critical.
 Can be: 'voltage', 'current', 'power'.
 
-=item B<--exclude>
-
-Metrics excluded.
-Can be: 'voltage', 'current', 'power'.
-Use | if you want to exclude two or more metrics.
-
 =back
 
 =cut
diff --git a/hardware/ups/eaton/mode/outlet.pm b/hardware/ups/eaton/mode/outlet.pm
index 7bba6582a..214f5f6f5 100644
--- a/hardware/ups/eaton/mode/outlet.pm
+++ b/hardware/ups/eaton/mode/outlet.pm
@@ -80,7 +80,6 @@ sub new {
     $self->{version} = '1.0';
     $options{options}->add_options(arguments =>
                                 {
-                                 "exclude:s"        => { name => 'exclude', },
                                 });
     foreach (keys %{$maps_counters}) {
         foreach my $name (keys %{$maps_counters->{$_}->{thresholds}}) {
@@ -156,7 +155,6 @@ sub run {
         my @exits;
         foreach (keys %{$maps_counters}) {
             foreach my $name (keys %{$maps_counters->{$_}->{thresholds}}) {
-		next if (defined($self->{option_results}->{exclude}) && $self->{option_results}->{exclude} ne '' && $_ =~ /$self->{option_results}->{exclude}/);
                 if (defined($self->{counters_value}->{$instance}->{$_}) && $self->{counters_value}->{$instance}->{$_} != 0) {
                     push @exits, $self->{perfdata}->threshold_check(value => $self->{counters_value}->{$instance}->{$_}*$maps_counters->{$_}->{factor}, threshold => [ { label => $maps_counters->{$_}->{thresholds}->{$name}->{label}, 'exit_litteral' => $maps_counters->{$_}->{thresholds}->{$name}->{exit_value} }]);
                 }
@@ -170,9 +168,7 @@ sub run {
         my $str_output = "Outlet '$instance_output' ";
         my $str_append = '';
         foreach (keys %{$maps_counters}) {
-            #next if (!defined($self->{counters_value}->{$instance}->{$_}) || $self->{counters_value}->{$instance}->{$_} == 0);
-            next if (!defined($self->{counters_value}->{$instance}->{$_}));
-	    next if (defined($self->{option_results}->{exclude}) && $self->{option_results}->{exclude} ne '' && $_ =~ /$self->{option_results}->{exclude}/);
+            next if (!defined($self->{counters_value}->{$instance}->{$_})) || $self->{counters_value}->{$instance}->{$_} == 0);
             
             $str_output .= $str_append . sprintf($maps_counters->{$_}->{output_msg}, $self->{counters_value}->{$instance}->{$_} * $maps_counters->{$_}->{factor});
             $str_append = ', ';
@@ -215,12 +211,6 @@ Can be: 'voltage', 'current', 'power'.
 Threshold critical.
 Can be: 'voltage', 'current', 'power'.
 
-=item B<--exclude>
-
-Metrics excluded.
-Can be: 'voltage', 'current', 'power'.
-Use | if you want to exclude two or more metrics.
-
 =back
 
 =cut