Hello community, here is the log from the commit of package munin for openSUSE:Factory checked in at 2015-11-26 17:04:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/munin (Old) and /work/SRC/openSUSE:Factory/.munin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "munin" Changes: -------- --- /work/SRC/openSUSE:Factory/munin/munin.changes 2015-09-03 18:09:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.munin.new/munin.changes 2015-11-26 17:04:13.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Nov 24 12:11:20 UTC 2015 - [email protected] + +- apply upstream change to work correctly for MySQL >= 5.5 + (mysql55.patch + +------------------------------------------------------------------- New: ---- mysql55.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ munin.spec ++++++ --- /var/tmp/diff_new_pack.g9x8bI/_old 2015-11-26 17:04:14.000000000 +0100 +++ /var/tmp/diff_new_pack.g9x8bI/_new 2015-11-26 17:04:14.000000000 +0100 @@ -47,6 +47,7 @@ Source13: gsa-munin.zip # https://svn.koumbit.net/koumbit/trunk/munin-plugins/quota-usage Patch: munin-plugin-quota_usage_warnings.patch +Patch2: mysql55.patch BuildRequires: html2text BuildRequires: perl-HTML-Template BuildRequires: perl-Log-Log4perl @@ -151,6 +152,7 @@ unzip %{SOURCE12} unzip %{SOURCE13} %patch +%patch2 -p1 %build %__make ++++++ mysql55.patch ++++++ >From 9f53020cc7aa5338b9983cab3c1f233ffd349576 Mon Sep 17 00:00:00 2001 From: y-ken <[email protected]> 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; + }; } ); }
