summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2009-01-31 19:09:39 -0500
committerChris Buechler <cmb@pfsense.org>2009-01-31 19:09:39 -0500
commitbc9b5f338087dab3d75d3ebbaabfc24ca283ec25 (patch)
tree9755dbbc916592fbb59a65c7e503ddf4009ddd78 /etc
parent8fc66a00846538542ee808ba3f2715a17069d2c2 (diff)
downloadpfsense-bc9b5f338087dab3d75d3ebbaabfc24ca283ec25.zip
pfsense-bc9b5f338087dab3d75d3ebbaabfc24ca283ec25.tar.gz
fix CPU RRD graphs
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/pfsense-utils.inc19
1 files changed, 5 insertions, 14 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index 6a27b46..b22aaca 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -3300,20 +3300,11 @@ function enable_rrd_graphing() {
}
/* the CPU stats gathering function. */
- $rrdupdatesh .= "`$top -d 2 -s 1 0 | $awk '{gsub(/%/, \"\")} BEGIN { ";
- $rrdupdatesh .= "printf \"$rrdtool update $rrddbpath$ifname$proc \" } ";
- $rrdupdatesh .= "{ if ( \$2 == \"processes:\" ) { ";
- $rrdupdatesh .= "processes = \$1; ";
- $rrdupdatesh .= "} ";
- $rrdupdatesh .= "else if ( \$1 == \"CPU\" ) { ";
- $rrdupdatesh .= "user = \$3; ";
- $rrdupdatesh .= "nice = \$5; ";
- $rrdupdatesh .= "sys = \$7; ";
- $rrdupdatesh .= "interrupt = \$9; ";
- $rrdupdatesh .= "} ";
- $rrdupdatesh .= "} END { ";
- $rrdupdatesh .= "printf \"N:\"user\":\"nice\":\"sys\":\"interrupt\":\"processes ";
- $rrdupdatesh .= "}'`\n\n";
+ $rrdupdatesh .= "`$top -d 2 -s 1 0 | $awk '{gsub(/%/, \"\")} BEGIN { \\\n";
+ $rrdupdatesh .= "printf \"$rrdtool update $rrddbpath$ifname$proc \" } \\\n";
+ $rrdupdatesh .= "{ if ( \$2 == \"processes:\" ) { processes = \$1; } \\\n";
+ $rrdupdatesh .= "else if ( \$1 == \"CPU:\" ) { user = \$2; nice = \$4; sys = \$6; interrupt = \$8; } \\\n";
+ $rrdupdatesh .= "} END { printf \"N:\"user\":\"nice\":\"sys\":\"interrupt\":\"processes }'`\n\n";
/* End CPU statistics */
OpenPOWER on IntegriCloud