From bae21def975db39c40d2694295b84bd70d5ec490 Mon Sep 17 00:00:00 2001 From: Marc Fournier Date: Mon, 15 Jul 2013 18:01:39 +0200 Subject: [PATCH] replace nginx_{accepts,handled} DSs reusing an existing DS is preferred. GH#227. --- src/nginx.c | 8 +++----- src/types.db | 2 -- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/nginx.c b/src/nginx.c index a87c35c9..de52262f 100644 --- a/src/nginx.c +++ b/src/nginx.c @@ -181,9 +181,7 @@ 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) + else if (strcmp (type, "connections") == 0) values[0].derive = value; else return; @@ -258,8 +256,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 ("connections", "accepted", atoll (fields[0])); + submit ("connections", "handled", atoll (fields[1])); submit ("nginx_requests", NULL, atoll (fields[2])); } } diff --git a/src/types.db b/src/types.db index 38655878..4922aa75 100644 --- a/src/types.db +++ b/src/types.db @@ -107,8 +107,6 @@ 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 -- 2.30.2