From 245fc36ea814eb8761134a5fd700566bc4beec93 Mon Sep 17 00:00:00 2001
From: Jordi Sanfeliu <jordi@fibranet.cat>
Date: Tue, 18 Dec 2012 17:33:35 +0100
Subject: [PATCH] 3.0: added support for 'lighttpd' graph

---
 3.0/lib/lighttpd.pm | 575 ++++++++++++++++++++++++++++++++++++++++++++
 3.0/monitorix.conf  |  12 +-
 2 files changed, 580 insertions(+), 7 deletions(-)
 create mode 100644 3.0/lib/lighttpd.pm

diff --git a/3.0/lib/lighttpd.pm b/3.0/lib/lighttpd.pm
new file mode 100644
index 0000000..2f2b5e3
--- /dev/null
+++ b/3.0/lib/lighttpd.pm
@@ -0,0 +1,575 @@
+#
+# Monitorix - A lightweight system monitoring tool.
+#
+# Copyright (C) 2005-2012 by Jordi Sanfeliu <jordi@fibranet.cat>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+package lighttpd;
+
+use strict;
+use warnings;
+use Monitorix;
+use RRDs;
+use LWP::UserAgent;
+use Exporter 'import';
+our @EXPORT = qw(lighttpd_init lighttpd_update lighttpd_cgi);
+
+sub lighttpd_init {
+	my $myself = (caller(0))[3];
+	my ($package, $config, $debug) = @_;
+	my $rrd = $config->{base_lib} . $package . ".rrd";
+	my $lighttpd = $config->{lighttpd};
+
+	my $info;
+	my @ds;
+	my @tmp;
+	my $n;
+
+	if(!scalar(my @ll = split(',', $lighttpd->{list}))) {
+		logger("$myself: ERROR: missing or not defined 'list' option.");
+		return 0;
+	}
+
+	if(-e $rrd) {
+		$info = RRDs::info($rrd);
+		for my $key (keys %$info) {
+			if(index($key, 'ds[') == 0) {
+				if(index($key, '.type') != -1) {
+					push(@ds, substr($key, 3, index($key, ']') - 3));
+				}
+			}
+		}
+		if(scalar(@ds) / 9 != scalar(my @ll = split(',', $lighttpd->{list}))) {
+			logger("Detected size mismatch between 'list' option (" . scalar(my @ll = split(',', $lighttpd->{list})) . ") and $rrd (" . scalar(@ds) / 9 . "). Resizing it accordingly. All historic data will be lost. Backup file created.");
+			rename($rrd, "$rrd.bak");
+		}
+	}
+
+	if(!(-e $rrd)) {
+		logger("Creating '$rrd' file.");
+		for($n = 0; $n < scalar(my @ll = split(',', $lighttpd->{list})); $n++) {
+			push(@tmp, "DS:lighttpd" . $n . "_acc:GAUGE:120:0:U");
+			push(@tmp, "DS:lighttpd" . $n . "_kb:GAUGE:120:0:U");
+			push(@tmp, "DS:lighttpd" . $n . "_busy:GAUGE:120:0:U");
+			push(@tmp, "DS:lighttpd" . $n . "_idle:GAUGE:120:0:U");
+			push(@tmp, "DS:lighttpd" . $n . "_val01:GAUGE:120:0:U");
+			push(@tmp, "DS:lighttpd" . $n . "_val02:GAUGE:120:0:U");
+			push(@tmp, "DS:lighttpd" . $n . "_val03:GAUGE:120:0:U");
+			push(@tmp, "DS:lighttpd" . $n . "_val04:GAUGE:120:0:U");
+			push(@tmp, "DS:lighttpd" . $n . "_val05:GAUGE:120:0:U");
+		}
+		eval {
+			RRDs::create($rrd,
+				"--step=60",
+				@tmp,
+				"RRA:AVERAGE:0.5:1:1440",
+				"RRA:AVERAGE:0.5:30:336",
+				"RRA:AVERAGE:0.5:60:744",
+				"RRA:AVERAGE:0.5:1440:365",
+				"RRA:MIN:0.5:1:1440",
+				"RRA:MIN:0.5:30:336",
+				"RRA:MIN:0.5:60:744",
+				"RRA:MIN:0.5:1440:365",
+				"RRA:MAX:0.5:1:1440",
+				"RRA:MAX:0.5:30:336",
+				"RRA:MAX:0.5:60:744",
+				"RRA:MAX:0.5:1440:365",
+				"RRA:LAST:0.5:1:1440",
+				"RRA:LAST:0.5:30:336",
+				"RRA:LAST:0.5:60:744",
+				"RRA:LAST:0.5:1440:365",
+			);
+		};
+		my $err = RRDs::error;
+		if($@ || $err) {
+			logger("$@") unless !$@;
+			if($err) {
+				logger("ERROR: while creating $rrd: $err");
+				if($err eq "RRDs::error") {
+					logger("... is the RRDtool Perl package installed?");
+				}
+			}
+			return;
+		}
+	}
+
+	$config->{lighttpd_hist} = ();
+	push(@{$config->{func_update}}, $package);
+	logger("$myself: Ok") if $debug;
+}
+
+sub lighttpd_update {
+	my $myself = (caller(0))[3];
+	my ($package, $config, $debug) = @_;
+	my $rrd = $config->{base_lib} . $package . ".rrd";
+	my $lighttpd = $config->{lighttpd};
+
+	my $str;
+	my $rrdata = "N";
+
+	my $n = 0;
+	foreach(my @ll = split(',', $lighttpd->{list})) {
+		my $url = trim($_) . "/server-status?auto";
+		my $ua = LWP::UserAgent->new(timeout => 30);
+		my $response = $ua->request(HTTP::Request->new('GET', $url));
+
+		my $acc = 0;
+		my $kb = 0;
+		my $busy = 0;
+		my $idle = 0;
+
+		foreach(split('\n', $response->content)) {
+			if(/^Total Accesses:\s+(\d+)$/) {
+				$str = $n . "acc";
+				$acc = $1 - ($config->{lighttpd_hist}->{$str} || 0);
+				$acc = 0 unless $acc != $1;
+				$acc /= 60;
+				$config->{lighttpd_hist}->{$str} = $1;
+				next;
+			}
+			if(/^Total kBytes:\s+(\d+)$/) {
+				$str = $n . "kb";
+				$kb = $1 - ($config->{lighttpd_hist}->{$str} || 0);
+				$kb = 0 unless $kb != $1;
+				$config->{lighttpd_hist}->{$str} = $1;
+				next;
+			}
+			if(/^BusyServers:\s+(\d+)/) {
+				$busy = int($1);
+				next;
+			}
+			if(/^IdleServers:\s+(\d+)/) {
+				$idle = int($1);
+				last;
+			}
+		}
+		$rrdata .= ":$acc:$kb:$busy:$idle:0:0:0:0:0";
+		$n++;
+	}
+
+	RRDs::update($rrd, $rrdata);
+	logger("$myself: $rrdata") if $debug;
+	my $err = RRDs::error;
+	logger("ERROR: while updating $rrd: $err") if $err;
+}
+
+sub lighttpd_cgi {
+	my ($package, $config, $cgi) = @_;
+
+	my $lighttpd = $config->{lighttpd};
+	my @rigid = split(',', $lighttpd->{rigid});
+	my @limit = split(',', $lighttpd->{limit});
+	my $tf = $cgi->{tf};
+	my $colors = $cgi->{colors};
+	my $graph = $cgi->{graph};
+	my $silent = $cgi->{silent};
+
+	my $u = "";
+	my $width;
+	my $height;
+	my @riglim;
+	my @PNG;
+	my @PNGz;
+	my @tmp;
+	my @tmpz;
+	my @CDEF;
+	my $vlabel = "bytes/s";
+	my $e;
+	my $e2;
+	my $n;
+	my $n2;
+	my $str;
+	my $err;
+
+	my $rrd = $config->{base_lib} . $package . ".rrd";
+	my $title = $config->{graph_title}->{$package};
+	my $PNG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir};
+
+	$title = !$silent ? $title : "";
+
+	if(lc($config->{netstats_in_bps}) eq "y") {
+		$vlabel = "bits/s";
+	}
+
+
+	# text mode
+	#
+	if(lc($config->{iface_mode}) eq "text") {
+		if($title) {
+			main::graph_header($title, 2);
+			print("    <tr>\n");
+			print("    <td bgcolor='$colors->{title_bg_color}'>\n");
+		}
+		my (undef, undef, undef, $data) = RRDs::fetch("$rrd",
+			"--start=-$tf->{nwhen}$tf->{twhen}",
+			"AVERAGE",
+			"-r $tf->{res}");
+		$err = RRDs::error;
+		print("ERROR: while fetching $rrd: $err\n") if $err;
+		my $line1;
+		my $line2;
+		my $line3;
+		print("    <pre style='font-size: 12px; color: $colors->{fg_color}';>\n");
+		print("    ");
+		for($n = 0; $n < scalar(my @ll = split(',', $lighttpd->{list})); $n++) {
+			$line1 = "                                    ";
+			$line2 .= "   Acceses    k$vlabel    Busy  Idle";
+			$line3 .= "------------------------------------";
+			if($line1) {
+				my $i = length($line1);
+				printf(sprintf("%${i}s", sprintf("%s", trim($ll[$n]))));
+			}
+		}
+		print("\n");
+		print("Time$line2\n");
+		print("----$line3 \n");
+		my $line;
+		my @row;
+		my $time;
+		my $n2;
+		my $from;
+		my $to;
+		for($n = 0, $time = $tf->{tb}; $n < ($tf->{tb} * $tf->{ts}); $n++) {
+			$line = @$data[$n];
+			$time = $time - (1 / $tf->{ts});
+			printf(" %2d$tf->{tc}", $time);
+			for($n2 = 0; $n2 < scalar(my @ll = split(',', $lighttpd->{list})); $n2++) {
+				undef(@row);
+				$from = $n2 * 9;
+				$to = $from + 9;
+				push(@row, @$line[$from..$to]);
+				printf("   %7d  %9d      %3d   %3d", @row);
+			}
+			print("\n");
+		}
+		print("    </pre>\n");
+		if($title) {
+			print("    </td>\n");
+			print("    </tr>\n");
+			main::graph_footer();
+		}
+		print("  <br>\n");
+		return;
+	}
+
+
+	# graph mode
+	#
+	if($silent eq "yes" || $silent eq "imagetag") {
+		$colors->{fg_color} = "#000000";  # visible color for text mode
+		$u = "_";
+	}
+	if($silent eq "imagetagbig") {
+		$colors->{fg_color} = "#000000";  # visible color for text mode
+		$u = "";
+	}
+
+	for($n = 0; $n < scalar(my @ll = split(',', $lighttpd->{list})); $n++) {
+		for($n2 = 1; $n2 <= 3; $n2++) {
+			$str = $u . $package . $n . $n2 . "." . $tf->{when} . ".png";
+			push(@PNG, $str);
+			unlink("$PNG_DIR" . $str);
+			if(lc($config->{enable_zoom}) eq "y") {
+				$str = $u . $package . $n . $n2 . "z." . $tf->{when} . ".png";
+				push(@PNGz, $str);
+				unlink("$PNG_DIR" . $str);
+			}
+		}
+	}
+
+	$e = 0;
+	foreach my $url (my @ll = split(',', $lighttpd->{list})) {
+		if($e) {
+			print("  <br>\n");
+		}
+		if($title) {
+			main::graph_header($title, 2);
+		}
+		undef(@riglim);
+		if(trim($rigid[0]) eq 1) {
+			push(@riglim, "--upper-limit=" . trim($limit[0]));
+		} else {
+			if(trim($rigid[0]) eq 2) {
+				push(@riglim, "--upper-limit=" . trim($limit[0]));
+				push(@riglim, "--rigid");
+			}
+		}
+		if($title) {
+			print("    <tr>\n");
+			print("    <td bgcolor='$colors->{title_bg_color}'>\n");
+		}
+		undef(@tmp);
+		undef(@tmpz);
+		push(@tmp, "AREA:lighttpd" . $e . "_idle#4444EE:Idle");
+		push(@tmp, "GPRINT:lighttpd" . $e . "_idle:LAST:            Current\\: %3.0lf");
+		push(@tmp, "GPRINT:lighttpd" . $e . "_idle:AVERAGE:   Average\\: %3.0lf");
+		push(@tmp, "GPRINT:lighttpd" . $e . "_idle:MIN:   Min\\: %3.0lf");
+		push(@tmp, "GPRINT:lighttpd" . $e . "_idle:MAX:   Max\\: %3.0lf\\n");
+		push(@tmp, "AREA:lighttpd" . $e . "_busy#44EEEE:Busy");
+		push(@tmp, "GPRINT:lighttpd" . $e . "_busy:LAST:            Current\\: %3.0lf");
+		push(@tmp, "GPRINT:lighttpd" . $e . "_busy:AVERAGE:   Average\\: %3.0lf");
+		push(@tmp, "GPRINT:lighttpd" . $e . "_busy:MIN:   Min\\: %3.0lf");
+		push(@tmp, "GPRINT:lighttpd" . $e . "_busy:MAX:   Max\\: %3.0lf\\n");
+		push(@tmp, "LINE1:lighttpd" . $e . "_idle#0000EE");
+		push(@tmp, "LINE1:lighttpd" . $e . "_busy#00EEEE");
+		push(@tmp, "LINE1:lighttpd" . $e . "_tot#EE0000");
+		push(@tmpz, "AREA:lighttpd" . $e . "_idle#4444EE:Idle");
+		push(@tmpz, "AREA:lighttpd" . $e . "_busy#44EEEE:Busy");
+		push(@tmpz, "LINE2:lighttpd" . $e . "_idle#0000EE");
+		push(@tmpz, "LINE2:lighttpd" . $e . "_busy#00EEEE");
+		push(@tmpz, "LINE2:lighttpd" . $e . "_tot#EE0000");
+		($width, $height) = split('x', $config->{graph_size}->{main});
+		if($silent =~ /imagetag/) {
+			($width, $height) = split('x', $config->{graph_size}->{remote}) if $silent eq "imagetag";
+			($width, $height) = split('x', $config->{graph_size}->{main}) if $silent eq "imagetagbig";
+			@tmp = @tmpz;
+		}
+		RRDs::graph("$PNG_DIR" . "$PNG[$e * 3]",
+			"--title=$config->{graphs}->{_lighttpd1}  ($tf->{nwhen}$tf->{twhen})",
+			"--start=-$tf->{nwhen}$tf->{twhen}",
+			"--imgformat=PNG",
+			"--vertical-label=Workers",
+			"--width=$width",
+			"--height=$height",
+			@riglim,
+			"--lower-limit=0",
+			@{$cgi->{version12}},
+			@{$colors->{graph_colors}},
+			"DEF:lighttpd" . $e . "_busy=$rrd:lighttpd" . $e . "_busy:AVERAGE",
+			"DEF:lighttpd" . $e . "_idle=$rrd:lighttpd" . $e . "_idle:AVERAGE",
+			"CDEF:lighttpd" . $e . "_tot=lighttpd" . $e . "_busy,lighttpd" . $e . "_idle,+",
+			"COMMENT: \\n",
+			@tmp,
+			"COMMENT: \\n",
+			"COMMENT: \\n");
+		$err = RRDs::error;
+		print("ERROR: while graphing $PNG_DIR" . "$PNG[$e * 3]: $err\n") if $err;
+		if(lc($config->{enable_zoom}) eq "y") {
+			($width, $height) = split('x', $config->{graph_size}->{zoom});
+			RRDs::graph("$PNG_DIR" . "$PNGz[$e * 3]",
+				"--title=$config->{graphs}->{_lighttpd1}  ($tf->{nwhen}$tf->{twhen})",
+				"--start=-$tf->{nwhen}$tf->{twhen}",
+				"--imgformat=PNG",
+				"--vertical-label=Workers",
+				"--width=$width",
+				"--height=$height",
+				@riglim,
+				"--lower-limit=0",
+				@{$cgi->{version12}},
+				@{$colors->{graph_colors}},
+				"DEF:lighttpd" . $e . "_busy=$rrd:lighttpd" . $e . "_busy:AVERAGE",
+				"DEF:lighttpd" . $e . "_idle=$rrd:lighttpd" . $e . "_idle:AVERAGE",
+				"CDEF:lighttpd" . $e . "_tot=lighttpd" . $e . "_busy,lighttpd" . $e . "_idle,+",
+				@tmpz);
+			$err = RRDs::error;
+			print("ERROR: while graphing $PNG_DIR" . "$PNGz[$e * 3]: $err\n") if $err;
+		}
+		$e2 = $e + 1;
+		if($title || ($silent =~ /imagetag/ && $graph =~ /lighttpd$e2/)) {
+			if(lc($config->{enable_zoom}) eq "y") {
+				if(lc($config->{disable_javascript_void}) eq "y") {
+					print("      <a href=\"" . $config->{url} . $config->{imgs_dir} . $PNGz[$e * 3] . "\"><img src='" . $config->{url} . $config->{imgs_dir} . $PNG[$e * 3] . "' border='0'></a>\n");
+				}
+				else {
+					print("      <a href=\"javascript:void(window.open('" . $config->{url} . $config->{imgs_dir} . $PNGz[$e * 3] . "','','width=" . ($width + 115) . ",height=" . ($height + 100) . ",scrollbars=0,resizable=0'))\"><img src='" . $config->{url} . $config->{imgs_dir} . $PNG[$e * 3] . "' border='0'></a>\n");
+				}
+			} else {
+				print("      <img src='" . $config->{url} . $config->{imgs_dir} . $PNG[$e * 3] . "'>\n");
+			}
+		}
+		if($title) {
+			print("    </td>\n");
+			print("    <td valign='top' bgcolor='" . $colors->{title_bg_color} . "'>\n");
+		}
+
+		undef(@riglim);
+		if(trim($rigid[1]) eq 1) {
+			push(@riglim, "--upper-limit=" . trim($limit[1]));
+		} else {
+			if(trim($rigid[1]) eq 2) {
+				push(@riglim, "--upper-limit=" . trim($limit[1]));
+				push(@riglim, "--rigid");
+			}
+		}
+		undef(@tmp);
+		undef(@tmpz);
+		undef(@CDEF);
+		push(@tmp, "AREA:Bytes#44AAEE:KBytes");
+		push(@tmp, "GPRINT:lighttpd" . $e . "_kb:LAST:               Current\\: %6.1lf\\n");
+		push(@tmp, "LINE1:lighttpd" . $e . "_kb#00EEEE");
+		push(@tmpz, "AREA:Bytes#44AAEE:Bytes");
+		push(@tmpz, "LINE1:lighttpd" . $e . "_kb#00EEEE");
+		if(lc($config->{netstats_in_bps}) eq "y") {
+			push(@CDEF, "CDEF:Bytes=lighttpd" . $e . "_kb,8,*,1024,*");
+		} else {
+			push(@CDEF, "CDEF:Bytes=lighttpd" . $e . "_kb,1024,*");
+		}
+		($width, $height) = split('x', $config->{graph_size}->{small});
+		if($silent =~ /imagetag/) {
+			($width, $height) = split('x', $config->{graph_size}->{remote}) if $silent eq "imagetag";
+			($width, $height) = split('x', $config->{graph_size}->{main}) if $silent eq "imagetagbig";
+			@tmp = @tmpz;
+			push(@tmp, "COMMENT: \\n");
+			push(@tmp, "COMMENT: \\n");
+			push(@tmp, "COMMENT: \\n");
+		}
+		RRDs::graph("$PNG_DIR" . "$PNG[$e * 3 + 1]",
+			"--title=$config->{graphs}->{_lighttpd2}  ($tf->{nwhen}$tf->{twhen})",
+			"--start=-$tf->{nwhen}$tf->{twhen}",
+			"--imgformat=PNG",
+			"--vertical-label=$vlabel",
+			"--width=$width",
+			"--height=$height",
+			@riglim,
+			"--lower-limit=0",
+			@{$cgi->{version12}},
+			@{$cgi->{version12_small}},
+			@{$colors->{graph_colors}},
+			"DEF:lighttpd" . $e . "_kb=$rrd:lighttpd" . $e . "_kb:AVERAGE",
+			@CDEF,
+			@tmp);
+		$err = RRDs::error;
+		print("ERROR: while graphing $PNG_DIR" . "$PNG[$e * 3 + 1]: $err\n") if $err;
+		if(lc($config->{enable_zoom}) eq "y") {
+			($width, $height) = split('x', $config->{graph_size}->{zoom});
+			RRDs::graph("$PNG_DIR" . "$PNGz[$e * 3 + 1]",
+				"--title=$config->{graphs}->{_lighttpd2}  ($tf->{nwhen}$tf->{twhen})",
+				"--start=-$tf->{nwhen}$tf->{twhen}",
+				"--imgformat=PNG",
+				"--vertical-label=$vlabel",
+				"--width=$width",
+				"--height=$height",
+				@riglim,
+				"--lower-limit=0",
+				@{$cgi->{version12}},
+				@{$cgi->{version12_small}},
+				@{$colors->{graph_colors}},
+				"DEF:lighttpd" . $e . "_kb=$rrd:lighttpd" . $e . "_kb:AVERAGE",
+				@CDEF,
+				@tmpz);
+			$err = RRDs::error;
+			print("ERROR: while graphing $PNG_DIR" . "$PNGz[$e * 3 + 1]: $err\n") if $err;
+		}
+		$e2 = $e + 2;
+		if($title || ($silent =~ /imagetag/ && $graph =~ /lighttpd$e2/)) {
+			if(lc($config->{enable_zoom}) eq "y") {
+				if(lc($config->{disable_javascript_void}) eq "y") {
+					print("      <a href=\"" . $config->{url} . $config->{imgs_dir} . $PNGz[$e * 3 + 1] . "\"><img src='" . $config->{url} . $config->{imgs_dir} . $PNG[$e * 3 + 1] . "' border='0'></a>\n");
+				}
+				else {
+					print("      <a href=\"javascript:void(window.open('" . $config->{url} . $config->{imgs_dir} . $PNGz[$e * 3 + 1] . "','','width=" . ($width + 115) . ",height=" . ($height + 100) . ",scrollbars=0,resizable=0'))\"><img src='" . $config->{url} . $config->{imgs_dir} . $PNG[$e * 3 + 1] . "' border='0'></a>\n");
+				}
+			} else {
+				print("      <img src='" . $config->{url} . $config->{imgs_dir} . $PNG[$e * 3 + 1] . "'>\n");
+			}
+		}
+
+		undef(@riglim);
+		if(trim($rigid[2]) eq 1) {
+			push(@riglim, "--upper-limit=" . trim($limit[2]));
+		} else {
+			if(trim($rigid[2]) eq 2) {
+				push(@riglim, "--upper-limit=" . trim($limit[2]));
+				push(@riglim, "--rigid");
+			}
+		}
+		undef(@tmp);
+		undef(@tmpz);
+		push(@tmp, "AREA:lighttpd" . $e . "_acc#44EE44:Accesses");
+		push(@tmp, "GPRINT:lighttpd" . $e . "_acc:LAST:             Current\\: %5.2lf\\n");
+		push(@tmp, "LINE1:lighttpd" . $e . "_acc#00EE00");
+		push(@tmpz, "AREA:lighttpd" . $e . "_acc#44EE44:Accesses");
+		push(@tmpz, "LINE1:lighttpd" . $e . "_acc#00EE00");
+		($width, $height) = split('x', $config->{graph_size}->{small});
+		if($silent =~ /imagetag/) {
+			($width, $height) = split('x', $config->{graph_size}->{remote}) if $silent eq "imagetag";
+			($width, $height) = split('x', $config->{graph_size}->{main}) if $silent eq "imagetagbig";
+			@tmp = @tmpz;
+			push(@tmp, "COMMENT: \\n");
+			push(@tmp, "COMMENT: \\n");
+			push(@tmp, "COMMENT: \\n");
+		}
+		RRDs::graph("$PNG_DIR" . "$PNG[$e * 3 + 2]",
+			"--title=$config->{graphs}->{_lighttpd3}  ($tf->{nwhen}$tf->{twhen})",
+			"--start=-$tf->{nwhen}$tf->{twhen}",
+			"--imgformat=PNG",
+			"--vertical-label=Accesses/s",
+			"--width=$width",
+			"--height=$height",
+			@riglim,
+			"--lower-limit=0",
+			@{$cgi->{version12}},
+			@{$cgi->{version12_small}},
+			@{$colors->{graph_colors}},
+			"DEF:lighttpd" . $e . "_acc=$rrd:lighttpd" . $e . "_acc:AVERAGE",
+			@tmp);
+		$err = RRDs::error;
+		print("ERROR: while graphing $PNG_DIR" . "$PNG[$e * 3 + 2]: $err\n") if $err;
+		if(lc($config->{enable_zoom}) eq "y") {
+			($width, $height) = split('x', $config->{graph_size}->{zoom});
+			RRDs::graph("$PNG_DIR" . "$PNGz[$e * 3 + 2]",
+				"--title=$config->{graphs}->{_lighttpd3}  ($tf->{nwhen}$tf->{twhen})",
+				"--start=-$tf->{nwhen}$tf->{twhen}",
+				"--imgformat=PNG",
+				"--vertical-label=Accesses/s",
+				"--width=$width",
+				"--height=$height",
+				@riglim,
+				"--lower-limit=0",
+				@{$cgi->{version12}},
+				@{$cgi->{version12_small}},
+				@{$colors->{graph_colors}},
+				"DEF:lighttpd" . $e . "_acc=$rrd:lighttpd" . $e . "_acc:AVERAGE",
+				@tmpz);
+			$err = RRDs::error;
+			print("ERROR: while graphing $PNG_DIR" . "$PNGz[$e * 3 + 2]: $err\n") if $err;
+		}
+		$e2 = $e + 3;
+		if($title || ($silent =~ /imagetag/ && $graph =~ /lighttpd$e2/)) {
+			if(lc($config->{enable_zoom}) eq "y") {
+				if(lc($config->{disable_javascript_void}) eq "y") {
+					print("      <a href=\"" . $config->{url} . $config->{imgs_dir} . $PNGz[$e * 3 + 2] . "\"><img src='" . $config->{url} . $config->{imgs_dir} . $PNG[$e * 3 + 2] . "' border='0'></a>\n");
+				}
+				else {
+					print("      <a href=\"javascript:void(window.open('" . $config->{url} . $config->{imgs_dir} . $PNGz[$e * 3 + 2] . "','','width=" . ($width + 115) . ",height=" . ($height + 100) . ",scrollbars=0,resizable=0'))\"><img src='" . $config->{url} . $config->{imgs_dir} . $PNG[$e * 3 + 2] . "' border='0'></a>\n");
+				}
+			} else {
+				print("      <img src='" . $config->{url} . $config->{imgs_dir} . $PNG[$e * 3 + 2] . "'>\n");
+			}
+		}
+
+		if($title) {
+			print("    </td>\n");
+			print("    </tr>\n");
+
+			print("    <tr>\n");
+			print "      <td bgcolor='$colors->{title_bg_color}' colspan='2'>\n";
+			print "       <font face='Verdana, sans-serif' color='$colors->{title_fg_color}'>\n";
+			print "       <font size='-1'>\n";
+			print "        <b style='{color: " . $colors->{title_fg_color} . "}'>&nbsp;&nbsp;$url<b>\n";
+			print "       </font></font>\n";
+			print "      </td>\n";
+			print("    </tr>\n");
+			main::graph_footer();
+		}
+		$e++;
+	}
+	print("  <br>\n");
+	return;
+}
+
+1;
diff --git a/3.0/monitorix.conf b/3.0/monitorix.conf
index 64a2274..8a737b6 100644
--- a/3.0/monitorix.conf
+++ b/3.0/monitorix.conf
@@ -269,13 +269,11 @@ alert_rootfs_script = /path/to/script.sh
 
 # LIGHTTPD graph
 # -----------------------------------------------------------------------------
-lighttpd_list = http://localhost/
-lighttpd1_rigid = 0
-lighttpd1_limit = 100
-lighttpd2_rigid = 0
-lighttpd2_limit = 100
-lighttpd3_rigid = 0
-lighttpd3_limit = 100
+<lighttpd>
+	list = http://localhost/
+	rigid = 0, 0, 0
+	limit = 100, 100, 100
+</lighttpd>
 
 
 # MYSQL graph