Changeset 1265

Timestamp:

11/29/06 17:55:05 (5 years ago)

Author:

ilmari

Message:

r9313@vesla (orig r1046): janl | 2006-08-17 15:12:08 +0100
IPMI plugin added

r9668@vesla (orig r1047): janl | 2006-08-24 12:43:15 +0100
Applied field.colour patch #54 - not tested O:-)

r9669@vesla (orig r1048): janl | 2006-08-24 23:35:54 +0100
Formating fix, closing #228.

r9670@vesla (orig r1049): janl | 2006-08-24 23:47:59 +0100
Plugin population cleanup

r9671@vesla (orig r1050): janl | 2006-08-25 00:01:54 +0100
New plugin

r9672@vesla (orig r1051): janl | 2006-08-25 00:04:45 +0100
New plugins

r9673@vesla (orig r1052): janl | 2006-08-25 00:16:11 +0100
Applied patch to allow _aggregated graph

r9674@vesla (orig r1053): janl | 2006-08-25 00:27:17 +0100
Tomcat plugins from runesk

r9675@vesla (orig r1054): janl | 2006-08-25 00:31:44 +0100
Debian #314610, Munin #92

r9676@vesla (orig r1055): janl | 2006-08-25 00:45:31 +0100
Adding contributed plugins

r9677@vesla (orig r1056): janl | 2006-08-30 00:35:43 +0100
New and better qmailscan plugin

