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

Makefile

@@ -12,7 +12,7 @@ INSTALL          = ./install-sh
 
 default: build
 
-install: install-main install-eye install-eye-plugins install-doc
+install: install-main install-node install-node-plugins install-doc
 
 install-main: build
 	$(CHECKUSER)
@@ -58,13 +58,13 @@ install-node: build
 	$(CHMOD) 775 $(PLUGSTATE)
 	$(CHMOD) 755 $(CONFDIR)/plugin-conf.d
 
-	$(INSTALL) -m 0755 build/eye/munin-eye $(SBINDIR)/
-	$(INSTALL) -m 0755 build/eye/munin-eye-configure $(SBINDIR)/
-	test -f "$(CONFDIR)/munin-eye.conf" || $(INSTALL) -m 0644 build/eye/munin-eye.conf $(CONFDIR)/
-	$(INSTALL) -m 0755 build/eye/munin-run $(SBINDIR)/
+	$(INSTALL) -m 0755 build/node/munin-node $(SBINDIR)/
+	$(INSTALL) -m 0755 build/node/munin-node-configure $(SBINDIR)/
+	test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/
+	$(INSTALL) -m 0755 build/node/munin-run $(SBINDIR)/
 
-install-eye-plugins: build
-	for p in build/eye/plugins.$(ARCH)/* build/eye/plugins/*; do    		\
+install-node-plugins: build
+	for p in build/node/node.d.$(ARCH)/* build/node/node.d/*; do    		\
 		if test -f "$$p" ; then                                     		\
 			family=`sed -n 's/^#%# family=\(.*\)$$/\1/p' $$p`;  		\
 			test "$$family" || family=contrib;                  		\
@@ -74,7 +74,7 @@ install-eye-plugins: build
 			fi;                                                 		\
 		fi                                                          		\
 	done
-	$(INSTALL) -m 0644 build/eye/plugins.history $(LIBDIR)/plugins/
+	$(INSTALL) -m 0644 build/node/plugins.history $(LIBDIR)/plugins/
 
 	#TODO:
 	#configure plugins.
@@ -201,4 +201,4 @@ source_dist: clean
 	(cd ..; ln -s munin munin-$(VERSION))
 	tar -C .. --dereference --exclude CVS --exclude dists -cvzf ../munin_$(RELEASE).tar.gz munin-$(VERSION)/
 
-.PHONY: install install-main install-eye install-doc build build-doc deb rpm clean source_dist
+.PHONY: install install-main install-node install-doc build build-doc deb rpm clean source_dist

README.api

@@ -6,7 +6,7 @@ Client commands:
 	- list [node]
 	  	Asks client to list all items available for query for
 		this host. If no host is given, default to host that runs
-		the munin-eye
+		the munin-node
 
 	- nodes
 		List hosts

RELEASE

@@ -1 +1 @@
-0.9.9r6
+1.0.0pre1

node/munin-node-configure.in

@@ -3,6 +3,9 @@
 # Program to suggest configurations and configuration changes.
 #
 # $Log$
+# Revision 1.2  2004/01/15 15:20:00  jimmyo
+# Making things workable after name change. Upping for test verwion.
+#
 # Revision 1.1  2004/01/02 18:50:00  jimmyo
 # Renamed occurrances of lrrd -> munin
 #
@@ -35,7 +38,7 @@ use strict;
 use Getopt::Long;
 
 my $version    = "@@VERSION@@";
-my $config     = "@@CONFDIR@@/munin-eye.conf";
+my $config     = "@@CONFDIR@@/munin-node.conf";
 my $servicedir = "@@CONFDIR@@/plugins";
 my $libdir     = "@@LIBDIR@@/plugins";
 my $bindir     = "@@SBINDIR@@";
@@ -93,7 +96,7 @@ Options:
 
 if ($do_version)
 {
-    print "munin-eye-configure (munin-eye) version $version.\n";
+    print "munin-node-configure (munin-node) version $version.\n";
     print "Written by Jimmy Olsen\n";
     print "\n";
     print "Copyright (C) 2003\n";
@@ -503,11 +506,11 @@ sub get_plugins
 
 =head1 NAME
 
-munin-eye-configure - A program to view configurations for munin-eye
+munin-node-configure - A program to view configurations for munin-node
 
 =head1 SYNOPSIS
 
-munin-eye-configure [options]
+munin-node-configure [options]
 
 =head1 OPTIONS
 
@@ -557,25 +560,25 @@ Also show rm-commands when doing --shell
 
 =head1 DESCRIPTION
 
-Munin's eye is a daemon that Munin connects to fetch data. This data is
+Munin's node is a daemon that Munin connects to fetch data. This data is
 stored in .rrd-files, and later graphed and htmlified. It's designed to
 let it be very easy to graph new datasources.
 
-Munin-eye-configure is a script to show the current configuration of which
+Munin-node-configure is a script to show the current configuration of which
 plugins the host is running, as well as suggestions on what changes to make
-to this configuration. Munin-eye-configure does this by using munin-run(1) to
+to this configuration. Munin-node-configure does this by using munin-run(1) to
 ask the plugins themselves of wether they should be run or not.
 
 =head1 FILES
 
-	@@CONFDIR@@/munin-eye.conf
+	@@CONFDIR@@/munin-node.conf
 	@@CONFDIR@@/plugin-conf.d/*
 	@@CONFDIR@@/plugins/*
 	@@LIBDIR@@/plugins/*
 
 =head1 VERSION
 
-This is munin-eye-configure v@@VERSION@@.
+This is munin-node-configure v@@VERSION@@.
 
 =head1 AUTHORS
 

node/munin-node-simple.in

@@ -1,12 +1,15 @@
 #!/usr/bin/perl -wT
 #
-# Simple munin-eye. Should be run from inetd or similar.
+# Simple munin-node. Should be run from inetd or similar.
 #
 # This should be as small and elegant as possible, to make for easier
 # reviewing by sysadmins that want to do simple munin-stuff in high
 # security environments.
 #
 # $Log$
+# Revision 1.2  2004/01/15 15:20:01  jimmyo
+# Making things workable after name change. Upping for test verwion.
+#
 # Revision 1.1  2004/01/02 18:50:00  jimmyo
 # Renamed occurrances of lrrd -> munin
 #

node/node.conf.in → node/munin-node.conf.in

@@ -1,11 +1,11 @@
 #
-# Example config-file for munin-eye
+# Example config-file for munin-node
 #
 
 log_level 4
-log_file @@LOGDIR@@/munin-eye.log
+log_file @@LOGDIR@@/munin-node.log
 port 4949
-pid_file @@STATEDIR@@/munin-eye.pid
+pid_file @@STATEDIR@@/munin-node.pid
 background 1
 setseid 1
 

node/munin-node.in

@@ -3,6 +3,9 @@
 # $Id$
 #
 # $Log$
+# Revision 1.2  2004/01/15 15:20:01  jimmyo
+# Making things workable after name change. Upping for test verwion.
+#
 # Revision 1.1  2004/01/02 18:50:00  jimmyo
 # Renamed occurrances of lrrd -> munin
 #
@@ -57,7 +60,7 @@ my %services;
 my %nodes;
 my $servicedir="@@CONFDIR@@/plugins";
 my $sconfdir="@@CONFDIR@@/plugin-conf.d";
-my $conffile="@@CONFDIR@@/munin-eye.conf";
+my $conffile="@@CONFDIR@@/munin-node.conf";
 my $FQDN="";
 my $do_usage = 0;
 my $DEBUG = 0;
@@ -83,7 +86,7 @@ if ($do_usage)
 Options:
     --help              View this message.
     --config <file>     Use <file> as configuration file. 
-                        [/etc/munin/munin-eye.conf]
+                        [/etc/munin/munin-node.conf]
     --[no]paranoia      Only run plugins owned by root. Check permissions.
                         [--noparanoia]
     --debug             View debug messages.
@@ -95,7 +98,7 @@ Options:
 
 if ($do_version)
 {
-	print "munin-eye (munin-eye) version $VERSION.
+	print "munin-node (munin-node) version $VERSION.
 Written by Audun Ytterdal, Jimmy Olsen, Tore Anderson / Linpro AS
 
 Copyright (C) 2002-2003
@@ -175,7 +178,7 @@ $ENV{FQDN}=$FQDN;
 &load_services;
 
 MyPackage->run(conf_file => $conffile,
-	       pid_file => "@@STATEDIR@@/munin-eye.pid");
+	       pid_file => "@@STATEDIR@@/munin-node.pid");
 exit;
 
 
@@ -184,7 +187,7 @@ exit;
 ### over-ridden subs below
 
 sub show_version {
-  print "munins eye on $FQDN version: $VERSION\n"
+  print "munins node on $FQDN version: $VERSION\n"
 }
 
 sub show_nodes {
@@ -401,7 +404,7 @@ sub run_service {
 
 sub process_request {
   my $self = shift;
-  print "# munins eye at $FQDN\n";
+  print "# munin node at $FQDN\n";
   local $SIG{ALRM} = sub { die "timeout" };
   alarm(10);
   while( <STDIN> ){
@@ -625,20 +628,20 @@ sub get_var
 
 =head1 NAME
 
-munin-eye - A daemon to gather information in cooperation with the main
+munin-node - A daemon to gather information in cooperation with the main
 Munin program
 
 =head1 SYNOPSIS
 
-munin-eye [--options]
+munin-node [--options]
 
 =head1 OPTIONS
 
 =over 5
 
 =item B<< --config <configfile> >>
 
-Use E<lt>fileE<gt> as configuration file. [/etc/munin/munin-eye.conf]
+Use E<lt>fileE<gt> as configuration file. [/etc/munin/munin-node.conf]
 
 =item B< --[no]paranoia >
 
@@ -656,11 +659,11 @@ View debug messages.
 
 =head1 DESCRIPTION
 
-Munin's eye is a daemon that Munin connects to fetch data. This data is
+Munin's node is a daemon that Munin connects to fetch data. This data is
 stored in .rrd-files, and later graphed and htmlified. It's designed to
 let it be very easy to graph new datasources.
 
-Munin-eye is a small perlscript listening to port 4949 using
+Munin-node is a small perlscript listening to port 4949 using
 Net::Server. It reads all the plugins in /etc/munin/plugins/ on startup.
 The node accepts the following commands:
 
@@ -669,11 +672,11 @@ The node accepts the following commands:
 =item B<< list [node] >>
 
 list available plugins for host. If no hostname is specified, list plugins
-on host running munin-eye
+on host running munin-node
 
 =item B<< nodes >>
 
-List nodes that has plugins in this munin-eye.
+List nodes that has plugins in this munin-node.
 
 =item B<< config <plugin> >>
 
@@ -717,23 +720,23 @@ For more information, see the documentation section at L<http://munin.sf.net/>.
 
 =head1 FILES
 
-	@@CONFDIR@@/munin-eye.conf
+	@@CONFDIR@@/munin-node.conf
 	@@CONFDIR@@/plugins/*
 	@@CONFDIR@@/plugin-conf.d/*
-	@@STATEDIR@@/munin-eye.pid
-	@@LOGDIR@@/munin-eye
+	@@STATEDIR@@/munin-node.pid
+	@@LOGDIR@@/munin-node
 
 =head1 VERSION
 
-This is munin-eye v@@VERSION@@
+This is munin-node v@@VERSION@@
 
 =head1 AUTHORS
 
 Audun Ytterdal, Jimmy Olsen, and Tore Anderson.
 
 =head1 BUGS
 
-munin-eye does, as of now, not check the syntax of the configuration file.
+munin-node does, as of now, not check the syntax of the configuration file.
 
 Please report other bugs in the bug tracker at L<http://munin.sf.net/>.