Changeset 1251

Timestamp:

11/15/06 23:03:45 (5 years ago)

Author:

janl

Message:

• Starting to put stuff in Munin::Server
  

Moving around on files and adapting the makefile

Files:

• people/janl/Makefile (modified) (5 diffs)
• people/janl/nonsrc (added)
• people/janl/nonsrc/VeraMono.ttf (moved) (moved from people/janl/src/server/VeraMono.ttf)
• people/janl/nonsrc/definitions.html (moved) (moved from people/janl/src/server/definitions.html)
• people/janl/nonsrc/favicon.ico (moved) (moved from people/janl/src/resources/favicon.ico)
• people/janl/nonsrc/logo-horizontal.svg (moved) (moved from people/janl/logo-horizontal.svg)
• people/janl/nonsrc/logo.eps (moved) (moved from people/janl/logo.eps)
• people/janl/nonsrc/logo.png (moved) (moved from people/janl/src/server/logo.png)
• people/janl/nonsrc/logo.svg (moved) (moved from people/janl/logo.svg)
• people/janl/nonsrc/style.css (moved) (moved from people/janl/src/server/style.css)
• people/janl/src/libperl/Munin.pm (modified) (7 diffs)
• people/janl/src/libperl/Munin/Server.pm (modified) (9 diffs)
• people/janl/src/server/munin-update (modified) (2 diffs)

people/janl/Makefile

