Hello,
I discovered some errors when showing performance graphs. All the errors
were caused by colons in comments not being escaped. I fixed all the
comments I was able to discover and am attaching a patch for it.
Tomas "Fox!MURDER" Zvala
diff -ru jffnms-0.8.3-rc1/engine/configs/cisco_cc.inc.php
jffnms/engine/configs/cisco_cc.inc.php
--- jffnms-0.8.3-rc1/engine/configs/cisco_cc.inc.php 2006-06-05
01:16:24.000000000 +0200
+++ jffnms/engine/configs/cisco_cc.inc.php 2006-06-20 13:08:13.000000000
+0200
@@ -39,7 +39,7 @@
$result = snmp_get($ip,$rwcommunity,"$oid.10.999");
sleep(2);
}
- if (($result == 3) or (preg_match("^successful",$result))) return true;
+ if (($result == 3) or (preg_match("/^successful/",$result))) return
true;
return false;
}
?>
diff -ru jffnms-0.8.3-rc1/engine/graphs/acct_packets.inc.php
jffnms/engine/graphs/acct_packets.inc.php
--- jffnms-0.8.3-rc1/engine/graphs/acct_packets.inc.php 2006-06-05
01:16:24.000000000 +0200
+++ jffnms/engine/graphs/acct_packets.inc.php 2006-06-20 10:41:29.000000000
+0200
@@ -11,7 +11,7 @@
$opts_GRAPH = array(
"AREA:packets#00CC00:'Accounting Packets (Probably Outbound)\\n'",
- "GPRINT:packets:MAX:'Max\:%6.0lf %s:Pps'",
+ "GPRINT:packets:MAX:'Max\:%6.0lf %s\:Pps'",
"GPRINT:packets:AVERAGE:'Average\:%6.0lf %sPps'",
"GPRINT:packets:LAST:'Last\:%6.0lf %sPps'"
);
diff -ru jffnms-0.8.3-rc1/engine/graphs/cpu_util_aggregation.inc.php
jffnms/engine/graphs/cpu_util_aggregation.inc.php
--- jffnms-0.8.3-rc1/engine/graphs/cpu_util_aggregation.inc.php 2006-06-05
01:16:24.000000000 +0200
+++ jffnms/engine/graphs/cpu_util_aggregation.inc.php 2006-06-20
11:03:53.000000000 +0200
@@ -23,7 +23,7 @@
$opts_GRAPH = array(
$str_cdef_cpu,
- "COMMENT:'Number of Processors:".$cant."\\n'",
+ "COMMENT:'Number of Processors\:".$cant."\\n'",
"AREA:cpu#00CC00:'Average CPU Utilization '",
"LINE1:cpu#0000FF:''",
diff -ru jffnms-0.8.3-rc1/engine/graphs/rtt.inc.php
jffnms/engine/graphs/rtt.inc.php
--- jffnms-0.8.3-rc1/engine/graphs/rtt.inc.php 2006-06-05 01:16:24.000000000
+0200
+++ jffnms/engine/graphs/rtt.inc.php 2006-06-20 10:27:34.000000000 +0200
@@ -16,7 +16,7 @@
"GPRINT:rtt:LAST:'Last\:%5.0lf msec'"
);
- if (!empty($data["peer"])) $opts_GRAPH[]="COMMENT:'Peer IP Address:
".$data["peer"]."'";
+ if (!empty($data["peer"])) $opts_GRAPH[]="COMMENT:'Peer IP Address\:
".$data["peer"]."'";
$opts_header[] = "--vertical-label='RTT in Milliseconds'";
diff -ru jffnms-0.8.3-rc1/engine/graphs/traffic.inc.php
jffnms/engine/graphs/traffic.inc.php
--- jffnms-0.8.3-rc1/engine/graphs/traffic.inc.php 2006-06-05
01:16:24.000000000 +0200
+++ jffnms/engine/graphs/traffic.inc.php 2006-06-19 15:51:37.000000000
+0200
@@ -24,9 +24,9 @@
$opts_GRAPH_init=array(
"HRULE:".$data["bandwidthin"]. "#FF0000:' '",
- "COMMENT:'Inbound Bandwidth: ".($data["bandwidthin"] /1000)." kbps'",
+ "COMMENT:'Inbound Bandwidth\: ".($data["bandwidthin"] /1000)." kbps'",
"HRULE:".$data["bandwidthout"]."#AA0000:' '",
- "COMMENT:'Outbound Bandwidth:".($data["bandwidthout"]/1000)."
kbps".(!empty($data["address"])?" IP: ".$data["address"]:"")."\\n'",
+ "COMMENT:'Outbound Bandwidth\:".($data["bandwidthout"]/1000)."
kbps".(!empty($data["address"])?" IP\: ".$data["address"]:"")."\\n'",
);
// External Data Gathering
diff -ru jffnms-0.8.3-rc1/engine/graphs/traffic_aggregation.inc.php
jffnms/engine/graphs/traffic_aggregation.inc.php
--- jffnms-0.8.3-rc1/engine/graphs/traffic_aggregation.inc.php 2006-06-05
01:16:24.000000000 +0200
+++ jffnms/engine/graphs/traffic_aggregation.inc.php 2006-06-20
10:20:51.000000000 +0200
@@ -41,9 +41,9 @@
//"CDEF:total_outputbits=outputbits,UN,0,outputbits,IF,300,*,PREV,UN,0,PREV,IF,+",
"HRULE:$bandwidthin#FF0000:' '",
- "COMMENT:'Inbound Bandwidth: $bandwidthin_k kbps'",
+ "COMMENT:'Inbound Bandwidth\: $bandwidthin_k kbps'",
"HRULE:$bandwidthout#AA0000:' '",
- "COMMENT:'Outbound Bandwidth: $bandwidthout_k kbps\\n'",
+ "COMMENT:'Outbound Bandwidth\: $bandwidthout_k kbps\\n'",
(!empty($flip_comment))?"COMMENT:'$flip_legend\\n'":"",
"AREA:inputbits#00CC00:'Inbound '",
diff -ru jffnms-0.8.3-rc1/engine/graphs/traffic_pl.inc.php
jffnms/engine/graphs/traffic_pl.inc.php
--- jffnms-0.8.3-rc1/engine/graphs/traffic_pl.inc.php 2006-06-05
01:16:24.000000000 +0200
+++ jffnms/engine/graphs/traffic_pl.inc.php 2006-06-20 10:24:57.000000000
+0200
@@ -16,8 +16,8 @@
$opts_GRAPH = array(
"CDEF:inputbits=input,8,*",
"CDEF:outputbits=output,8,*",
- "HRULE:".$data["bandwidthin"]. "#55000:'Total Inbound Bandwidth\:
".($data["bandwidthin"] /1000)." kbps\\n'",
- "HRULE:".$data["bandwidthout"]."#99000:'Total Outbound Bandwidth\:
".($data["bandwidthout"]/1000)." kbps\\n'",
+ "HRULE:".$data["bandwidthin"]. "#550000:'Total Inbound Bandwidth\:
".($data["bandwidthin"] /1000)." kbps\\n'",
+ "HRULE:".$data["bandwidthout"]."#990000:'Total Outbound Bandwidth\:
".($data["bandwidthout"]/1000)." kbps\\n'",
"CDEF:plpor=plraw,2,*",
"CDEF:pldiv=plraw,2,/",
diff -ru jffnms-0.8.3-rc1/engine/graphs/ucd_cpu_linux_aggregation.inc.php
jffnms/engine/graphs/ucd_cpu_linux_aggregation.inc.php
--- jffnms-0.8.3-rc1/engine/graphs/ucd_cpu_linux_aggregation.inc.php
2006-06-05 01:16:24.000000000 +0200
+++ jffnms/engine/graphs/ucd_cpu_linux_aggregation.inc.php 2006-06-20
11:04:41.000000000 +0200
@@ -41,7 +41,7 @@
$str_cdef_system,
$str_cdef_idle,
- "COMMENT:'Number of Processors:".$cant."\\n'",
+ "COMMENT:'Number of Processors\:".$cant."\\n'",
"AREA:cpu_user#FF0000:'Average User CPU Time'",
"GPRINT:cpu_user:MAX:'Max\:%8.2lf %%'",
diff -ru jffnms-0.8.3-rc1/engine/graphs/ucd_load_average_aggregation.inc.php
jffnms/engine/graphs/ucd_load_average_aggregation.inc.php
--- jffnms-0.8.3-rc1/engine/graphs/ucd_load_average_aggregation.inc.php
2006-06-05 01:16:24.000000000 +0200
+++ jffnms/engine/graphs/ucd_load_average_aggregation.inc.php 2006-06-20
11:04:26.000000000 +0200
@@ -36,7 +36,7 @@
$str_cdef_5,
$str_cdef_15,
- "COMMENT:'Number of Processors:".$cant."\\n'",
+ "COMMENT:'Number of Processors\:".$cant."\\n'",
"LINE1:load_average_1#FF0000:' 1 Minute Load Average'",
"GPRINT:load_average_1:MAX:'Max\: %5.2lf'",
_______________________________________________
jffnms-users mailing list
jffnms-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jffnms-users
