[munin] Move munin-node logs, fix some html validation errors
fenris02
fenris02 at fedoraproject.org
Fri Dec 21 03:43:41 UTC 2012
commit 47f6d9cd4a3d07f5421206fefeeb86b04e9eb705
Author: D. Johnson <fenris02 at fedoraproject.org>
Date: Thu Dec 20 21:43:04 2012 -0600
Move munin-node logs, fix some html validation errors
httpd_munin-cgi.conf | 4 ++--
munin-2.0.9_HTMLConfig.pm.patch | 20 ++++++++++++++++++++
munin-node.logrotate | 2 +-
munin.spec | 21 ++++++++++++++++++---
4 files changed, 41 insertions(+), 6 deletions(-)
---
diff --git a/httpd_munin-cgi.conf b/httpd_munin-cgi.conf
index 3f74e0c..3108580 100644
--- a/httpd_munin-cgi.conf
+++ b/httpd_munin-cgi.conf
@@ -17,8 +17,8 @@
RewriteRule ^/static/(.*) /var/www/html/munin/static/$1 [L]
# workaround for some static content
- RewriteRule /favicon.ico /var/www/html/munin/static/favicon.ico [L]
- RewriteRule /static/style-new.css /var/www/html/munin/static/style-new.css [L]
+ RewriteRule /favicon.ico /var/www/html/munin/static/favicon.ico [L]
+ RewriteRule /static/(.*) /var/www/html/munin/static/$1 [L]
# HTML
RewriteCond %{REQUEST_URI} .html$ [or]
diff --git a/munin-2.0.9_HTMLConfig.pm.patch b/munin-2.0.9_HTMLConfig.pm.patch
new file mode 100644
index 0000000..3abae3a
--- /dev/null
+++ b/munin-2.0.9_HTMLConfig.pm.patch
@@ -0,0 +1,20 @@
+diff -ru munin-2.0.9.orig/master/lib/Munin/Master/HTMLConfig.pm munin-2.0.9/master/lib/Munin/Master/HTMLConfig.pm
+--- munin-2.0.9.orig/master/lib/Munin/Master/HTMLConfig.pm 2012-12-05 13:19:35.000000000 -0600
++++ munin-2.0.9/master/lib/Munin/Master/HTMLConfig.pm 2012-12-20 21:37:22.364028610 -0600
+@@ -499,11 +499,11 @@
+ my $start_year = $epoch_now - (3600 * 24 * 400);
+ my $size_x = 800;
+ my $size_y = 400;
+- my $common_url = "$root_path/static/dynazoom.html?cgiurl_graph=$config->{'cgiurl_graph'}&plugin_name=$path&size_x=$size_x&size_y=$size_y";
+- $srv{zoomday} = "$common_url&start_epoch=$start_day&stop_epoch=$epoch_now";
+- $srv{zoomweek} = "$common_url&start_epoch=$start_week&stop_epoch=$epoch_now";
+- $srv{zoommonth} = "$common_url&start_epoch=$start_month&stop_epoch=$epoch_now";
+- $srv{zoomyear} = "$common_url&start_epoch=$start_year&stop_epoch=$epoch_now";
++ my $common_url = "$root_path/static/dynazoom.html?cgiurl_graph=$config->{'cgiurl_graph'}&plugin_name=$path&size_x=$size_x&size_y=$size_y";
++ $srv{zoomday} = "$common_url&start_epoch=$start_day&stop_epoch=$epoch_now";
++ $srv{zoomweek} = "$common_url&start_epoch=$start_week&stop_epoch=$epoch_now";
++ $srv{zoommonth} = "$common_url&start_epoch=$start_month&stop_epoch=$epoch_now";
++ $srv{zoomyear} = "$common_url&start_epoch=$start_year&stop_epoch=$epoch_now";
+ }
+
+ for my $scale (@times) {
diff --git a/munin-node.logrotate b/munin-node.logrotate
index 8d176ea..843cd28 100644
--- a/munin-node.logrotate
+++ b/munin-node.logrotate
@@ -1,4 +1,4 @@
-/var/log/munin/munin-node.log {
+/var/log/munin-node/munin-node.log {
daily
missingok
rotate 7
diff --git a/munin.spec b/munin.spec
index fe6466f..41fea67 100644
--- a/munin.spec
+++ b/munin.spec
@@ -1,6 +1,6 @@
Name: munin
Version: 2.0.9
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Network-wide graphing framework (grapher/gatherer)
Group: System Environment/Daemons
@@ -36,6 +36,7 @@ Patch5: acpi-2.0.5.patch
Patch7: munin-2.0-defect-1213.patch
#Patch8: munin-2.0.2-defect-1245-LimitsOld.pm-notify_alias.patch
Patch9: munin-2.0.8-cgitmp.patch
+Patch10: munin-2.0.9_HTMLConfig.pm.patch
BuildArch: noarch
@@ -182,7 +183,10 @@ virtually everything imaginable throughout your network, while still
maintaining a rattling ease of installation and configuration.
This package contains the tools necessary for setting up an asynchronous
-client / spooling system
+client / spooling system.
+
+See documentation for setup instructions:
+https://munin.readthedocs.org/en/latest/node/async.html
%package common
@@ -277,6 +281,7 @@ install -c %{SOURCE12} ./plugins/node.d.linux/cpuspeed.in
%patch5 -p0
%patch7 -p1
%patch9 -p1
+%patch10 -p1
install -c %{SOURCE13} ./resources/
@@ -418,6 +423,10 @@ mkdir -p %{buildroot}/var/lib/munin/cgi-tmp/munin-cgi-graph
# Fix config file so that it no longer references the build host
sed -i 's/^\[.*/\[localhost\]/' %{buildroot}/etc/munin/munin.conf
+# BZ# 885422 Move munin-node logs to /var/log/munin-node/
+mkdir -p %{buildroot}/var/log/munin-node
+sed -i 's,^log_file .*,log_file /var/log/munin-node/munin-node.log,' %{buildroot}/etc/munin/munin-node.conf
+
# Create sample fcgi config files
mkdir -p %{buildroot}/etc/sysconfig %{buildroot}/etc/httpd/conf.d
cp %{SOURCE19} %{buildroot}/etc/httpd/conf.d/munin-cgi.conf
@@ -564,6 +573,7 @@ exit 0
%dir %{_sysconfdir}/munin/templates/partial
%dir %{_datadir}/munin
%dir %{_datadir}/munin/plugins
+%dir %attr(0775,apache,munin) /var/log/munin
%dir %attr(0775,root,munin) /var/lib/munin/plugin-state
%attr(0755,munin,munin) %dir /var/www/html/munin
%attr(0755,munin,munin) %dir /var/www/html/munin/static
@@ -602,7 +612,7 @@ exit 0
%dir %{_datadir}/munin
%dir %attr(-,munin,munin) /var/lib/munin
%dir %attr(0775,nobody,munin) /var/lib/munin-node/plugin-state
-%dir %attr(0775,apache,munin) /var/log/munin
+%dir %attr(0755,root,root) /var/log/munin-node
%config(noreplace) %{_sysconfdir}/logrotate.d/munin-node
%config(noreplace) %{_sysconfdir}/munin/munin-node.conf
%config(noreplace) %{_sysconfdir}/munin/plugin-conf.d/df
@@ -668,6 +678,11 @@ exit 0
%changelog
+* Sun Dec 09 2012 D. Johnson <fenris02 at fedoraproject.org> - 2.0.9-3
+- Add documentation links for async
+- BZ# 885422 Move munin-node logs to /var/log/munin-node/
+- BZ# 877166 Convert '&' to '&' in HTMLConfig.pm for validation
+
* Thu Dec 06 2012 D. Johnson <fenris02 at fedoraproject.org> - 2.0.9-2
- Require: LWP::UserAgent for plugins
- BZ# 861816 Add simplified files for switching to FCGI
More information about the scm-commits
mailing list