From aea5c69d4768c90b816c4a16c969f5a04d369bb89560115c02f9325b37c1f2de Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Mon, 28 May 2018 09:21:48 +0000 Subject: [PATCH] Accepting request 612631 from home:wrosenauer:devel - update to 2.0.37 * Add support for IBM i * Update lighttpd.rst * Update nginx.rst * ejabberd improvements * add example plugin graphs * Add support for MySQL 5.5/5.6 * Added HP-UX support to processes plugin * snmp__if_multi: Set warning to 75% of interface speed instead of 133% * Add support for rndc options in bind9_rndc plugin * Correcting mysql_queries plugin random hash ordering * Add PostgreSQL 10 support to postgres_xlog * mysql improvements * Add IPv6 support * many other improvements - require also perl-rrdtool where it exists (boo#1094776) - remove obsolete mysql55.patch OBS-URL: https://build.opensuse.org/request/show/612631 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/munin?expand=0&rev=41 --- munin-2.0.32.tar.gz | 3 -- munin-2.0.37.tar.gz | 3 ++ munin.changes | 21 +++++++++ munin.spec | 25 ++++++---- mysql55.patch | 109 -------------------------------------------- 5 files changed, 41 insertions(+), 120 deletions(-) delete mode 100644 munin-2.0.32.tar.gz create mode 100644 munin-2.0.37.tar.gz delete mode 100644 mysql55.patch diff --git a/munin-2.0.32.tar.gz b/munin-2.0.32.tar.gz deleted file mode 100644 index 7fa8b74..0000000 --- a/munin-2.0.32.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:132ed808f637af661b5ec8d51415638a53d175a8e0ab10878b89a28f67d018a8 -size 1342572 diff --git a/munin-2.0.37.tar.gz b/munin-2.0.37.tar.gz new file mode 100644 index 0000000..925574b --- /dev/null +++ b/munin-2.0.37.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa93bd3415fc52e4c3b1c2fff58ec078e5d42fdc7202d38a8546bef97fcbd5b4 +size 2242442 diff --git a/munin.changes b/munin.changes index 6c75953..09c83ee 100644 --- a/munin.changes +++ b/munin.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Mon May 28 08:22:36 UTC 2018 - wr@rosenauer.org + +- update to 2.0.37 + * Add support for IBM i + * Update lighttpd.rst + * Update nginx.rst + * ejabberd improvements + * add example plugin graphs + * Add support for MySQL 5.5/5.6 + * Added HP-UX support to processes plugin + * snmp__if_multi: Set warning to 75% of interface speed instead of 133% + * Add support for rndc options in bind9_rndc plugin + * Correcting mysql_queries plugin random hash ordering + * Add PostgreSQL 10 support to postgres_xlog + * mysql improvements + * Add IPv6 support + * many other improvements +- require also perl-rrdtool where it exists (boo#1094776) +- remove obsolete mysql55.patch + ------------------------------------------------------------------- Fri Sep 29 04:56:09 UTC 2017 - coolo@suse.com diff --git a/munin.spec b/munin.spec index 2ab0170..e20cb4e 100644 --- a/munin.spec +++ b/munin.spec @@ -1,7 +1,7 @@ # # spec file for package munin # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,10 +24,10 @@ %define active_by_default 0 Name: munin -Version: 2.0.32 +Version: 2.0.37 Release: 0 Summary: Network-wide graphing framework (grapher/gatherer) -License: GPL-2.0 +License: GPL-2.0-only Group: System/Monitoring Url: http://munin-monitoring.org/ Source0: http://downloads.munin-monitoring.org/%{name}/stable/%{version}/%{name}-%{version}.tar.gz @@ -47,7 +47,6 @@ Source12: nginx-munin.zip Source13: gsa-munin.zip # https://svn.koumbit.net/koumbit/trunk/munin-plugins/quota-usage Patch: munin-plugin-quota_usage_warnings.patch -Patch2: mysql55.patch Patch3: perl526.patch BuildRequires: html2text BuildRequires: perl-HTML-Template @@ -81,6 +80,9 @@ Requires: pwdutils Requires: rrdtool Requires: spawn-fcgi Requires: perl(Munin::Common::Defaults) +%if 0%{?suse_version} > 1320 +Requires: perl-rrdtool +%endif Recommends: logrotate cron BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -116,6 +118,9 @@ Requires: perl-libwww-perl Requires: ps Requires: pwdutils Requires: sysstat +# manual requires from certain plugins using "env ..." +Requires: python +Requires: ruby %if 0%{?suse_version} >= 1220 %{?systemd_requires} %else @@ -157,7 +162,6 @@ cp %{SOURCE1} . unzip %{SOURCE12} unzip %{SOURCE13} %patch -%patch2 -p1 %patch3 -p1 %build @@ -184,6 +188,8 @@ unzip %{SOURCE13} %__ln_s %{_sysconfdir}/init.d/munin-node $RPM_BUILD_ROOT/sbin/rcmunin-node %else %__ln_s /sbin/service $RPM_BUILD_ROOT/sbin/rcmunin-node +%__ln_s /sbin/service $RPM_BUILD_ROOT/sbin/rcmunin-cgi-graph +%__ln_s /sbin/service $RPM_BUILD_ROOT/sbin/rcmunin-cgi-html %endif %if 0%{?suse_version} >= 1220 @@ -264,11 +270,11 @@ touch %{logdir}/munin-node.log chown munin:munin %{logdir}/* chown root:root %{logdir}/munin-node.log* chown -R nobody:nobody %{dbdir}/plugin-state/* >/dev/null 2>&1 -%if 0%{?active_by_default} > 0 %if 0%{?suse_version} >= 1220 -systemd-tmpfiles --create /usr/lib/tmpfiles.d/munin-node.conf +%tmpfiles_create /usr/lib/tmpfiles.d/munin-node.conf %service_add_post munin-node.service %else +%if 0%{?active_by_default} > 0 /etc/init.d/munin-node status >/dev/null 2>&1 || /etc/init.d/munin-node start %endif %endif @@ -290,7 +296,8 @@ systemd-tmpfiles --create /usr/lib/tmpfiles.d/munin-node.conf %files %defattr(-, root, root) -%doc ChangeLog COPYING README UPGRADING +%license COPYING +%doc ChangeLog README UPGRADING %{_bindir}/munin-check %{_bindir}/munin-cron %{_bindir}/munindoc @@ -309,6 +316,8 @@ systemd-tmpfiles --create /usr/lib/tmpfiles.d/munin-node.conf %{_prefix}/lib/tmpfiles.d/munin.conf %{_unitdir}/munin-cgi-graph.service %{_unitdir}/munin-cgi-html.service +/sbin/rcmunin-cgi-graph +/sbin/rcmunin-cgi-html %endif %attr(0755, munin, munin) %dir %{htmldir} %attr(0444, munin, munin) %{htmldir}/.htaccess diff --git a/mysql55.patch b/mysql55.patch deleted file mode 100644 index 937db5d..0000000 --- a/mysql55.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 9f53020cc7aa5338b9983cab3c1f233ffd349576 Mon Sep 17 00:00:00 2001 -From: y-ken -Date: Sat, 22 Jun 2013 01:47:20 +0900 -Subject: [PATCH 1/4] Add support for MySQL 5.5/5.6 - -The mysql plugin named "mysql_" have a problem. So It could not work -fine with MySQL 5.5 or 5.6. -I have make a patch for "INDIVIDUAL BUFFER POOL INFO" section as -skipped to work. - -## all of symlinked mysql_ pluugin gets error like below. -```sh -$ /etc/munin/plugins/mysql_connections -Unknown section: INDIVIDUAL BUFFER POOL INFO at -/etc/munin/plugins/mysql_connections line 1098. -``` - -## related issue -https://github.com/kjellm/munin-mysql/commit/111293966ccd6e8df6c1347cb0f -9a8b4025c0266 - -diff --git a/plugins/node.d/mysql_.in b/plugins/node.d/mysql_.in -index 76c214a..3914e92 100644 ---- a/plugins/node.d/mysql_.in -+++ b/plugins/node.d/mysql_.in -@@ -9,7 +9,7 @@ mysql_ - Munin plugin to display misc MySQL server status - - =head1 APPLICABLE SYSTEMS - --Any MySQL platform, tested by the author on MySQL 5.1.29 and 5.0.51 -+Any MySQL platform, tested by the author on MySQL 5.6.12 and 5.5.32, 5.1.29, 5.0.51 - - =head1 CONFIGURATION - -@@ -882,8 +882,11 @@ sub show { - if $graph_name =~ /innodb_/ && $data->{_innodb_disabled}; - - for my $ds (@{$graph->{data_sources}}) { -- printf "%s.value %s\n", -- clean_fieldname($ds->{name}), $data->{$ds->{name}}; -+ my $value = exists $ds->{value} -+ ? $ds->{value}($data) -+ : $data->{$ds->{name}}; -+ -+ printf "%s.value %s\n", clean_fieldname($ds->{name}), defined($value) ? $value : 'U'; - } - - return 0; -@@ -1071,17 +1074,18 @@ sub parse_innodb_status { - - my %section_map = ( - -- 'BUFFER POOL AND MEMORY' => \&parse_buffer_pool_and_memory, -- 'FILE I/O' => \&parse_file_io, -+ 'BUFFER POOL AND MEMORY' => \&parse_buffer_pool_and_memory, -+ 'INDIVIDUAL BUFFER POOL INFO' => \&skip, -+ 'FILE I/O' => \&parse_file_io, - 'INSERT BUFFER AND ADAPTIVE HASH INDEX' - => \&parse_insert_buffer_and_adaptive_hash_index, -- 'LATEST DETECTED DEADLOCK' => \&skip, -- 'LATEST FOREIGN KEY ERROR' => \&skip, -- 'LOG' => \&parse_log, -- 'ROW OPERATIONS' => \&skip, -- 'SEMAPHORES' => \&parse_semaphores, -- 'TRANSACTIONS' => \&parse_transactions, -- 'BACKGROUND THREAD' => \&skip, -+ 'LATEST DETECTED DEADLOCK' => \&skip, -+ 'LATEST FOREIGN KEY ERROR' => \&skip, -+ 'LOG' => \&parse_log, -+ 'ROW OPERATIONS' => \&skip, -+ 'SEMAPHORES' => \&parse_semaphores, -+ 'TRANSACTIONS' => \&parse_transactions, -+ 'BACKGROUND THREAD' => \&skip, - ); - - skip_heading(); -@@ -1213,12 +1217,26 @@ sub parse_file_io { - sub parse_insert_buffer_and_adaptive_hash_index { - parse_section( - sub { -- m/\G(\d+) inserts, (\d+) merged recs, (\d+) merges\n/gc && do { -- $data->{ib_ibuf_inserts} = $1; -- $data->{ib_ibuf_merged_rec} = $2; -- $data->{ib_ibuf_merges} = $3; -- return 1; -- }; -+ # MySQL < 5.5 -+ m/\G(\d+) inserts, (\d+) merged recs, (\d+) merges\n/gc && do { -+ $data->{ib_ibuf_inserts} = $1; -+ $data->{ib_ibuf_merged_rec} = $2; -+ $data->{ib_ibuf_merges} = $3; -+ return 1; -+ }; -+ # MySQL >= 5.5 -+ m/\Gmerged operations:\n insert (\d+), delete mark \d+, delete \d+\ndiscarded operations:\n insert (\d+), delete mark \d+, delete \d+\n/gc && do { -+ $data->{ib_ibuf_inserts} = $1; -+ $data->{ib_ibuf_merged_rec} = $1 + $2; -+ return 1; -+ }; -+ m/\GIbuf: size (\d+), free list len (\d+), seg size (\d+),(?: (\d+) merges)?\n/gc && do { -+ $data->{ib_ibuf_size} = $1; -+ $data->{ib_ibuf_free_len} = $2; -+ $data->{ib_ibuf_seg_size} = $3; -+ $data->{ib_ibuf_merges} = $4 if defined $4; # MySQL >= 5.5 -+ return 1; -+ }; - } - ); - }