nginx plugin: Changed to the version 4 plugin infrastructure.

diff --git a/configure.in b/configure.in
index 48b4e62ceacb56abf7f177643699003a0a01dbb8..fa1aab0ac8376969b1b57793882f241ae88b7a95 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1843,6 +1843,7 @@ AC_PLUGIN([mysql],       [$with_libmysql],     [MySQL statistics])
 AC_PLUGIN([netlink],     [$with_libnetlink],   [Enhanced Linux network statistics])
 AC_PLUGIN([network],     [yes],                [Network communication plugin])
 AC_PLUGIN([nfs],         [$plugin_nfs],        [NFS statistics])
+AC_PLUGIN([nginx],       [$with_libcurl],      [nginx statistics])
 AC_PLUGIN([ntpd],        [yes],                [NTPd statistics])
 AC_PLUGIN([nut],         [$with_libupsclient], [Network UPS tools statistics])
 AC_PLUGIN([perl],        [$with_libperl],      [Embed a Perl interpreter])

diff --git a/src/nginx.c b/src/nginx.c
index e5848ee3c530218e50418d23b1555f4f1de6389b..69dc49e227b161d92461a7960531ee810cc1cbec 100644 (file)
--- a/src/nginx.c
+++ b/src/nginx.c
@@ -23,60 +23,31 @@
 #include "collectd.h"
 #include "common.h"
 #include "plugin.h"
-#include "utils_debug.h"
 #include "configfile.h"
 
-#define MODULE_NAME "nginx"
-
-#if HAVE_LIBCURL && HAVE_CURL_CURL_H
-#  define NGINX_HAVE_READ 1
-#  include <curl/curl.h>
-#else
-#  define NGINX_HAVE_READ 0
-#endif
+#include <curl/curl.h>
 
 static char *url    = NULL;
 static char *user   = NULL;
 static char *pass   = NULL;
 static char *cacert = NULL;
 
-#if HAVE_LIBCURL
 static CURL *curl = NULL;
 
 #define ABUFFER_SIZE 16384
 static char nginx_buffer[ABUFFER_SIZE];
 static int  nginx_buffer_len = 0;
 static char nginx_curl_error[CURL_ERROR_SIZE];
-#endif /* HAVE_LIBCURL */
 
-static char *connections_file = "nginx/nginx_connections-%s.rrd";
-static char *connections_ds_def[] =
-{
-  "DS:value:GAUGE:"COLLECTD_HEARTBEAT":0:U",
-  NULL
-};
-static int connections_ds_num = 1;
-
-/* Limit to 2^20 requests/s */
-static char *requests_file = "nginx/nginx_requests.rrd";
-static char *requests_ds_def[] =
-{
-  "DS:value:COUNTER:"COLLECTD_HEARTBEAT":0:1048576",
-  NULL
-};
-static int requests_ds_num = 1;
-
-static char *config_keys[] =
+static const char *config_keys[] =
 {
   "URL",
   "User",
   "Password",
-  "CACert",
-  NULL
+  "CACert"
 };
-static int config_keys_num = 4;
+static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
 
-#if HAVE_LIBCURL
 static size_t nginx_curl_callback (void *buf, size_t size, size_t nmemb, void *stream)
 {
   size_t len = size * nmemb;
@@ -95,9 +66,8 @@ static size_t nginx_curl_callback (void *buf, size_t size, size_t nmemb, void *s
 
   return (len);
 }
-#endif /* HAVE_LIBCURL */
 
-static int config_set (char **var, char *value)
+static int config_set (char **var, const char *value)
 {
   if (*var != NULL)
   {
@@ -111,7 +81,7 @@ static int config_set (char **var, char *value)
     return (0);
 }
 
-static int config (char *key, char *value)
+static int config (const char *key, const char *value)
 {
   if (strcasecmp (key, "url") == 0)
     return (config_set (&url, value));
@@ -123,22 +93,19 @@ static int config (char *key, char *value)
     return (config_set (&cacert, value));
   else
     return (-1);
-}
+} /* int config */
 
-static void init (void)
+static int init (void)
 {
-#if HAVE_LIBCURL
   static char credentials[1024];
 
   if (curl != NULL)
-  {
     curl_easy_cleanup (curl);
-  }
 
   if ((curl = curl_easy_init ()) == NULL)
   {
-    syslog (LOG_ERR, "nginx: `curl_easy_init' failed.");
-    return;
+    ERROR ("nginx plugin: curl_easy_init failed.");
+    return (-1);
   }
 
   curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, nginx_curl_callback);
@@ -149,8 +116,8 @@ static void init (void)
   {
     if (snprintf (credentials, 1024, "%s:%s", user, pass == NULL ? "" : pass) >= 1024)
     {
-      syslog (LOG_ERR, "nginx: Credentials would have been truncated.");
-      return;
+      ERROR ("nginx plugin: Credentials would have been truncated.");
+      return (-1);
     }
 
     curl_easy_setopt (curl, CURLOPT_USERPWD, credentials);
@@ -165,46 +132,39 @@ static void init (void)
   {
     curl_easy_setopt (curl, CURLOPT_CAINFO, cacert);
   }
-#endif /* HAVE_LIBCURL */
+
+  return (0);
 } /* void init */
 
-static void connections_write (char *host, char *inst, char *val)
+static void submit (char *type, char *inst, long long value)
 {
-  char buf[1024];
+  value_t values[1];
+  value_list_t vl = VALUE_LIST_INIT;
 
-  if (snprintf (buf, 1024, connections_file, inst) >= 1024)
+  if (strcpy (type, "nginx_connections") == 0)
+    values[0].gauge = value;
+  else if (strcpy (type, "nginx_requests") == 0)
+    values[0].counter = value;
+  else
     return;
 
-  rrd_update_file (host, buf, val,
-      connections_ds_def, connections_ds_num);
-}
+  vl.values = values;
+  vl.values_len = 1;
+  vl.time = time (NULL);
+  strcpy (vl.host, hostname_g);
+  strcpy (vl.plugin, "nginx");
+  strcpy (vl.plugin_instance, "");
 
-static void requests_write (char *host, char *inst, char *val)
-{
-  rrd_update_file (host, requests_file, val,
-      requests_ds_def, requests_ds_num);
-}
-
-#if NGINX_HAVE_READ
-static void submit (char *type, char *inst, long long value)
-{
-  char buf[1024];
-  int  status;
-
-  DBG ("type = %s; inst = %s; value = %lli;",
-      type, (inst == NULL) ? "(nil)" : inst, value);
-
-  status = snprintf (buf, 1024, "%u:%lli", (unsigned int) curtime, value);
-  if ((status < 0) || (status >= 1024))
+  if (inst != NULL)
   {
-    syslog (LOG_ERR, "nginx: snprintf failed");
-    return;
+    strncpy (vl.type_instance, inst, sizeof (vl.type_instance));
+    vl.type_instance[sizeof (vl.type_instance) - 1] = '\0';
   }
 
-  plugin_submit (type, inst, buf);
-}
+  plugin_dispatch_values (type, &vl);
+} /* void submit */
 
-static void nginx_read (void)
+static int nginx_read (void)
 {
   int i;
 
@@ -216,15 +176,15 @@ static void nginx_read (void)
   int   fields_num;
 
   if (curl == NULL)
-    return;
+    return (-1);
   if (url == NULL)
-    return;
+    return (-1);
 
   nginx_buffer_len = 0;
   if (curl_easy_perform (curl) != 0)
   {
-    syslog (LOG_WARNING, "nginx: curl_easy_perform failed: %s", nginx_curl_error);
-    return;
+    WARNING ("nginx plugin: curl_easy_perform failed: %s", nginx_curl_error);
+    return (-1);
   }
 
   ptr = nginx_buffer;
@@ -276,20 +236,16 @@ static void nginx_read (void)
   }
 
   nginx_buffer_len = 0;
-}
-#else
-#  define nginx_read NULL
-#endif /* NGINX_HAVE_READ */
+
+  return (0);
+} /* int nginx_read */
 
 void module_register (void)
 {
-  plugin_register (MODULE_NAME, init, nginx_read, NULL);
-  plugin_register ("nginx_requests",   NULL, NULL, requests_write);
-  plugin_register ("nginx_connections", NULL, NULL, connections_write);
-  cf_register (MODULE_NAME, config, config_keys, config_keys_num);
-}
-
-#undef MODULE_NAME
+  plugin_register_config ("nginx", config, config_keys, config_keys_num);
+  plugin_register_init ("nginx", init);
+  plugin_register_read ("nginx", nginx_read);
+} /* void module_register */
 
 /*
  * vim: set shiftwidth=2 softtabstop=2 tabstop=8 :

diff --git a/src/types.db b/src/types.db
index e53f92ffda194ad39699724b1df1e41ba458312e..fbce116c83903bdd1d61301bcadce1fccd0dbce2 100644 (file)
--- a/src/types.db
+++ b/src/types.db
@@ -48,6 +48,8 @@ mysql_octets          rx:COUNTER:0:4294967295, tx:COUNTER:0:4294967295
 mysql_qcache           hits:COUNTER:0:U, inserts:COUNTER:0:U, not_cached:COUNTER:0:U, lowmem_prunes:COUNTER:0:U, queries_in_cache:GAUGE:0:U
 mysql_threads          running:GAUGE:0:U, connected:GAUGE:0:U, cached:GAUGE:0:U, created:COUNTER:0:U
 nfs_procedure          value:COUNTER:0:4294967295
+nginx_connections      value:GAUGE:0:U
+nginx_requests         value:COUNTER:0:134217728
 percent                        percent:GAUGE:0:100.1
 ping                   ping:GAUGE:0:65535
 power                  value:GAUGE:0:U