* change nginx plugin for collectd to submit "nginx_accepts" and

* "nginx_handled"

diff --git a/src/nginx.c b/src/nginx.c
index 7568a2c5ee2ded6439b6eb24927d64bb1b503e4a..a87c35c986e35399acc1f0fe4232c4eeaf31f5f8 100644 (file)
--- a/src/nginx.c
+++ b/src/nginx.c
@@ -181,6 +181,10 @@ static void submit (char *type, char *inst, long long value)
     values[0].gauge = value;
   else if (strcmp (type, "nginx_requests") == 0)
     values[0].derive = value;
+  else if (strcmp (type, "nginx_accepts") == 0)
+    values[0].derive = value;
+  else if (strcmp (type, "nginx_handled") == 0)
+    values[0].derive = value;
   else
     return;
 
@@ -254,6 +258,8 @@ static int nginx_read (void)
          && (atoll (fields[1]) != 0)
          && (atoll (fields[2]) != 0))
       {
+       submit ("nginx_accepts", NULL, atoll (fields[0]));
+       submit ("nginx_handled", NULL, atoll (fields[1]));
        submit ("nginx_requests", NULL, atoll (fields[2]));
       }
     }

diff --git a/src/types.db b/src/types.db
index 4922aa75f06338626e661878fb8d296eecec74e3..38655878a47220a9736b041ec255c7a9af58bc5d 100644 (file)
--- a/src/types.db
+++ b/src/types.db
@@ -107,6 +107,8 @@ mysql_octets                rx:DERIVE:0:U, tx:DERIVE:0:U
 nfs_procedure          value:DERIVE:0:U
 nginx_connections      value:GAUGE:0:U
 nginx_requests         value:DERIVE:0:U
+nginx_accepts          value:DERIVE:0:U
+nginx_handled          value:DERIVE:0:U
 node_octets            rx:DERIVE:0:U, tx:DERIVE:0:U
 node_rssi              value:GAUGE:0:255
 node_stat              value:DERIVE:0:U