Changeset 8c720f9a4bd5979520e9c7ec00d9bea8d305391b

Timestamp:

12/08/10 05:31:12 (2 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[ef66c597dd4703603001731c680a7d276cbaa174]

git-author:

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

Message:

this is a big patch. adds an optional extended-id. you should upgrade your iep first, then your stratcon, then your noits. This is most certainly a flag-day, *but* the feature is off by default... refs #331

Files:

• src/Makefile.in (modified) (1 diff)
• src/java/com/omniti/reconnoiter/event/NoitCheck.java (modified) (1 diff)
• src/java/com/omniti/reconnoiter/event/NoitEvent.java (modified) (1 diff)
• src/java/com/omniti/reconnoiter/event/NoitMetricNumeric.java (modified) (3 diffs)
• src/java/com/omniti/reconnoiter/event/NoitMetricText.java (modified) (3 diffs)
• src/java/com/omniti/reconnoiter/event/NoitStatus.java (modified) (3 diffs)
• src/noit.conf.in (modified) (1 diff)
• src/noit_check.c (modified) (1 diff)
• src/noit_check.h (modified) (2 diffs)
• src/noit_check_log.c (modified) (5 diffs)
• src/noit_check_tools.c (modified) (1 diff)
• src/noit_check_tools.h (modified) (1 diff)
• src/noit_conf.c (modified) (1 diff)
• src/stratcon_datastore.c (modified) (5 diffs)
• src/stratcon_realtime_http.c (modified) (4 diffs)
• src/utils/noit_log.c (modified) (1 diff)
• src/utils/noit_log.h (modified) (1 diff)

src/Makefile.in

@@ -76 +76 @@
-        noit_console_complete.o noit_xml.o \
-        noit_conf.o noit_http.o noit_rest.o noit_tokenizer.o \
-
+noit_check_tools.o 
-        stratcon_realtime_http.o \
-        stratcon_jlog_streamer.o stratcon_datastore.o \

src/java/com/omniti/reconnoiter/event/NoitCheck.java

@@ -29 +29 @@
-  public NoitCheck(String[] parts) throws Exception {
-    super(parts);
+    String id[] = extended_id_split(parts[3]);
-    noit = parts[1];
-parts
+id
-    target = parts[4];
-    module = parts[5];

src/java/com/omniti/reconnoiter/event/NoitEvent.java

@@ -17 +17 @@
-    super(parts);
-  }
+  public String[] extended_id_split(String id) {
+    String parts[] = { null, null, null, null }; /* target,module,name,uuid */
+    if(id.length() <= 36) {
+      parts[3] = id;
+      return parts;
+    }
+    parts[3] = id.substring(id.length() - 36);
+    int p1 = id.indexOf('`');
+    if(p1 < 0) return parts;
+    parts[0] = id.substring(0,p1);
+    int p2 = id.indexOf('`', p1+1);
+    if(p2 < 0) return parts;
+    parts[1] = id.substring(p1+1,p2);
+    parts[2] = id.substring(p2+1,id.length()-37);
+    return parts;
+  }
-  public void handle(EventHandler eh) {
-    eh.getService().getEPRuntime().sendEvent(this);

src/java/com/omniti/reconnoiter/event/NoitMetricNumeric.java

@@ -13 +13 @@
-public class NoitMetricNumeric extends NoitEvent {
-    private String uuid;
+    private String check_target;
+    private String check_module;
+    private String check_name;
-    private String name;
-    private long time;
@@ -27 +30 @@
-   public NoitMetricNumeric(String[] parts) throws Exception {
-      super(parts);
+      String id[] = extended_id_split(parts[3]);
-      noit = parts[1];
-      time = timeToLong(parts[2]);
-
+
+
+
+
-      name = parts[4];
-      value = null;
@@ -46 +53 @@
-    public Double getValue() { return value; }
-    public String getNoit() { return noit; }
+    public String getCheck_target() { return check_target; }
+    public String getCheck_module() { return check_module; }
+    public String getCheck_name() { return check_name; }
-
-    public int getLength() {

src/java/com/omniti/reconnoiter/event/NoitMetricText.java

@@ -17 +17 @@
-   String message;
-   String noit;
+   String check_target;
+   String check_module;
+   String check_name;
-
-   public String getPrefix() {
@@ -27 +30 @@
-    public NoitMetricText(String[] parts) throws Exception {
-      super(parts);
+      String id[] = extended_id_split(parts[3]);
-      noit = parts[1];
-
+
+
+
+
-      name = parts[4];
-      message = parts[6].equals("[[null]]") ? null : parts[6];
@@ -38 +45 @@
-    public String getMessage() { return message; }
-    public String getNoit() { return noit; }
-
+
+
+
-
-    public int getLength() {

src/java/com/omniti/reconnoiter/event/NoitStatus.java

@@ -19 +19 @@
-  Double duration;
-  String noit;
+  String check_target;
+  String check_module;
+  String check_name;
-
-  public String getPrefix() {
@@ -30 +33 @@
-  public NoitStatus(String[] parts) throws Exception {
-    super(parts);
+    String id[] = extended_id_split(parts[3]);
-    noit = parts[1];
-
+
+
+
+
-    state = parts[4];
-    availability = parts[5];
@@ -46 +53 @@
-  public Double getDuration() { return duration; }
-  public String getNoit() { return noit; }
+  public String getCheck_target() { return check_target; }
+  public String getCheck_module() { return check_module; }
+  public String getCheck_name() { return check_name; }
-
-  public int getLength() {

src/noit.conf.in

@@ -47 +47 @@
-    </components>
-    <feeds>
+      <config><extended_id>off</extended_id></config>
-      <outlet name="feed"/>
-      <log name="check"/>

src/noit_check.c

@@ -754 +754 @@
-}
-
+int
+noit_check_xpath(char *xpath, int len,
+                 const char *base, const char *arg) {
+  uuid_t checkid;
+  int base_trailing_slash;
+  char argcopy[1024], *target, *module, *name;
+
+  base_trailing_slash = (base[strlen(base)-1] == '/');
+  xpath[0] = '\0';
+  argcopy[0] = '\0';
+  if(arg) strlcpy(argcopy, arg, sizeof(argcopy));
+
+  if(uuid_parse(argcopy, checkid) == 0) {
+    /* If they kill by uuid, we'll seek and destroy -- find it anywhere */
+    snprintf(xpath, len, "/noit/checks%s%s/check[@uuid=\"%s\"]",
+             base, base_trailing_slash ? "" : "/", argcopy);
+  }
+  else if((module = strchr(argcopy, '`')) != NULL) {
+    noit_check_t *check;
+    char uuid_str[37];
+    target = argcopy;
+    *module++ = '\0';
+    if((name = strchr(module+1, '`')) == NULL)
+      name = module;
+    else
+      name++;
+    check = noit_poller_lookup_by_name(target, name);
+    if(!check) {
+      return -1;
+    }
+    uuid_unparse_lower(check->checkid, uuid_str);
+    snprintf(xpath, len, "/noit/checks%s%s/check[@uuid=\"%s\"]",
+             base, base_trailing_slash ? "" : "/", uuid_str);
+  }
+  return strlen(xpath);
+}
+
-void
-noit_check_stats_clear(stats_t *s) {

src/noit_check.h

@@ -200 +200 @@
-  noit_poller_lookup_by_name(char *target, char *name);
-
+API_EXPORT(int)
+  noit_check_xpath(char *xpath, int len,
+                   const char *base, const char *arg);
+
-API_EXPORT(void)
-  noit_check_stats_clear(stats_t *s);
@@ -237 +241 @@
-API_EXPORT(void) noit_check_log_status(noit_check_t *check);
-API_EXPORT(void) noit_check_log_metrics(noit_check_t *check);
+API_EXPORT(void) noit_check_extended_id_split(const char *in, int len,
+                                              char *target, int target_len,
+                                              char *module, int module_len,
+                                              char *name, int name_len,
+                                              char *uuid, int uuid_len);
+
-
-API_EXPORT(char *)

src/noit_check_log.c

@@ -60 +60 @@
-#define SECPART(a) ((unsigned long)(a)->tv_sec)
-#define MSECPART(a) ((unsigned long)((a)->tv_usec / 1000))
+#define MAKE_CHECK_UUID_STR(uuid_str, len, ls, check) do { \
+  noit_boolean extended_id = noit_false; \
+  const char *v; \
+  v = noit_log_stream_get_property(ls, "extended_id"); \
+  if(v && !strcmp(v, "on")) extended_id = noit_true; \
+  uuid_str[0] = '\0'; \
+  if(extended_id) { \
+    strlcat(uuid_str, check->target, len-37); \
+    strlcat(uuid_str, "`", len-37); \
+    strlcat(uuid_str, check->module, len-37); \
+    strlcat(uuid_str, "`", len-37); \
+    strlcat(uuid_str, check->name, len-37); \
+    strlcat(uuid_str, "`", len-37); \
+  } \
+  uuid_unparse_lower(check->checkid, uuid_str + strlen(uuid_str)); \
+} while(0)
-
-static void
@@ -92 +108 @@
-                      noit_check_t *check) {
-  struct timeval __now;
-
-
-
+
+
+
+
-  gettimeofday(&__now, NULL);
-  return noit_log(ls, &__now, __FILE__, __LINE__,
@@ -115 +132 @@
-                       noit_check_t *check) {
-  stats_t *c;
-
-
-
+
+
+
+
-  c = &check->stats.current;
-  return noit_log(ls, &c->whence, __FILE__, __LINE__,
@@ -136 +154 @@
-  int rv = 0;
-  int srv;
-
+256*3+
-  noit_hash_iter iter = NOIT_HASH_ITER_ZERO;
-  const char *key;
@@ -142 +160 @@
-  stats_t *c;
-  void *vm;
-
-
+
+
+
-  c = &check->stats.current;
-  while(noit_hash_next(&c->metrics, &iter, &key, &klen, &vm)) {

src/noit_check_tools.c

@@ -219 +219 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-  return strlen(xpath);
-}
-

src/noit_check_tools.h

@@ -79 +79 @@
-API_EXPORT(void)
-  noit_check_release_attrs(noit_hash_table *attrs);
-API_EXPORT(int)
-  noit_check_xpath(char *xpath, int len,
-                   const char *base, const char *arg);
-
-
-#endif

src/noit_conf.c

@@ -1002 +1002 @@
-    }
-    config = noit_conf_get_hash(log_configs[i],
-/*
+
-    ls = noit_log_stream_new(name, type[0] ? type : NULL,
-                             path[0] ? path : NULL, NULL, config);

src/stratcon_datastore.c

@@ -712 +712 @@
-        d->whence = (time_t)strtoul(token, NULL, 10);
-        PROCESS_NEXT_FIELD(token, len);
+        /* uuid is last 36 bytes */
+        if(len > 36) { token += (len-36); len = 36; }
-        sid = uuid_to_sid(token, remote_cn);
-        if(sid == 0) goto bad_row;
@@ -728 +730 @@
-        d->whence = (time_t)strtoul(token, NULL, 10);
-        PROCESS_NEXT_FIELD(token, len);
+        /* uuid is last 36 bytes */
+        if(len > 36) { token += (len-36); len = 36; }
-        sid = uuid_to_sid(token, remote_cn);
-        if(sid == 0) goto bad_row;
@@ -743 +747 @@
-        d->whence = (time_t)strtoul(token, NULL, 10);
-        PROCESS_NEXT_FIELD(token, len);
+        /* uuid is last 36 bytes */
+        if(len > 36) { token += (len-36); len = 36; }
-        sid = uuid_to_sid(token, remote_cn);
-        if(sid == 0) goto bad_row;
@@ -1417 +1423 @@
-                           const char *remote_cn, char *line) {
-  interim_journal_t *ij = NULL;
-
+1, *cp2
-  const char *fqdn = NULL, *dsn = NULL;
-  int storagenode_id = 0;
@@ -1427 +1433 @@
-    case 'S':
-    case 'M':
-
-
+
+
+
+
-        if(!uuid_parse(uuid_str, checkid)) {
-          storage_node_quick_lookup(uuid_str, remote_cn, NULL,

src/stratcon_realtime_http.c

@@ -42 +42 @@
-#include "noit_http.h"
-#include "noit_rest.h"
+#include "noit_check.h"
-#include "noit_livestream_listener.h"
-#include "stratcon_realtime_http.h"
@@ -159 +160 @@
-  scp = buff;
-  PROCESS_NEXT_FIELD(token,len); /* Skip the leader */
-
+
+
-    noit_hash_iter iter = NOIT_HASH_ITER_ZERO;
-    const char *key;
-    int klen, i=0;
-    void *vval;
+    char type[2] = { '\0', '\0' };
+    type[0] = buff[0];
-
-#define ra_write(a,b) if(noit_http_response_append(ctx, a, b) == noit_false) BAIL_HTTP_WRITE
@@ -176 +180 @@
-    /* Time */
-    noit_hash_store(&json, "script_id", 9, strdup(s_inc_id));
-"M"
+type
-    PROCESS_NEXT_FIELD(token,len);
-    noit_hash_store(&json, "time", 4, noit__strndup(token, len));
-    /* UUID */
-    PROCESS_NEXT_FIELD(token,len);
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    memset(&iter, 0, sizeof(iter));
@@ -196 +230 @@
-      char *val = (char *)vval;
-      if(i++) ra_write(",", 1);
-'
+\"
-      ra_write(key, klen);
-'
+\"
-      while(*val) {
-        if(*val == '\"' || *val == '\\') {

src/utils/noit_log.c

@@ -506 +506 @@
-}
-
+const char *
+noit_log_stream_get_property(noit_log_stream_t ls,
+                             const char *prop) {
+  const char *v;
+  if(ls && ls->config &&
+     noit_hash_retr_str(ls->config, prop, strlen(prop), &v))
+    return v;
+  return NULL;
+}
+
+void
+noit_log_stream_set_property(noit_log_stream_t ls,
+                             const char *prop, const char *v) {
+  if(!ls) return;
+  if(!ls->config) {
+    ls->config = calloc(1, sizeof(*ls->config));
+    noit_hash_init(ls->config);
+  }
+  noit_hash_replace(ls->config, prop, strlen(prop), (void *)v, free, free);
+}
+
-noit_log_stream_t
-noit_log_stream_new_on_fd(const char *name, int fd, noit_hash_table *config) {

src/utils/noit_log.h

@@ -103 +103 @@
-API_EXPORT(size_t) noit_log_stream_size(noit_log_stream_t ls);
-API_EXPORT(size_t) noit_log_stream_written(noit_log_stream_t ls);
+API_EXPORT(const char *) noit_log_stream_get_property(noit_log_stream_t ls,
+                                                      const char *);
+API_EXPORT(void) noit_log_stream_set_property(noit_log_stream_t ls,
+                                              const char *, const char *);
-API_EXPORT(void) noit_log_stream_free(noit_log_stream_t ls);
-API_EXPORT(int) noit_vlog(noit_log_stream_t ls, struct timeval *,