email plugin: Added some information about this plugin and it's config options to...

Also updated the README file, fixed a little indentation in `src/collectd.h'
and force the base of the `SocketPerms' to be eight (i. e. assume octal numbers
when setting the permission).

diff --git a/README b/README
index 3665099b620eac427864ebf05ee6ab037b8c8599..0fd37263da26a5c297e5df182e962ede8afa5813 100644 (file)
--- a/README
+++ b/README
@@ -42,6 +42,9 @@ Features
     - DNS traffic
       (query types, response codes, opcodes and traffic)
 
+    - Email statistics
+      (count, traffic, spam scores and checks)
+
     - Harddisk temperatures
       (Uhm, yeah, temperature of harddisks that is ;)
 

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 3e544e11b2cc87ee63a34cbdb3b16aba48aa0514..e7ebaf98326ae63464567e38d91026d4ceb2d5e1 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -160,6 +160,31 @@ TCP-Port to connect to. Defaults to B<3551>.
 
 =back
 
+=head2 Plugin C<df>
+
+=over 4
+
+=item B<Device> I<Device>
+
+Select partitions based on the devicename.
+
+=item B<MountPoint> I<Directory>
+
+Select partitions based on the mountpoint.
+
+=item B<FSType> I<FSType>
+
+Select partitions based on the filesystem type.
+
+=item B<IgnoreSelected> I<true>|I<false>
+
+Invert the selection: If set to true, all partitions B<except> the ones that
+match any one of the criteria are collected. By default only selected
+partitions are collected if a selection is made. If no selection is conifured
+at all, B<all> partitions are selected.
+
+=back
+
 =head2 Plugin C<dns>
 
 =over 4
@@ -177,28 +202,26 @@ Ignore packets that originate from this address.
 
 =back
 
-=head2 Plugin C<df>
+=head2 Plugin C<email>
 
 =over 4
 
-=item B<Device> I<Device>
+=item B<SocketGroup> I<Group>
 
-Select partitions based on the devicename.
+Change the group of the UNIX-socket after it has been created.
 
-=item B<MountPoint> I<Directory>
+=item B<SocketPerms> I<Permissions>
 
-Select partitions based on the mountpoint.
+Change the file permissions of the UNIX-socket after it has been created. The
+permissions must be given as a numeric, octal value as you would pass to
+L<chmod(1)>. Defaults to B<0770>.
 
-=item B<FSType> I<FSType>
-
-Select partitions based on the filesystem type.
-
-=item B<IgnoreSelected> I<true>|I<false>
+=item B<MaxConns> I<Number>
 
-Invert the selection: If set to true, all partitions B<except> the ones that
-match any one of the criteria are collected. By default only selected
-partitions are collected if a selection is made. If no selection is conifured
-at all, B<all> partitions are selected.
+Sets the maximum number of connections that can be handeled in parallel. Since
+this many threads will be started immediately setting this to a very high
+value will waste valuable resources. Defaults to B<5> and will be forced to be
+at most B<16384> to prevent typos and dumb mistakes.
 
 =back
 

diff --git a/src/collectd.h b/src/collectd.h
index d8f74f9549a67753e155299a5aec15bc3f4ee3c4..2ce0a155639a95b07a17a638db180fc9514f035a 100644 (file)
--- a/src/collectd.h
+++ b/src/collectd.h
@@ -201,7 +201,7 @@
 #define MODE_LOG    0x08
 
 #ifndef COLLECTD_GRP_NAME
-#      define COLLECTD_GRP_NAME "collectd"
+# define COLLECTD_GRP_NAME "collectd"
 #endif
 
 #ifndef COLLECTD_STEP

diff --git a/src/collectd.pod b/src/collectd.pod
index b0af26d2a4273bfb82a0a1f1f9c1857198f3e1a0..4919f550948f2332dac08a09f0b59bb58a16d21b 100644 (file)
--- a/src/collectd.pod
+++ b/src/collectd.pod
@@ -44,6 +44,10 @@ DNS traffic (I<dns>)
 
 =item
 
+Email usage (I<email>)
+
+=item
+
 Harddisk temperatures (I<hddtemp>)
 
 =item

diff --git a/src/email.c b/src/email.c
index 9fd05ba0fcf15ad4aa9a6de2d8a8cd0319aa1d20..58d94d1d4322047becb78f957a372f618fb014a5 100644 (file)
--- a/src/email.c
+++ b/src/email.c
@@ -211,7 +211,7 @@ static int email_config (char *key, char *value)
        }
        else if (0 == strcasecmp (key, "SocketPerms")) {
                /* the user is responsible for providing reasonable values */
-               sock_perms = (int)strtol (value, NULL, 0);
+               sock_perms = (int)strtol (value, NULL, 8);
        }
        else if (0 == strcasecmp (key, "MaxConns")) {
                long int tmp = strtol (value, NULL, 0);