Changeset 7d308b7989cb04229e214e3ca04435922d9965c8

Timestamp:

02/16/11 01:41:23 (2 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1297820483 +0000

git-parent:

[b7a4679e0291d61725dbbb87147645140ae8c802]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1297820483 +0000

Message:

make collect work better and support watches

Files:

• src/modules/collectd.c (modified) (18 diffs)
• src/modules/collectd.xml (modified) (2 diffs)
• src/noit_check.c (modified) (1 diff)
• src/noit_check.h (modified) (1 diff)

src/modules/collectd.c

@@ -47 +47 @@
-static noit_log_stream_t nlerr = NULL;
-static noit_log_stream_t nldeb = NULL;
-static int __collectd_initialize_once = 0;
-
-
-typedef struct _mod_config {
-  noit_hash_table *options;
-  noit_hash_table target_sessions;
+  noit_boolean support_notifications;
-  int ipv4_fd;
-  int ipv6_fd;
@@ -113 +112 @@
-#define NET_DEFAULT_V4_ADDR "239.192.74.66"
-#define NET_DEFAULT_V6_ADDR "ff18::efc0:4a42"
-"25826"
+25826
-
-#define TYPE_HOST            0x0000
@@ -1166 +1165 @@
-    char buf[20];
-    snprintf(buf, sizeof(buf), "%d", index);
- 
+
-    noitL(noit_debug, "collectd: parsing multiple values" 
-        " and guessing on the type for plugin[%s] and type[%s]"
@@ -1195 +1194 @@
-  stats_t current;
-  char buffer[DATA_MAX_NAME_LEN*4 + 128];
+  collectd_mod_config_t *conf;
+  conf = noit_module_get_userdata(self);
+
+  if(!conf->support_notifications) return 0;
+  /* We are passive, so we don't do anything for transient checks */
+  if(check->flags & NP_TRANSIENT) return 0;
-
-  noit_check_stats_clear(&current);
-  gettimeofday(&current.whence, NULL);
+
-  // Concat all the names together so they fit into the flat noitd model 
-  concat_metrics(buffer, n->plugin, n->plugin_instance, n->type, n->type_instance);
-  noit_stats_set_metric(&ccl->current, buffer, METRIC_STRING, n->message);
-
+passive_
-  noitL(nldeb, "collectd: dispatch_notifications(%s, %s, %s)\n",check->target, buffer, n->message);
-  return 0;
@@ -1250 +1256 @@
-    noitL(nldeb, "collectd: queue_values(%s, %s)\n", buffer, check->target);
-  }
-  //noit_check_set_stats(self, check, &current);
-  return 0;
-} 
@@ -1264 +1269 @@
-  collectd_closure_t *ccl;
-  struct timeval duration;
+  /* We are passive, so we don't do anything for transient checks */
+  if(check->flags & NP_TRANSIENT) return 0;
+
-  if(!check->closure) {
-    ccl = check->closure = (void *)calloc(1, sizeof(collectd_closure_t)); 
@@ -1286 +1294 @@
-        NP_GOOD : NP_BAD;
-    ccl->current.status = human_buffer;
-
+passive_
-
-    memcpy(&check->last_fire_time, &ccl->current.whence, sizeof(duration));
@@ -1296 +1304 @@
-static int noit_collectd_handler(eventer_t e, int mask, void *closure,
-                             struct timeval *now) {
-
+
+
+
+
-  char packet[1500];
-  int packet_len = sizeof(packet);
-  unsigned int from_len;
-
+6
-  noit_module_t *self = (noit_module_t *)closure;
-  collectd_mod_config_t *conf;
@@ -1314 +1325 @@
-    char *security_buffer; 
-
-skaddr
+remote
-
-    inlen = recvfrom(e->fd, packet, packet_len, 0,
-skaddr
+remote
-    gettimeofday(now, NULL); /* set it, as we care about accuracy */
-
@@ -1325 +1336 @@
-      break;
-    }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      break;
-    }
@@ -1341 +1364 @@
-      memset(ccl, 0, sizeof(collectd_closure_t));
-    } else {
- 
+
-    }
-    // Default to NONE
-     
+
-    if (noit_hash_retr_str(check->config, "security_level", strlen("security_level"),
-                           (const char**)&security_buffer)) 
@@ -1421 +1444 @@
-  if(!nlerr) nlerr = noit_log_stream_find("error/collectd");
-  if(!nldeb) nldeb = noit_log_stream_find("debug/collectd");
-stder
+erro
-  if(!nldeb) nldeb = noit_debug;
-  eventer_name_callback("noit_collectd/handler", noit_collectd_handler);
@@ -1434 +1457 @@
-  int portint = 0;
-  struct sockaddr_in skaddr;
+  struct sockaddr_in6 skaddr6;
+  struct in6_addr in6addr_any = IN6ADDR_ANY_INIT;
-  const char *host;
-  unsigned short port;
-
-
-
-
-
-
+
+
+
+
+
+
+
-  /* Default Collectd port */
-25826
+NET_DEFAULT_PORT
-  if(noit_hash_retr_str(conf->options,
-                         "collectd_port", strlen("collectd_port"),
@@ -1465 +1492 @@
-  }
-  else {
-   /*
-    socklen_t slen = sizeof(on);
-    if(getsockopt(conf->ipv4_fd, SOL_SOCKET, SO_SNDBUF, &on, &slen) == 0) {
-      while(on < (1 << 20)) {
-        on <<= 1;
-        if(setsockopt(conf->ipv4_fd, SOL_SOCKET, SO_SNDBUF,
-                      &on, sizeof(on)) != 0) {
-          on >>= 1;
-          break;
-        }
-      }
-      noitL(noit_debug, ": send buffer set to %d\n", on);
-    }
-    else
-      noitL(noit_error, "Cannot get sndbuf size: %s\n", strerror(errno));
-    */
-    if(eventer_set_fd_nonblocking(conf->ipv4_fd)) {
-      close(conf->ipv4_fd);
@@ -1495 +1506 @@
-  sockaddr_len = sizeof(skaddr);
-  if(bind(conf->ipv4_fd, (struct sockaddr *)&skaddr, sockaddr_len) < 0) {
-stder
+erro
-    close(conf->ipv4_fd);
-    return -1;
@@ -1509 +1520 @@
-    eventer_add(newe);
-  }
-
+
-  conf->ipv6_fd = socket(AF_INET6, SOCK_DGRAM, 0);
-  if(conf->ipv6_fd < 0) {
-
+IPv6 
-          strerror(errno));
-  }
@@ -1524 +1535 @@
-    }
-  }
+  sockaddr_len = sizeof(skaddr6);
+  memset(&skaddr6, 0, sizeof(skaddr6));
+  skaddr6.sin6_family = AF_INET6;
+  skaddr6.sin6_addr = in6addr_any;
+  skaddr6.sin6_port = htons(port);
+
+  if(bind(conf->ipv6_fd, (struct sockaddr *)&skaddr6, sockaddr_len) < 0) {
+    noitL(noit_error, "bind(IPv6) failed[%s]: %s\n", host, strerror(errno));
+    close(conf->ipv6_fd);
+    conf->ipv6_fd = -1;
+  }
+
-  if(conf->ipv6_fd >= 0) {
-    eventer_t newe;
@@ -1529 +1552 @@
-    newe->fd = conf->ipv6_fd;
-    newe->mask = EVENTER_READ;
-ping_icmp
+noit_collectd
-    newe->closure = self;
-    eventer_add(newe);
-  }
-
+
-  noit_module_set_userdata(self, conf);
-  return 0;

src/modules/collectd.xml

@@ -3 +3 @@
-  <description><para>The collectd module provides collectd support for Reconnoiter.  The collectd modules listens on a UDP port and waits for metrics to come from a collectd agent. It also provides support for signing and encrypting metrics from the collectd agent, which is supported in version 4.7.0 and above.  Only one is supported per target.</para></description>
-  <loader>C</loader>
-snmp
+collectd
-  <moduleconfig>
-    <parameter name="collectd_port"
@@ -9 +9 @@
-               default="25826"
-               allowed="\d+">The port which collectd packets are received</parameter>
-snmptrapd_host
-al
-*
-\d+">The host interface on which packets are accepted
+notifications
+s
+true
+(?:true|on|false|off)">Specify whether collectd notifications are acted upon
-  </moduleconfig>
-  <checkconfig>

src/noit_check.c

@@ -1012 +1012 @@
-
-void
+noit_check_passive_set_stats(struct _noit_module *module, 
+                             noit_check_t *check, stats_t *newstate) {
+  noit_skiplist_node *next;
+  noit_check_t n;
+
+  uuid_copy(n.checkid, check->checkid);
+  n.period = 0;
+
+  noit_check_set_stats(module,check,newstate);
+  noit_skiplist_find_neighbors(&watchlist, &n, NULL, NULL, &next);
+  while(next && next->data) {
+    stats_t backup;
+    noit_check_t *wcheck = next->data;
+    if(uuid_compare(n.checkid, wcheck->checkid)) break;
+
+    /* Swap the real check's stats into place */
+    memcpy(&backup, &wcheck->stats.current, sizeof(stats_t));
+    memcpy(&wcheck->stats.current, newstate, sizeof(stats_t));
+    /* Write out our status */
+    noit_check_log_status(wcheck);
+    /* Write out all metrics */
+    noit_check_log_metrics(wcheck);
+    /* Swap them back out */
+    memcpy(&wcheck->stats.current, &backup, sizeof(stats_t));
+
+    noit_skiplist_next(&watchlist, &next);
+  }
+}
+void
-noit_check_set_stats(struct _noit_module *module,
-                     noit_check_t *check, stats_t *newstate) {

src/noit_check.h

@@ -217 +217 @@
-
-struct _noit_module;
+/* This if for modules (passive) than cannot be watched... */
+API_EXPORT(void)
+  noit_check_passive_set_stats(struct _noit_module *self, noit_check_t *check,
+                               stats_t *newstate);
+/* This is for normal (active) modules... */
-API_EXPORT(void)
-  noit_check_set_stats(struct _noit_module *self, noit_check_t *check,