summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorSven Nierlein <sven@nierlein.de>2012-06-26 22:02:09 (GMT)
committerSven Nierlein <sven@nierlein.de>2012-06-26 22:02:09 (GMT)
commit843f9540562930391b7db224664adbf951f11275 (patch)
treea716cf76399c9c271699a45d79fde1387e4837b3 /plugins
parent9c886d049d1dec9be0ac147c57d2094d2d4773da (diff)
downloadmonitoring-plugins-843f9540562930391b7db224664adbf951f11275.tar.gz
check_snmp: use single quotes for perf data labels
Diffstat (limited to 'plugins')
-rw-r--r--plugins/check_snmp.c6
-rwxr-xr-xplugins/tests/check_snmp.t6
2 files changed, 8 insertions, 4 deletions
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index 51ad6f4..a5a88d2 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -494,10 +494,10 @@ main (int argc, char **argv)
494 if (strpbrk (temp_string, " ='\"") == NULL) { 494 if (strpbrk (temp_string, " ='\"") == NULL) {
495 strncat(perfstr, temp_string, sizeof(perfstr)-strlen(perfstr)-1); 495 strncat(perfstr, temp_string, sizeof(perfstr)-strlen(perfstr)-1);
496 } else { 496 } else {
497 if (strpbrk (temp_string, "\"") == NULL) { 497 if (strpbrk (temp_string, "'") == NULL) {
498 quote_string="\"";
499 } else {
500 quote_string="'"; 498 quote_string="'";
499 } else {
500 quote_string="\"";
501 } 501 }
502 strncat(perfstr, quote_string, sizeof(perfstr)-strlen(perfstr)-1); 502 strncat(perfstr, quote_string, sizeof(perfstr)-strlen(perfstr)-1);
503 strncat(perfstr, temp_string, sizeof(perfstr)-strlen(perfstr)-1); 503 strncat(perfstr, temp_string, sizeof(perfstr)-strlen(perfstr)-1);
diff --git a/plugins/tests/check_snmp.t b/plugins/tests/check_snmp.t
index 7a5a8b3..1ef0b20 100755
--- a/plugins/tests/check_snmp.t
+++ b/plugins/tests/check_snmp.t
@@ -8,7 +8,7 @@ use Test::More;
8use NPTest; 8use NPTest;
9use FindBin qw($Bin); 9use FindBin qw($Bin);
10 10
11my $tests = 51; 11my $tests = 53;
12# Check that all dependent modules are available 12# Check that all dependent modules are available
13eval { 13eval {
14 require NetSNMP::OID; 14 require NetSNMP::OID;
@@ -165,6 +165,10 @@ $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1
165is($res->return_code, 0, "OK as no thresholds" ); 165is($res->return_code, 0, "OK as no thresholds" );
166is($res->output, "SNMP OK - 70660 | iso.3.6.1.4.1.8072.3.2.67.10=70660c ", "Check label"); 166is($res->output, "SNMP OK - 70660 | iso.3.6.1.4.1.8072.3.2.67.10=70660c ", "Check label");
167 167
168$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 -l 'test test'" );
169is($res->return_code, 0, "OK as no thresholds" );
170is($res->output, "SNMP OK - test test 71326 | 'test test'=71326c ", "Check label");
171
168 172
169$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 --rate -l inoctets_per_minute --rate-multiplier=60" ); 173$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 --rate -l inoctets_per_minute --rate-multiplier=60" );
170is($res->return_code, 0, "OK for first call" ); 174is($res->return_code, 0, "OK for first call" );