pool/collectd
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 197516 from server:monitoring

Browse Source 
->

OBS-URL: https://build.opensuse.org/request/show/197516
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/collectd?expand=0&rev=15
This commit is contained in:
Stephan Kulow 2013-09-11 09:27:28 +00:00 committed by Git OBS Bridge
commit 431886e7a1
16 changed files with 183 additions and 424 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
collectd-5.0.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d55c33e411b6fe3333168654009492154b97690b1719e3808a99fdff4936101d
size 1317954

3
collectd-5.4.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:90973894a1f10775d409fe23ce7bc4d89c1b7c6f4d9918b305d160605871923e
size 1506520

124
collectd-collection3.patch
View File

@ -1,124 +0,0 @@
--- contrib/collection3/bin/graph.cgi.orig 2009-10-07 23:29:32.000000000 +0200
+++ contrib/collection3/bin/graph.cgi 2009-10-07 23:51:50.000000000 +0200
@@ -2,10 +2,9 @@
use strict;
use warnings;
-use lib ('../lib');
+use lib ('/usr/lib/collectd-js');
use utf8;
-use FindBin ('$RealBin');
use Carp (qw(confess cluck));
use CGI (':cgi');
use RRDs ();
@@ -49,7 +48,7 @@
HTTP
}
-gc_read_config ("$RealBin/../etc/collection.conf");
+gc_read_config ("/etc/collectd/collection-js.conf");
if ($GraphWidth)
{
--- contrib/collection3/bin/index.cgi.orig 2009-10-07 23:30:27.000000000 +0200
+++ contrib/collection3/bin/index.cgi 2009-10-07 23:52:09.000000000 +0200
@@ -17,11 +17,10 @@
use strict;
use warnings;
-use lib ('../lib');
+use lib ('/usr/lib/collectd-js');
use utf8;
use Carp (qw(cluck confess));
-use FindBin ('$RealBin');
use CGI (':cgi');
use CGI::Carp ('fatalsToBrowser');
use HTML::Entities ('encode_entities');
@@ -59,7 +58,7 @@
exit 1;
}
-gc_read_config ("$RealBin/../etc/collection.conf");
+gc_read_config ("/etc/collectd/collection-js.conf");
$Actions{$action}->();
exit (0);
@@ -144,9 +143,9 @@
print <<HTML;
<head>
<title>collection.cgi, Version 3</title>
- <link rel="icon" href="../share/shortcut-icon.png" type="image/png" />
- <link rel="stylesheet" href="../share/style.css" type="text/css" />
- <script type="text/javascript" src="../share/navigate.js"></script>
+ <link rel="icon" href="shortcut-icon.png" type="image/png" />
+ <link rel="stylesheet" href="style.css" type="text/css" />
+ <script type="text/javascript" src="navigate.js"></script>
</head>
<body onload="nav_init ($begin, $end);">
HTML
--- contrib/collection3/bin/json.cgi.orig 2009-10-07 23:30:58.000000000 +0200
+++ contrib/collection3/bin/json.cgi 2009-10-07 23:51:33.000000000 +0200
@@ -17,10 +17,9 @@
use strict;
use warnings;
-use lib ('../lib');
+use lib ('/usr/lib/collectd-js');
use utf8;
-use FindBin ('$RealBin');
use CGI (':cgi');
use CGI::Carp ('fatalsToBrowser');
use URI::Escape ('uri_escape');
@@ -36,7 +35,7 @@
our $Debug = param ('debug') ? 1 : 0;
our $ServerName = 'collect.noris.net';
-gc_read_config ("$RealBin/../etc/collection.conf");
+gc_read_config ("/etc/collectd/collection-js.conf");
if ($Debug)
{
--- contrib/collection3/etc/collection.conf.orig 2009-10-07 23:52:29.000000000 +0200
+++ contrib/collection3/etc/collection.conf 2009-10-07 23:52:34.000000000 +0200
@@ -1,4 +1,4 @@
-#DataDir "/var/lib/collectd/rrd"
+#DataDir "/var/lib/collectd"
GraphWidth 400
#UnixSockAddr "/var/run/collectd-unixsock"
<Type apache_bytes>
--- contrib/collection3/lib/Collectd/Graph/Common.pm.orig 2009-10-07 23:36:33.000000000 +0200
+++ contrib/collection3/lib/Collectd/Graph/Common.pm 2009-10-07 23:36:39.000000000 +0200
@@ -44,7 +44,7 @@
flush_files
));
-our $DefaultDataDir = '/var/lib/collectd/rrd';
+our $DefaultDataDir = '/var/lib/collectd';
return (1);
--- contrib/collection3/lib/Collectd/Graph/Config.pm.orig 2009-10-07 23:35:15.000000000 +0200
+++ contrib/collection3/lib/Collectd/Graph/Config.pm 2009-10-07 23:35:31.000000000 +0200
@@ -57,7 +57,7 @@
return (1);
}
- $file ||= "etc/collection.conf";
+ $file ||= "/etc/collectd/collection-js.conf";
%conf = ParseConfig (-ConfigFile => $file,
-LowerCaseNames => 1,
--- contrib/collection3/lib/Collectd/Config.pm.orig 2009-10-07 23:32:23.000000000 +0200
+++ contrib/collection3/lib/Collectd/Config.pm 2009-10-07 23:34:57.000000000 +0200
@@ -58,7 +58,7 @@
return (1);
}
- $file ||= "etc/collection.conf";
+ $file ||= "/etc/collectd/collection-js.conf";
%conf = ParseConfig (-ConfigFile => $file,
-LowerCaseNames => 1,

66
collectd-fix-config.patch
View File

@ -1,21 +1,6 @@
--- src/collectd.conf.in.orig 2012-01-26 01:12:16.191115559 +0100 --- src/collectd.conf.in.orig 2013-06-04 02:22:35.386712789 +0200
+++ src/collectd.conf.in 2012-01-26 01:13:39.662112590 +0100 +++ src/collectd.conf.in 2013-06-04 02:24:33.579744915 +0200
@@ -12,10 +12,10 @@ @@ -211,7 +211,7 @@
#Hostname "localhost"
#FQDNLookup true
-#BaseDir "@prefix@/var/lib/@PACKAGE_NAME@"
-#PIDFile "@prefix@/var/run/@PACKAGE_NAME@.pid"
-#PluginDir "@prefix@/lib/@PACKAGE_NAME@"
-#TypesDB "@prefix@/share/@PACKAGE_NAME@/types.db"
+#BaseDir "/var/lib/@PACKAGE_NAME@"
+#PIDFile "/var/run/@PACKAGE_NAME@.pid"
+#PluginDir "@libdir@/@PACKAGE_NAME@"
+#TypesDB "@libdir@/@PACKAGE_NAME@/types.db"
#Interval 10
#Timeout 2
#ReadThreads 5
@@ -173,7 +173,7 @@
#<Plugin apache> #<Plugin apache>
# <Instance "local"> # <Instance "local">
# URL "http://localhost/status?auto" # URL "http://localhost/status?auto"
@ -24,7 +9,7 @@
# Password "secret" # Password "secret"
# CACert "/etc/ssl/ca.crt" # CACert "/etc/ssl/ca.crt"
# </Instance> # </Instance>
@@ -186,7 +186,7 @@ @@ -225,7 +225,7 @@
#<Plugin ascent> #<Plugin ascent>
# URL "http://localhost/ascent/status/" # URL "http://localhost/ascent/status/"
@ -33,46 +18,3 @@
# Password "secret" # Password "secret"
# CACert "/etc/ssl/ca.crt" # CACert "/etc/ssl/ca.crt"
#</Plugin> #</Plugin>
@@ -211,7 +211,7 @@
#</Plugin>
#<Plugin csv>
-# DataDir "@prefix@/var/lib/@PACKAGE_NAME@/csv"
+# DataDir "/var/lib/@PACKAGE_NAME@/csv"
# StoreRates false
#</Plugin>
@@ -324,7 +324,7 @@
#</Plugin>
#<Plugin email>
-# SocketFile "@prefix@/var/run/@PACKAGE_NAME@-email"
+# SocketFile "/var/run/@PACKAGE_NAME@-email"
# SocketGroup "collectd"
# SocketPerms "0770"
# MaxConns 5
@@ -786,13 +786,13 @@
#<Plugin rrdcached>
# DaemonAddress "unix:/tmp/rrdcached.sock"
-# DataDir "@prefix@/var/lib/@PACKAGE_NAME@/rrd"
+# DataDir "/var/lib/@PACKAGE_NAME@/rrd"
# CreateFiles true
# CollectStatistics true
#</Plugin>
#<Plugin rrdtool>
-# DataDir "@prefix@/var/lib/@PACKAGE_NAME@/rrd"
+# DataDir "/var/lib/@PACKAGE_NAME@/rrd"
# CacheTimeout 120
# CacheFlush 900
#</Plugin>
@@ -913,7 +913,7 @@
#</Plugin>
#<Plugin unixsock>
-# SocketFile "@prefix@/var/run/@PACKAGE_NAME@-unixsock"
+# SocketFile "/var/run/@PACKAGE_NAME@-unixsock"
# SocketGroup "collectd"
# SocketPerms "0660"
# DeleteSocket false

20
collectd-fix-warnings.patch
View File

@ -1,20 +0,0 @@
--- src/netlink.c.orig 2009-02-17 12:56:09.000000000 +0100
+++ src/netlink.c 2009-02-17 12:56:44.000000000 +0100
@@ -573,7 +573,7 @@
}
if (rtnl_dump_filter (&rth, link_filter, /* arg1 = */ NULL,
- NULL, NULL) != 0)
+ (rtnl_filter_t)NULL, NULL) != 0)
{
ERROR ("netlink plugin: ir_read: rtnl_dump_filter failed.");
return (-1);
@@ -611,7 +611,7 @@
}
if (rtnl_dump_filter (&rth, qos_filter, (void *) &ifindex,
- NULL, NULL) != 0)
+ (rtnl_filter_t)NULL, NULL) != 0)
{
ERROR ("netlink plugin: ir_read: rtnl_dump_filter failed.");
continue;

14
collectd-fix_libltdl_autoreconf.patch
View File

@ -1,19 +1,19 @@
--- Makefile.in.orig 2012-01-26 01:15:11.357109327 +0100 --- Makefile.in.orig 2013-06-04 02:28:14.547813510 +0200
+++ Makefile.in 2012-01-26 01:15:34.625108499 +0100 +++ Makefile.in 2013-06-04 02:28:22.270816101 +0200
@@ -342,7 +342,7 @@ @@ -346,7 +346,7 @@
top_build_prefix = @top_build_prefix@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
-ACLOCAL_AMFLAGS = -I libltdl/m4 -ACLOCAL_AMFLAGS = -I libltdl/m4
+ACLOCAL_AMFLAGS = -I libltdl +ACLOCAL_AMFLAGS = -I libltdl
SUBDIRS = libltdl src bindings SUBDIRS = libltdl src bindings .
INCLUDES = $(LTDLINCL) INCLUDES = $(LTDLINCL)
EXTRA_DIST = contrib version-gen.sh EXTRA_DIST = contrib version-gen.sh
--- Makefile.am.orig 2012-01-26 01:15:36.301108441 +0100 --- Makefile.am.orig 2013-06-04 02:28:28.047818050 +0200
+++ Makefile.am 2012-01-26 01:15:41.577108253 +0100 +++ Makefile.am 2013-06-04 02:28:32.101819418 +0200
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-ACLOCAL_AMFLAGS = -I libltdl/m4 -ACLOCAL_AMFLAGS = -I libltdl/m4
+ACLOCAL_AMFLAGS = -I libltdl +ACLOCAL_AMFLAGS = -I libltdl
SUBDIRS = libltdl src bindings SUBDIRS = libltdl src bindings .

73
collectd-fix_own_iptc.patch
View File

@ -1,73 +0,0 @@
--- src/owniptc/libiptc.c.orig 2012-02-19 17:40:40.717235267 +0100
+++ src/owniptc/libiptc.c 2012-02-19 17:43:13.324229837 +0100
@@ -81,7 +81,7 @@
};
/* Convenience structures */
-struct ipt_error_target
+struct x_ipt_error_target
{
STRUCT_ENTRY_TARGET t;
char error[TABLE_MAXNAMELEN];
@@ -1007,10 +1007,10 @@
/* Convenience structures */
struct iptcb_chain_start{
STRUCT_ENTRY e;
- struct ipt_error_target name;
+ struct x_ipt_error_target name;
};
#define IPTCB_CHAIN_START_SIZE (sizeof(STRUCT_ENTRY) + \
- ALIGN(sizeof(struct ipt_error_target)))
+ ALIGN(sizeof(struct x_ipt_error_target)))
struct iptcb_chain_foot {
STRUCT_ENTRY e;
@@ -1021,10 +1021,10 @@
struct iptcb_chain_error {
STRUCT_ENTRY entry;
- struct ipt_error_target target;
+ struct x_ipt_error_target target;
};
#define IPTCB_CHAIN_ERROR_SIZE (sizeof(STRUCT_ENTRY) + \
- ALIGN(sizeof(struct ipt_error_target)))
+ ALIGN(sizeof(struct x_ipt_error_target)))
@@ -1069,7 +1069,7 @@
head->e.next_offset = IPTCB_CHAIN_START_SIZE;
strcpy(head->name.t.u.user.name, ERROR_TARGET);
head->name.t.u.target_size =
- ALIGN(sizeof(struct ipt_error_target));
+ ALIGN(sizeof(struct x_ipt_error_target));
strcpy(head->name.error, c->name);
} else {
repl->hook_entry[c->hooknum-1] = c->head_offset;
@@ -1113,7 +1113,7 @@
if (!iptcc_is_builtin(c)) {
/* Chain has header */
*offset += sizeof(STRUCT_ENTRY)
- + ALIGN(sizeof(struct ipt_error_target));
+ + ALIGN(sizeof(struct x_ipt_error_target));
(*num)++;
}
@@ -1153,7 +1153,7 @@
/* Append one error rule at end of chain */
num++;
offset += sizeof(STRUCT_ENTRY)
- + ALIGN(sizeof(struct ipt_error_target));
+ + ALIGN(sizeof(struct x_ipt_error_target));
/* ruleset size is now in offset */
*size = offset;
@@ -1177,7 +1177,7 @@
error->entry.target_offset = sizeof(STRUCT_ENTRY);
error->entry.next_offset = IPTCB_CHAIN_ERROR_SIZE;
error->target.t.u.user.target_size =
- ALIGN(sizeof(struct ipt_error_target));
+ ALIGN(sizeof(struct x_ipt_error_target));
strcpy((char *)&error->target.t.u.user.name, ERROR_TARGET);
strcpy((char *)&error->target.error, "ERROR");

24
collectd-iproute2-HZ.patch
View File

@ -1,24 +0,0 @@
--- lib/utils.c.orig 2008-04-17 19:12:54.000000000 +0200
+++ lib/utils.c 2008-05-08 00:20:27.000000000 +0200
@@ -33,6 +33,10 @@
#include "utils.h"
+#ifndef HZ
+#define HZ sysconf(_SC_CLK_TCK)
+#endif
+
int get_integer(int *val, const char *arg, int base)
{
long res;
@@ -430,8 +434,8 @@
int inet_addr_match(const inet_prefix *a, const inet_prefix *b, int bits)
{
- const __u32 *a1 = a->data;
- const __u32 *a2 = b->data;
+ const __u32 *a1 = (__u32*)a->data;
+ const __u32 *a2 = (__u32*)b->data;
int words = bits >> 0x05;
bits &= 0x1f;

16
collectd-perl-vendor.patch
View File

@ -1,11 +1,11 @@
--- bindings/Makefile.am.orig 2008-01-22 09:16:05.000000000 +0100 --- bindings/Makefile.am.orig 2013-06-04 02:26:20.688776802 +0200
+++ bindings/Makefile.am 2008-01-22 09:16:18.000000000 +0100 +++ bindings/Makefile.am 2013-06-04 02:26:33.551780804 +0200
@@ -3,7 +3,7 @@ @@ -29,7 +29,7 @@
all-local: @PERL_BINDINGS@
install-exec-local: install-exec-local:
- [ ! -f perl/Makefile ] || ( cd perl && $(MAKE) install ) - [ ! -f buildperl/Makefile ] || ( cd buildperl && $(MAKE) install )
+ [ ! -f perl/Makefile ] || ( cd perl && $(MAKE) install_vendor ) + [ ! -f buildperl/Makefile ] || ( cd buildperl && $(MAKE) install_vendor )
clean-local: # Perl 'make uninstall' does not work as well as wanted.
[ ! -f perl/Makefile ] || ( cd perl && $(MAKE) realclean ) # So we do the work here.

28
collectd-pkgconfig_libnotify_add_gtk.patch
View File

@ -1,6 +1,6 @@
--- configure.orig 2012-01-26 01:16:29.955106532 +0100 --- configure.orig 2013-08-23 07:39:03.431280602 +0200
+++ configure 2012-01-26 01:17:57.822103406 +0100 +++ configure 2013-08-23 07:40:51.242303290 +0200
@@ -23690,11 +23690,11 @@ @@ -26052,11 +26052,11 @@
elif test -n "$PKG_CONFIG"; then elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify\""; } >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify\""; } >&5
@ -11,10 +11,10 @@
test $ac_status = 0; }; then test $ac_status = 0; }; then
- pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify" 2>/dev/null` - 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` + pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify" "gtk+-2.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else else
pkg_failed=yes pkg_failed=yes
fi @@ -26069,11 +26069,11 @@
@@ -23706,11 +23706,11 @@
elif test -n "$PKG_CONFIG"; then elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify\""; } >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify\""; } >&5
@ -25,24 +25,24 @@
test $ac_status = 0; }; then test $ac_status = 0; }; then
- pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify" 2>/dev/null` - 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` + pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify" "gtk+-2.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else else
pkg_failed=yes pkg_failed=yes
fi @@ -26094,9 +26094,9 @@
@@ -23730,9 +23730,9 @@
_pkg_short_errors_supported=no _pkg_short_errors_supported=no
fi fi
if test $_pkg_short_errors_supported = yes; then if test $_pkg_short_errors_supported = yes; then
- LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnotify" 2>&1` - LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnotify" 2>&1`
+ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnotify" "gtk+-2.0" 2>&1` + LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnotify" "gtk+-2.0" 2>&1`
else else
- LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnotify" 2>&1` - LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnotify" 2>&1`
+ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnotify" "gtk+-2.0" 2>&1` + LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnotify" "gtk+-2.0" 2>&1`
fi fi
# Put the nasty error message in config.log where it belongs # Put the nasty error message in config.log where it belongs
echo "$LIBNOTIFY_PKG_ERRORS" >&5 echo "$LIBNOTIFY_PKG_ERRORS" >&5
--- configure.in.orig 2012-01-26 01:16:14.664107075 +0100 --- configure.in.orig 2013-08-23 07:40:53.933303888 +0200
+++ configure.in 2012-01-26 01:16:28.342106589 +0100 +++ configure.in 2013-08-23 07:41:03.963306130 +0200
@@ -4184,7 +4184,7 @@ @@ -4612,7 +4612,7 @@
fi fi
# }}} # }}}

10
collectd-split_README.patch
View File

@ -1,5 +1,5 @@
--- contrib/README.orig 2009-10-07 22:17:58.000000000 +0200 --- contrib/README.orig 2013-06-04 02:29:18.736835454 +0200
+++ contrib/README 2009-10-07 22:45:41.000000000 +0200 +++ contrib/README 2013-06-04 02:29:59.160849717 +0200
@@ -28,22 +28,6 @@ @@ -28,22 +28,6 @@
`/var/lib/collectd/' and generate an HTML file and a directory containing `/var/lib/collectd/' and generate an HTML file and a directory containing
several PNG files which are graphs of the RRD files found. several PNG files which are graphs of the RRD files found.
@ -51,7 +51,7 @@
snmp-data.conf snmp-data.conf
-------------- --------------
Sample configuration for the SNMP plugin. This config includes a few standard Sample configuration for the SNMP plugin. This config includes a few standard
@@ -97,7 +67,3 @@ @@ -97,11 +67,6 @@
whatever people have send in. If you have some more definitions please send whatever people have send in. If you have some more definitions please send
them in, so others can profit from it. them in, so others can profit from it.
@ -59,3 +59,7 @@
------------ ------------
- Manifest file for the Solaris SMF system and detailed information on how to - Manifest file for the Solaris SMF system and detailed information on how to
-register collectd as a service with this system. -register collectd as a service with this system.
-
collectd.service
----------------
Service file for systemd. Please ship this file as

8
collectd-version.patch
View File

@ -1,9 +1,9 @@
--- configure.in.orig 2012-01-26 01:14:21.392111105 +0100 --- configure.in.orig 2013-06-04 02:25:25.850760151 +0200
+++ configure.in 2012-01-26 01:14:41.350110395 +0100 +++ configure.in 2013-06-04 02:25:50.593767582 +0200
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
-AC_INIT(collectd, m4_esyscmd(./version-gen.sh)) -AC_INIT(collectd, [m4_esyscmd(./version-gen.sh)])
+AC_INIT(collectd, @@VERSION@@) +AC_INIT(collectd, [@@VERSION@@])
AC_CONFIG_SRCDIR(src/collectd.c) AC_CONFIG_SRCDIR(src/collectd.c)
AC_CONFIG_HEADERS(src/config.h) AC_CONFIG_HEADERS(src/config.h)
AC_CONFIG_AUX_DIR([libltdl/config]) AC_CONFIG_AUX_DIR([libltdl/config])

105
collectd.changes
View File

@ -1,3 +1,108 @@
-------------------------------------------------------------------
Thu Sep 5 17:19:25 CEST 2013 - mls@suse.de
- add libperl_requires, as we link against libperl and thus
need a specific version of perl
-------------------------------------------------------------------
Fri Aug 23 05:33:18 UTC 2013 - pascal.bleser@opensuse.org
- update to 5.4.0:
* collectd: The "LoadPlugin" config option no longer attempts to load
plugins twice. If more than one "LoadPlugin" statement or block is
encountered, only the first will have any effect.
* collectd: The "AutoLoadPlugin" option allows to automatically load
plugins for which a configuration is found.
* collectd: The "WriteQueueLimitHigh" and "WriteQueueLimitLow" options
allow collectd to drop values when under stress, to avoid running out
of memory.
* amqp plugin: The "GraphiteSeparateInstances" and
"GraphiteAlwaysAppendDS" options have been added.
* aquaero plugin: This new plugin reads various metrics, e.g. fan
speeds and temperatures, from Aquaero 5, a fan and water cooling
control panel.
* curl plugin: The "MeasureResponseCode" option has been added.
* curl_json plugin: Support for UNIX domain sockets and array wildcards
has been added.
* curl_xml plugin: Support for long URLs has been improved.
* cgroups plugin: This new plugin collects CPU accounting information
for processes in a cgroup.
* df plugin: The "ValuesAbsolute" and "ValuesPercentage" options have
been added.
* exec plugin: Do UID / GID lookups before forking. This should prevent
a race condition in the NSS library.
* lvm plugin: This new plugin collects size information from Linux'
Logical Volume Manager (LVM).
* memcached plugin: Support for increment and decrement counts has been
added.
* mic plugin: This new plugin collects CPU and memory usage, power
consumption and temperatures of Intel's Many-Integrated-Core (MIC)
architecture, such as Xeon Phi cards.
* netlink plugin: This plugin has been converted to use the supported
"libmnl" library.
* nginx plugin: Collection of accepted and handled connections has been
added.
* sigrok plugin: This new plugin collects metrics from sigrok, a signal
processing framework reading various hardware devices, from light
meters to spectrum analyzers.
* statsd plugin: This new plugin listens to a UDP socket and reads
metrics in the StatsD format.
* varnish plugin: Many additional metrics have been added.
* write_graphite plugin: Support for "UDP" has been added.
* write_riemann plugin: The "TTLFactor" option has been added.
- changes from 5.3.1:
* Configuration: Fix error handling: Errors in included files were
ignored, causing configuration mistakes to go unnoticed.
* dns plugin: Don't abort when PCAP returns an error.
* modbus plugin: The reconnection strategy was improved, fixing a
segfault in the libmodbud library.
* mysql plugin: The notification about a newly running MySQL slave
thread has been fixed.
* snmp plugin: A build issue has been fixed (C99 mixed declaration).
* threshold plugin: Handling of the "Interesting" configuration option
has been fixed.
* write_riemann plugin: A memory leak has been fixed.
- dropped collectd-fix-warnings.patch, as it only fixed warnings in the
netlink plugin, which has been rewritten
- disable dns plugin on SLE_11_SP2, libpcap too old there
-------------------------------------------------------------------
Fri Aug 23 05:26:54 UTC 2013 - pascal.bleser@opensuse.org
- update to 5.3.0:
* collectd: The "Include" statements can now be limited to include
only matching files in a directory
* collectd: Dispatches / writes are now handled by a thread pool. This
improves reliability and throughput for instances configured to act
as a "server"
* aggregation plugin: Selection of value lists is now possible using
regular expressions. Parts of the identifier of the resulting metric
can now be set via the configuration file.
* apcups plugin: The "ReportSeconds" option has been implemented.
* curl* plugins: Support for POST requests and custom request headers
has been added
* curl_xml plugin: Support for XML namespaces has been added.
* dbi plugin: Support for numeric options has been added. The
"Host" option has been added.
* disk plugin: Support for systems with >256 has been fixed
* libvirt plugin: Support for memory allocation has been added.
* netapp plugin: Support for "SnapVault", "VFiler" and deduplication /
compression and quota metrics.
* postgresql plugin: The reconnection logic has been improved.
* rrdtool, rrdcached plugins: The "CreateFilesAsync" option has been
implemented. When enabled, new RRD files will be created
asynchronously, which improved throughput of "server" instances.
* tail_csv plugin: This new plugins allows to read metrics from CSV
files, such as Snort's statistics file.
* write_mongodb plugin: Authentication options have been added.
* write_riemann plugin: This new plugin allows sending metrics to
Riemann, a stream processing and alerting tool.
- dropped own copy of iproute2, builds properly with the one provided
by the system
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 1 08:54:24 UTC 2013 - tchvatal@suse.com Thu Aug 1 08:54:24 UTC 2013 - tchvatal@suse.com