r9678@vesla (orig r1057): janl | 2006-08-30 00:36:09 +0100
New and better name for it (ticket #58 btw)

r9679@vesla (orig r1058): janl | 2006-08-30 00:48:49 +0100
Applied patches from ticket #42. Unfortunately this does not fix the ticket, only enhances the aix plugins

r9680@vesla (orig r1059): janl | 2006-08-30 01:11:11 +0100
Make warn/crit levels configurable by environment (ticket #44)

r9681@vesla (orig r1060): janl | 2006-08-30 01:44:30 +0100
SNMP based uptime grapher - ticket #141

r9682@vesla (orig r1061): janl | 2006-08-30 02:07:34 +0100
Saner values on 64 bit machines - ticket #119

r9683@vesla (orig r1062): janl | 2006-09-03 21:53:09 +0100
Random cosmetic changes while trying to understand process_node

r9684@vesla (orig r1063): janl | 2006-09-06 13:36:38 +0100
Change global headers limit to 16 or longer labels - 20 was too much even with rrd 1.0

r9685@vesla (orig r1064): janl | 2006-09-06 14:48:19 +0100
Incomplete usage text

r9686@vesla (orig r1065): janl | 2006-09-06 15:40:54 +0100
New plugins

r9687@vesla (orig r1066): janl | 2006-09-06 15:41:25 +0100
very slight rename

r9688@vesla (orig r1067): janl | 2006-09-06 15:59:35 +0100
Some comments to clearify

r9689@vesla (orig r1068): janl | 2006-09-06 16:08:46 +0100
Bah, redundant work

r9690@vesla (orig r1069): janl | 2006-09-06 16:21:21 +0100
The cpuload plugin seems pretty broken. Reinstating the winload

r9691@vesla (orig r1070): janl | 2006-09-06 17:07:34 +0100
And memory too

r9692@vesla (orig r1071): janl | 2006-09-06 17:12:42 +0100
Still better

r9693@vesla (orig r1072): janl | 2006-09-19 11:24:18 +0100
sort keys instead of keys, prettyer that way

r9694@vesla (orig r1073): janl | 2006-09-25 23:05:11 +0100
New version if if_ plugin that also handles mii-tool dependent interfaces
and handles absence of tools better.
Typo fix in memory plugin.

r9695@vesla (orig r1074): janl | 2006-09-28 20:54:15 +0100
Plugins from Lars Strand

r9696@vesla (orig r1075): janl | 2006-09-28 20:54:34 +0100
New AIX plugin

r11484@vesla (orig r1087): bjorn | 2006-10-06 15:20:47 +0100
Lowercased graph category, fixed ticket #118

r11486@vesla (orig r1089): bjorn | 2006-10-06 15:31:07 +0100
Changelog for fixing ticket #118

r11501@vesla (orig r1098): tore | 2006-10-12 11:20:12 +0100
Node: use Sys::Hostname::hostname()+gethostbyname() instead of
Net::Domain::hostfqdn() in order to determine the fully-qualified host
name of the host. The latter appears to be brain-damaged, see
<http://bugs.debian.org/275024> for background (Deb#307462, Trac#89).

r11507@vesla (orig r1104): janl | 2006-10-12 14:30:45 +0100
Foo!?

r11509@vesla (orig r1106): janl | 2006-10-12 14:56:37 +0100
One # too many too

r11511@vesla (orig r1108): tore | 2006-10-13 08:07:29 +0100
Make munin-node-configure-snmp die gracefully with a potentially useful
error message if Net::SNMP->session() fails. Patch helpfully provided by
Cyril Bouthors <cyb@debian.org>, thanks!

r11523@vesla (orig r1120): bjorn | 2006-10-13 14:20:14 +0100
Added "colour" to @legal in Munin.pm (ticket #54)

r11531@vesla (orig r1127): ilmari | 2006-10-14 17:36:09 +0100
Add digitemp and yum plugins
r11533@vesla (orig r1129): tore | 2006-10-14 21:24:20 +0100
Really fix #92. I wonder if Nicolai forgot to commit the fix.

r11542@vesla (orig r1138): bjorn | 2006-10-15 20:51:51 +0100
Applied changeset 1081 to trunk

r11549@vesla (orig r1145): janl | 2006-10-18 21:09:33 +0100
Merge 1076:1093 from 1.3.3rc - making 1.3.3rc was a silly newbie mistake.

------------------------------------------------------------------------
r1093 | janl | 2006-10-06 23:30:16 +0200 (Fri, 06 Oct 2006) | 2 lines

Node: Clear up some operator presidence causing problems in perl 5.8.7

------------------------------------------------------------------------
r1092 | janl | 2006-10-06 21:57:15 +0200 (Fri, 06 Oct 2006) | 2 lines

Merge of trunk

------------------------------------------------------------------------
r1091 | janl | 2006-10-06 21:54:38 +0200 (Fri, 06 Oct 2006) | 2 lines

revert stupid changes I made a long time ago

------------------------------------------------------------------------
r1086 | janl | 2006-10-05 17:11:19 +0200 (Thu, 05 Oct 2006) | 2 lines

Update copyright years and put copyright info into the new README file

------------------------------------------------------------------------
r1085 | janl | 2006-10-05 17:10:26 +0200 (Thu, 05 Oct 2006) | 2 lines

Install a .htaccess file by default and document it

------------------------------------------------------------------------
r1084 | janl | 2006-10-05 16:00:37 +0200 (Thu, 05 Oct 2006) | 2 lines

Not Linux specific. ... I suspect this plugin is redundant and snmpif_ can do

the same job

------------------------------------------------------------------------
r1083 | janl | 2006-10-03 23:54:47 +0200 (Tue, 03 Oct 2006) | 2 lines

Remove obsolete files

------------------------------------------------------------------------
r1082 | janl | 2006-10-03 23:16:52 +0200 (Tue, 03 Oct 2006) | 2 lines

Yet more documentation cleaning

------------------------------------------------------------------------
r1081 | janl | 2006-10-03 09:52:09 +0200 (Tue, 03 Oct 2006) | 2 lines

Bugfix to support notify_alias at service level

------------------------------------------------------------------------
r1080 | janl | 2006-10-03 00:52:52 +0200 (Tue, 03 Oct 2006) | 2 lines

Getting better all the time

------------------------------------------------------------------------
r1079 | janl | 2006-10-02 19:24:26 +0200 (Mon, 02 Oct 2006) | 3 lines

Put configuration-file snippets into resource directory and use install
@@ substitutions in them

------------------------------------------------------------------------
r1078 | janl | 2006-10-02 18:21:20 +0200 (Mon, 02 Oct 2006) | 2 lines

Better dependencies

------------------------------------------------------------------------
r1077 | janl | 2006-09-28 22:17:04 +0200 (Thu, 28 Sep 2006) | 2 lines

Correct release version

------------------------------------------------------------------------
r1076 | janl | 2006-09-28 22:03:37 +0200 (Thu, 28 Sep 2006) | 1 line

Preparing for 1.3.3
---------------------------------------------------------------------

r11551@vesla (orig r1147): janl | 2006-10-18 21:35:55 +0100

• Fix rrd 1.2 font size problem causing line wrap (#104)
  
• Fold in contributed hack to generate single service comparative pages
  
  
  

r11552@vesla (orig r1148): janl | 2006-10-18 21:56:00 +0100

• munin-html: Split on /\s+/ instead of / / to ensure more robust handling of user input
  
  

r11554@vesla (orig r1150): janl | 2006-10-18 22:21:37 +0100

• nutups_: new plugin for ups checking through "nut".
  
  

r11555@vesla (orig r1151): janl | 2006-10-18 22:26:41 +0100

• Squid plugins: Add timeout to http connection call
  
• Correct years of (C) in snmpwinmem
  
  

r11556@vesla (orig r1152): janl | 2006-10-18 22:30:36 +0100

• Add uptime plugin for solaris (trac #419)
  
  

r11557@vesla (orig r1153): janl | 2006-10-18 22:38:55 +0100

• Added init script for Solaris in resources directory
  
  

r11558@vesla (orig r1154): janl | 2006-10-18 22:53:58 +0100

• irqstats plugin: Fix bug related to different /proc/interupts format on Sparc hardware (trac #436)
  
  

r11559@vesla (orig r1155): janl | 2006-10-18 23:26:27 +0100

• Munin.pm: Fix uninitialized value problem in lock reading code.
  
  
  

r11560@vesla (orig r1156): janl | 2006-10-18 23:44:43 +0100

• Contrib: (updated) hack to generate pages of each-service-on-every-host
  
  

r11561@vesla (orig r1157): janl | 2006-10-19 00:02:43 +0100

• Add a possibly helpful readme file to dists/sunos
  
  

r11562@vesla (orig r1158): janl | 2006-10-19 08:43:59 +0100

• Document what graph_strategy cgi does (trac #98)
  
  

r11563@vesla (orig r1159): janl | 2006-10-19 09:09:19 +0100

• munin-node: Fix depreciated environment setting messages (trac #377)
  
  

r11564@vesla (orig r1160): janl | 2006-10-19 09:10:52 +0100
Fix previois changeset better

r11565@vesla (orig r1161): janl | 2006-10-19 09:20:25 +0100

• New plugin: Multiping shows multiple ping results in one graph (trac #109)
  
  

r11566@vesla (orig r1162): janl | 2006-10-19 09:28:11 +0100

• Contributed plugins for netbsd
  
• New ntpdc based ntp plugins to show kernel params
  
  

r11567@vesla (orig r1163): janl | 2006-10-19 09:52:18 +0100

• fw_forwarded_local: Removed arbitrary max settings (trac #149)
  
  

r11568@vesla (orig r1164): janl | 2006-10-19 20:45:50 +0100

• Add maintainer version of Makefile.config - and stop it from being
  distributed as the actual Makefile.config by accident
  
• Add favicon.ico file and install
  
• Add other convinience features for the maintainer to Makefile
  
  
  

r11569@vesla (orig r1165): janl | 2006-10-19 22:14:53 +0100

• YUM plugin did not autoconf correctly
  
• install-node-plugins now installs all plugins in the distribution -
  no matter what
  
• Inform about ruthless installation practices in INSTALL document
  
  

r11570@vesla (orig r1166): janl | 2006-10-19 23:45:41 +0100

• ipmi plugin: Incorrect handeling of 'autoconf' method
  
  

r11571@vesla (orig r1167): janl | 2006-10-20 00:00:48 +0100

• port_ plugin did not use @@PLUGSTATE@@ for plugin state
  
  

r11572@vesla (orig r1168): janl | 2006-10-20 00:08:31 +0100

• Makefile: Create plugin state directory with correct ownership and permissions
  
  

r11573@vesla (orig r1169): janl | 2006-10-20 00:09:52 +0100
Work in progress: munin-node-configure was fragile when plugins said the wrong thing. Currently it's broken and will not install any plugins.
Irqstats was and is broken.

r11574@vesla (orig r1170): janl | 2006-10-20 20:59:21 +0100

• munin-run: Make --debug messages consistent wrt STDERR/STDOUT and prefix with # to make them obvious to users and munin-node-configure
  
  

r11575@vesla (orig r1171): janl | 2006-10-20 23:16:16 +0100

• Munin-node-configure: Make more robust, make it present plugin errors and exit with error if there are any. Write testcases and node-monkeywrench target in Makefile to test the error handling.
  
  
  

r11576@vesla (orig r1172): janl | 2006-10-24 11:48:52 +0100

• lpstat: New plugin for print queue depths
  
  

r11577@vesla (orig r1173): janl | 2006-10-24 14:09:20 +0100

• Multiple plugins: Correct autoconf/suggest action slightly
  
  

r11578@vesla (orig r1174): janl | 2006-10-24 16:18:28 +0100

• Partial audit of correct magicmarkers in generic and linux plugins
  
  

r11579@vesla (orig r1175): janl | 2006-10-24 21:19:22 +0100
Undo some fuzzy thinking in the locking procedures of Munin.pm

r11580@vesla (orig r1176): janl | 2006-10-24 22:26:41 +0100

• Memory plugin: Remove warning on overcommit
  
  

r11581@vesla (orig r1177): janl | 2006-10-25 11:14:27 +0100

• Bring SunOS df plugin names into line with other platforms
  
• Make SunOS df plugins auto/autoconf
  
  

r11582@vesla (orig r1178): janl | 2006-10-25 11:15:01 +0100
Brainfart in renaming

r11583@vesla (orig r1179): janl | 2006-10-25 15:42:39 +0100

• Munin-update: Add code to interpret Scientific notation (3E-20) for RRD so plugins don't have to
  
  

r11584@vesla (orig r1180): janl | 2006-10-25 15:45:44 +0100

• Munin-graph: Installed kluge for rrd 1.2 to make lines narrower to compensate for crayon-effect.
  
  

r11585@vesla (orig r1181): janl | 2006-10-25 15:47:14 +0100

• Makefile: Install platform-specific plugins after generic plugins so that the former override the latter ones
  
  

r11586@vesla (orig r1182): janl | 2006-10-25 15:48:21 +0100

• df* plugins on all architectures: Make fieldnames comply to charset restrictions
  
  

r11587@vesla (orig r1183): janl | 2006-10-25 21:40:31 +0100

• Munin-run/node: Put most @@ config params from install time into plugin environment. This means that plugins can access @@PLUGSTATE@@ as $MUNIN_PLUGSTATE, and so on.
  
  

r11588@vesla (orig r1184): janl | 2006-10-25 21:45:48 +0100

• plugin.sh: Utility functions for shell plugins
  
• Munin::Plugin: Utility functions for perl plugins
  
• Sample plugins: Convert to use plugin.sh and Munin::Plugin
  
• Makefile: Install utility files
  
  

r11589@vesla (orig r1185): janl | 2006-10-25 23:20:11 +0100

• Linux df* plugins: Configurable filesystem-type exclution. cds by defaut
  
  

r11590@vesla (orig r1186): janl | 2006-10-26 09:15:11 +0100

• munin-node docs: Mention two most importand Net::Server config options.
  
  

r11591@vesla (orig r1187): janl | 2006-10-26 10:04:27 +0100

• Put "host" thing in munin-node.conf template config
  
  

r11592@vesla (orig r1188): janl | 2006-10-26 10:20:40 +0100
Further featurefixing in these plugins

r11593@vesla (orig r1189): janl | 2006-10-26 14:36:24 +0100

• exim_* plugins: Problems with "which exim" on Solaris corrected
  
  

r11594@vesla (orig r1190): janl | 2006-10-26 14:41:48 +0100

• Define GOODSH and BASH in Makefile.config to be used by shell plugins
  
  

r11595@vesla (orig r1191): janl | 2006-10-26 14:42:35 +0100

• SunOS df plugins: use @@GOODSH@@
  
  

r11596@vesla (orig r1192): janl | 2006-10-26 14:58:10 +0100
More @@ variables into the environment

r11597@vesla (orig r1193): janl | 2006-10-26 15:01:36 +0100
Undo unposix from earlier changeset

r11598@vesla (orig r1194): janl | 2006-10-26 15:11:18 +0100
Further fixes to make the GOODSH stuff work

r11599@vesla (orig r1195): janl | 2006-10-26 15:12:55 +0100

• munin-node-simple: Fix @@ variable typos
  
  

r11600@vesla (orig r1196): tore | 2006-10-26 17:24:48 +0100
Fix typo "contigious"

r11602@vesla (orig r1198): janl | 2006-10-27 10:54:41 +0100
Correct brainfart w.r.t. MUNIN_ env variables. Include all and don't make silly mistakes.

r11603@vesla (orig r1199): janl | 2006-10-29 13:35:48 +0000

• Further adjustments w.r.t. correct handling of vmalloc_used
  
  

r11604@vesla (orig r1200): janl | 2006-10-29 15:25:30 +0000

• users plugin: change familiy to auto, make generic
  
  

r11605@vesla (orig r1201): janl | 2006-10-29 15:26:46 +0000

• users plugin: Move to platform independent directory
  
  

r11606@vesla (orig r1202): janl | 2006-10-29 15:35:05 +0000
Lost a \n in translation

r11607@vesla (orig r1203): janl | 2006-10-29 16:16:39 +0000

• munin-graph/Munin.pm: Support graph_printf
  
  

r11608@vesla (orig r1204): janl | 2006-10-29 16:17:24 +0000

• users plugin: Further fixing. Make testbed for field.colour and graph_printf
  
  

r11609@vesla (orig r1205): janl | 2006-10-29 16:17:43 +0000

• Makefile: Remove build before rebuilding it
  
  

r11610@vesla (orig r1206): janl | 2006-10-29 17:53:55 +0000
Allow ip based access-controll too

r11611@vesla (orig r1207): janl | 2006-10-29 17:54:30 +0000
Ditto for INSTALL file

r11612@vesla (orig r1208): janl | 2006-10-29 18:42:29 +0000
Insert lacking graph_info option

r11613@vesla (orig r1209): janl | 2006-10-29 18:43:31 +0000

• munin-graph: Simplify colour processing
  
  

r11614@vesla (orig r1210): janl | 2006-10-29 18:45:53 +0000

• INSTALL: Document what to do first when working with a svn checkout
  
  

r11677@vesla (orig r1211): janl | 2006-10-29 20:11:34 +0000

• munin-graph: Support draw types AREASTACK and LINESTACK which is not sensitive to order like LINE/STACK and AREA/STACK
  
  

r11678@vesla (orig r1212): janl | 2006-10-29 20:11:58 +0000

• users plugin: Make vehicle for *STACK draw types
  
  

r11787@vesla (orig r1213): janl | 2006-10-29 21:54:50 +0000
But the average format stays the same old

r11788@vesla (orig r1214): janl | 2006-10-29 22:04:56 +0000
Fix so *STACK draw-type don't need to be the first of all.

r11789@vesla (orig r1215): janl | 2006-10-29 23:35:06 +0000

• munin-html: Log runtime - like with munin-graph etc.
  
  

r11790@vesla (orig r1216): janl | 2006-10-30 13:52:06 +0000

• muin-html: Do not generate height/width attributes when in cgi mode
  
  

r11791@vesla (orig r1217): janl | 2006-10-30 14:56:53 +0000

• munin-cgi-graph: Patch to limit number of concurrent rrdgraph processes
  
  

r11792@vesla (orig r1218): janl | 2006-10-30 18:21:55 +0000

• ntp_kernel_* plugins: Not ntpdc's were created equal, autodetect better
  
  

r11793@vesla (orig r1219): janl | 2006-10-30 18:29:55 +0000
And make them "auto" and invent category "time" as well

r11794@vesla (orig r1220): janl | 2006-10-30 18:33:36 +0000

• ntp_ and ntp_states plugins: Insert graph_category
  
  

r11795@vesla (orig r1221): janl | 2006-10-30 18:39:10 +0000

• munin monitoring plugins: Make them auto-installing
  
  

r11796@vesla (orig r1222): janl | 2006-10-30 19:09:48 +0000

• node.d/df and df_inode plugins: Rewrite like the last 20 years of shell enhancments happened
  
  

r11797@vesla (orig r1223): janl | 2006-10-30 19:15:19 +0000

• Bring the goodness og @@GOODSH@@ to the generic plugins
  
  

r11798@vesla (orig r1224): janl | 2006-10-30 20:13:10 +0000

• sunos memory: Make autoconf'able
  
  

r11799@vesla (orig r1225): janl | 2006-10-30 20:19:52 +0000

• Solaris plugins: bring them @@GOODSH@@ and some elementary civilization
  
  

r11800@vesla (orig r1226): janl | 2006-10-30 20:25:43 +0000

• linux/vlan: Better autoconf messages
  
  

r11801@vesla (orig r1227): janl | 2006-10-30 20:38:51 +0000

• Linux plugins: print posix there too
  
  

r11807@vesla (orig r1233): janl | 2006-11-02 20:32:01 +0000
nut is unix, not linux

r11851@vesla (orig r1234): janl | 2006-11-09 15:26:52 +0000

• Putting 1.3.3 into RELEASE
  
  

r11852@vesla (orig r1235): janl | 2006-11-09 15:38:19 +0000
Update plugins.history and adjust Checklist

r11853@vesla (orig r1236): janl | 2006-11-10 12:36:49 +0000
That should do it for 1.3.3

r11855@vesla (orig r1238): janl | 2006-11-10 12:38:39 +0000
And the trunk continues here

r11856@vesla (orig r1239): janl | 2006-11-13 10:49:30 +0000

• New acpi thermal_zone plugin
  
  

r11857@vesla (orig r1240): janl | 2006-11-13 10:49:56 +0000
Actuall new in place now

r11858@vesla (orig r1241): janl | 2006-11-13 14:36:25 +0000

• Bugfix linux/if_ plugin (--path=>-p, quoting, ethtool output tolerance)
  
  

r11860@vesla (orig r1243): janl | 2006-11-13 23:02:08 +0000

• linux/cpuspeed: $(< ) isn't in POSIX it seems
  
  

Files:

• people/ilmari/modularisation-branch/COPYING (modified) (1 diff)
• people/ilmari/modularisation-branch/ChangeLog (modified) (3 diffs)
• people/ilmari/modularisation-branch/Checklist (added)
• people/ilmari/modularisation-branch/INSTALL (modified) (2 diffs)
• people/ilmari/modularisation-branch/Makefile (modified) (14 diffs)
• people/ilmari/modularisation-branch/Makefile.config (modified) (3 diffs)
• people/ilmari/modularisation-branch/Makefile.config-dist (added)
• people/ilmari/modularisation-branch/Makefile.config-maint (added)
• people/ilmari/modularisation-branch/README (added)
• people/ilmari/modularisation-branch/README-apache-cgi.in (deleted)
• people/ilmari/modularisation-branch/README.api (deleted)
• people/ilmari/modularisation-branch/RELEASE (modified) (1 diff)
• people/ilmari/modularisation-branch/contrib (added)
• people/ilmari/modularisation-branch/contrib/munin-every-services-all-boxes-build-html.in (added)
• people/ilmari/modularisation-branch/dists/sunos/README (added)
• people/ilmari/modularisation-branch/monkeywrench (added)
• people/ilmari/modularisation-branch/monkeywrench/plugin-break-autoconf-die_ (added)
• people/ilmari/modularisation-branch/monkeywrench/plugin-break-autoconf-empty_ (added)
• people/ilmari/modularisation-branch/monkeywrench/plugin-break-suggest-die_ (added)
• people/ilmari/modularisation-branch/monkeywrench/plugin-break-suggest-empty_ (added)
• people/ilmari/modularisation-branch/node/Plugin.pm.in (added)
• people/ilmari/modularisation-branch/node/TODO (deleted)
• people/ilmari/modularisation-branch/node/TODO.plugins (deleted)
• people/ilmari/modularisation-branch/node/munin-node-configure-snmp.in (modified) (6 diffs)
• people/ilmari/modularisation-branch/node/munin-node-configure.in (modified) (19 diffs)
• people/ilmari/modularisation-branch/node/munin-node-simple.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/munin-node.conf.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/munin-node.conf.pod (modified) (2 diffs)
• people/ilmari/modularisation-branch/node/munin-node.in (modified) (8 diffs)
• people/ilmari/modularisation-branch/node/munin-run.in (modified) (8 diffs)
• people/ilmari/modularisation-branch/node/node.d.aix/cpu.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d.aix/df.in (modified) (2 diffs)
• people/ilmari/modularisation-branch/node/node.d.aix/iostat.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d.aix/load.in (added)
• people/ilmari/modularisation-branch/node/node.d.aix/memory.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d.aix/netstat.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d.aix/processes.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d.aix/swap.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d.freebsd/df.in (modified) (3 diffs)
• people/ilmari/modularisation-branch/node/node.d.freebsd/df_inode.in (modified) (3 diffs)
• people/ilmari/modularisation-branch/node/node.d.freebsd/if_.in (modified) (3 diffs)
• people/ilmari/modularisation-branch/node/node.d.freebsd/uptime.in (added)
• people/ilmari/modularisation-branch/node/node.d.linux/acpi.in (added)
• people/ilmari/modularisation-branch/node/node.d.linux/apt.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d.linux/apt_all.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d.linux/cpu.in (modified) (4 diffs)
• people/ilmari/modularisation-branch/node/node.d.linux/cpuspeed.in (modified) (4 diffs)
• people/ilmari/modularisation-branch/node/node.d.linux/df.in (modified) (8 diffs)
• people/ilmari/modularisation-branch/node/node.d.linux/df_abs.in (modified) (4 diffs)
• people/ilmari/modularisation-branch/node/node.d.linux/df_inode.in (modified) (8 diffs)
• people/ilmari/modularisation-branch/node/node.d.linux/entropy.in (modified) (3 diffs)
• people/ilmari/modularisation-branch/node/node.d.linux/files_.in (modified) (3 diffs)
• people/ilmari/modularisation-branch/node/node.d.linux/forks.in (modified) (2 diffs)
• people/ilmari/modularisation-branch/node/node.d.linux/fw_conntrack.in (modified) (3 diffs)
• people/ilmari/modularisation-branch/node/node.d.linux/fw_forwarded_local.in (modified) (3 diffs)
• people/ilmari/modularisation-branch/node/node.d.linux/fw_packets.in (modified) (3 diffs)
• people/ilmari/modularisation-branch/node/node.d.linux/i2c.in (deleted)
• people/ilmari/modularisation-branch/node/node.d.linux/i2c_fan.in (deleted)
• people/ilmari/modularisation-branch/node/node.d.linux/if_.in (modified) (2 diffs)
• people/ilmari/modularisation-branch/node/node.d.linux/if_err_.in (modified) (3 diffs)
• people/ilmari/modularisation-branch/node/node.d.linux/interrupts.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d.linux/ip_.in (modified) (2 diffs)
• people/ilmari/modularisation-branch/node/node.d.linux/ipmi_.in (added)
• people/ilmari/modularisation-branch/node/node.d.linux/irqstats.in (modified) (3 diffs)
• people/ilmari/modularisation-branch/node/node.d.linux/load.in (modified) (5 diffs)
• people/ilmari/modularisation-branch/node/node.d.linux/memory.in (modified) (7 diffs)
• people/ilmari/modularisation-branch/node/node.d.linux/netopia.in (deleted)
• people/ilmari/modularisation-branch/node/node.d.linux/netstat.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d.linux/nfs4_client.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d.linux/nfs_client.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d.linux/nfsd.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d.linux/open_files.in (modified) (2 diffs)
• people/ilmari/modularisation-branch/node/node.d.linux/open_inodes.in (modified) (2 diffs)
• people/ilmari/modularisation-branch/node/node.d.linux/port_.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d.linux/proc_pri.in (added)
• people/ilmari/modularisation-branch/node/node.d.linux/processes.in (modified) (2 diffs)
• people/ilmari/modularisation-branch/node/node.d.linux/quota_usage_.in (added)
• people/ilmari/modularisation-branch/node/node.d.linux/swap.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d.linux/threads.in (added)
• people/ilmari/modularisation-branch/node/node.d.linux/uptime.in (modified) (2 diffs)
• people/ilmari/modularisation-branch/node/node.d.linux/users.in (deleted)
• people/ilmari/modularisation-branch/node/node.d.linux/vlan_.in (modified) (3 diffs)
• people/ilmari/modularisation-branch/node/node.d.linux/yum.in (added)
• people/ilmari/modularisation-branch/node/node.d.netbsd (added)
• people/ilmari/modularisation-branch/node/node.d.netbsd/cpu.in (added)
• people/ilmari/modularisation-branch/node/node.d.netbsd/df.in (added)
• people/ilmari/modularisation-branch/node/node.d.netbsd/df_inode.in (added)
• people/ilmari/modularisation-branch/node/node.d.netbsd/forks.in (added)
• people/ilmari/modularisation-branch/node/node.d.netbsd/if_.in (added)
• people/ilmari/modularisation-branch/node/node.d.netbsd/if_errcoll_.in (added)
• people/ilmari/modularisation-branch/node/node.d.netbsd/interrupts.in (added)
• people/ilmari/modularisation-branch/node/node.d.netbsd/iostat.in (added)
• people/ilmari/modularisation-branch/node/node.d.netbsd/iostat_ops.in (added)
• people/ilmari/modularisation-branch/node/node.d.netbsd/irqstats.in (added)
• people/ilmari/modularisation-branch/node/node.d.netbsd/load.in (added)
• people/ilmari/modularisation-branch/node/node.d.netbsd/memory.in (added)
• people/ilmari/modularisation-branch/node/node.d.netbsd/memory_pools.in (added)
• people/ilmari/modularisation-branch/node/node.d.netbsd/memory_types.in (added)
• people/ilmari/modularisation-branch/node/node.d.netbsd/netstat.in (added)
• people/ilmari/modularisation-branch/node/node.d.netbsd/nfs_client.in (added)
• people/ilmari/modularisation-branch/node/node.d.netbsd/nfsd.in (added)
• people/ilmari/modularisation-branch/node/node.d.netbsd/open_files.in (added)
• people/ilmari/modularisation-branch/node/node.d.netbsd/processes.in (added)
• people/ilmari/modularisation-branch/node/node.d.netbsd/sensors_.in (added)
• people/ilmari/modularisation-branch/node/node.d.netbsd/swap.in (added)
• people/ilmari/modularisation-branch/node/node.d.netbsd/uptime.in (added)
• people/ilmari/modularisation-branch/node/node.d.netbsd/vmstat.in (added)
• people/ilmari/modularisation-branch/node/node.d.sunos/df.in (added)
• people/ilmari/modularisation-branch/node/node.d.sunos/df_inode.in (added)
• people/ilmari/modularisation-branch/node/node.d.sunos/fs_df.in (deleted)
• people/ilmari/modularisation-branch/node/node.d.sunos/fs_inodes.in (deleted)
• people/ilmari/modularisation-branch/node/node.d.sunos/if_.in (modified) (2 diffs)
• people/ilmari/modularisation-branch/node/node.d.sunos/if_errcoll_.in (modified) (2 diffs)
• people/ilmari/modularisation-branch/node/node.d.sunos/io_busy_.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d.sunos/io_bytes_.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d.sunos/io_ops_.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d.sunos/load.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d.sunos/memory.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d.sunos/paging_in.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d.sunos/paging_out.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d.sunos/processes.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d.sunos/uptime.in (added)
• people/ilmari/modularisation-branch/node/node.d/README (deleted)
• people/ilmari/modularisation-branch/node/node.d/acpi.in (deleted)
• people/ilmari/modularisation-branch/node/node.d/amavis.in (modified) (2 diffs)
• people/ilmari/modularisation-branch/node/node.d/apc_envunit_.in (modified) (3 diffs)
• people/ilmari/modularisation-branch/node/node.d/cmc_tc_sensor_.in (added)
• people/ilmari/modularisation-branch/node/node.d/courier_.in (modified) (3 diffs)
• people/ilmari/modularisation-branch/node/node.d/courier_mta_mailqueue.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d/cupsys_pages.in (modified) (7 diffs)
• people/ilmari/modularisation-branch/node/node.d/df.in (modified) (2 diffs)
• people/ilmari/modularisation-branch/node/node.d/df_inode.in (modified) (2 diffs)
• people/ilmari/modularisation-branch/node/node.d/digitemp_.in (added)
• people/ilmari/modularisation-branch/node/node.d/exim_mailqueue.in (modified) (2 diffs)
• people/ilmari/modularisation-branch/node/node.d/exim_mailqueue_alt.in (modified) (2 diffs)
• people/ilmari/modularisation-branch/node/node.d/exim_mailstats.in (modified) (2 diffs)
• people/ilmari/modularisation-branch/node/node.d/foldingathome.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d/foldingathome_rank.in (modified) (2 diffs)
• people/ilmari/modularisation-branch/node/node.d/foldingathome_wu.in (modified) (3 diffs)
• people/ilmari/modularisation-branch/node/node.d/hddtemp.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d/id.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d/ipac-ng.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d/lpstat.in (added)
• people/ilmari/modularisation-branch/node/node.d/mbmon_.in (modified) (2 diffs)
• people/ilmari/modularisation-branch/node/node.d/multiping.in (added)
• people/ilmari/modularisation-branch/node/node.d/multips.in (modified) (2 diffs)
• people/ilmari/modularisation-branch/node/node.d/munin_graph.in (modified) (2 diffs)
• people/ilmari/modularisation-branch/node/node.d/munin_update.in (modified) (2 diffs)
• people/ilmari/modularisation-branch/node/node.d/mysql_bytes.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d/mysql_isam_space_.in (modified) (3 diffs)
• people/ilmari/modularisation-branch/node/node.d/mysql_queries.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d/mysql_slowqueries.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d/mysql_threads.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d/named.in (modified) (2 diffs)
• people/ilmari/modularisation-branch/node/node.d/netopia.in (added)
• people/ilmari/modularisation-branch/node/node.d/ntp_.in (modified) (2 diffs)
• people/ilmari/modularisation-branch/node/node.d/ntp_kernel_err.in (added)
• people/ilmari/modularisation-branch/node/node.d/ntp_kernel_pll_freq.in (added)
• people/ilmari/modularisation-branch/node/node.d/ntp_kernel_pll_off.in (added)
• people/ilmari/modularisation-branch/node/node.d/ntp_states.in (modified) (2 diffs)
• people/ilmari/modularisation-branch/node/node.d/nutups_.in (added)
• people/ilmari/modularisation-branch/node/node.d/perdition.in (modified) (2 diffs)
• people/ilmari/modularisation-branch/node/node.d/ping_.in (modified) (3 diffs)
• people/ilmari/modularisation-branch/node/node.d/postfix_mailqueue.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d/postfix_mailstats.in (modified) (4 diffs)
• people/ilmari/modularisation-branch/node/node.d/ps_.in (modified) (4 diffs)
• people/ilmari/modularisation-branch/node/node.d/psu_.in (modified) (2 diffs)
• people/ilmari/modularisation-branch/node/node.d/qmailscan-simple.in (added)
• people/ilmari/modularisation-branch/node/node.d/qmailscan.in (added)
• people/ilmari/modularisation-branch/node/node.d/samba.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d/sendmail_mailqueue.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d/sendmail_mailstats.in (modified) (2 diffs)
• people/ilmari/modularisation-branch/node/node.d/sendmail_mailtraffic.in (modified) (2 diffs)
• people/ilmari/modularisation-branch/node/node.d/snmp__if_.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d/snmp__rdp_users.in (added)
• people/ilmari/modularisation-branch/node/node.d/snmp__uptime.in (added)
• people/ilmari/modularisation-branch/node/node.d/snmp__winload.in (added)
• people/ilmari/modularisation-branch/node/node.d/snmp__winmem.in (added)
• people/ilmari/modularisation-branch/node/node.d/spamstats.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d/squid_cache.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d/squid_icp.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d/squid_requests.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d/squid_traffic.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/node.d/tomcat_access.in (added)
• people/ilmari/modularisation-branch/node/node.d/tomcat_jvm.in (added)
• people/ilmari/modularisation-branch/node/node.d/tomcat_threads.in (added)
• people/ilmari/modularisation-branch/node/node.d/tomcat_volume.in (added)
• people/ilmari/modularisation-branch/node/node.d/users.in (added)
• people/ilmari/modularisation-branch/node/node.d/vmstat.in (modified) (1 diff)
• people/ilmari/modularisation-branch/node/plugin.sh.in (added)
• people/ilmari/modularisation-branch/node/plugins.history.in (modified) (2 diffs)
• people/ilmari/modularisation-branch/resources (added)
• people/ilmari/modularisation-branch/resources/apache-cgi.conf.in (added)
• people/ilmari/modularisation-branch/resources/apache-passwd.conf.in (added)
• people/ilmari/modularisation-branch/resources/favicon.ico (added)
• people/ilmari/modularisation-branch/resources/linux-cron.d_munin-node.in (added)
• people/ilmari/modularisation-branch/resources/linux-cron.d_munin.in (added)
• people/ilmari/modularisation-branch/resources/solaris-init.d_munin-node.in (added)
• people/ilmari/modularisation-branch/server/TODO (deleted)
• people/ilmari/modularisation-branch/server/VeraMono.ttf (added)
• people/ilmari/modularisation-branch/server/munin-cgi-graph.in (modified) (3 diffs)
• people/ilmari/modularisation-branch/server/munin-cron.pod (modified) (2 diffs)
• people/ilmari/modularisation-branch/server/munin-graph.in (modified) (30 diffs)
• people/ilmari/modularisation-branch/server/munin-htaccess (deleted)
• people/ilmari/modularisation-branch/server/munin-htaccess.in (added)
• people/ilmari/modularisation-branch/server/munin-html.in (modified) (10 diffs)
• people/ilmari/modularisation-branch/server/munin-limits.in (modified) (3 diffs)
• people/ilmari/modularisation-branch/server/munin-update.in (modified) (5 diffs)

people/ilmari/modularisation-branch/COPYING

@@ -1 @@
-
-
+
-
-
-
-
-
+
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
+
-
-
-
-
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
-
-Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a fre
-
-
-patent must be licensed for everyone's free use or not licensed at all
+The Font Software may be modified, altered, or added to, and in
+  particular the designs of glyphs or characters in the Fonts may b
+
+
+  "Bitstream" or the word "Vera"
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+

people/ilmari/modularisation-branch/ChangeLog

@@ +1 @@
+-*- text -*-
-munin (repository)
-
@@ -6 +7 @@
-  * Move Perl modules to {node,server}/lib/.
-  * Server: Display the time period in the title of the comparison pages.
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  * Plugins: "exists $ARGV[0]" does not work with perl < 5.6.0. use
-    "defined $ARGV[0]".
@@ -14 +204 @@
-  * Dists: Merged changes from Debian Etch package. See
-    dists/debian/changelog.
-  * Main: Correct munin-limits pod documentation.
-  * Server: filter a trivial error message from RRDtool (Deb#326061)
-  * Server: A patch from trunk that makes munin-limits eat stdout/err from the
-    contact.foo.command option in munin.conf. (Deb#301196)
-  * Server: make munin-graph deal with RRDtool 1.0.x and 1.2.x.
-  * Server: Fix thinko in category_order in munin-html.in.
-  * Server: Fix handling of 'update no' on services. 
-  * Server: Log warning about nodes without addresses.
-  * Node: Prevent list command from polluting the node list.
- given
-   
+
+       given
-  * Plugins: Fix to support the Linux cciss driver in the iostat plugin.
-  * Plugins: squid_requests: Put the CDEF back that computes misses.
-  * Plugins: postfix_mailvolume: Fix bad exit code test for `which postconf`.
-  * Plugins: hddtemp_smartctl: Fix bugs on Solaris.  Revert back to using -A
-
-
+  
+  
-  * Plugins: samba: Make location of smbstatus program configurable.
-
-
-
-
+  
+  
+  
+  
-  * Plugins: smart_: Allow to query several drives on the same 3ware card.
-
-
-
-
-
+  
+  
+  
+  
+  
-  * Plugins: perdition: Add missing backquote on mktempfile line. Support
-
+  
-  * Plugins (FreeBSD): if_, if_errcoll_: Shift field numbers in awk for
-
+  
-  * Plugins (Solaris): fs_df, fs_inodes: Allow '-' in mountpoints.
-  * Plugins (Solaris): processes: Replaced numerous calls to various programs
-
+  
-  * Plugins (Solaris): netstat: "exists $ARGV[0]" does not work with perl <
-
+  
-  * Plugins (Solaris): memory: Rewrite the value computation as a single nawk
-
+  
-  * Plugins (Linux): port_: Correct offset error in TCP6 code.
-  * Plugins (Linux): if_: Simplify awk program greatly, suggested by
-    Nicolai Langfeldt <janl@linpro.no>
+  * Plugins: Added plugin generic/digitemp_.
+  * Plugins: Added plugin linux/yum.
+  * Node: use Sys::Hostname::hostname()+gethostbyname() instead of
+    Net::Domain::hostfqdn() in order to determine the fully-qualified host
+    name of the host.  The latter appears to be brain-damaged, see
+    <http://bugs.debian.org/275024> for background (Deb#307462, Trac#89).
-
-munin (1.3.2)

people/ilmari/modularisation-branch/INSTALL

@@ -1 @@
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        - edit Makefile.config
-        - create the user "munin"
-        - make install-main
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-To install the documentation:
@@ -18 +56 @@
-        - make install-doc install-man
-
-the client
+a node
-
-        - edit Makefile.config
-        - create the group "munin"
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-Notes about node plugins
---
+
-
-"make install-node-plugins" installs the plugins in LIBDIR (defined in
-Makefile.config). Put the ones you want to use (or better yet, create
-client.d/ . An easy way to do this, is the program
-
-
+plugins/ . An easy way to do this, is the
+
+then 
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+

people/ilmari/modularisation-branch/Makefile

@@ -1 @@
-
-
-
-
-
-
-
+
+
+
+
+
-
-RELEASE          = $(shell cat RELEASE)
@@ -11 +9 @@
-INSTALL          = ./install-sh
-DIR              = $(shell /bin/pwd | sed 's/^.*\///')
+INFILES          = $(shell find . -name '*.in')
+PLUGINS          = $(wildcard node/node.d.$(OSTYPE)/* node/node.d/*)
+MANCENTER        = "Munin Documentation"
+MAN8             = node/munin-node node/munin-run \
+                        node/munin-node-configure-snmp \
+                        node/munin-node-configure \
+                        server/munin-graph server/munin-update \
+                        server/munin-limits server/munin-html
+PODMAN8          = server/munin-cron
+PODMAN5          = server/munin.conf node/munin-node.conf
-
-default: build
-
-
+
+
+
+
+
+
+
+
+
-
-install-main: build
@@ -31 +47 @@
-        $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(RUNDIR) $(HTMLDIR) $(DBDIR)
-
-     
+
-                $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \
-        done
@@ -37 +53 @@
-        $(INSTALL) -m 0644 server/style.css $(CONFDIR)/templates/
-        $(INSTALL) -m 0644 server/definitions.html $(CONFDIR)/templates/
-
+
+
+
-        test -f "$(CONFDIR)/munin.conf"  || $(INSTALL) -m 0644 build/server/munin.conf $(CONFDIR)/
-
-        $(INSTALL) -m 0755 build/server/munin-cron $(BINDIR)/
-
-        $(INSTALL) -m 0755 build/server/munin-update $(LIBDIR)/
-        $(INSTALL) -m 0755 build/server/munin-graph $(LIBDIR)/
@@ -47 +63 @@
-        $(INSTALL) -m 0755 build/server/munin-limits $(LIBDIR)/
-        $(INSTALL) -m 0755 build/server/munin-cgi-graph $(CGIDIR)/
-
-        $(INSTALL) -m 0644 build/server/lib/Munin.pm $(PERLLIB)/
+
+uninstall-main: build
+        for p in build/server/*.tmpl; do            \
+                rm -f $(CONFDIR)/templates/"$$p"  ; \
+        done
+        rm -f $(CONFDIR)/templates/logo.png
+        rm -f $(CONFDIR)/templates/style.css
+        rm -f $(CONFDIR)/templates/definitions.html
+        rm -f $(HTMLDIR)/.htaccess
+
+        rm -f $(CONFDIR)/munin.conf 
+
+        rm -f $(BINDIR)/munin-cron 
+
+        rm -f $(LIBDIR)/munin-update
+        rm -f $(LIBDIR)/munin-graph
+        rm -f $(LIBDIR)/munin-html
+        rm -f $(LIBDIR)/munin-limits
+        rm -f $(CGIDIR)/munin-cgi-graph
+
+        rm -f $(PERLLIB)/Munin.pm 
+        -rmdir $(CONFDIR)/templates
+        -rmdir $(CONFDIR)
+        -rmdir $(LIBDIR)
+        -rmdir $(BINDIR)
+
+        -rmdir $(LOGDIR)
+        -rmdir $(STATEDIR)
+        -rmdir $(HTMLDIR)
+        -rmdir $(DBDIR)
+        -rmdir $(CGIDIR)
-
-install-node: build install-node-non-snmp install-node-snmp
-        echo Done.
-
+uninstall-node: uninstall-node-non-snmp uninstall-node-snmp
+        echo Undone.
+
-install-node-snmp: build
-        $(INSTALL) -m 0755 build/node/munin-node-configure-snmp $(SBINDIR)/
+
+uninstall-node-snmp: build
+        rm -f $(SBINDIR)/munin-node-configure-snmp
+        -rmdir $(SBINDIR)
-
-install-node-non-snmp: build
@@ -76 +129 @@
-        $(INSTALL) -m 0755 build/node/munin-run $(SBINDIR)/
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        $(INSTALL) -m 0644 build/node/plugins.history $(LIBDIR)/plugins/
+        $(INSTALL) -m 0644 build/node/plugin.sh $(LIBDIR)/plugins/
+        mkdir -p $(PERLLIB)/Munin
+        $(INSTALL) -m 0644 build/node/Plugin.pm $(PERLLIB)/Munin/
-
-        mkdir -p $(PERLLIB)/Munin/Plugin
@@ -94 +165 @@
-        $(INSTALL) -m 0644 build/node/lib/Munin/Node/Runner.pm $(PERLLIB)/Munin/Node/
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        mkdir -p $(MANDIR)/man1 $(MANDIR)/man5 $(MANDIR)/man8
-        $(INSTALL) -m 0644 build/doc/munin-node.conf.5 $(MANDIR)/man5/
@@ -111 +189 @@
-        $(INSTALL) -m 0644 build/doc/munin-cron.8 $(MANDIR)/man8/
-
+uninstall-man: build-man
+        rm -f $(MANDIR)/man5/munin-node.conf.5 
+        rm -f $(MANDIR)/man5/munin.conf.5 
+        rm -f $(MANDIR)/man8/munin-node.8
+        rm -f $(MANDIR)/man8/munin-node-configure.8 
+        rm -f $(MANDIR)/man8/munin-node-configure-snmp.8
+        rm -f $(MANDIR)/man8/munin-run.8
+        rm -f $(MANDIR)/man8/munin-graph.8 
+        rm -f $(MANDIR)/man8/munin-update.8 
+        rm -f $(MANDIR)/man8/munin-limits.8
+        rm -f $(MANDIR)/man8/munin-html.8
+        rm -f $(MANDIR)/man8/munin-cron.8 
+        -rmdir $(MANDIR)/man1 $(MANDIR)/man5 $(MANDIR)/man8 $(MANDIR)
+
-install-doc: build-doc
-
-
-
-
-
-
-
-
+
+
-        $(INSTALL) -m 0644 COPYING $(DOCDIR)/
-
-
+
+
+
+
-
-build: build-stamp
-
-
-
+
+
+
+
+
+
+
-                destname=`echo $$file | sed 's/.in$$//'`;               \
-$$destname..;  
+build/$$destname..;
-                mkdir -p build/`dirname $$file`;                        \
-                sed -e 's|@@PREFIX@@|$(PREFIX)|g'                       \
@@ -144 +237 @@
-                    -e 's|@@PERL@@|$(PERL)|g'                           \
-                    -e 's|@@PERLLIB@@|$(PERLLIB)|g'                     \
-       
-       
+
+
-                    -e 's|@@HOSTNAME@@|$(HOSTNAME)|g'                   \
-                    -e 's|@@MKTEMP@@|$(MKTEMP)|g'                       \
@@ -154 +247 @@
-                    -e 's|@@GROUP@@|$(GROUP)|g'                         \
-                    -e 's|@@PLUGINUSER@@|$(PLUGINUSER)|g'               \
+                    -e 's|@@GOODSH@@|$(GOODSH)|g'                       \
+                    -e 's|@@BASH@@|$(BASH)|g'                           \
-                    $$file > build/$$destname;                          \
-        done
-
-
-
+
+
-
-build-doc-stamp:
+        touch build-doc-stamp
-        mkdir -p build/doc
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-        mkdir -p build/doc
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-deb:
+        (! grep MAINTAINER Makefile.config)
-        -rm debian
-        -ln -s dists/debian
@@ -207 +281 @@
-
-rpm-pre:
+        (! grep MAINTAINER Makefile.config)
-        @for file in `find dists/redhat/ -type f -name '*.in'`; do                      \
-                destname=`echo $$file | sed 's/.in$$//'`;               \
@@ -225 +300 @@
-
-suse-pre:
+        (! grep MAINTAINER Makefile.config)
-        @for file in `find dists/suse/ -type f -name '*.in'`; do                \
-                destname=`echo $$file | sed 's/.in$$//'`;               \
@@ -259 +335 @@
-
-source_dist: clean
-
+
+
-        tar -C .. --dereference --exclude .svn -cvzf ../munin_$(RELEASE).tar.gz munin-$(VERSION)/
+        (cd .. && rm munin-$(VERSION))
-
-ifeq ($(MAKELEVEL),0)
@@ -281 +359 @@
-        ln -s $< $@
-
+node-monkeywrench: install-node
+        rm -rf $(CONFDIR)/plugins
+        rm -rf $(LIBDIR)/plugins
+        mkdir -p $(LIBDIR)/plugins
+        mkdir -p $(CONFDIR)/plugins
+        cp monkeywrench/plugin-break*_ $(LIBDIR)/plugins/
+        $(SBINDIR)/munin-node-configure --suggest
+        echo 'Done?'
+
-t/install: 
-        $(MAKE) clean install-node install-node-plugins CONFIG=t/Makefile.config INSTALL_PLUGINS=test

people/ilmari/modularisation-branch/Makefile.config

@@ +1 @@
+# MAINTAINER VERSION OF Makefile.config
+# -*- Makefile -*-
+#
+# This file is rigged to overwrite the a debian munin-package as that
+# is what janl uses.
+#
+# $Id$
+
-# This file specifies where Munin will look for things after you've
-# run 'make' in the source directory.  Modify it to suit your needs.
@@ -5 +13 @@
-# a shadow tree during make install.
-
-
-
-
-
+
+
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-# Where to put internal binaries and plugin repository
-lib
+share/munin
-
-# Server only - Output directory
-$(PREFIX)/var/www
-
+/var/www/munin
+../
-
-# Client only - Where to put RRD files and other intenal data
-opt
+lib
-
-# Client only - Where plugins should put their states. Must be writable by
@@ -52 +50 @@
-PYTHON     = /usr/bin/env python
-
+# A modern shell.  We're not looking for arrays, but $() and other modern
+# stuff is expected.
+# Linux: /bin/bash
+# SunOS/Solaris: /usr/xpg4/bin/sh or /bin/ksh
+# In general: bash or ksh will work
+GOODSH     = /bin/bash
+
+# Path of bash for bash specific plugins
+BASH       = /bin/bash
+
-# Server only - Where to install the perl libraries
-= -f2 | sed "s/[\';]//g"
+"'" -f2
-
-# Client only - Install plugins for this architecture

people/ilmari/modularisation-branch/RELEASE

@@ -1 @@
-napshot
+vn-trunk

people/ilmari/modularisation-branch/node/munin-node-configure-snmp.in

@@ -1 +1 @@
-#!@@PERL@@ -w
-#
-
+-2006
-#
-# This program is free software; you can redistribute it and/or
@@ -17 +17 @@
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-#
-
-use strict;
@@ -63 +62 @@
-    "snmpversion=s" => \$snmpver,
-    "community=s"   => \$community,
-=> \$newer
+ => \$newer   # Seems unused
-);
-
@@ -87 +86 @@
-        --servicedir <dir>  Override plugin dir [$servicedir]
-        --libdir <dir>      Override plugin lib [$libdir]
-
+
+
-
-";
@@ -100 +100 @@
-Written by Jimmy Olsen
-
-5
+6
-
-This is free software released under the GNU General Public License. There
@@ -166 +166 @@
-                );
-        $session->translate (0);
+        die $error if $error;
-
-        if (!defined ($session))

people/ilmari/modularisation-branch/node/munin-node-configure.in

@@ -1 +1 @@
-#!@@PERL@@ -w
+# -*- perl -*-
-#
-4 Jimmy Olsen
+3-2006 Jimmy Olsen, Nicolai Langfeldt.
-#
-# This program is free software; you can redistribute it and/or
@@ -17 +18 @@
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-
-
+
-
-$| = 1; # Flush after every write to stdout
@@ -24 +24 @@
-use strict;
-use Getopt::Long;
+# use Data::Dumper;
-
-my $version    = "@@VERSION@@";
@@ -46 +47 @@
-my $do_version = 0;
-my $newer      = undef;
+my $debugopt   = '--debug'; # Pass --debug to children or not
+my @errors     = ();
+my $exiterror  = 1;
-
-$do_error = 1 unless GetOptions (
-        "help"            => \$do_usage,
-        "shell!"          => \$shell,
+        "exitnoterror!"   => \$exiterror,
-        "debug!"          => \$debug,
-        "suggest!"        => \$suggest,
@@ -79 +84 @@
-        --suggest               Show suggestions instead of status
-        --shell                 Show shell commands (implies --suggest)
+        --exitnoterror          Do not consider non-zero exit-value as error
-        --remove-also           Also show rm-commands when doing --shell
-        --newer <version>       Only show suggestions related to plugins newer
@@ -86 +92 @@
-        --snmpcommunity <comm>  Set SNMP community [public]
-
+By default this program shows which plugins are activated on the
+system.  If you specify --suggest it will present a table of plugins
+that will probably work (according to the plugins autoconf command).
+If you specify --shell shell commands to install those same plugins
+will be printed.  These can be reviewed or piped directly into a shell
+to install the plugins.
+
-";
-
@@ -97 +110 @@
-Written by Jimmy Olsen
-
-5
+6
-
-This is free software released under the GNU General Public License. There
@@ -110 +123 @@
-if (defined $newer and (!$shell or $removes))
-{
-
+STDERR 
-    exit 2;
-}
-
-
-
+
+
+
-    if (@snmp)
-    {
@@ -131 +145 @@
-}
-
-
-
+
+
+
+
-
-if (@snmp and !$shell)
-{
-
+STDERR 
-    exit 3;
-}
@@ -158 +174 @@
-    foreach my $plug (sort keys %{$plugins})
-    {
+#       print "New plugin: ", Dumper $plugins->{$plug},"\n";
+
-        next unless defined $plugins->{$plug}->{'family'};
-        next unless (grep (/^$plugins->{$plug}->{'family'}$/, @families));
@@ -282 +300 @@
-                &normal ($plug, $now, "");
-            }
-    
-       
-    
-
+}
+    
+
+
-
-if (@snmp and $shell)
@@ -297 +315 @@
-            push (@params, "--snmpversion", $snmpver) if defined $snmpver;
-            push (@params, "--community", $snmpcomm) if defined $snmpcomm;
-"--debug"
+$debugopt
-            push (@params, @snmp);
+            print "# executing: ",join(' ',@params),"\n" if $debug;
-            exec (@params);
-            # NOTREACHED
@@ -317 +336 @@
-}
-
+if (@errors) {
+    print STDERR "# There were some errors:\n";
+    print STDERR "# ",join("\n# ",@errors),"\n";
+
+    exit 1;
+}
+
-sub link_remove
-{
@@ -347 +373 @@
-}
-
-
-
+
-        (my $ps, my $dir) = @_;
-
-DEBUG:
-
+#
+\n
-        my @installed = readdir (DIR);
+        print "# Found ",scalar(@installed)," files\n" if $debug;
-        close (DIR);
-
-
-
+
-                my $realfile = undef;
-
@@ -365 +390 @@
-                $realfile =~ s/^.+\///;
-
-DEBUG:
+#
-                if ($realfile =~ /_$/) # Wildcard plugin...
-                {
-
+# 
-                    (my $wild = $inst) =~ s/^$realfile//;
-
+# 
-                    push @{$ps->{$realfile}->{'suggest'}}, $wild;
-                }
@@ -381 +406 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -582 +683 @@
-=item B<< --debug >>
-
-
+
+
+
-
-=item B<< --config <file> >>
@@ -653 +756 @@
-=head1 AUTHORS
-
-.
+, Nicolai Langfeldt
-
-=head1 BUGS
@@ -661 +764 @@
-=head1 COPYRIGHT
-
-© 2003 Jimmy Olsen
+(C) 2003-2006 Jimmy Olsen, Nicolai Langfeldt.
-
-This is free software; see the source for copying conditions. There is

people/ilmari/modularisation-branch/node/munin-node-simple.in

@@ -29 +29 @@
-$| = 1;
-
-ID
-ID
+DI
+DI
-my $version   = "@@VERSION@@";
-

people/ilmari/modularisation-branch/node/munin-node.conf.in

@@ -36 +36 @@
-allow ^127\.0\.0\.1$
-
+# uncomment this to only listen on the loopback/localhost interface
+#
+# host 127.0.0.1
+

people/ilmari/modularisation-branch/node/munin-node.conf.pod

@@ -15 +15 @@
-by using the module.
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-=over 5
@@ -70 +94 @@
-=head1 COPYRIGHT
-
-
+
+
-
-This is free software; see the source for copying conditions. There is NO

people/ilmari/modularisation-branch/node/munin-node.in

@@ -1 +1 @@
-#!@@PERL@@ -wT
+# -*- cperl -*-
-#
-# Copyright (C) 2002-2006 Audun Ytterdal, Jimmy Olsen, Tore Anderson,
@@ -45 +46 @@
-$0 = $1;
-
+# Make configuration settings available at runtime.
+$ENV{'MUNIN_PREFIX'}     = '@@PREFIX@@';
+$ENV{'MUNIN_CONFDIR'}    = '@@CONFDIR@@';   # /etc/munin,/etc/opt/munin or such
+$ENV{'MUNIN_BINDIR'}     = '@@BINDIR@@';
+$ENV{'MUNIN_SBINDIR'}    = '@@SBINDIR@@';
+$ENV{'MUNIN_DOCDIR'}     = '@@DOCDIR@@';
+$ENV{'MUNIN_LIBDIR'}     = '@@LIBDIR@@';    # LIBDIR/plugins contains plugin.sh
+$ENV{'MUNIN_HTMLDIR'}    = '@@HTMLDIR@@';
+$ENV{'MUNIN_CGIDIR'}     = '@@CGIDIR@@';
+$ENV{'MUNIN_DBDIR'}      = '@@DBDIR@@';
+$ENV{'MUNIN_PLUGSTATE'}  = '@@PLUGSTATE@@'; # Put plugin state files here!
+$ENV{'MUNIN_MANDIR'}     = '@@MANDIR@@';
+$ENV{'MUNIN_LOGDIR'}     = '@@LOGDIR@@';
+$ENV{'MUNIN_STATEDIR'}   = '@@STATEDIR@@';  # This is for .pid files
+$ENV{'MUNIN_USER'}       = '@@USER@@';      # User munin runs as (mostly)
+$ENV{'MUNIN_GROUP'}      = '@@GROUP@@';     # Group ditto
+$ENV{'MUNIN_PLUGINUSER'} = '@@PLUGINUSER@@';# Default user for plugin running
+$ENV{'MUNIN_VERSION'}    = '@@VERSION@@';
+$ENV{'MUNIN_PERL'}       = '@@PERL@@';
+$ENV{'MUNIN_PERLLIB'}    = '@@PERLLIB@@';
+$ENV{'MUNIN_GOODSH'}     = '@@GOODSH@@';
+$ENV{'MUNIN_BASH'}       = '@@BASH@@';
+$ENV{'MUNIN_PYTHON'}     = '@@PYTHON@@';
+$ENV{'MUNIN_OSTYPE'}     = '@@OSTYPE@@';
+$ENV{'MUNIN_HOSTNAME'}   = '@@HOSTNAME@@';
+$ENV{'MUNIN_MKTEMP'}     = '@@MKTEMP@@';
+
-@ISA = qw(Net::Server::Fork);
-my @ORIG_ARGV = @ARGV;
-my %services;
-my %nodes;
-$CONFDIR
-$CONFDIR
-$CONFDIR
+@@CONFDIR@@
+@@CONFDIR@@
+@@CONFDIR@@
-my $FQDN="";
-my $do_usage = 0;
@@ -57 +85 @@
-my $do_version = 0;
-my $VERSION=$Muninnode::VERSION;
-$PLUGINUSER
-$GROUP
+"@@PLUGINUSER@@"
+"@@GROUP@@"
-my $paranoia= 0;
-my @ignores = ();
@@ -184 +212 @@
-
-MyPackage->run(conf_file => $conffile,
-$STATEDIR
+@@STATEDIR@@
-exit;
-
@@ -213 +241 @@
-    my $hostname;
-    eval {
-Net::Domain
-Net::Domain::hostfqdn()
+Sys::Hostname
+(gethostbyname(Sys::Hostname::hostname()))[0]
-    };
-    return $hostname if $hostname;
@@ -285 +313 @@
-sub list_services {
-    my $node = $_[0] || $FQDN;
-
+
+
+
+
-    #print join " ", keys %{$nodes{$node}};
-    net_write ("\n");
@@ -542 +573 @@
-      $key = &get_var (\%sconf, "tls_private_key")
-          unless defined $key;
-$CONFDIR
+@@CONFDIR@@
-      $cert = &get_var (\%sconf, "tls_certificate")
-          unless defined $cert;
-$CONFDIR
+@@CONFDIR@@
-      $mode = &get_var (\%sconf, 'tls');
-      $mode = "auto" unless defined $mode and length $mode;
@@ -927 +958 @@
-        elsif (/^\s*env\s+([^=\s]+)\s*=\s*(.+)$/)
-        {
+            # $sconf->{$service}{'env'}{$1} = $2;
+            # net_write ("Saving $service->env->$1 = $2...\n") if $DEBUG;
+            warn "Warning: Deprecated format in \"$dir/$file\" under \"[$service]\" (\"env $1=$2\" should be rewritten to \"env.$1 $2. Ignored.\").";
+        }
+        elsif (/^\s*env\.(\S+)\s+(.+)$/)
+        {
-            $sconf->{$service}{'env'}{$1} = $2;
-            net_write ("Saving $service->env->$1 = $2...\n") if $DEBUG;
-            warn "Warning: Deprecated format in \"$dir/$file\" under \"[$service]\" (\"env $1=$2\" should be rewritten to \"env.$1 $2\").";
-        }
-        elsif (/^\s*env\.(\S+)\s+(.+)$/)
-        {
-            $sconf->{$service}{'env'}{$1} = $2;
-            net_write ("Saving $service->env->$1 = $2...\n") if $DEBUG;
-        }
-        elsif (/^\s*(\w+)\s+(.+)$/)
-        {
-
-
- lrrd_$1=$2
+# 
+# 
+.$1 $2. Ignored.
-        }
-        elsif (/\S/)

people/ilmari/modularisation-branch/node/munin-run.in

@@ -1 +1 @@
-#!@@PERL@@ -wT
-
-
+
+
+
-#
-# This program is free software; you can redistribute it and/or
@@ -16 +17 @@
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-#
-# $Id$
@@ -29 +29 @@
-foreach my $key (keys %ENV)
-{
-
-
+
-            $ENV{$key} = $1;
-
-
-
+
-            delete $ENV{$key};
-        }
@@ -51 +48 @@
-               help))
-  or $config->{help} = 1;
+
+$0 =~ /^(.*)$/; # for some strange reason won't "$0 = $0;" work.
+$0 = $1;
+
+# Make configuration settings available at runtime.
+$ENV{'MUNIN_PREFIX'}     = '@@PREFIX@@';
+$ENV{'MUNIN_CONFDIR'}    = '@@CONFDIR@@';   # /etc/munin,/etc/opt/munin or such
+$ENV{'MUNIN_BINDIR'}     = '@@BINDIR@@';
+$ENV{'MUNIN_SBINDIR'}    = '@@SBINDIR@@';
+$ENV{'MUNIN_DOCDIR'}     = '@@DOCDIR@@';
+$ENV{'MUNIN_LIBDIR'}     = '@@LIBDIR@@';    # LIBDIR/plugins contains plugin.sh
+$ENV{'MUNIN_HTMLDIR'}    = '@@HTMLDIR@@';
+$ENV{'MUNIN_CGIDIR'}     = '@@CGIDIR@@';
+$ENV{'MUNIN_DBDIR'}      = '@@DBDIR@@';
+$ENV{'MUNIN_PLUGSTATE'}  = '@@PLUGSTATE@@'; # Put plugin state files here!
+$ENV{'MUNIN_MANDIR'}     = '@@MANDIR@@';
+$ENV{'MUNIN_LOGDIR'}     = '@@LOGDIR@@';
+$ENV{'MUNIN_STATEDIR'}   = '@@STATEDIR@@';  # This is for .pid files
+$ENV{'MUNIN_USER'}       = '@@USER@@';      # User munin runs as (mostly)
+$ENV{'MUNIN_GROUP'}      = '@@GROUP@@';     # Group ditto
+$ENV{'MUNIN_PLUGINUSER'} = '@@PLUGINUSER@@';# Default user for plugin running
+$ENV{'MUNIN_VERSION'}    = '@@VERSION@@';
+$ENV{'MUNIN_PERL'}       = '@@PERL@@';
+$ENV{'MUNIN_PERLLIB'}    = '@@PERLLIB@@';
+$ENV{'MUNIN_GOODSH'}     = '@@GOODSH@@';
+$ENV{'MUNIN_BASH'}       = '@@BASH@@';
+$ENV{'MUNIN_PYTHON'}     = '@@PYTHON@@';
+$ENV{'MUNIN_OSTYPE'}     = '@@OSTYPE@@';
+$ENV{'MUNIN_HOSTNAME'}   = '@@HOSTNAME@@';
+$ENV{'MUNIN_MKTEMP'}     = '@@MKTEMP@@';
+
-
-if ($config->{help})
@@ -137 +165 @@
-=item B< --debug >
-
-
+
+
+
-
-=item B< --version >
@@ -147 +177 @@
-=head1 DESCRIPTION
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-=head1 FILES
@@ -170 +203 @@
-=head1 AUTHORS
-
-
+
+
-
-=head1 BUGS
@@ -180 +214 @@
-=head1 COPYRIGHT
-
-
+
+
-
-This is free software; see the source for copying conditions. There is

people/ilmari/modularisation-branch/node/node.d.aix/cpu.in

@@ -61 +61 @@
-    print "graph_vlabel %\n";
-    print "graph_scale no\n";
+    print "graph_category system\n";
-    print "system.label system\n";
-    print "system.type GAUGE\n";

people/ilmari/modularisation-branch/node/node.d.aix/df.in

@@ -24 +24 @@
-#%# capabilities=autoconf
-
-
-
-
-if [ "$1" = "autoconf" ]; then
-        echo yes
@@ -37 +34 @@
-        echo 'graph_args --upper-limit 100 -l 0'
-        echo 'graph_vlabel %'
+        echo 'graph_category disk'
+        echo 'graph_scale no'
-        df -P -k | sed 1d | grep -v "//" | grep -v "nfs" | while read i; do
-                name=`echo $i | sed 's/[\/.-]/_/g'| awk '{ print $6 }'`

people/ilmari/modularisation-branch/node/node.d.aix/iostat.in

@@ -61 +61 @@
-    print "graph_args --base 1024 -l 0\n";
-    print "graph_vlabel KB / \${graph_period}\n";
+    print "graph_category disk\n";
-    my(@info) = getDiskIO("disk only");
-    my($line);

people/ilmari/modularisation-branch/node/node.d.aix/memory.in

@@ -62 +62 @@
-    print "graph_title Memory usage\n";
-    print "graph_order inuse free pinned swap\n";
+    print "graph_category system\n";
-    print "inuse.label inuse\n";
-    print "inuse.draw AREA\n";

people/ilmari/modularisation-branch/node/node.d.aix/netstat.in

@@ -46 +46 @@
-    print "graph_args -l 0 --base 1000\n";
-    print "graph_vlabel requests connections per \${graph_period}\n";
+    print "graph_category network\n";
-    print "requests.label requests\n";
-    print "requests.type COUNTER\n";

people/ilmari/modularisation-branch/node/node.d.aix/processes.in

@@ -55 +55 @@
-    print "graph_args --base 1000 -l 0 \n";
-    print "graph_vlabel number of processes\n";
+    print "graph_category processes\n";
-    print "global.label global\n";
-    print "global.draw LINE2\n";

people/ilmari/modularisation-branch/node/node.d.aix/swap.in

@@ -51 +51 @@
-    print "graph_title Swap usage\n";
-    print "graph_order used total\n";
+    print "graph_category system\n";
-    print "used.label used\n";
-    print "used.draw STACK\n";

people/ilmari/modularisation-branch/node/node.d.freebsd/df.in

@@ -14 +14 @@
-#%# capabilities=autoconf
-
-MAXLABEL=20
-
-if [ "$1" = "autoconf" ]; then
-        echo yes
@@ -27 +25 @@
-        echo 'graph_vlabel %'
-        echo 'graph_category disk'
+        echo 'graph_scale no'
-        echo 'graph_info This graph shows disk usage on the machine.'
-        mfs=0
@@ -35 +34 @@
-                esac
-                echo -n "$name.label "
-
-
-
-
-
-
-
-
+
-                echo "$name.warning 92"
-                echo "$name.critical 98"

people/ilmari/modularisation-branch/node/node.d.freebsd/df_inode.in

@@ -13 +13 @@
-#%# family=auto
-#%# capabilities=autoconf
-
-MAXLABEL=20
-
-print_values() {
@@ -43 +41 @@
-        echo 'graph_vlabel %'
-        echo 'graph_category disk'
+        echo 'graph_scale no'
-        echo 'graph_info This graph shows the inode usage for the partitions of types that use inodes.'
-        /bin/df -P -i -t noprocfs,devfs,fdescfs,linprocfs,nfs | tail +2 | grep -v "//" | awk "
@@ -57 +56 @@
-                                gsub(/[^a-zA-Z0-9_]/, \"_\", name)
-                        }
-
-
-
-
+
-                        print name \".info \" dir \" -> \" \$1
-                        print name \".warning 92\"

people/ilmari/modularisation-branch/node/node.d.freebsd/if_.in

@@ -7 +7 @@
-#
-# ...will monitor eth0.
+#
+# To aggregate all network interfaces on the system (except lo0), 
+# link if_aggregated to this file.
-#
-# Any device found in /usr/bin/netstat can be monitored.
@@ -56 +59 @@
-        echo "obytes.info Traffic sent (+) and received (-) on the $INTERFACE network interface."
-        exit 0
-;
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-/<Link#[0-9]*>/ {
-        if (NF == 10) { 
@@ -68 +87 @@
-        }
-}'
+fi

people/ilmari/modularisation-branch/node/node.d.linux/apt.in

@@ -163 +163 @@
-                }
-        }
-
-
+
-                $hold = $1;
-        }

people/ilmari/modularisation-branch/node/node.d.linux/apt_all.in

@@ -119 +119 @@
-                            }
-                    }
-packages upgraded,\s\d+\snewly installed, \d+ to remove and (\d+) 
+upgraded,\s\d+\snewly installed, \d+ to remove and (\d+)
-                    {
-                            $hold = $1;

people/ilmari/modularisation-branch/node/node.d.linux/cpu.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Plugin to monitor CPU usage.
@@ -27 +27 @@
-#
-# $Id$
-
-
-if [ "$1" = "autoconf" ]; then
@@ -108 +107 @@
-                echo "iowait.max $MAX"
-                echo 'iowait.type DERIVE'
-
+ when there is nothing else to do.
-                echo 'irq.label irq'
-                echo 'irq.draw STACK'
@@ -130 +129 @@
-fi
-
+# Note: Counters/derive need to report integer values.  Also we need
+# to avoid 10e+09 and the like %.0f should do this.
-
-if [ ! -z "$extinfo" ]; then
- "user.value " $2*100/hz "\nnice.value " $3*100/hz "\nsystem.value " $4*100/hz "\nidle.value " $5*100/hz "\niowait.value " $6*100/hz "\nirq.value " $7*100/hz "\nsoftirq.value "
+f "user.value %.0f\nnice.value %.0f\nsystem.value %.0f\nidle.value %.0f\niowait.value %.0f\nirq.value %.0f\nsoftirq.value %.0f\n", $2*100/hz, $3*100/hz, $4*100/hz, $5*100/hz, $6*100/hz, $7*100/hz,
-else
- "user.value " $2*100/hz "\nnice.value " $3*100/hz "\nsystem.value " $4*100/hz "\nidle.value "
+f "user.value %.0f\nnice.value %.0f\nsystem.value %.0f\nidle.value %.0f\n", $2*100/hz, $3*100/hz, $4*100/hz,
-fi

people/ilmari/modularisation-branch/node/node.d.linux/cpuspeed.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Plugin to monitor CPU speed
@@ -29 +29 @@
-if [ "$1" = "config" ]; then
-    cat <<EOF
-'
+
-graph_args --base 1000 -r --lower-limit 0
-graph_vlabel Hz
-graph_scale yes
-
+graph_info 
-graph_category system
-EOF
@@ -39 +39 @@
-for c in /sys/devices/system/cpu/cpu*; do
-    N=${c##*/cpu}
-<
+cat 
-    cat <<EOF
-cpu$N.label CPU $N
-cpu$N.max $MAXHZ
-<
+cat 
-cpu$N.type GAUGE
-EOF
@@ -56 +56 @@
-for c in /sys/devices/system/cpu/cpu*; do
-    N=${c##*/cpu}
-<
+cat 
-done

people/ilmari/modularisation-branch/node/node.d.linux/df.in

@@ -1 @@
-
+
+
-#
-# Plugin to monitor disk usage. Rewrite based on original shell-based version
- 
+
-# Parameters understood:
-#
@@ -8 +9 @@
-#       autoconf (optional - used by munin-config)
-#
-
+
+
+
+
+
-#
-# Magic markers (optional - used by munin-config and installation
@@ -17 +22 @@
-
-use strict;
+use Munin::Plugin;
-
-$MAXLABEL=25
+%mounts
-
-# Read /proc/mounts
-my %mounts;
-open (MOUNTS,"/proc/mounts") or die "Could not /proc/mounts for reading.";
-while (<MOUNTS>) {
@@ -31 +35 @@
-close MOUNTS;
-
+my $exclude=$ENV{'exclude'} || 'iso9660';
+my $dfopts = "-P -l ".join(' -x ',('',split('\s+',$exclude)));
+
-sub print_values() {
-
+
-    # Read from df
-/bin/df -P -l |") or die "Could not open pipe from /bin/
+df $dfopts |") or die "Could not open pipe from 
-    <DF>; # Skip the header
-    while (<DF>) {
@@ -43 +50 @@
-            my $fs=$mounts{$6};
-            my $ps=$5;
-$1
-
+clean_fieldname($1)
+
-            $ps =~ s/\%//;
-
-
+
-        }
-    }
-    close DF;
+    die "Error executing df. Exit code $?\n" if $?;
-}
-
+
-if ( $ARGV[0] eq "autoconf" ) {
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-}
-
@@ -74 +76 @@
-    print "graph_args --upper-limit 100 -l 0\n";
-    print "graph_vlabel %\n";
-
+
+
+
-    # Read from df
-/bin/df -P -l |") or die "Unable to open pipe from /bin/df
+df $dfopts |") or die "Unable to open pipe from df: $!
-    <DF>; # Skip the header
-    while (<DF>) {
@@ -85 +89 @@
-            my $fs=$mounts{$6};
-            my $dir=$6;
-$1; 
-
+clean_fieldname($1);
+
-            # Create and print labels
-
-
-
-
-
-
-
-
-
+
+
+
-            print "$name.warning 92\n";
-            print "$name.critical 98\n";
@@ -102 +100 @@
-    }
-    close DF;
+    die "Error executing df. Exit code $?\n" if $?;
-    exit 0;
-}

people/ilmari/modularisation-branch/node/node.d.linux/df_abs.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Script to monitor absolute disk usage.
@@ -8 +8 @@
-#       autoconf (optional - used by munin-config)
-#
+# Environment
+#       exclude: space separated list if fs types to exclude.
+#                iso9660 by default
+#
-# Magic markers (optional - used by munin-config and installation
-# scripts):
+#
+# $Id$
-#
-#%# family=manual
-#%# capabilities=autoconf
-
-
-
+
-
-if [ "$1" = "autoconf" ]; then
@@ -22 +27 @@
-fi
-
-
-
-
-
-
-
-
-
+
+
+
-
-if [ "$1" = "config" ]; then
@@ -38 +38 @@
-        echo 'graph_category disk'
-        echo 'graph_total Total'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-        done
-        exit 0
-fi
-
-
-
-
-
+
+
+
-done

people/ilmari/modularisation-branch/node/node.d.linux/df_inode.in

@@ -1 @@
-
+
+
-#
-
-
+
+
+
-# Parameters understood:
-#
@@ -8 +10 @@
-#       autoconf (optional - used by munin-config)
-#
-
+
+
+
+
+
-#
-# Magic markers (optional - used by munin-config and installation
@@ -17 +23 @@
-
-use strict;
-
-
+
-
-# Read /proc/mounts
@@ -31 +36 @@
-close MOUNTS;
-
+my $exclude=$ENV{'exclude'} || 'iso9660';
+my $dfopts = "-P -l -i ".join(' -x ',('',split('\s+',$exclude)));
+
-sub print_values() {
-
+
-    # Read from df
-/bin/df -P -l -i |") or die "Could not open pipe from /bin/df,
+df $dfopts |") or die "Could not open pipe from df:
-    <DF>; # Skip the header
-    while (<DF>) {
@@ -42 +50 @@
-        if ( /^(\S+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\S+)\s+(\S+)/ ) {
-            my $fs=$mounts{$6};
+            next if $fs eq "reiserfs";
+
-            my $ps=$5;
-
-
-
+
+
-            $ps =~ s/\%//;
-
+
-            print $name .  ".value  " . $ps . "\n";
-        }
-    }
-    close DF;
+    die "Error executing df. Exit code $?\n" if $?;
-}
-
+
-if ( $ARGV[0] eq "autoconf" ) {
-perl
+@@PERL@@
-    print "no\n";
-    exit 1;
-
-
-
-
-
-
+
-    print "yes\n";
-    exit 0;
@@ -75 +80 @@
-    print "graph_args --upper-limit 100 -l 0\n";
-    print "graph_vlabel %\n";
-
+
+
+
-    # Read from df
-/bin/df -P -l -i  |") or die "Unable to open pipe from /bin/df
+df $dfopts |") or die "Unable to open pipe from df: $!
-    <DF>; # Skip the header
-    while (<DF>) {
@@ -85 +92 @@
-        if ( /^(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)/ ) {
-            my $fs=$mounts{$6};
+            next if $fs eq "reiserfs";
+
-            my $dir=$6;
-$1; 
-
+clean_fieldname($1);
+
-            # Create and print labels
-
-
-
-
-
-
-
-
-
-
+
-            print "$name.warning 92\n";
-            print "$name.critical 98\n";
@@ -104 +104 @@
-    }
-    close DF;
+    die "Error executing df. Exit code $?\n" if $?;
-    exit 0;
-}

people/ilmari/modularisation-branch/node/node.d.linux/entropy.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-# 
-# Plugin to monitor available entropy
@@ -11 +11 @@
-#%# capabilities=autoconf
-
-
-
-if [ "$1" = "autoconf" ]; then
-        if [ -r /proc/sys/kernel/random/entropy_avail ]; then
@@ -22 +20 @@
-        fi
-fi
-
- 
-if [ "$1" = "config" ]; then

people/ilmari/modularisation-branch/node/node.d.linux/files_.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-# 
-# Plugin to monitor the number of open files in the system.
@@ -14 +14 @@
-#%# capabilities=autoconf
-
-
-
-
+
+
-
-if [ "$1" = "autoconf" ]; then
@@ -23 +22 @@
-                exit 0
-        else
-no
+"no (no lsof)"
-                exit 1
-        fi

people/ilmari/modularisation-branch/node/node.d.linux/forks.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Plugin to monitor the number of forks per second on the machine.
@@ -12 +12 @@
-#%# family=auto
-#%# capabilities=autoconf
-
-
-
-if [ "$1" = "autoconf" ]; then

people/ilmari/modularisation-branch/node/node.d.linux/fw_conntrack.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# fw_conntrack: Plugin to monitor the number of tracked connections
@@ -10 +10 @@
-#    config
-#    autoconf
+#
+# NOTE: MUST RUN AS ROOT.
+# @@CONFDIR@@/plugin-conf.d/global or other file in that dir must contain:
+# [fw*]
+#      user root
-#
-# Bugs:
@@ -31 +36 @@
-#
-# Magic markers?
-manual
+auto
-#%# capabilities=autoconf
-

people/ilmari/modularisation-branch/node/node.d.linux/fw_forwarded_local.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Plugin to monitor network connections.
@@ -13 +13 @@
-# Magic markers (optional - used by munin-config and some installation
-# scripts):
-manual
+auto
-#%# capabilities=autoconf
-
+
+
+
+
+
-
-
@@ -42 +46 @@
-        echo 'forward.label forward'
-        echo 'forward.type GAUGE'
-        echo 'forward.max 500'''
-        echo 'local.label local'
-        echo 'local.type GAUGE'
-        echo 'local.max 500'''
-        exit 0
-fi

people/ilmari/modularisation-branch/node/node.d.linux/fw_packets.in

@@ -1 +1 @@
-#!@@PERL@@ -w
+# -*- perl -*-
-#
-# Plugin to monitor the throuhgput of a firewall.
@@ -10 +11 @@
-#       autoconf (optional - used by munin-config)
-#
+# NOTE: MUST RUN AS ROOT.
+# @@CONFDIR@@/plugin-conf.d/global or other file in that dir must contain:
+# [fw*]
+#      user root
+#
-# Config variables:
-#
@@ -15 +21 @@
-# scripts):
-#
-manual
+auto
-#%# capabilities=autoconf
-

people/ilmari/modularisation-branch/node/node.d.linux/if_.in

@@ -1 @@
-
-
-
-
-
+
+
+
+
+
+
-#    ln -s /usr/share/node/node/plugins-auto/if_ /etc/munin/node.d/if_eth0
-
+
-# ...will monitor eth0.
-
+
-# Any device found in /proc/net/dev can be monitored. Examples include
-# ipsec*, eth*, irda* and lo. Please note that aliases cannot be
-# monitored with this plugin.
-
+
-# Magic markers (optional - used by munin-config and some installation
-# scripts):
-
+
-#%# family=auto
-#%# capabilities=autoconf suggest
-
+INTERFACE=${0##*if_}
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if [ -r /proc/net/dev ]; then
-       
-       
+    
+    
-        else
-       
-       
+    
+    
-        fi
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
-        fi
-
-
-
-
+
+
+
+
-        echo "graph_order down up" 
-        echo "graph_title $INTERFACE traffic"
@@ -56 +145 @@
-        echo 'up.negative down'
-        echo 'up.cdef up,8,*'
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-        exit 0
-
+
+
-
-
-
-
+
+
+
+
+
+
+
-    /proc/net/dev
-

people/ilmari/modularisation-branch/node/node.d.linux/if_err_.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Wildcard-plugin to monitor network interfaces. To monitor an
@@ -18 +18 @@
-#%# capabilities=autoconf suggest
-
-`basename $0 | sed 's/^if_err_//g'`
+${0##*/if_err_}
-
-if [ "$1" = "autoconf" ]; then
@@ -31 +31 @@
-
-if [ "$1" = "suggest" ]; then
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-fi
-

people/ilmari/modularisation-branch/node/node.d.linux/interrupts.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-# 
-# Plugin to monitor the number of interrupts and context switches on a system. 

people/ilmari/modularisation-branch/node/node.d.linux/ip_.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Wildcard-plugin to monitor IP addresses through iptables. To monitor an
@@ -24 +24 @@
-
-
-`basename $0 | sed 's/^ip_//g'`
+${0##*/ip_}
-
-if [ "$1" = "autoconf" ]; then

people/ilmari/modularisation-branch/node/node.d.linux/irqstats.in

@@ -1 +1 @@
-#!@@PERL@@ -w
+# -*- cperl -*-
-# 
-# Plugin to monitor individual interrupts
@@ -16 +17 @@
-    }
-}
-open my $in, '<', '/proc/interrupts'
-  or die "Can't open /proc/interrupts: $!\n";
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-my $cpu;
-
@@ -40 +54 @@
-while (my $line = <$in>) {
-    my ($irq, $label, $type);
-
+
+
+
+
+
+
-    chomp @data;
-    $irq = shift @data;

people/ilmari/modularisation-branch/node/node.d.linux/load.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-# 
-# Plugin to monitor the load average on a system.
-#
-# Usage: Link or copy into /etc/munin/node.d/
+#
+# Parameters
+#     env.load_warn <warning load>
+#     env.load_crit <critical load>
-#
-# Magic markers (optional - only used by munin-config and some
@@ -10 +14 @@
-#%# family=auto
-#%# capabilities=autoconf
-
-
-
-# If run with the "autoconf"-parameter, give our opinion on wether we
@@ -27 +29 @@
- 
-if [ "$1" = "config" ]; then
+        LOAD_WARN=${load_warn:-10}
+        LOAD_CRIT=${load_crit:-120}
+
-        # The host name this plugin is for. (Can be overridden to have
-        # one machine answer for several)
@@ -48 +53 @@
-        # configured your munin to tell a Nagios-server about any
-        # problems
-10
-120
+$LOAD_WARN
+$LOAD_CRIT
-        # This one is purely to add an explanation to the web page. The first
-        # one is for the graph itself, while the second one is for the field
@@ -67 +72 @@
-echo -n "load.value "
-cut -f2 -d' ' < /proc/loadavg
-
-# How could this plugin have been written in its simplest form?
-# Something like this:
-#
-# ---------------------
-# #!/bin/sh
-
-#
-# if [ "$1" = "config" ]; then
-
-#       echo "graph_title Load average"
-#       echo 'graph_args --base 1000 -l 0'
-#       echo 'graph_vlabel load'
-#       echo "load.label load"
-#       exit 0
-# fi
-# echo -n "load.value "
-# cut -f1 -d' ' < /proc/loadavg
-# ---------------------
-#
-# Except for the Nagios-warnings (which most people don't have any need
-# for) and things used by installation scripts and munin-config (which
-# you don't need if you don't plan on submitting your plugin to the
-# pacakge), and the scaling (no milliload numbers) the two versions will
-# work identically.

people/ilmari/modularisation-branch/node/node.d.linux/memory.in

@@ -1 +1 @@
-#!@@PERL@@ -w
+# -*- perl -*-
-#
-# Plugin to monitor memory usage.
@@ -5 +6 @@
-# Origional Author: Jimmy Olsen
-# Contributors:
-
+
+
+
+
+
-#
-# Parameters:
@@ -12 +17 @@
-#       autoconf (optional - only used by munin-config)
-#
-only 
+
-# installation scripts):
+#
+# $Id$
+#
-#%# family=auto
-#%# capabilities=autoconf
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-}
-
@@ -35 +38 @@
-&fetch_meminfo;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -161 +158 @@
-# and is has not been set by &fetch_meminfo
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -198 +186 @@
-        -$mems{'Buffers'}
-        -$mems{'Cached'}
-        -$mems{'SwapCached'}
-        -$mems{'Slab'}
-        -$mems{'PageTables'}
-       -$mems{'VmallocUs
+        -$mems{'SwapCach
-        ,"\n";
+
-print "free.value ", $mems{'MemFree'}, "\n";
-print "buffers.value ", $mems{'Buffers'}, "\n";
@@ -208 +196 @@
-print "swap.value ", $mems{'SwapTotal'} - $mems{'SwapFree'}, "\n";
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-}
-

people/ilmari/modularisation-branch/node/node.d.linux/netstat.in

@@ -1 @@
-
+
+
-#
-# Plugin to monitor network connections.

people/ilmari/modularisation-branch/node/node.d.linux/nfs4_client.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Plugin to monitor NFSv4 client traffic

people/ilmari/modularisation-branch/node/node.d.linux/nfs_client.in

@@ -1 @@
-
+
+
-#
-# Plugin to monitor NFS client traffic

people/ilmari/modularisation-branch/node/node.d.linux/nfsd.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Plugin created by Alexandre Dupouy, with the assistance of Mike Fedyk
-#
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-#
-#%# family=auto

people/ilmari/modularisation-branch/node/node.d.linux/open_files.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-# 
-# Plugin to monitor the number of open files in the system.
@@ -13 +13 @@
-#%# family=auto
-#%# capabilities=autoconf
-
-
-
-if [ "$1" = "autoconf" ]; then

people/ilmari/modularisation-branch/node/node.d.linux/open_inodes.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-# 
-# Plugin to monitor the number of open files in the system.
@@ -13 +13 @@
-#%# family=auto
-#%# capabilities=autoconf
-
-
-
-if [ "$1" = "autoconf" ]; then

people/ilmari/modularisation-branch/node/node.d.linux/port_.in

@@ -31 +31 @@
-    my ($fd, $file) = @_;
-
-/var/run/munin/plugin-state
+@@PLUGSTATE@@
-    my $cache = $file;
-    $cache =~ s:/:_:g;

people/ilmari/modularisation-branch/node/node.d.linux/processes.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Plugin to monitor the number of processes on the machine. Much linke
@@ -13 +13 @@
-#%# family=auto
-#%# capabilities=autoconf
-
-
-
-if [ "$1" = "autoconf" ]; then

people/ilmari/modularisation-branch/node/node.d.linux/swap.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Plugin to monitor swap IO in number of blocks per second.

people/ilmari/modularisation-branch/node/node.d.linux/uptime.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Plugin to measure uptime. Especially the average and max values on the
@@ -27 +27 @@
-fi
-
-env LC_ALL=C 
+

people/ilmari/modularisation-branch/node/node.d.linux/vlan_.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Wildcard-script to monitor network interfaces. To monitor an
@@ -17 +17 @@
-#%# capabilities=autoconf suggest
-
-`basename $0 | sed 's/^vlan_//g' | tr '_' '.'` 
+$(basename $0 | sed 's/^vlan_//g' | tr '_' '.')
-
-if [ "$1" = "autoconf" ]; then
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-fi
-
-if [ "$1" = "suggest" ]; then
-
-
-
-
-
-
-
-
-
+
+
+
-        fi
-
+
+
-fi
-
@@ -63 +65 @@
-        echo 'transmitted.draw AREA'
-        exit 0
-;
+
-
-awk "/bytes received/ { print \"received.value \" \$4 } /bytes transmitted/ { print \"transmitted.value \" \$4 }" < /proc/net/vlan/$INTERFACE

people/ilmari/modularisation-branch/node/node.d.sunos/if_.in

@@ -1 @@
-
+
+
-#
-# Wildcard-plugin to monitor network interfaces. To monitor an
@@ -16 +17 @@
-#%# capabilities=autoconf suggest
-
-
-
+
-
-if [ "$1" = "autoconf" ]; then

people/ilmari/modularisation-branch/node/node.d.sunos/if_errcoll_.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Wildcard-plugin to monitor network interfaces. To monitor an
@@ -16 +16 @@
-#%# capabilities=autoconf suggest
-
-
-
+
-
-if [ "$1" = "autoconf" ]; then

people/ilmari/modularisation-branch/node/node.d.sunos/io_busy_.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Wildcard-plugin to monitor disks. To monitor a disk,

people/ilmari/modularisation-branch/node/node.d.sunos/io_bytes_.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Wildcard-plugin to monitor disks. To monitor a disk,

people/ilmari/modularisation-branch/node/node.d.sunos/io_ops_.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Wildcard-plugin to monitor disks. To monitor a disk,

people/ilmari/modularisation-branch/node/node.d.sunos/load.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-
-#%# family=auto

people/ilmari/modularisation-branch/node/node.d.sunos/memory.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-
+
+
+
+
+
+
+
+
+
+
-
+TOP=${top:-/usr/local/bin/top}
-
-
+
+
+
+
+
+
+
+
+
-
-if [ "$1" = "config" ]; then
-
-        echo "graph_title Memory usage (in MB)"
-                echo 'graph_category system'

people/ilmari/modularisation-branch/node/node.d.sunos/paging_in.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Plugin to monitor CPU usage.

people/ilmari/modularisation-branch/node/node.d.sunos/paging_out.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Plugin to monitor CPU usage.

people/ilmari/modularisation-branch/node/node.d.sunos/processes.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-#%# family=auto

people/ilmari/modularisation-branch/node/node.d/amavis.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Plugin to monitor the amavis mail filter.
@@ -14 +14 @@
-#       amavislog    - file where amavis logs are written
-#
+# #%# family=auto
+# #%# capabilities=autoconf
-
-mktempfile () {
-
+
-}
-
-logfile
+amavislog
-LOGTAIL=${logtail:-`which logtail`}
-
-
-
+
-
-if [ "$1" = "autoconf" ]; then

people/ilmari/modularisation-branch/node/node.d/apc_envunit_.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Plugin to monitor APC environmental units (temperature/humidity)
@@ -16 +16 @@
-#       community - Community to use to access the APC unit
-#
-
+
+
-#
-# Configuration for temperature or humidity probes 
+#
+# FIXME: Candidate to be snmp__apc
-#
-
@@ -50 +53 @@
-if [ "$1" = "autoconf" ]; then
-  if [ -z "${UNITS}" -o -z "${SNMPGET}" ] ; then echo "no" ; exit 1 ; fi
+  if [ ! -x "$SNMPGET" ] ; then echo "no (no snmpget executable)"; exit 1; fi
-  for m in ${UNITS} ; do
-    if ping -c1 -q $m  >/dev/null 2>&1 ; then continue ; fi

people/ilmari/modularisation-branch/node/node.d/courier_.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Plugin to graph number of courier login/logouts
@@ -27 +27 @@
-# courierpop3login:
-# Jan 22 06:28:24 raven courierpop3login: Connection, ip=[::ffff:192.168.0.1]
-5B
-# Jan 22 06:48:22 raven courierpop3login: DISCONNECTED, user=someuser, ip=[::ffff:192.168.0.1], top=0, retr=0, time=21
-# Jan 22 06:28:24 raven courierpop3login: LOGIN, user=someuser, ip=[::ffff:192.168.0.1]
@@ -47 +46 @@
-    if [ -f ${COURIER_LOG} -a -x ${LOGTAIL} ] 
-    then
-
+
+
+
-        exit 0
-    else

people/ilmari/modularisation-branch/node/node.d/courier_mta_mailqueue.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-# 
-# Plugin to monitor courier-mta mail spools

people/ilmari/modularisation-branch/node/node.d/cupsys_pages.in

@@ -1 @@
-#
-#!@@PERL@@ -w
-#
@@ -25 +24 @@
-use strict;
-# use Muninnode;
+use Munin::Plugin;
-
-my $statefile = "@@PLUGSTATE@@/munin-cupsys-pages.state";
@@ -71 +71 @@
-
-if (-f $statefile) {
-exit 4
+die "Could not open $statefile for reading: $!\n"
-    if(<IN> =~ /^(\d+)$/) {
-        $pos = $1;
@@ -103 +103 @@
-
-# Write back to state file
-
-open (STATFILE, ">$statefile") or exit 4
+
+  die "Could not open $statefile for writing: $!\n"
-print STATFILE "$pos\n";
-foreach my $printer (sort(keys %printers)) {
@@ -116 +116 @@
-    print "graph_args --base 1000 -l 0\n";
-    print "graph_vlabel pages/\${graph_period}\n";
-    print "graph_order ".
-      join(" ",
-           sort(map { s/^[^a-zA-Z_]*//; s/[^a-zA-Z0-9_]/_/g; $_; }
-                keys(%printers))),
-           "\n";
-    foreach my $printer (sort(keys %printers)) {
-        # Convert printername to something legal
-        my $p = $printer;
-
-
+
-        print "$printer.label $p\n";
-        print "$printer.type DERIVE\n";
@@ -134 +128 @@
-    foreach my $printer (sort(keys %printers)) {
-        my $p = $printer;
-
-
+
-        print "$printer.value ".$printers{$p}."\n";
-    }
+    exit 0;
-}
-
-sub parselogfile {
-    my ($fname, $start, $stop) = @_;
-exit 3
-exit 2
+die "No logfile $fname: $!\n"
+die "Could not seek in logfile $fname: $!\n"
-    while (tell(LOGFILE) < $stop) {
-        my $line = <LOGFILE>;
@@ -157 +151 @@
-    close(LOGFILE);
-}
-
-

people/ilmari/modularisation-branch/node/node.d/df.in

@@ -1 @@
-
+
+
-#
-# Script to monitor disk usage.
@@ -14 +15 @@
-#%# capabilities=autoconf
-
-
+
+
+
+
+
+
+
+
+
-
-if [ "$1" = "autoconf" ]; then
-       if [ `uname -s` = SunOS ]
-       
-       
-       
-       
-       
-       
+    if [ -z "$(print_values)" ] 
+
+
+    
+
+
+    
-fi
-
-if [ "$1" = "config" ]; then
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-fi
-
-
-
-
-
-
+
+

people/ilmari/modularisation-branch/node/node.d/df_inode.in

@@ -1 @@
-
+
+
-#
-
+
+
+
+
+
-#
-# Parameters understood:
@@ -14 +19 @@
-#%# capabilities=autoconf
-
-
-
-
-
-
-
+
-
-print_values() {
-
-
-
-
-
-
+
+
+
+
-}
-
-if [ "$1" = "autoconf" ]; then
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-        exit 0
+    fi
-fi
-
-if [ "$1" = "config" ]; then
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-fi
-

people/ilmari/modularisation-branch/node/node.d/exim_mailqueue.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Plugin to monitor exim queue size
@@ -25 +25 @@
-DIRNAME=`dirname $0`
-SPOOLDIR="unset"
-
-
-
+
+
+
+
+
+
+
+
+
-GRAPHTITLE='Exim Mailqueue'
-
-
-
-
-
-
+
+
+
+
+
-
-if [ "$SPOOLDIR" = "unset" ]
-then
-`($EXIM -bP spool_directory | awk '{ print $3 "/input" }') 2>/dev/null`
+$( ($EXIM -bP spool_directory | awk '{ print $3 "/input" }') 2>/dev/null)
-fi
-
-if [ "$1" = "autoconf" ]; then
-
+
+
+
+
+
+
-                if ( /usr/bin/find $SPOOLDIR -iname "*-H" -print 2>/dev/null >/dev/null ); then
-                        echo yes

people/ilmari/modularisation-branch/node/node.d/exim_mailqueue_alt.in

@@ -1 @@
-/bin/bash
+@@GOODSH@@
-#
-# Plugin to monitor Exim's mail queue
@@ -24 +24 @@
-
-PATH='/bin:/sbin:/usr/bin:/usr/sbin'
-
-
+
+
+
+
+
+
+
+
+
-QUEUECRIT=200
-
-
-
-
+
+
+
-
-if [ "$1" == "config" ]; then

people/ilmari/modularisation-branch/node/node.d/exim_mailstats.in

@@ -34 +34 @@
-        my $ts = sprintf("%04d%02d%02d",$t[5]+1900, $t[4]+1, $t[3]);
-        $logfile =~ s/\%D/$ts/g;
-        
+
-    my @lfiles = split(/\s?:\s?/, $logfile);
-    foreach (@lfiles) {
@@ -57 +57 @@
-{
-    my $logfile;
-
+
-    if(defined($LOGDIR)) {
-        if(! -d $LOGDIR) {

people/ilmari/modularisation-branch/node/node.d/foldingathome.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Folding@Home

people/ilmari/modularisation-branch/node/node.d/foldingathome_rank.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Folding@Home Rank
@@ -13 +13 @@
-#%# capabilities=autoconf
-
-@@PLUGSTATE@@
+$MUNIN_PLUGSTATE
-
-if [ "$1" = "autoconf" ]; then
-
-
+
+
+
+
-fi
-

people/ilmari/modularisation-branch/node/node.d/foldingathome_wu.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Folding@Home WU submited
@@ -13 +13 @@
-#%# capabilities=autoconf
-
-@@PLUGSTATE@@
+$MUNIN_PLUGSTATE
-
-if [ "$1" = "autoconf" ]; then
-
-
+
+
+
+
-fi
-
@@ -30 +32 @@
-fi
-
-`wget "http://vspx27.stanford.edu/cgi-bin/main.py?qtype=userpage&username=8d" -q -t 1 -T 5 -O - | egrep -A 2 "<TD> WU</TD>" | grep "<b>" | sed 's/.*<b> \([0-9]*\) .*/\1/'`
+$(wget "http://vspx27.stanford.edu/cgi-bin/main.py?qtype=userpage&username=8d" -q -t 1 -T 5 -O - | egrep -A 2 "<TD> WU</TD>" | grep "<b>" | sed 's/.*<b> \([0-9]*\) .*/\1/')
-
-if [ "$wu" == "" ]; then

people/ilmari/modularisation-branch/node/node.d/hddtemp.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Plugin to monitor harddrive temperatures through SMART.

people/ilmari/modularisation-branch/node/node.d/id.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Copyright (C) 2006 Dagfinn Ilmari Mannsaaker <ilmari@ilmari.org>

people/ilmari/modularisation-branch/node/node.d/ipac-ng.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Skeleton-plugin to monitor ipac-ng rules. To monitor an

people/ilmari/modularisation-branch/node/node.d/mbmon_.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Plugin to monitor Motherboard temparature using mbmon
@@ -21 +21 @@
-#%# capabilities=autoconf suggest
-
-
-
-what=`basename $0 | sed 's/^mbmon_//g'`
-
-
-if [ "$1" = "suggest" ]; then

people/ilmari/modularisation-branch/node/node.d/multips.in

@@ -1 @@
-
+
+
-#
-# Script to monitor number of processes. Programs are configured
@@ -46 +47 @@
-
-        eval REGEX='"${regex_'$name'-\<'$name'\>}"'
-`which pgrep`
-
+$(which pgrep)
+-a -x "$PGREP" 
-                $PGREP -f -l "$name" | grep "$REGEX" | wc -l
-        elif [ -x /usr/ucb/ps ]; then

people/ilmari/modularisation-branch/node/node.d/munin_graph.in

@@ -1 @@
-
+
+
-#
-# Script to monitor munin-graph
@@ -11 +12 @@
-# scripts):
-#
-manual
+auto
-#%# capabilities=autoconf
-
-if [ ! "$GRAPH_STATSFILE" ] ; then
-@@DBDIR@@
+$MUNIN_DBDIR
-fi
-
-if [ "$1" = "autoconf" ]; then
-f
+r
-            echo "yes"
-            exit 0

people/ilmari/modularisation-branch/node/node.d/munin_update.in

@@ -1 @@
-
+
+
-#
-# Script to monitor Munin-update
@@ -11 +12 @@
-# scripts):
-#
-manual
+auto
-#%# capabilities=autoconf
-
-if [ ! "$UPDATE_STATSFILE" ]; then
-@@DBDIR@@
+$MUNIN_DBDIR
-fi
-
-if [ "$1" = "autoconf" ]; then
-f
+r
-            echo "yes"
-            exit 0

people/ilmari/modularisation-branch/node/node.d/mysql_bytes.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Plugin to monitor the number of bytes sent from and received by mysql.

people/ilmari/modularisation-branch/node/node.d/mysql_isam_space_.in

@@ -1 +1 @@
-#!@@PERL@@ -w
+# -*- perl -*-
-#
-# Plugin to monitor the percent of table space used on isam and myisam
@@ -24 +25 @@
-my $STATEFILE = $ENV{'statefile'} || "@@PLUGSTATE@@/plugin-mysql_isam_space.state";
-my $MYSQLSHOW = $ENV{'mysqlshow'} || 'mysqlshow';
+my $ABSOLUTE  = $ENV{'absolute'} || 0;
-my @mysql_opts = ();
-
@@ -193 +195 @@
-                        if (! $headerseen and $fields[1] eq "Name")
-                        { # Header line, grab field names
-
+s
-                        }
-                        else

people/ilmari/modularisation-branch/node/node.d/mysql_queries.in

@@ -105 +105 @@
-    else
-    {
-
+l
-    }
-    exit $return;

people/ilmari/modularisation-branch/node/node.d/mysql_slowqueries.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-# 
-# Plugin to monitor the number of slow queries on a mysql-server

people/ilmari/modularisation-branch/node/node.d/mysql_threads.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Plugin to monitor the number of threads on a mysql-server. Faster than

people/ilmari/modularisation-branch/node/node.d/named.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Munin plugin for named.  This is a bit experimental, we will have to see
@@ -130 +130 @@
-
-do_stats
-

people/ilmari/modularisation-branch/node/node.d/ntp_.in

@@ -1 +1 @@
-#!@@PERL@@ -w
+# -*- perl -*-
-#
-# Plugin to monitor NTP statistics
@@ -76 +77 @@
-        }
-        print "graph_args --base 1000 --vertical-label seconds --lower-limit 0\n";
+        print "graph_category time\n";
-        print "delay.label Delay\n";
-        print "delay.draw LINE2\n";

people/ilmari/modularisation-branch/node/node.d/ntp_states.in

@@ -1 +1 @@
-#!@@PERL@@ -w
+# -*- perl -*-
-#
-# Plugin to monitor NTP states
@@ -53 +54 @@
-        print "graph_title NTP states\n";
-        print "graph_args --base 1000 --vertical-label msec --lower-limit 0\n";
+        print "graph_category time\n";
-        foreach (`ntpq -c "hostnames no" -c peers`) {
-                next unless /^.(\d+\.\d+\.\d+\.\d+)/;

people/ilmari/modularisation-branch/node/node.d/perdition.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Plugin to graph perdition connections and errors 
@@ -57 +57 @@
-fatal.label Fatal Errors
-EOF
+    # Echo warnnig and critical attributes if set in the plugin config
+    for i in imap imaps pop pops fatal connection disconnected; do
+        warn=\$${i}_warn; eval val=$warn
+        [ "$val" ] && echo "$i.warning ${val}"
+        crit=\$${i}_crit; eval val=$crit
+        [ "$val" ] && echo "$i.critical ${val}"
+    done
-    exit 0
-    ;;

people/ilmari/modularisation-branch/node/node.d/ping_.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Copyright (C) 2004 Jimmy Olsen
@@ -26 +26 @@
-#       ping           - Ping program to use
-#       host           - Host to ping
+#       ping_warn      - Warning limit for nagios notification
+#       ping_crit      - Critical limit for nagios notification
+#       packetloss_warn- Warning limit for nagios notification
+#       packetloss_crit- Critical limit for nagios notification
-#
-# Arguments for Solaris:
@@ -47 +51 @@
-        echo 'packetloss.label packet loss'
-        echo 'packetloss.graph no'
+        [ -n "$ping_warn" ] && echo "ping.warning $ping_warn"
+        [ -n "$ping_crit" ] && echo "ping.critical $ping_crit"
+        [ -n "$packetloss_warn" ] && echo "packetloss.warning $packetloss_warn"
+        [ -n "$packetloss_crit" ] && echo "packetloss.critical $packetloss_crit"
-        exit 0
-fi

people/ilmari/modularisation-branch/node/node.d/postfix_mailqueue.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-# 
-# Plugin to monitor postfix mail spools

people/ilmari/modularisation-branch/node/node.d/postfix_mailstats.in

@@ -109 +109 @@
-{
-    print "delivered.value U\n";
-
+sort 
-    {
-        print "r$i.value U\n";
@@ -147 +147 @@
-    print "delivered.draw AREA\n";
-    print "delivered.min 0\n";
-
+sort 
-    {
-            print "r$i.label reject $i\n";
@@ -158 +158 @@
-
-print "delivered.value $delivered\n";
-
+sort 
-{
-        print "r$i.value ", $rejects->{$i}, "\n";
@@ -168 +168 @@
-open (OUT, ">$statefile") or exit 4;
-print OUT "$pos:$delivered\n";
-
+sort 
-{
-        print OUT "$i:", $rejects->{$i}, "\n";

people/ilmari/modularisation-branch/node/node.d/ps_.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Wildcard-script to monitor number of processes. To monitor a
@@ -22 +22 @@
-#%# capabilities=autoconf suggest
-
+. $MUNIN_LIBDIR/plugins/plugin.sh
-
-myname=`basename $0 | sed 's/^ps_//g'`
@@ -29 +30 @@
-
-if [ "$1" = "autoconf" ]; then
-
-
+
+
+
-fi
-
@@ -43 +45 @@
-        echo 'graph_category processes'
-        echo "count.label $myname"
-        echo 'processes.draw LINE2'
-        exit 0
-fi

people/ilmari/modularisation-branch/node/node.d/psu_.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Wildcard-script to monitor number of processes running as a given user.
@@ -17 +17 @@
-#%# family=manual
-#%# capabilities=autoconf suggest
-
-
-
-name=`basename $0 | sed 's/^psu_//g'`

people/ilmari/modularisation-branch/node/node.d/samba.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-# 
-# Plugin to monitor the number of open files in the system.

people/ilmari/modularisation-branch/node/node.d/sendmail_mailqueue.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Plugin to monitor sendmail queue size.

people/ilmari/modularisation-branch/node/node.d/sendmail_mailstats.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Plugin to monitor sendmail statistics.
@@ -21 +21 @@
-
-if [ "$1" = "autoconf" ]; then
-$MAILSTATS
+"$MAILSTATS"
-                echo yes
-                exit 0

people/ilmari/modularisation-branch/node/node.d/sendmail_mailtraffic.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Plugin to monitor sendmail statistics.
@@ -21 +21 @@
-
-if [ "$1" = "autoconf" ]; then
-$MAILSTATS
+"$MAILSTATS"
-                echo yes
-                exit 0

people/ilmari/modularisation-branch/node/node.d/snmp__if_.in

@@ -27 +27 @@
-
-my $response;
+
+# This is the snmpwalk:
+# .1.3.6.1.2.1.2.1.0 = INTEGER: 2
+# .1.3.6.1.2.1.2.2.1.1.1 = INTEGER: 1
+# .1.3.6.1.2.1.2.2.1.1.65539 = INTEGER: 65539
+# .1.3.6.1.2.1.2.2.1.2.1 = STRING: MS TCP Loopback interface
+# .1.3.6.1.2.1.2.2.1.2.65539 = STRING: Broadcom NetXtreme Gigabit Ethernet
+# .1.3.6.1.2.1.2.2.1.3.1 = INTEGER: softwareLoopback(24)
+# .1.3.6.1.2.1.2.2.1.3.65539 = INTEGER: ethernetCsmacd(6)
+# .1.3.6.1.2.1.2.2.1.4.1 = INTEGER: 1520
+# .1.3.6.1.2.1.2.2.1.4.65539 = INTEGER: 1500
+# .1.3.6.1.2.1.2.2.1.5.1 = Gauge32: 10000000
+# .1.3.6.1.2.1.2.2.1.5.65539 = Gauge32: 1000000000
+# .1.3.6.1.2.1.2.2.1.6.1 = STRING:
+# .1.3.6.1.2.1.2.2.1.6.65539 = STRING: 0:30:48:75:65:5e
+# .1.3.6.1.2.1.2.2.1.7.1 = INTEGER: up(1)
+# .1.3.6.1.2.1.2.2.1.7.65539 = INTEGER: up(1)
+# .1.3.6.1.2.1.2.2.1.8.1 = INTEGER: up(1)
+# .1.3.6.1.2.1.2.2.1.8.65539 = INTEGER: up(1)
-
-if (defined $ARGV[0] and $ARGV[0] eq "snmpconf")

people/ilmari/modularisation-branch/node/node.d/spamstats.in

@@ -73 +73 @@
-{
-    # Log rotated
-
+
+
+
-    $pos = 0;
-}

people/ilmari/modularisation-branch/node/node.d/squid_cache.in

@@ -68 +68 @@
-    my $cachemgr = IO::Socket::INET->new(PeerAddr => $host,
-                                        PeerPort => $port,
-
+
+
-
-    if (!$cachemgr)

people/ilmari/modularisation-branch/node/node.d/squid_icp.in

@@ -73 +73 @@
-    my $cachemgr = IO::Socket::INET->new(PeerAddr => $host,
-                                        PeerPort => $port,
-
+
+
-
-    if (!$cachemgr)

people/ilmari/modularisation-branch/node/node.d/squid_requests.in

@@ -69 +69 @@
-    my $cachemgr = IO::Socket::INET->new(PeerAddr => $host,
-                                        PeerPort => $port,
-
+
+
-
-    if (!$cachemgr)

people/ilmari/modularisation-branch/node/node.d/squid_traffic.in

@@ -70 +70 @@
-    my $cachemgr = IO::Socket::INET->new(PeerAddr => $host,
-                                        PeerPort => $port,
-
+
+
-
-    if (!$cachemgr)

people/ilmari/modularisation-branch/node/node.d/vmstat.in

@@ -1 @@
-/bin/sh
+@@GOODSH@@
-#
-# Plugin to monitor the number of procs in io-sleep and other wait

people/ilmari/modularisation-branch/node/plugins.history.in

@@ +1 @@
+
-#
-# This file contains plugin history. It only contains history for plugins in
@@ -120 +121 @@
-[1.3.1]
-[1.3.2]
+linux/yum
+digitemp_
+[1.3.3]
+aix/load
+digitemp_
+env
+freebsd/uptime
+id
+linux/acpi
+linux/cpuspeed
+linux/nfs4_client
+linux/proc_pri
+linux/quota_usage_
+linux/threads
+linux/yum
+lpstat
+multiping
+netbsd
+netbsd/cpu
+netbsd/df
+netbsd/df_inode
+netbsd/forks
+netbsd/if_
+netbsd/if_errcoll_
+netbsd/interrupts
+netbsd/iostat
+netbsd/iostat_ops
+netbsd/irqstats
+netbsd/load
+netbsd/memory
+netbsd/memory_pools
+netbsd/memory_types
+netbsd/netstat
+netbsd/nfs_client
+netbsd/nfsd
+netbsd/open_files
+netbsd/processes
+netbsd/sensors_
+netbsd/swap
+netbsd/uptime
+netbsd/vmstat
+netopia
+ntp_kernel_err
+ntp_kernel_pll_freq
+ntp_kernel_pll_off
+nutups_
+qmailscan
+qmailscan-simple
+snmp__rdp_users
+snmp__uptime
+snmp__winmem
+sunos/df
+sunos/df_inode
+sunos/uptime
+tomcat_access
+tomcat_jvm
+tomcat_threads
+tomcat_volume
+users

people/ilmari/modularisation-branch/server/munin-cgi-graph.in

@@ -1 +1 @@
-#!@@PERL@@  -Tw
-#
-#
-# Copyright (C) 2004 Jimmy Olsen
@@ -50 +49 @@
-my $serv  = "";
-my $dom   = "";
+my $lock  = "";
-
-my $config = &munin_readconfig ($conffile);
@@ -103 +103 @@
-print "\n";
-
+# Try to police the number of concurrent rrdgraph instances.  The
+# third value is the default maximum.
+
+# NOTE: The munin_*lock functions are not exactly ideal for race prone
+# locking, they're a bit fuzzy.  A better solution, which would not
+# imply a "sleep 1" would be to use semaphores.  See "perldoc perlipc"
+# and "man semop".
+
+my $max_cgi_graph_jobs = &munin_get ($config, "max_cgi_graph_jobs" , 6, $dom);
+
+until ( $lock ) {
+    foreach my $n ( 1 .. $max_cgi_graph_jobs ) {
+       if (&munin_getlock ("$config->{rundir}/munin-cgi-graph-$n.lock")) {
+           $lock = "munin-cgi-graph-$n.lock";
+           last;
+       }
+    }
+    sleep 1;
+}
-
-&graph ($filename);
+
+munin_removelock($lock);
-
-sub graph

people/ilmari/modularisation-branch/server/munin-cron.pod

@@ -36 +36 @@
-so only use parameters that are understood by all the other programs.
-
-=head1 VERSION
-
-This is munin-cron version 0.9.2-3
-
-=head1 AUTHORS
-
@@ -46 +42 @@
-=head1 COPYRIGHT
-
-4
+6
-
-This is free software; see the source for copying conditions. There is

people/ilmari/modularisation-branch/server/munin-graph.in

@@ -1 +1 @@
-#!@@PERL@@ -w
+# -*- cperl -*-
-#
-4 Jimmy Olsen, Audun Ytterdal
+6 Jimmy Olsen, Audun Ytterdal, Nicolai Langfeldt
-#
-# This program is free software; you can redistribute it and/or
@@ -17 +18 @@
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-#
-# $Id$
-
+
-$|=1;
-
@@ -33 +33 @@
-my $graph_time= Time::HiRes::time;
-my $DEBUG = 0;
-"@@VERSION@@"
+'@@VERSION@@'
-
-# Limit graphing to certain hosts and/or services
@@ -42 +42 @@
-my $RRDkludge = $RRDs::VERSION < 1.2 ? '' : '\\';
-
-
+
+
+
+
+
+
+
+
-my $force_graphing = 0;
-my $force_lazy = 1;
@@ -514 +521 @@
-{
-    my $name = shift;
-
+
-    $name = substr (Digest::MD5::md5_hex ($name), -15)
-        if (length $name > 15);
@@ -544 +551 @@
-        my @added = ();
-
- 
+
-        next if (&skip_service ($node, $service));
-
@@ -553 +560 @@
-        my $force_single_value;
-
-
+
+
+
+
+
-
-        # Array to keep 'preprocess'ed fields.
-        my @rrd_preprocess = ();
-
-
+
+
+
+
+
+
+
-
-        @field_order = (@rrd_preprocess, @field_order);
-
+
+
+
-
-        # Get max label length
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        # Array to keep negative data until we're finished with positive.
@@ -572 +615 @@
-        my %total_pos;
-        my %total_neg;
+        my $autostacking=0;
-        print "DEBUG: Treating fields \"", join "\",\"", @field_order, "\".\n" if $DEBUG;
-        for my $field (@field_order) {
-            my $path  = undef;
-
-
+
-                $path = $1;
-            }
@@ -583 +626 @@
-            print "DEBUG: Processing field \"$field\".\n" if $DEBUG;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            # Getting name of rrd file
-
+
+
+
-
-            my $update = RRDs::last ($filename);
-            $update = 0 if ! defined $update;
-
-
+
-                $lastupdate = $update;
-            }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-            # Trim the fieldname to make room for other field names.
-            $rrdname = &get_field_name ($field);
-# A change was made
-    {
+{
+       # A change was made
-                set_cdef_name ($node->{client}->{$service}, $field, $rrdname);
-            }
@@ -615 +690 @@
-            push (@rrd, "DEF:a$rrdname=" .
-                  $filename . ":" . $rrdfield . ":MAX");
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                push (@rrd, "CDEF:c$rrdname=g$rrdname");
-                print "DEBUG: Field name after cdef set to $rrdname\n" if $DEBUG;
-
-
-
+
+
-                push (@rrd, "CDEF:c$rrdname=g$rrdname" . (($now-$update)>900 ? ",POP,UNKN" : ""));
-            }
@@ -637 +719 @@
-            print "DEBUG: Drawing field \"$field\".\n" if $DEBUG;
-
-# Only one field. Do min/max range.     
-    {
+{
+       # Only one field. Do min/max range.     
-                push (@rrd, "CDEF:min_max_diff=a$rrdname,i$rrdname,-");
-                push (@rrd, "CDEF:re_zero=min_max_diff,min_max_diff,-") 
@@ -648 +730 @@
-            }
-
-
-
+
-                push (@rrd, "COMMENT:" . (" " x $max_field_len));
-                push (@rrd, "COMMENT:Cur (-/+)");
@@ -655 +736 @@
-                push (@rrd, "COMMENT:Avg (-/+)");
-                push (@rrd, "COMMENT:Max (-/+) \\j");
-
-
-
+
-                push (@rrd, "COMMENT:" . (" " x $max_field_len));
-                push (@rrd, "COMMENT: Cur$RRDkludge:");
@@ -666 +745 @@
-            }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                  (escape ($node->{client}->{$service}->{"$field.label"}) || escape ($field))
-                  . (" " x ($max_field_len + 1 -
-                            length ($node->{client}->{$service}->{"$field.label"} || $field))));
-
-
-
-
+
+
-                my $negfield = &orig_to_cdef ($node->{client}->{$service}, $node->{client}->{$service}->{$field.".negative"});
-                print "DEBUG: negfield = $negfield\n" if $DEBUG;
-
-
+
-                    $negfield = $node->{client}->{$service}->{$negfield.".realname"};
-                }
-                
-# zero-line, to redraw zero afterwards.
-{
+{
+    # zero-line, to redraw zero afterwards.
-                    push (@rrd_negatives, "CDEF:re_zero=g$negfield,UN,0,0,IF");
-                }
@@ -690 +778 @@
-                push (@rrd_negatives, "CDEF:ng$negfield=g$negfield,-1,*");
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-                # Draw HRULEs
-                my $linedef = munin_get ($config, "line", undef, $domain, $name, $service, $node->{client}->{$service}->{$field.".negative"});
-
-
-
+
+
-                    push (@rrd_negatives, "HRULE:".$number.
-
-
-
-
-
-
+
+
+
-                    push (@rrd_negatives, "HRULE:".$node->{client}->{$service}->{$node->{client}->{$service}->{$field.".negative"}.".warn"}.
-((defined $single_value and $single_value) ? "#ff0000" : $COLOUR[($field_count-1)%@COLOUR])
-
-
-%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, 1)?"%s":"")
-%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, 1)?"%s":"")
-%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, 1)?"%s":"")
-%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, 1)?"%s":"")
-%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, 1)?"%s":"")
-%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, 1)?"%s":"")
-%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, 1)?"%s":"")
-%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, 1)?"%s":"")
+  (defined $single_value and $single_value) ? "#ff0000" : $colour
+
+
+$rrdformat" . $rrdscale
+$rrdformat" . $rrdscale
+$rrdformat" . $rrdscale
+$rrdformat" . $rrdscale
+$avgformat" . $rrdscale
+$avgformat" . $rrdscale
+$rrdformat" . $rrdscale
+$rrdformat" . $rrdscale
-                push (@{$total_pos{'min'}}, "i$rrdname");
-                push (@{$total_pos{'avg'}}, "g$rrdname");
@@ -732 +814 @@
-                push (@{$total_neg{'avg'}}, "g$negfield");
-                push (@{$total_neg{'max'}}, "a$negfield");
-
-
-
+
-                push (@rrd, "COMMENT: Cur$RRDkludge:") unless $global_headers;
-%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, "yes")?"%s":"")
+$rrdformat" . $rrdscale
-                push (@rrd, "COMMENT: Min$RRDkludge:") unless $global_headers;
-%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, 1)?"%s":"")
+$rrdformat" . $rrdscale
-                push (@rrd, "COMMENT: Avg$RRDkludge:") unless $global_headers;
-%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, 1)?"%s":"")
+$avgformat" . $rrdscale
-                push (@rrd, "COMMENT: Max$RRDkludge:") unless $global_headers;
-%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, 1)?"%s":"")
+$rrdformat" . $rrdscale
-                push (@{$total_pos{'min'}}, "i$rrdname");
-                push (@{$total_pos{'avg'}}, "g$rrdname");
@@ -748 +828 @@
-            }
-
-
-            # Draw HRULEs
-            my $linedef = munin_get ($config, "line", undef, $domain, $name, $service, $field);
-
-
-
+
+
-                $label =~ s/:/\\:/g if defined $label;
-                push (@rrd, "HRULE:".$number.
-
-
-
+
+
+
+
-                      "COMMENT: \\j"
-                    );
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-            push (@rrd, @rrd_negatives);
-            push (@rrd, "LINE2:re_zero#000000"); # Redraw zero.
- 
-    exists $total_pos{'min'} and exists $total_neg{'min'} and 
-    @{$total_pos{'min'}} and @{$total_neg{'min'}})
-
+
+exists $total_pos{'min'} and exists $total_neg{'min'} and
+@{$total_pos{'min'}} and @{$total_neg{'min'}}) {
+
-                push (@rrd, "CDEF:ipostotal=".join (",", map { "$_,UN,0,$_,IF" } @{$total_pos{'min'}}).(",+" x (@{$total_pos{'min'}}-1)));
-                push (@rrd, "CDEF:gpostotal=".join (",", map { "$_,UN,0,$_,IF" } @{$total_pos{'avg'}}).(",+" x (@{$total_pos{'avg'}}-1)));
@@ -784 +862 @@
-                push (@rrd, "CDEF:dpostotal=ipostotal,UN,ipostotal,UNKN,IF");
-                push (@rrd, "LINE1:dpostotal#000000:" . $node->{client}->{$service}->{graph_total} . (" " x ($max_field_len - length ($node->{client}->{$service}->{graph_total}) + 1)));
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-            push (@rrd, "CDEF:ipostotal=".join (",", map { "$_,UN,0,$_,IF" } @{$total_pos{'min'}}).(",+" x (@{$total_pos{'min'}}-1)));
-            push (@rrd, "CDEF:gpostotal=".join (",", map { "$_,UN,0,$_,IF" } @{$total_pos{'avg'}}).(",+" x (@{$total_pos{'avg'}}-1)));
-            push (@rrd, "CDEF:apostotal=".join (",", map { "$_,UN,0,$_,IF" } @{$total_pos{'max'}}).(",+" x (@{$total_pos{'max'}}-1)));
-
+
-            push (@rrd, "CDEF:dpostotal=ipostotal,UN,ipostotal,UNKN,IF");
-            push (@rrd, "LINE1:dpostotal#000000:" . $node->{client}->{$service}->{graph_total} . (" " x ($max_field_len - length ($node->{client}->{$service}->{graph_total}) + 1)));
-            push (@rrd, "COMMENT: Cur$RRDkludge:") unless $global_headers;
-%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, 1)?"%s":"")
+$rrdformat" . $rrdscale
-            push (@rrd, "COMMENT: Min$RRDkludge:") unless $global_headers;
-%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, 1)?"%s":"")
+$rrdformat" . $rrdscale
-            push (@rrd, "COMMENT: Avg$RRDkludge:") unless $global_headers;
-%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, 1)?"%s":"") . 
+$avgformat" . $rrdscale .
-            push (@rrd, "COMMENT: Max$RRDkludge:") unless $global_headers;
-%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, 1)?"%s":"")
+$rrdformat" . $rrdscale
-        }
-
-        for my $time (keys %times) {
-            next unless ($draw{$time});
-
+
+
+
+
+
+
+
+
-            logger ("Processing $name -> $time") if $DEBUG;
-
-            # Do the header (title, vtitle, size, etc...)
-            push @complete, @{&get_header ($node, $config, $domain, $name, $service, $time)};
+            if ($LINEkluge) {
+                @rrd = map { s/LINE3:/LINE2.2:/; $_; } @rrd;
+                @rrd = map { s/LINE2:/LINE1.6:/; $_; } @rrd;
+                # LINE1 is thin enough.
+            }
-            push @complete, @rrd;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-            RRDs::graph (@complete);
-            if (my $ERROR = RRDs::error) {
-                logger ("Unable to graph $filename: $ERROR");
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                next unless ($draw{"sum".$time});
-                my @rrd_sum;
-                push @rrd_sum, @{&get_header ($node, $config, $domain, $name, $service, $time, 1)};
-
-
-
-
+
+
-                }
-                push @rrd_sum, @rrd;
@@ -855 +943 @@
-                my $labelled = 0;
-                my @defined = ();
-
-
-
-
+
+
-                        (my $label = $node->{client}->{$service}->{graph_vlabel}) =~ s/\$\{graph_period\}/$sumtimes{$time}[0]/g;
-                        splice (@rrd_sum, $index, 2, ("--vertical-label", $label));
-                        $index++;
-                        $labelled++;
-
-
-
+
-                        my ($pre, $fname, $post) = ($1, $2, $3);
-                        next if $fname eq "re_zero";
-
-
+
-                            splice (@rrd_sum, $index, 1, $pre . ":x$fname" . $post);
-                            $index++;
@@ -878 +961 @@
-                        my @replace;
-
- $node->{client}->{$service}->{$fname.".type"} ne "GAUGE")
-
-
-    { 
-
-{
+
+    $node->{client}->{$service}->{$fname.".type"} ne "GAUGE") 
+ {
+       
+ {
+   
-                                    push @replace, "CDEF:x$fname=PREV($fname),UN,0,PREV($fname),IF,$fname,+,5,*,6,*";
-
-
-
+
-                                    push @replace, "CDEF:x$fname=PREV($fname),UN,0,PREV($fname),IF,$fname,+,300,*,6,*";
-                                }
-
-
-
-
-
+
+
+
+
-                                    push @replace, "CDEF:x$fname=$fname,5,*,288,*";
-
-
-
+
-                                    push @replace, "CDEF:x$fname=$fname,300,*,288,*";
-                                }
@@ -906 +984 @@
-                        splice (@rrd_sum, $index, 1, @replace);
-                        $index++;
-
-
-
+
-                        $index++;
-                        $rrd_sum[$index] = $rrd_sum[$index] * 300 * $sumtimes{$time}->[1];
-                    }
-                }
-
-
+
+unless ($labelled) 
-                    my $label = $node->{client}->{$service}->{"graph_vlabel_sum_$time"} || $sumtimes{$time}->[0];
-                    unshift @rrd_sum, "--vertical-label", $label;
@@ -921 +997 @@
-                print "\n\nrrdtool \"graph\" \"", join ("\"\n\t\"",@rrd_sum), "\"\n" if $DEBUG;
-                RRDs::graph (@rrd_sum);
+
-                if (my $ERROR = RRDs::error) {
-                    logger ("Unable to graph $filename: $ERROR");
-
-
-
+
+
-                    print &munin_get_picture_filename ($config, $domain, $name, $service, $time, 1), "\n";
-                }
@@ -935 +1011 @@
-        print STATS "GS|$domain|$name|$service|$service_time\n" unless $skip_stats;
-
-
-{
-delete $node->{client}->{$service}->{$_}
+ {
+    delete $node->{client}->{$service}->{$_}
+ 
-        }
-        @added = ();
-    }
-
-
-
-
-
+
+
+
-    my $config  = shift;
-    my $domain  = shift;
@@ -954 +1028 @@
-}
-
-
-
+
-    my $service = shift;
-    my $field   = shift;
@@ -966 +1039 @@
-}
-
-
-
+
-    my $service = shift;
-    my $field   = shift;
@@ -976 +1048 @@
-}
-
-
-
+
-    my $node = shift;
-    my $service = shift;
@@ -996 +1067 @@
-}
-
-
-
+
-    my $service     = shift;
-    my $cfield_ref  = shift;
@@ -1184 +1254 @@
-about any off-limit values.
-
-
+
+
+
+
+
-
-It checks the rrd-files for updated values, and redraws the graphs if
-needed. To force redrawing of graphs (after setup-changes et alia), use
- 
+
-
-=head1 FILES
@@ -1197 +1271 @@
-        @@STATEDIR@@/*
-
-=head1 VERSION
-
-This is munin-graph version 0.9.2-3
-
-=head1 AUTHORS
-
- and Jimmy Olsen
+, Jimmy Olsen, Tore Anderson, Nicolai Langfeldt
-
-=head1 BUGS
@@ -1213 +1283 @@
-=head1 COPYRIGHT
-
-© 2002-2004 Audun Ytterdal, Jimmy Olsen, and Tore Anderson / Linpro AS.
+(C) 2002-2006 Audun Ytterdal, Jimmy Olsen, Tore Anderson, and Nicolai Langfeldt
-
-This is free software; see the source for copying conditions. There is

people/ilmari/modularisation-branch/server/munin-html.in

@@ -1 +1 @@
-#!@@PERL@@
+# -*- perl -*-
-#
-4
+6
-#
-# This program is free software; you can redistribute it and/or
@@ -25 +26 @@
-use HTML::Template;
-use Getopt::Long;
+use Time::HiRes;
-use Munin;
-use POSIX qw(strftime);
-
-my @times = ( "day", "week", "month", "year" );
-
-
-my $DEBUG=0;
@@ -41 +42 @@
-
-# Get options
- 
+
-GetOptions ( "host=s"       => \(),
-             "force-root!"  => \$force_root,
@@ -75 +76 @@
-Written by Knut Haugen, Audun Ytterdal, Jimmy Olsen, Tore Anderson / Linpro AS
-
-5
+6
-
-This is free software released under the GNU General Public License. There
@@ -93 +94 @@
-    exit (1);
-}
+
+my $update_time = Time::HiRes::time;
-
-my $config;
@@ -139 +142 @@
-my @domainorder;
-if ($config->{domain_order}) {
- 
+\s+
-}
-foreach my $d (sort (keys %{$config->{domain}})) {
@@ -165 +168 @@
-my $timestamp = strftime("%Y-%m-%d T %T", localtime);
-for my $domain (@domainorder) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        } else {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -604 +637 @@
-}
-
-
+
+
+
-close $log;
-
@@ -651 +686 @@
-Munin's nodes, graph them, create html-pages, and optionally warn Nagios
-about any off-limit values.
+
+If munin.conf sets "graph_strategy cgi" then munin-html generates URLs
+referencing the graph CGI instead of referencing pre-generated
+graphs (made by munin-graph).
-
-Munin-html creates the html pages.
@@ -678 +717 @@
-=head1 COPYRIGHT
-
-
+
+
-
-This is free software; see the source for copying conditions. There is

people/ilmari/modularisation-branch/server/munin-limits.in

@@ -157 +157 @@
-            $client->{'fields'} = join (' ', map { $_ =~ s/\.label$//; $_} grep (/\.label/, keys %$client));
-            $client->{'plugin'} = $clientname;
-options
+title
-            $client->{'host'} = $config->{'domain'}->{$domain}->{'node'}->{$name}->{'notify_alias'} || $name;
-            $client->{'group'} = $config->{'domain'}->{$domain}->{'notify_alias'} || $domain;
@@ -643 +643 @@
-=head1 AUTHORS
-
-
+Knut Haugen, 
-
-=head1 BUGS
@@ -653 +653 @@
-=head1 COPYRIGHT
-
-4
+6
-
-This is free software; see the source for copying conditions. There is

people/ilmari/modularisation-branch/server/munin-update.in

@@ -17 +17 @@
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-#
-#
-# Script to update the RRD-files with current information.
@@ -312 +310 @@
-else
-{
-warn
+die
-}
-
@@ -1107 +1105 @@
-
-sub fetch_node {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -1316 +1329 @@
-=head1 AUTHORS
-
- and Jimmy Olse
+, Jimmy Olsen, and Tore Anderso
-
-=head1 BUGS
@@ -1326 +1339 @@
-=head1 COPYRIGHT
-
-4
+6
-
-This is free software; see the source for copying conditions. There is