Florian Forster [Thu, 14 Jun 2012 12:46:03 +0000 (14:46 +0200)]
oracle plugin: Implement the "Host" option.
Florian Forster [Mon, 2 Apr 2012 08:14:12 +0000 (10:14 +0200)]
varnish plugin: Make argument "stats" const.
Florian Forster [Mon, 2 Apr 2012 08:04:23 +0000 (10:04 +0200)]
ethstat plugin: Fix a typo.
Florian Forster [Sun, 1 Apr 2012 15:15:20 +0000 (17:15 +0200)]
Bump version to 5.1.0; Update ChangeLog.
Florian Forster [Sun, 1 Apr 2012 10:07:20 +0000 (12:07 +0200)]
Merge branch 'collectd-5.0'
Florian Forster [Sun, 1 Apr 2012 10:07:09 +0000 (12:07 +0200)]
Merge branch 'collectd-4.10' into collectd-5.0
Conflicts:
ChangeLog
Florian Forster [Sun, 1 Apr 2012 10:06:42 +0000 (12:06 +0200)]
ChangeLog: Correct date.
Florian Forster [Sun, 1 Apr 2012 10:06:24 +0000 (12:06 +0200)]
Bump version to 5.0.4; Update ChangeLog.
Florian Forster [Sun, 1 Apr 2012 10:01:58 +0000 (12:01 +0200)]
Merge branch 'collectd-4.10' into collectd-5.0
Conflicts:
ChangeLog
src/collectd.conf.pod
src/common.c
src/network.c
src/processes.c
version-gen.sh
Florian Forster [Sun, 1 Apr 2012 09:51:38 +0000 (11:51 +0200)]
Bump version to 4.10.7; Update ChangeLog.
Florian Forster [Sat, 31 Mar 2012 15:27:14 +0000 (17:27 +0200)]
Revert "Proposal fix for large "MaxPacketSize" use."
This reverts commit
12213f8dfeee3feb3846aa658def0bb79c1211d0.
Florian Forster [Fri, 23 Mar 2012 21:21:43 +0000 (22:21 +0100)]
network plugin: Do not forward received notifications.
The network plugin would send out all notifications it got through its
callback, even the ones it received itself and even when forwarding was
disabled.
With this patch the network plugin will only transmit notifications created
locally -- forwarding of notifications is not implemented due to missing
loop-detection. For loop-detection we would have to keep track of the last
timestamp of each notifications, and since each host/plugin/type/-instance
field may be empty, this is not as straight forward as with value lists. If
someone needs this, they will need to invest some work I'm afraid.
Florian Forster [Fri, 23 Mar 2012 13:17:00 +0000 (06:17 -0700)]
Merge pull request #56 from octo/ci/nfs
NFS plugin: Add Solaris support.
Florian Forster [Fri, 23 Mar 2012 12:53:39 +0000 (13:53 +0100)]
Merge branch 'ff/zfs'
Florian Forster [Fri, 23 Mar 2012 12:52:51 +0000 (13:52 +0100)]
zfs_arc plugin: Move reading of kstat values into separate functions.
This way error handling can be done in a central place and we can do this more
carefully overall.
Florian Forster [Fri, 23 Mar 2012 12:48:19 +0000 (05:48 -0700)]
Merge pull request #60 from octo/ar/zfs
more zfs kstat values
Florian Forster [Thu, 22 Mar 2012 08:05:12 +0000 (09:05 +0100)]
zfs_arc plugin: Add copyright header for Aurelien Rougemont.
Cyril Feraudet [Mon, 19 Mar 2012 10:08:06 +0000 (11:08 +0100)]
Proposal fix for large "MaxPacketSize" use.
When we use a "MaxPacketSize" over two thousand of octets (to pass huge
message in notification for example), buffer may not be flushed for a
while.
By flushing buffer when there is about 1400 octets, we're sure there is
no data too longer in.
Florian Forster [Wed, 21 Mar 2012 06:41:38 +0000 (07:41 +0100)]
zfs_arc plugin: Fix the "hash collision" and "mutex miss" metrics.
Florian Forster [Tue, 20 Mar 2012 21:40:39 +0000 (22:40 +0100)]
zfs_arc plugin: Fix typo in variable name.
Florian Forster [Tue, 20 Mar 2012 21:39:39 +0000 (22:39 +0100)]
zfs_arc plugin: Introduce the single-valued "mutex_operation" type.
Florian Forster [Tue, 20 Mar 2012 21:32:14 +0000 (22:32 +0100)]
zfs_arc plugin: Introduce the single-valued "cache_eviction" type.
Florian Forster [Tue, 20 Mar 2012 21:29:59 +0000 (22:29 +0100)]
zfs_arc plugin: Convert to use DERIVE.
Aurelien Rougemont [Thu, 1 Mar 2012 13:48:45 +0000 (14:48 +0100)]
add types for deleted, evict, hash, mutex
Signed-off-by: Florian Forster <octo@collectd.org>
Aurelien Rougemont [Thu, 1 Mar 2012 13:40:10 +0000 (14:40 +0100)]
add hash_collisions, deleted, mutex_miss, evict_*
Cosmin Ioiart [Mon, 19 Mar 2012 09:56:03 +0000 (10:56 +0100)]
Fixed Solaris compilation errors
The value returned by get_kstat_value is of type long long whereas values is a union. Fixed the code so that the value gets assigned to one of the union members, in this case counter.
Cosmin Ioiart [Mon, 19 Mar 2012 09:54:57 +0000 (10:54 +0100)]
Fixed solaris configure script generation errors
The brackets in configure.in and the changes in version-gen.sh are needed in order for the build.sh script to generate the configure script correctly. Else the generated script won't work.
Florian Forster [Mon, 19 Mar 2012 09:47:22 +0000 (10:47 +0100)]
src/common.h: Add comment about return value of read_file_contents().
Florian Forster [Sun, 18 Mar 2012 10:35:13 +0000 (11:35 +0100)]
nfs plugin: Minor coding style fixes.
Florian Forster [Sun, 18 Mar 2012 10:27:03 +0000 (11:27 +0100)]
nfs plugin: Remove duplicated code.
Changes include:
* Calculate nfs[234]_procedures_names_num at compile time.
* Made nfs_procedures_submit() more versatile, so it can be used from the Linux
and the Solaris code.
* Switched to plugin_dispatch_values_secure(), since the code is using the same
value_list_t for multiple values.
* Broke out nfs_submit_fields() from the Linux code. This removed quite a bit
of code duplication between the v2/v3 code.
* Broke out nfs_read_kstat() which does the get_kstat_value() call in a loop
rather than duplicating all the NFS procedure names.
Cosmin Ioiart [Thu, 8 Mar 2012 10:12:53 +0000 (11:12 +0100)]
Enable modules for Solaris
Enabling nfs,processes and protocols modules for Solaris when running the
configure script.
Cosmin Ioiart [Tue, 13 Mar 2012 07:38:16 +0000 (08:38 +0100)]
Fix Linux compilation errors
Fixed compilation errors for the linux platform
Cosmin Ioiart [Thu, 23 Feb 2012 14:34:32 +0000 (15:34 +0100)]
Added safe-guard for kstat libraries
Cosmin Ioiart [Thu, 23 Feb 2012 13:47:47 +0000 (14:47 +0100)]
Added Solaris support for nfs3 and nfs4 (client/server)
Florian Forster [Sun, 18 Mar 2012 08:14:54 +0000 (09:14 +0100)]
tcpconns plugin: Include <bsd/nlist.h> rather than <nlist.h>.
It appears that <nlist.h> is being deprecated / moved.
This hopefully fixes Debian bug #664429.
Florian Forster [Sat, 17 Mar 2012 10:45:44 +0000 (11:45 +0100)]
Merge branch 'jr/varnish'
Florian Forster [Sat, 17 Mar 2012 10:41:47 +0000 (03:41 -0700)]
Merge pull request #48 from octo/pk/processes
Fix processes plugin under FreeBSD.
Florian Forster [Sat, 17 Mar 2012 10:41:04 +0000 (11:41 +0100)]
processes plugin: Minimize whitespace-only changes.
Florian Forster [Sat, 17 Mar 2012 10:34:43 +0000 (11:34 +0100)]
processes plugin: Some more minor coding style fixes.
Florian Forster [Sat, 17 Mar 2012 10:20:22 +0000 (03:20 -0700)]
Merge pull request #52 from octo/cf/ethstat
ethstat support
Florian Forster [Sat, 17 Mar 2012 10:18:57 +0000 (11:18 +0100)]
ethstat plugin: Implement the "MappedOnly" option.
Florian Forster [Sat, 17 Mar 2012 09:54:37 +0000 (10:54 +0100)]
ethstat plugin: Fix indentation. It was a mess, sorry.
Florian Forster [Fri, 16 Mar 2012 17:26:08 +0000 (18:26 +0100)]
src/common.c: parse_value: Strip trailing whitespace before parsing.
This hopefully avoids the annoying "trailing garbage" message when the buffer
only contains a newline or space at the end.
Florian Forster [Fri, 16 Mar 2012 16:44:50 +0000 (17:44 +0100)]
collectd.conf(5): Document the "Hits" and "Hysteresis" threshold options.
Fixes GitHub issue #53.
Clemens Lang [Sat, 10 Mar 2012 01:30:26 +0000 (02:30 +0100)]
Makefile adds dependency on $(LIBLTDL), which is valued "-lltdl"
When building on OS X, the collectd build failed, because the collectd target
has a dependency on "-lltdl", which is the value the variable $(LIBLTDL) has.
Obviously, this should be the file name instead. I am however not sure how to
specify the correct filename in this case.
Fixes GitHub issue #54.
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Mon, 12 Mar 2012 12:35:38 +0000 (13:35 +0100)]
ethstat plugin: Implement the "Map" option.
Florian Forster [Mon, 12 Mar 2012 06:38:19 +0000 (07:38 +0100)]
ethstat plugin: Add documentation.
Florian Forster [Sun, 11 Mar 2012 18:22:06 +0000 (19:22 +0100)]
ethstat plugin: Use the system header files if available.
And disable the plugin when they are not.
Florian Forster [Sun, 11 Mar 2012 14:53:39 +0000 (15:53 +0100)]
ethstat module: Fix allocation of "ifacelist".
And remove uses of strcpy(3).
Florian Forster [Sun, 11 Mar 2012 14:49:55 +0000 (15:49 +0100)]
ethstat plugin: Fix includes.
Cyril Feraudet [Tue, 4 Oct 2011 13:00:04 +0000 (15:00 +0200)]
ethstat plugin: Collect performance statistics from NICs.
Hi all,
For my needs at work I wrote a plugin for collectd and I wish to share it with
you.
This plugins, temporary called ethstat and wrote in C, collect lot of
performance counter about network interface as "ethtool -S ethX" do by asking
NIC driver module.
At the moment this plugin work only under Linux. Any help would be great for
make it working under Solaris, AIX and co ...
If you think this plugin may be included to collectd sources, what is the
procedure to do it ?
Regards,
Cyril Feraudet
To be added to configuration file to make it work :
LoadPlugin ethstat
<Plugin ethstat>
Iface "eth0"
#Iface "eth1"
#Iface "eth2"
#Iface "eth3"
</Plugin>
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Sun, 11 Mar 2012 14:14:40 +0000 (15:14 +0100)]
varnish plugin: Simplify the v2/v3 define structs.
This somewhat duplicates the code in the read callback, but it's easier to read
than having four or so defines in one function.
Addresses GitHub issue #14.
Jérôme Renard [Tue, 20 Dec 2011 14:22:55 +0000 (15:22 +0100)]
varnish plugin: Closed VSM
Jérôme Renard [Wed, 26 Oct 2011 23:20:47 +0000 (01:20 +0200)]
varnish plugin: Switched to AC_CHECK_HEADERS
Jérôme Renard [Wed, 26 Oct 2011 23:02:39 +0000 (01:02 +0200)]
varnish plugin: Fixed wrong function name
Jérôme Renard [Wed, 26 Oct 2011 21:15:00 +0000 (23:15 +0200)]
varnish plugin: Added basic Varnish 3.0 support
Jérôme Renard [Wed, 26 Oct 2011 19:14:15 +0000 (21:14 +0200)]
varnish plugin: Added Varnish version detection flag
Florian Forster [Sun, 11 Mar 2012 13:47:24 +0000 (14:47 +0100)]
amqp plugin: Fix compabitility with current librabbitmq.
In particular, add compatibility to the 0.9.1 and current development version.
Unfortunately, no version macro exists, so we need to do some autoconf trickery
:(
Fixes GitHub issue #6.
Florian Forster [Sun, 11 Mar 2012 12:11:33 +0000 (05:11 -0700)]
Merge pull request #44 from octo/ff/perl
Fix race condition in the Perl plugin.
Florian Forster [Sun, 11 Mar 2012 12:04:13 +0000 (13:04 +0100)]
collectd.conf(5): Improve the network plugin's documentation.
The example given was confusing since it didn't make it clear enough, that only
one "Server" stanza is required.
Resolves GitHub issue #19.
Florian Forster [Sun, 11 Mar 2012 11:57:10 +0000 (12:57 +0100)]
network plugin: Fix compiler warnings.
Resolves GitHub issue #49.
Florian Forster [Sun, 11 Mar 2012 11:13:37 +0000 (12:13 +0100)]
snmp plugin: Keep track of signedness of ASN values.
Prior to this, the signed variant was used when casting to gauge_t. This caused
problems with values larger than 2^31-1, since they were casted to negative
values.
Hopefully fixes GitHub issue #50.
Florian Forster [Sun, 19 Feb 2012 22:01:35 +0000 (23:01 +0100)]
processes plugin: A few coding style fixes for the FreeBSD code.
Change-Id: I3469a605c0dc0b7ce51049636ab3f82b03fdfa17
Phil Kulin [Sun, 8 Jan 2012 16:50:27 +0000 (19:50 +0300)]
collectd-5.0.1-mine.patch some processes.c fixes for FreeBSD
I welcome from rainy Ingermanland!
Our thoughts are now occupied by Putin and vodka, however...
I have paid attention to a little incorrect data which is given out by
a processes plugin on my beautifull FreeBSD system.
I have corrected them and in process have made absolutely slightly
have improved accuracy and productivity of a processes plugin for
FreeBSD systems.
- Fix strange plural call of getpagesize(). Has entered a global
variable and initialization procedure for FreeBSD
- Data was summarized on all processes including threads. It led to
absolutely uncertain result. Fix based on codebase of FreeBSD top
programm. KERN_PROC_ALL attribute keep for future purposes.
- Gets command argument failed for some processes as system and some
other. It led to error messages to console. Fix based on codebase of
FreeBSD top programm.
- System and user CPU times turned out from the sum of miliseconds
and... Oh! microseconds in one glass with overflow possibility. Fixed.
My girlfriend has left me for such Christmas vacation, but I am
assured that have made good business.
Patch in mail attachment.
--
Non nobis Domine non nobis sed Nomini Tuo da gloriam
Phil Kulin
Change-Id: Ib88faadf5a0fd335b426e9024b0a2e438ddbaf1f
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Fri, 9 Mar 2012 15:58:15 +0000 (16:58 +0100)]
write_mongodb plugin: Fix reconnection behavior.
The previous code would never detect a disconnect and act appropriately. In the
process, manual tracking of the connection state is removed in favor of
mongo_is_connected().
Florian Forster [Wed, 7 Mar 2012 10:10:06 +0000 (11:10 +0100)]
write_mongodb plugin: Export DS names and DS types.
The values are exported as an array now. This is very close to the way data is
exported as JSON.
Florian Forster [Wed, 7 Mar 2012 09:54:36 +0000 (01:54 -0800)]
Merge pull request #43 from octo/ff/numa
numa plugin: Add plugin for Non-Uniform Memory Access (NUMA).
Florian Forster [Wed, 7 Mar 2012 09:53:21 +0000 (10:53 +0100)]
collectd.conf.in: Add the numa plugin.
Florian Forster [Mon, 5 Mar 2012 09:35:58 +0000 (10:35 +0100)]
write_mongodb plugin: Actually store time as "date" type.
Jason Schmidlapp [Thu, 1 Mar 2012 01:27:50 +0000 (20:27 -0500)]
Fixed memory leak in collectdclient library.
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Sun, 4 Mar 2012 10:10:20 +0000 (11:10 +0100)]
perl plugin: Fix a race condition.
This hopefully fixes GitHub issue #9.
Florian Forster [Sun, 4 Mar 2012 09:41:11 +0000 (10:41 +0100)]
numa plugin: Add plugin for Non-Uniform Memory Access (NUMA).
Change-Id: I2610c7d8f73082154672114ad82001c6bd1b6f14
Florian Forster [Thu, 1 Mar 2012 09:57:02 +0000 (01:57 -0800)]
Merge pull request #40 from octo/db/processes
Add support for processes with spaces in their names.
Florian Forster [Thu, 1 Mar 2012 08:56:56 +0000 (09:56 +0100)]
processes plugin: Support processes with spaces in their names.
… without replacing the space in the process name. This is done by using
an equivalent of strchr() and strrchr() to determine the boundaries of
the second "field".
Change-Id: Id4c1a84c0544554fae05623457d2a7a3e0630db2
Darrell Bishop [Sat, 5 Nov 2011 08:29:00 +0000 (09:29 +0100)]
processes plugin: Support processes with spaces in their name.
Fixes GitHub issue #11.
Change-Id: Ifa9db0e020f19da43bbf49bba0626e70c16dc30f
Florian Forster [Wed, 29 Feb 2012 22:11:26 +0000 (23:11 +0100)]
write_mongodb plugin: Actually implement the "Timeout" option.
Change-Id: I8eb1bc53a15cd301d663e55a5ea71e46013f04c5
Florian Forster [Wed, 29 Feb 2012 22:09:58 +0000 (23:09 +0100)]
collectd.conf(5): Add documentation for the write_mongodb plugin.
Resolves GitHub issue #37.
Change-Id: I9b2ff533003e379f0eb81de256a946fdf8851661
Florian Forster [Wed, 29 Feb 2012 19:47:08 +0000 (20:47 +0100)]
conntrack plugin: Strip newlie before calling parse_value().
Change-Id: Ifa4db20a6b937912db77a214d2c0ef3eeebfa164
Louis Opter [Tue, 28 Feb 2012 17:23:06 +0000 (18:23 +0100)]
Use parse_value in the conntrack plugin and submit the result even if it's zero
Dear collectd,
Please find attached a patch for the conntrack plugin.
The patch is about two things:
1. submit the value even if it is zero (which is a legitimate value according
to types.db);
2. use parse_value and a value_t instead of directly using a double and atof(3).
The first point was important because it meant that the metric was not created
when the initial value was zero. (It could also lead to holes in your graphs).
The parse_value return value is correctly checked, note that the parsed file
ends with a \n which mean that parse_value always complain when running in
debug/info maybe we should replace it with a \0 before handing the buffer to
parse_value() ?
Thanks
--
Louis Opter
Signed-off-by: Florian Forster <octo@collectd.org>
Timon [Tue, 28 Feb 2012 11:10:35 +0000 (17:10 +0600)]
Fix buffer size for memcached stats answer
Typical stats answer has ~1900 bytes length.
$ memcached-tool localhost:11211 stats | wc -c
1863
But buffer for this answer was only 1024 bytes length.
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Tue, 28 Feb 2012 09:12:09 +0000 (01:12 -0800)]
Merge pull request #36 from octo/mh/softraid
Merge the "md" plugin, collecting disk counts from Linux software-RAID devices.
Florian Forster [Tue, 28 Feb 2012 09:10:10 +0000 (10:10 +0100)]
AUTHORS, README: Add Michael Hanselmann / the md plugin.
Florian Forster [Tue, 28 Feb 2012 09:06:54 +0000 (10:06 +0100)]
collectd.conf(5): Update the information on the md plugin.
Florian Forster [Tue, 28 Feb 2012 08:54:59 +0000 (09:54 +0100)]
md plugin: Change metrics so each disk is reported only once.
This hopefully makes graphing easier.
Andrew Elwell [Sun, 26 Feb 2012 21:32:08 +0000 (22:32 +0100)]
Also check in ip4tc for iptc_init
./configure --enable-iptables was failing on fedora as iptc_init
wasn't found. This patches configure.in to also look in ip4tc
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Tue, 28 Feb 2012 05:53:01 +0000 (21:53 -0800)]
Merge pull request #38 from octo/ff/mongodb
write_mongodb plugin: Implement the "StoreRates" option.
Florian Forster [Mon, 27 Feb 2012 21:41:48 +0000 (22:41 +0100)]
write_mongodb plugin: Implement the "StoreRates" option.
Change-Id: I73503de7605d456156664fd91c81cac1f3624939
Michael Hanselmann [Tue, 22 Feb 2011 23:18:12 +0000 (00:18 +0100)]
Plugin for Linux Software-RAID devices
This is an initial implementation of a plugin to collect information
about Linux Software-RAID (md) devices. It reports the number of
component devices, number of devices in array, number of active,
working, failed and spare disks.
Change-Id: Id0ba8e678f33153112e9999c6341dd2ce71b10c0
Signed-off-by: Michael Hanselmann <public@hansmi.ch>
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Fri, 2 Sep 2011 17:58:44 +0000 (13:58 -0400)]
contrib/exec-ksm.sh: Exec plugin for Kernel Samepage Merging (KSM).
Change-Id: I98d834ca849b21637c8fb00a63a037b73e0879b7
Florian Forster [Sat, 25 Feb 2012 17:16:59 +0000 (18:16 +0100)]
Merge branch 'collectd-5.0'
Conflicts:
src/amqp.c
Change-Id: I85ab3ee2b51830ad0b5d474cf1f18b5c828d6588
Florian Forster [Sat, 25 Feb 2012 17:15:36 +0000 (18:15 +0100)]
Merge branch 'collectd-4.10' into collectd-5.0
Conflicts:
src/df.c
Change-Id: Ie7c9fd4a20cc356bb53b135bf2ca2d5162a8a953
Florian Forster [Mon, 19 Apr 2010 11:04:35 +0000 (13:04 +0200)]
contrib/exec-nagios.px: Implement the "NRPEConfig" option.
Florian Forster [Sat, 25 Feb 2012 16:55:36 +0000 (17:55 +0100)]
syslog plugin: Copy the BUFFER_ADD() macro from src/utils_format_json.c.
Also determine the string representation of the severity in the switch
block, since it's much easier to read than the ?:-cascade.
Change-Id: Ieb5467633db3e06e1fad6a60b5a19fd7708e2002
Florian Forster [Sat, 25 Feb 2012 16:33:05 +0000 (17:33 +0100)]
syslog plugin: Log "OKAY" notifications with severity "NOTICE".
It's a noteworthy event that implies normal operation, i.e. NOTICE. Also
renamed "severity" to "log_severity" to emphasize its use.
Change-Id: I7f3e4b12dabeb0caa9c9c8c86924bf77b2627ba1
Florian Forster [Sat, 25 Feb 2012 16:31:23 +0000 (17:31 +0100)]
syslog plugin: Change notification severity handling.
This way it is more like log severity handling, i.e. "OKAY" implies
"WARNING" and "WARNING" implies "FAILURE".
Change-Id: I972c09e4bc9e26b5abeb17cc4d8c5e0e1a42e1c3
Florian Forster [Sat, 25 Feb 2012 16:25:50 +0000 (17:25 +0100)]
syslog plugin: Parse "value" as severity, not "key".
Change-Id: I4a7bde018be5a8925c9a998cd3e89e0289453063
Florian Forster [Sat, 25 Feb 2012 16:12:45 +0000 (17:12 +0100)]
src/plugin.c: Fix use of strcmp().
Change-Id: I078ca80ba6e3cac413186c2ad063d32cdfbb398e
Fabien Wernli [Wed, 26 Oct 2011 09:22:46 +0000 (11:22 +0200)]
Add notifications to syslog plugin
Deduplicated some code from logfile and syslog
and added NotifyLevel option to plugin.
Change-Id: I364067189d628420333cb625c885a256399e076a
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Sat, 25 Feb 2012 15:56:35 +0000 (16:56 +0100)]
bind plugin: Fix use of the "QType" types.
This should resolve GitHub issue #21.
Change-Id: I67e4b440a6fbc8a8608fa672fb3320b05f9c0a12
Florian Forster [Sat, 25 Feb 2012 15:04:41 +0000 (07:04 -0800)]
Merge pull request #22 from bostjan/master
php-collection: Fixed DS definitions for apache_bytes, apache_requests and apache_scoreboard merge