Adding d/p/20_check_snmp_int_avaid_huge_amount_of_regex from upstream
This commit is contained in:
parent
a193b79f09
commit
fdc0108a3b
2 changed files with 94 additions and 0 deletions
93
debian/patches/20_check_snmp_int_avaid_huge_amount_of_regex
vendored
Normal file
93
debian/patches/20_check_snmp_int_avaid_huge_amount_of_regex
vendored
Normal file
|
|
@ -0,0 +1,93 @@
|
||||||
|
From c591f7d56378cbb40f1c3c23cbf23a8669a45730 Mon Sep 17 00:00:00 2001
|
||||||
|
From: kwork-er <88452982+kwork-er@users.noreply.github.com>
|
||||||
|
Date: Thu, 5 Aug 2021 21:53:43 +0200
|
||||||
|
Subject: [PATCH] Update check_snmp_int.pl
|
||||||
|
|
||||||
|
Effectively reverting commit 9f9b15a926d8795935b54626dc3ab9e5becb2763 and doing it in a different way that avoids adding huge amounts of regex, that may not run on older systems.
|
||||||
|
Removed the added " =~ s/\./_/r ", instead replacing the dots (.) in the regex that was meant for it in the first place -> line 967.
|
||||||
|
---
|
||||||
|
plugins/check_snmp_int.pl | 28 ++++++++++++++--------------
|
||||||
|
1 file changed, 14 insertions(+), 14 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/plugins/check_snmp_int.pl b/plugins/check_snmp_int.pl
|
||||||
|
index 271cfbc..71f8d14 100755
|
||||||
|
--- a/plugins/check_snmp_int.pl
|
||||||
|
+++ b/plugins/check_snmp_int.pl
|
||||||
|
@@ -964,7 +964,7 @@ sub check_options {
|
||||||
|
}
|
||||||
|
|
||||||
|
# Get rid of special caracters for performance in description
|
||||||
|
- $descr[$i] =~ s/'\/\(\)/_/g;
|
||||||
|
+ $descr[$i] =~ s/['\/\(\).]/_/g;
|
||||||
|
if (($int_status == $ok_val) || (defined($o_down) && $int_status == 2) || (defined($o_dormant) && $int_status == 5))
|
||||||
|
{
|
||||||
|
$num_ok++;
|
||||||
|
@@ -979,12 +979,12 @@ sub check_options {
|
||||||
|
$warn_factor /= $speed_real;
|
||||||
|
$warn_factor *= 100; # now turn into displayed % : 0,1 = 10%
|
||||||
|
}
|
||||||
|
- $perf_out .= "'" . $descr[$i] =~ s/\./_/r . "_in_prct'=";
|
||||||
|
+ $perf_out .= "'" . $descr[$i] . "_in_prct'=";
|
||||||
|
$perf_out .= sprintf("%.0f", $checkperf_out_raw[0] * 800 / $speed_real) . "%;";
|
||||||
|
$perf_out .= ($o_warn[0] != 0) ? sprintf("%.0f", $o_warn[0] * $warn_factor) . ";" : ";";
|
||||||
|
$perf_out .= ($o_crit[0] != 0) ? sprintf("%.0f", $o_crit[0] * $warn_factor) . ";" : ";";
|
||||||
|
$perf_out .= "0;100 ";
|
||||||
|
- $perf_out .= "'" . $descr[$i] =~ s/\./_/r . "_out_prct'=";
|
||||||
|
+ $perf_out .= "'" . $descr[$i] . "_out_prct'=";
|
||||||
|
$perf_out .= sprintf("%.0f", $checkperf_out_raw[1] * 800 / $speed_real) . "%;";
|
||||||
|
$perf_out .= ($o_warn[1] != 0) ? sprintf("%.0f", $o_warn[1] * $warn_factor) . ";" : ";";
|
||||||
|
$perf_out .= ($o_crit[1] != 0) ? sprintf("%.0f", $o_crit[1] * $warn_factor) . ";" : ";";
|
||||||
|
@@ -1000,12 +1000,12 @@ sub check_options {
|
||||||
|
} else { # just convert from K|M|G bps
|
||||||
|
$warn_factor = (defined($o_meg)) ? 1000000 : (defined($o_gig)) ? 1000000000 : 1000;
|
||||||
|
}
|
||||||
|
- $perf_out .= "'" . $descr[$i] =~ s/\./_/r . "_in_bps'=";
|
||||||
|
+ $perf_out .= "'" . $descr[$i] . "_in_bps'=";
|
||||||
|
$perf_out .= sprintf("%.0f", $checkperf_out_raw[0] * 8) . ";";
|
||||||
|
$perf_out .= ($o_warn[0] != 0) ? $o_warn[0] * $warn_factor . ";" : ";";
|
||||||
|
$perf_out .= ($o_crit[0] != 0) ? $o_crit[0] * $warn_factor . ";" : ";";
|
||||||
|
$perf_out .= "0;" . $speed_real . " ";
|
||||||
|
- $perf_out .= "'" . $descr[$i] =~ s/\./_/r . "_out_bps'=";
|
||||||
|
+ $perf_out .= "'" . $descr[$i] . "_out_bps'=";
|
||||||
|
$perf_out .= sprintf("%.0f", $checkperf_out_raw[1] * 8) . ";";
|
||||||
|
$perf_out .= ($o_warn[1] != 0) ? $o_warn[1] * $warn_factor . ";" : ";";
|
||||||
|
$perf_out .= ($o_crit[1] != 0) ? $o_crit[1] * $warn_factor . ";" : ";";
|
||||||
|
@@ -1017,29 +1017,29 @@ sub check_options {
|
||||||
|
} else { # just convert from K|M|G bps
|
||||||
|
$warn_factor = (defined($o_meg)) ? 1048576 : (defined($o_gig)) ? 1073741824 : 1024;
|
||||||
|
}
|
||||||
|
- $perf_out .= "'" . $descr[$i] =~ s/\./_/r . "_in_Bps'=" . sprintf("%.0f", $checkperf_out_raw[0]) . ";";
|
||||||
|
+ $perf_out .= "'" . $descr[$i] . "_in_Bps'=" . sprintf("%.0f", $checkperf_out_raw[0]) . ";";
|
||||||
|
$perf_out .= ($o_warn[0] != 0) ? $o_warn[0] * $warn_factor . ";" : ";";
|
||||||
|
$perf_out .= ($o_crit[0] != 0) ? $o_crit[0] * $warn_factor . ";" : ";";
|
||||||
|
$perf_out .= "0;" . $speed_real / 8 . " ";
|
||||||
|
- $perf_out .= "'" . $descr[$i] =~ s/\./_/r . "_out_Bps'=" . sprintf("%.0f", $checkperf_out_raw[1]) . ";";
|
||||||
|
+ $perf_out .= "'" . $descr[$i] . "_out_Bps'=" . sprintf("%.0f", $checkperf_out_raw[1]) . ";";
|
||||||
|
$perf_out .= ($o_warn[1] != 0) ? $o_warn[1] * $warn_factor . ";" : ";";
|
||||||
|
$perf_out .= ($o_crit[1] != 0) ? $o_crit[1] * $warn_factor . ";" : ";";
|
||||||
|
$perf_out .= "0;" . $speed_real / 8 . " ";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else { # output in octet counter
|
||||||
|
- $perf_out .= "'" . $descr[$i] =~ s/\./_/r . "_in_octet'=" . $$result{ $oid_perf_inoct[$i] } . "c ";
|
||||||
|
- $perf_out .= "'" . $descr[$i] =~ s/\./_/r . "_out_octet'=" . $$result{ $oid_perf_outoct[$i] } . "c ";
|
||||||
|
+ $perf_out .= "'" . $descr[$i] . "_in_octet'=" . $$result{ $oid_perf_inoct[$i] } . "c ";
|
||||||
|
+ $perf_out .= "'" . $descr[$i] . "_out_octet'=" . $$result{ $oid_perf_outoct[$i] } . "c ";
|
||||||
|
}
|
||||||
|
if (defined($o_perfe)) {
|
||||||
|
- $perf_out .= "'" . $descr[$i] =~ s/\./_/r . "_in_error'=" . $$result{ $oid_perf_inerr[$i] } . "c ";
|
||||||
|
- $perf_out .= "'" . $descr[$i] =~ s/\./_/r . "_in_discard'=" . $$result{ $oid_perf_indisc[$i] } . "c ";
|
||||||
|
- $perf_out .= "'" . $descr[$i] =~ s/\./_/r . "_out_error'=" . $$result{ $oid_perf_outerr[$i] } . "c ";
|
||||||
|
- $perf_out .= "'" . $descr[$i] =~ s/\./_/r . "_out_discard'=" . $$result{ $oid_perf_outdisc[$i] } . "c ";
|
||||||
|
+ $perf_out .= "'" . $descr[$i] . "_in_error'=" . $$result{ $oid_perf_inerr[$i] } . "c ";
|
||||||
|
+ $perf_out .= "'" . $descr[$i] . "_in_discard'=" . $$result{ $oid_perf_indisc[$i] } . "c ";
|
||||||
|
+ $perf_out .= "'" . $descr[$i] . "_out_error'=" . $$result{ $oid_perf_outerr[$i] } . "c ";
|
||||||
|
+ $perf_out .= "'" . $descr[$i] . "_out_discard'=" . $$result{ $oid_perf_outdisc[$i] } . "c ";
|
||||||
|
}
|
||||||
|
if (defined($o_perfs)) {
|
||||||
|
$speed_real = "" unless (defined($speed_real));
|
||||||
|
- $perf_out .= "'" . $descr[$i] =~ s/\./_/r . "_speed_bps'=" . $speed_real . " ";
|
||||||
|
+ $perf_out .= "'" . $descr[$i] . "_speed_bps'=" . $speed_real . " ";
|
||||||
|
}
|
||||||
|
if (defined($o_weather) && $usable_data == 1) {
|
||||||
|
$perf_out .= "in=" . sprintf("%.0f", $checkperf_out_raw[0]) . ";;;0;" . sprintf("%.0f", $speed_real / 8) . " ";
|
||||||
1
debian/patches/series
vendored
1
debian/patches/series
vendored
|
|
@ -8,5 +8,6 @@
|
||||||
17_check_snmp_storage_okifempty
|
17_check_snmp_storage_okifempty
|
||||||
18_check_snmp_int_fix_perf_out
|
18_check_snmp_int_fix_perf_out
|
||||||
19_check_snmp_int_remove_unneeded_my
|
19_check_snmp_int_remove_unneeded_my
|
||||||
|
20_check_snmp_int_avaid_huge_amount_of_regex
|
||||||
50_disable_epn
|
50_disable_epn
|
||||||
51_fix_privacy_doc
|
51_fix_privacy_doc
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue