forked from pool/collectd
Accepting request 77989 from server:monitoring
fixes for 12.1- notify-desktop: fix compatibility with libnotify >= 0.7.0
- iptables plugin: use iptables library
- ipvs plugin: disable for >= 12.1, as build fails currently
- df plugin: skip duplicate entries, fixes "uc_update: Value too old"
error
- downgrading in-tree iproute2 from 2.6.38 to 2.6.37, as 2.6.38 causes an
internal error in gcc
- add pinba plugin (through protobuf-c support)
- add rpmlintrc file to suppress false positives
- add collectd-pkgconfig_libnotify_add_gtk.patch to fix building libnotify
support on >= 11.4
- bump in-tree iproute2 to 2.6.38
- update to 4.10.3:
* collectd: Threshold subsection: Handling of NAN values in the percentage
calculation has been fixed
* collectd, java plugin, ntpd plugin: Several diagnostic messages have been
improved
* curl_json plugin: Handling of arrays has been fixed.
* libvirt plugin: A bug in reading the virtual CPU statistics has been fixed
* processes plugin: Potentially erroneous behavior has been fixed in an error
handling case
* python plugin: Fix dispatching of values from Python scripts to collectd
- changes from 4.10.2:
* collectd: If including one configuration file fails, continue with the rest
of the configuration if possible
* collectd: Fix a bug in the read function scheduling. In rare cases read
functions may not have been called as often as requested
OBS-URL: https://build.opensuse.org/request/show/77989
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/collectd?expand=0&rev=4
This commit is contained in:
Sascha Peilicke
Git OBS Bridge
parent
0ff81c1d1c
commit
f605ba4b85
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:17cd6741c360cb2544f00fbe902ec3e9aa0d04a7ab6a744e3e8ea5615bb794be
|
||||
size 1419603
|
||||
3
collectd-4.10.3.tar.bz2
Normal file
3
collectd-4.10.3.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ffd1959273301b302c144057baf68128e62c42bcff156ba941336e7389439b65
|
||||
size 1343806
|
||||
33
collectd-df-remove-duplicates.patch
Normal file
33
collectd-df-remove-duplicates.patch
Normal file
@ -0,0 +1,33 @@
|
||||
diff --git a/src/df.c b/src/df.c
|
||||
index fc80ac3..a6cf37c 100644
|
||||
--- a/src/df.c
|
||||
+++ b/src/df.c
|
||||
@@ -213,6 +213,7 @@ static int df_read (void)
|
||||
{
|
||||
unsigned long long blocksize;
|
||||
char disk_name[256];
|
||||
+ cu_mount_t *mnt_dup_ptr;
|
||||
|
||||
if (ignorelist_match (il_device,
|
||||
(mnt_ptr->spec_device != NULL)
|
||||
@@ -224,6 +225,20 @@ static int df_read (void)
|
||||
if (ignorelist_match (il_fstype, mnt_ptr->type))
|
||||
continue;
|
||||
|
||||
+ /* ignore duplicates */
|
||||
+ for (mnt_dup_ptr = mnt_ptr; mnt_dup_ptr != NULL; mnt_dup_ptr = mnt_dup_ptr->next)
|
||||
+ {
|
||||
+ if (by_device) {
|
||||
+ if (strcmp (mnt_ptr->spec_device, mnt_dup_ptr->spec_device) == 0)
|
||||
+ continue;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ if (strcmp (mnt_ptr->dir, mnt_dup_ptr->dir) == 0)
|
||||
+ continue;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
if (STATANYFS (mnt_ptr->dir, &statbuf) < 0)
|
||||
{
|
||||
char errbuf[1024];
|
||||
@ -1,16 +1,16 @@
|
||||
--- Makefile.in.orig 2009-07-27 16:44:54.000000000 +0200
|
||||
+++ Makefile.in 2009-07-27 16:45:08.000000000 +0200
|
||||
@@ -263,7 +263,7 @@
|
||||
top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
--- Makefile.in.orig 2011-04-13 22:41:49.000000000 +0200
|
||||
+++ Makefile.in 2011-04-13 22:41:57.000000000 +0200
|
||||
@@ -565,7 +565,7 @@
|
||||
subdirs = @subdirs@
|
||||
sysconfdir = @sysconfdir@
|
||||
target_alias = @target_alias@
|
||||
-ACLOCAL_AMFLAGS = -I libltdl/m4
|
||||
+ACLOCAL_AMFLAGS = -I libltdl
|
||||
SUBDIRS = libltdl src bindings
|
||||
INCLUDES = $(LTDLINCL)
|
||||
EXTRA_DIST = contrib version-gen.sh
|
||||
--- Makefile.am.orig 2009-07-27 16:44:44.000000000 +0200
|
||||
+++ Makefile.am 2009-07-27 16:44:52.000000000 +0200
|
||||
--- Makefile.am.orig 2011-04-13 22:42:01.000000000 +0200
|
||||
+++ Makefile.am 2011-04-13 22:42:05.000000000 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-ACLOCAL_AMFLAGS = -I libltdl/m4
|
||||
+ACLOCAL_AMFLAGS = -I libltdl
|
||||
|
||||
26
collectd-javac_target.patch
Normal file
26
collectd-javac_target.patch
Normal file
@ -0,0 +1,26 @@
|
||||
--- bindings/java/Makefile.in.orig 2010-07-12 20:27:41.000000000 +0200
|
||||
+++ bindings/java/Makefile.in 2010-07-12 20:28:09.000000000 +0200
|
||||
@@ -490,8 +490,8 @@
|
||||
|
||||
|
||||
java-build-stamp: org/collectd/api/*.java org/collectd/java/*.java
|
||||
- $(JAVAC) -d "." "$(srcdir)/org/collectd/api"/*.java
|
||||
- $(JAVAC) -d "." "$(srcdir)/org/collectd/java"/*.java
|
||||
+ $(JAVAC) $(JAVAC_TARGET) -d "." "$(srcdir)/org/collectd/api"/*.java
|
||||
+ $(JAVAC) $(JAVAC_TARGET) -d "." "$(srcdir)/org/collectd/java"/*.java
|
||||
mkdir -p .libs
|
||||
$(JAR) cf .libs/collectd-api.jar "org/collectd/api"/*.class
|
||||
$(JAR) cf .libs/generic-jmx.jar "org/collectd/java"/*.class
|
||||
--- bindings/java/Makefile.am.orig 2010-07-12 20:26:48.000000000 +0200
|
||||
+++ bindings/java/Makefile.am 2010-07-12 20:27:35.000000000 +0200
|
||||
@@ -25,8 +25,8 @@
|
||||
org/collectd/java/JMXMemory.java
|
||||
|
||||
java-build-stamp: org/collectd/api/*.java org/collectd/java/*.java
|
||||
- $(JAVAC) -d "." "$(srcdir)/org/collectd/api"/*.java
|
||||
- $(JAVAC) -d "." "$(srcdir)/org/collectd/java"/*.java
|
||||
+ $(JAVAC) $(JAVAC_TARGET) -d "." "$(srcdir)/org/collectd/api"/*.java
|
||||
+ $(JAVAC) $(JAVAC_TARGET) -d "." "$(srcdir)/org/collectd/java"/*.java
|
||||
mkdir -p .libs
|
||||
$(JAR) cf .libs/collectd-api.jar "org/collectd/api"/*.class
|
||||
$(JAR) cf .libs/generic-jmx.jar "org/collectd/java"/*.class
|
||||
16
collectd-libip4tc.patch
Normal file
16
collectd-libip4tc.patch
Normal file
@ -0,0 +1,16 @@
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 5c3564c..d1c293c 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -1630,9 +1630,9 @@ fi
|
||||
# Check for the iptc_init symbol in the library.
|
||||
if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xno"
|
||||
then
|
||||
- AC_CHECK_LIB(iptc, iptc_init,
|
||||
+ AC_CHECK_LIB(ip4tc, iptc_init,
|
||||
[
|
||||
- AC_DEFINE(HAVE_LIBIPTC, 1, [Define to 1 if you have the iptc library (-liptc).])
|
||||
+ AC_DEFINE(HAVE_LIBIPTC, 1, [Define to 1 if you have the iptc library (-lip4tc).])
|
||||
],
|
||||
[
|
||||
with_libiptc="yes"
|
||||
18
collectd-libnotify_070.patch
Normal file
18
collectd-libnotify_070.patch
Normal file
@ -0,0 +1,18 @@
|
||||
diff --git a/src/notify_desktop.c b/src/notify_desktop.c
|
||||
index 839bc61..31c2411 100644
|
||||
--- a/src/notify_desktop.c
|
||||
+++ b/src/notify_desktop.c
|
||||
@@ -95,7 +95,13 @@ static int c_notify (const notification_t *n,
|
||||
: (NOTIF_WARNING == n->severity) ? "WARNING"
|
||||
: (NOTIF_OKAY == n->severity) ? "OKAY" : "UNKNOWN");
|
||||
|
||||
+#if (defined NOTIFY_CHECK_VERSION)
|
||||
+#if NOTIFY_CHECK_VERSION(0, 7, 0)
|
||||
+ notification = notify_notification_new (summary, n->message, NULL);
|
||||
+#endif
|
||||
+#else
|
||||
notification = notify_notification_new (summary, n->message, NULL, NULL);
|
||||
+#endif
|
||||
if (NULL == notification) {
|
||||
log_err ("Failed to create a new notification.");
|
||||
return -1;
|
||||
48
collectd-pkgconfig_libnotify_add_gtk.patch
Normal file
48
collectd-pkgconfig_libnotify_add_gtk.patch
Normal file
@ -0,0 +1,48 @@
|
||||
--- configure.in.orig 2011-04-15 08:06:54.000000000 +0200
|
||||
+++ configure.in 2011-04-15 08:09:05.000000000 +0200
|
||||
@@ -3833,7 +3833,7 @@
|
||||
fi
|
||||
# }}}
|
||||
|
||||
-PKG_CHECK_MODULES([LIBNOTIFY], [libnotify],
|
||||
+PKG_CHECK_MODULES([LIBNOTIFY], [libnotify gtk+-2.0],
|
||||
[with_libnotify="yes"],
|
||||
[with_libnotify="no ($LIBNOTIFY_PKG_ERRORS)"])
|
||||
|
||||
--- configure.orig 2011-04-15 08:09:08.000000000 +0200
|
||||
+++ configure 2011-04-15 08:10:40.000000000 +0200
|
||||
@@ -45112,7 +45112,7 @@
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; then
|
||||
- pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify" 2>/dev/null`
|
||||
+ pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify" "gtk+-2.0"2>/dev/null`
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
@@ -45126,11 +45126,11 @@
|
||||
else
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnotify\"") >&5
|
||||
- ($PKG_CONFIG --exists --print-errors "libnotify") 2>&5
|
||||
+ ($PKG_CONFIG --exists --print-errors "libnotify" "gtk+-2.0") 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; then
|
||||
- pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify" 2>/dev/null`
|
||||
+ pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify" "gtk+-2.0" 2>/dev/null`
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
@@ -45149,9 +45149,9 @@
|
||||
_pkg_short_errors_supported=no
|
||||
fi
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
- LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnotify"`
|
||||
+ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnotify" "gtk+-2.0"`
|
||||
else
|
||||
- LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnotify"`
|
||||
+ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnotify" "gtk+-2.0"`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$LIBNOTIFY_PKG_ERRORS" >&5
|
||||
10
collectd-rpmlintrc
Normal file
10
collectd-rpmlintrc
Normal file
@ -0,0 +1,10 @@
|
||||
addFilter('perl5-naming-policy-not-applied')
|
||||
|
||||
addFilter('non-etc-or-var-file-marked-as-conffile .*/spamassassin/99_collectd.cf')
|
||||
addFilter('non-etc-or-var-file-marked-as-conffile .*/collectd/postgresql_default.conf')
|
||||
|
||||
addFilter('macro-in-comment')
|
||||
|
||||
addFilter('no-manual-page-for-binary rccollectd')
|
||||
|
||||
addFilter('obsolete-suse-version-check')
|
||||
231
collectd.changes
231
collectd.changes
@ -1,14 +1,72 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 21 14:27:22 UTC 2010 - lslezak@suse.cz
|
||||
Tue Aug 2 22:55:45 UTC 2011 - stefan.bruens@rwth-aachen.de
|
||||
|
||||
- fixed packaging on openSUSE-11.4 - some perl-files are not
|
||||
generated, disabled plugin-notify-desktop - it doesn't build
|
||||
- notify-desktop: fix compatibility with libnotify >= 0.7.0
|
||||
- iptables plugin: use iptables library
|
||||
- ipvs plugin: disable for >= 12.1, as build fails currently
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 9 12:11:28 UTC 2010 - schubi@novell.com
|
||||
Mon Aug 1 11:50:52 UTC 2011 - stefan.bruens@rwth-aachen.de
|
||||
|
||||
- Update to version 4.9.4 in order to fix security issue:
|
||||
CVE-2010-4336
|
||||
- df plugin: skip duplicate entries, fixes "uc_update: Value too old"
|
||||
error
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Apr 16 23:58:31 UTC 2011 - pascal.bleser@opensuse.org
|
||||
|
||||
- downgrading in-tree iproute2 from 2.6.38 to 2.6.37, as 2.6.38 causes an
|
||||
internal error in gcc
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 15 06:50:14 UTC 2011 - pascal.bleser@opensuse.org
|
||||
|
||||
- add pinba plugin (through protobuf-c support)
|
||||
- add rpmlintrc file to suppress false positives
|
||||
- add collectd-pkgconfig_libnotify_add_gtk.patch to fix building libnotify
|
||||
support on >= 11.4
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 13 21:24:21 UTC 2011 - pascal.bleser@opensuse.org
|
||||
|
||||
- bump in-tree iproute2 to 2.6.38
|
||||
|
||||
- update to 4.10.3:
|
||||
* collectd: Threshold subsection: Handling of NAN values in the percentage
|
||||
calculation has been fixed
|
||||
* collectd, java plugin, ntpd plugin: Several diagnostic messages have been
|
||||
improved
|
||||
* curl_json plugin: Handling of arrays has been fixed.
|
||||
* libvirt plugin: A bug in reading the virtual CPU statistics has been fixed
|
||||
* processes plugin: Potentially erroneous behavior has been fixed in an error
|
||||
handling case
|
||||
* python plugin: Fix dispatching of values from Python scripts to collectd
|
||||
|
||||
- changes from 4.10.2:
|
||||
* collectd: If including one configuration file fails, continue with the rest
|
||||
of the configuration if possible
|
||||
* collectd: Fix a bug in the read function scheduling. In rare cases read
|
||||
functions may not have been called as often as requested
|
||||
* collectd: A left-over hard-coded 2 has been replaced by the configurable
|
||||
timeout value
|
||||
* curl, memcachec, tail plugins: Fix handling of "DERIVE" data sources.
|
||||
Matching the end of a string has been improved
|
||||
* curl_json plugin: Fix a problem when parsing 64bit integers. Reading JSON
|
||||
data from non-HTTP sources has been fixed
|
||||
* network plugin: Be less verbose about unchecked signatures, in order to
|
||||
prevent spamming the logs
|
||||
* notify_email plugin: Concurrency problems have been fixed
|
||||
* python plugin: Set "sys.argv", since many scripts don't expect that it may
|
||||
not be set
|
||||
* rrdtool, rrdcached plugin: Fix a too strict assertion when creating RRD
|
||||
files
|
||||
* swap plugin: A bug which lead to incorrect I/O values has been fixed
|
||||
* value match: A minor memory leak has been fixed
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 12 19:47:09 UTC 2010 - pascal.bleser@opensuse.org
|
||||
|
||||
- add curl_json plugin (libyajl)
|
||||
- fix Java plugin on 11.1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 11 00:00:58 UTC 2010 - pascal.bleser@opensuse.org
|
||||
@ -18,7 +76,9 @@ Sun Jul 11 00:00:58 UTC 2010 - pascal.bleser@opensuse.org
|
||||
* libcollectdclient: a format error in the PUTVAL command has been removed
|
||||
* DF plugin: an error message shown when cu_mount_getlist fails has been added
|
||||
* Processes plugin: missing initialization code for IO members of a struct has been added
|
||||
* Python plugin: memory leaks in the write and notification callbacks have been fixed; a possible crash when the plugin was loaded but not configured has been fixed
|
||||
* Python plugin: memory leaks in the write and notification callbacks have
|
||||
been fixed; a possible crash when the plugin was loaded but not configured
|
||||
has been fixed
|
||||
* SNMP plugin: verbosity with regard to unknown ASN types has been increased
|
||||
* PowerDNS plugin: compatibility changes for PowerDNS 2.9.22 and above have been applied
|
||||
|
||||
@ -26,22 +86,30 @@ Sun Jul 11 00:00:58 UTC 2010 - pascal.bleser@opensuse.org
|
||||
* JSON output now includes the dstypes and dsnames fields
|
||||
* the new Timeout option can be used to specify a timeout for missing values
|
||||
* Apache plugin: support for IdleWorkers (Apache 1.*: IdleServers) has been added
|
||||
* cURL plugin: the new ExcludeRegex allows to easily exclude certain lines from the match
|
||||
* cURL-XML plugin: new plugin allows to read XML files using cURL and extract metrics included in the files
|
||||
* FileCount plugin: the new IncludeHidden option allows to include hidden files and directories in the statistics
|
||||
* LogFile plugin: the new PrintSeverity option allows to include the severity of a message in the output
|
||||
* memcachec plugin: the new ExcludeRegex allows to easily exclude certain lines from the match
|
||||
* Modbus plugin: new plugin allows to read registers from Modbus-TCP enabled devices
|
||||
* Network plugin: new Interface option allows to set the interface to be used for multicast and, if supported, unicast traffic
|
||||
* OpenVPN plugin: the CollectUserCount and CollectIndividualUsers options allow more detailed control over how to report sessions of multiple users
|
||||
* Pinba plugin: new plugin receives timing information from the Pinba PHP extension, which can be used for profiling PHP code and webserver performance
|
||||
* Ping plugin: new MaxMissed allows to re-resolve a hosts address when it doesn't reply to a number of ping requests
|
||||
* PostgreSQL plugin: the Interval config option has been added; the plugin has been relicensed under the 2-clause BSD license
|
||||
* Processes plugin: support for code and data virtual memory sizes has been added
|
||||
* cURL plugin: the new ExcludeRegex allows to easily exclude certain lines
|
||||
from the match
|
||||
* cURL-XML plugin: new plugin allows to read XML files using cURL and extract
|
||||
metrics included in the files
|
||||
* FileCount plugin: the new IncludeHidden option allows to include hidden
|
||||
files and directories in the statistics
|
||||
* LogFile plugin: the new PrintSeverity option allows to include the severity
|
||||
of a message in the output
|
||||
* memcachec plugin: the new ExcludeRegex allows to easily exclude certain
|
||||
lines from the match
|
||||
* Network plugin: new Interface option allows to set the interface to be used
|
||||
for multicast and, if supported, unicast traffic
|
||||
* OpenVPN plugin: the CollectUserCount and CollectIndividualUsers options
|
||||
allow more detailed control over how to report sessions of multiple users
|
||||
* Ping plugin: new MaxMissed allows to re-resolve a hosts address when it
|
||||
doesn't reply to a number of ping requests
|
||||
* PostgreSQL plugin: the Interval config option has been added; the plugin
|
||||
has been relicensed under the 2-clause BSD license
|
||||
* Processes plugin: support for code and data virtual memory sizes has been
|
||||
added
|
||||
* Python plugin: support for Python 3 has been implemented
|
||||
* RouterOS plugin: support for collecting CPU load, memory usage, used and free disk space, sectors written and number of bad blocks from MikroTik devices has been added
|
||||
* Swap plugin: support for Linux < 2.6 has been added
|
||||
* Tail plugin: the new ExcludeRegex allows to easily exclude certain lines from the match
|
||||
* Tail plugin: the new ExcludeRegex allows to easily exclude certain lines
|
||||
from the match
|
||||
* Write HTTP plugin: the StoreRates option has been added
|
||||
* RegEx match: the Invert option has been added
|
||||
|
||||
@ -57,12 +125,16 @@ Fri Apr 23 12:32:21 UTC 2010 - pascal.bleser@opensuse.org
|
||||
* serialization of NANs in JSON format has been fixed
|
||||
* checks whether a "sleep" returned early have been added
|
||||
* continue reading files in a directory when parsing one file fails
|
||||
* Apache plugin: collection of the number of active connections has been fixed for Apache 2.*
|
||||
* Exec plugin: error messages have been improved; the "running" flag is now cleared correctly when forking a child fails
|
||||
* Apache plugin: collection of the number of active connections has been
|
||||
fixed for Apache 2.*
|
||||
* Exec plugin: error messages have been improved; the "running" flag is now
|
||||
cleared correctly when forking a child fails
|
||||
* IPTables plugin: fix a violation of aliasing rules
|
||||
* Java plugin: the Java API files are now packaged into a .jar file
|
||||
* Network plugin: fix a segmentation fault when receiving packets with an unknown data source type
|
||||
* Network plugin: a memory leak when receiving encrypted network packets has been fixed
|
||||
* Network plugin: fix a segmentation fault when receiving packets with an
|
||||
unknown data source type
|
||||
* Network plugin: a memory leak when receiving encrypted network packets has
|
||||
been fixed
|
||||
* Oracle plugin: fix checking for lost connections and reconnect in this case
|
||||
* UnixSock plugin: a memory leak in the "LISTVAL" command has been fixed
|
||||
* Write HTTP plugin: use the "any" authentication schema, used to be "digest"
|
||||
@ -103,8 +175,10 @@ Sat Dec 19 23:11:00 UTC 2009 - pascal.bleser@opensuse.org
|
||||
|
||||
- update to 4.8.2:
|
||||
* fixes a memory leak in the "listval" command
|
||||
* adds detection of dead connections and reconnection in the GenericJMX and Oracle plugins
|
||||
* fixes handling of negative values and hex strings has been corrected in the SNMP plugin
|
||||
* adds detection of dead connections and reconnection in the GenericJMX and
|
||||
Oracle plugins
|
||||
* fixes handling of negative values and hex strings has been corrected in the
|
||||
SNMP plugin
|
||||
* improved treatment of error messages when no log plugin was loaded
|
||||
|
||||
- build memcachec and dbi plugins
|
||||
@ -125,26 +199,45 @@ Sun Oct 4 00:00:00 CEST 2009 - pascal.bleser@opensuse.org
|
||||
* UnixSock plugin: fix a (well hidden) race condition related to file descriptor handling
|
||||
|
||||
- changes from 4.8.0:
|
||||
* collectd: two new data source types, DERIVE and ABSOLUTE, have been added: DERIVE can be used for counters that are reset occasionally
|
||||
* thresholds: the advanced threshold options “Percentage”, “Hits”, and “Hysteresis” have been added
|
||||
* cURL-JSON plugin: the new cURL-JSON plugin reads JSON files using the cURL library and parses the contents according to user specification; among other things, this allows to read statistics from a CouchDB instance
|
||||
* DF plugin: using the new “ReportByDevice” option the device rather than the mount point can be used to identify partitions
|
||||
* collectd: two new data source types, DERIVE and ABSOLUTE, have been added:
|
||||
DERIVE can be used for counters that are reset occasionally
|
||||
* thresholds: the advanced threshold options “Percentage”, “Hits”, and
|
||||
“Hysteresis” have been added
|
||||
* cURL-JSON plugin: the new cURL-JSON plugin reads JSON files using the cURL
|
||||
library and parses the contents according to user specification; among
|
||||
other things, this allows to read statistics from a CouchDB instance
|
||||
* DF plugin: using the new “ReportByDevice” option the device rather than the
|
||||
mount point can be used to identify partitions
|
||||
* DNS plugin: the possibility to ignore numeric QTypes has been added
|
||||
* GenericJMX plugin: the new, Java-based GenericJMX plugin allows to query arbitrary data from a Java process using the Java Management Extensions (JMX)
|
||||
* MadWifi plugin: the new MadWifi plugin collects information about Atheros wireless LAN chipsets from the MadWifi driver
|
||||
* network plugin: the receive- and send-buffer-sizes have been made configurable, allowing for bigger and smaller packets
|
||||
* olsrd plugin: the new OLSR plugin queries routing information from the Optimized Link State Routing daemon
|
||||
* RRDtool plugin: a new configuration option allows to define a random write delay when writing RRD files; this spreads the load created by writing RRD files more evenly
|
||||
* Swap plugin: the possibility to collect swapped in/out pages has been added to the Swap plugin
|
||||
* TokyoTyrant plugin: the new TokyoTyrant plugin reads the number of records and file size from a running Tokyo Tyrant server
|
||||
* UnixSock plugin: add the GETTHRESHOLD command: this command can be used to query the thresholds configured for a particular identifier
|
||||
* Write HTTP plugin: the new Write HTTP plugin sends the values collected by collectd to a web-server using HTTP POST requests
|
||||
* Empty Counter match: the new Empty Counter match matches value lists, where at least one data source is of type COUNTER and the counter value of all counter data sources is zero
|
||||
* GenericJMX plugin: the new, Java-based GenericJMX plugin allows to query
|
||||
arbitrary data from a Java process using the Java Management Extensions
|
||||
(JMX)
|
||||
* MadWifi plugin: the new MadWifi plugin collects information about Atheros
|
||||
wireless LAN chipsets from the MadWifi driver
|
||||
* network plugin: the receive- and send-buffer-sizes have been made
|
||||
configurable, allowing for bigger and smaller packets
|
||||
* olsrd plugin: the new OLSR plugin queries routing information from the
|
||||
Optimized Link State Routing daemon
|
||||
* RRDtool plugin: a new configuration option allows to define a random write
|
||||
delay when writing RRD files; this spreads the load created by writing RRD
|
||||
files more evenly
|
||||
* Swap plugin: the possibility to collect swapped in/out pages has been added
|
||||
to the Swap plugin
|
||||
* TokyoTyrant plugin: the new TokyoTyrant plugin reads the number of records
|
||||
and file size from a running Tokyo Tyrant server
|
||||
* UnixSock plugin: add the GETTHRESHOLD command: this command can be used to
|
||||
query the thresholds configured for a particular identifier
|
||||
* Write HTTP plugin: the new Write HTTP plugin sends the values collected by
|
||||
collectd to a web-server using HTTP POST requests
|
||||
* Empty Counter match: the new Empty Counter match matches value lists, where
|
||||
at least one data source is of type COUNTER and the counter value of all
|
||||
counter data sources is zero
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Sep 26 00:00:00 CEST 2009 - kkaempf@suse.de
|
||||
|
||||
- temporarily disable perl plugin for opensuse 11.2, must fix configure check first
|
||||
- temporarily disable perl plugin for opensuse 11.2, must fix configure check
|
||||
first
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 27 00:00:00 CEST 2009 - pascal.bleser@opensuse.org
|
||||
@ -160,35 +253,51 @@ Wed May 13 00:00:00 CEST 2009 - pascal.bleser@opensuse.org
|
||||
- added missing ldconfig for libcollectclient0
|
||||
- update to 4.7.0:
|
||||
* apache plugin: support to query multiple servers has been added
|
||||
* apache plugin: handling of lighttpd's scoreboard statistics has been improved
|
||||
* conntrack plugin: the new conntrack plugin collects the connection tracking table size
|
||||
* fscache plugin: the new fscache plugin collects statistics about Linux' file-system based caching framework
|
||||
* gmond plugin: the new gmond plugin can receive and interpret multicast traffic from Ganglia's gmond daemon
|
||||
* java plugin: the new java plugin exports the collectd API to Java, making it possible to write extensions to collectd in Java
|
||||
* memcachec plugin: the new memcachec plugin queries data from a memcached daemon and parses it similar to the cURL plugin
|
||||
* memcached plugin: support for connections over UNIX domain sockets has been added
|
||||
* apache plugin: handling of lighttpd's scoreboard statistics has been
|
||||
improved
|
||||
* conntrack plugin: the new conntrack plugin collects the connection tracking
|
||||
table size
|
||||
* fscache plugin: the new fscache plugin collects statistics about Linux'
|
||||
file-system based caching framework
|
||||
* gmond plugin: the new gmond plugin can receive and interpret multicast
|
||||
traffic from Ganglia's gmond daemon
|
||||
* java plugin: the new java plugin exports the collectd API to Java, making
|
||||
it possible to write extensions to collectd in Java
|
||||
* memcachec plugin: the new memcachec plugin queries data from a memcached
|
||||
daemon and parses it similar to the cURL plugin
|
||||
* memcached plugin: support for connections over UNIX domain sockets has been
|
||||
added
|
||||
* mysql plugin: support to query multiple databases has been added
|
||||
* mysql plugin: master/slave statistics have been added
|
||||
* mysql plugin: lock statistics have been added
|
||||
* network plugin: the possibility to sign or encrypt network traffic has been added
|
||||
* protocols plugin: the new protocols plugin provides information about network protocols, such as IP, TCP and UDP
|
||||
* snmp plugin: the intervals given in the configuration of the SNMP plugin must no longer be a multiple of the global interval
|
||||
* table plugin: the new Table plugin provides parsing for table-like structured files, such as many files beneath /proc
|
||||
* ted plugin: the new TED plugin reads power consumption measurements from “The Energy Detective” (TED)
|
||||
* onewire plugin: the new Interval option allows collecting information from OneWire sensors at arbitrary intervals
|
||||
* ping plugin: support for collecting the drop rate and standard deviation of round-trip times has been added
|
||||
* network plugin: the possibility to sign or encrypt network traffic has been
|
||||
added
|
||||
* protocols plugin: the new protocols plugin provides information about
|
||||
network protocols, such as IP, TCP and UDP
|
||||
* snmp plugin: the intervals given in the configuration of the SNMP plugin
|
||||
must no longer be a multiple of the global interval
|
||||
* table plugin: the new Table plugin provides parsing for table-like
|
||||
structured files, such as many files beneath /proc
|
||||
* ted plugin: the new TED plugin reads power consumption measurements from
|
||||
“The Energy Detective” (TED)
|
||||
* onewire plugin: the new Interval option allows collecting information from
|
||||
OneWire sensors at arbitrary intervals
|
||||
* ping plugin: support for collecting the drop rate and standard deviation of
|
||||
round-trip times has been added
|
||||
* uptime plugin: the new uptime plugin can collect the server's uptime
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 19 00:00:00 CET 2009 - pascal.bleser@opensuse.org
|
||||
|
||||
- update to 4.6.2:
|
||||
* collection of the number of cached RR-sets has been fixed in the "BIND" plugin
|
||||
* collection of the number of cached RR-sets has been fixed in the "BIND"
|
||||
plugin
|
||||
* filter chains can now be configured without a default target
|
||||
* portability fixes have been added to the "DNS" and "Oracle" plugins
|
||||
* a typo that prevented the module from being used correctly has been
|
||||
corrected in the "TimeDiff" match
|
||||
* a possible race condition during startup has been fixed in the "RRDtool" plugin
|
||||
* a possible race condition during startup has been fixed in the "RRDtool"
|
||||
plugin
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 23 00:00:00 CET 2009 - pascal.bleser@opensuse.org
|
||||
@ -396,7 +505,8 @@ Fri Jul 21 00:00:00 CEST 2006 - guru@unixtech.be
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 16 00:00:00 CEST 2006 - guru@unixtech.be
|
||||
|
||||
- added mysql support on SUSE >= 9.3 (older versions don't have the required version >= 4.1.0)
|
||||
- added mysql support on SUSE >= 9.3 (older versions don't have the required
|
||||
version >= 4.1.0)
|
||||
- moved configure to build section
|
||||
- new upstream version
|
||||
|
||||
@ -456,7 +566,8 @@ Mon Dec 5 00:00:00 CET 2005 - guru@unixtech.be
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 9 00:00:00 CET 2005 - guru@unixtech.be
|
||||
|
||||
- had to specify --enable-serial to build the serial collect module (only on Linux)
|
||||
- had to specify --enable-serial to build the serial collect module (only on
|
||||
Linux)
|
||||
- sanitized spec file
|
||||
- new upstream version
|
||||
|
||||
|
||||
264
collectd.spec
264
collectd.spec
@ -1,23 +1,12 @@
|
||||
#
|
||||
# spec file for package collectd
|
||||
#
|
||||
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
# vim: set ts=4 sw=4 et:
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
# TODO:
|
||||
# libtokyotyrant (tcrdb.h)
|
||||
# libupsclient (.pc)
|
||||
# ? oracle ($ORACLE_HOME)
|
||||
# gmond
|
||||
|
||||
# norootforbuild
|
||||
|
||||
%if 0%{?_with_xmms:1}0 || 0%{?suse_version} <= 1020
|
||||
%if 0%{?_with_xmms:1}0
|
||||
%define xmms 1
|
||||
%else
|
||||
%define xmms 0
|
||||
@ -41,27 +30,27 @@
|
||||
%define dbi 0
|
||||
%endif
|
||||
|
||||
%if ! 0%{?_without_memcachec:1}
|
||||
%if 0%{?suse_version} >= 1100 && ! 0%{?_without_memcachec:1}
|
||||
%define memcachec 1
|
||||
%define memcached_plugin memcached
|
||||
%else
|
||||
%define memcachec 0
|
||||
%define memcached_plugin %{nil}
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version} < 1000 || 0%{?suse_version} > 1130
|
||||
%if 0%{?suse_version} < 1000
|
||||
%define libnotify 0
|
||||
%else
|
||||
%define libnotify 1
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version} > 1020
|
||||
%define snmp 1
|
||||
%define ipmi 1
|
||||
%define ascent 1
|
||||
%define ascent_plugin ascent
|
||||
%define iptables 1
|
||||
%define iptables_plugin iptables
|
||||
%else
|
||||
%define snmp 0
|
||||
%define ipmi 0
|
||||
%define ascent 0
|
||||
%define ascent_plugin %{nil}
|
||||
@ -69,11 +58,7 @@
|
||||
%define iptables_plugin %{nil}
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version} >= 1110
|
||||
%define madwifi_plugin madwifi
|
||||
%else
|
||||
%define madwifi_plugin %{nil}
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version} >= 1130
|
||||
%define rrdcached_plugin rrdcached
|
||||
@ -81,13 +66,46 @@
|
||||
%define rrdcached_plugin %{nil}
|
||||
%endif
|
||||
|
||||
%define libnetlink_version 2.6.34
|
||||
%define snmp 1
|
||||
%define with_esmtp 1
|
||||
|
||||
%define plugins apache apcups battery bind curl curl_xml conntrack contextswitch cpu cpufreq csv df disk dns email entropy exec filecount fscache hddtemp interface ipvs irq load logfile match_empty_counter match_hashed match_regex match_timediff match_value mbmon memcached memory multimeter netlink network nfs nginx ntpd olsrd openvpn perl ping protocols powerdns processes rrdtool sensors serial swap syslog table tail target_notification target_replace target_scale target_set tcpconns teamspeak2 ted thermal unixsock uptime users uuid vmem vserver wireless write_http %{expand:%ascent_plugin} %{expand:%iptables_plugin} %{expand:%madwifi_plugin} %{expand:%rrdcached_plugin}
|
||||
%if 0%{?suse_version} >= 1000
|
||||
%define yajl 1
|
||||
%define curl_json_plugin curl_json
|
||||
%define curl_xml_plugin curl_xml
|
||||
%define with_snmp_plugin 1
|
||||
%define with_pgsql 1
|
||||
%define with_mysql 1
|
||||
%define with_bind 1
|
||||
%define bind_plugin bind
|
||||
%define protobuf 1
|
||||
%define pinba_plugin pinba
|
||||
%else
|
||||
%define yajl 0
|
||||
%define curl_json_plugin %{nil}
|
||||
%define curl_xml_plugin %{nil}
|
||||
%define with_snmp_plugin 0
|
||||
%define with_pgsql 0
|
||||
%define with_mysql 0
|
||||
%define with_bind 0
|
||||
%define bind_plugin %{nil}
|
||||
%define protobuf 0
|
||||
%define pinba_plugin %{nil}
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version} >= 1210
|
||||
%define ipvs_plugin %{nil}
|
||||
%else
|
||||
%define ipvs_plugin ipvs
|
||||
%endif
|
||||
|
||||
%define libnetlink_version 2.6.37
|
||||
|
||||
%define plugins apache apcups battery %{expand:%bind_plugin} curl %{expand:%curl_json_plugin} %{expand:%curl_xml_plugin} conntrack contextswitch cpu cpufreq csv df disk dns email entropy exec filecount fscache hddtemp interface %{expand:%ipvs_plugin} irq load logfile match_empty_counter match_hashed match_regex match_timediff match_value mbmon %{expand:%memcached_plugin} memory multimeter netlink network nfs nginx ntpd olsrd openvpn perl ping protocols powerdns processes rrdtool sensors serial swap syslog table tail target_notification target_replace target_scale target_set tcpconns teamspeak2 ted thermal unixsock uptime users uuid vmem vserver wireless write_http %{expand:%ascent_plugin} %{expand:%iptables_plugin} %{expand:%madwifi_plugin} %{expand:%rrdcached_plugin}
|
||||
|
||||
Name: collectd
|
||||
Version: 4.10.2
|
||||
Release: 1
|
||||
Version: 4.10.3
|
||||
Release: 0
|
||||
Summary: Statistics Collection Daemon for filling RRD Files
|
||||
Source: http://collectd.org/files/collectd-%{version}.tar.bz2
|
||||
Source1: collectd.suse.init
|
||||
@ -113,13 +131,19 @@ Patch19: collectd-fix_spamassassin_doc.patch
|
||||
Patch20: collectd-split_README.patch
|
||||
Patch21: collectd-fix_collectd_config_path_in_snmp_probe.patch
|
||||
Patch22: collectd-collection3.patch
|
||||
Url: http://collectd.org/
|
||||
Patch23: collectd-javac_target.patch
|
||||
Patch24: collectd-pkgconfig_libnotify_add_gtk.patch
|
||||
Patch25: collectd-df-remove-duplicates.patch
|
||||
Patch26: collectd-libip4tc.patch
|
||||
Patch27: collectd-libnotify_070.patch
|
||||
Source99: collectd-rpmlintrc
|
||||
URL: http://collectd.org/
|
||||
Group: System/Monitoring
|
||||
License: GNU General Public License (GPL)
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRoot: %{_tmppath}/build-%{name}-%{version}
|
||||
Requires: sensors rrdtool
|
||||
BuildRequires: libpng-devel perl rrdtool sensors zlib-devel
|
||||
BuildRequires: bind-devel gettext gettext-devel intltool libstatgrab-devel
|
||||
BuildRequires: sensors rrdtool libpng-devel zlib-devel perl
|
||||
BuildRequires: libstatgrab-devel gettext gettext-devel intltool bind-devel
|
||||
%if 0%{?suse_version} > 1020
|
||||
BuildRequires: libdb-4_5-devel
|
||||
%else
|
||||
@ -131,27 +155,34 @@ BuildRequires: libgcrypt-devel
|
||||
BuildRequires: libgcrypt
|
||||
%endif
|
||||
BuildRequires: liboping-devel
|
||||
BuildRequires: autoconf automake gcc libtool make pkgconfig
|
||||
BuildRequires: make gcc autoconf automake libtool pkgconfig
|
||||
BuildRequires: freetype2-devel libart_lgpl-devel
|
||||
BuildRequires: python-devel
|
||||
%if %libnotify
|
||||
BuildRequires: gtk2-devel libnotify-devel
|
||||
BuildRequires: libnotify-devel gtk2-devel
|
||||
%endif
|
||||
%if %java
|
||||
BuildRequires: java-devel
|
||||
%endif #java
|
||||
# for /etc/apache2/... ownership (rpmlint):
|
||||
BuildRequires: apache2
|
||||
%if %suse_version >= 1000
|
||||
%if %with_esmtp
|
||||
BuildRequires: libesmtp-devel
|
||||
%endif
|
||||
BuildRequires: xfsprogs-devel
|
||||
%if %suse_version >= 930
|
||||
%if %with_mysql
|
||||
BuildRequires: mysql-devel >= 4.1.0
|
||||
%endif
|
||||
%if %with_pgsql
|
||||
BuildRequires: postgresql-devel
|
||||
%endif
|
||||
%if %yajl
|
||||
BuildRequires: libyajl-devel
|
||||
%endif
|
||||
%if %suse_version >= 1030
|
||||
BuildRequires: rrdtool-devel
|
||||
%endif
|
||||
%if %suse_version >= 1030
|
||||
BuildRequires: libcurl-devel
|
||||
%else
|
||||
BuildRequires: curl-devel
|
||||
@ -166,7 +197,7 @@ BuildRequires: OpenIPMI-devel gdbm-devel
|
||||
BuildRequires: net-snmp-devel
|
||||
%endif #snmp
|
||||
# for ipvs and madwifi:
|
||||
BuildRequires: kernel-source linux-kernel-headers
|
||||
BuildRequires: linux-kernel-headers kernel-source
|
||||
%if %suse_version >= 1030
|
||||
BuildRequires: libpcap-devel
|
||||
%endif
|
||||
@ -185,6 +216,12 @@ BuildRequires: libdbi-devel
|
||||
%if %memcachec
|
||||
BuildRequires: libmemcached-devel
|
||||
%endif
|
||||
%if %protobuf
|
||||
BuildRequires: protobuf-c
|
||||
%endif
|
||||
%if %suse_version >= 1210
|
||||
BuildRequires: iptables-devel
|
||||
%endif
|
||||
# in case we'd like to split it later:
|
||||
Provides: collectd-perl = %{version}-%{release}
|
||||
PreReq: %fillup_prereq
|
||||
@ -208,7 +245,6 @@ Authors:
|
||||
Florian octo Forster <octo@verplant.org>
|
||||
|
||||
%package web
|
||||
License: GNU General Public License (GPL)
|
||||
Summary: Web Frontend for watching the %{name} Statistics
|
||||
Group: System/Monitoring
|
||||
Requires: perl apache2 rrdtool
|
||||
@ -224,7 +260,6 @@ Web frontend CGI for watching %{name} statistics from a browser.
|
||||
Please look at /etc/apache2/conf.d/%{name}.conf on how to enable.
|
||||
|
||||
%package web-js
|
||||
License: GNU General Public License (GPL)
|
||||
Summary: Web/JavaScript Frontend for watching %{name} Statistics
|
||||
Group: System/Monitoring
|
||||
Requires: perl apache2 rrdtool
|
||||
@ -243,9 +278,7 @@ Please look at /etc/apache2/conf.d/%{name}-js.conf on how to
|
||||
enable.
|
||||
|
||||
%if %libnotify
|
||||
|
||||
%package plugin-notify-desktop
|
||||
|
||||
Summary: Desktop Notification Plugin for %{name}
|
||||
Group: System/Monitoring
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
@ -255,9 +288,7 @@ Desktop Notification Support for %{name}
|
||||
%endif #libnotify
|
||||
|
||||
%if %ipmi
|
||||
|
||||
%package plugin-ipmi
|
||||
License: GNU General Public License (GPL)
|
||||
Summary: OpenIPMI Monitoring Plugin for %{name}
|
||||
Group: System/Monitoring
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
@ -268,9 +299,7 @@ library, for IPMI enabled systems.
|
||||
%endif #ipmi
|
||||
|
||||
%if %snmp
|
||||
|
||||
%package plugin-snmp
|
||||
License: GNU General Public License (GPL)
|
||||
Summary: SNMP Monitoring Plugin for %{name}
|
||||
Group: System/Monitoring
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
@ -282,29 +311,27 @@ Requires: perl(Config::General)
|
||||
Optional %{name} plugin to monitor devices using SNMP.
|
||||
%endif #snmp
|
||||
|
||||
%if %suse_version >= 930
|
||||
|
||||
%if %with_mysql
|
||||
%package plugin-mysql
|
||||
License: GNU General Public License (GPL)
|
||||
Summary: MySQL Monitoring Plugin for %{name}
|
||||
Group: System/Monitoring
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description plugin-mysql
|
||||
Optional %{name} plugin to monitor MySQL server instances.
|
||||
%endif
|
||||
%endif #with_mysql
|
||||
|
||||
%if %with_pgsql
|
||||
%package plugin-postgresql
|
||||
License: GNU General Public License (GPL)
|
||||
Summary: PostgreSQL Monitoring Plugin for %{name}
|
||||
Group: System/Monitoring
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description plugin-postgresql
|
||||
Optional %{name} plugin to monitor PostgreSQL server instances.
|
||||
%endif #with_pgsql
|
||||
|
||||
%package plugin-python
|
||||
License: GNU General Public License (GPL)
|
||||
Summary: Python API for %{name}
|
||||
Group: System/Monitoring
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
@ -314,9 +341,7 @@ Optional %{name} Python API in order to write %{name} plugins in
|
||||
Python.
|
||||
|
||||
%if %java
|
||||
|
||||
%package plugin-java
|
||||
License: GNU General Public License (GPL)
|
||||
Summary: Java API for %{name}
|
||||
Group: System/Monitoring
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
@ -327,9 +352,7 @@ Java.
|
||||
%endif #java
|
||||
|
||||
%if %virt
|
||||
|
||||
%package plugin-virt
|
||||
License: GNU General Public License (GPL)
|
||||
Summary: Virtual Machine Statistics Plugin for %{name}
|
||||
Group: System/Monitoring
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
@ -340,9 +363,7 @@ machines using libvirt.
|
||||
%endif
|
||||
|
||||
%if %xmms
|
||||
|
||||
%package plugin-xmms
|
||||
License: GNU General Public License (GPL)
|
||||
Summary: XMMS Monitoring Plugin for %{name}
|
||||
Group: System/Monitoring
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
@ -353,9 +374,7 @@ bitrates of files played with XMMS.
|
||||
%endif #xmms
|
||||
|
||||
%if %dbi
|
||||
|
||||
%package plugin-dbi
|
||||
License: GNU General Public License (GPL)
|
||||
Summary: DBI Storage Plugin for %{name}
|
||||
Group: System/Monitoring
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
@ -366,9 +385,7 @@ various databases as supported by libdbi.
|
||||
%endif #dbi
|
||||
|
||||
%if %memcachec
|
||||
|
||||
%package plugin-memcachec
|
||||
License: GNU General Public License (GPL)
|
||||
Summary: Memcache Daemon Monitoring Plugin for %{name}
|
||||
Group: System/Monitoring
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
@ -377,8 +394,18 @@ Requires: %{name} = %{version}-%{release}
|
||||
Optional %{name} plugin to sample memcached statistics.
|
||||
%endif #memcachec
|
||||
|
||||
%if %protobuf
|
||||
%package plugin-pinba
|
||||
Summary: Pinba Collector Plugin for %{name}
|
||||
Group: System/Monitoring
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description plugin-pinba
|
||||
Optional %{name} plugin to receive and dispatch timing values from Pinba, a
|
||||
profiling extension for PHP.
|
||||
%endif #protobuf
|
||||
|
||||
%package plugins-all
|
||||
License: GNU General Public License (GPL)
|
||||
Summary: All Monitoring Plugins for %{name}
|
||||
Group: System/Monitoring
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
@ -388,10 +415,12 @@ Requires: %{name}-plugin-ipmi = %{version}-%{release}
|
||||
%if %snmp
|
||||
Requires: %{name}-plugin-snmp = %{version}-%{release}
|
||||
%endif #snmp
|
||||
%if %suse_version >= 930
|
||||
%if %with_mysql
|
||||
Requires: %{name}-plugin-mysql = %{version}-%{release}
|
||||
%endif #suse >= 930
|
||||
%endif #with_mysql
|
||||
%if %with_pgsql
|
||||
Requires: %{name}-plugin-postgresql = %{version}-%{release}
|
||||
%endif
|
||||
%if %java
|
||||
Requires: %{name}-plugin-java = %{version}-%{release}
|
||||
%endif #java
|
||||
@ -410,13 +439,15 @@ Requires: %{name}-plugin-dbi = %{version}-%{release}
|
||||
%if %memcachec
|
||||
Requires: %{name}-plugin-memcachec = %{version}-%{release}
|
||||
%endif #memcachec
|
||||
%if %protobuf
|
||||
Requires: %{name}-plugin-pinba = %{version}-%{release}
|
||||
%endif #protobuf
|
||||
|
||||
%description plugins-all
|
||||
Metapackage that installs %{name} and all the available
|
||||
monitoring plugin subpackages, except %{name}-plugin-xmms
|
||||
|
||||
%package spamassassin
|
||||
License: GNU General Public License (GPL)
|
||||
Summary: Spamassassin Monitoring for %{name}
|
||||
Group: System/Monitoring
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
@ -427,7 +458,6 @@ Plugin for filling %{name} with statistics from the
|
||||
SpamAsssassin anti-spam engine.
|
||||
|
||||
%package -n libcollectdclient0
|
||||
License: GNU General Public License (GPL)
|
||||
Summary: Library for %{name} clients
|
||||
Group: System/Monitoring
|
||||
Provides: libcollectdclient = %{version}-%{release}
|
||||
@ -437,7 +467,6 @@ Library which abstracts communication with the %{name}
|
||||
unixsock plugin for clients.
|
||||
|
||||
%package -n libcollectdclient-devel
|
||||
License: GNU General Public License (GPL)
|
||||
Summary: Development Environment for %{name} clients
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libcollectdclient0 = %{version}-%{release}
|
||||
@ -468,6 +497,11 @@ popd #iproute2
|
||||
%patch20
|
||||
%patch21
|
||||
%patch22
|
||||
%patch23
|
||||
%patch24
|
||||
%patch25 -p1
|
||||
%patch26 -p1
|
||||
%patch27 -p1
|
||||
|
||||
%__sed -i 's|@@VERSION@@|%{version}|g' configure.in
|
||||
|
||||
@ -475,6 +509,8 @@ popd #iproute2
|
||||
%__install -D -m0644 "%{SOURCE20}" pkgconfig/pthread.pc
|
||||
%__sed 's|@@LIB@@|%{_lib}|g' pkgconfig/pthread.pc
|
||||
|
||||
%__perl -p -i -e 's|(-L\$withval/lib)\b|${1}64|g' configure.in configure
|
||||
|
||||
# unneeded files:
|
||||
%__rm -fr \
|
||||
contrib/fedora \
|
||||
@ -511,7 +547,8 @@ autoreconf -fiv
|
||||
export PATH="$JDK_HOME/bin:$JRE_HOME/bin:$JAVA_HOME/bin:$PATH"
|
||||
|
||||
# add /usr/src/linux to include path to find net/ip_vs.h:
|
||||
export CFLAGS="%{optflags} -I$PWD/iproute2-%{libnetlink_version}/include/ -fno-strict-aliasing"
|
||||
#export CFLAGS="%{optflags} -I$PWD/iproute2-%{libnetlink_version}/include/ -fno-strict-aliasing"
|
||||
export CFLAGS="%{optflags} -fno-strict-aliasing"
|
||||
export CXXFLAGS="$CFLAGS"
|
||||
# workaround for missing pthread.pc on openSUSE, required by OpenIPMIpthread.pc
|
||||
export PKG_CONFIG_PATH="$PWD/pkgconfig:$PKG_CONFIG_PATH"
|
||||
@ -524,6 +561,7 @@ export KERNEL_DIR=/usr/src/linux
|
||||
--disable-nut \
|
||||
--enable-netlink \
|
||||
--enable-python \
|
||||
--with-librrd \
|
||||
%if %iptables
|
||||
--enable-iptables \
|
||||
%else
|
||||
@ -566,7 +604,12 @@ export KERNEL_DIR=/usr/src/linux
|
||||
--disable-serial
|
||||
%endif #os linux
|
||||
|
||||
%__make %{?jobs:-j%{jobs}}
|
||||
%__make %{?_smp_flags} \
|
||||
%if 0%{?suse_version} < 1120
|
||||
JAVAC_TARGET="-source 1.5 -target 1.5"
|
||||
%else
|
||||
JAVAC_TARGET="-source 1.5 -target 1.6"
|
||||
%endif
|
||||
|
||||
%install
|
||||
%makeinstall
|
||||
@ -577,6 +620,9 @@ export KERNEL_DIR=/usr/src/linux
|
||||
|
||||
%__sed -i '/^dependency_libs=/ s|-L'"${RPM_BUILD_DIR}/%{name}-%{version}"'/src||g' "%{buildroot}%{_libdir}/collectd/python.la"
|
||||
|
||||
# delete if it exists (not packaged any more on openSUSE):
|
||||
%__rm -rf "%{buildroot}/var/adm/perl-modules/%{name}"
|
||||
|
||||
%if !%java
|
||||
%__rm -f "%{buildroot}%{_mandir}/man5"/collectd-java.5*
|
||||
%__rm -rf "%{buildroot}%{_datadir}/collectd/java"
|
||||
@ -610,6 +656,7 @@ export KERNEL_DIR=/usr/src/linux
|
||||
%__rm contrib/collection.cgi contrib/collection.conf
|
||||
|
||||
%perl_process_packlist
|
||||
%__rm -rf "%{buildroot}/var/adm/perl-modules"/*
|
||||
|
||||
# web-js CGI frontend (_must_ be installed _after_ perl_process_packlist)
|
||||
%__install -d "%{buildroot}/srv/www/collectd-js"
|
||||
@ -666,6 +713,14 @@ pod2man \
|
||||
|
||||
find contrib/ -name '*.orig' -exec %__rm {} \;
|
||||
|
||||
%if !%with_pgsql
|
||||
%__rm -f "%{buildroot}%{_datadir}/collectd/postgresql_default.conf"
|
||||
%endif
|
||||
|
||||
%if !%with_snmp_plugin
|
||||
%__rm -f "%{buildroot}%{_mandir}/man5/collectd-snmp.5"
|
||||
%endif
|
||||
|
||||
# plugin list:
|
||||
echo -n > plugins.lst
|
||||
for plugin in %{plugins}; do
|
||||
@ -689,11 +744,10 @@ EOF
|
||||
%{fillup_only collectd}
|
||||
|
||||
%post -n libcollectdclient0 -p /sbin/ldconfig
|
||||
|
||||
%postun -n libcollectdclient0 -p /sbin/ldconfig
|
||||
|
||||
%clean
|
||||
%__rm -rf "%{buildroot}"
|
||||
%{?buildroot:%__rm -rf "%{buildroot}"}
|
||||
|
||||
%files -f plugins.lst
|
||||
%defattr(-,root,root)
|
||||
@ -706,33 +760,30 @@ EOF
|
||||
%{_sbindir}/collectd
|
||||
%{_sbindir}/collectdmon
|
||||
%dir %{_libdir}/collectd
|
||||
%if %suse_version >= 1000
|
||||
%if %with_esmtp
|
||||
%{_libdir}/collectd/notify_email.so
|
||||
%{_libdir}/collectd/notify_email.la
|
||||
%endif
|
||||
%endif #with_esmtp
|
||||
%dir %{_datadir}/collectd
|
||||
%{_datadir}/collectd/types.db
|
||||
%{perl_vendorlib}/Collectd.pm
|
||||
%dir %{perl_vendorlib}/Collectd
|
||||
%{perl_vendorlib}/Collectd/*
|
||||
%{perl_vendorarch}/auto/Collectd
|
||||
%doc %{_mandir}/man1/collectd.1*
|
||||
%doc %{_mandir}/man1/collectdmon.1*
|
||||
%doc %{_mandir}/man1/collectd-nagios.1*
|
||||
%doc %{_mandir}/man1/cussh.1*
|
||||
%doc %{_mandir}/man5/collectd.conf.5*
|
||||
%doc %{_mandir}/man5/collectd-email.5*
|
||||
%doc %{_mandir}/man5/collectd-exec.5*
|
||||
%doc %{_mandir}/man5/collectd-perl.5*
|
||||
%doc %{_mandir}/man5/collectd-unixsock.5*
|
||||
%doc %{_mandir}/man5/types.db.5*
|
||||
%doc %{perl_man3dir}/Collectd::Unixsock.%{perl_man3ext}*
|
||||
%doc %{_mandir}/man1/collectd.1%{ext_man}
|
||||
%doc %{_mandir}/man1/collectdmon.1%{ext_man}
|
||||
%doc %{_mandir}/man1/collectd-nagios.1%{ext_man}
|
||||
%doc %{_mandir}/man1/cussh.1%{ext_man}
|
||||
%doc %{_mandir}/man5/collectd.conf.5%{ext_man}
|
||||
%doc %{_mandir}/man5/collectd-email.5%{ext_man}
|
||||
%doc %{_mandir}/man5/collectd-exec.5%{ext_man}
|
||||
%doc %{_mandir}/man5/collectd-perl.5%{ext_man}
|
||||
%doc %{_mandir}/man5/collectd-unixsock.5%{ext_man}
|
||||
%doc %{_mandir}/man5/types.db.5%{ext_man}
|
||||
%doc %{perl_man3dir}/Collectd::Unixsock.%{perl_man3ext}%{ext_man}
|
||||
%dir %{_localstatedir}/lib/collectd
|
||||
/etc/init.d/collectd
|
||||
/usr/sbin/rccollectd
|
||||
%if 0%{?suse_version} == 0 || 0%{?suse_version} <= 1130
|
||||
/var/adm/perl-modules/%{name}
|
||||
%endif
|
||||
|
||||
%files web
|
||||
%defattr(-,root,root)
|
||||
@ -751,7 +802,6 @@ EOF
|
||||
%{_usr}/lib/collectd-js
|
||||
|
||||
%if %libnotify
|
||||
|
||||
%files plugin-notify-desktop
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/collectd/notify_desktop.so
|
||||
@ -759,7 +809,6 @@ EOF
|
||||
%endif #libnotify
|
||||
|
||||
%if %ipmi
|
||||
|
||||
%files plugin-ipmi
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/collectd/ipmi.so
|
||||
@ -767,50 +816,57 @@ EOF
|
||||
%endif #ipmi
|
||||
|
||||
%if %snmp
|
||||
|
||||
%files plugin-snmp
|
||||
%defattr(-,root,root)
|
||||
%doc _rpmdoc_/snmp/*
|
||||
%{_bindir}/collectd-snmp-probe-host
|
||||
%doc %{_mandir}/man1/collectd-snmp-probe-host.1%{ext_man}
|
||||
%if %with_snmp_plugin
|
||||
%{_libdir}/collectd/snmp.so
|
||||
%{_libdir}/collectd/snmp.la
|
||||
%doc %{_mandir}/man1/collectd-snmp-probe-host.1*
|
||||
%doc %{_mandir}/man5/collectd-snmp.5*
|
||||
%doc %{_mandir}/man5/collectd-snmp.5%{ext_man}
|
||||
%endif #with_snmp_plugin
|
||||
%endif #snmp
|
||||
|
||||
%if %suse_version >= 930
|
||||
%if %protobuf
|
||||
%files plugin-pinba
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/collectd/pinba.so
|
||||
%{_libdir}/collectd/pinba.la
|
||||
%endif #protobuf
|
||||
|
||||
%if %suse_version >= 930
|
||||
%files plugin-mysql
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/collectd/mysql.so
|
||||
%{_libdir}/collectd/mysql.la
|
||||
%endif
|
||||
|
||||
%if %with_pgsql
|
||||
%files plugin-postgresql
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/collectd/postgresql.so
|
||||
%{_libdir}/collectd/postgresql.la
|
||||
%config %{_datadir}/collectd/postgresql_default.conf
|
||||
%endif #with_pgsql
|
||||
|
||||
%files plugin-python
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/collectd/python.so
|
||||
%{_libdir}/collectd/python.la
|
||||
%doc %{_mandir}/man5/collectd-python.5*
|
||||
%doc %{_mandir}/man5/collectd-python.5%{ext_man}
|
||||
|
||||
%if %java
|
||||
|
||||
%files plugin-java
|
||||
%defattr(-,root,root)
|
||||
%doc _rpmdoc_/java/GenericJMX.conf
|
||||
%{_libdir}/collectd/java.so
|
||||
%{_libdir}/collectd/java.la
|
||||
%{_datadir}/collectd/java
|
||||
%doc %{_mandir}/man5/collectd-java.5*
|
||||
%doc %{_mandir}/man5/collectd-java.5%{ext_man}
|
||||
%endif #java
|
||||
|
||||
%if %virt
|
||||
|
||||
%files plugin-virt
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/collectd/libvirt.so
|
||||
@ -818,7 +874,6 @@ EOF
|
||||
%endif #virt
|
||||
|
||||
%if %xmms
|
||||
|
||||
%files plugin-xmms
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/collectd/xmms.so
|
||||
@ -826,7 +881,6 @@ EOF
|
||||
%endif #xmms
|
||||
|
||||
%if %dbi
|
||||
|
||||
%files plugin-dbi
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/collectd/dbi.so
|
||||
@ -834,7 +888,6 @@ EOF
|
||||
%endif #dbi
|
||||
|
||||
%if %memcachec
|
||||
|
||||
%files plugin-memcachec
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/collectd/memcachec.so
|
||||
@ -849,7 +902,7 @@ EOF
|
||||
%dir %{perl_vendorlib}/Mail/SpamAssassin
|
||||
%dir %{perl_vendorlib}/Mail/SpamAssassin/Plugin
|
||||
%{perl_vendorlib}/Mail/SpamAssassin/Plugin/Collectd.pm
|
||||
%doc %{perl_man3dir}/Mail::SpamAssassin::Plugin::Collectd.%{perl_man3ext}*
|
||||
%doc %{perl_man3dir}/Mail::SpamAssassin::Plugin::Collectd.%{perl_man3ext}%{ext_man}
|
||||
|
||||
%files plugins-all
|
||||
%defattr(-,root,root)
|
||||
@ -866,9 +919,4 @@ EOF
|
||||
%{_libdir}/libcollectdclient.so
|
||||
%{_libdir}/pkgconfig/libcollectdclient.pc
|
||||
|
||||
# vim: set sw=3 ts=3 noet:
|
||||
# Local Variables:
|
||||
# mode: rpm-spec
|
||||
# tab-width: 3
|
||||
# End:
|
||||
%changelog
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f7feb3c34df4714cae0265f7629863af8b0a88550f4f38aba0ffc81a10c29bbb
|
||||
size 385281
|
||||
3
iproute2-2.6.37.tar.bz2
Normal file
3
iproute2-2.6.37.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:71754f8ad68facdb97d0cb9d7a298dc7f1ba069370bce902b661e06959f264e3
|
||||
size 388866
|
||||
Loading…
Reference in New Issue
Block a user