[collectd] update to 5.2.2
Alan Pevec
apevec at fedoraproject.org
Mon Apr 22 14:02:54 UTC 2013
commit 41d3e5c62b8615c643d440157856ed992b94470e
Author: Alan Pevec <apevec at redhat.com>
Date: Tue Apr 9 10:14:19 2013 +0200
update to 5.2.2
Also fixes rhbz 954322 collectd package should be built with PIE flags
TODO sync with https://github.com/collectd/collectd/tree/master/contrib/redhat
For now, just adding conf files which were dropped upstream:
apache.conf email.conf mysql.conf nginx.conf sensors.conf snmp.conf
.gitignore | 2 +-
apache.conf | 7 +++++++
collectd.spec | 30 +++++++++++++++++++++---------
email.conf | 7 +++++++
fixperlinstall.patch | 22 ----------------------
mysql.conf | 7 +++++++
nginx.conf | 7 +++++++
sensors.conf | 7 +++++++
snmp.conf | 42 ++++++++++++++++++++++++++++++++++++++++++
sources | 2 +-
10 files changed, 100 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c9d70df..febba60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/collectd-5.2.1.tar.bz2
+/collectd-5.2.2.tar.bz2
diff --git a/apache.conf b/apache.conf
new file mode 100644
index 0000000..a1a4848
--- /dev/null
+++ b/apache.conf
@@ -0,0 +1,7 @@
+LoadPlugin apache
+#<Plugin apache>
+# URL "http://localhost/status?auto"
+# User "www-user"
+# Password "secret"
+# CACert "/etc/ssl/ca.crt"
+#</Plugin>
diff --git a/collectd.spec b/collectd.spec
index 5b672c1..282eee5 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -1,6 +1,8 @@
+%global _hardened_build 1
+
Summary: Statistics collection daemon for filling RRD files
Name: collectd
-Version: 5.2.1
+Version: 5.2.2
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Daemons
@@ -10,8 +12,14 @@ Source: http://collectd.org/files/%{name}-%{version}.tar.bz2
Source1: collectd-httpd.conf
Source2: collection.conf
Source3: collectd.service
+Source91: apache.conf
+Source92: email.conf
+Source93: mysql.conf
+Source94: nginx.conf
+Source95: sensors.conf
+Source96: snmp.conf
+
Patch1: %{name}-include-collectd.d.patch
-Patch2: fixperlinstall.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -189,7 +197,6 @@ This plugin collects information from virtualized guests.
%prep
%setup -q
%patch1
-%patch2
sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in
@@ -349,12 +356,12 @@ find contrib -name '*.p[lm]' -exec mv {} perl-examples/ \;
# Move config contribs
mkdir -p %{buildroot}/etc/collectd.d/
-cp contrib/redhat/apache.conf %{buildroot}/etc/collectd.d/apache.conf
-cp contrib/redhat/email.conf %{buildroot}/etc/collectd.d/email.conf
-cp contrib/redhat/mysql.conf %{buildroot}/etc/collectd.d/mysql.conf
-cp contrib/redhat/nginx.conf %{buildroot}/etc/collectd.d/nginx.conf
-cp contrib/redhat/sensors.conf %{buildroot}/etc/collectd.d/sensors.conf
-cp contrib/redhat/snmp.conf %{buildroot}/etc/collectd.d/snmp.conf
+cp %{SOURCE91} %{buildroot}/etc/collectd.d/apache.conf
+cp %{SOURCE92} %{buildroot}/etc/collectd.d/email.conf
+cp %{SOURCE93} %{buildroot}/etc/collectd.d/mysql.conf
+cp %{SOURCE94} %{buildroot}/etc/collectd.d/nginx.conf
+cp %{SOURCE95} %{buildroot}/etc/collectd.d/sensors.conf
+cp %{SOURCE96} %{buildroot}/etc/collectd.d/snmp.conf
# configs for subpackaged plugins
%ifnarch s390 s390x
@@ -660,6 +667,11 @@ fi
%endif
%changelog
+* Mon Apr 22 2013 Alan Pevec <apevec at redhat.com> 5.2.2-1
+- update to 5.2.2
+ http://mailman.verplant.org/pipermail/collectd/2013-April/005749.html
+- build with PIE flags rhbz#954322
+
* Mon Feb 04 2013 Alan Pevec <apevec at redhat.com> 5.2.1-1
- update to 5.2.1
http://mailman.verplant.org/pipermail/collectd/2013-January/005577.html
diff --git a/email.conf b/email.conf
new file mode 100644
index 0000000..cc43ff0
--- /dev/null
+++ b/email.conf
@@ -0,0 +1,7 @@
+LoadPlugin email
+#<Plugin email>
+# SocketFile "/usr/var/run/collectd-email"
+# SocketGroup "collectd"
+# SocketPerms "0770"
+# MaxConns 5
+#</Plugin>
diff --git a/mysql.conf b/mysql.conf
new file mode 100644
index 0000000..6dc03cc
--- /dev/null
+++ b/mysql.conf
@@ -0,0 +1,7 @@
+LoadPlugin mysql
+#<Plugin mysql>
+# Host "database.serv.er"
+# User "db_user"
+# Password "secret"
+# Database "db_name"
+#</Plugin>
diff --git a/nginx.conf b/nginx.conf
new file mode 100644
index 0000000..ae56014
--- /dev/null
+++ b/nginx.conf
@@ -0,0 +1,7 @@
+LoadPlugin nginx
+#<Plugin nginx>
+# URL "http://localhost/status?auto"
+# User "www-user"
+# Password "secret"
+# CACert "/etc/ssl/ca.crt"
+#</Plugin>
diff --git a/sensors.conf b/sensors.conf
new file mode 100644
index 0000000..8149f1b
--- /dev/null
+++ b/sensors.conf
@@ -0,0 +1,7 @@
+LoadPlugin sensors
+#<Plugin sensors>
+# Sensor "it8712-isa-0290/temperature-temp1"
+# Sensor "it8712-isa-0290/fanspeed-fan3"
+# Sensor "it8712-isa-0290/voltage-in8"
+# IgnoreSelected false
+#</Plugin>
diff --git a/snmp.conf b/snmp.conf
new file mode 100644
index 0000000..235a068
--- /dev/null
+++ b/snmp.conf
@@ -0,0 +1,42 @@
+LoadPlugin snmp
+#<Plugin snmp>
+# <Data "powerplus_voltge_input">
+# Type "voltage"
+# Table false
+# Instance "input_line1"
+# Values "SNMPv2-SMI::enterprises.6050.5.4.1.1.2.1"
+# </Data>
+# <Data "hr_users">
+# Type "users"
+# Table false
+# Instance ""
+# Values "HOST-RESOURCES-MIB::hrSystemNumUsers.0"
+# </Data>
+# <Data "std_traffic">
+# Type "if_octets"
+# Table true
+# Instance "IF-MIB::ifDescr"
+# Values "IF-MIB::ifInOctets" "IF-MIB::ifOutOctets"
+# </Data>
+#
+# <Host "some.switch.mydomain.org">
+# Address "192.168.0.2"
+# Version 1
+# Community "community_string"
+# Collect "std_traffic"
+# Inverval 120
+# </Host>
+# <Host "some.server.mydomain.org">
+# Address "192.168.0.42"
+# Version 2
+# Community "another_string"
+# Collect "std_traffic" "hr_users"
+# </Host>
+# <Host "some.ups.mydomain.org">
+# Address "192.168.0.3"
+# Version 1
+# Community "more_communities"
+# Collect "powerplus_voltge_input"
+# Interval 300
+# </Host>
+#</Plugin>
diff --git a/sources b/sources
index 45d0d63..76352f5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-350934cfea62d37e10191816744f0eb7 collectd-5.2.1.tar.bz2
+29e61411e51845d5ae71ab676078867e collectd-5.2.2.tar.bz2
More information about the scm-commits
mailing list