|
[-]
[+]
|
Changed |
munin.changes
|
|
|
|
[-]
[+]
|
Changed |
munin.spec
^
|
|
|
|
[-]
[+]
|
Changed |
munin-2.0.17.tar.bz2/ChangeLog
^
|
| @@ -1,5 +1,29 @@
-*- text -*-
+munin-2.0.17, 2013-07-19
+
+-------
+Summary
+-------
+
+Bugfix release.
+
+Closes: #1305, D:710899, D:712793, D:717265
+
+------------------
+Detailed Changelog
+------------------
+
+Steve Schnepp:
+ p/df: also ignore devtmpfs
+ plugins/df_abs: fix the multiple block device
+ gitignore: ignoring output dir sandbox/
+ master: fix "graph_period hour"
+ plugins: fix uninitialized $MUNIN::VERSION
+
+Stig Sandbeck Mathisen:
+ Remove typo in the example rrdcached socket documentation
+
munin-2.0.16, 2013-06-03
-------
|
|
[-]
[+]
|
Changed |
munin-2.0.17.tar.bz2/RELEASE
^
|
| @@ -1 +1 @@
-2.0.16
+2.0.17
|
|
[-]
[+]
|
Changed |
munin-2.0.17.tar.bz2/doc/master/rrdcached.rst
^
|
| @@ -77,7 +77,7 @@
::
- rrdcached_socket=/run/munin/rrdcached.sock
+ rrdcached_socket /run/munin/rrdcached.sock
Is it working?
|
|
[-]
[+]
|
Changed |
munin-2.0.17.tar.bz2/master/lib/Munin/Master/GraphOld.pm
^
|
| @@ -1042,6 +1042,10 @@
and graph_by_minute($service)) {
push(@rrd, expand_cdef($service, \$rrdname, "$fname,60,*"));
}
+ if ( munin_get($field, "type", "GAUGE") ne "GAUGE"
+ and graph_by_hour($service)) {
+ push(@rrd, expand_cdef($service, \$rrdname, "$fname,3600,*"));
+ }
if (my $tmpcdef = munin_get($field, "cdef")) {
push(@rrd, expand_cdef($service, \$rrdname, $tmpcdef));
@@ -1495,6 +1499,10 @@
# Already multiplied by 60
push @replace,
"CDEF:x$fname=PREV($fname),UN,0,PREV($fname),IF,$fname,+,5,*,6,*";
+ } elsif (graph_by_hour($service)) {
+ # Already multiplied by 3600, have to *divide* by 12
+ push @replace,
+ "CDEF:x$fname=PREV($fname),UN,0,PREV($fname),IF,$fname,+,12,/,6,*";
}
else {
push @replace,
@@ -1508,6 +1516,9 @@
# Already multiplied by 60
push @replace, "CDEF:x$fname=$fname,5,*,288,*";
+ } elsif (graph_by_hour($service)) {
+ # Already multiplied by 3600, have to *divide* by 12
+ push @replace, "CDEF:x$fname=$fname,12,/,288,*";
}
else {
push @replace,
@@ -1695,6 +1706,12 @@
return (munin_get($service, "graph_period", "second") eq "minute");
}
+sub graph_by_hour {
+ my $service = shift;
+
+ return (munin_get($service, "graph_period", "second") eq "hour");
+}
+
sub orig_to_cdef {
my $service = shift;
my $fieldname = shift;
|
|
[-]
[+]
|
Changed |
munin-2.0.17.tar.bz2/plugins/node.d.linux/df.in
^
|
| @@ -24,7 +24,7 @@
This configuration snipplet is an example with the defaults:
[df]
- env.exclude none unknown rootfs iso9660 squashfs udf romfs ramfs debugfs cgroup_root
+ env.exclude none unknown rootfs iso9660 squashfs udf romfs ramfs debugfs cgroup_root devtmpfs
env.warning 92
env.critical 98
@@ -87,7 +87,7 @@
# For these devices use the mount point, the device is useless
my %usemntpt = ( tmpfs => 1, none => 1, udev => 1, simfs => 1 );
-my $exclude = $ENV{'exclude'} || 'none unknown rootfs iso9660 squashfs udf romfs ramfs debugfs cgroup_root';
+my $exclude = $ENV{'exclude'} || 'none unknown rootfs iso9660 squashfs udf romfs ramfs debugfs cgroup_root devtmpfs';
my $dfopts = "-P -l ".join(' -x ',('',split('\s+',$exclude)));
my $mode = ($ARGV[0] or "print");
|
|
[-]
[+]
|
Changed |
munin-2.0.17.tar.bz2/plugins/node.d.linux/df_abs.in
^
|
| @@ -35,10 +35,8 @@
=head1 BUGS
-Does not handle cases where the block special device is the same for
-multiple mounts. On Ubuntu systems, this is commonly "none" for
-non-disk file systems like fusectl, debugfs, securityfs, devpts,
-tmpfs, etc...
+Does not handle cases where the block device is the same
+for multiple mounts.
=head1 MAGIC MARKERS
@@ -56,6 +54,20 @@
exit 0
fi
+# Append $mnt in case $dev is not a real block device
+get_fieldname() {
+ dev="$1"
+ mnt="$2"
+ case "$dev" in
+ "/*" )
+ clean_fieldname $dev
+ ;;
+ * )
+ clean_fieldname "$dev $mnt"
+ ;;
+ esac
+}
+
total=${total:-on}
exclude=${exclude:-iso9660}
@@ -72,7 +84,7 @@
fi
df -P -l $exclude | sed 1d | grep -v "//" |
while read dev size used avail cap mnt; do
- name="$(clean_fieldname $dev)"
+ name="$(get_fieldname $dev $mnt)"
echo "$name.label $mnt"
echo "$name.cdef $name,1024,*"
warn=$(get_warning $name)
@@ -89,5 +101,5 @@
df -P -l $exclude | sed 1d | grep -v "//" |
while read dev size used avail cap mnt; do
- echo "$(clean_fieldname $dev).value $used"
+ echo "$(get_fieldname $dev $mnt).value $used"
done
|
|
[-]
[+]
|
Changed |
munin-2.0.17.tar.bz2/plugins/node.d/haproxy_.in
^
|
| @@ -52,6 +52,8 @@
=cut
+use Munin::Plugin;
+
my $ret = undef;
if (! eval "require LWP::UserAgent;")
{
|
|
[-]
[+]
|
Changed |
munin-2.0.17.tar.bz2/plugins/node.d/nginx_request.in
^
|
| @@ -57,7 +57,7 @@
=cut
use Munin::Plugin;
-use Munin::Common::Defaults;
+
my $ret = undef;
|
|
[-]
[+]
|
Changed |
munin-2.0.17.tar.bz2/plugins/node.d/nginx_status.in
^
|
| @@ -56,7 +56,7 @@
=cut
use Munin::Plugin;
-use Munin::Common::Defaults;
+
my $ret = undef;
|
|
[-]
[+]
|
Changed |
munin-2.0.17.tar.bz2/plugins/node.d/tomcat_access.in
^
|
| @@ -53,6 +53,8 @@
=cut
use strict;
+use Munin::Plugin;
+
my $ret = undef;
|
|
[-]
[+]
|
Changed |
munin-2.0.17.tar.bz2/plugins/node.d/tomcat_jvm.in
^
|
| @@ -64,6 +64,8 @@
=cut
use strict;
+use Munin::Plugin;
+
my $ret = undef;
|
|
[-]
[+]
|
Changed |
munin-2.0.17.tar.bz2/plugins/node.d/tomcat_threads.in
^
|
| @@ -52,6 +52,8 @@
=cut
use strict;
+use Munin::Plugin;
+
my $ret = undef;
|
|
[-]
[+]
|
Changed |
munin-2.0.17.tar.bz2/plugins/node.d/tomcat_volume.in
^
|
| @@ -73,6 +73,8 @@
=cut
use strict;
+use Munin::Plugin;
+
my $ret = undef;
|
|
[-]
[+]
|
Changed |
munin-2.0.17.tar.bz2/plugins/plugins.history.in
^
|
| @@ -361,3 +361,4 @@
[2.0.14]
[2.0.15]
[2.0.16]
+[2.0.17]
|
