From 69f07b42813cb2552727d4c3a9d054913641ea20 Mon Sep 17 00:00:00 2001 From: qgarnier Date: Wed, 22 Dec 2021 13:10:14 +0100 Subject: [PATCH] clean(plugin): some mode missing + update check_plugins script (#3337) --- centreon-plugins/apps/kingdee/eas/plugin.pm | 3 +-- .../management/applicationinsights/plugin.pm | 3 +-- centreon-plugins/contrib/check_plugins.pl | 24 ++++++++++++++++++- centreon-plugins/os/linux/local/mode/quota.pm | 3 --- 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/centreon-plugins/apps/kingdee/eas/plugin.pm b/centreon-plugins/apps/kingdee/eas/plugin.pm index 8ba32ca5c..3d877681f 100644 --- a/centreon-plugins/apps/kingdee/eas/plugin.pm +++ b/centreon-plugins/apps/kingdee/eas/plugin.pm @@ -40,14 +40,13 @@ sub new { 'oraclejvmgc' => 'apps::kingdee::eas::mode::oraclejvmgc', 'ibmjvmgc' => 'apps::kingdee::eas::mode::ibmjvmgc', 'ormrpc' => 'apps::kingdee::eas::mode::ormrpc', - 'easlicense' => 'apps::kingdee::eas::mode::easlicense', 'activeusers' => 'apps::kingdee::eas::mode::activeusers', 'oracleversion' => 'apps::kingdee::eas::mode::oracleversion', 'oraclesession' => 'apps::kingdee::eas::mode::oraclesession', 'oracletable' => 'apps::kingdee::eas::mode::oracletable', 'oraclerecyclebin' => 'apps::kingdee::eas::mode::oraclerecyclebin', 'oracleksqltemptable' => 'apps::kingdee::eas::mode::oracleksqltemptable', - 'oracleredolog' => 'apps::kingdee::eas::mode::oracleredolog', + 'oracleredolog' => 'apps::kingdee::eas::mode::oracleredolog' ); $self->{custom_modes}{api} = 'apps::kingdee::eas::custom::api'; diff --git a/centreon-plugins/cloud/azure/management/applicationinsights/plugin.pm b/centreon-plugins/cloud/azure/management/applicationinsights/plugin.pm index ae64beab5..208531aa8 100644 --- a/centreon-plugins/cloud/azure/management/applicationinsights/plugin.pm +++ b/centreon-plugins/cloud/azure/management/applicationinsights/plugin.pm @@ -38,10 +38,9 @@ sub new { 'exceptions' => 'cloud::azure::management::applicationinsights::mode::exceptions', 'external-calls' => 'cloud::azure::management::applicationinsights::mode::externalcalls', 'io-operations' => 'cloud::azure::management::applicationinsights::mode::iooperations', - 'health' => 'cloud::azure::management::applicationinsights::mode::health', 'memory' => 'cloud::azure::management::applicationinsights::mode::memory', 'page-views' => 'cloud::azure::management::applicationinsights::mode::pageviews', - 'requests' => 'cloud::azure::management::applicationinsights::mode::requests', + 'requests' => 'cloud::azure::management::applicationinsights::mode::requests' }; $self->{custom_modes}->{azcli} = 'cloud::azure::custom::azcli'; diff --git a/centreon-plugins/contrib/check_plugins.pl b/centreon-plugins/contrib/check_plugins.pl index ce3fc127e..03e6b559d 100755 --- a/centreon-plugins/contrib/check_plugins.pl +++ b/centreon-plugins/contrib/check_plugins.pl @@ -38,6 +38,22 @@ sub check_directory { closedir $dh; } +sub check_custommode { + my (%options) = @_; + + my $cmodes = `$options{bin} --plugin=$options{plugin} --list-custommode`; + if ($cmodes !~ /Custom Modes Available:\n(.*)/ms) { + print " mode: $options{mode}, result=$cmodes"; + return ; + } + + foreach my $cmode (split /\n/, $1) { + $cmode =~ s/\s+//g; + my $result = `$options{bin} --plugin=$options{plugin} --custommode=$cmode --mode=$options{mode}`; + print " mode: $options{mode}, custommode: $cmode, result=$result"; + } +} + my $plugin = "$FindBin::Bin/../centreon_plugins.pl"; check_directory("$FindBin::Bin/.."); @@ -49,11 +65,17 @@ foreach my $plugin_path (@$plugins) { foreach my $mode (split /\n/, $1) { $mode =~ s/\s+//g; my $result = `$plugin --plugin=$plugin_path --mode=$mode`; - print " mode: $mode, result=$result"; + if ($result =~ /Need to specify '--custommode'/i) { + check_custommode(bin => $plugin, plugin => $plugin_path, mode => $mode); + } else { + print " mode: $mode, result=$result"; + } } } else { print "error: $modes\n"; } + + print "\n"; } exit(0); diff --git a/centreon-plugins/os/linux/local/mode/quota.pm b/centreon-plugins/os/linux/local/mode/quota.pm index 1cebd1425..4ab606f25 100644 --- a/centreon-plugins/os/linux/local/mode/quota.pm +++ b/centreon-plugins/os/linux/local/mode/quota.pm @@ -203,9 +203,6 @@ sub manage_selection { } if (scalar(keys %{$self->{quota}}) <= 0) { - if ($exit_code != 0) { - $self->{output}->output_add(long_msg => "command output:" . $stdout); - } $self->{output}->add_option_msg(short_msg => "No quota found (filters or command issue)"); $self->{output}->option_exit(); }