Permalink
Browse files

Updated to final 1.2.4 version [merged change r98r984 from /branches/…

…1.2-stable]
  • Loading branch information...
LupeChristoph committed Nov 6, 2005
1 parent f0e1142 commit 23a2e6645faa4493735836317119299c88e394dc
Showing with 1,097 additions and 673 deletions.
  1. +57 −0 ChangeLog
  2. +8 −4 Makefile
  3. +5 −0 Makefile.config
  4. +52 −0 dists/debian/changelog
  5. +5 −7 dists/debian/control
  6. +1 −1 dists/debian/munin-node.cron.d
  7. +161 −66 dists/debian/munin-node.init
  8. +0 −19 dists/debian/munin-node.postinst
  9. +1 −1 dists/debian/munin-node.postrm
  10. +0 −76 dists/debian/munin-node.preinst
  11. +0 −16 dists/debian/munin.postinst
  12. +1 −4 dists/debian/munin.postrm
  13. +0 −88 dists/debian/munin.preinst
  14. +8 −6 dists/freebsd/munin-main/Makefile
  15. +2 −2 dists/freebsd/munin-main/distinfo
  16. +35 −0 dists/freebsd/munin-main/files/patch-munin-limits.in
  17. 0 dists/freebsd/munin-main/files/{pkg-message → pkg-message.in}
  18. +0 −10 dists/freebsd/munin-main/pkg-install
  19. +8 −4 dists/freebsd/munin-main/pkg-plist
  20. +18 −19 dists/freebsd/munin-node/Makefile
  21. +2 −2 dists/freebsd/munin-node/distinfo
  22. +27 −0 dists/freebsd/munin-node/files/munin-node-revive.sh.in
  23. +0 −32 dists/freebsd/munin-node/files/munin-node.sh
  24. +28 −0 dists/freebsd/munin-node/files/munin-node.sh.in
  25. +4 −3 dists/freebsd/munin-node/files/{pkg-message → pkg-message.in}
  26. +0 −2 dists/freebsd/munin-node/pkg-install
  27. +27 −7 dists/freebsd/munin-node/pkg-plist
  28. +1 −0 dists/redhat/Makefile.config
  29. +1 −1 dists/redhat/munin-node.rc
  30. +84 −25 dists/redhat/munin.spec.in
  31. +196 −123 dists/suse/munin.spec.in
  32. +46 −0 dists/suse/patch-002
  33. +1 −1 node/munin-node.in
  34. +7 −2 node/node.d.freebsd/if_.in
  35. +9 −3 node/node.d.freebsd/if_errcoll_.in
  36. +5 −1 node/node.d.linux/iostat.in
  37. +3 −3 node/node.d.linux/sensors_.in
  38. +2 −2 node/node.d.sunos/fs_df.in
  39. +2 −2 node/node.d.sunos/fs_inodes.in
  40. +22 −14 node/node.d.sunos/memory.in
  41. +2 −2 node/node.d.sunos/netstat.in
  42. +10 −30 node/node.d.sunos/processes.in
  43. +9 −3 node/node.d/amavis.in
  44. +2 −2 node/node.d/apache_accesses.in
  45. +2 −2 node/node.d/apache_processes.in
  46. +2 −2 node/node.d/apache_volume.in
  47. +10 −4 node/node.d/courier_.in
  48. +2 −2 node/node.d/hddtemp2.in
  49. +12 −4 node/node.d/hddtemp_smartctl.in
  50. +15 −8 node/node.d/mysql_isam_space_.in
  51. +7 −0 node/node.d/ntp_.in
  52. +6 −0 node/node.d/ntp_states.in
  53. +2 −2 node/node.d/nut_misc.in
  54. +1 −1 node/node.d/nut_volts.in
  55. +15 −5 node/node.d/perdition.in
  56. +3 −2 node/node.d/postfix_mailvolume.in
  57. +24 −9 node/node.d/samba.in
  58. +49 −31 node/node.d/smart_.in
  59. +1 −0 node/node.d/squid_requests.in
  60. +1 −1 node/node.d/sybase_space.in
  61. +1 −1 server/munin-cron.in
  62. +23 −14 server/munin-graph.in
  63. +1 −1 server/munin-html.in
  64. +1 −1 server/munin-limits.in
  65. +67 −0 test-mktemp
