From b43132c75a89f81e80c96a02df632260cb7dbcf4 Mon Sep 17 00:00:00 2001 From: garnier-quentin Date: Tue, 29 Oct 2019 15:40:07 +0100 Subject: [PATCH] enhance indent --- apps/centreon/local/mode/retentionbroker.pm | 20 +++--- apps/centreon/sql/mode/countproblems.pm | 75 ++++++++++++--------- apps/centreon/sql/mode/countservices.pm | 13 ++-- 3 files changed, 61 insertions(+), 47 deletions(-) diff --git a/apps/centreon/local/mode/retentionbroker.pm b/apps/centreon/local/mode/retentionbroker.pm index 1ae0d6968..e34ec8971 100644 --- a/apps/centreon/local/mode/retentionbroker.pm +++ b/apps/centreon/local/mode/retentionbroker.pm @@ -32,10 +32,10 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options); bless $self, $class; - $options{options}->add_options(arguments => - { - "broker-config:s@" => { name => 'broker_config' }, - }); + $options{options}->add_options(arguments => { + 'broker-config:s@' => { name => 'broker_config' }, + }); + return $self; } @@ -82,8 +82,10 @@ sub run { $self->{output}->output_add(long_msg => "Checking config '$config'"); if (! -f $config or ! -r $config) { - $self->{output}->output_add(severity => 'UNKNOWN', - short_msg => "'$config': not a file or cannot be read"); + $self->{output}->output_add( + severity => 'UNKNOWN', + short_msg => "'$config': not a file or cannot be read" + ); next; } @@ -93,8 +95,10 @@ sub run { $xml = $parser->parse_file($config); }; if ($@) { - $self->{output}->output_add(severity => 'UNKNOWN', - short_msg => "'$config': cannot parse xml"); + $self->{output}->output_add( + severity => 'UNKNOWN', + short_msg => "'$config': cannot parse xml" + ); next; } my %failover_found = (); diff --git a/apps/centreon/sql/mode/countproblems.pm b/apps/centreon/sql/mode/countproblems.pm index bca184e7b..733c5ed8c 100644 --- a/apps/centreon/sql/mode/countproblems.pm +++ b/apps/centreon/sql/mode/countproblems.pm @@ -31,14 +31,13 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options); bless $self, $class; - $options{options}->add_options(arguments => - { - "warning:s" => { name => 'warning' }, - "critical:s" => { name => 'critical' }, - "centreon-storage-database:s" => { name => 'centreon_storage_database', default => 'centreon_storage' }, - }); - $self->{statefile_cache} = centreon::plugins::statefile->new(%options); + $options{options}->add_options(arguments => { + 'warning:s' => { name => 'warning' }, + 'critical:s' => { name => 'critical' }, + 'centreon-storage-database:s' => { name => 'centreon_storage_database', default => 'centreon_storage' }, + }); + $self->{statefile_cache} = centreon::plugins::statefile->new(%options); return $self; } @@ -68,10 +67,12 @@ sub execute { my $total_problems_by_poller = {}; while ((my $row = $self->{sql}->fetchrow_hashref())) { if (!defined($total_problems_by_poller->{$row->{name}})) { - $total_problems_by_poller->{$row->{name}} = { '0_1' => { label_perf => 'host_down', label => 'host down', num => 0 }, - '1_1' => { label_perf => 'service_warning', label => 'service warning', num => 0 }, - '1_2' => { label_perf => 'service_critical', label => 'service critical', num => 0 }, - '1_3' => { label_perf => 'service_unknown', label => 'service unknown', num => 0 }}; + $total_problems_by_poller->{$row->{name}} = { + '0_1' => { label_perf => 'host_down', label => 'host down', num => 0 }, + '1_1' => { label_perf => 'service_warning', label => 'service warning', num => 0 }, + '1_2' => { label_perf => 'service_critical', label => 'service critical', num => 0 }, + '1_3' => { label_perf => 'service_unknown', label => 'service unknown', num => 0 } + }; } if ($row->{num} != 0 && defined($total_problems_by_poller->{$row->{name}}->{$row->{msg_type} . '_' . $row->{status}})) { @@ -84,40 +85,50 @@ sub execute { $total_problems->{total} += $row->{num}; } } - + $self->{output}->output_add(long_msg => sprintf("%d total hosts problems", $total_problems->{services})); $self->{output}->output_add(long_msg => sprintf("%d total services problems", $total_problems->{services})); foreach my $poller (sort keys %{$total_problems_by_poller}) { foreach my $id (sort keys %{$total_problems_by_poller->{$poller}}) { - $self->{output}->output_add(long_msg => sprintf("%d %s problems on %s", - $total_problems_by_poller->{$poller}->{$id}->{num}, - $total_problems_by_poller->{$poller}->{$id}->{label}, - $poller)); - $self->{output}->perfdata_add(label => $total_problems_by_poller->{$poller}->{$id}->{label_perf} . "_" . $poller, - value => $total_problems_by_poller->{$poller}->{$id}->{num}, - min => 0); + $self->{output}->output_add( + long_msg => sprintf( + "%d %s problems on %s", + $total_problems_by_poller->{$poller}->{$id}->{num}, + $total_problems_by_poller->{$poller}->{$id}->{label}, + $poller + ) + ); + $self->{output}->perfdata_add( + label => $total_problems_by_poller->{$poller}->{$id}->{label_perf} . "_" . $poller, + value => $total_problems_by_poller->{$poller}->{$id}->{num}, + min => 0 + ); } } - + my $exit_code = $self->{perfdata}->threshold_check(value => $total_problems->{total}, threshold => [ { label => 'critical', exit_litteral => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]); $self->{output}->output_add(severity => $exit_code, short_msg => sprintf("%d total problems", $total_problems->{total})); - $self->{output}->perfdata_add(label => 'total', - value => $total_problems->{total}, - warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning'), - critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical'), - min => 0); - $self->{output}->perfdata_add(label => 'total_hosts', - value => $total_problems->{hosts}, - min => 0); - $self->{output}->perfdata_add(label => 'total_services', - value => $total_problems->{services}, - min => 0); + $self->{output}->perfdata_add( + label => 'total', + value => $total_problems->{total}, + warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning'), + critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical'), + min => 0 + ); + $self->{output}->perfdata_add( + label => 'total_hosts', + value => $total_problems->{hosts}, + min => 0); + $self->{output}->perfdata_add( + label => 'total_services', + value => $total_problems->{services}, + min => 0 + ); } sub run { my ($self, %options) = @_; - # $options{sql} = sqlmode object $self->{sql} = $options{sql}; $self->{statefile_cache}->read(statefile => 'sql_' . $self->{mode} . '_' . $self->{sql}->get_unique_id4save()); diff --git a/apps/centreon/sql/mode/countservices.pm b/apps/centreon/sql/mode/countservices.pm index 2913a2483..745479e8a 100644 --- a/apps/centreon/sql/mode/countservices.pm +++ b/apps/centreon/sql/mode/countservices.pm @@ -65,12 +65,11 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options); bless $self, $class; - $options{options}->add_options(arguments => - { - "filter-poller:s" => { name => 'filter_poller' }, - "centreon-storage-database:s" => { name => 'centreon_storage_database', default => 'centreon_storage' }, - }); - + $options{options}->add_options(arguments => { + 'filter-poller:s' => { name => 'filter_poller' }, + 'centreon-storage-database:s' => { name => 'centreon_storage_database', default => 'centreon_storage' }, + }); + return $self; } @@ -78,7 +77,7 @@ sub manage_selection { my ($self, %options) = @_; my $query = "SELECT instances.name, COUNT(DISTINCT hosts.host_id) as num_hosts, count(DISTINCT services.host_id, services.service_id) as num_services - FROM " . $self->{option_results}->{centreon_storage_database} . ".instances, " . $self->{option_results}->{centreon_storage_database} . ".hosts, " . $self->{option_results}->{centreon_storage_database} . ".services WHERE instances.running = '1' AND instances.instance_id = hosts.instance_id AND hosts.enabled = '1' AND hosts.host_id = services.host_id AND services.enabled = '1' GROUP BY hosts.instance_id"; + FROM " . $self->{option_results}->{centreon_storage_database} . ".instances, " . $self->{option_results}->{centreon_storage_database} . ".hosts, " . $self->{option_results}->{centreon_storage_database} . ".services WHERE instances.running = '1' AND instances.instance_id = hosts.instance_id AND hosts.enabled = '1' AND hosts.host_id = services.host_id AND services.enabled = '1' GROUP BY hosts.instance_id"; $options{sql}->connect(); $options{sql}->query(query => $query);