Changeset 84fddd139d4c8f36cc7a25cac7a848e2e9a8e342

Timestamp:

03/11/09 20:25:36 (4 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[ec182aa491a0935820d4dd33dde474b7fe657568]

git-author:

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

Message:

basic extraction, refs #103... might need to be more sophisticated

Files:

• src/modules/external.c (modified) (6 diffs)
• src/modules/external.xml (modified) (1 diff)

src/modules/external.c

@@ -20 +20 @@
-#include <netinet/in_systm.h>
-#endif
-
-
-
-
-
+
-
-#include "noit_module.h"
@@ -47 +43 @@
-  char *output;
-  char *error;
+  pcre *matcher;
-  eventer_t timeout_event;
-};
@@ -123 +120 @@
-    current.state = (WEXITSTATUS(ci->exit_code) == 0) ? NP_GOOD : NP_BAD;
-  }
+
+  /* Hack the output into metrics */
+  if(ci->output && ci->matcher) {
+    int rc, len, startoffset = 0;
+    int ovector[30];
+    len = strlen(ci->output);
+    noitL(data->nldeb, "going to match output at %d/%d\n", startoffset, len);
+    while((rc = pcre_exec(ci->matcher, NULL, ci->output, len, startoffset, 0,
+                          ovector, sizeof(ovector)/sizeof(*ovector))) > 0) {
+      char metric[128];
+      char value[128];
+      startoffset = ovector[1];
+      noitL(data->nldeb, "matched at offset %d\n", rc);
+      if(pcre_copy_named_substring(ci->matcher, ci->output, ovector, rc,
+                                   "key", metric, sizeof(metric)) > 0 &&
+         pcre_copy_named_substring(ci->matcher, ci->output, ovector, rc,
+                                   "value", value, sizeof(value)) > 0) {
+        /* We're able to extract something... */
+        noit_stats_set_metric(&current, metric, METRIC_GUESS, value);
+      }
+      noitL(data->nldeb, "going to match output at %d/%d\n", startoffset, len);
+    }
+    noitL(data->nldeb, "match failed.... %d\n", rc);
+  }
+
-  current.status = ci->output;
-  noit_check_set_stats(self, check, &current);
@@ -129 +151 @@
-   * provide a full report.
-   */
-WTERMSIG(ci->exit_code) != SIGQUIT
+(WTERMSIG(ci->exit_code) != SIGQUIT && WTERMSIG(ci->exit_code) != 0)
-     WCOREDUMP(ci->exit_code) ||
-ci->error
+(ci->error && *ci->error)
-    char uuid_str[37];
-    uuid_unparse_lower(check->checkid, uuid_str);
@@ -164 +186 @@
-  if(ci->envlens) free(ci->envlens);
-  if(ci->envs) free(ci->envs);
+  if(ci->matcher) pcre_free(ci->matcher);
-  memset(ci, 0, sizeof(*ci));
-}
@@ -427 +450 @@
-  ci->check_no = noit_atomic_inc64(&data->check_no_seq);
-  ci->check = check;
+  /* We might want to extract metrics */
+  if(noit_hash_retrieve(check->config,
+                        "output_extract", strlen("output_extract"),
+                        (void **)&value) != 0) {
+    const char *error;
+    int erroffset;
+    ci->matcher = pcre_compile(value, 0, &error, &erroffset, NULL);
+    if(!ci->matcher) {
+      noitL(data->nlerr, "external pcre /%s/ failed @ %d: %s\n",
+            value, erroffset, error);
+    }
+  }
+
-  noit_check_make_attrs(check, &check_attrs_hash);
-

src/modules/external.xml

@@ -25 +25 @@
-               required="optional"
-               allowed=".+">These parameters allow the setting of environment variables for the command execution.  The text following env_ is the key and the parameter value is the value of the environment variable to be set via execve.</parameter>
+    <parameter name="output_extract"
+               required="optional"
+               allowed=".+">This is a regular expression that is globally applied to the stdout of the command.  Each match is turned into a metric. It is a requirement to used named capturing in the regular expression where "key" is the named match of the metric name and "value" is the named match for the matric value.  A sample for extracting performance data from Nagios commands would be: <![CDATA[(?<key>\S+)=(?<value>[^;\s]+)(?=[;\s])]]></parameter>
-  </checkconfig>
-  <examples>