[prev in list] [next in list] [prev in thread] [next in thread]
List: fedora-extras-commits
Subject: kimheino pushed to munin (f28). "Merge remote-tracking branch 'origin/master' into el6"
From: notifications () fedoraproject ! org
Date: 2018-08-24 19:48:50
Message-ID: 20180824194850.DBACD62B92E3 () bastion01 ! phx2 ! fedoraproject ! org
[Download RAW message or body]
Notification time stamped 2018-08-24 19:44:35 UTC
From 4c2c00b5bfe28381ee8164bf607e379d69ff4623 Mon Sep 17 00:00:00 2001
From: d. johnson <fenris02@fedoraproject.org>
Date: Nov 01 2016 03:34:39 +0000
Subject: Merge remote-tracking branch 'origin/master' into el6
---
diff --git a/.gitignore b/.gitignore
index 09711b1..4458dce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@
/munin-2.0.24.tar.gz
/munin-2.0.25.tar.gz
/munin-2.0.26.tar.gz
+/munin-2.0.27.tar.gz
diff --git a/737.patch b/737.patch
deleted file mode 100644
index 00444ec..0000000
--- a/737.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From bbd1e158b94bff8b8541db58d6d8cf04fc63829a Mon Sep 17 00:00:00 2001
-From: dipohl <contact@dipohl.de>
-Date: Tue, 27 Sep 2016 15:09:21 +0200
-Subject: [PATCH] Return smartctl exit code and warning message Fixes github
- issue: hddtemp_smartctl fails on a drive in standby #690 checkin further
- improvements that are already in branch devel
-
----
- plugins/node.d/hddtemp_smartctl.in | 41 +++++++++++++++++++++++++++++++-------
- 1 file changed, 34 insertions(+), 7 deletions(-)
-
-diff --git a/plugins/node.d/hddtemp_smartctl.in b/plugins/node.d/hddtemp_smartctl.in
-index 1bdac98..a912aac 100644
---- a/plugins/node.d/hddtemp_smartctl.in
-+++ b/plugins/node.d/hddtemp_smartctl.in
-@@ -24,7 +24,7 @@ The following environment variables are used
- used.
- dev_$dev - monitoring device for one drive, e.g. twe0
-
--If the "smartctl" enviroment variable is not set the plugin will
-+If the "smartctl" environment variable is not set the plugin will
- search your $PATH, /usr/bin, /usr/sbin, /usr/local/bin and
- /usr/local/sbin for a file called "smartctl", and use that.
-
-@@ -41,6 +41,9 @@ attempt to search for drives to probe.
- Copyright (c) 2005, Lutz Peter Christoph
- All rights reserved.
-
-+2016-08-27, Gabriele Pohl (contact@dipohl.de)
-+Fix for github issue #690
-+
- =head1 LICENSE
-
- Redistribution and use in source and binary forms, with or without
-@@ -162,7 +165,7 @@ if ($^O eq 'linux') {
-
- } elsif ($^O eq 'freebsd') {
- opendir(DEV, '/dev');
-- @drives = grep /^ad[0-9]+$/, readdir DEV;
-+ @drives = grep /^(ada?|da)[0-9]+$/, readdir DEV;
- closedir(DEV);
- } elsif ($^O eq 'solaris') {
- @drives = map { s@.*/@@ ; $_ } glob '/dev/rdsk/c*t*d*s2';
-@@ -224,11 +227,32 @@ foreach my $drive (@drives) {
- warn "[DEBUG] Command for $drive is % $cmd %\n" if $DEBUG;
-
- my $output = `$cmd`;
-- if ($? ne 0) {
-- print "$drive.value U\n";
-- print "$drive.extinfo Command $cmd on drive $drive failed: $?. The plugin \
needs to have read permission on all monitored devices.\n";
-- warn "[ERROR] Command $cmd on drive $drive failed: $?. The plugin needs to \
have read permission on all monitored devices.\n";
-- next;
-+ my $cmd_exit = $?;
-+
-+ # Strip header
-+ $output =~ s/.*?\n\n//s;
-+ # Strip trailer
-+ $output =~ s/Please specify device type with the -d option.\n//s;
-+ $output =~ s/Use smartctl -h to get a usage summary//s;
-+ $output =~ s/\n+$//s;
-+
-+ if ($cmd_exit != 0) {
-+ print "$drive.value U\n";
-+ if ($cmd_exit == -1) {
-+ warn "[ERROR] Command $cmd on drive $drive failed to execute: $!";
-+ } else {
-+ my $smartctl_exit = $cmd_exit >> 8;
-+ print "$drive.extinfo Command '$cmd' on drive $drive failed with \
exit($smartctl_exit)\n";
-+
-+ # exit (2) is a normal state with directive "--nocheck=standby" when device \
is in STANDBY or SLEEP mode
-+ if ($smartctl_exit == 2 and $use_nocheck) {
-+ if ($output =~ /(?:standby|sleep)/i) {
-+ next;
-+ }
-+ }
-+ warn "[ERROR] Command $cmd on drive $drive failed with exit($smartctl_exit): \
$output";
-+ }
-+ next;
- }
- if ($output =~ /Current Drive Temperature:\s*(\d+)/) {
- print "$drive.value $1\n";
-@@ -238,6 +262,9 @@ foreach my $drive (@drives) {
- } elsif ($output =~ /^(231 Temperature_Celsius.*)/m) {
- my @F = split ' ', $1;
- print "$drive.value $F[9]\n";
-+ } elsif ($output =~ /^(190 Airflow_Temperature_Cel.*)/m) {
-+ my @F = split ' ', $1;
-+ print "$drive.value $F[9]\n";
- } else {
- print "$drive.value U\n";
- print "$drive.extinfo Temperature not detected in smartctl output\n";
diff --git a/acpi-2.0.5.patch b/acpi-2.0.5.patch
deleted file mode 100644
index a33c4b6..0000000
--- a/acpi-2.0.5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./plugins/node.d.linux/acpi.in.orig 2012-08-14 10:19:40.000000000 -0500
-+++ ./plugins/node.d.linux/acpi.in 2012-08-14 11:21:35.558280164 -0500
-@@ -47,7 +47,7 @@
- =cut
-
-
--ATZ="$(echo /proc/acpi/thermal_zone/*/temperature)"
-+ATZ="[ -e /proc/acpi/thermal_zone/*/temperature ] && echo \
/proc/acpi/thermal_zone/*/temperature || echo \
/sys/class/thermal/thermal_zone*/trip*temp | cut -c1-2"
-
- do_ () { # Fetch
- echo "$ATZ" | tr ' ' '\n' | awk -F'[ /\t]*' '{
diff --git a/munin-2.0.26.tar.gz.sha256sum b/munin-2.0.26.tar.gz.sha256sum
deleted file mode 100644
index 9849e09..0000000
--- a/munin-2.0.26.tar.gz.sha256sum
+++ /dev/null
@@ -1 +0,0 @@
-fb5fff319820e63b1107528e8302f0e0f1a29a710a3af1b8e281cc6c3c34bb84 \
munin-2.0.26.tar.gz
diff --git a/munin-2.0.27.tar.gz.sha256sum b/munin-2.0.27.tar.gz.sha256sum
new file mode 100644
index 0000000..c4f7472
--- /dev/null
+++ b/munin-2.0.27.tar.gz.sha256sum
@@ -0,0 +1 @@
+78f832bf1494815833459923cbfc8f41d47765cb5667c4e5c33f461aec15417c \
munin-2.0.27.tar.gz
diff --git a/munin.spec b/munin.spec
index d174a2f..1ccdab0 100644
--- a/munin.spec
+++ b/munin.spec
@@ -1,6 +1,6 @@
Name: munin
-Version: 2.0.26
-Release: 4%{?dist}
+Version: 2.0.27
+Release: 1%{?dist}
Summary: Network-wide graphing framework (grapher/gatherer)
Group: System Environment/Daemons
@@ -38,7 +38,7 @@ Source26: munin-2.0.25-postgresql-config
#Patch1: munin-1.4.6-restorecon.patch
#Patch2: munin-1.4.2-fontfix.patch
Patch4: munin-2.0.4-Utils-cluck.patch
-Patch5: acpi-2.0.5.patch
+#Patch5: acpi-2.0.5.patch
#Patch6: munin-2.0.7-http_loadtime.patch
#Patch7: munin-2.0-defect-1213.patch
#Patch8: munin-2.0.2-defect-1245-LimitsOld.pm-notify_alias.patch
@@ -49,7 +49,7 @@ Patch11: \
https://github.com/munin-monitoring/munin/pull/274.patch Patch12: \
bz1049262-ntp_.patch Patch13: mariadb-show-status.patch
Patch14: mariadb-innodb.patch
-Patch15: https://patch-diff.githubusercontent.com/raw/munin-monitoring/munin/pull/737.patch
+#Patch15: https://patch-diff.githubusercontent.com/raw/munin-monitoring/munin/pull/737.patch
BuildArch: noarch
@@ -344,7 +344,7 @@ rm -f plugins/node.d/memcached_.in
%endif
%patch4 -p0
-%patch5 -p0
+#% patch5 -p0
#% patch7 -p1
%patch9 -p1
%patch10 -p1
@@ -352,7 +352,7 @@ rm -f plugins/node.d/memcached_.in
%patch12 -p1
%patch13 -p1
%patch14 -p1
-%patch15 -p1
+#% patch15 -p1
install -c %{SOURCE13} ./resources/
# Create Makefile.config-dist
@@ -868,6 +868,9 @@ exit 0
%changelog
+* Tue Nov 01 2016 "D. Johnson" <fenris02@fedoraproject.org> - 2.0.27-1
+- Upstream released 2.0.27
+
* Tue Oct 11 2016 "D. Johnson" <fenris02@fedoraproject.org> - 2.0.26-4
- BZ# 1383219 - user nginx is not required for cgi
diff --git a/sources b/sources
index 067677c..94586d9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c6d472f48a68d2a520ff84d3a6cc3496 munin-2.0.26.tar.gz
+bd6a75cb48335c5a7abc6f84dea9d2ca munin-2.0.27.tar.gz
https://src.fedoraproject.org/rpms/munin/c/4c2c00b5bfe28381ee8164bf607e379d69ff4623?branch=f28
_______________________________________________
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/ZIKTCLLS6MM65H6MPOTEGI6DWGNHVJZE/
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic