Project

General

Profile

« Previous | Next » 

Revision af543bcb

Added by Scott Ullrich about 19 years ago

MFC 12473
Adjusted rrd graph width so they fit in the pfsense theme as well.

View differences:

usr/local/www/status_rrd_graph_img.php
119 119 
		--start -$seconds -e -$average \\
120 120 
		--vertical-label \"bits/sec\" \\
121 121 
		--title \"`hostname` - $curgraph - $interval\" \\
122 
		--height 100 --width 650 -x \"$scale\" \\
122 
		--height 100 --width 620 -x \"$scale\" \\
123 123 
		DEF:$curif-in_bytes=$rrddbpath$curif$traffic:in:AVERAGE \\
124 124 
		DEF:$curif-out_bytes=$rrddbpath$curif$traffic:out:AVERAGE \\
125 125 
		\"CDEF:$curif-in_bits=$curif-in_bytes,8,*\" \\
......
154 154 
		GPRINT:$curif-bits_io:LAST:'%7.2lf %sb/s'\\
155 155 
		GPRINT:$curif-bytes_t:AVERAGE:'%7.2lf %sB t'\\
156 156 
        	COMMENT:\"\\n\"\\
157 
		COMMENT:\"\t\t\t\t\t\t\t\t\t\t\t\t\t\t`date +\"%b %d %H\:%M\:%S %Y\"`\"";
157 
		COMMENT:\"\t\t\t\t\t\t\t\t\t\t\t\t\t`date +\"%b %d %H\:%M\:%S %Y\"`\"";
158 158 
	}
159 159 
elseif(($curgraph == "packets") && (file_exists("$rrddbpath$curif$packets"))) {
160 160 
	/* define graphcmd for packets stats */
......
162 162 
		--start -$seconds -e -$average \\
163 163 
		--vertical-label \"packets/sec\" \\
164 164 
		--title \"`hostname` - $curgraph - $interval\" \\
165 
		--height 100 --width 650 -x \"$scale\" \\
165 
		--height 100 --width 620 -x \"$scale\" \\
166 166 
		DEF:$curif-in_pps=$rrddbpath$curif$packets:in:AVERAGE \\
167 167 
		DEF:$curif-out_pps=$rrddbpath$curif$packets:out:AVERAGE \\
168 168 
		\"CDEF:$curif-out_pps_neg=$curif-out_pps,-1,*\" \\
......
195 195 
		GPRINT:$curif-pps_io:LAST:'%7.2lf %s pps'\\
196 196 
		GPRINT:$curif-pps_t:AVERAGE:'%7.2lf %s pkts'\\
197 197 
        	COMMENT:\"\\n\"\\
198 
		COMMENT:\"\t\t\t\t\t\t\t\t\t\t\t\t\t\t`date +\"%b %d %H\:%M\:%S %Y\"`\"";
198 
		COMMENT:\"\t\t\t\t\t\t\t\t\t\t\t\t\t`date +\"%b %d %H\:%M\:%S %Y\"`\"";
199 199 
	}
200 200 
elseif(($curgraph == "queues") && (file_exists("$rrddbpath$curif$queues"))) {
201 201 
	/* define graphcmd for queue stats */
......
203 203 
		--start -$seconds -e -$average \\
204 204 
		--vertical-label \"bits/sec\" \\
205 205 
		--title \"`hostname` - $curgraph - $interval\" \\
206 
		--height 200 --width 650 -x \"$scale\" \\";
206 
		--height 200 --width 620 -x \"$scale\" \\";
207 207 
		if (!is_array($config['shaper']['queue'])) {
208 208 
			$config['shaper']['queue'] = array();
209 209 
		}
......
243 243 
			}
244 244 
		}
245 245 
		$graphcmd .= "COMMENT:\"\\n\" \\";
246 
		$graphcmd .= "COMMENT:\"\t\t\t\t\t\t\t\t\t\t\t\t\t\t`date +\"%b %d %H\:%M\:%S %Y\"`\"";
246 
		$graphcmd .= "COMMENT:\"\t\t\t\t\t\t\t\t\t\t\t\t\t`date +\"%b %d %H\:%M\:%S %Y\"`\"";
247 247 
	}
248 248 
elseif(($curgraph == "quality") && (file_exists("$rrddbpath$curif$quality"))) {
249 249 
	/* make a link quality graphcmd, we only have WAN for now, others too follow */
......
251 251 
		--start -$seconds -e -$average \\
252 252 
		--title=\"Link quality last $interval for $curif\" \\
253 253 
		--vertical-label \"ms / %\" \\
254 
		--height 100 --width 650 \\
254 
		--height 100 --width 620 \\
255 255 
		-x \"$scale\" --lower-limit 0 \\
256 256 
		DEF:roundtrip=$rrddbpath$curif$quality:roundtrip:AVERAGE \\
257 257 
		DEF:loss=$rrddbpath$curif$quality:loss:AVERAGE \\
......
292 292 
		AREA:loss10#ee0000:\"Packet loss\\n\" \\
293 293 
		COMMENT:\"  \" \\
294 294 
		LINE1:roundtrip#000000:\"roundtrip average\\n\" \\
295 
		COMMENT:\"\t\t\t\t\t\t\t\t\t\t\t\t\t\t`date +\"%b %d %H\:%M\:%S %Y\"`\"";
295 
		COMMENT:\"\t\t\t\t\t\t\t\t\t\t\t\t\t`date +\"%b %d %H\:%M\:%S %Y\"`\"";
296 296 
	}
297 297 
elseif(($curgraph == "spamd") && (file_exists("$rrddbpath$spamd"))) {
298 298 
	/* graph a spamd statistics graph */
......
300 300 
		--start -$seconds -e -$average \\
301 301 
		--title=\"Spamd statistics for last $interval\" \\
302 302 
		--vertical-label=\"Conn / Time, sec.\" \\
303 
		--height 150 --width 650 --no-gridfit \\
303 
		--height 150 --width 620 --no-gridfit \\
304 304 
		-x \"$scale\" --lower-limit 0  \\
305 305 
		DEF:consmin=$rrddbpath$spamd:conn:MIN \\
306 306 
		DEF:consavg=$rrddbpath$spamd:conn:AVERAGE \\
......
330 330 
		GPRINT:consmin:MIN:\"Min\\:%6.2lf\\t\" \\
331 331 
		GPRINT:consavg:AVERAGE:\"Avg\\:%6.2lf\\t\" \\
332 332 
		GPRINT:consmax:MAX:\"Max\\:%6.2lf\\n\" \\
333 
		COMMENT:\"\t\t\t\t\t\t\t\t\t\t\t\t\t\t`date +\"%b %d %H\:%M\:%S %Y\"`\"";
333 
		COMMENT:\"\t\t\t\t\t\t\t\t\t\t\t\t\t`date +\"%b %d %H\:%M\:%S %Y\"`\"";
334 334 
	}
335 335 
else
336 336 
	{

Also available in: Unified diff