X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fnginx.c;h=c356353e3798ea3104625cb96c655e1271934eb8;hb=56a7a6f079711a6cd5bbeb9c7eeb64c4d9349720;hp=7568a2c5ee2ded6439b6eb24927d64bb1b503e4a;hpb=7285e5f59ffa4efb391485fe9b35ee02f3dc856f;p=collectd.git diff --git a/src/nginx.c b/src/nginx.c index 7568a2c5..c356353e 100644 --- a/src/nginx.c +++ b/src/nginx.c @@ -122,7 +122,7 @@ static int init (void) curl_easy_setopt (curl, CURLOPT_NOSIGNAL, 1L); curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, nginx_curl_callback); - curl_easy_setopt (curl, CURLOPT_USERAGENT, PACKAGE_NAME"/"PACKAGE_VERSION); + curl_easy_setopt (curl, CURLOPT_USERAGENT, COLLECTD_USERAGENT); curl_easy_setopt (curl, CURLOPT_ERRORBUFFER, nginx_curl_error); if (user != NULL) @@ -181,6 +181,8 @@ 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, "connections") == 0) + values[0].derive = value; else return; @@ -254,6 +256,8 @@ static int nginx_read (void) && (atoll (fields[1]) != 0) && (atoll (fields[2]) != 0)) { + submit ("connections", "accepted", atoll (fields[0])); + submit ("connections", "handled", atoll (fields[1])); submit ("nginx_requests", NULL, atoll (fields[2])); } }