[munin] Cattleprod fedpkg into updating
fenris02
fenris02 at fedoraproject.org
Sat Aug 4 22:10:45 UTC 2012
commit cc957ded03a88c360d3312b40500869d55b19e3d
Author: D. Johnson <fenris02 at fedoraproject.org>
Date: Sat Aug 4 16:21:56 2012 -0500
Cattleprod fedpkg into updating
.gitignore | 1 +
cpuspeed.in.rev1243 | 59 +++++++++++++++++++++++++++++++++++
munin-1.2.4-sendmail-config | 3 ++
munin-1.2.5-hddtemp_smartctl-config | 2 +
munin-1.2.6-postfix-config | 4 ++
munin-1.4.2-fontfix.patch | 16 +++++++++
munin-1.4.5-df-config | 2 +
munin-1.4.6-restorecon.patch | 11 ++++++
munin-2.0.2.tar.gz.sha256sum | 1 -
munin-2.0.4.tar.gz.sha256sum | 1 +
munin-node.service | 11 ++++++
sources | 2 +-
12 files changed, 111 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b8f469f..1c6f27c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ munin-1.4.5.tar.gz
/munin-1.4.6.tar.gz
/munin-1.4.7.tar.gz
/munin-2.0.2.tar.gz
+/munin-2.0.4.tar.gz
diff --git a/cpuspeed.in.rev1243 b/cpuspeed.in.rev1243
new file mode 100644
index 0000000..c5b4b3b
--- /dev/null
+++ b/cpuspeed.in.rev1243
@@ -0,0 +1,59 @@
+#!@@GOODSH@@
+#
+# Plugin to monitor CPU speed
+#
+# Usage: Place in /etc/munin/node.d/ (or link it there using ln -s)
+#
+# Parameters understood:
+#
+# config (required)
+# autoconf (optional - used by munin-config)
+#
+# Magic markers - optional - used by installation scripts and
+# munin-config:
+#
+#%# family=auto
+#%# capabilities=autoconf
+
+if [ "$1" = "autoconf" ]; then
+ if [ -r /sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq ]; then
+ echo yes
+ exit 0
+ else
+ echo no
+ exit 1
+ fi
+fi
+
+
+if [ "$1" = "config" ]; then
+ cat <<EOF
+graph_title CPU frequency scaling
+graph_args --base 1000 -r --lower-limit 0
+graph_vlabel Hz
+graph_scale yes
+graph_info This graph shows at what speeds the CPUs are running
+graph_category system
+EOF
+
+for c in /sys/devices/system/cpu/cpu*; do
+ N=${c##*/cpu}
+ MAXHZ=$(cat $c/cpufreq/cpuinfo_max_freq)
+ cat <<EOF
+cpu$N.label CPU $N
+cpu$N.max $MAXHZ
+cpu$N.min $(cat $c/cpufreq/cpuinfo_min_freq)
+cpu$N.type GAUGE
+EOF
+ if [ "$scaleto100" = "yes" ]; then
+ echo "cpu$N.cdef $cpu$N,$MAXHZ,/"
+ fi
+done
+
+ exit 0
+fi
+
+for c in /sys/devices/system/cpu/cpu*; do
+ N=${c##*/cpu}
+ echo "cpu$N.value $(cat $c/cpufreq/scaling_cur_freq)"
+done
diff --git a/munin-1.2.4-sendmail-config b/munin-1.2.4-sendmail-config
new file mode 100644
index 0000000..e062fbb
--- /dev/null
+++ b/munin-1.2.4-sendmail-config
@@ -0,0 +1,3 @@
+[sendmail*]
+user root
+env.mspqueue /var/spool/clientmqueue
diff --git a/munin-1.2.5-hddtemp_smartctl-config b/munin-1.2.5-hddtemp_smartctl-config
new file mode 100644
index 0000000..dcdb2b6
--- /dev/null
+++ b/munin-1.2.5-hddtemp_smartctl-config
@@ -0,0 +1,2 @@
+[hddtemp_smartctl]
+user root
diff --git a/munin-1.2.6-postfix-config b/munin-1.2.6-postfix-config
new file mode 100644
index 0000000..8a63875
--- /dev/null
+++ b/munin-1.2.6-postfix-config
@@ -0,0 +1,4 @@
+[postfix*]
+user root
+env.logfile maillog
+env.logdir /var/log
diff --git a/munin-1.4.2-fontfix.patch b/munin-1.4.2-fontfix.patch
new file mode 100644
index 0000000..3b2ab34
--- /dev/null
+++ b/munin-1.4.2-fontfix.patch
@@ -0,0 +1,16 @@
+diff -aur ../munin-1.4.2.orig/master/lib/Munin/Master/GraphOld.pm ./master/lib/Munin/Master/GraphOld.pm
+--- ../munin-1.4.2.orig/master/lib/Munin/Master/GraphOld.pm 2009-12-16 15:53:28.000000000 +0100
++++ ./master/lib/Munin/Master/GraphOld.pm 2009-12-17 11:22:44.753518725 +0100
+@@ -1299,9 +1299,9 @@
+ # The RRD 1.2 documentation says you can identify font family
+ # names but I never got that to work, but full font path worked
+ return (
+- '--font', "LEGEND:7:$libdir/DejaVuSansMono.ttf",
+- '--font', "UNIT:7:$libdir/DejaVuSans.ttf",
+- '--font', "AXIS:7:$libdir/DejaVuSans.ttf",
++ '--font', "LEGEND:7:/usr/share/fonts/bitstream-vera/VeraMono.ttf",
++ '--font', "UNIT:7:/usr/share/fonts/bitstream-vera/VeraMono.ttf",
++ '--font', "AXIS:7:/usr/share/fonts/bitstream-vera/VeraMono.ttf",
+ );
+ } elsif ($RRDs::VERSION >= 1.3) {
+ # RRD 1.3 and up
diff --git a/munin-1.4.5-df-config b/munin-1.4.5-df-config
new file mode 100644
index 0000000..8a2542e
--- /dev/null
+++ b/munin-1.4.5-df-config
@@ -0,0 +1,2 @@
+[df*]
+env.exclude none unknown iso9660 squashfs udf romfs ramfs debugfs binfmt_misc rpc_pipefs fuse.gvfs-fuse-daemon
diff --git a/munin-1.4.6-restorecon.patch b/munin-1.4.6-restorecon.patch
new file mode 100644
index 0000000..6d263bf
--- /dev/null
+++ b/munin-1.4.6-restorecon.patch
@@ -0,0 +1,11 @@
+diff -Nur munin-1.4.6.orig/dists/redhat/munin-node.rc munin-1.4.6/dists/redhat/munin-node.rc
+--- munin-1.4.6.orig/dists/redhat/munin-node.rc 2011-07-05 11:36:14.000000000 -0600
++++ munin-1.4.6/dists/redhat/munin-node.rc 2011-08-27 16:35:55.056612853 -0600
+@@ -16,6 +16,7 @@
+
+ mkdir -p /var/run/munin 2>/dev/null
+ chown munin /var/run/munin
++restorecon /var/run/munin 2>/dev/null
+
+ # See how we were called.
+ case "$1" in
diff --git a/munin-2.0.4.tar.gz.sha256sum b/munin-2.0.4.tar.gz.sha256sum
new file mode 100644
index 0000000..82ae419
--- /dev/null
+++ b/munin-2.0.4.tar.gz.sha256sum
@@ -0,0 +1 @@
+309388e3528b41d727cea01233f0d4f60714e2de443576e1c472e8a1dc81722c munin-2.0.4.tar.gz
diff --git a/munin-node.service b/munin-node.service
new file mode 100644
index 0000000..ac7257e
--- /dev/null
+++ b/munin-node.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Munin Node Server.
+After=syslog.target network.target
+
+[Service]
+Type=forking
+PIDFile=/var/run/munin/munin-node.pid
+ExecStart=/usr/sbin/munin-node
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sources b/sources
index 4a13801..f1d260e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5020eaf323f08ec09600a0b07622861a munin-2.0.2.tar.gz
+5efd93a070159f4554242a0ba38eb0b1 munin-2.0.4.tar.gz
More information about the scm-commits
mailing list