[prev in list] [next in list] [prev in thread] [next in thread]
List: fedora-extras-commits
Subject: kimheino pushed to munin (f29). "Merge remote-tracking branch 'origin/master' into epel7"
From: notifications () fedoraproject ! org
Date: 2018-08-24 19:47:09
Message-ID: 20180824194709.B796C62C324D () bastion01 ! phx2 ! fedoraproject ! org
[Download RAW message or body]
Notification time stamped 2018-08-24 19:44:18 UTC
From 42e04d441fb1f9d31ff7d98fd8c1caf42f5cc536 Mon Sep 17 00:00:00 2001
From: d. johnson <fenris02@fedoraproject.org>
Date: Mar 07 2015 05:36:34 +0000
Subject: Merge remote-tracking branch 'origin/master' into epel7
---
diff --git a/274.patch b/274.patch
new file mode 100644
index 0000000..6638a9e
--- /dev/null
+++ b/274.patch
@@ -0,0 +1,32 @@
+From 4a39b56c7aefdd9794add4468c7dbe87ff683ce8 Mon Sep 17 00:00:00 2001
+From: Daniel Black <daniel.black@openquery.com>
+Date: Sun, 26 Oct 2014 17:36:29 +1100
+Subject: [PATCH] Run munin-asyncd fetching on wall clock type
+
+Patch by Picnic Pete: https://github.com/picnicpete
+---
+ node/_bin/munin-asyncd.in | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/node/_bin/munin-asyncd.in b/node/_bin/munin-asyncd.in
+index 8efe50f..4811b2d 100644
+--- a/node/_bin/munin-asyncd.in
++++ b/node/_bin/munin-asyncd.in
+@@ -160,9 +160,14 @@ MAIN: while($keepgoing) {
+ next;
+ }
+
+- # Should update it
+- $last_updated{$plugin} = $when;
+- $when_next = min($when_next, $when + max($plugin_rate, $minrate));
++ # Should update it - based on wall clock time
++ my $should_have_been = $when - ($when % $plugin_rate);
++ my $should_be_next = $should_have_been + $plugin_rate;
++
++ $last_updated{$plugin} = $should_have_been;
++ if ($should_be_next < $when_next) {
++ $when_next = $should_be_next;
++ }
+
+ if ($do_fork && fork()) {
+ # parent, return directly
diff --git a/bz1049262-ntp_.patch b/bz1049262-ntp_.patch
new file mode 100644
index 0000000..d26322f
--- /dev/null
+++ b/bz1049262-ntp_.patch
@@ -0,0 +1,29 @@
+--- ./plugins/node.d/ntp_.in.orig 2014-03-26 18:45:21.374305323 -0500
++++ ./plugins/node.d/ntp_.in 2015-03-06 22:31:31.154285245 -0600
+@@ -77,7 +77,7 @@
+ if ($line =~ m/^\s*\d+/) {
+ my (undef, undef, $assid, undef, undef, undef, undef, \
undef, undef, undef) = split(/\s+/, $line); + chomp(my \
$peerinfo = `ntpq -n -c "readvar $assid srcadr"`); +- \
$peerinfo =~ s/\R/ /g; ++ $peerinfo =~ s/\n/ /g;
+ my ($peer_addr) = ($peerinfo =~ m/srcadr=(.*)/);
+ print $peer_addr, "\n" unless $peer_addr eq "0.0.0.0";
+ }
+@@ -114,7 +114,7 @@
+ if ($line =~ m/^\s*\d+/) {
+ my (undef, undef, $assid, undef, undef, undef, undef, undef, undef, \
undef) = split(/\s+/, $line); + chomp(my $peerinfo = `ntpq -n -c \
"readvar $assid srcadr,delay,offset,jitter"`); +- $peerinfo =~ s/\R/ \
/g; ++ $peerinfo =~ s/\n/ /g;
+ ($srcadr) = ($peerinfo =~ m/srcadr=([^, ]+)/);
+ ($delay) = ($peerinfo =~ m/delay=([^, ]+)/);
+ ($offset) = ($peerinfo =~ m/offset=([^, ]+)/);
+@@ -152,7 +152,7 @@
+ if ($line =~ m/^\s*\d+/) {
+ my (undef, undef, $assid, undef, undef, undef, undef, \
undef, undef, undef) = split(/\s+/, $line); + chomp(my \
$peerinfo = `ntpq -n -c "readvar $assid srcadr,delay,offset,jitter"`); +- \
$peerinfo =~ s/\R/ /g; ++ $peerinfo =~ s/\n/ /g;
+ ($srcadr) = ($peerinfo =~ m/srcadr=([^, ]+)/);
+ ($delay) = ($peerinfo =~ m/delay=([^, ]+)/);
+ ($offset) = ($peerinfo =~ m/offset=([^, ]+)/);
diff --git a/mariadb-innodb.patch b/mariadb-innodb.patch
new file mode 100644
index 0000000..d2a2f65
--- /dev/null
+++ b/mariadb-innodb.patch
@@ -0,0 +1,45 @@
+commit 997d82d30040dc9749db46823a933555e586e645
+Author: Daniel Black <daniel.black@openquery.com>
+Date: Thu Jan 30 11:34:54 2014 +1100
+
+ Break mysql innodb data on full sections
+
+ Patch from Jan Mara
+ https://github.com/jmara/ubuntu-munin-mysql/commit/77ae2b2d8bc1233e0f0b0e6346d66b955441ba14
+
+diff --git a/plugins/node.d/mysql_.in b/plugins/node.d/mysql_.in
+index 3376036..fb70e24 100644
+--- a/plugins/node.d/mysql_.in
++++ b/plugins/node.d/mysql_.in
+@@ -1070,7 +1070,7 @@ sub parse_innodb_status {
+
+ # Add a dummy section to the end in case the innodb status output
+ # has been truncated (Happens for status > 64K characters)
+- $_ .= "\n----------\nDUMMY\n";
++ $_ .= "\n----------\nDUMMY\n----------\n";
+
+ my %section_map = (
+
+@@ -1114,7 +1114,12 @@ sub parse_innodb_status {
+ my $innodb_bigint_rx = qr{([[a-fA-F\d]+)(?: (\d+))?};
+
+
+-sub match_dashes { return m/\G-+\n(?!-)/gc; }
++sub match_new_section {
++ return m/\G
++ -+\n # ---------------------------
++ (?= [A-Z\/ ]+\n # SECTION NAME
++ [=-]+\n)/gcx; # --------------------------- ('=' on end of \
output) ++}
+
+
+ sub skip_line { return m/\G.*\n/gc; }
+@@ -1133,7 +1138,7 @@ sub parse_section {
+
+ #warn substr($_, pos(), 10);
+ for (;;) {
+- return if match_dashes();
++ return if match_new_section;
+ next if $parser->();
+ skip_line();
+ }
diff --git a/mariadb-show-status.patch b/mariadb-show-status.patch
new file mode 100644
index 0000000..c5218bd
--- /dev/null
+++ b/mariadb-show-status.patch
@@ -0,0 +1,50 @@
+commit e5f12ef57c75d37aa2e3444cc448598f3c32b0ea
+Author: Daniel Black <daniel.black@openquery.com>
+Date: Tue Jun 17 11:45:13 2014 +1000
+
+ Mariadb-10 show innodb status compatiblity
+
+ show innodb status on mariadb-10 if in a transaction will show
+
+ --------------
+ ROW OPERATIONS
+ --------------
+ 0 queries inside InnoDB, 0 queries in queue
+ 1 read views open inside InnoDB
+ 1 RW transactions active inside InnoDB
+ 0 RO transactions active inside InnoDB
+ 1 out of 1000 descriptors used
+ ---OLDEST VIEW---
+ Normal read view
+ Read view low limit trx n:o 726056894
+ Read view up limit trx id 726056894
+ Read view low limit trx id 726056894
+ Read view individually stored trx ids:
+ -----------------
+ Main thread process no. 13048, id 140163878000384, state: sleeping
+ Number of rows inserted 0, updated 0, deleted 0, read 1666121005
+ 0.00 inserts/s, 0.00 updates/s, 0.00 deletes/s, 17566.53 reads/s
+ ------------
+
+ In this patch we just skip sections like "Main thread process.." that we
+ don't know about.
+
+diff --git a/plugins/node.d/mysql_.in b/plugins/node.d/mysql_.in
+index 9b6914b..1d83115 100644
+--- a/plugins/node.d/mysql_.in
++++ b/plugins/node.d/mysql_.in
+@@ -1102,8 +1102,12 @@ sub parse_innodb_status {
+ last;
+ }
+
+- die "Unknown section: $1" unless exists $section_map{$sec};
+- die "Parse error. Expected a section separator" unless m/\G-+\n/gc;
++ if (exists $section_map{$sec}) {
++ $section_map{$sec}->();
++ } else {
++ #warn "Unknown section: $1";
++ skip();
++ }
+
+ $section_map{$sec}->();
+ }
diff --git a/munin-1.4.5-df-config b/munin-1.4.5-df-config
index 8a2542e..b4f0ef5 100644
--- a/munin-1.4.5-df-config
+++ b/munin-1.4.5-df-config
@@ -1,2 +1,2 @@
[df*]
-env.exclude none unknown iso9660 squashfs udf romfs ramfs debugfs binfmt_misc \
rpc_pipefs fuse.gvfs-fuse-daemon +env.exclude none unknown binfmt_misc debugfs \
devtmpfs fuse.gvfs-fuse-daemon iso9660 ramfs romfs rpc_pipefs \
squashfs tmpfs udf
diff --git a/munin.spec b/munin.spec
index 7b1fa0b..a412dae 100644
--- a/munin.spec
+++ b/munin.spec
@@ -1,6 +1,6 @@
Name: munin
Version: 2.0.25
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Network-wide graphing framework (grapher/gatherer)
Group: System Environment/Daemons
@@ -43,6 +43,10 @@ Patch5: acpi-2.0.5.patch
Patch9: munin-2.0.8-cgitmp.patch
# BZ# 877116 Patch using '&' in the URLs instead of '&' in HTMLConfig
Patch10: munin-2.0.9_HTMLConfig.pm.patch
+Patch11: https://github.com/munin-monitoring/munin/pull/274.patch
+Patch12: bz1049262-ntp_.patch
+Patch13: mariadb-show-status.patch
+Patch14: mariadb-innodb.patch
BuildArch: noarch
@@ -332,6 +336,10 @@ rm -f plugins/node.d/memcached_.in
#% patch7 -p1
%patch9 -p1
%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
install -c %{SOURCE13} ./resources/
# Create Makefile.config-dist
@@ -824,6 +832,12 @@ exit 0
%changelog
+* Sat Mar 07 2015 "D. Johnson" <fenris02@fedoraproject.org> - 2.0.25-2
+- Merge 2.1 paches back to 2.0
+- BZ# 1149949 - munin-async init script to override defaults (PR-274 backport)
+- BZ# 1049262 - munin ntp_ plugin uses perl features from perl 5.10.0 but can only \
use perl 5.8.8 +- BZ# 1140015 - Munin mysql plugin fails to parse MariaDB status
+
* Tue Nov 25 2014 "D. Johnson" <fenris02@fedoraproject.org> - 2.0.25-1
- Upstream released 2.0.25
https://src.fedoraproject.org/rpms/munin/c/42e04d441fb1f9d31ff7d98fd8c1caf42f5cc536?branch=f29
_______________________________________________
scm-commits mailing list -- scm-commits@lists.fedoraproject.org
To unsubscribe send an email to scm-commits-leave@lists.fedoraproject.org
Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/scm-commits@lists.fedoraproject.org/message/2ZXKQYMCFLRVMCHWHKDXIDYSI6OKYN7F/
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic