Changeset c385b68fdd537ec15c1467e6c8541b32d3838bf6

Timestamp:

05/22/12 14:48:01 (1 year ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1337698081 -0400

git-parent:

[c0606177e96ca2dd9ca395a81715892807816f5c]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1337698081 -0400

Message:

Add lookup by ip/module.

Make the counters into a rate like statsd does.

Files:

• src/modules/statsd.c (modified) (9 diffs)
• src/noit_check.c (modified) (3 diffs)
• src/noit_check.h (modified) (1 diff)

src/modules/statsd.c

@@ -46 +46 @@
-#include "utils/noit_hash.h"
-
-DEPTH 32
+CHECKS 3
-
-static noit_log_stream_t nlerr = NULL;
@@ -153 +153 @@
-  /* Next the actual data */
-  snprintf(buff, sizeof(buff), "%s`%s", key,
-counter
+rate
-  m = noit_stats_get_metric(check, &ccl->current, buff);
-  if(type == 'c') {
-
+ / (check->period / 1000.0)
-    if(m && m->metric_type == METRIC_DOUBLE && m->metric_value.n != NULL) {
-      (*m->metric_value.n) += v;
@@ -176 +176 @@
-
-static void
-parent, noit_check_t *single
+*checks, int nchecks
-                      char *payload, int len) {
-  char *cp, *ecp, *endptr;
@@ -182 +182 @@
-  endptr = payload + len - 1;
-  while(ecp != NULL && ecp < endptr) {
-
+, i
-    char key[256], *value;
-    const char *type = NULL;
@@ -240 +240 @@
-        case 'c':
-        case 'm':
-if(parent) update_check(parent, key, *type, diff, sampleRate);
-if(single) update_check(single
+for(i=0;i<nchecks;i++)
+  update_check(checks[i]
-          break;
-        default:
@@ -259 +259 @@
-  int packets_per_cycle;
-  statsd_mod_config_t *conf;
-check = NULL, *
+
-
-  conf = noit_module_get_userdata(self);
@@ -266 +266 @@
-  packets_per_cycle = MAX(conf->packets_per_cycle, 1);
-  for( ; packets_per_cycle > 0; packets_per_cycle--) {
+    noit_check_t *checks[MAX_CHECKS];
+    int nchecks = 0;
-    char ip[INET6_ADDRSTRLEN];
-    union {
@@ -277 +279 @@
-                   (struct sockaddr *)&addr, &addrlen);
-    if(len < 0) {
-=
+!
-        noitL(nlerr, "statsd: recvfrom() -> %s\n", strerror(errno));
-      break;
@@ -294 +296 @@
-    }
-    conf->payload[len] = '\0';
-
-
-
+
+
+
+
+
+
+
-  }
-  return EVENTER_READ | EVENTER_EXCEPTION;

src/noit_check.c

@@ -999 +999 @@
-}
-int
-
+onst c
-                      void *closure) {
-  int count = 0;
@@ -1006 +1006 @@
-
-  memset(&pivot, 0, sizeof(pivot));
-
+(char *)
-  pivot.name = "";
-  noit_skiplist_find_neighbors(&polls_by_name, &pivot, NULL, NULL, &next);
@@ -1016 +1016 @@
-  }
-  return count;
+}
+struct ip_module_collector_crutch {
+  noit_check_t **array;
+  const char *module;
+  int idx;
+  int allocd;
+};
+static int ip_module_collector(noit_check_t *check, void *cl) {
+  struct ip_module_collector_crutch *c = cl;
+  if(c->idx >= c->allocd) return 0;
+  if(strcmp(check->module, c->module)) return 0;
+  c->array[c->idx++] = check;
+  return 1;
+}
+int
+noit_poller_lookup_by_ip_module(const char *ip, const char *mod,
+                                noit_check_t **checks, int nchecks) {
+  struct ip_module_collector_crutch crutch;
+  crutch.array = checks;
+  crutch.allocd = nchecks;
+  crutch.idx = 0;
+  crutch.module = mod;
+  return noit_poller_target_do(ip, ip_module_collector, &crutch);
-}
-

src/noit_check.h

@@ -228 +228 @@
-
-API_EXPORT(int)
-
+
+
+
+
+
-                         void *closure);
-