@@ -1 +1 @@
-# Gnu make only.  Seriously.
+#
-# $Id$
-
+
-# Defaults/paths from this file
-include Makefile.config
@@ -9 +10 @@
-INSTALL          = ./install-sh
-DIR              = $(shell /bin/pwd | sed 's/^.*\///')
-. -name '*.in
-node/node.d.$(OSTYPE)/* 
+src -type f -print | egrep -v '(/\.svn/|~)
+src/node/node.d.$(OSTYPE)/* src/
-MANCENTER        = "Munin Documentation"
-MAN8             = node/munin-node node/munin-run \
-
+src/
-                        node/munin-node-configure \
-                        server/munin-graph server/munin-update \
@@ -50 +51 @@
-                $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \
-        done
-server
-server
-server
-server
-resources
+nonsrc
+nonsrc
+nonsrc
+nonsrc
+nonsrc
-        test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/server/munin-htaccess $(HTMLDIR)/.htaccess
- 
+
-        $(INSTALL) -m 0755 build/server/munin-cron $(BINDIR)/
-        $(INSTALL) -m 0755 build/server/munin-update $(LIBDIR)/
@@ -216 +217 @@
-        touch build-stamp
-        rm -rf build
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                    -e 's|@@CONFDIR@@|$(CONFDIR)|g'                     \
-                    -e 's|@@BINDIR@@|$(BINDIR)|g'                       \
@@ -245 +250 @@
-                    -e 's|@@GOODSH@@|$(GOODSH)|g'                       \
-                    -e 's|@@BASH@@|$(BASH)|g'                           \
-build/
+
-        done
-

people/janl/src/libperl/Munin.pm

@@ -21 +21 @@
-
-use strict;
-use vars qw(@ISA @EXPORT $VERSION $CONFDIR);
-use Exporter;
+
+use vars qw(@ISA @EXPORT @EXPORT_OK $VERSION $CONFDIR $DEBUG @legalfetch
+            @legalconfig @copy_fields);
-
-@ISA = ('Exporter');
@@ -33 +35 @@
-           'munin_runlock',
-           'munin_getlock',
-           'munin_readconfig',
-           'munin_writeconfig',
-           'munin_delete',
-           'munin_overwrite',
-           'munin_config',
-           'munin_draw_field',
-           'munin_get_bool',
@@ -52 +51 @@
-           'munin_get_field_order',
-           'munin_get_rrd_filename',
+           '$CONFDIR',
+           '$DEBUG',
-           );
+
+@EXPORT_OK = ''; # qw($CONFDIR);
+
+$VERSION='@@VERSION@@';
+$CONFDIR='@@CONFDIR@@';
-
-use RRDs;
@@ -59 +65 @@
-use Symbol 'gensym';
-
-$VERSION='@@VERSION@@';
-$CONFDIR='@@CONFDIR@@';
-1;
-__END__
-
-$VERSION = '@@VERSION@@';
-
@@ -69 +70 @@
-my $config = undef;
-
-my 
+
-my $configfile='@@CONFDIR@@/munin.conf';
-
@@ -84 +85 @@
-                );
-
-
-# Fields to copy when "aliasing" a field
-my 
+
-
-# Make configuration settings available at runtime.
-my $PREFIX               = '@@PREFIX@@';
-$ENV{'MUNIN_PREFIX'}     = $PREFIX;
-
+   
-print "CONFDIR: $CONFDIR!\n";
-$ENV{'MUNIN_CONFDIR'}    = $CONFDIR;
@@ -270 +270 @@
-}
-
-sub munin_readconfig {
-    my ($conf, $missingok, $corruptok) = @_;
-    my $config   = undef;
-    my @contents = undef;
-
-    $conf ||= $configfile;
-    if (! -r $conf and ! $missingok) {
-                ::logger ("munin_readconfig: cannot open '$conf'");
-                return undef;
-    }
-    if (open (CFG, $conf))
-    {
-        @contents = <CFG>;
-        close (CFG);
-    }
-
-    $config = &munin_parse_config (\@contents);
-
-    # Some important defaults before we return...
-    $config->{'rundir'} ||= "/tmp/";
-    $config->{'dbdir'}  ||= "/var/lib/munin/";
-    $config->{'logdir'} ||= "/var/log/";
-    $config->{'tmpldir'}||= "/etc/munin/templates/";
-    $config->{'htmldir'}||= "@@HTMLDIR@@/";
-    return ($config);
-}
-
-sub munin_parse_config
-{
-    my $lines    = shift;
-    my $hash     = undef;
-    my $prefix   = "";
-    my $prevline = "";
-
-    foreach my $line (@{$lines})
-    {
-        chomp $line;
-#$line =~ s/(^|[^\\])#.*/$1/g if $line =~ /#/;  # Skip comments...
-        if ($line =~ /#/)
-        { 
-            next if ($line =~ /^#/);
-            $line =~ s/(^|[^\\])#.*/$1/g;
-        }
-        next unless ($line =~ /\S/);  # And empty lines...
-        if (length $prevline)
-        {
-            $line = $prevline . $line;
-            $prevline = "";
-        }
-        if ($line =~ /\\\\$/)
-        {
-            $line =~ s/\\\\$/\\/;
-        }
-        elsif ($line =~ /\\$/)
-        {
-            ($prevline = $line) =~ s/\\$//;
-            next;
-        }
-        $line =~ s/\s+$//g;           # And trailing whitespace...
-        $line =~ s/^\s+//g;           # And heading whitespace...
-
-        if ($line =~ /^\.(\S+)\s+(.+)\s*$/)
-        {
-            my ($var, $val) = ($1, $2);
-            $hash = &munin_set_var_path ($hash, $var, $val);
-        }
-        elsif ($line =~ /^\s*\[([^\]]*)]\s*$/)
-        {
-            $prefix = $1;
-            if ($prefix =~ /^([^:;]+);([^:;]+)$/)
-            {
-                $prefix .= ":";
-            }
-            elsif ($prefix =~ /^([^:;]+);$/)
-            {
-                $prefix .= "";
-            }
-            elsif ($prefix =~ /^([^:;]+);([^:;]+):(.*)$/)
-            {
-                $prefix .= ".";
-            }
-            elsif ($prefix =~ /^([^:;]+)$/)
-            {
-                (my $domain = $prefix) =~ s/^[^\.]+\.//;
-                $prefix = "$domain;$prefix:";
-            }
-            elsif ($prefix =~ /^([^:;]+):(.*)$/)
-            {
-                (my $domain = $prefix) =~ s/^[^\.]+\.//;
-                $prefix = "$domain;$prefix.";
-            }
-        }
-        elsif ($line =~ /^\s*(\S+)\s+(.+)\s*$/)
-        {
-            my ($var, $val) = ($1, $2);
-            $hash = &munin_set_var_path ($hash, "$prefix$var", $val);
-        }
-        else
-        {
-            warn "Malformed configuration line \"$line\".";
-        }
-    }
-
-    return $hash;
-}
-
-sub munin_get_var_path
-{
-    my $hash = shift;
-    my $var  = shift;
-    my $val  = shift;
-
-    print "DEBUG: Getting var \"$var\" = \"$val\"\n" if $DEBUG;
-    if ($var =~ /^\s*([^;:]+);([^;:]+):(\S+)\s*$/)
-    {
-        my ($dom, $host, $rest) = ($1, $2, $3);
-        my @sp = split (/\./, $rest);
-
-        if (@sp == 3)
-        {
-            return $hash->{domain}->{$dom}->{node}->{$host}->{client}->{$sp[0]}->{"$sp[1].$sp[2]"};
-        }
-        elsif (@sp == 2)
-        {
-            return $hash->{domain}->{$dom}->{node}->{$host}->{client}->{$sp[0]}->{$sp[1]};
-        }
-        elsif (@sp == 1)
-        {
-            return $hash->{domain}->{$dom}->{node}->{$host}->{$sp[0]};
-        }
-        else
-        {
-            warn "munin_set_var: Malformatted variable path \"$var\".";
-        }
-    }
-    elsif ($var =~ /^\s*([^;:]+);([^;:]+)\s*$/)
-    {
-        my ($dom, $rest) = ($1, $2);
-        my @sp = split (/\./, $rest);
-
-        if (@sp == 1)
-        {
-            return $hash->{domain}->{$dom}->{$sp[0]};
-        }
-        else
-        {
-            warn "munin_set_var: Malformatted variable path \"$var\".";
-        }
-    }
-    elsif ($var =~ /^\s*([^;:\.]+)\s*$/)
-    {
-        return $hash->{$1};
-    }
-    else
-    {
-        warn "munin_set_var: Malformatted variable path \"$var\".";
-    }
-
-    return undef;
-}
-
-sub munin_set_var_path {
-    my $hash = shift;
-    my $var  = shift;
-    my $val  = shift;
-
-    print "DEBUG: Setting var \"$var\" = \"$val\"\n" if $DEBUG;
-    if ($var =~ /^\s*([^;:]+);([^:]+):(\S+)\s*$/)
-    {
-        my ($dom, $host, $rest) = ($1, $2, $3);
-        my @sp = split (/\./, $rest);
-
-        if (@sp == 3)
-        {
-            ::logger ("Warning: Unknown option \"$sp[2]\" in \"$dom;$host:$sp[0].$sp[1].$sp[2]\".")
-                unless defined $legal_expanded{$sp[2]};
-            $hash->{domain}->{$dom}->{node}->{$host}->{client}->{$sp[0]}->{"$sp[1].$sp[2]"} = $val;
-        }
-        elsif (@sp == 2)
-        {
-            ::logger ("Warning: Unknown option \"$sp[1]\" in \"$dom;$host:$sp[0].$sp[1]\".")
-                unless defined $legal_expanded{$sp[1]};
-            $hash->{domain}->{$dom}->{node}->{$host}->{client}->{$sp[0]}->{$sp[1]} = $val;
-        }
-        elsif (@sp == 1)
-        {
-            ::logger ("Warning: Unknown option \"$sp[0]\" in \"$dom;$host:$sp[0]\".")
-                unless defined $legal_expanded{$sp[0]};
-            $hash->{domain}->{$dom}->{node}->{$host}->{$sp[0]} = $val;
-        }
-        else
-        {
-            warn "munin_set_var: Malformatted variable path \"$var\".";
-        }
-    }
-    elsif ($var =~ /^\s*([^;:]+);([^;:]+)\s*$/)
-    {
-        my ($dom, $rest) = ($1, $2);
-        my @sp = split (/\./, $rest);
-
-        if (@sp == 1)
-        {
-            ::logger ("Warning: Unknown option \"$sp[0]\" in \"$dom;$sp[0]\".")
-                unless defined $legal_expanded{$sp[0]};
-            $hash->{domain}->{$dom}->{$sp[0]} = $val;
-        }
-        else
-        {
-            warn "munin_set_var: Malformatted variable path \"$var\".";
-        }
-    }
-    elsif ($var =~ /^\s*([^;:\.]+)\s*$/)
-    {
-        ::logger ("Warning: Unknown option \"$1\" in \"$1\".")
-            unless defined $legal_expanded{$1};
-        $hash->{$1} = $val;
-    }
-    elsif ($var =~ /^\s*([^\.]+)\.([^\.]+)\.([^\.]+)$/)
-    {
-        ::logger ("Warning: Unknown option \"$1\" in \"$var\".")
-            unless defined $legal_expanded{$1};
-        ::logger ("Warning: Unknown option \"$3\" in \"$var\".")
-            unless defined $legal_expanded{$3};
-        $hash->{$1}->{$2}->{$3} = $val;
-    }
-    else
-    {
-        warn "munin_set_var: Malformatted variable path \"$var\".";
-    }
-
-    return $hash;
-}
-
-sub munin_writeconfig_loop {
-    my ($data,$fh,$pre) = @_;
-    $pre |= "";
-
-    # Write datafile
-    foreach my $a (keys %{$data})
-    {
-        if (ref ($data->{$a}) eq "HASH")
-        {
-            if ($a eq "domain" or $a eq "node" or $a eq "client")
-            {
-                &munin_writeconfig_loop ($data->{$a}, $fh, "$pre");
-            }
-            elsif ($a eq "contact" and $pre eq "")
-            {
-                &munin_writeconfig_loop ($data->{$a}, $fh, "contact.");
-            }
-            else
-            {
-                my $lpre = $pre;
-                if ($lpre eq "")
-                {
-                    $lpre = $a.";";
-                }
-                elsif ($lpre =~ /;$/)
-                {
-                    $lpre .= $a.":";
-                }
-                else
-                {
-                    $lpre .= $a.".";
-                }
-                &munin_writeconfig_loop ($data->{$a}, $fh, "$lpre");
-            }
-        }
-        elsif (defined $data->{$a} and length $data->{$a})
-        {
-            next if "$pre$a" eq "version"; # Handled separately
-            print "Writing: $pre$a $data->{$a}\n" if $DEBUG;
-            if ($data->{$a} =~ /\\$/)
-            { # Backslash as last char has special meaning. Avoid it.
-                print $fh "$pre$a $data->{$a}\\\n"; 
-            } else {
-                print $fh "$pre$a $data->{$a}\n";
-            }
-        }
-    }
-}
-sub munin_writeconfig {
-    my ($datafilename,$data,$fh) = @_;
-#   my $datafile = new Config::General();
-#   $datafile->save_file($datafilename,$data);
-
-    if (!defined $fh)
-    {
-        $fh = gensym();
-        unless (open ($fh, ">$datafilename"))
-        {
-            die "Fatal error: Could not open \"$datafilename\" for writing: $!";
-        }
-    }
-
-    # Write version
-    print $fh "version $VERSION\n";
-    # Write datafile
-    &munin_writeconfig_loop ($data, $fh, "");
-    
-    if (defined $fh)
-    {
-        print "DEBUG: Closing filehandle \"$datafilename\"...\n" if $DEBUG;
-        close ($fh);
-    }
-}
-    
-sub munin_config {
-    my $conffile = shift;
-    $config = shift;
-    $conffile ||= $configfile;
-    $config = &munin_readconfig ($conffile);
-    ::logger_open ($config->{logdir});
-    my $data = &munin_readconfig("$config->{dbdir}/datafile", 1, 1);
-    
-    $data = &munin_overwrite($data,$config);
-    return ($data);
-}
-
-sub munin_get_picture_filename {

people/janl/src/libperl/Munin/Server.pm

@@ -3 +3 @@
-use strict;
-use RRDs;
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-$configfile='@@CONFDIR@@/munin.conf';
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-push(@legal,@Munin::legalfetch,@Munin::legalconfig);
-
+$VERSION='@@VERSION@@';
-
-%legal_expanded = map { $_ => 1 } @legal;
@@ -52 +61 @@
-
-    # Some important defaults before we return...
-"/tmp/"
-"/var/lib/munin/"
-"/var/log/"
-"/etc/munin/templates/"
-"@@HTMLDIR@@/"
+'/tmp/'
+'@@DBDIR@@/'
+'@@LOGDIR@@/'
+'@@CONFDIR@@/templates/'
+'@@HTMLDIR@@/'
-    return ($config);
-}
-
-
-
+
-    my $lines    = shift;
-    my $hash     = undef;
@@ -67 +75 @@
-    my $prevline = "";
-
-
-
+
-        chomp $line;
-#$line =~ s/(^|[^\\])#.*/$1/g if $line =~ /#/;  # Skip comments...
-
-
+
-            next if ($line =~ /^#/);
-            $line =~ s/(^|[^\\])#.*/$1/g;
-        }
-        next unless ($line =~ /\S/);  # And empty lines...
-
-
+
-            $line = $prevline . $line;
-            $prevline = "";
-        }
-
-
+
-            $line =~ s/\\\\$/\\/;
-
-
-
+
-            ($prevline = $line) =~ s/\\$//;
-            next;
@@ -94 +96 @@
-        $line =~ s/^\s+//g;           # And heading whitespace...
-
-
-
+
-            my ($var, $val) = ($1, $2);
-            $hash = &munin_set_var_path ($hash, $var, $val);
-
-
-
+
-            $prefix = $1;
-
-
+
-                $prefix .= ":";
-
-
-
+
-                $prefix .= "";
-
-
-
+
-                $prefix .= ".";
-
-
-
+
-                (my $domain = $prefix) =~ s/^[^\.]+\.//;
-                $prefix = "$domain;$prefix:";
-
-
-
+
-                (my $domain = $prefix) =~ s/^[^\.]+\.//;
-                $prefix = "$domain;$prefix.";
-            }
-
-
-
+
-            my ($var, $val) = ($1, $2);
-            $hash = &munin_set_var_path ($hash, "$prefix$var", $val);
-
-
-
+
-            warn "Malformed configuration line \"$line\".";
-        }
@@ -145 +131 @@
-    my $val  = shift;
-
-
+::
-    if ($var =~ /^\s*([^;:]+);([^;:]+):(\S+)\s*$/)
-    {
@@ -199 +185 @@
-    my $val  = shift;
-
-
+::
-    if ($var =~ /^\s*([^;:]+);([^:]+):(\S+)\s*$/)
-    {
@@ -304 +290 @@
-        {
-            next if "$pre$a" eq "version"; # Handled separately
-
+::
-            if ($data->{$a} =~ /\\$/)
-            { # Backslash as last char has special meaning. Avoid it.
@@ -314 +300 @@
-    }
-}
+
+
-sub munin_writeconfig {
-    my ($datafilename,$data,$fh) = @_;
@@ -335 +323 @@
-    if (defined $fh)
-    {
-
+
+
-        close ($fh);
-    }
-}
-
-
+($$) 
-    my $conffile = shift;
-
+my 
-    $conffile ||= $configfile;
-    $config = &munin_readconfig ($conffile);

people/janl/src/server/munin-update

@@ -24 +24 @@
-
-use strict;
-# 
-
+
+../
-use Munin;
-
-
-
-
-
-
-
+
-use Time::HiRes;
-use RRDs;
@@ -40 +34 @@
-use POSIX ":sys_wait_h";
-use Storable qw(fd_retrieve nstore_fd);
-
-print "Confdir: ",$Munin::CONFDIR,"\n";
-exit 0;
-
-my $DEBUG=0;