|
[-]
[+]
|
Changed |
munin.changes
|
|
|
|
[-]
[+]
|
Changed |
munin.spec
^
|
|
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/.gitignore
^
|
| @@ -4,3 +4,4 @@
build-*-stamp
build/
.*.swp
+/sandbox/
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/COPYING
^
|
| @@ -11,9 +11,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Includes the font Bitstream Vera Mono, which is under the following license:
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/ChangeLog
^
|
| @@ -1,5 +1,54 @@
-*- text -*-
+munin-2.0.8, 2012-11-08
+
+-------
+Summary
+-------
+
+Small bugfix-only release.
+
+- Many minor fixes
+
+------------------
+Detailed Changelog
+------------------
+
+Andrea Piccinelli:
+ http_loadtime: fixed stderr redirection with 'time'
+
+Anton Tolchanov:
+ Fixed parsing of first element in custom graph_data_size
+
+Diego Elio Petteno:
+ master: on limit checks, if one of the two values is 'U', make the final value 'U' as well.
+ master: on limits, be more careful on checking what always_send is set to.
+ master: munin-limits: remove --force parameter
+ master: munin-limits: open the data file based on hostname, not alias.
+ plugins: Remove all '%' characters from plugins' graph_titles.
+ master: factor out the SSH command, and set parameters to disable interactions
+ master: if there is no path present, don't send a remote command.
+ master: ignore all the lines before the greeting.
+
+Juho Juopperi:
+ Fix multiping to show packetloss correctly
+
+Kjetil Torgrim Homme:
+ fix problem with SIGHUP causing exec of unqualified script name
+
+Marc Schutz:
+ Update licenses to current address of FSF.
+
+Steve Schnepp:
+ master: fixed graph_data_size custom parsing
+ getversion: update to use the debian-auto one.
+ master: add an ip6 example in the sample munin.conf
+ gitignore: ignoring output dir sandbox/
+
+Stig Sandbeck Mathisen:
+ Update apache httpd configuration example for 2.0.7
+
+
munin-2.0.7, 2012-10-03
-------
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/RELEASE
^
|
| @@ -1 +1 @@
-2.0.7
+2.0.8
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/doc/example/webserver/apache-virtualhost.rst
^
|
| @@ -19,7 +19,7 @@
::
- # graph_strategy should be commented out, if present
+ graph_strategy cgi
html_strategy cgi
Virtualhost configuration
@@ -56,7 +56,7 @@
RewriteRule ^/(.*) /usr/lib/munin/cgi/munin-cgi-html/$1 [L]
# Images
- RewriteRule ^/munin-cgi/munin-cgi-graph/(.*) /usr/lib/munin/cgi/munin-cgi-graph/$1 [L]
+ RewriteRule ^/(.*) /usr/lib/munin/cgi/munin-cgi-graph/$1 [L]
# Ensure we can run (fast)cgi scripts
<Directory "/usr/lib/munin/cgi">
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/getversion
^
|
| @@ -26,15 +26,22 @@
git describe
;;
*)
- git log -n 1 --pretty="${branch}-%ad-%tc" --date=short
+ GIT_REVISION="$(git describe --long | sed 's/-g.*//')"
+ git log -n 1 --pretty="${GIT_REVISION}-${branch}-%ad-%tc" --date=short
;;
esac
}
+generate_version_string_from_dir() {
+ basename $(pwd) | grep -e '^munin-' | cut -c7-
+}
+
if [ -s "RELEASE" ]; then
cat RELEASE
elif [ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ]; then
generate_version_string
+elif [ ! -z "$(generate_version_string_from_dir)" ]; then
+ generate_version_string_from_dir
else
echo "unknown"
fi
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/master/lib/Munin/Master/LimitsOld.pm
^
|
| @@ -61,7 +61,6 @@
my $stdout = 0;
my $force_run_as_root = 0;
my %notes = ();
-my $force = 0;
my $config;
my $oldnotes;
my $modified = 0;
@@ -87,7 +86,6 @@
"config=s" => \$conffile,
"debug!" => \$DEBUG,
"stdout!" => \$stdout,
- "force!" => \$force,
"force-run-as-root!" => \$force_run_as_root,
"version!" => \$do_version,
"help" => \$do_usage
@@ -279,7 +277,8 @@
sub process_service {
my $hash = shift || return;
my $hobj = get_host_node($hash);
- my $host = get_notify_name($hobj);
+ my $host = munin_get_node_name($hobj);
+ my $hostalias = get_notify_name($hobj);
my $service = munin_get_node_name($hash);
my $hparentobj = munin_get_parent($hobj);
my $parent = munin_get_node_name($hobj);
@@ -298,12 +297,12 @@
$hash->{'fields'} = join(' ', map {munin_get_node_name($_)} @$children);
$hash->{'plugin'} = $service;
$hash->{'graph_title'} = get_full_service_name($hash);
- $hash->{'host'} = $host;
+ $hash->{'host'} = $hostalias;
$hash->{'group'} = get_full_group_path($hparentobj);
$hash->{'worst'} = "ok";
$hash->{'worstid'} = 0 unless defined $hash->{'worstid'};
- my $state_file = sprintf ('%s/state-%s-%s.storable', $config->{dbdir}, $hash->{group}, $hash->{host});
+ my $state_file = sprintf ('%s/state-%s-%s.storable', $config->{dbdir}, $hash->{group}, $host);
DEBUG "[DEBUG] state_file: $state_file";
my $state = munin_read_storable($state_file) || {};
@@ -345,6 +344,9 @@
} elsif ($field->{type} eq "COUNTER" && $current_updated_value < $previous_updated_value) {
# COUNTER never decrease. Report unknown.
$value = "U";
+ } elsif ($current_updated_value eq "U" || $previous_updated_value eq "U" ) {
+ # One of the values is unknown. Report unknown.
+ $value = "U";
} else {
$value = ($current_updated_value - $previous_updated_value) / ($current_updated_timestamp - $previous_updated_timestamp);
}
@@ -497,11 +499,11 @@
}
}
- elsif (defined $onfield and defined $onfield->{"state"} or $force) {
+ elsif (defined $onfield and defined $onfield->{"state"}) {
munin_set_var_loc(\%notes, [@$fpath, "state"], "ok");
munin_set_var_loc(\%notes, [@$fpath, "ok"], "OK");
- if ($onfield->{'state'} ne 'ok' or $force) {
+ if ($onfield->{'state'} ne 'ok') {
$hash->{'state_changed'} = 1;
}
}
@@ -629,10 +631,12 @@
next;
}
my $obsess = 0;
- my $cas = munin_get($contactobj, "always_send");
- if (defined $cas) {
- $obsess = grep {scalar(@{$stats{$_}})} (split(/\s+/, lc $cas));
- }
+ my $always_send = munin_get($contactobj, "always_send");
+ foreach my $cas (split(/\s+/, lc $always_send)) {
+ if(defined($stats{$cas})) {
+ $obsess += scalar @{$stats{$cas}};
+ }
+ }
if (!$hash->{'state_changed'} and !$obsess) {
next; # No need to send notification
}
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/master/lib/Munin/Master/Node.pm
^
|
| @@ -93,11 +93,12 @@
return 0;
}
} elsif ($uri->scheme eq "ssh") {
+ my $ssh_command = "ssh -o ChallengeResponseAuthentication=no -o StrictHostKeyChecking=no ";
my $user_part = ($uri->user) ? ($uri->user . "@") : "";
- my $remote_cmd = $uri->path;
+ my $remote_cmd = ($uri->path ne '/') ? $uri->path : "";
# Add any parameter to the cmd
- my $remote_connection_cmd = "/usr/bin/ssh -p" . $uri->port . " $user_part" . $uri->host . " $remote_cmd $params";
+ my $remote_connection_cmd = $ssh_command . " -p " . $uri->port . " " . $user_part . $uri->host . " " . $remote_cmd . " " . $params;
# Open a triple pipe
use IPC::Open3;
@@ -129,24 +130,24 @@
return 0;
}
- my $greeting = $self->_node_read_single();
- $self->{node_name} = $self->_extract_name_from_greeting($greeting);
- return 1;
-}
+ # check all the lines until we find one that matches the expected
+ # greeting; ignore anything that doesn't look like it as long as
+ # there is output. This allows to accept SSH connections where
+ # lastlog or motd is used.
+ until(defined($self->{node_name})) {
+ my $greeting = $self->_node_read_single();
+ if (!$greeting) {
+ die "[ERROR] Got unknown reply from node ".$self->{host}."\n";
+ }
+ if ($greeting =~ /\#.*(?:lrrd|munin) (?:client|node) at (\S+)/i) {
+ $self->{node_name} = $1;
+ }
+ };
-sub _extract_name_from_greeting {
- my ($self, $greeting) = @_;
- if (!$greeting) {
- die "[ERROR] Got no reply from node ".$self->{host}."\n";
- }
- if ($greeting !~ /\#.*(?:lrrd|munin) (?:client|node) at (\S+)/i) {
- die "[ERROR] Got unknown reply from node ".$self->{host}."\n";
- }
- return $1;
+ return 1;
}
-
sub _run_starttls_if_required {
my ($self) = @_;
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/master/lib/Munin/Master/UpdateWorker.pm
^
|
| @@ -773,9 +773,15 @@
my @computer_format;
- # First element is always the full resoltion, converting to computer format
- my $full_res = shift @elems;
- unshift @elems, "$update_rate for $full_res";
+ # First element is always the full resolution
+ my $full_res = shift @elems;
+ if ($full_res =~ m/^\d+$/) {
+ # Only numeric, computer format
+ unshift @elems, "1 $full_res";
+ } else {
+ # Human readable. Adding $update_rate in front of
+ unshift @elems, "$update_rate for $full_res";
+ }
foreach my $elem (@elems) {
if ($elem =~ m/(\d+) (\d+)/) {
@@ -974,8 +980,8 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/master/munin.conf.in
^
|
| @@ -110,6 +110,10 @@
# [fay.foo.com]
# address fay
#
+## IPv6 host. note that the ip adress has to be in brackets
+# [ip6.foo.com]
+# address [2001::1234:1]
+#
## Then we want totals...
# [foo.com;Totals] #Force it into the "foo.com"-domain...
# update no # Turn off data-fetching for this "host".
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/node/lib/Munin/Node/Server.pm
^
|
| @@ -209,6 +209,23 @@
return 1;
}
+# We override this function from Net::Server. It prefers to read
+# /proc/PID/cmdline, which causes $0 to become /usr/bin/perl (after a re-exec
+# to the argv returned by this function), while we want to keep the value
+# which is the path to the script itself.
+sub _get_commandline {
+ my $self = shift;
+
+ my $script = $0;
+ # make relative path absolute
+ $script = $ENV{'PWD'} .'/'. $script if $script =~ m|^[^/]+/| && $ENV{'PWD'};
+ # untaint for later use in hup
+ # TBD: should we prevent script names containing TAB, LF and other unusual
+ # characters?
+ $script =~ /^(.+)$/;
+ return [ $1, @ARGV ]
+}
+
sub _expect_starttls {
my ($session) = @_;
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/node/sbin/munin-node
^
|
| @@ -54,9 +54,6 @@
$ENV{$key} = $1;
}
- $0 =~ /([^\/]*)$/;
- $0 = $1;
-
parse_args();
my $config = Munin::Node::Config->instance();
@@ -88,6 +85,11 @@
conf_file => $conffile,
);
+ # Untaint $0 after Munin::Node::Server has had a chance of getting
+ # the original value
+ $0 =~ /([^\/]*)$/;
+ $0 = $1;
+
return 0;
}
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d.aix/df.in
^
|
| @@ -57,7 +57,7 @@
if [ "$1" = "config" ]; then
- echo 'graph_title Filesystem usage (in %)'
+ echo 'graph_title Disk usage in percent'
echo 'graph_args --upper-limit 100 -l 0'
echo 'graph_vlabel %'
echo 'graph_category disk'
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d.cygwin/df.in
^
|
| @@ -66,7 +66,7 @@
fi
if [ "$1" = "config" ]; then
- echo 'graph_title Filesystem usage (in %)'
+ echo 'graph_title Disk usage in percent'
echo 'graph_args --upper-limit 100 -l 0'
echo 'graph_vlabel %'
echo 'graph_scale no'
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d.darwin/df_inode.in
^
|
| @@ -38,7 +38,7 @@
if [ "$1" = "config" ]; then
- echo 'graph_title Inode usage (in %)'
+ echo 'graph_title Inode usage in percent'
echo 'graph_args --upper-limit 100 -l 0'
echo 'graph_vlabel %'
echo 'graph_category disk'
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d.debug/env.in
^
|
| @@ -24,10 +24,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-USA.
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
=head1 MAGIC MARKERS
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d.debug/id.in
^
|
| @@ -26,10 +26,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-USA.
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
=head1 MAGIC MARKERS
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d.freebsd/df.in
^
|
| @@ -31,7 +31,7 @@
fi
if [ "$1" = "config" ]; then
- echo 'graph_title Filesystem usage (in %)'
+ echo 'graph_title Disk usage in percent'
echo 'graph_args --upper-limit 100 -l 0'
echo 'graph_vlabel %'
echo 'graph_category disk'
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d.freebsd/df_inode.in
^
|
| @@ -38,7 +38,7 @@
if [ "$1" = "config" ]; then
- echo 'graph_title Inode usage (in %)'
+ echo 'graph_title Inode usage in percent'
echo 'graph_args --upper-limit 100 -l 0'
echo 'graph_vlabel %'
echo 'graph_category disk'
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d.hp-ux/df.in
^
|
| @@ -85,7 +85,7 @@
my $maxlabel = 20;
if(defined($ARGV[0]) and $ARGV[0] eq "config") {
- print "graph_title Filesystem usage (in %)\n";
+ print "graph_title Disk usage in percent\n";
print "graph_args --upper-limit 100 -l 0\n";
print "graph_vlabel %\n";
print "graph_category disk\n";
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d.hp-ux/df_inode.in
^
|
| @@ -84,7 +84,7 @@
my $maxlabel = 20;
if(defined($ARGV[0]) and $ARGV[0] eq "config") {
- print "graph_title Inode usage (in %)\n";
+ print "graph_title Inode usage in percent\n";
print "graph_args --upper-limit 100 -l 0\n";
print "graph_vlabel %\n";
print "graph_category disk\n";
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d.linux/bonding_err_.in
^
|
| @@ -31,10 +31,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-USA.
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
=end comment
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d.linux/tcp.in
^
|
| @@ -25,10 +25,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-USA.
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
=end comment
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d.linux/vserver_cpu_.in
^
|
| @@ -53,10 +53,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-USA.
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
=end comment
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d.linux/vserver_loadavg.in
^
|
| @@ -45,9 +45,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
=end comment
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d.linux/vserver_resources.in
^
|
| @@ -126,10 +126,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-USA.
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
=end comment
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d.netbsd/df.in
^
|
| @@ -31,7 +31,7 @@
if [ "$1" = "config" ]; then
- echo 'graph_title Filesystem usage (in %)'
+ echo 'graph_title Disk usage in percent'
echo 'graph_args --upper-limit 100 -l 0'
echo 'graph_vlabel %'
echo 'graph_category disk'
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d.netbsd/df_inode.in
^
|
| @@ -44,7 +44,7 @@
if [ "$1" = "config" ]; then
- echo 'graph_title Inode usage (in %)'
+ echo 'graph_title Inode usage in percent'
echo 'graph_args --upper-limit 100 -l 0'
echo 'graph_vlabel %'
echo 'graph_category disk'
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d.sunos/df.in
^
|
| @@ -57,7 +57,7 @@
if [ "$1" = "config" ]; then
- echo 'graph_title Filesystem usage (in %)'
+ echo 'graph_title Disk usage in percent'
echo 'graph_args --upper-limit 100'
echo 'graph_category disk'
echo 'graph_scale no'
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d.sunos/df_inode.in
^
|
| @@ -69,7 +69,7 @@
if [ "$1" = "config" ]; then
- echo 'graph_title Inode usage (in %)'
+ echo 'graph_title Inode usage in percent'
echo 'graph_args --upper-limit 100'
echo 'graph_category disk'
echo 'graph_scale no'
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d/asterisk_channels.in
^
|
| @@ -43,10 +43,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-USA.
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
If you improve this script please send your version to my email
address with the copyright notice upgrade with your name.
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d/asterisk_channelstypes.in
^
|
| @@ -51,9 +51,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
If you improve this script please send your version to my email address
with the copyright notice upgrade with your name.
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d/asterisk_codecs.in
^
|
| @@ -56,10 +56,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-USA.
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
If you improve this script please send your version to my email
address with the copyright notice upgrade with your name.
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d/asterisk_meetme.in
^
|
| @@ -43,10 +43,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-USA.
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
If you improve this script please send your version to my email
address with the copyright notice upgrade with your name.
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d/asterisk_meetmeusers.in
^
|
| @@ -44,10 +44,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-USA.
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
If you improve this script please send your version to my email
address with the copyright notice upgrade with your name.
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d/asterisk_sipchannels.in
^
|
| @@ -52,10 +52,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-USA.
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
If you improve this script please send your version to my email
address with the copyright notice upgrade with your name.
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d/asterisk_sippeers.in
^
|
| @@ -43,10 +43,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-USA.
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
If you improve this script please send your version to my email
address with the copyright notice upgrade with your name.
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d/asterisk_voicemail.in
^
|
| @@ -49,9 +49,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
If you improve this script please send your version to my email address
with the copyright notice upgrade with your name.
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d/df.in
^
|
| @@ -41,7 +41,7 @@
fi
if [ "$1" = "config" ]; then
- echo 'graph_title Filesystem usage (in %)'
+ echo 'graph_title Disk usage in percent'
echo 'graph_args --upper-limit 100 -l 0'
echo 'graph_vlabel %'
echo 'graph_category disk'
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d/df_inode.in
^
|
| @@ -46,7 +46,7 @@
fi
if [ "$1" = "config" ]; then
- echo 'graph_title Inode usage (in %)'
+ echo 'graph_title Inode usage in percent'
echo 'graph_args --upper-limit 100 -l 0'
echo 'graph_vlabel %'
echo 'graph_scale no'
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d/digitemp_.in
^
|
| @@ -34,10 +34,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-USA.
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
=head1 MAGIC MARKERS
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d/http_loadtime.in
^
|
| @@ -67,7 +67,7 @@
trap "rm -rf $TMPDIR" EXIT
cd $TMPDIR || exit 1
-loadtime=$(time -p wget -p --no-cache --delete-after $target -q 2>&1 | awk '/^real / { print $2 }')
+loadtime=$((time -p wget -p --no-cache --delete-after $target -q) 2>&1 | awk '/^real / { print $2 }')
cd ..
echo "loadtime.value $loadtime"
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d/ipmi_sensor_.in
^
|
| @@ -41,10 +41,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-USA.
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
=end comment
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d/loggrep.in
^
|
| @@ -39,10 +39,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-USA.
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
=head1 MAGIC MARKERS
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d/multiping.in
^
|
| @@ -82,5 +82,5 @@
${ping:-ping} ${ping_args:-'-c 2'} ${hosts} ${ping_args2} \
| perl -n -e 'print "site$ENV{'site'}.value ", $1 / 1000, "\n"
if m@min/avg/max.*\s\d+(?:\.\d+)?/(\d+(?:\.\d+)?)/\d+(?:\.\d+)?@;
- print "packetloss.value $1\n" if /(\d+)% packet loss/;'
+ print "site$ENV{'site'}_packetloss.value $1\n" if /(\d+)% packet loss/;'
done
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d/mysql_.in
^
|
| @@ -109,10 +109,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-USA.
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
=head1 VERSION
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d/openvpn.in
^
|
| @@ -50,9 +50,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
If you improve this script please send your version to my email address
with the copyright notice upgrade with your name.
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d/snmp__cpuload.in
^
|
| @@ -89,7 +89,7 @@
print "host_name $host\n" unless ($host eq 'localhost');
print <<'EOC';
-graph_title CPU usage (in %)
+graph_title CPU usage in percent
graph_category system
graph_args --upper-limit 100 -l 0
graph_vlabel %
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d/snmp__df.in
^
|
| @@ -188,7 +188,7 @@
if (defined $ARGV[0] and $ARGV[0] eq "config")
{
print "host_name $host\n" unless $host eq 'localhost';
- print "graph_title Filesystem usage (in %)\n";
+ print "graph_title Disk usage in percent\n";
print "graph_args --upper-limit 100 -l 0\n";
print "graph_vlabel %\n";
print "graph_category disk\n";
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d/snmp__df_ram.in
^
|
| @@ -171,7 +171,7 @@
if (defined $ARGV[0] and $ARGV[0] eq "config")
{
print "host_name $host\n" unless $host eq 'localhost';
- print "graph_title Memory usage (in %)\n";
+ print "graph_title Memory usage in percent\n";
print "graph_args --upper-limit 100 -l 0\n";
print "graph_vlabel %\n";
print "graph_category system\n";
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d/snort_alerts.in
^
|
| @@ -43,9 +43,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
=end comment
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d/snort_bytes_pkt.in
^
|
| @@ -43,9 +43,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
=end comment
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d/snort_drop_rate.in
^
|
| @@ -43,9 +43,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
=end comment
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d/snort_pattern_match.in
^
|
| @@ -44,9 +44,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
=end comment
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d/snort_pkts.in
^
|
| @@ -44,9 +44,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
=end comment
|
|
[-]
[+]
|
Changed |
munin-2.0.8.tar.bz2/plugins/node.d/snort_traffic.in
^
|
| @@ -43,9 +43,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
=end comment
|
