rpm/munin
SHA256
1
0
Fork 0
forked from pool/munin
Code Pull Requests Activity

Accepting request 612631 from home:wrosenauer:devel

Browse Source 
- 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
This commit is contained in:
Wolfgang Rosenauer 2018-05-28 09:21:48 +00:00 committed by Git OBS Bridge
parent 724478ac8a
commit aea5c69d47
5 changed files with 41 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
munin-2.0.32.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:132ed808f637af661b5ec8d51415638a53d175a8e0ab10878b89a28f67d018a8
size 1342572

3
munin-2.0.37.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:aa93bd3415fc52e4c3b1c2fff58ec078e5d42fdc7202d38a8546bef97fcbd5b4
size 2242442

21
munin.changes
View File

@ -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 Fri Sep 29 04:56:09 UTC 2017 - coolo@suse.com

25
munin.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package munin # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -24,10 +24,10 @@
%define active_by_default 0 %define active_by_default 0
Name: munin Name: munin
Version: 2.0.32 Version: 2.0.37
Release: 0 Release: 0
Summary: Network-wide graphing framework (grapher/gatherer) Summary: Network-wide graphing framework (grapher/gatherer)
License: GPL-2.0 License: GPL-2.0-only
Group: System/Monitoring Group: System/Monitoring
Url: http://munin-monitoring.org/ Url: http://munin-monitoring.org/
Source0: http://downloads.munin-monitoring.org/%{name}/stable/%{version}/%{name}-%{version}.tar.gz 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 Source13: gsa-munin.zip
# https://svn.koumbit.net/koumbit/trunk/munin-plugins/quota-usage # https://svn.koumbit.net/koumbit/trunk/munin-plugins/quota-usage
Patch: munin-plugin-quota_usage_warnings.patch Patch: munin-plugin-quota_usage_warnings.patch
Patch2: mysql55.patch
Patch3: perl526.patch Patch3: perl526.patch
BuildRequires: html2text BuildRequires: html2text
BuildRequires: perl-HTML-Template BuildRequires: perl-HTML-Template
@ -81,6 +80,9 @@ Requires: pwdutils
Requires: rrdtool Requires: rrdtool
Requires: spawn-fcgi Requires: spawn-fcgi
Requires: perl(Munin::Common::Defaults) Requires: perl(Munin::Common::Defaults)
%if 0%{?suse_version} > 1320
Requires: perl-rrdtool
%endif
Recommends: logrotate cron Recommends: logrotate cron
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch BuildArch: noarch
@ -116,6 +118,9 @@ Requires: perl-libwww-perl
Requires: ps Requires: ps
Requires: pwdutils Requires: pwdutils
Requires: sysstat Requires: sysstat
# manual requires from certain plugins using "env ..."
Requires: python
Requires: ruby
%if 0%{?suse_version} >= 1220 %if 0%{?suse_version} >= 1220
%{?systemd_requires} %{?systemd_requires}
%else %else
@ -157,7 +162,6 @@ cp %{SOURCE1} .
unzip %{SOURCE12} unzip %{SOURCE12}
unzip %{SOURCE13} unzip %{SOURCE13}
%patch %patch
%patch2 -p1
%patch3 -p1 %patch3 -p1
%build %build
@ -184,6 +188,8 @@ unzip %{SOURCE13}
%__ln_s %{_sysconfdir}/init.d/munin-node $RPM_BUILD_ROOT/sbin/rcmunin-node %__ln_s %{_sysconfdir}/init.d/munin-node $RPM_BUILD_ROOT/sbin/rcmunin-node
%else %else
%__ln_s /sbin/service $RPM_BUILD_ROOT/sbin/rcmunin-node %__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 %endif
%if 0%{?suse_version} >= 1220 %if 0%{?suse_version} >= 1220
@ -264,11 +270,11 @@ touch %{logdir}/munin-node.log
chown munin:munin %{logdir}/* chown munin:munin %{logdir}/*
chown root:root %{logdir}/munin-node.log* chown root:root %{logdir}/munin-node.log*
chown -R nobody:nobody %{dbdir}/plugin-state/* >/dev/null 2>&1 chown -R nobody:nobody %{dbdir}/plugin-state/* >/dev/null 2>&1
%if 0%{?active_by_default} > 0
%if 0%{?suse_version} >= 1220 %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 %service_add_post munin-node.service
%else %else
%if 0%{?active_by_default} > 0
/etc/init.d/munin-node status >/dev/null 2>&1 || /etc/init.d/munin-node start /etc/init.d/munin-node status >/dev/null 2>&1 || /etc/init.d/munin-node start
%endif %endif
%endif %endif
@ -290,7 +296,8 @@ systemd-tmpfiles --create /usr/lib/tmpfiles.d/munin-node.conf
%files %files
%defattr(-, root, root) %defattr(-, root, root)
%doc ChangeLog COPYING README UPGRADING %license COPYING
%doc ChangeLog README UPGRADING
%{_bindir}/munin-check %{_bindir}/munin-check
%{_bindir}/munin-cron %{_bindir}/munin-cron
%{_bindir}/munindoc %{_bindir}/munindoc
@ -309,6 +316,8 @@ systemd-tmpfiles --create /usr/lib/tmpfiles.d/munin-node.conf
%{_prefix}/lib/tmpfiles.d/munin.conf %{_prefix}/lib/tmpfiles.d/munin.conf
%{_unitdir}/munin-cgi-graph.service %{_unitdir}/munin-cgi-graph.service
%{_unitdir}/munin-cgi-html.service %{_unitdir}/munin-cgi-html.service
/sbin/rcmunin-cgi-graph
/sbin/rcmunin-cgi-html
%endif %endif
%attr(0755, munin, munin) %dir %{htmldir} %attr(0755, munin, munin) %dir %{htmldir}
%attr(0444, munin, munin) %{htmldir}/.htaccess %attr(0444, munin, munin) %{htmldir}/.htaccess

109
mysql55.patch
View File

@ -1,109 +0,0 @@
From 9f53020cc7aa5338b9983cab3c1f233ffd349576 Mon Sep 17 00:00:00 2001
From: y-ken <y.ken.studio@gmail.com>
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;
+ };
}
);
}