96
collectd.spec
View File

@ -3,7 +3,7 @@
# spec file for package collectd # spec file for package collectd
# #
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2005-2012 Pascal Bleser <pascal.bleser@opensuse.org> # Copyright (c) 2005-2013 Pascal Bleser <pascal.bleser@opensuse.org>
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -18,9 +18,6 @@
# #
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%if 0%{?_with_xmms:1}0 %if 0%{?_with_xmms:1}0
%define xmms 1 %define xmms 1
%else %else
@ -81,6 +78,15 @@
%define rrdcached_plugin %{nil} %define rrdcached_plugin %{nil}
%endif %endif
%define pcap_version %({rpm -q --qf='%{VERSION}\n' libpcap-devel 2>/dev/null || echo 0.0.0} | %__awk -F. '{print $1*10000+$2*100+$3}')
%if %pcap_version >= 10000
%define dns 1
%define dns_plugin dns
%else
%define dns 0
%define dns_plugin %{nil}
%endif
%define snmp 1 %define snmp 1
%define with_esmtp 1 %define with_esmtp 1
@ -110,13 +116,10 @@
%define ipvs_plugin ipvs %define ipvs_plugin ipvs
%define libnetlink_version 2.6.37 %define plugins apache apcups battery %{expand:%bind_plugin} cgroups curl %{expand:%curl_json_plugin} %{expand:%curl_xml_plugin} conntrack contextswitch cpu cpufreq csv df disk %{expand:%dns_plugin} 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 statsd swap syslog table tail target_notification target_replace target_scale target_set target_v5upgrade tcpconns teamspeak2 ted thermal threshold unixsock uptime users uuid vmem vserver wireless write_http %{expand:%ascent_plugin} %{expand:%iptables_plugin} %{expand:%madwifi_plugin} %{expand:%rrdcached_plugin} aggregation ethstat md numa tail_csv write_graphite write_riemann
%define intree_netlink 1
%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 target_v5upgrade tcpconns teamspeak2 ted thermal threshold unixsock uptime users uuid vmem vserver wireless write_http %{expand:%ascent_plugin} %{expand:%iptables_plugin} %{expand:%madwifi_plugin} %{expand:%rrdcached_plugin}
Name: collectd Name: collectd
Version: 5.0.4 Version: 5.4.0
Release: 0 Release: 0
Summary: Statistics Collection Daemon for filling RRD Files Summary: Statistics Collection Daemon for filling RRD Files
License: GPL-2.0 License: GPL-2.0
@ -125,10 +128,6 @@ Source: http://collectd.org/files/collectd-%{version}.tar.bz2
Source1: collectd.suse.init Source1: collectd.suse.init
Source2: collectd.apache2.conf Source2: collectd.apache2.conf
Source3: collectd-js.apache2.conf Source3: collectd-js.apache2.conf
# bundled/in-tree libnetlink.a, see http://mailman.verplant.org/pipermail/collectd/2007-October/001210.html
# Can't use download url as upstream changed download layout and provide only versions 3.0 and newer.
# https://www.kernel.org/pub/linux/utils/net/iproute2/
Source10: iproute2-%{libnetlink_version}.tar.bz2
# workaround for missing pthread.pc on openSUSE, required by OpenIPMIpthread.pc # workaround for missing pthread.pc on openSUSE, required by OpenIPMIpthread.pc
# see https://bugzilla.novell.com/show_bug.cgi?id=388026 # see https://bugzilla.novell.com/show_bug.cgi?id=388026
Source20: collectd-pthread.pc Source20: collectd-pthread.pc
@ -140,31 +139,28 @@ Patch9: collectd-version.patch
Patch10: collectd-perl-vendor.patch Patch10: collectd-perl-vendor.patch
# see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=467072 # see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=467072
Patch11: collectd-fix_broken_perl-5.10.patch Patch11: collectd-fix_broken_perl-5.10.patch
Patch12: collectd-fix-warnings.patch
Patch14: collectd-iproute2-HZ.patch
Patch16: iproute2-optflags.patch
Patch17: collectd-fix_libltdl_autoreconf.patch Patch17: collectd-fix_libltdl_autoreconf.patch
Patch18: collectd-fix_collection_cgi.patch Patch18: collectd-fix_collection_cgi.patch
Patch19: collectd-fix_spamassassin_doc.patch Patch19: collectd-fix_spamassassin_doc.patch
Patch20: collectd-split_README.patch Patch20: collectd-split_README.patch
Patch21: collectd-fix_collectd_config_path_in_snmp_probe.patch Patch21: collectd-fix_collectd_config_path_in_snmp_probe.patch
Patch22: collectd-collection3.patch
Patch23: collectd-javac_target.patch Patch23: collectd-javac_target.patch
Patch24: collectd-pkgconfig_libnotify_add_gtk.patch Patch24: collectd-pkgconfig_libnotify_add_gtk.patch
Patch25: collectd-df-remove-duplicates.patch Patch25: collectd-df-remove-duplicates.patch
Patch26: collectd-fix_own_iptc.patch
Url: http://collectd.org/ Url: http://collectd.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: rrdtool Requires: rrdtool
Requires: sensors Requires: sensors
BuildConflicts: libnetlink-devel
BuildRequires: bind-devel BuildRequires: bind-devel
BuildRequires: bison BuildRequires: bison
BuildRequires: flex BuildRequires: flex
BuildRequires: gettext BuildRequires: gettext
BuildRequires: gettext-devel BuildRequires: gettext-devel
BuildRequires: intltool BuildRequires: intltool
BuildRequires: libevent-devel
BuildRequires: libnetlink-devel
#BuildRequires: libmodbus-devel #BuildRequires: libmodbus-devel
BuildRequires: libmnl-devel
BuildRequires: libpng-devel BuildRequires: libpng-devel
BuildRequires: libstatgrab-devel BuildRequires: libstatgrab-devel
BuildRequires: perl BuildRequires: perl
@ -265,6 +261,7 @@ BuildRequires: libxtables-devel
%endif %endif
%if %suse_version >= 1210 %if %suse_version >= 1210
%{perl_requires} %{perl_requires}
%{?libperl_requires}
BuildRequires: systemd BuildRequires: systemd
%{?systemd_requires} %{?systemd_requires}
%define has_systemd 1 %define has_systemd 1
@ -512,19 +509,19 @@ Requires: perl-spamassassin
Plugin for filling %{name} with statistics from the Plugin for filling %{name} with statistics from the
SpamAsssassin anti-spam engine. SpamAsssassin anti-spam engine.
%package -n libcollectdclient0 %package -n libcollectdclient1
Summary: Library for %{name} clients Summary: Library for %{name} clients
Group: System/Monitoring Group: System/Monitoring
Provides: libcollectdclient = %{version}-%{release} Provides: libcollectdclient = %{version}-%{release}
%description -n libcollectdclient0 %description -n libcollectdclient1
Library which abstracts communication with the %{name} Library which abstracts communication with the %{name}
unixsock plugin for clients. unixsock plugin for clients.
%package -n libcollectdclient-devel %package -n libcollectdclient-devel
Summary: Development Environment for %{name} clients Summary: Development Environment for %{name} clients
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libcollectdclient0 = %{version}-%{release} Requires: libcollectdclient1 = %{version}-%{release}
%description -n libcollectdclient-devel %description -n libcollectdclient-devel
Library which abstracts communication with the %{name} Library which abstracts communication with the %{name}
@ -533,7 +530,7 @@ This package contains the required development environment
to write %{name} unixsock clients. to write %{name} unixsock clients.
%prep %prep
%setup -q -n "collectd-%{version}" -a 10 %setup -q -n "collectd-%{version}"
%if "%{_lib}"=="lib64" %if "%{_lib}"=="lib64"
%patch4 %patch4
%endif %endif
@ -541,21 +538,14 @@ to write %{name} unixsock clients.
%patch9 %patch9
%patch10 %patch10
%patch11 %patch11
%patch12
%patch17 %patch17
pushd "iproute2-%{libnetlink_version}"
%patch14
%patch16
popd #iproute2
%patch18 %patch18
%patch19 %patch19
%patch20 %patch20
%patch21 %patch21
%patch22
%patch23 %patch23
%patch24 %patch24
%patch25 %patch25
%patch26
%__sed -i 's|@@VERSION@@|%{version}|g' configure.in %__sed -i 's|@@VERSION@@|%{version}|g' configure.in
@ -578,23 +568,6 @@ find . -name 'configure*' -o -name 'Makefile*' -exec %__sed -i 's|-Werror||g' {}
%build %build
export SUSE_ASNEEDED=0 export SUSE_ASNEEDED=0
%if %intree_netlink
# build in-tree libnetlink.a
pushd "iproute2-%{libnetlink_version}"
LIBNETLINK_CFLAGS="%{optflags}"
%ifarch x86_64 ia64 ppc64 ppc64 s390x
# only add -fPIC on 64bit, to avoid performance drawback on non-64bit archs:
LIBNETLINK_CFLAGS="$LIBNETLINK_CFLAGS -fPIC"
%endif
%__make %{?jobs:-j%{jobs}} \
SUBDIRS="lib" \
CC="%__cc" \
OPTFLAGS="$LIBNETLINK_CFLAGS"
%__rm -f lib/*.so.* lib/*.so
%__ln_s lib lib64
popd #iproute2
%endif #%intree_netlink
autoreconf -fiv autoreconf -fiv
# set JAVA_HOME properly # set JAVA_HOME properly
@ -603,8 +576,6 @@ autoreconf -fiv
[ -n "$JRE_HOME" -a -d "$JRE_HOME" ] || export JRE_HOME="$JAVA_HOME" [ -n "$JRE_HOME" -a -d "$JRE_HOME" ] || export JRE_HOME="$JAVA_HOME"
export PATH="$JDK_HOME/bin:$JRE_HOME/bin:$JAVA_HOME/bin:$PATH" 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} -fno-strict-aliasing" export CFLAGS="%{optflags} -fno-strict-aliasing"
export CXXFLAGS="$CFLAGS" export CXXFLAGS="$CFLAGS"
# workaround for missing pthread.pc on openSUSE, required by OpenIPMIpthread.pc # workaround for missing pthread.pc on openSUSE, required by OpenIPMIpthread.pc
@ -614,14 +585,17 @@ export KERNEL_DIR=/usr/src/linux
--with-libstatgrab \ --with-libstatgrab \
--with-rrdtool \ --with-rrdtool \
--disable-static \ --disable-static \
%if %dns
--enable-dns \ --enable-dns \
%else
--disable-dns \
%endif
--disable-nut \ --disable-nut \
--enable-netlink \ --enable-netlink \
--enable-python \ --enable-python \
--with-librrd \ --with-librrd \
%if %iptables %if %iptables
--enable-iptables \ --enable-iptables \
--with-libiptc=shipped \
%else %else
--disable-iptables \ --disable-iptables \
--without-iptc \ --without-iptc \
@ -652,9 +626,6 @@ export KERNEL_DIR=/usr/src/linux
%else %else
--disable-memcached \ --disable-memcached \
%endif #memcachec %endif #memcachec
%if %intree_netlink
--with-libnetlink="$PWD/iproute2-%{libnetlink_version}/" \
%endif
%if %suse_version < 930 %if %suse_version < 930
--disable-mysql \ --disable-mysql \
%endif %endif
@ -690,13 +661,6 @@ export KERNEL_DIR=/usr/src/linux
%__mkdir_p _rpmdoc_/java %__mkdir_p _rpmdoc_/java
%__mv contrib/GenericJMX.conf _rpmdoc_/java/ %__mv contrib/GenericJMX.conf _rpmdoc_/java/
# fix bogus dependency in netlink.la, as it has been built against
# a static netlink library:
%if %intree_netlink
%__sed -i "/^dependency_libs=/s/=.*/=''/" \
"%{buildroot}%{_libdir}/collectd/netlink.la"
%endif
# fix permissions: # fix permissions:
%__chmod 0755 "%{buildroot}%{_libdir}/collectd"/*.so %__chmod 0755 "%{buildroot}%{_libdir}/collectd"/*.so
%__chmod 0644 "%{buildroot}%{_libdir}/collectd"/*.la %__chmod 0644 "%{buildroot}%{_libdir}/collectd"/*.la
@ -827,9 +791,9 @@ EOF
%service_add_post %{name}.service %service_add_post %{name}.service
%endif %endif
%post -n libcollectdclient0 -p /sbin/ldconfig %post -n libcollectdclient1 -p /sbin/ldconfig
%postun -n libcollectdclient0 -p /sbin/ldconfig %postun -n libcollectdclient1 -p /sbin/ldconfig
%clean %clean
%{?buildroot:%__rm -rf "%{buildroot}"} %{?buildroot:%__rm -rf "%{buildroot}"}
@ -840,6 +804,7 @@ EOF
%doc contrib %doc contrib
%config(noreplace) %{_sysconfdir}/collectd.conf %config(noreplace) %{_sysconfdir}/collectd.conf
%dir %{_sysconfdir}/collectd %dir %{_sysconfdir}/collectd
%{_bindir}/collectd-tg
%{_bindir}/collectd-nagios %{_bindir}/collectd-nagios
%{_bindir}/collectdctl %{_bindir}/collectdctl
%{_bindir}/cussh %{_bindir}/cussh
@ -859,6 +824,7 @@ EOF
%doc %{_mandir}/man1/collectd.1%{ext_man} %doc %{_mandir}/man1/collectd.1%{ext_man}
%doc %{_mandir}/man1/collectdctl.1%{ext_man} %doc %{_mandir}/man1/collectdctl.1%{ext_man}
%doc %{_mandir}/man1/collectdmon.1%{ext_man} %doc %{_mandir}/man1/collectdmon.1%{ext_man}
%doc %{_mandir}/man1/collectd-tg.1%{ext_man}
%doc %{_mandir}/man1/collectd-nagios.1%{ext_man} %doc %{_mandir}/man1/collectd-nagios.1%{ext_man}
%doc %{_mandir}/man1/cussh.1%{ext_man} %doc %{_mandir}/man1/cussh.1%{ext_man}
%doc %{_mandir}/man5/collectd.conf.5%{ext_man} %doc %{_mandir}/man5/collectd.conf.5%{ext_man}
@ -1010,10 +976,10 @@ EOF
%defattr(-,root,root) %defattr(-,root,root)
%doc README.plugins-all %doc README.plugins-all
%files -n libcollectdclient0 %files -n libcollectdclient1
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libcollectdclient.so.0 %{_libdir}/libcollectdclient.so.1
%{_libdir}/libcollectdclient.so.0.*.* %{_libdir}/libcollectdclient.so.1.*.*
%files -n libcollectdclient-devel %files -n libcollectdclient-devel
%defattr(-,root,root) %defattr(-,root,root)

3
iproute2-2.6.37.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:71754f8ad68facdb97d0cb9d7a298dc7f1ba069370bce902b661e06959f264e3
size 388866

14
iproute2-optflags.patch
View File

@ -1,14 +0,0 @@
--- Makefile.orig 2009-05-13 21:06:21.000000000 +0200
+++ Makefile 2009-05-13 21:06:44.000000000 +0200
@@ -22,8 +22,9 @@
CC = gcc
HOSTCC = gcc
-CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall
-CFLAGS = $(CCOPTS) -I../include $(DEFINES)
+OPTFLAGS = -O2 -g
+CCOPTS = -D_GNU_SOURCE -Wstrict-prototypes -Wall
+CFLAGS = $(CCOPTS) -I../include $(DEFINES) $(OPTFLAGS)
YACCFLAGS = -d -t -v
LDLIBS += -L../lib -lnetlink -lutil