tyler.durden/centreon-plugins
1
0
Fork 0
mirror of https://github.com/centreon/centreon-plugins.git synced 2025-07-28 16:14:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix #2690 (#2703)

Browse Source
This commit is contained in:
qgarnier 2021-04-12 08:51:54 +02:00 committed by GitHub
parent 5745b4649e
commit 75b0ebe2f1
2 changed files with 89 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
centreon-plugins/cloud/microsoft/office365/custom/graphapi.pm
View File

@ -239,9 +239,7 @@ sub request_api_csv {
} }
} }
if (!centreon::plugins::misc::minimal_version(Text::CSV->VERSION, '1.31')) { $content =~ s/^(?:\x{feff}|\x{ef}\x{bb}\x{bf})//;
$content =~ s/^\x{feff}//; # patched in Test-CSV 1.31
}
my $decoded = encode('UTF-8', $content); my $decoded = encode('UTF-8', $content);
my @rows; my @rows;

160
centreon-plugins/cloud/microsoft/office365/sharepoint/mode/siteusage.pm
View File

@ -38,11 +38,13 @@ sub custom_active_perfdata {
$self->{result_values}->{report_date} =~ /^([0-9]{4})-([0-9]{2})-([0-9]{2})$/; $self->{result_values}->{report_date} =~ /^([0-9]{4})-([0-9]{2})-([0-9]{2})$/;
$self->{output}->perfdata_add(label => 'perfdate', value => timelocal(0,0,12,$3,$2-1,$1-1900)); $self->{output}->perfdata_add(label => 'perfdate', value => timelocal(0,0,12,$3,$2-1,$1-1900));
$self->{output}->perfdata_add(label => 'active_sites', nlabel => 'sharepoint.sites.active.count', $self->{output}->perfdata_add(
value => $self->{result_values}->{active}, label => 'active_sites', nlabel => 'sharepoint.sites.active.count',
warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{label}, %total_options), value => $self->{result_values}->{active},
critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{label}, %total_options), warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{thlabel}, %total_options),
unit => 'sites', min => 0, max => $self->{result_values}->{total}); critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{thlabel}, %total_options),
unit => 'sites', min => 0, max => $self->{result_values}->{total}
);
} }
sub custom_active_threshold { sub custom_active_threshold {
@ -52,22 +54,26 @@ sub custom_active_threshold {
if ($self->{instance_mode}->{option_results}->{units} eq '%') { if ($self->{instance_mode}->{option_results}->{units} eq '%') {
$threshold_value = $self->{result_values}->{prct_active}; $threshold_value = $self->{result_values}->{prct_active};
} }
my $exit = $self->{perfdata}->threshold_check(value => $threshold_value, my $exit = $self->{perfdata}->threshold_check(
threshold => [ { label => 'critical-' . $self->{label}, exit_litteral => 'critical' }, value => $threshold_value,
{ label => 'warning-' . $self->{label}, exit_litteral => 'warning' } ]); threshold => [
{ label => 'critical-' . $self->{thlabel}, exit_litteral => 'critical' },
{ label => 'warning-' . $self->{thlabel}, exit_litteral => 'warning' }
]
);
return $exit; return $exit;
} }
sub custom_active_output { sub custom_active_output {
my ($self, %options) = @_; my ($self, %options) = @_;
my $msg = sprintf("Active sites on %s : %d/%d (%.2f%%)", return sprintf(
$self->{result_values}->{report_date}, 'Active sites on %s : %d/%d (%.2f%%)',
$self->{result_values}->{active}, $self->{result_values}->{report_date},
$self->{result_values}->{total}, $self->{result_values}->{active},
$self->{result_values}->{prct_active}); $self->{result_values}->{total},
return $msg; $self->{result_values}->{prct_active}
);
} }
sub custom_active_calc { sub custom_active_calc {
@ -87,12 +93,14 @@ sub custom_usage_perfdata {
my $extra_label = ''; my $extra_label = '';
$extra_label = '_' . $self->{result_values}->{display} if (!defined($options{extra_instance}) || $options{extra_instance} != 0); $extra_label = '_' . $self->{result_values}->{display} if (!defined($options{extra_instance}) || $options{extra_instance} != 0);
$self->{output}->perfdata_add(label => 'used' . $extra_label, nlabel => $self->{result_values}->{display} . '#sharepoint.sites.usage.bytes', $self->{output}->perfdata_add(
unit => 'B', label => 'used' . $extra_label, nlabel => $self->{result_values}->{display} . '#sharepoint.sites.usage.bytes',
value => $self->{result_values}->{used}, unit => 'B',
warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{label}, total => $self->{result_values}->{total}, cast_int => 1), value => $self->{result_values}->{used},
critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{label}, total => $self->{result_values}->{total}, cast_int => 1), warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{thlabel}, total => $self->{result_values}->{total}, cast_int => 1),
min => 0, max => $self->{result_values}->{total}); critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{thlabel}, total => $self->{result_values}->{total}, cast_int => 1),
min => 0, max => $self->{result_values}->{total}
);
} }
sub custom_usage_threshold { sub custom_usage_threshold {
@ -105,9 +113,13 @@ sub custom_usage_threshold {
$threshold_value = $self->{result_values}->{prct_used}; $threshold_value = $self->{result_values}->{prct_used};
$threshold_value = $self->{result_values}->{prct_free} if (defined($self->{instance_mode}->{option_results}->{free})); $threshold_value = $self->{result_values}->{prct_free} if (defined($self->{instance_mode}->{option_results}->{free}));
} }
$exit = $self->{perfdata}->threshold_check(value => $threshold_value, $exit = $self->{perfdata}->threshold_check(
threshold => [ { label => 'critical-' . $self->{label}, exit_litteral => 'critical' }, value => $threshold_value,
{ label => 'warning-' . $self->{label}, exit_litteral => 'warning' } ]); threshold => [
{ label => 'critical-' . $self->{thlabel}, exit_litteral => 'critical' },
{ label => 'warning-' . $self->{thlabel}, exit_litteral => 'warning' }
]
);
return $exit; return $exit;
} }
@ -118,11 +130,12 @@ sub custom_usage_output {
my ($free_value, $free_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{free}); my ($free_value, $free_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{free});
my ($total_value, $total_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{total}); my ($total_value, $total_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{total});
my $msg = sprintf("Total: %s Used: %s (%.2f%%) Free: %s (%.2f%%)", return sprintf(
$total_value . " " . $total_unit, 'Total: %s Used: %s (%.2f%%) Free: %s (%.2f%%)',
$used_value . " " . $used_unit, $self->{result_values}->{prct_used}, $total_value . " " . $total_unit,
$free_value . " " . $free_unit, $self->{result_values}->{prct_free}); $used_value . " " . $used_unit, $self->{result_values}->{prct_used},
return $msg; $free_value . " " . $free_unit, $self->{result_values}->{prct_free}
);
} }
sub custom_usage_calc { sub custom_usage_calc {
@ -174,17 +187,17 @@ sub set_counters {
closure_custom_threshold_check => $self->can('custom_active_threshold'), closure_custom_threshold_check => $self->can('custom_active_threshold'),
closure_custom_perfdata => $self->can('custom_active_perfdata') closure_custom_perfdata => $self->can('custom_active_perfdata')
} }
}, }
]; ];
$self->{maps_counters}->{global} = [ $self->{maps_counters}->{global} = [
{ label => 'total-usage-active', nlabel => 'sharepoint.sites.active.usage.total.bytes', set => { { label => 'total-usage-active', nlabel => 'sharepoint.sites.active.usage.total.bytes', set => {
key_values => [ { name => 'storage_used_active' } ], key_values => [ { name => 'storage_used_active' } ],
output_template => 'Usage (active sites): %s %s', output_template => 'Usage (active sites): %s %s',
output_change_bytes => 1, output_change_bytes => 1,
perfdatas => [ perfdatas => [
{ label => 'total_usage_active', value => 'storage_used_active', template => '%d', { label => 'total_usage_active', template => '%d', min => 0, unit => 'B' }
min => 0, unit => 'B' }, ]
],
} }
}, },
{ label => 'total-usage-inactive', nlabel => 'sharepoint.sites.inactive.usage.total.bytes', set => { { label => 'total-usage-inactive', nlabel => 'sharepoint.sites.inactive.usage.total.bytes', set => {
@ -192,102 +205,97 @@ sub set_counters {
output_template => 'Usage (inactive sites): %s %s', output_template => 'Usage (inactive sites): %s %s',
output_change_bytes => 1, output_change_bytes => 1,
perfdatas => [ perfdatas => [
{ label => 'total_usage_inactive', value => 'storage_used_inactive', template => '%d', { label => 'total_usage_inactive', template => '%d', min => 0, unit => 'B' }
min => 0, unit => 'B' }, ]
],
} }
}, },
{ label => 'total-file-count-active', nlabel => 'sharepoint.sites.active.files.total.count', set => { { label => 'total-file-count-active', nlabel => 'sharepoint.sites.active.files.total.count', set => {
key_values => [ { name => 'file_count_active' } ], key_values => [ { name => 'file_count_active' } ],
output_template => 'File Count (active sites): %d', output_template => 'File Count (active sites): %d',
perfdatas => [ perfdatas => [
{ label => 'total_file_count_active', value => 'file_count_active', template => '%d', { label => 'total_file_count_active', template => '%d', min => 0 }
min => 0 }, ]
],
} }
}, },
{ label => 'total-file-count-inactive', nlabel => 'sharepoint.sites.inactive.files.total.count', set => { { label => 'total-file-count-inactive', nlabel => 'sharepoint.sites.inactive.files.total.count', set => {
key_values => [ { name => 'file_count_inactive' } ], key_values => [ { name => 'file_count_inactive' } ],
output_template => 'File Count (inactive sites): %d', output_template => 'File Count (inactive sites): %d',
perfdatas => [ perfdatas => [
{ label => 'total_file_count_inactive', value => 'file_count_inactive', template => '%d', { label => 'total_file_count_inactive', template => '%d', min => 0 }
min => 0 }, ]
],
} }
}, },
{ label => 'total-active-file-count', nlabel => 'sharepoint.sites.files.active.total.count', set => { { label => 'total-active-file-count', nlabel => 'sharepoint.sites.files.active.total.count', set => {
key_values => [ { name => 'active_file_count' } ], key_values => [ { name => 'active_file_count' } ],
output_template => 'Active File Count (active sites): %d', output_template => 'Active File Count (active sites): %d',
perfdatas => [ perfdatas => [
{ label => 'total_active_file_count', value => 'active_file_count', template => '%d', { label => 'total_active_file_count', template => '%d', min => 0 }
min => 0 }, ]
],
} }
}, },
{ label => 'total-visited-page-count', nlabel => 'sharepoint.sites.pages.visited.total.count', set => { { label => 'total-visited-page-count', nlabel => 'sharepoint.sites.pages.visited.total.count', set => {
key_values => [ { name => 'visited_page_count' } ], key_values => [ { name => 'visited_page_count' } ],
output_template => 'Visited Page Count (active sites): %d', output_template => 'Visited Page Count (active sites): %d',
perfdatas => [ perfdatas => [
{ label => 'total_visited_page_count', value => 'visited_page_count', template => '%d', { label => 'total_visited_page_count', template => '%d', min => 0 }
min => 0 }, ]
],
} }
}, },
{ label => 'total-page-view-count', nlabel => 'sharepoint.sites.pages.viewed.total.count', set => { { label => 'total-page-view-count', nlabel => 'sharepoint.sites.pages.viewed.total.count', set => {
key_values => [ { name => 'page_view_count' } ], key_values => [ { name => 'page_view_count' } ],
output_template => 'Page View Count (active sites): %d', output_template => 'Page View Count (active sites): %d',
perfdatas => [ perfdatas => [
{ label => 'total_page_view_count', value => 'page_view_count', template => '%d', { label => 'total_page_view_count', template => '%d', min => 0 }
min => 0 }, ]
],
} }
}, }
]; ];
$self->{maps_counters}->{sites} = [ $self->{maps_counters}->{sites} = [
{ label => 'usage', set => { { label => 'usage', set => {
key_values => [ { name => 'storage_used' }, { name => 'storage_allocated' }, { name => 'url' }, { name => 'id' } ], key_values => [ { name => 'storage_used' }, { name => 'storage_allocated' }, { name => 'url' }, { name => 'id' } ],
closure_custom_calc => $self->can('custom_usage_calc'), closure_custom_calc => $self->can('custom_usage_calc'),
closure_custom_output => $self->can('custom_usage_output'), closure_custom_output => $self->can('custom_usage_output'),
closure_custom_perfdata => $self->can('custom_usage_perfdata'), closure_custom_perfdata => $self->can('custom_usage_perfdata'),
closure_custom_threshold_check => $self->can('custom_usage_threshold'), closure_custom_threshold_check => $self->can('custom_usage_threshold')
} }
}, },
{ label => 'file-count', nlabel => 'sharepoint.sites.files.count', set => { { label => 'file-count', nlabel => 'sharepoint.sites.files.count', set => {
key_values => [ { name => 'file_count' }, { name => 'url' }, { name => 'id' } ], key_values => [ { name => 'file_count' }, { name => 'url' }, { name => 'id' } ],
output_template => 'File Count: %d', output_template => 'File Count: %d',
perfdatas => [ perfdatas => [
{ label => 'file_count', value => 'file_count', template => '%d', { label => 'file_count', template => '%d',
min => 0, label_extra_instance => 1, instance_use => 'url' }, min => 0, label_extra_instance => 1, instance_use => 'url' }
], ]
} }
}, },
{ label => 'active-file-count', nlabel => 'sharepoint.sites.files.active.count', set => { { label => 'active-file-count', nlabel => 'sharepoint.sites.files.active.count', set => {
key_values => [ { name => 'active_file_count' }, { name => 'url' }, { name => 'id' } ], key_values => [ { name => 'active_file_count' }, { name => 'url' }, { name => 'id' } ],
output_template => 'Active File Count: %d', output_template => 'Active File Count: %d',
perfdatas => [ perfdatas => [
{ label => 'active_file_count', value => 'active_file_count', template => '%d', { label => 'active_file_count', template => '%d',
min => 0, label_extra_instance => 1, instance_use => 'url' }, min => 0, label_extra_instance => 1, instance_use => 'url' }
], ]
} }
}, },
{ label => 'visited-page-count', nlabel => 'sharepoint.sites.pages.visited.count', set => { { label => 'visited-page-count', nlabel => 'sharepoint.sites.pages.visited.count', set => {
key_values => [ { name => 'visited_page_count' }, { name => 'url' }, { name => 'id' } ], key_values => [ { name => 'visited_page_count' }, { name => 'url' }, { name => 'id' } ],
output_template => 'Visited Page Count: %d', output_template => 'Visited Page Count: %d',
perfdatas => [ perfdatas => [
{ label => 'visited_page_count', value => 'visited_page_count', template => '%d', { label => 'visited_page_count', template => '%d',
min => 0, label_extra_instance => 1, instance_use => 'url' }, min => 0, label_extra_instance => 1, instance_use => 'url' }
], ]
} }
}, },
{ label => 'page-view-count', nlabel => 'sharepoint.sites.pages.viewed.count', set => { { label => 'page-view-count', nlabel => 'sharepoint.sites.pages.viewed.count', set => {
key_values => [ { name => 'page_view_count' }, { name => 'url' }, { name => 'id' } ], key_values => [ { name => 'page_view_count' }, { name => 'url' }, { name => 'id' } ],
output_template => 'Page View Count: %d', output_template => 'Page View Count: %d',
perfdatas => [ perfdatas => [
{ label => 'page_view_count', value => 'page_view_count', template => '%d', { label => 'page_view_count', template => '%d',
min => 0, label_extra_instance => 1, instance_use => 'url' }, min => 0, label_extra_instance => 1, instance_use => 'url' }
], ]
} }
}, }
]; ];
} }
@ -297,11 +305,11 @@ sub new {
bless $self, $class; bless $self, $class;
$options{options}->add_options(arguments => { $options{options}->add_options(arguments => {
"filter-url:s" => { name => 'filter_url' }, 'filter-url:s' => { name => 'filter_url' },
"filter-id:s" => { name => 'filter_id' }, 'filter-id:s' => { name => 'filter_id' },
"units:s" => { name => 'units', default => '%' }, 'units:s' => { name => 'units', default => '%' },
"free" => { name => 'free' }, 'free' => { name => 'free' },
"filter-counters:s" => { name => 'filter_counters', default => 'active-sites|total' }, 'filter-counters:s' => { name => 'filter_counters', default => 'active-sites|total' }
}); });
return $self; return $self;
@ -311,15 +319,17 @@ sub manage_selection {
my ($self, %options) = @_; my ($self, %options) = @_;
$self->{active} = { active => 0, total => 0, report_date => '' }; $self->{active} = { active => 0, total => 0, report_date => '' };
$self->{global} = { storage_used_active => 0, storage_used_inactive => 0, $self->{global} = {
file_count_active => 0, file_count_inactive => 0, storage_used_active => 0, storage_used_inactive => 0,
active_file_count => 0 , visited_page_count => 0 , page_view_count => 0 }; file_count_active => 0, file_count_inactive => 0,
active_file_count => 0 , visited_page_count => 0 , page_view_count => 0
};
$self->{sites} = {}; $self->{sites} = {};
my $results = $options{custom}->office_get_sharepoint_site_usage(param => "period='D7'"); my $results = $options{custom}->office_get_sharepoint_site_usage(param => "period='D7'");
my $results_daily = []; my $results_daily = [];
if (scalar(@{$results})) { if (scalar(@{$results})) {
$self->{active}->{report_date} = @{$results}[0]->{'Report Refresh Date'}; $self->{active}->{report_date} = $results->[0]->{'Report Refresh Date'};
$results_daily = $options{custom}->office_get_sharepoint_site_usage(param => "date=" . $self->{active}->{report_date}); $results_daily = $options{custom}->office_get_sharepoint_site_usage(param => "date=" . $self->{active}->{report_date});
} }