Changeset 2734

Timestamp:

10/28/09 01:48:10 (2 years ago)

Author:

janl

Message:

* munin-graph: set m/a time of png to last modification time of the corresponding rrd file
* Adapt patch in #3 to current munin-cgi-graph for non-fastcgi. Closes #3. Thanks to blueyed
* Adapt patch in #3 to current munin-cgi-graph to obtain munin-fastcgi-graph
* Install munin-fastcgi-graph

Files:

• trunk/Makefile (modified) (1 diff)
• trunk/master/_bin/munin-cgi-graph.in (modified) (8 diffs)
• trunk/master/_bin/munin-fastcgi-graph.in (added)
• trunk/master/_bin/munin-graph.in (modified) (4 diffs)

trunk/Makefile

@@ -101 +101 @@
-        $(INSTALL) -m 0755 build/master/_bin/munin-gather $(LIBDIR)/
-        $(INSTALL) -m 0755 build/master/_bin/munin-cgi-graph $(CGIDIR)/
+        $(INSTALL) -m 0755 build/master/_bin/munin-fastcgi-graph $(CGIDIR)/
-
-

trunk/master/_bin/munin-cgi-graph.in

@@ -73 +73 @@
-my $time = time;
-
-if (-f $filename) {
-    my @sstats = stat ($filename);
-    my $slast_modified = strftime ("%a, %d %b %Y %H:%M:%S %Z", localtime ($sstats[9]));
-
-    if (defined $ENV{HTTP_IF_MODIFIED_SINCE} and 
-        !&modified (gmtime(time+($period{$scale}-($time%$period{$scale}))),
-                    $sstats[9]-1)) {
-        print "Status: 304\n";
-        print "Content-Type: image/png\n";
-        print "Expires: ", strftime ("%a, %d %b %Y %H:%M:%S GMT", gmtime(time+($period{$scale}-($time%$period{$scale})))), "\n";
-        print "Last-Modified: $slast_modified\n";
-        print "\n";
-        exit 0;
-    }
-}
-
-# Get semaphore handle - Before graphing as recommended by snide.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-my $last_modified = strftime ("%a, %d %b %Y %H:%M:%S %Z", localtime ($stats[9]));
+# "Expires" has to use last modified time as base:
+my $expires       = strftime ("%a, %d %b %Y %H:%M:%S GMT", 
+                              gmtime($stats[9]+($period{$scale}-($stats[9]%$period{$scale}))));
+
+# Check for If-Modified-Since and send 304 if not changed:
+if (defined $ENV{HTTP_IF_MODIFIED_SINCE} and 
+    !&modified ($ENV{HTTP_IF_MODIFIED_SINCE}, $stats[9]-1)) {
+    print "Status: 304\n";
+    print "Content-Type: image/png\n";
+    print "Expires: ", $expires, "\n";
+    print "Last-Modified: $last_modified\n";
+    print "\n";
+    exit 0;
+}
+
+draw:
+
+    @stats = stat ($filename) unless @stats;
+
+$last_modified //= strftime ("%a, %d %b %Y %H:%M:%S %Z", localtime ($stats[9]));
+$expires       //= strftime ("%a, %d %b %Y %H:%M:%S GMT", 
+                             gmtime($stats[9]+($period{$scale}-($stats[9]%$period{$scale}))));
-
-print "Content-Type: image/png\n";
@@ -128 +117 @@
-print "\n";
-
-# Try to police the number of concurrent rrdgraph instances.  The
-# third value is the default maximum.
-
-# Fox kindly submitted a patch to convert to SysV IPC semaphores.
-# Lovely! (ticket #499).
-
-my $max_cgi_graph_jobs = &munin_get ($config, "max_cgi_graph_jobs" , 6, $dom);
-
-my $opstring; 
-
-# Sending the graph requires I/O but not the amount of CPU that
-# creating the graph requires.  So we might consider taking sending
-# the graph out of the semaphore protected area.
-
-&graph ($filename);
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-sub graph {
+    # This just serves the file, no file is made.
-    my $filename = shift;
-
@@ -156 +169 @@
-    close ($GRAPH);
-}
+
-
-sub get_picture_filename {
@@ -167 +181 @@
-}
-
+
-sub logger_open {
-    my $dirname = shift;
@@ -178 +193 @@
-    }
-}
+
-
-sub logger {
@@ -248 +264 @@
-}
-
+
-sub graph_usable {
-my $filename = shift;
-$time     = shift
+# Check how old the graph is and return 1 if it's new enough and 0 otherwise.
+($filename, $time) = @_
-
-    if (-f $filename) {
-        my @stats = stat (_);
-
-
-
-
-
+
+
-#print STDERR ("Graph unexpired for $scale. ($stats[9] , $time, ". ($time%$period{$scale}). ", ". ($time - $time%$period{$scale}). ").\n");
-            return 1;
@@ -269 +283 @@
-}
-
+
-sub draw_graph {
-    my $host  = shift;
@@ -284 +299 @@
-
-    my $file = "/dev/null";
-
-
-
+
+
+
+
+
-        exec @params;
-    }
-    $file = join (' ', <$IN>);
+
-    close ($IN);
+    sem_release();
+
-    return $file;
-}
-
+
+sub draw_graph_or_complain {
+    my $ret = draw_graph(@_);
+
+    if (! -f $ret) {
+        ::logger ("Warning: Could not draw graph \"$host-$serv-$scale.png\": $ret");
+        print "Status: 500\n";
+        print "Content-Type: image/png\n";
+        print "\n";
+        return 0;
+    } else {
+        return $ret;
+    }
+}
+
+
-sub modified {
-
+
+
+
-
-    my $since_string = shift;

trunk/master/_bin/munin-graph.in

@@ -5 +5 @@
-
-Copyright (C) 2002-2009 Jimmy Olsen, Audun Ytterdal, Kjell Magne Øierud,
-
+ and others.
-
-This program is free software; you can redistribute it and/or
@@ -19 +19 @@
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+9 Temple Place - Suite 330, Boston, MA  02111-1307,
-
-$Id$
@@ -79 +79 @@
-
-# Get options
- 
+
-GetOptions ( "force!"       => \$force_graphing,
-             "lazy!"        => \$force_lazy,
@@ -903 +903 @@
-        if (my $ERROR = RRDs::error) {
-            logger ("Unable to graph ". munin_get_picture_filename ($service, $time) . ": $ERROR");
-
+
+
+
+
+
+
+
-            # Command-line option to list images created
-            print munin_get_picture_filename ($service, $time),"\n";