upstream/monitoring-plugins
1
0
Fork 0
mirror of https://github.com/monitoring-plugins/monitoring-plugins.git synced 2026-04-27 09:06:42 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'master' into check_snmp_fixes

Browse source
This commit is contained in:
Lorenz Kästle 2026-04-07 13:27:38 +02:00 committed by GitHub
commit 8703090d93
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 195 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/output.c
View file

@ -61,6 +61,8 @@ static inline char *fmt_subcheck_perfdata(mp_subcheck check) {
mp_check mp_check_init(void) {
mp_check check = {
.evaluation_function = &mp_eval_check_default,
.default_output_override = NULL,
.default_output_override_content = NULL,
};
return check;
}
@ -283,6 +285,11 @@ char *mp_fmt_output(mp_check check) {
switch (output_format) {
case MP_FORMAT_MULTI_LINE: {
if (check.default_output_override != NULL) {
result = check.default_output_override(check.default_output_override_content);
break;
}
if (check.summary == NULL) {
check.summary = get_subcheck_summary(check);
}

4
lib/output.h
View file

@ -70,6 +70,10 @@ struct mp_check {
// the evaluation_functions computes the state of check
mp_state_enum (*evaluation_function)(mp_check);
// override for the default output format
char *(*default_output_override)(void *);
void *default_output_override_content;
};
mp_check mp_check_init(void);

11
lib/perfdata.c
View file

@ -251,7 +251,16 @@ char *mp_range_to_string(const mp_range input) {
if (input.start_infinity) {
asprintf(&result, "%s~:", result);
} else {
asprintf(&result, "%s%s:", result, pd_value_to_string(input.start));
// check for zeroes, so we can use the short form
if ((input.start.type == PD_TYPE_NONE) ||
((input.start.type == PD_TYPE_INT) && (input.start.pd_int == 0)) ||
((input.start.type == PD_TYPE_UINT) && (input.start.pd_uint == 0)) ||
((input.start.type == PD_TYPE_DOUBLE) && (input.start.pd_double == 0))){
// nothing to do here
} else {
// Start value is an actual value
asprintf(&result, "%s%s:", result, pd_value_to_string(input.start));
}
}
if (!input.end_infinity) {

17
plugins/check_by_ssh.c
View file

@ -41,6 +41,8 @@ const char *email = "devel@monitoring-plugins.org";
# define NP_MAXARGS 1024
#endif
char *check_by_ssh_output_override(void *remote_output) { return ((char *)remote_output); }
typedef struct {
int errorcode;
check_by_ssh_config config;
@ -155,10 +157,21 @@ int main(int argc, char **argv) {
xasprintf(&sc_active_check.output, "command stdout:");
if (child_result.out.lines > skip_stdout) {
char *remote_command_output = NULL;
for (size_t i = skip_stdout; i < child_result.out.lines; i++) {
xasprintf(&sc_active_check.output, "%s\n%s", sc_active_check.output,
child_result.out.line[i]);
if (i == skip_stdout) {
// first iteration
xasprintf(&remote_command_output, "%s", child_result.out.line[i]);
} else {
xasprintf(&remote_command_output, "%s\n%s", remote_command_output,
child_result.out.line[i]);
}
}
sc_active_check.output = remote_command_output;
overall.default_output_override_content = remote_command_output;
overall.default_output_override = check_by_ssh_output_override;
} else {
xasprintf(&sc_active_check.output, "remote command '%s' returned status %d",
config.remotecmd, child_result.cmd_error_code);

58
plugins/check_disk.c
View file

@ -933,31 +933,43 @@ void set_all_thresholds(parameter_list_elem *path, char *warn_freespace_units,
if (warn_freespace_units) {
tmp = mp_parse_range_string(warn_freespace_units);
tmp.range.start = mp_create_pd_value(0);
tmp.range.start_infinity = false;
path->freespace_units = mp_thresholds_set_warn(path->freespace_units, tmp.range);
}
if (crit_freespace_units) {
tmp = mp_parse_range_string(crit_freespace_units);
tmp.range.start = mp_create_pd_value(0);
tmp.range.start_infinity = false;
path->freespace_units = mp_thresholds_set_crit(path->freespace_units, tmp.range);
}
if (warn_freespace_percent) {
tmp = mp_parse_range_string(warn_freespace_percent);
tmp.range.start = mp_create_pd_value(0);
tmp.range.start_infinity = false;
path->freespace_percent = mp_thresholds_set_warn(path->freespace_percent, tmp.range);
}
if (crit_freespace_percent) {
tmp = mp_parse_range_string(crit_freespace_percent);
tmp.range.start = mp_create_pd_value(0);
tmp.range.start_infinity = false;
path->freespace_percent = mp_thresholds_set_crit(path->freespace_percent, tmp.range);
}
if (warn_freeinodes_percent) {
tmp = mp_parse_range_string(warn_freeinodes_percent);
tmp.range.start = mp_create_pd_value(0);
tmp.range.start_infinity = false;
path->freeinodes_percent = mp_thresholds_set_warn(path->freeinodes_percent, tmp.range);
}
if (crit_freeinodes_percent) {
tmp = mp_parse_range_string(crit_freeinodes_percent);
tmp.range.start = mp_create_pd_value(0);
tmp.range.start_infinity = false;
path->freeinodes_percent = mp_thresholds_set_crit(path->freeinodes_percent, tmp.range);
}
}
@ -1182,14 +1194,22 @@ mp_subcheck evaluate_filesystem(measurement_unit measurement_unit, bool display_
humanize_byte_value((unsigned long long)measurement_unit.total_bytes, false));
}
mp_perfdata used_space = perfdata_init();
used_space.label = measurement_unit.name;
used_space.value = mp_create_pd_value(measurement_unit.free_bytes);
used_space = mp_set_pd_max_value(used_space, mp_create_pd_value(measurement_unit.total_bytes));
used_space = mp_set_pd_min_value(used_space, mp_create_pd_value(0));
used_space.uom = "B";
used_space = mp_pd_set_thresholds(used_space, measurement_unit.freespace_bytes_thresholds);
freespace_bytes_sc = mp_set_subcheck_state(freespace_bytes_sc, mp_get_pd_status(used_space));
// Free space just internally for computation
mp_perfdata free_space_pd = perfdata_init();
free_space_pd.label = measurement_unit.name;
free_space_pd.value = mp_create_pd_value(measurement_unit.free_bytes);
free_space_pd =
mp_pd_set_thresholds(free_space_pd, measurement_unit.freespace_bytes_thresholds);
freespace_bytes_sc = mp_set_subcheck_state(freespace_bytes_sc, mp_get_pd_status(free_space_pd));
// Used space for display
mp_perfdata used_space_pd = perfdata_init();
used_space_pd.label = measurement_unit.name;
used_space_pd.value = mp_create_pd_value(measurement_unit.used_bytes);
used_space_pd =
mp_set_pd_max_value(used_space_pd, mp_create_pd_value(measurement_unit.total_bytes));
used_space_pd = mp_set_pd_min_value(used_space_pd, mp_create_pd_value(0));
used_space_pd.uom = "B";
// special case for absolute space thresholds here:
// if absolute values are not set, compute the thresholds from percentage thresholds
@ -1209,7 +1229,8 @@ mp_subcheck evaluate_filesystem(measurement_unit measurement_unit, bool display_
}
measurement_unit.freespace_bytes_thresholds =
mp_thresholds_set_crit(measurement_unit.freespace_bytes_thresholds, tmp_range);
used_space = mp_pd_set_thresholds(used_space, measurement_unit.freespace_bytes_thresholds);
free_space_pd =
mp_pd_set_thresholds(free_space_pd, measurement_unit.freespace_bytes_thresholds);
}
if (!temp_thlds.warning_is_set &&
@ -1225,10 +1246,22 @@ mp_subcheck evaluate_filesystem(measurement_unit measurement_unit, bool display_
}
measurement_unit.freespace_bytes_thresholds =
mp_thresholds_set_warn(measurement_unit.freespace_bytes_thresholds, tmp_range);
used_space = mp_pd_set_thresholds(used_space, measurement_unit.freespace_bytes_thresholds);
free_space_pd =
mp_pd_set_thresholds(free_space_pd, measurement_unit.freespace_bytes_thresholds);
}
mp_add_perfdata_to_subcheck(&freespace_bytes_sc, used_space);
mp_thresholds thr_used_space = measurement_unit.freespace_bytes_thresholds;
if (thr_used_space.critical_is_set) {
thr_used_space.critical.alert_on_inside_range =
!thr_used_space.critical.alert_on_inside_range;
}
if (thr_used_space.warning_is_set) {
thr_used_space.warning.alert_on_inside_range =
!thr_used_space.warning.alert_on_inside_range;
}
used_space_pd = mp_pd_set_thresholds(used_space_pd, thr_used_space);
mp_add_perfdata_to_subcheck(&freespace_bytes_sc, used_space_pd);
mp_add_subcheck_to_subcheck(&result, freespace_bytes_sc);
// ==========================
@ -1264,7 +1297,8 @@ mp_subcheck evaluate_filesystem(measurement_unit measurement_unit, bool display_
mp_perfdata inode_percentage_pd = perfdata_init();
inode_percentage_pd = mp_set_pd_value(inode_percentage_pd, free_inode_percentage);
inode_percentage_pd = mp_pd_set_thresholds(inode_percentage_pd, measurement_unit.freeinodes_percent_thresholds);
inode_percentage_pd = mp_pd_set_thresholds(inode_percentage_pd,
measurement_unit.freeinodes_percent_thresholds);
if (verbose > 0) {
printf("free inode percentage computed: %g\n", free_inode_percentage);

211
plugins/t/check_disk.t
View file

@ -7,6 +7,7 @@
# TODO: Add in tests for perf data. Need to beef up Monitoring::Plugin::Performance to cater for max, min, etc
use strict;
use warnings;
use Test::More;
use NPTest;
use POSIX qw(ceil floor);
@ -26,7 +27,7 @@ my $output_format = "--output-format mp-test-json";
if ($mountpoint_valid eq "" or $mountpoint2_valid eq "") {
plan skip_all => "Need 2 mountpoints to test";
} else {
plan tests => 97;
plan tests => 96;
}
$result = NPTest->testCmd(
@ -34,25 +35,30 @@ $result = NPTest->testCmd(
);
cmp_ok( $result->return_code, "==", 0, "Checking two mountpoints (must have at least 1% free in space and inodes)");
my $result_mp2 = $result->{'mp_test_result'}->{'checks'}->[0];
my $result_mp1 = $result->{'mp_test_result'}->{'checks'}->[1];
like($result->{'mp_test_result'}->{'state'}, "/OK/", "Main result is OK");
like($result->{'mp_test_result'}->{'checks'}->[0]->{'state'}, "/OK/", "First sub result is OK");
like($result->{'mp_test_result'}->{'checks'}->[1]->{'state'}, "/OK/", "Second sub result is OK");
my $absolut_space_mp1 = $result->{'mp_test_result'}->{'checks'}->[1]->{'checks'}->[0]->{'perfdata'}->[0]->{'max'}->{'value'};
# print("absolute space on mp1: ". $absolut_space_mp1 . "\n");
my $free_percent_on_mp1 = ($result->{'mp_test_result'}->{'checks'}->[1]->{'checks'}->[0]->{'perfdata'}->[0]->{'value'}->{'value'} / ($absolut_space_mp1/100));
print("free percent on mp1: ". $free_percent_on_mp1 . "\n");
my $absolut_space_mp2 = $result->{'mp_test_result'}->{'checks'}->[0]->{'checks'}->[0]->{'perfdata'}->[0]->{'max'}->{'value'};
# print("absolute space on mp2: ". $absolut_space_mp2 . "\n");
my $free_percent_on_mp2 = ($result->{'mp_test_result'}->{'checks'}->[0]->{'checks'}->[0]->{'perfdata'}->[0]->{'value'}->{'value'}/ ($absolut_space_mp2/100));
print("free percent on mp2: ". $free_percent_on_mp2 . "\n");
like($result_mp2->{'state'}, "/OK/", "First sub result is OK");
like($result_mp1->{'state'}, "/OK/", "Second sub result is OK");
my @perfdata;
@perfdata[0] = $result->{'mp_test_result'}->{'checks'}->[0]->{'checks'}->[0]->{'perfdata'}->[0];
@perfdata[1] = $result->{'mp_test_result'}->{'checks'}->[1]->{'checks'}->[0]->{'perfdata'}->[0];
@perfdata[0] = $result_mp2->{'checks'}->[0]->{'perfdata'}->[0];
@perfdata[1] = $result_mp1->{'checks'}->[0]->{'perfdata'}->[0];
my $absolut_space_mp1 = $perfdata[1]->{'max'}->{'value'};
# print("absolute space on mp1: ". $absolut_space_mp1 . "\n");
my $absolut_used_space_mp1 = $perfdata[1]->{'value'}->{'value'};
my $free_percent_on_mp1 = ($absolut_space_mp1 - $absolut_used_space_mp1) / ($absolut_space_mp1/100);
# print("free percent on mp1: ". $free_percent_on_mp1 . "\n");
my $absolut_space_mp2 = $perfdata[0]->{'max'}->{'value'};
# print("absolute space on mp2: ". $absolut_space_mp2 . "\n");
my $absolut_used_space_mp2 = $perfdata[0]->{'value'}->{'value'};
my $free_percent_on_mp2 = (($absolut_space_mp2 - $absolut_used_space_mp2)/ ($absolut_space_mp2/100));
# print("free percent on mp2: ". $free_percent_on_mp2 . "\n");
# Decrease precision of numbers since the the fs might be modified between the two runs
$perfdata[0]->{'value'}->{'value'} = int($perfdata[0]->{'value'}->{'value'} / 1000000);
@ -73,46 +79,56 @@ if ($free_percent_on_mp1 > $free_percent_on_mp2) {
die "Two mountpoints are the same - cannot do rest of test";
}
print("less free: " . $less_free . "\n");
print("more free: " . $more_free . "\n");
# print("less free: " . $less_free . "\n");
# print("more free: " . $more_free . "\n");
if($free_percent_on_mp1 == $avg_free_percent || $free_percent_on_mp2 == $avg_free_percent) {
die "One mountpoints has average space free - cannot do rest of test";
}
my $used_inodes_on_mp1 = $result->{'mp_test_result'}->{'checks'}->[1]->{'checks'}[2]->{'perfdata'}->[0]->{'value'}->{'value'};
my $total_inodes_on_mp1 = $result->{'mp_test_result'}->{'checks'}->[1]->{'checks'}[2]->{'perfdata'}->[0]->{'max'}->{'value'};
# TODO enable inode checks later when there is enough nerves for Perl
# my $have_inodes = 1;
# my $more_inode_free;
# my $less_inode_free;
# my $avg_inode_free_percentage;
my $free_inodes_on_mp1 = $total_inodes_on_mp1 - $used_inodes_on_mp1;
my $free_inode_percentage_on_mp1 = $free_inodes_on_mp1 / ($total_inodes_on_mp1 / 100);
# # Do we have an inode reading? might not be if the filesystem does not have a fixed number of inodes
# if ($result->{'mp_test_result'}->{'checks'}->[1]->{'checks'}[2] && $result->{'mp_test_result'}->{'checks'}->[0]) {
# my $used_inodes_on_mp1 = $result->{'mp_test_result'}->{'checks'}->[1]->{'checks'}[2]->{'perfdata'}->[0]->{'value'}->{'value'};
# my $total_inodes_on_mp1 = $result->{'mp_test_result'}->{'checks'}->[1]->{'checks'}[2]->{'perfdata'}->[0]->{'max'}->{'value'};
# print("free inodes on mp1: " . $free_inodes_on_mp1 . "\n");
# print("total inodes on mp1: " . $total_inodes_on_mp1 . "\n");
# print("free inode percentage on mp1: " . $free_inode_percentage_on_mp1 . "\n");
# my $free_inodes_on_mp1 = $total_inodes_on_mp1 - $used_inodes_on_mp1;
# my $free_inode_percentage_on_mp1 = $free_inodes_on_mp1 / ($total_inodes_on_mp1 / 100);
my $used_inodes_on_mp2 = $result->{'mp_test_result'}->{'checks'}->[0]->{'checks'}[2]->{'perfdata'}->[0]->{'value'}->{'value'};
my $total_inodes_on_mp2 = $result->{'mp_test_result'}->{'checks'}->[0]->{'checks'}[2]->{'perfdata'}->[0]->{'max'}->{'value'};
my $free_inodes_on_mp2 = $total_inodes_on_mp2 - $used_inodes_on_mp2;
my $free_inode_percentage_on_mp2 = $free_inodes_on_mp2 / ($total_inodes_on_mp2 / 100);
# # print("free inodes on mp1: " . $free_inodes_on_mp1 . "\n");
# # print("total inodes on mp1: " . $total_inodes_on_mp1 . "\n");
# # print("free inode percentage on mp1: " . $free_inode_percentage_on_mp1 . "\n");
# print("free inodes on mp2: " . $free_inodes_on_mp2 . "\n");
# print("total inodes on mp2: " . $total_inodes_on_mp2 . "\n");
# print("free inode percentage on mp2: " . $free_inode_percentage_on_mp2 . "\n");
# my $used_inodes_on_mp2 = $result->{'mp_test_result'}->{'checks'}->[0]->{'checks'}[2]->{'perfdata'}->[0]->{'value'}->{'value'};
# my $total_inodes_on_mp2 = $result->{'mp_test_result'}->{'checks'}->[0]->{'checks'}[2]->{'perfdata'}->[0]->{'max'}->{'value'};
# my $free_inodes_on_mp2 = $total_inodes_on_mp2 - $used_inodes_on_mp2;
# my $free_inode_percentage_on_mp2 = $free_inodes_on_mp2 / ($total_inodes_on_mp2 / 100);
my $avg_inode_free_percentage = ceil(($free_inode_percentage_on_mp1 + $free_inode_percentage_on_mp2)/2);
my ($more_inode_free, $less_inode_free);
if ($free_inode_percentage_on_mp1 > $free_inode_percentage_on_mp2) {
$more_inode_free = $mountpoint_valid;
$less_inode_free = $mountpoint2_valid;
} elsif ($free_inode_percentage_on_mp1 < $free_inode_percentage_on_mp2) {
$more_inode_free = $mountpoint2_valid;
$less_inode_free = $mountpoint_valid;
} else {
die "Two mountpoints with same inodes free - cannot do rest of test";
}
if($free_inode_percentage_on_mp1 == $avg_inode_free_percentage || $free_inode_percentage_on_mp2 == $avg_inode_free_percentage) {
die "One mountpoints has average inodes free - cannot do rest of test";
}
# # print("free inodes on mp2: " . $free_inodes_on_mp2 . "\n");
# # print("total inodes on mp2: " . $total_inodes_on_mp2 . "\n");
# # print("free inode percentage on mp2: " . $free_inode_percentage_on_mp2 . "\n");
# my $avg_inode_free_percentage = ceil(($free_inode_percentage_on_mp1 + $free_inode_percentage_on_mp2)/2);
# if ($free_inode_percentage_on_mp1 > $free_inode_percentage_on_mp2) {
# $more_inode_free = $mountpoint_valid;
# $less_inode_free = $mountpoint2_valid;
# } elsif ($free_inode_percentage_on_mp1 < $free_inode_percentage_on_mp2) {
# $more_inode_free = $mountpoint2_valid;
# $less_inode_free = $mountpoint_valid;
# } else {
# die "Two mountpoints with same inodes free - cannot do rest of test";
# }
# if($free_inode_percentage_on_mp1 == $avg_inode_free_percentage || $free_inode_percentage_on_mp2 == $avg_inode_free_percentage) {
# die "One mountpoints has average inodes free - cannot do rest of test";
# }
# } else {
# $have_inodes = 0;
# }
# Verify performance data
# First check absolute thresholds...
@ -144,8 +160,8 @@ my $warn_percth_data = $result->{'mp_test_result'}->{'checks'}->[0]->{'checks'}[
my $crit_percth_data = $result->{'mp_test_result'}->{'checks'}->[0]->{'checks'}[0]->{'perfdata'}->[0]->{'crit'}->{'end'}->{'value'};
my $total_percth_data = $result->{'mp_test_result'}->{'checks'}->[0]->{'checks'}[0]->{'perfdata'}->[0]->{'max'}->{'value'};
print("warn_percth_data: " . $warn_percth_data . "\n");
print("crit_percth_data: " . $crit_percth_data . "\n");
# print("warn_percth_data: " . $warn_percth_data . "\n");
# print("crit_percth_data: " . $crit_percth_data . "\n");
is (int($warn_percth_data), int((20/100)*$total_percth_data), "Wrong warning in perf data using percent thresholds. Got " . $warn_percth_data . " with total " . $total_percth_data);
is (int($crit_percth_data), int((10/100)*$total_percth_data), "Wrong critical in perf data using percent thresholds. Got " . $crit_percth_data . " with total " . $total_percth_data);
@ -161,6 +177,18 @@ cmp_ok( $result->return_code, "==", 0, "with JSON test format result should alwa
my @perfdata2;
@perfdata2[0] = $result->{'mp_test_result'}->{'checks'}->[1]->{'checks'}->[0]->{'perfdata'}->[0];
@perfdata2[1] = $result->{'mp_test_result'}->{'checks'}->[0]->{'checks'}->[0]->{'perfdata'}->[0];
my $free_on_mp1 = ($perfdata2[1]->{'max'}->{'value'} - $perfdata2[1]->{'value'}->{'value'});
my $free_on_mp2 = ($perfdata2[0]->{'max'}->{'value'} - $perfdata2[0]->{'value'}->{'value'});
# print "free on mp1: " . $free_on_mp1 . "\n";
# print "free on mp2: " . $free_on_mp2 . "\n";
# Either one of those should not be zero
die "Cannot parse output: $_" unless (defined($free_on_mp1) && defined($free_on_mp2));
my $free_on_all = $free_on_mp1 + $free_on_mp2;
# print "free on all: " . $free_on_all . "\n";
# Decrease precision of numbers since the the fs might be modified between the two runs
$perfdata2[0]->{'value'}->{'value'} = int($perfdata2[0]->{'value'}->{'value'} / 1000000);
$perfdata2[1]->{'value'}->{'value'} = int($perfdata2[1]->{'value'}->{'value'} / 1000000);
@ -175,12 +203,6 @@ $result = NPTest->testCmd( "./check_disk -w 1 -c 1 -p $more_free -p $less_free $
cmp_ok( $result->return_code, "==", 0, "with JSON test format result should always be OK");
like($result->{'mp_test_result'}->{'state'}, "/OK/", "At least 1 MB available on $more_free and $less_free");
my $free_mb_on_mp1 =$result->{'mp_test_result'}->{'checks'}->[0]->{'checks'}->[0]->{'perfdata'}->[0]->{'value'}->{'value'} / (1024 * 1024);
my $free_mb_on_mp2 = $result->{'mp_test_result'}->{'checks'}->[1]->{'checks'}->[0]->{'perfdata'}->[0]->{'value'}->{'value'}/ (1024 * 1024);
die "Cannot parse output: $_" unless ($free_mb_on_mp1 && $free_mb_on_mp2);
my $free_mb_on_all = $free_mb_on_mp1 + $free_mb_on_mp2;
$result = NPTest->testCmd( "./check_disk -e -w 1 -c 1 -p $more_free $output_format" );
cmp_ok( $result->return_code, "==", 0, "with JSON test format result should always be OK");
@ -248,55 +270,45 @@ cmp_ok( $result->return_code, '==', 2, "And reversing arguments should not make
# Basic inode checks for sizes
SKIP: {
skip "No inode data", 14 if 1 eq 1;
$result = NPTest->testCmd( "./check_disk --icritical 1% --iwarning 1% -p $more_inode_free" );
is( $result->return_code, 0, "At least 1% free on inodes for both mountpoints");
# $result = NPTest->testCmd( "./check_disk --icritical 1% --iwarning 1% -p $more_inode_free" );
# is( $result->return_code, 0, "At least 1% free on inodes for both mountpoints");
$result = NPTest->testCmd( "./check_disk -K 100% -W 100% -p $less_inode_free" );
is( $result->return_code, 2, "Critical requesting 100% free inodes for both mountpoints");
# $result = NPTest->testCmd( "./check_disk -K 100% -W 100% -p $less_inode_free" );
# is( $result->return_code, 2, "Critical requesting 100% free inodes for both mountpoints");
$result = NPTest->testCmd( "./check_disk --iwarning 1% --icritical 1% -p $more_inode_free -K 100% -W 100% -p $less_inode_free" );
is( $result->return_code, 2, "Get critical on less_inode_free mountpoint $less_inode_free");
# $result = NPTest->testCmd( "./check_disk --iwarning 1% --icritical 1% -p $more_inode_free -K 100% -W 100% -p $less_inode_free" );
# is( $result->return_code, 2, "Get critical on less_inode_free mountpoint $less_inode_free");
$result = NPTest->testCmd( "./check_disk -W $avg_inode_free_percentage% -K 0% -p $less_inode_free" );
is( $result->return_code, 1, "Get warning on less_inode_free, when checking average");
# $result = NPTest->testCmd( "./check_disk -W $avg_inode_free_percentage% -K 0% -p $less_inode_free" );
# is( $result->return_code, 1, "Get warning on less_inode_free, when checking average");
$result = NPTest->testCmd( "./check_disk -W $avg_inode_free_percentage% -K $avg_inode_free_percentage% -p $more_inode_free ");
is( $result->return_code, 0, "Get ok on more_inode_free when checking average");
# $result = NPTest->testCmd( "./check_disk -W $avg_inode_free_percentage% -K $avg_inode_free_percentage% -p $more_inode_free ");
# is( $result->return_code, 0, "Get ok on more_inode_free when checking average");
$result = NPTest->testCmd( "./check_disk -W $avg_inode_free_percentage% -K 0% -p $less_inode_free -W $avg_inode_free_percentage% -K $avg_inode_free_percentage% -p $more_inode_free" );
is ($result->return_code, 1, "Combine above two tests, get warning");
$all_disks = $result->output;
# $result = NPTest->testCmd( "./check_disk -W $avg_inode_free_percentage% -K 0% -p $less_inode_free -W $avg_inode_free_percentage% -K $avg_inode_free_percentage% -p $more_inode_free" );
# is ($result->return_code, 1, "Combine above two tests, get warning");
# $all_disks = $result->output;
$result = NPTest->testCmd( "./check_disk -e -W $avg_inode_free_percentage% -K 0% -p $less_inode_free -W $avg_inode_free_percentage% -K $avg_inode_free_percentage% -p $more_inode_free" );
isnt( $result->output, $all_disks, "-e gives different output");
like( $result->output, qr/$less_inode_free/, "Found problem $less_inode_free");
unlike( $result->only_output, qr/$more_inode_free\s/, "Has ignored $more_inode_free as not a problem");
like( $result->perf_output, qr/$more_inode_free/, "But $more_inode_free is still in perf data");
# $result = NPTest->testCmd( "./check_disk -e -W $avg_inode_free_percentage% -K 0% -p $less_inode_free -W $avg_inode_free_percentage% -K $avg_inode_free_percentage% -p $more_inode_free" );
# isnt( $result->output, $all_disks, "-e gives different output");
# like( $result->output, qr/$less_inode_free/, "Found problem $less_inode_free");
# unlike( $result->only_output, qr/$more_inode_free\s/, "Has ignored $more_inode_free as not a problem");
# like( $result->perf_output, qr/$more_inode_free/, "But $more_inode_free is still in perf data");
$result = NPTest->testCmd( "./check_disk -W $avg_inode_free_percentage% -K 0% -p $more_inode_free" );
is( $result->return_code, 0, "Get ok on more_inode_free mountpoint, checking average");
# $result = NPTest->testCmd( "./check_disk -W $avg_inode_free_percentage% -K 0% -p $more_inode_free" );
# is( $result->return_code, 0, "Get ok on more_inode_free mountpoint, checking average");
$result = NPTest->testCmd( "./check_disk -W $avg_inode_free_percentage% -K $avg_inode_free_percentage% -p $less_inode_free" );
is( $result->return_code, 2, "Get critical on less_inode_free, checking average");
# $result = NPTest->testCmd( "./check_disk -W $avg_inode_free_percentage% -K $avg_inode_free_percentage% -p $less_inode_free" );
# is( $result->return_code, 2, "Get critical on less_inode_free, checking average");
$result = NPTest->testCmd( "./check_disk -W $avg_inode_free_percentage% -K 0% -p $more_inode_free -W $avg_inode_free_percentage% -K $avg_inode_free_percentage% -p $less_inode_free" );
is( $result->return_code, 2, "Combining above two tests, get critical");
# $result = NPTest->testCmd( "./check_disk -W $avg_inode_free_percentage% -K 0% -p $more_inode_free -W $avg_inode_free_percentage% -K $avg_inode_free_percentage% -p $less_inode_free" );
# is( $result->return_code, 2, "Combining above two tests, get critical");
$result = NPTest->testCmd( "./check_disk -W $avg_inode_free_percentage% -K $avg_inode_free_percentage% -p $less_inode_free -W $avg_inode_free_percentage% -K 0% -p $more_inode_free" );
cmp_ok( $result->return_code, '==', 2, "And reversing arguments should not make a difference");
TODO: {
local $TODO = "Invalid percent figures";
$result = NPTest->testCmd(
"./check_disk -w 10% -c 15% -p $mountpoint_valid"
);
cmp_ok( $result->return_code, '==', 3, "Invalid command line options" );
# $result = NPTest->testCmd( "./check_disk -W $avg_inode_free_percentage% -K $avg_inode_free_percentage% -p $less_inode_free -W $avg_inode_free_percentage% -K 0% -p $more_inode_free" );
# cmp_ok( $result->return_code, '==', 2, "And reversing arguments should not make a difference");
}
$result = NPTest->testCmd(
@ -371,20 +383,23 @@ $result = NPTest->testCmd( "./check_disk -w 0% -c 0% -C -w 0% -c 0% -p $mountpoi
cmp_ok( $result->return_code, "==", 0, "with JSON test format result should always be OK");
cmp_ok(scalar $result->{'mp_test_result'}->{'checks'}, '>', 1, "-C invokes matchall logic again");
my $value_below = ($free_on_all - (10**6)) % (10**5) * (10**5);
my $value_above = $free_on_all + (10**6) % (10**5) * (10**5);
# grouping: exit crit if the sum of free megs on mp1+mp2 is less than warn/crit
$result = NPTest->testCmd( "./check_disk -w ". ($free_mb_on_all + 1) ." -c ". ($free_mb_on_all + 1) ." -g group -p $mountpoint_valid -p $mountpoint2_valid" );
cmp_ok( $result->return_code, '==', 2, "grouping: exit crit if the sum of free megs on mp1+mp2 is less than warn/crit\nInstead received: " . $result->output);
$result = NPTest->testCmd( "./check_disk -u Bytes -w ". $value_above ." -c ". $value_above ." -g group -p $mountpoint_valid -p $mountpoint2_valid" );
cmp_ok( $result->return_code, '==', 2, "grouping: exit crit if the sum of free megs on mp1+mp2 is less than warn/crit");
# grouping: exit warning if the sum of free megs on mp1+mp2 is between -w and -c
$result = NPTest->testCmd( "./check_disk -w ". ($free_mb_on_all + 1) ." -c ". ($free_mb_on_all - 1) ." -g group -p $mountpoint_valid -p $mountpoint2_valid" );
$result = NPTest->testCmd( "./check_disk -u Bytes -w ". $value_above ." -c ". $value_below ." -g group -p $mountpoint_valid -p $mountpoint2_valid" );
cmp_ok( $result->return_code, '==', 1, "grouping: exit warning if the sum of free megs on mp1+mp2 is between -w and -c ");
# grouping: exit ok if the sum of free megs on mp1+mp2 is more than warn/crit
$result = NPTest->testCmd( "./check_disk -w ". ($free_mb_on_all - 1) ." -c ". ($free_mb_on_all - 1) ." -g group -p $mountpoint_valid -p $mountpoint2_valid" );
$result = NPTest->testCmd( "./check_disk -u Bytes -w ". $value_below ." -c ". $value_below ." -g group -p $mountpoint_valid -p $mountpoint2_valid" );
cmp_ok( $result->return_code, '==', 0, "grouping: exit ok if the sum of free megs on mp1+mp2 is more than warn/crit");
# grouping: exit unknown if group name is given after -p
$result = NPTest->testCmd( "./check_disk -w ". ($free_mb_on_all - 1) ." -c ". ($free_mb_on_all - 1) ." -p $mountpoint_valid -g group -p $mountpoint2_valid" );
$result = NPTest->testCmd( "./check_disk -u Bytes -w ". $value_below ." -c ". $value_below ." -p $mountpoint_valid -g group -p $mountpoint2_valid" );
cmp_ok( $result->return_code, '==', 3, "Invalid options: -p must come after groupname");
# regex: exit unknown if given regex is not compilable