Changeset 7

Show
Ignore:
Timestamp:
01/15/04 16:20:01 (8 years ago)
Author:
jimmyo
Message:

Making things workable after name change. Upping for test verwion.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Makefile

    • Property cvs2svn:cvs-rev changed from 1.2 to 1.3
    r6 r7  
    1313default: build 
    1414 
    15 install: install-main install-eye install-eye-plugins install-doc 
     15install: install-main install-node install-node-plugins install-doc 
    1616 
    1717install-main: build 
    …… 
    5959        $(CHMOD) 755 $(CONFDIR)/plugin-conf.d 
    6060 
    61         $(INSTALL) -m 0755 build/eye/munin-eye $(SBINDIR)/ 
    62         $(INSTALL) -m 0755 build/eye/munin-eye-configure $(SBINDIR)/ 
    63         test -f "$(CONFDIR)/munin-eye.conf" || $(INSTALL) -m 0644 build/eye/munin-eye.conf $(CONFDIR)/ 
    64         $(INSTALL) -m 0755 build/eye/munin-run $(SBINDIR)/ 
    65  
    66 install-eye-plugins: build 
    67         for p in build/eye/plugins.$(ARCH)/* build/eye/plugins/*; do                  \ 
     61        $(INSTALL) -m 0755 build/node/munin-node $(SBINDIR)/ 
     62        $(INSTALL) -m 0755 build/node/munin-node-configure $(SBINDIR)/ 
     63        test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/ 
     64        $(INSTALL) -m 0755 build/node/munin-run $(SBINDIR)/ 
     65 
     66install-node-plugins: build 
     67        for p in build/node/node.d.$(ARCH)/* build/node/node.d/*; do                  \ 
    6868                if test -f "$$p" ; then                                                 \ 
    6969                        family=`sed -n 's/^#%# family=\(.*\)$$/\1/p' $$p`;              \ 
    …… 
    7575                fi                                                                      \ 
    7676        done 
    77         $(INSTALL) -m 0644 build/eye/plugins.history $(LIBDIR)/plugins/ 
     77        $(INSTALL) -m 0644 build/node/plugins.history $(LIBDIR)/plugins/ 
    7878 
    7979        #TODO: 
    …… 
    202202        tar -C .. --dereference --exclude CVS --exclude dists -cvzf ../munin_$(RELEASE).tar.gz munin-$(VERSION)/ 
    203203 
    204 .PHONY: install install-main install-eye install-doc build build-doc deb rpm clean source_dist 
     204.PHONY: install install-main install-node install-doc build build-doc deb rpm clean source_dist 

  • trunk/README.api

    • Property cvs2svn:cvs-rev changed from 1.2 to 1.3
    r6 r7  
    77                Asks client to list all items available for query for 
    88                this host. If no host is given, default to host that runs 
    9                 the munin-eye 
     9                the munin-node 
    1010         
    1111        - nodes 

  • trunk/RELEASE

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.2
    r2 r7  
    1 0.9.9r6 
     11.0.0pre1 

  • trunk/node/munin-node-configure.in

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.2
    r6 r7  
    44# 
    55# $Log$ 
     6# Revision 1.2  2004/01/15 15:20:00  jimmyo 
     7# Making things workable after name change. Upping for test verwion. 
     8# 
    69# Revision 1.1  2004/01/02 18:50:00  jimmyo 
    710# Renamed occurrances of lrrd -> munin 
    …… 
    3639 
    3740my $version    = "@@VERSION@@"; 
    38 my $config     = "@@CONFDIR@@/munin-eye.conf"; 
     41my $config     = "@@CONFDIR@@/munin-node.conf"; 
    3942my $servicedir = "@@CONFDIR@@/plugins"; 
    4043my $libdir     = "@@LIBDIR@@/plugins"; 
    …… 
    9497if ($do_version) 
    9598{ 
    96     print "munin-eye-configure (munin-eye) version $version.\n"; 
     99    print "munin-node-configure (munin-node) version $version.\n"; 
    97100    print "Written by Jimmy Olsen\n"; 
    98101    print "\n"; 
    …… 
    504507=head1 NAME 
    505508 
    506 munin-eye-configure - A program to view configurations for munin-eye 
     509munin-node-configure - A program to view configurations for munin-node 
    507510 
    508511=head1 SYNOPSIS 
    509512 
    510 munin-eye-configure [options] 
     513munin-node-configure [options] 
    511514 
    512515=head1 OPTIONS 
    …… 
    558561=head1 DESCRIPTION 
    559562 
    560 Munin's eye is a daemon that Munin connects to fetch data. This data is 
     563Munin's node is a daemon that Munin connects to fetch data. This data is 
    561564stored in .rrd-files, and later graphed and htmlified. It's designed to 
    562565let it be very easy to graph new datasources. 
    563566 
    564 Munin-eye-configure is a script to show the current configuration of which 
     567Munin-node-configure is a script to show the current configuration of which 
    565568plugins the host is running, as well as suggestions on what changes to make 
    566 to this configuration. Munin-eye-configure does this by using munin-run(1) to 
     569to this configuration. Munin-node-configure does this by using munin-run(1) to 
    567570ask the plugins themselves of wether they should be run or not. 
    568571 
    569572=head1 FILES 
    570573 
    571         @@CONFDIR@@/munin-eye.conf 
     574        @@CONFDIR@@/munin-node.conf 
    572575        @@CONFDIR@@/plugin-conf.d/* 
    573576        @@CONFDIR@@/plugins/* 
    …… 
    576579=head1 VERSION 
    577580 
    578 This is munin-eye-configure v@@VERSION@@. 
     581This is munin-node-configure v@@VERSION@@. 
    579582 
    580583=head1 AUTHORS 

  • trunk/node/munin-node-simple.in

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.2
    r6 r7  
    11#!/usr/bin/perl -wT 
    22# 
    3 # Simple munin-eye. Should be run from inetd or similar. 
     3# Simple munin-node. Should be run from inetd or similar. 
    44# 
    55# This should be as small and elegant as possible, to make for easier 
    …… 
    88# 
    99# $Log$ 
     10# Revision 1.2  2004/01/15 15:20:01  jimmyo 
     11# Making things workable after name change. Upping for test verwion. 
     12# 
    1013# Revision 1.1  2004/01/02 18:50:00  jimmyo 
    1114# Renamed occurrances of lrrd -> munin 

  • trunk/node/munin-node.in

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.2
    r6 r7  
    44# 
    55# $Log$ 
     6# Revision 1.2  2004/01/15 15:20:01  jimmyo 
     7# Making things workable after name change. Upping for test verwion. 
     8# 
    69# Revision 1.1  2004/01/02 18:50:00  jimmyo 
    710# Renamed occurrances of lrrd -> munin 
    …… 
    5861my $servicedir="@@CONFDIR@@/plugins"; 
    5962my $sconfdir="@@CONFDIR@@/plugin-conf.d"; 
    60 my $conffile="@@CONFDIR@@/munin-eye.conf"; 
     63my $conffile="@@CONFDIR@@/munin-node.conf"; 
    6164my $FQDN=""; 
    6265my $do_usage = 0; 
    …… 
    8487    --help              View this message. 
    8588    --config <file>     Use <file> as configuration file.  
    86                         [/etc/munin/munin-eye.conf] 
     89                        [/etc/munin/munin-node.conf] 
    8790    --[no]paranoia      Only run plugins owned by root. Check permissions. 
    8891                        [--noparanoia] 
    …… 
    9699if ($do_version) 
    97100{ 
    98         print "munin-eye (munin-eye) version $VERSION. 
     101        print "munin-node (munin-node) version $VERSION. 
    99102Written by Audun Ytterdal, Jimmy Olsen, Tore Anderson / Linpro AS 
    100103 
    …… 
    176179 
    177180MyPackage->run(conf_file => $conffile, 
    178                pid_file => "@@STATEDIR@@/munin-eye.pid"); 
     181               pid_file => "@@STATEDIR@@/munin-node.pid"); 
    179182exit; 
    180183 
    …… 
    185188 
    186189sub show_version { 
    187   print "munins eye on $FQDN version: $VERSION\n" 
     190  print "munins node on $FQDN version: $VERSION\n" 
    188191} 
    189192 
    …… 
    402405sub process_request { 
    403406  my $self = shift; 
    404   print "# munins eye at $FQDN\n"; 
     407  print "# munin node at $FQDN\n"; 
    405408  local $SIG{ALRM} = sub { die "timeout" }; 
    406409  alarm(10); 
    …… 
    626629=head1 NAME 
    627630 
    628 munin-eye - A daemon to gather information in cooperation with the main 
     631munin-node - A daemon to gather information in cooperation with the main 
    629632Munin program 
    630633 
    631634=head1 SYNOPSIS 
    632635 
    633 munin-eye [--options] 
     636munin-node [--options] 
    634637 
    635638=head1 OPTIONS 
    …… 
    639642=item B<< --config <configfile> >> 
    640643 
    641 Use E<lt>fileE<gt> as configuration file. [/etc/munin/munin-eye.conf] 
     644Use E<lt>fileE<gt> as configuration file. [/etc/munin/munin-node.conf] 
    642645 
    643646=item B< --[no]paranoia > 
    …… 
    657660=head1 DESCRIPTION 
    658661 
    659 Munin's eye is a daemon that Munin connects to fetch data. This data is 
     662Munin's node is a daemon that Munin connects to fetch data. This data is 
    660663stored in .rrd-files, and later graphed and htmlified. It's designed to 
    661664let it be very easy to graph new datasources. 
    662665 
    663 Munin-eye is a small perlscript listening to port 4949 using 
     666Munin-node is a small perlscript listening to port 4949 using 
    664667Net::Server. It reads all the plugins in /etc/munin/plugins/ on startup. 
    665668The node accepts the following commands: 
    …… 
    670673 
    671674list available plugins for host. If no hostname is specified, list plugins 
    672 on host running munin-eye 
     675on host running munin-node 
    673676 
    674677=item B<< nodes >> 
    675678 
    676 List nodes that has plugins in this munin-eye. 
     679List nodes that has plugins in this munin-node. 
    677680 
    678681=item B<< config <plugin> >> 
    …… 
    718721=head1 FILES 
    719722 
    720         @@CONFDIR@@/munin-eye.conf 
     723        @@CONFDIR@@/munin-node.conf 
    721724        @@CONFDIR@@/plugins/* 
    722725        @@CONFDIR@@/plugin-conf.d/* 
    723         @@STATEDIR@@/munin-eye.pid 
    724         @@LOGDIR@@/munin-eye 
     726        @@STATEDIR@@/munin-node.pid 
     727        @@LOGDIR@@/munin-node 
    725728 
    726729=head1 VERSION 
    727730 
    728 This is munin-eye v@@VERSION@@ 
     731This is munin-node v@@VERSION@@ 
    729732 
    730733=head1 AUTHORS 
    …… 
    734737=head1 BUGS 
    735738 
    736 munin-eye does, as of now, not check the syntax of the configuration file. 
     739munin-node does, as of now, not check the syntax of the configuration file. 
    737740 
    738741Please report other bugs in the bug tracker at L<http://munin.sf.net/>. 

  • trunk/node/munin-run.in

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.2
    r6 r7  
    44# 
    55# $Log$ 
     6# Revision 1.2  2004/01/15 15:20:01  jimmyo 
     7# Making things workable after name change. Upping for test verwion. 
     8# 
    69# Revision 1.1  2004/01/02 18:50:00  jimmyo 
    710# Renamed occurrances of lrrd -> munin 
    …… 
    4750my $servicedir="@@CONFDIR@@/plugins"; 
    4851my $sconfdir="@@CONFDIR@@/plugin-conf.d"; 
    49 my $conffile="@@CONFDIR@@/munin-eye.conf"; 
     52my $conffile="@@CONFDIR@@/munin-node.conf"; 
    5053my $sconffile=undef; 
    5154my $FQDN=""; 
    …… 
    7881    --help              View this message. 
    7982    --config <file>     Use <file> as configuration file.  
    80                         [@@CONFDIR@@/munin-eye.conf] 
     83                        [@@CONFDIR@@/munin-node.conf] 
    8184    --servicedir <dir>  Dir where plugins are found.  
    8285                        [@@CONFDIR@@/plugins] 
    …… 
    131134if ($do_version) 
    132135{ 
    133         print "munin-run (munin-eye) version $VERSION. 
     136        print "munin-run (munin-node) version $VERSION. 
    134137Written by Jimmy Olsen / Linpro AS 
    135138 
    …… 
    587590=head1 NAME 
    588591 
    589 munin-run - A program to run munin-eye plugins from the command line 
     592munin-run - A program to run munin-node plugins from the command line 
    590593 
    591594=head1 SYNOPSIS 
    …… 
    599602=item B<< --config <configfile> >> 
    600603 
    601 Use E<lt>fileE<gt> as configuration file. [@@CONFDIR@@/munin-eye.conf] 
     604Use E<lt>fileE<gt> as configuration file. [@@CONFDIR@@/munin-node.conf] 
    602605 
    603606=item B<< --servicedir <dir> >> 
    …… 
    629632=head1 DESCRIPTION 
    630633 
    631 Munin's eye is a daemon that Munin connects to fetch data. This data is 
     634Munin's node is a daemon that Munin connects to fetch data. This data is 
    632635stored in .rrd-files, and later graphed and htmlified. It's designed to 
    633636let it be very easy to graph new datasources. 
    634637 
    635 munin-run is a small perlscript to run the plugins used by the munin-eye 
     638munin-run is a small perlscript to run the plugins used by the munin-node 
    636639daemon from the command line. 
    637640 
    …… 
    640643=head1 FILES 
    641644 
    642         @@CONFDIR@@/munin-eye.conf 
     645        @@CONFDIR@@/munin-node.conf 
    643646        @@CONFDIR@@/plugins/* 
    644647        @@CONFDIR@@/plugin-conf.d/* 
    645         @@STATEDIR@@/munin-eye.pid 
    646         @@LOGDIR@@/munin-eye 
     648        @@STATEDIR@@/munin-node.pid 
     649        @@LOGDIR@@/munin-node 
    647650 
    648651=head1 VERSION 
    649652 
    650 This is munin-eye v@@VERSION@@ 
     653This is munin-node v@@VERSION@@ 
    651654 
    652655=head1 AUTHORS 
    …… 
    656659=head1 BUGS 
    657660 
    658 munin-eye does, as of now, not check the syntax of the configuration file. 
     661munin-node does, as of now, not check the syntax of the configuration file. 
    659662 
    660663Please report other bugs in the bug tracker at L<http://munin.sf.net/>. 

  • trunk/node/plugins.history.in

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.2
    r6 r7  
    7777[0.9.9r6] 
    7878[0.9.9r7] 
     79[1.0.0pre1] 

  • trunk/server/Munin.pm.in

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.2
    r6 r7  
    55# 
    66# $Log$ 
     7# Revision 1.2  2004/01/15 15:20:01  jimmyo 
     8# Making things workable after name change. Upping for test verwion. 
     9# 
    710# Revision 1.1  2004/01/02 18:50:01  jimmyo 
    811# Renamed occurrances of lrrd -> munin 
    …… 
    244247    } 
    245248 
    246     if (grep (/^\s*<\s*domain\s*/, @contents)) 
    247     { 
    248         if (! eval "require Config::General;") 
    249         { 
    250             die "Fatal: Configuration file \"$conf\" uses old configuration format requiring uninstalled perl module Config::General. Bailing out. ($!)"; 
    251         } 
    252         print "DEBUG: Config file has old format.\n" if $DEBUG; 
    253         if ($corruptok) 
    254         { 
    255             # Check if the datafile is sane 
    256             $@ = undef; 
    257             eval { 
    258                 new Config::General($conf); 
    259             }; 
    260             if ($@) 
    261             { 
    262                 ::logger ("munin_readconfig: \'$conf\' corrupt, starting from scratch. ($@)\n"); 
    263                 return undef; 
    264             } 
    265         } 
    266         my $conffile = new Config::General($conf); 
    267         $config = { $conffile->getall }; 
    268     } 
    269     else 
    270     { # New config format 
    271         print "DEBUG: Config file has new format.\n" if $DEBUG; 
    272         $config = &munin_parse_config (\@contents); 
    273     } 
     249    $config = &munin_parse_config (\@contents); 
    274250 
    275251    # Some important defaults before we return... 

  • trunk/server/munin-cron.pod

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.2
    r6 r7  
    2828 
    2929Munin-cron is a part of the package Munin, which is used in combination 
    30 with Munin's eye.  Munin is a group of programs to gather data from 
    31 Munin's eyes, graph them, create html-pages, and optionally warn Nagios 
     30with Munin's node.  Munin is a group of programs to gather data from 
     31Munin's nodes, graph them, create html-pages, and optionally warn Nagios 
    3232about any off-limit values. 
    3333 

  • trunk/server/munin-graph.in

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.2
    r6 r7  
    66# 
    77# $Log$ 
     8# Revision 1.2  2004/01/15 15:20:01  jimmyo 
     9# Making things workable after name change. Upping for test verwion. 
     10# 
    811# Revision 1.1  2004/01/02 18:50:01  jimmyo 
    912# Renamed occurrances of lrrd -> munin 
    …… 
    851854 
    852855Munin-graph is a part of the package Munin, which is used in combination 
    853 with Munin's eye.  Munin is a group of programs to gather data from 
    854 Munin's eyes, graph them, create html-pages, and optionally warn Nagios 
     856with Munin's node.  Munin is a group of programs to gather data from 
     857Munin's nodes, graph them, create html-pages, and optionally warn Nagios 
    855858about any off-limit values. 
    856859 

  • trunk/server/munin-html.in

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.2
    r6 r7  
    44# 
    55# $Log$ 
     6# Revision 1.2  2004/01/15 15:20:01  jimmyo 
     7# Making things workable after name change. Upping for test verwion. 
     8# 
    69# Revision 1.1  2004/01/02 18:50:01  jimmyo 
    710# Renamed occurrances of lrrd -> munin 
    …… 
    273276 
    274277Munin-html is a part of the package Munin, which is used in combination 
    275 with Munin's eye.  Munin is a group of programs to gather data from 
    276 Munin's eyes, graph them, create html-pages, and optionally warn Nagios 
     278with Munin's node.  Munin is a group of programs to gather data from 
     279Munin's nodes, graph them, create html-pages, and optionally warn Nagios 
    277280about any off-limit values. 
    278281 

  • trunk/server/munin-limits.in

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.2
    r6 r7  
    33# 
    44# $Log$ 
     5# Revision 1.2  2004/01/15 15:20:01  jimmyo 
     6# Making things workable after name change. Upping for test verwion. 
     7# 
    58# Revision 1.1  2004/01/02 18:50:01  jimmyo 
    69# Renamed occurrances of lrrd -> munin 
    …… 
    231234 
    232235Munin-nagios is a part of the package Munin, which is used in combination 
    233 with Munin's eye.  Munin is a group of programs to gather data from 
    234 Munin's eyes, graph them, create html-pages, and optionally warn Nagios 
     236with Munin's node.  Munin is a group of programs to gather data from 
     237Munin's nodes, graph them, create html-pages, and optionally warn Nagios 
    235238about any off-limit values. 
    236239 

  • trunk/server/munin-nagios.in

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.2
    r6 r7  
    55# 
    66# $Log$ 
     7# Revision 1.2  2004/01/15 15:20:01  jimmyo 
     8# Making things workable after name change. Upping for test verwion. 
     9# 
    710# Revision 1.1  2004/01/02 18:50:01  jimmyo 
    811# Renamed occurrances of lrrd -> munin 
    …… 
    360363 
    361364Munin-nagios is a part of the package Munin, which is used in 
    362 combination with Munin's eye.  Munin is a group of programs to gather 
    363 data from Munin's eyes, graph them, create html-pages, and optionally 
     365combination with Munin's node.  Munin is a group of programs to gather 
     366data from Munin's nodes, graph them, create html-pages, and optionally 
    364367warn Nagios about any off-limit values. 
    365368 

  • trunk/server/munin-update.in

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.2
    r6 r7  
    66# 
    77# $Log$ 
     8# Revision 1.2  2004/01/15 15:20:01  jimmyo 
     9# Making things workable after name change. Upping for test verwion. 
     10# 
    811# Revision 1.1  2004/01/02 18:50:01  jimmyo 
    912# Renamed occurrances of lrrd -> munin 
    …… 
    540543      return 0; 
    541544  } 
    542   $clientdomain =~ s/\#.*(?:lrrd|munins) (?:client|eye) at //; 
     545  $clientdomain =~ s/\#.*(?:lrrd|munins) (?:client|node) at //; 
    543546  if (exists $node->{'use_node_name'} and $node->{'use_node_name'} =~ /^\s*y(?:es)\s*$/i) 
    544547  { 
    …… 
    793796 
    794797Munin-update is a part of the package Munin, which is used in 
    795 combination with Munin's eye.  Munin is a group of programs to gather 
    796 data from Munin's eyes, graph them, create html-pages, and optionally 
     798combination with Munin's node.  Munin is a group of programs to gather 
     799data from Munin's nodes, graph them, create html-pages, and optionally 
    797800warn Nagios about any off-limit values. 
    798801 
    …… 
    800803munin-cron. 
    801804 
    802 It contacts each host's munin-eye in turn, gathers data from it, and 
     805It contacts each host's munin-node in turn, gathers data from it, and 
    803806stores them in .rrd-files. If necessary, it will create the rrd-files 
    804807and the directories to store them in. 

  • trunk/server/munin.conf.pod

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.2
    r6 r7  
    55=head1 DESCRIPTION 
    66 
    7 Munin is a group of programs to gather data from Munin's eyes, graph 
     7Munin is a group of programs to gather data from Munin's nodes, graph 
    88them, create html-pages, and optionally warn Nagios about any off-limit 
    99values.