From f886222cd0cdc012c789da67be7e1c48bd984487 Mon Sep 17 00:00:00 2001 From: omercier Date: Fri, 2 Aug 2024 16:32:38 +0200 Subject: [PATCH] enh(plugin): handle 64 bits counters in snmp_standard::memory Merged commits: - fix(tests): fixed spellchecks and Safe missing dependency on Alma9 - fix(stopwords): added net-snmp - Apply suggestions from code review - Update src/snmp_standard/mode/memory.pm - enh(workflow): consider building plugins when the default dependencies are changed - enh(code): use is_snmpv1() method as suggested by @garnier-quentin ;) Co-authored-by: sdepassio <114986849+sdepassio@users.noreply.github.com> Co-authored-by: Evan-Adam <152897682+Evan-Adam@users.noreply.github.com> REFS: CTOR-542 --- .../packaging/centreon-plugin.yaml.template | 1 + .github/workflows/plugins.yml | 4 + src/snmp_standard/mode/memory.pm | 76 +++++++---- tests/os/linux/snmp/linux.snmpwalk | 16 +-- tests/os/linux/snmp/memory.robot | 67 ++++++---- tests/resources/spellcheck/stopwords.txt | 118 +++++++++--------- 6 files changed, 173 insertions(+), 109 deletions(-) diff --git a/.github/packaging/centreon-plugin.yaml.template b/.github/packaging/centreon-plugin.yaml.template index 11abf0ccf8..9a159b0b54 100644 --- a/.github/packaging/centreon-plugin.yaml.template +++ b/.github/packaging/centreon-plugin.yaml.template @@ -44,6 +44,7 @@ overrides: perl(JSON::XS), perl-JSON-Path, perl-KeePass-Reader, + perl(Safe), perl(Storable), perl(POSIX), perl(Encode), diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml index c31be04f17..6b9f6b50cf 100644 --- a/.github/workflows/plugins.yml +++ b/.github/workflows/plugins.yml @@ -10,6 +10,7 @@ on: paths: - '.github/workflows/plugins.yml' - '.github/scripts/plugins-source.container.pl' + - '.github/packaging/centreon-plugin.yaml.template' - 'src/**' - 'packaging/**' push: @@ -18,6 +19,8 @@ on: - master paths: - '.github/workflows/plugins.yml' + - '.github/scripts/plugins-source.container.pl' + - '.github/packaging/centreon-plugin.yaml.template' - 'src/**' - 'packaging/**' @@ -46,6 +49,7 @@ jobs: filters: | common: - added|deleted|modified: src/centreon/** + - modified: .github/packaging/centreon-plugin.yaml.template packages: - added|modified: packaging/** plugins: diff --git a/src/snmp_standard/mode/memory.pm b/src/snmp_standard/mode/memory.pm index 9767e46195..44c767eeae 100644 --- a/src/snmp_standard/mode/memory.pm +++ b/src/snmp_standard/mode/memory.pm @@ -146,13 +146,14 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options); bless $self, $class; - $options{options}->add_options(arguments => { - 'units:s' => { name => 'units', default => '%' }, - 'free' => { name => 'free' }, - 'swap' => { name => 'check_swap' }, - 'patch-redhat' => { name => 'patch_redhat' }, - 'redhat' => { name => 'redhat' }, # for legacy (do nothing) - 'autodetect-redhat' => { name => 'autodetect_redhat' } # for legacy (do nothing) + $options{options}->add_options(arguments => { + 'units:s' => { name => 'units', default => '%' }, + 'force-64bits-counters' => { name => 'force_64bits_counters' }, + 'free' => { name => 'free' }, + 'swap' => { name => 'check_swap' }, + 'patch-redhat' => { name => 'patch_redhat' }, + 'redhat' => { name => 'redhat' }, # for legacy (do nothing) + 'autodetect-redhat' => { name => 'autodetect_redhat' } # for legacy (do nothing) }); return $self; @@ -177,7 +178,8 @@ sub check_options { $self->SUPER::check_options(%options); } -my $mapping = { +# legacy counters +my $mapping_32 = { memTotalSwap => { oid => '.1.3.6.1.4.1.2021.4.3' }, memAvailSwap => { oid => '.1.3.6.1.4.1.2021.4.4' }, memTotalReal => { oid => '.1.3.6.1.4.1.2021.4.5' }, @@ -188,29 +190,41 @@ my $mapping = { memCached => { oid => '.1.3.6.1.4.1.2021.4.15' } }; +my $mapping_64 = { + memTotalSwap => { oid => '.1.3.6.1.4.1.2021.4.18' }, + memAvailSwap => { oid => '.1.3.6.1.4.1.2021.4.19' }, + memTotalReal => { oid => '.1.3.6.1.4.1.2021.4.20' }, + memAvailReal => { oid => '.1.3.6.1.4.1.2021.4.21' }, + memTotalFree => { oid => '.1.3.6.1.4.1.2021.4.23' }, + memShared => { oid => '.1.3.6.1.4.1.2021.4.24' }, + memBuffer => { oid => '.1.3.6.1.4.1.2021.4.25' }, + memCached => { oid => '.1.3.6.1.4.1.2021.4.26' } +}; + sub memory_calc { my ($self, %options) = @_; my $available = ($options{result}->{memAvailReal}) ? $options{result}->{memAvailReal} * 1024 : 0; - my $total = ($options{result}->{memTotalReal}) ? $options{result}->{memTotalReal} * 1024 : 0; - my $buffer = ($options{result}->{memBuffer}) ? $options{result}->{memBuffer} * 1024 : 0; - my $cached = ($options{result}->{memCached}) ? $options{result}->{memCached} * 1024 : 0; + my $total = ($options{result}->{memTotalReal}) ? $options{result}->{memTotalReal} * 1024 : 0; + my $buffer = ($options{result}->{memBuffer}) ? $options{result}->{memBuffer} * 1024 : 0; + my $cached = ($options{result}->{memCached}) ? $options{result}->{memCached} * 1024 : 0; + my ($used, $free, $prct_used, $prct_free) = (0, 0, 0, 0); # rhel patch introduced: net-snmp-5.7.2-43.el7 (https://bugzilla.redhat.com/show_bug.cgi?id=1250060) # rhel patch reverted: net-snmp-5.7.2-47.el7 (https://bugzilla.redhat.com/show_bug.cgi?id=1779609) if ($total != 0) { - $used = (defined($self->{option_results}->{patch_redhat})) ? $total - $available : $total - $available - $buffer - $cached; - $free = (defined($self->{option_results}->{patch_redhat})) ? $available : $total - $used; + $used = (defined($self->{option_results}->{patch_redhat})) ? $total - $available : $total - $available - $buffer - $cached; + $free = (defined($self->{option_results}->{patch_redhat})) ? $available : $total - $used; $prct_used = $used * 100 / $total; $prct_free = 100 - $prct_used; } $self->{ram} = { - total => $total, - used => $used, - free => $free, + total => $total, + used => $used, + free => $free, prct_used => $prct_used, prct_free => $prct_free, memShared => ($options{result}->{memShared}) ? $options{result}->{memShared} * 1024 : 0, @@ -222,20 +236,21 @@ sub memory_calc { sub swap_calc { my ($self, %options) = @_; - my $free = ($options{result}->{memAvailSwap}) ? $options{result}->{memAvailSwap} * 1024 : 0; + my $free = ($options{result}->{memAvailSwap}) ? $options{result}->{memAvailSwap} * 1024 : 0; my $total = ($options{result}->{memTotalSwap}) ? $options{result}->{memTotalSwap} * 1024 : 0; + my ($used, $prct_used, $prct_free) = (0, 0, 0, 0); if ($total != 0) { - $used = $total - $free; + $used = $total - $free; $prct_used = $used * 100 / $total; $prct_free = 100 - $prct_used; } $self->{swap} = { - total => $total, - used => $used, - free => $free, + total => $total, + used => $used, + free => $free, prct_used => $prct_used, prct_free => $prct_free }; @@ -244,8 +259,17 @@ sub swap_calc { sub manage_selection { my ($self, %options) = @_; + my $mapping = $mapping_32; + # If asked to use 64bits counters AND if using v2c or v3 (v1 does not support 64bits counters) + if (defined($self->{option_results}->{force_64bits_counters}) + && defined($self->{option_results}->{snmp_version}) + && !$options{snmp}->is_snmpv1()) { + $mapping = $mapping_64; + } + my @oids = sort map($_->{oid} . '.0', values(%$mapping)); + my $results = $options{snmp}->get_leef( - oids => [ map($_->{oid} . '.0', values(%$mapping)) ], + oids => \@oids, nothing_quit => 1 ); my $result = $options{snmp}->map_instance(mapping => $mapping, results => $results, instance => 0); @@ -287,12 +311,18 @@ Can be: 'usage' (B), 'usage-free' (B), 'usage-prct' (%), =item B<--patch-redhat> -If using RedHat distribution with net-snmp >= 5.7.2-43 and net-snmp < 5.7.2-47. But you should update net-snmp!!!! +If using Red Hat distribution with net-snmp >= 5.7.2-43 and net-snmp < 5.7.2-47. But you should update net-snmp!!!! This version: used = memTotalReal - memAvailReal // free = memAvailReal Others versions: used = memTotalReal - memAvailReal - memBuffer - memCached // free = total - used +=item B<--force-64bits-counters> + +Use this option to monitor a server/device that has more than 2 TB of RAM, the maximum size of a signed 32 bits integer. +If you omit it you'll get the remainder of the Euclidean division of the actual value by 2 TB. +NB: it cannot work with version 1 of SNMP protocol. 64 bits counters are supported starting version 2c. + =back =cut diff --git a/tests/os/linux/snmp/linux.snmpwalk b/tests/os/linux/snmp/linux.snmpwalk index 7013392c11..0a53344144 100644 --- a/tests/os/linux/snmp/linux.snmpwalk +++ b/tests/os/linux/snmp/linux.snmpwalk @@ -11041,15 +11041,15 @@ .1.3.6.1.4.1.2021.4.13.0 = INTEGER: 29600 .1.3.6.1.4.1.2021.4.14.0 = INTEGER: 36720 .1.3.6.1.4.1.2021.4.15.0 = INTEGER: 510772 -.1.3.6.1.4.1.2021.4.18.0 = Counter64: 0 -.1.3.6.1.4.1.2021.4.19.0 = Counter64: 0 -.1.3.6.1.4.1.2021.4.20.0 = Counter64: 2014256 -.1.3.6.1.4.1.2021.4.21.0 = Counter64: 747712 -.1.3.6.1.4.1.2021.4.22.0 = Counter64: 747712 +.1.3.6.1.4.1.2021.4.18.0 = Counter64: 17825788 +.1.3.6.1.4.1.2021.4.19.0 = Counter64: 13283452 +.1.3.6.1.4.1.2021.4.20.0 = Counter64: 6341032700 +.1.3.6.1.4.1.2021.4.21.0 = Counter64: 20050780 +.1.3.6.1.4.1.2021.4.22.0 = Counter64: 33334232 .1.3.6.1.4.1.2021.4.23.0 = Counter64: 16000 -.1.3.6.1.4.1.2021.4.24.0 = Counter64: 29600 -.1.3.6.1.4.1.2021.4.25.0 = Counter64: 36720 -.1.3.6.1.4.1.2021.4.26.0 = Counter64: 510772 +.1.3.6.1.4.1.2021.4.24.0 = Counter64: 9763096 +.1.3.6.1.4.1.2021.4.25.0 = Counter64: 711208 +.1.3.6.1.4.1.2021.4.26.0 = Counter64: 230069704 .1.3.6.1.4.1.2021.4.27.0 = Counter64: 1117168 .1.3.6.1.4.1.2021.4.100.0 = INTEGER: 1 .1.3.6.1.4.1.2021.4.101.0 = STRING: "Running out of swap space (0)" diff --git a/tests/os/linux/snmp/memory.robot b/tests/os/linux/snmp/memory.robot index 1e98abd4e9..0131cf61c5 100644 --- a/tests/os/linux/snmp/memory.robot +++ b/tests/os/linux/snmp/memory.robot @@ -21,29 +21,52 @@ memory ${tc} ... --snmp-port=${SNMPPORT} ... --snmp-community=os/linux/snmp/linux ... --snmp-timeout=1 + ... --snmp-version=${snmpver} + ... --force-64bits-counters ... ${extra_options} Ctn Run Command And Check Result As Strings ${command} ${expected_result} - Examples: tc extra_options expected_result -- - ... 1 --verbose OK: Ram Total: 1.92 GB Used (-buffers/cache): 702.20 MB (35.70%) Free: 1.24 GB (64.30%), Buffer: 35.86 MB, Cached: 498.80 MB, Shared: 28.91 MB | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;;;0;2062598144 'used_prct'=35.70%;;;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;;;0; 'shared'=30310400B;;;0; - ... 2 --warning-usage='1' WARNING: Ram Total: 1.92 GB Used (-buffers/cache): 702.20 MB (35.70%) Free: 1.24 GB (64.30%) | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;;;0;2062598144 'used_prct'=35.70%;0:1;;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;;;0; 'shared'=30310400B;;;0; - ... 3 --warning-usage-free='1' WARNING: Ram Total: 1.92 GB Used (-buffers/cache): 702.20 MB (35.70%) Free: 1.24 GB (64.30%) | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;0:1;;0;2062598144 'used_prct'=35.70%;;;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;;;0; 'shared'=30310400B;;;0; - ... 4 --warning-usage-prct='1' WARNING: Ram Total: 1.92 GB Used (-buffers/cache): 702.20 MB (35.70%) Free: 1.24 GB (64.30%) | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;;;0;2062598144 'used_prct'=35.70%;0:1;;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;;;0; 'shared'=30310400B;;;0; - ... 5 --warning-swap='1' OK: Ram Total: 1.92 GB Used (-buffers/cache): 702.20 MB (35.70%) Free: 1.24 GB (64.30%), Buffer: 35.86 MB, Cached: 498.80 MB, Shared: 28.91 MB | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;;;0;2062598144 'used_prct'=35.70%;;;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;;;0; 'shared'=30310400B;;;0; - ... 6 --warning-swap-free='1' OK: Ram Total: 1.92 GB Used (-buffers/cache): 702.20 MB (35.70%) Free: 1.24 GB (64.30%), Buffer: 35.86 MB, Cached: 498.80 MB, Shared: 28.91 MB | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;;;0;2062598144 'used_prct'=35.70%;;;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;;;0; 'shared'=30310400B;;;0; - ... 7 --warning-swap-prct='0' OK: Ram Total: 1.92 GB Used (-buffers/cache): 702.20 MB (35.70%) Free: 1.24 GB (64.30%), Buffer: 35.86 MB, Cached: 498.80 MB, Shared: 28.91 MB | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;;;0;2062598144 'used_prct'=35.70%;;;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;;;0; 'shared'=30310400B;;;0; - ... 8 --warning-buffer='40' WARNING: Buffer: 35.86 MB | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;;;0;2062598144 'used_prct'=35.70%;;;0;100 'buffer'=37601280B;0:40;;0; 'cached'=523030528B;;;0; 'shared'=30310400B;;;0; - ... 9 --warning-cached='1' WARNING: Cached: 498.80 MB | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;;;0;2062598144 'used_prct'=35.70%;;;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;0:1;;0; 'shared'=30310400B;;;0; - ... 10 --warning-shared='1' WARNING: Shared: 28.91 MB | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;;;0;2062598144 'used_prct'=35.70%;;;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;;;0; 'shared'=30310400B;0:1;;0; - ... 11 --patch-redhat='1' OK: Ram Total: 1.92 GB Used (-buffers/cache): 1.21 GB (62.88%) Free: 730.19 MB (37.12%), Buffer: 35.86 MB, Cached: 498.80 MB, Shared: 28.91 MB | 'used'=1296941056B;;;0;2062598144 'free'=765657088B;;;0;2062598144 'used_prct'=62.88%;;;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;;;0; 'shared'=30310400B;;;0; - ... 12 --critical-usage='1' CRITICAL: Ram Total: 1.92 GB Used (-buffers/cache): 702.20 MB (35.70%) Free: 1.24 GB (64.30%) | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;;;0;2062598144 'used_prct'=35.70%;;0:1;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;;;0; 'shared'=30310400B;;;0; - ... 13 --critical-usage-free='1' CRITICAL: Ram Total: 1.92 GB Used (-buffers/cache): 702.20 MB (35.70%) Free: 1.24 GB (64.30%) | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;;0:1;0;2062598144 'used_prct'=35.70%;;;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;;;0; 'shared'=30310400B;;;0; - ... 14 --critical-usage-prct='1' CRITICAL: Ram Total: 1.92 GB Used (-buffers/cache): 702.20 MB (35.70%) Free: 1.24 GB (64.30%) | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;;;0;2062598144 'used_prct'=35.70%;;0:1;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;;;0; 'shared'=30310400B;;;0; - ... 15 --critical-swap='1' OK: Ram Total: 1.92 GB Used (-buffers/cache): 702.20 MB (35.70%) Free: 1.24 GB (64.30%), Buffer: 35.86 MB, Cached: 498.80 MB, Shared: 28.91 MB | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;;;0;2062598144 'used_prct'=35.70%;;;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;;;0; 'shared'=30310400B;;;0; - ... 16 --critical-swap-free='1' OK: Ram Total: 1.92 GB Used (-buffers/cache): 702.20 MB (35.70%) Free: 1.24 GB (64.30%), Buffer: 35.86 MB, Cached: 498.80 MB, Shared: 28.91 MB | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;;;0;2062598144 'used_prct'=35.70%;;;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;;;0; 'shared'=30310400B;;;0; - ... 17 --critical-swap-prct='1' OK: Ram Total: 1.92 GB Used (-buffers/cache): 702.20 MB (35.70%) Free: 1.24 GB (64.30%), Buffer: 35.86 MB, Cached: 498.80 MB, Shared: 28.91 MB | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;;;0;2062598144 'used_prct'=35.70%;;;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;;;0; 'shared'=30310400B;;;0; - ... 18 --critical-buffer='1' CRITICAL: Buffer: 35.86 MB | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;;;0;2062598144 'used_prct'=35.70%;;;0;100 'buffer'=37601280B;;0:1;0; 'cached'=523030528B;;;0; 'shared'=30310400B;;;0; - ... 19 --critical-cached='1' CRITICAL: Cached: 498.80 MB | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;;;0;2062598144 'used_prct'=35.70%;;;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;;0:1;0; 'shared'=30310400B;;;0; - ... 20 --critical-shared='1' CRITICAL: Shared: 28.91 MB | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;;;0;2062598144 'used_prct'=35.70%;;;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;;;0; 'shared'=30310400B;;0:1;0; - ... 21 --patch-redhat='1' OK: Ram Total: 1.92 GB Used (-buffers/cache): 1.21 GB (62.88%) Free: 730.19 MB (37.12%), Buffer: 35.86 MB, Cached: 498.80 MB, Shared: 28.91 MB | 'used'=1296941056B;;;0;2062598144 'free'=765657088B;;;0;2062598144 'used_prct'=62.88%;;;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;;;0; 'shared'=30310400B;;;0; \ No newline at end of file + Examples: tc snmpver extra_options expected_result -- + ... 1 1 --verbose OK: Ram Total: 1.92 GB Used (-buffers/cache): 702.20 MB (35.70%) Free: 1.24 GB (64.30%), Buffer: 35.86 MB, Cached: 498.80 MB, Shared: 28.91 MB | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;;;0;2062598144 'used_prct'=35.70%;;;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;;;0; 'shared'=30310400B;;;0; + ... 2 1 --warning-usage='1' WARNING: Ram Total: 1.92 GB Used (-buffers/cache): 702.20 MB (35.70%) Free: 1.24 GB (64.30%) | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;;;0;2062598144 'used_prct'=35.70%;0:1;;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;;;0; 'shared'=30310400B;;;0; + ... 3 1 --warning-usage-free='1' WARNING: Ram Total: 1.92 GB Used (-buffers/cache): 702.20 MB (35.70%) Free: 1.24 GB (64.30%) | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;0:1;;0;2062598144 'used_prct'=35.70%;;;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;;;0; 'shared'=30310400B;;;0; + ... 4 1 --warning-usage-prct='1' WARNING: Ram Total: 1.92 GB Used (-buffers/cache): 702.20 MB (35.70%) Free: 1.24 GB (64.30%) | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;;;0;2062598144 'used_prct'=35.70%;0:1;;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;;;0; 'shared'=30310400B;;;0; + ... 5 1 --warning-swap='1' OK: Ram Total: 1.92 GB Used (-buffers/cache): 702.20 MB (35.70%) Free: 1.24 GB (64.30%), Buffer: 35.86 MB, Cached: 498.80 MB, Shared: 28.91 MB | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;;;0;2062598144 'used_prct'=35.70%;;;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;;;0; 'shared'=30310400B;;;0; + ... 6 1 --warning-swap-free='1' OK: Ram Total: 1.92 GB Used (-buffers/cache): 702.20 MB (35.70%) Free: 1.24 GB (64.30%), Buffer: 35.86 MB, Cached: 498.80 MB, Shared: 28.91 MB | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;;;0;2062598144 'used_prct'=35.70%;;;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;;;0; 'shared'=30310400B;;;0; + ... 7 1 --warning-swap-prct='0' OK: Ram Total: 1.92 GB Used (-buffers/cache): 702.20 MB (35.70%) Free: 1.24 GB (64.30%), Buffer: 35.86 MB, Cached: 498.80 MB, Shared: 28.91 MB | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;;;0;2062598144 'used_prct'=35.70%;;;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;;;0; 'shared'=30310400B;;;0; + ... 8 1 --warning-buffer='40' WARNING: Buffer: 35.86 MB | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;;;0;2062598144 'used_prct'=35.70%;;;0;100 'buffer'=37601280B;0:40;;0; 'cached'=523030528B;;;0; 'shared'=30310400B;;;0; + ... 9 1 --warning-cached='1' WARNING: Cached: 498.80 MB | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;;;0;2062598144 'used_prct'=35.70%;;;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;0:1;;0; 'shared'=30310400B;;;0; + ... 10 1 --warning-shared='1' WARNING: Shared: 28.91 MB | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;;;0;2062598144 'used_prct'=35.70%;;;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;;;0; 'shared'=30310400B;0:1;;0; + ... 11 1 --patch-redhat='1' OK: Ram Total: 1.92 GB Used (-buffers/cache): 1.21 GB (62.88%) Free: 730.19 MB (37.12%), Buffer: 35.86 MB, Cached: 498.80 MB, Shared: 28.91 MB | 'used'=1296941056B;;;0;2062598144 'free'=765657088B;;;0;2062598144 'used_prct'=62.88%;;;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;;;0; 'shared'=30310400B;;;0; + ... 12 1 --critical-usage='1' CRITICAL: Ram Total: 1.92 GB Used (-buffers/cache): 702.20 MB (35.70%) Free: 1.24 GB (64.30%) | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;;;0;2062598144 'used_prct'=35.70%;;0:1;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;;;0; 'shared'=30310400B;;;0; + ... 13 1 --critical-usage-free='1' CRITICAL: Ram Total: 1.92 GB Used (-buffers/cache): 702.20 MB (35.70%) Free: 1.24 GB (64.30%) | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;;0:1;0;2062598144 'used_prct'=35.70%;;;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;;;0; 'shared'=30310400B;;;0; + ... 14 1 --critical-usage-prct='1' CRITICAL: Ram Total: 1.92 GB Used (-buffers/cache): 702.20 MB (35.70%) Free: 1.24 GB (64.30%) | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;;;0;2062598144 'used_prct'=35.70%;;0:1;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;;;0; 'shared'=30310400B;;;0; + ... 15 1 --critical-swap='1' OK: Ram Total: 1.92 GB Used (-buffers/cache): 702.20 MB (35.70%) Free: 1.24 GB (64.30%), Buffer: 35.86 MB, Cached: 498.80 MB, Shared: 28.91 MB | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;;;0;2062598144 'used_prct'=35.70%;;;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;;;0; 'shared'=30310400B;;;0; + ... 16 1 --critical-swap-free='1' OK: Ram Total: 1.92 GB Used (-buffers/cache): 702.20 MB (35.70%) Free: 1.24 GB (64.30%), Buffer: 35.86 MB, Cached: 498.80 MB, Shared: 28.91 MB | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;;;0;2062598144 'used_prct'=35.70%;;;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;;;0; 'shared'=30310400B;;;0; + ... 17 1 --critical-swap-prct='1' OK: Ram Total: 1.92 GB Used (-buffers/cache): 702.20 MB (35.70%) Free: 1.24 GB (64.30%), Buffer: 35.86 MB, Cached: 498.80 MB, Shared: 28.91 MB | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;;;0;2062598144 'used_prct'=35.70%;;;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;;;0; 'shared'=30310400B;;;0; + ... 18 1 --critical-buffer='1' CRITICAL: Buffer: 35.86 MB | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;;;0;2062598144 'used_prct'=35.70%;;;0;100 'buffer'=37601280B;;0:1;0; 'cached'=523030528B;;;0; 'shared'=30310400B;;;0; + ... 19 1 --critical-cached='1' CRITICAL: Cached: 498.80 MB | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;;;0;2062598144 'used_prct'=35.70%;;;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;;0:1;0; 'shared'=30310400B;;;0; + ... 20 1 --critical-shared='1' CRITICAL: Shared: 28.91 MB | 'used'=736309248B;;;0;2062598144 'free'=1326288896B;;;0;2062598144 'used_prct'=35.70%;;;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;;;0; 'shared'=30310400B;;0:1;0; + ... 21 1 --patch-redhat='1' OK: Ram Total: 1.92 GB Used (-buffers/cache): 1.21 GB (62.88%) Free: 730.19 MB (37.12%), Buffer: 35.86 MB, Cached: 498.80 MB, Shared: 28.91 MB | 'used'=1296941056B;;;0;2062598144 'free'=765657088B;;;0;2062598144 'used_prct'=62.88%;;;0;100 'buffer'=37601280B;;;0; 'cached'=523030528B;;;0; 'shared'=30310400B;;;0; + ... 22 2c --warning-usage='1' WARNING: Ram Total: 5.91 TB Used (-buffers/cache): 5.67 TB (96.04%) Free: 239.21 GB (3.96%) | 'used'=6236365832192B;;;0;6493217484800 'free'=256851652608B;;;0;6493217484800 'used_prct'=96.04%;0:1;;0;100 'buffer'=728276992B;;;0; 'cached'=235591376896B;;;0; 'shared'=9997410304B;;;0; + ... 23 2c --warning-usage-free='1' WARNING: Ram Total: 5.91 TB Used (-buffers/cache): 5.67 TB (96.04%) Free: 239.21 GB (3.96%) | 'used'=6236365832192B;;;0;6493217484800 'free'=256851652608B;0:1;;0;6493217484800 'used_prct'=96.04%;;;0;100 'buffer'=728276992B;;;0; 'cached'=235591376896B;;;0; 'shared'=9997410304B;;;0; + ... 24 2c --warning-usage-prct='1' WARNING: Ram Total: 5.91 TB Used (-buffers/cache): 5.67 TB (96.04%) Free: 239.21 GB (3.96%) | 'used'=6236365832192B;;;0;6493217484800 'free'=256851652608B;;;0;6493217484800 'used_prct'=96.04%;0:1;;0;100 'buffer'=728276992B;;;0; 'cached'=235591376896B;;;0; 'shared'=9997410304B;;;0; + ... 25 2c --warning-swap='1' OK: Ram Total: 5.91 TB Used (-buffers/cache): 5.67 TB (96.04%) Free: 239.21 GB (3.96%), Buffer: 694.54 MB, Cached: 219.41 GB, Shared: 9.31 GB | 'used'=6236365832192B;;;0;6493217484800 'free'=256851652608B;;;0;6493217484800 'used_prct'=96.04%;;;0;100 'buffer'=728276992B;;;0; 'cached'=235591376896B;;;0; 'shared'=9997410304B;;;0; + ... 26 2c --warning-swap-free='1' OK: Ram Total: 5.91 TB Used (-buffers/cache): 5.67 TB (96.04%) Free: 239.21 GB (3.96%), Buffer: 694.54 MB, Cached: 219.41 GB, Shared: 9.31 GB | 'used'=6236365832192B;;;0;6493217484800 'free'=256851652608B;;;0;6493217484800 'used_prct'=96.04%;;;0;100 'buffer'=728276992B;;;0; 'cached'=235591376896B;;;0; 'shared'=9997410304B;;;0; + ... 27 2c --warning-swap-prct='0' OK: Ram Total: 5.91 TB Used (-buffers/cache): 5.67 TB (96.04%) Free: 239.21 GB (3.96%), Buffer: 694.54 MB, Cached: 219.41 GB, Shared: 9.31 GB | 'used'=6236365832192B;;;0;6493217484800 'free'=256851652608B;;;0;6493217484800 'used_prct'=96.04%;;;0;100 'buffer'=728276992B;;;0; 'cached'=235591376896B;;;0; 'shared'=9997410304B;;;0; + ... 28 2c --warning-buffer='40' WARNING: Buffer: 694.54 MB | 'used'=6236365832192B;;;0;6493217484800 'free'=256851652608B;;;0;6493217484800 'used_prct'=96.04%;;;0;100 'buffer'=728276992B;0:40;;0; 'cached'=235591376896B;;;0; 'shared'=9997410304B;;;0; + ... 29 2c --warning-cached='1' WARNING: Cached: 219.41 GB | 'used'=6236365832192B;;;0;6493217484800 'free'=256851652608B;;;0;6493217484800 'used_prct'=96.04%;;;0;100 'buffer'=728276992B;;;0; 'cached'=235591376896B;0:1;;0; 'shared'=9997410304B;;;0; + ... 30 2c --warning-shared='1' WARNING: Shared: 9.31 GB | 'used'=6236365832192B;;;0;6493217484800 'free'=256851652608B;;;0;6493217484800 'used_prct'=96.04%;;;0;100 'buffer'=728276992B;;;0; 'cached'=235591376896B;;;0; 'shared'=9997410304B;0:1;;0; + ... 31 2c --patch-redhat='1' OK: Ram Total: 5.91 TB Used (-buffers/cache): 5.89 TB (99.68%) Free: 19.12 GB (0.32%), Buffer: 694.54 MB, Cached: 219.41 GB, Shared: 9.31 GB | 'used'=6472685486080B;;;0;6493217484800 'free'=20531998720B;;;0;6493217484800 'used_prct'=99.68%;;;0;100 'buffer'=728276992B;;;0; 'cached'=235591376896B;;;0; 'shared'=9997410304B;;;0; + ... 32 2c --critical-usage='1' CRITICAL: Ram Total: 5.91 TB Used (-buffers/cache): 5.67 TB (96.04%) Free: 239.21 GB (3.96%) | 'used'=6236365832192B;;;0;6493217484800 'free'=256851652608B;;;0;6493217484800 'used_prct'=96.04%;;0:1;0;100 'buffer'=728276992B;;;0; 'cached'=235591376896B;;;0; 'shared'=9997410304B;;;0; + ... 33 2c --critical-usage-free='1' CRITICAL: Ram Total: 5.91 TB Used (-buffers/cache): 5.67 TB (96.04%) Free: 239.21 GB (3.96%) | 'used'=6236365832192B;;;0;6493217484800 'free'=256851652608B;;0:1;0;6493217484800 'used_prct'=96.04%;;;0;100 'buffer'=728276992B;;;0; 'cached'=235591376896B;;;0; 'shared'=9997410304B;;;0; + ... 34 2c --critical-usage-prct='1' CRITICAL: Ram Total: 5.91 TB Used (-buffers/cache): 5.67 TB (96.04%) Free: 239.21 GB (3.96%) | 'used'=6236365832192B;;;0;6493217484800 'free'=256851652608B;;;0;6493217484800 'used_prct'=96.04%;;0:1;0;100 'buffer'=728276992B;;;0; 'cached'=235591376896B;;;0; 'shared'=9997410304B;;;0; + ... 35 2c --critical-swap='1' OK: Ram Total: 5.91 TB Used (-buffers/cache): 5.67 TB (96.04%) Free: 239.21 GB (3.96%), Buffer: 694.54 MB, Cached: 219.41 GB, Shared: 9.31 GB | 'used'=6236365832192B;;;0;6493217484800 'free'=256851652608B;;;0;6493217484800 'used_prct'=96.04%;;;0;100 'buffer'=728276992B;;;0; 'cached'=235591376896B;;;0; 'shared'=9997410304B;;;0; + ... 36 2c --critical-swap-free='1' OK: Ram Total: 5.91 TB Used (-buffers/cache): 5.67 TB (96.04%) Free: 239.21 GB (3.96%), Buffer: 694.54 MB, Cached: 219.41 GB, Shared: 9.31 GB | 'used'=6236365832192B;;;0;6493217484800 'free'=256851652608B;;;0;6493217484800 'used_prct'=96.04%;;;0;100 'buffer'=728276992B;;;0; 'cached'=235591376896B;;;0; 'shared'=9997410304B;;;0; + ... 37 2c --critical-swap-prct='1' OK: Ram Total: 5.91 TB Used (-buffers/cache): 5.67 TB (96.04%) Free: 239.21 GB (3.96%), Buffer: 694.54 MB, Cached: 219.41 GB, Shared: 9.31 GB | 'used'=6236365832192B;;;0;6493217484800 'free'=256851652608B;;;0;6493217484800 'used_prct'=96.04%;;;0;100 'buffer'=728276992B;;;0; 'cached'=235591376896B;;;0; 'shared'=9997410304B;;;0; + ... 38 2c --critical-buffer='1' CRITICAL: Buffer: 694.54 MB | 'used'=6236365832192B;;;0;6493217484800 'free'=256851652608B;;;0;6493217484800 'used_prct'=96.04%;;;0;100 'buffer'=728276992B;;0:1;0; 'cached'=235591376896B;;;0; 'shared'=9997410304B;;;0; + ... 39 2c --critical-cached='1' CRITICAL: Cached: 219.41 GB | 'used'=6236365832192B;;;0;6493217484800 'free'=256851652608B;;;0;6493217484800 'used_prct'=96.04%;;;0;100 'buffer'=728276992B;;;0; 'cached'=235591376896B;;0:1;0; 'shared'=9997410304B;;;0; + ... 40 2c --critical-shared='1' CRITICAL: Shared: 9.31 GB | 'used'=6236365832192B;;;0;6493217484800 'free'=256851652608B;;;0;6493217484800 'used_prct'=96.04%;;;0;100 'buffer'=728276992B;;;0; 'cached'=235591376896B;;;0; 'shared'=9997410304B;;0:1;0; + ... 41 2c --patch-redhat='1' OK: Ram Total: 5.91 TB Used (-buffers/cache): 5.89 TB (99.68%) Free: 19.12 GB (0.32%), Buffer: 694.54 MB, Cached: 219.41 GB, Shared: 9.31 GB | 'used'=6472685486080B;;;0;6493217484800 'free'=20531998720B;;;0;6493217484800 'used_prct'=99.68%;;;0;100 'buffer'=728276992B;;;0; 'cached'=235591376896B;;;0; 'shared'=9997410304B;;;0; + diff --git a/tests/resources/spellcheck/stopwords.txt b/tests/resources/spellcheck/stopwords.txt index 83a61c5dfe..1587b13fa7 100644 --- a/tests/resources/spellcheck/stopwords.txt +++ b/tests/resources/spellcheck/stopwords.txt @@ -22,6 +22,7 @@ --filter-imei --filter-vdom --filter-vm +--force-64bits-counters --force-counters32 --force-counters64 --force-oid @@ -49,6 +50,7 @@ --oid-display --oid-extra-display --oid-filter +--patch-redhat --scope-datacenter --sql-errors-exit --urlpath @@ -63,71 +65,23 @@ 2c 3CX ADSL -ASAM Alcatel +allCapacity Ansible +api.meraki.com +ASAM Avigilon Backbox -Centreon -DC4 -Datacore -FCCapacity -Fortigate -Fortinet -HPE -HashiCorp -IMEI -ISAM -IpAddr -Iwsva -JOBQ -Kubernetes -Loggly -MBean -MIB -MQTT -Meraki -Mosquitto -NLCapacity -NTLMv2 -NagVis -Nagios -Netscaler -OID -PKCS1 -Primera -QoS -RestAPI -RFC1628 -RRDCached -RestAPI -SNMP -SSDCapacity -SSH -Sansymphony -SureBackup -SysVol -TCP -Teldat -TrendMicro -UCD -VDSL2 -VM -VMware -VPN -Veeam -VeloCloud -WSMAN -XPath -allCapacity -api.meraki.com cardtemperature +Centreon connections-dhcp connections-dns cpu-utilization-1m cpu-utilization-5m cpu-utilization-5s +Datacore datasource +DC4 dcdiag deduplication deltaps @@ -135,34 +89,61 @@ df dfsrevent eth fanspeed +FCCapacity +Fortigate +Fortinet frsevent +HashiCorp hashicorpvault +HPE ifAlias ifDesc ifName +IMEI in-bcast in-mcast in-ucast interface-dsl-name +IpAddr ipv4 ipv6 +ISAM +Iwsva +JOBQ jobqueue jobqueues kccevent keepass Kubernetes +Kubernetes ldap license-instances-usage-prct +Loggly machineaccount +MBean +memAvailReal +memBuffer +memTotalReal +Meraki +MIB module-cellradio-csq module-cellradio-rscp module-cellradio-rsrp module-cellradio-rsrq module-cellradio-snr modules-cellradio-detected +Mosquitto +MQTT multiple -NTP +Nagios nagios +NagVis +net-snmp +Netscaler +NLCapacity +NTLMv2 +NTP +OID okta oneaccess-sys-mib out-bcast @@ -171,15 +152,30 @@ out-ucast overprovisioning perfdata physicaldrive +PKCS1 powershell powershell.exe prct +Primera proto psu +QoS queue-messages-inflighted +RestAPI +RestAPI +RFC1628 +RRDCached +Sansymphony sfp.temperature +SNMP space-usage-prct +SSDCapacity +SSH +SureBackup +SysVol +TCP teampass +Teldat timeframe topic-messages-inflighted total-offline-prct @@ -187,6 +183,8 @@ total-online-prct total-oper-down total-oper-up tower-cli +TrendMicro +UCD UDP uptime usage-prct @@ -194,8 +192,16 @@ userpass v1 v2 VDSL2 +VDSL2 +Veeam Veeam VeloCloud +VeloCloud +VM +VMware VMware +VPN vSAN -WSMAN \ No newline at end of file +WSMAN +WSMAN +XPath