mirror of
https://github.com/centreon/centreon-plugins.git
synced 2025-09-21 08:47:57 +02:00
minor fixes
This commit is contained in:
parent
29d1a79937
commit
4b0cff8468
@ -13,7 +13,7 @@ ${CMD} /usr/lib/centreon/plugins/centreon_linux_snmp.pl --plugin=os::linux:
|
||||
|
||||
|
||||
*** Test Cases ***
|
||||
list-diskspath ${tc}
|
||||
list-diskspath-connector ${tc}
|
||||
[Tags] os linux
|
||||
${command} Catenate
|
||||
... ${CMD}
|
||||
|
@ -13,7 +13,7 @@ ${CMD} /usr/lib/centreon/plugins/centreon_linux_snmp.pl --plugin=os::linux:
|
||||
|
||||
|
||||
*** Test Cases ***
|
||||
list-interfaces ${tc}
|
||||
list-interfaces-connector ${tc}
|
||||
[Tags] os linux
|
||||
${command} Catenate
|
||||
... ${CMD}
|
||||
|
@ -13,7 +13,7 @@ ${CMD} /usr/lib/centreon/plugins/centreon_linux_snmp.pl --plugin=os::linux:
|
||||
|
||||
|
||||
*** Test Cases ***
|
||||
swap ${tc}
|
||||
swap-connector ${tc}
|
||||
[Tags] os linux
|
||||
${command} Catenate
|
||||
... ${CMD}
|
||||
|
@ -12,7 +12,7 @@ ${CMD} /usr/lib/centreon/plugins/centreon_linux_snmp.pl --plugin=os::linux:
|
||||
|
||||
|
||||
*** Test Cases ***
|
||||
time ${tc}
|
||||
time-connector ${tc}
|
||||
[Tags] os linux
|
||||
${command} Catenate
|
||||
... ${CMD}
|
||||
|
@ -31,7 +31,7 @@ cpu ${tc}
|
||||
... 3 --critical-average OK: 1 CPU(s) average usage is 2.00 % - CPU '0' usage : 2.00 % | 'total_cpu_avg'=2.00%;;;0;100 'cpu'=2.00%;;;0;100
|
||||
... 4 --warning-core OK: 1 CPU(s) average usage is 2.00 % - CPU '0' usage : 2.00 % | 'total_cpu_avg'=2.00%;;;0;100 'cpu'=2.00%;;;0;100
|
||||
... 5 --critical-core OK: 1 CPU(s) average usage is 2.00 % - CPU '0' usage : 2.00 % | 'total_cpu_avg'=2.00%;;;0;100 'cpu'=2.00%;;;0;100
|
||||
... 6 --verbose OK: 1 CPU(s) average usage is 2.00 % - CPU '0' usage : 2.00 % | 'total_cpu_avg'=2.00%;;;0;100 'cpu'=2.00%;;;0;100 CPU '0' usage : 2.00 %
|
||||
... 6 --verbose OK: 1 CPU(s) average usage is 2.00 % - CPU '0' usage : 2.00 % | 'total_cpu_avg'=2.00%;;;0;100 'cpu'=2.00%;;;0;100
|
||||
... 7 --warning-average='0' WARNING: 1 CPU(s) average usage is 2.00 % | 'total_cpu_avg'=2.00%;0:0;;0;100 'cpu'=2.00%;;;0;100
|
||||
... 8 --critical-average='0' CRITICAL: 1 CPU(s) average usage is 2.00 % | 'total_cpu_avg'=2.00%;;0:0;0;100 'cpu'=2.00%;;;0;100
|
||||
... 9 --warning-core='0' WARNING: CPU '0' usage : 2.00 % | 'total_cpu_avg'=2.00%;;;0;100 'cpu'=2.00%;0:0;;0;100
|
||||
|
@ -31,7 +31,7 @@ cpu ${tc}
|
||||
... 3 --critical-average OK: 1 CPU(s) average usage is 2.00 % - CPU '0' usage : 2.00 % | 'total_cpu_avg'=2.00%;;;0;100 'cpu'=2.00%;;;0;100
|
||||
... 4 --warning-core OK: 1 CPU(s) average usage is 2.00 % - CPU '0' usage : 2.00 % | 'total_cpu_avg'=2.00%;;;0;100 'cpu'=2.00%;;;0;100
|
||||
... 5 --critical-core OK: 1 CPU(s) average usage is 2.00 % - CPU '0' usage : 2.00 % | 'total_cpu_avg'=2.00%;;;0;100 'cpu'=2.00%;;;0;100
|
||||
... 6 --verbose OK: 1 CPU(s) average usage is 2.00 % - CPU '0' usage : 2.00 % | 'total_cpu_avg'=2.00%;;;0;100 'cpu'=2.00%;;;0;100 CPU '0' usage : 2.00 %
|
||||
... 6 --verbose OK: 1 CPU(s) average usage is 2.00 % - CPU '0' usage : 2.00 % | 'total_cpu_avg'=2.00%;;;0;100 'cpu'=2.00%;;;0;100
|
||||
... 7 --warning-average='0' WARNING: 1 CPU(s) average usage is 2.00 % | 'total_cpu_avg'=2.00%;0:0;;0;100 'cpu'=2.00%;;;0;100
|
||||
... 8 --critical-average='0' CRITICAL: 1 CPU(s) average usage is 2.00 % | 'total_cpu_avg'=2.00%;;0:0;0;100 'cpu'=2.00%;;;0;100
|
||||
... 9 --warning-core='0' WARNING: CPU '0' usage : 2.00 % | 'total_cpu_avg'=2.00%;;;0;100 'cpu'=2.00%;0:0;;0;100
|
||||
|
@ -204,7 +204,7 @@ def ctn_extract_multiline_result_from_log(tc, log_path="/tmp/connector.log", out
|
||||
result_lines.append(m.group(2).strip())
|
||||
in_result = True
|
||||
else:
|
||||
if line.strip().startswith("error:") or re.match(r"^\d+ \[.*", line):
|
||||
if line.strip().startswith("error:") or re.match(r"^\d+ \[20.*", line):
|
||||
break
|
||||
result_lines.append(line.strip())
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user