View
@@ -1,4 +1,61 @@
munin (repository)
+ * Plugins: "exists $ARGV[0]" does not work with perl < 5.6.0. use
+ "defined $ARGV[0]".
+ * Dists: Brought dists.freebsd in line with the FreeBSD ports.
+ * 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.
+ * Plugins: Fix tempfile creation by using the best method available on a given
+ platform. (amavis, courier_, perdition)
+ * 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
+ (attributes) rather than -a (all). That can be specified through the
+ args_$dev mechanism. THIS CAN BREAK EXISTING SETUPS!
+ * Plugins: samba: Make location of smbstatus program configurable.
+ Streamline computation of foo.value. Correct typos and a thinko. Add
+ configurable "ignoreipcshare". Make awk program a lot more complicated to
+ deal with variations of smbstatus output. Quote error message with
+ parentheseis.
+ * Plugins: smart_: Allow to query several drives on the same 3ware card.
+ Correct a bug when '-i' was not listed in smartargs. Don't fail if
+ no value was obtained for hard drive model. Minor enhancements and
+ minor bug fixes from Nicolas STRANSKY <Nico@neo-lan.net>. smartctl exit
+ code is a value composed of bits. Allow more than one to be turned on
+ simultaneously by using the exit code itself rather than the log2 of it.
+ * Plugins: perdition: Add missing backquote on mktempfile line. Support
+ IMAPS and POP3S protocols.
+ * Plugins (FreeBSD): if_, if_errcoll_: Shift field numbers in awk for
+ interfaces that have no MAC address.
+ * Plugins (Solaris): fs_df, fs_inodes: Allow '-' in mountpoints.
+ * Plugins (Solaris): processes: Replaced numerous calls to various programs
+ with a single awk program.
+ * Plugins (Solaris): netstat: "exists $ARGV[0]" does not work with perl <
+ 5.6.0. use "defined $ARGV[0]".
+ * Plugins (Solaris): memory: Rewrite the value computation as a single nawk
+ program. Support scale factor "K" (gives values < 1).
+ * Plugins (Linux): port_: Correct offset error in TCP6 code.
+
+munin (1.2.3)
+
+ * Main: Remove stdout output (Deb#302502).
+ * Node: Added support for optional "user" settings in node.
+ * Node: Allow "root" for the per-plugin "group" directive.
+ * Plugins: sort drives in generic/hddtemp_smartcl (SF#1174847).
+ * Plugins: Fix autoconf for linux/{nfsd,nfs_client}.
+ * Plugins: Make linux/sensors_ handle multiline output better (Deb#300690).
+ * Plugins: generic/postfix_mailstats now treats reject-lines better
+ (Deb#302220).
+ * Plugins: Made generic/postfix_mailvolume autoconf less eager.
* Main: Tuned logging.
* Main: Log warning about nodes without addresses in munin-update.
View
@@ -116,6 +116,7 @@ install-doc: build-doc
$(INSTALL) -m 0644 build/doc/munin-faq.txt $(DOCDIR)/
$(INSTALL) -m 0644 README.* $(DOCDIR)/
$(INSTALL) -m 0644 COPYING $(DOCDIR)/
+ $(INSTALL) -m 0644 build/README-apache-cgi $(DOCDIR)/
$(INSTALL) -m 0644 node/node.d/README $(DOCDIR)/README.plugins
build: build-stamp
@@ -141,6 +142,7 @@ build-stamp:
-e 's|@@PYTHON@@|$(PYTHON)|g' \
-e 's|@@OSTYPE@@|$(OSTYPE)|g' \
-e 's|@@HOSTNAME@@|$(HOSTNAME)|g' \
+ -e 's|@@MKTEMP@@|$(MKTEMP)|g' \
-e 's|@@VERSION@@|$(VERSION)|g' \
-e 's|@@PLUGSTATE@@|$(PLUGSTATE)|g' \
-e 's|@@CGIDIR@@|$(CGIDIR)|g' \
@@ -210,11 +212,11 @@ rpm-pre:
# (cd ..; ln -s munin munin-$(VERSION))
rpm: rpm-pre
- tar -C .. --dereference --exclude .svn -cvzf ../munin-$(RELEASE).tar.gz munin-$(VERSION)/
+ tar -C .. --dereference --exclude .svn -cvzf ../munin-$(RELEASE).tar.gz munin-$(VERSION)/
(cd ..; rpmbuild -tb munin-$(RELEASE).tar.gz)
rpm-src: rpm-pre
- tar -C .. --dereference --exclude .svn -cvzf ../munin-$(RELEASE).tar.gz munin-$(VERSION)/
+ tar -C .. --dereference --exclude .svn -cvzf ../munin-$(RELEASE).tar.gz munin-$(VERSION)/
(cd ..; rpmbuild -ts munin-$(RELEASE).tar.gz)
+suse-pre:
@@ -228,11 +230,11 @@ rpm-src: rpm-pre
# (cd ..; ln -s munin munin-$(VERSION))
suse: suse-pre
- tar -C .. --dereference --exclude .svn -cvzf ../munin-$(RELEASE).tar.gz munin-$(VERSION)/
+ tar -C .. --dereference --exclude .svn -cvzf ../munin_$(RELEASE).tar.gz munin-$(VERSION)/
(cd ..; rpmbuild -tb munin-$(RELEASE).tar.gz)
suse-src: suse-pre
- tar -C .. --dereference --exclude .svn -cvzf ../munin-$(RELEASE).tar.gz munin-$(VERSION)/
+ tar -C .. --dereference --exclude .svn -cvzf ../munin_$(RELEASE).tar.gz munin-$(VERSION)/
(cd ..; rpmbuild -ts munin-$(RELEASE).tar.gz)
clean:
@@ -247,6 +249,8 @@ endif
-rm -f build-doc-stamp
-rm -f build-man-stamp
+ -rm -f dists/redhat/munin.spec
+
source_dist: clean
(cd ..; ln -s $(DIR) munin-$(VERSION))
tar -C .. --dereference --exclude .svn -cvzf ../munin_$(RELEASE).tar.gz munin-$(VERSION)/
View
@@ -61,6 +61,11 @@ OSTYPE = $(shell uname | tr '[A-Z]' '[a-z]')
# files)
HOSTNAME = $(shell hostname)
+# What is the safest way to create a tempfile.
+# Default is to figure it out by testing various methods.
+# Replace this with a known platform-specific method
+MKTEMP = $(shell ./test-mktemp)
+
# Munin version number.
VERSION = $(shell cat RELEASE)
View
@@ -1,3 +1,55 @@
+munin (1.2.3-3) unstable; urgency=medium
+
+ * debian/munin.preinst (removed), debian/munin.postinst, debian/munin.postrm,
+ debian/munin-node.preinst (removed), debian/munin-node.postinst:
+ - Remove all code that handled upgrades from versions earlier than
+ 1.2.3-1. In a way this closes: #308008.
+
+ * debian/munin.postrm, debian/munin-node.postrm:
+ - Replace "test -o" bashism with "||".
+
+ * debian/munin-node.cron.d:
+ - Update APT's package index files periodically if the apt_all plugin
+ enabled, too. Patch by Tommi Virtanen, thanks! Closes: #317278.
+
+ * debian/control:
+ - Remove conflict declarations on the old LRRD packages.
+ - Make munin-node suggest ethtool, closes: #311603.
+ - Make Munin depend on rrdtool instead of merely suggesting it. This is
+ a workaround for bug #323975 and its duplicates.
+ - Add a dependency on adduser for both packages.
+ - Increment standards-version to 3.6.2.1, no changes required.
+
+ * debian/munin-node.init, debian/control:
+ - Reimplemented Munin-Node's init script using LSB functions.
+ Closes: #326912, #326913.
+ - Add a dependency on lsb-base for Munin-Node.
+
+ * server/munin-graph.in, debian/control:
+ - Replaced the patch from 1.2.3-2 with the upstream one from SVN revision
+ 954. This re-enables support for RRDtool 1.0, so the versioned
+ dependency on librrds-perl is dropped.
+
+ * server/munin-cron.in:
+ - Swallow bogus output from RRDtool, closes: #326061. This is a
+ (hopefully temporary) workaround for bug #325353.
+
+ -- Tore Anderson <tore@debian.org> Sat, 10 Sep 2005 10:58:08 +0200
+
+munin (1.2.3-2) unstable; urgency=low
+
+ * server/munin-graph.in:
+ - Gave up waiting for the new upstream release, and applied Robert
+ Loomans' patch to make Munin support RRDtool 1.2, closes: #324605,
+ closes: #325280. Thanks, Robert! Note that this breaks compability
+ with RRDtool 1.0. Sarge users should wait for the new upstream release
+ which will support both RRDtool 1.0 and 1.2.
+
+ * debian/control:
+ - Made the munin package depend on librrds-perl in versions 1.2 or above.
+
+ -- Tore Anderson <tore@debian.org> Wed, 31 Aug 2005 09:11:47 +0200
+
munin (1.2.3-1) unstable; urgency=medium
* New upstream release, targeted at Sarge.
View
@@ -4,14 +4,13 @@ Priority: optional
Maintainer: Munin Debian Maintainers <munin-deb-maint@linpro.no>
Uploaders: Tore Anderson <tore@debian.org>, Dagfinn Ilmari Mannsaker <ilmari@ilmari.org>
Build-Depends-Indep: debhelper (>> 4.0.0), perl, htmldoc, html2text
-Standards-Version: 3.6.1.1
+Standards-Version: 3.6.2.1
Package: munin-node
Architecture: all
-Depends: ${perl:Depends}, libnet-server-perl, procps
+Depends: ${perl:Depends}, libnet-server-perl, procps, adduser, lsb-base
Recommends: libnet-snmp-perl
-Suggests: munin, libwww-perl, libnet-irc-perl, mysql-client, smartmontools, acpi | lm-sensors, python (>= 2.2)
-Conflicts: lrrd-client (<= 0.9.9r5-1)
+Suggests: munin, libwww-perl, libnet-irc-perl, mysql-client, smartmontools, acpi | lm-sensors, python (>= 2.2), ethtool
Description: network-wide graphing framework (node)
Munin is a highly flexible and powerful solution used to create graphs of
virtually everything imaginable throughout your network, while still
@@ -36,10 +35,9 @@ Description: network-wide graphing framework (node)
Package: munin
Architecture: all
-Depends: ${perl:Depends}, perl-modules (>= 5.8.0) | libparse-recdescent-perl, librrds-perl, libhtml-template-perl, libdigest-md5-perl, libtime-hires-perl, libstorable-perl
+Depends: ${perl:Depends}, perl-modules (>= 5.8.0) | libparse-recdescent-perl, librrds-perl, libhtml-template-perl, libdigest-md5-perl, libtime-hires-perl, libstorable-perl, rrdtool, adduser
Recommends: munin-node, libdate-manip-perl
-Suggests: rrdtool, www-browser, httpd
-Conflicts: lrrd-server (<= 0.9.9r5-1)
+Suggests: www-browser, httpd
Description: network-wide graphing framework (grapher/gatherer)
Munin is a highly flexible and powerful solution used to create graphs of
virtually everything imaginable throughout your network, while still
@@ -8,5 +8,5 @@ MAILTO=root
# an hour (12 invokations an hour, 1 in 12 chance that the update will
# happen), but ensure that there will never be more than two hour (7200
# seconds) interval between updates..
-*/5 * * * * root [ -x /etc/munin/plugins/apt ] && /etc/munin/plugins/apt update 7200 12 >/dev/null
+*/5 * * * * root if [ -x /etc/munin/plugins/apt_all ]; then /etc/munin/plugins/apt_all update 7200 12 >/dev/null; elif [ -x /etc/munin/plugins/apt ]; then /etc/munin/plugins/apt update 7200 12 >/dev/null; fi
Oops, something went wrong.

0 comments on commit 23a2e66

Please sign in to comment.