Changeset 64e4b06c954e1727bf19b222f32cea893b5cc4c1

Timestamp:

01/31/08 20:55:23 (5 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[1afde4ed656dbe3db947a99cd27b177f5a3f560f]

git-author:

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

Message:

load and parse resmon output

Files:

• src/modules/http.c (modified) (10 diffs)
• src/noit_module.c (modified) (1 diff)
• src/sample.conf (modified) (3 diffs)
• src/utils/noit_hash.c (modified) (1 diff)

src/modules/http.c

@@ -12 +12 @@
-#include <math.h>
-
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+#include <libxml/xpath.h>
+
-#include "noit_module.h"
-#include "noit_poller.h"
-#include "utils/noit_log.h"
+#include "utils/noit_hash.h"
-
-#include <apr_uri.h>
@@ -22 +27 @@
-
-#define NOIT_HTTP_VERSION_STRING "0.1"
+
+typedef struct {
+  noit_hash_table *options;
+  void (*results)(noit_module_t *, noit_check_t);
+} serf_module_conf_t;
-
-typedef struct {
@@ -81 +91 @@
-static int serf_recur_handler(eventer_t e, int mask, void *closure,
-                              struct timeval *now);
+static void serf_log_results(noit_module_t *self, noit_check_t check);
+static void resmon_log_results(noit_module_t *self, noit_check_t check);
-
-static int serf_config(noit_module_t *self, noit_hash_table *options) {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-static void serf_log_results(noit_module_t *self, noit_check_t check) {
-  int expect_code = 200;
-  char *code_str;
-  check_info_t *ci = check->closure;
-  struct timeval duration;
-  stats_t current;
-char human_buffer[256]
-code[4]
-
+int expect_code = 200
+*code_str
+human_buffer[256], code[4], 
-
-  if(noit_hash_retrieve(check->config, "code", strlen("code"),
@@ -117 +148 @@
-  noit_poller_set_state(check, &current);
-}
+static void resmon_log_results(noit_module_t *self, noit_check_t check) {
+  check_info_t *ci = check->closure;
+  struct timeval duration;
+  stats_t current;
+  int expect_code = 200;
+  int services = 0;
+  char *code_str;
+  char human_buffer[256], code[4], rt[14];
+  xmlDocPtr resmon_results = NULL;
+  xmlXPathContextPtr xpath_ctxt = NULL;
+
+  if(ci->body.b) resmon_results = xmlParseMemory(ci->body.b, ci->body.l);
+  if(resmon_results) {
+    xmlXPathObjectPtr pobj;
+    xpath_ctxt = xmlXPathNewContext(resmon_results);
+    pobj = xmlXPathEval((xmlChar *)"/ResmonResults/ResmonResult", xpath_ctxt);
+    if(pobj)
+      if(pobj->type == XPATH_NODESET)
+        services = xmlXPathNodeSetGetLength(pobj->nodesetval);
+    xmlXPathFreeObject(pobj);
+  } else {
+    noitL(nlerr, "Error in resmon doc: %s\n", ci->body.b);
+  }
+  if(xpath_ctxt) xmlXPathFreeContext(xpath_ctxt);
+  if(resmon_results) xmlFreeDoc(resmon_results);
+
+  sub_timeval(ci->finish_time, check->last_fire_time, &duration);
+
+  snprintf(rt, sizeof(rt), "%.3fms",
+           (float)duration.tv_sec + (float)duration.tv_usec / 1000000.0);
+  snprintf(human_buffer, sizeof(human_buffer),
+           "services=%d,rt=%s",
+           services,
+           ci->timed_out ? "timeout" : rt);
+  noitL(nldeb, "resmon(%s) [%s]\n", check->target, human_buffer);
+
+  current.duration = duration.tv_sec * 1000 + duration.tv_usec / 1000;
+  current.available = (ci->timed_out || ci->status.code != 200) ?
+                          NP_UNAVAILABLE : NP_AVAILABLE;
+  current.state = services ? NP_GOOD : NP_BAD;
+  current.status = human_buffer;
+  noit_poller_set_state(check, &current);
+}
-static int serf_complete(eventer_t e, int mask,
-                         void *closure, struct timeval *now) {
@@ -123 +197 @@
-
-  noitLT(nldeb, now, "serf_complete(%s)\n", ccl->check->target);
-serf
+generic
-  if(ci->connection) {
-    serf_connection_close(ci->connection);
@@ -156 +230 @@
-  serf_event_trigger(ci->context, sct->serf_baton, &desc);
-  serf_context_prerun(ci->context);
-
-
-
-
+
+
+
+
+
-  return e->mask;
-}
@@ -212 +287 @@
-    b->b = n;
-  else {
-b->b, n
+n, b->b
-    b->b = n;
-  }
@@ -405 +480 @@
-  apr_status_t status;
-  eventer_t newe;
+  serf_module_conf_t *mod_config;
-  char *config_url;
-
+  mod_config = noit_module_get_userdata(self);
-  ci = (check_info_t *)check->closure;
-  /* We cannot be running */
@@ -437 +514 @@
-  if(!noit_hash_retrieve(check->config, "url", strlen("url"),
-                        (void **)&config_url))
-
+
+
+
+
-  apr_uri_parse(ci->pool, config_url, &ci->url);
-
@@ -580 +660 @@
-};
-
+noit_module_t resmon = {
+  NOIT_MODULE_MAGIC,
+  NOIT_MODULE_ABI_VERSION,
+  "resmon",
+  "libserf-based resmon resource checker",
+  serf_onload,
+  resmon_config,
+  serf_init,
+  serf_initiate_check
+};
+

src/noit_module.c

@@ -34 +34 @@
-  else
-    snprintf(module_file, sizeof(module_file), "%s/%s.%s",
-nam
+fil
-  free(base);
-

src/sample.conf

@@ -9 +9 @@
-      <image>ping_icmp</image>
-      <name>ping_icmp</name>
+      <config>
+        <key1>value2</key1>
+        <key2>value2</key2>
+      </config>
+    </module>
+    <module>
+      <image>http</image>
+      <name>resmon</name>
-      <config>
-        <key1>value2</key1>
@@ -46 +54 @@
-    <checkgroup>
-      <module>http</module>
-2
-1
+30
+5
-      <check uuid="1b4e28ba-2fa1-11d2-883f-b9a761bde3fc">
-        <target>66.225.209.31</target>
@@ -56 +64 @@
-      </check>
-    </checkgroup>
+    <checkgroup>
+      <module>resmon</module>
+      <period>30000</period>
+      <timeout>5000</timeout>
+      <check uuid="1b4e28ba-2fa1-11d2-883f-b9a761bde3fd">
+        <target>10.225.209.36</target>
+      </check>
+    </checkgroup>
-  </checks>
-</noit>

src/utils/noit_hash.c

@@ -206 +206 @@
-  noit_hash_bucket *b;
-
+  if(!h) return 0;
-  if(h->table_size == 0) noit_hash_init(h);
-  off = __hash(k, klen, h->initval) & (h->table_size-1);