Changeset 8d08f77c61b7d5163f3f7f4e3979cf81e63564ae

Timestamp:

06/01/10 20:37:01 (3 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[52b8bc4e1ecc74b21f4db46822bfe9c609fb818a]

git-author:

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

Message:

support arbitrary extraction from documents, closes #287

Files:

• src/modules-lua/noit/module/http.lua (modified) (2 diffs)
• src/modules/lua_noit.c (modified) (5 diffs)

src/modules-lua/noit/module/http.lua

@@ -85 +85 @@
-               required="optional"
-               allowed=".+">This regular expression is matched against the body of the response.  If a match is not found, the check will be marked as "bad."</parameter>
+    <parameter name="extract"
+               required="optional"
+               allowed=".+">This regular expression is matched against the body of the response globally.  The first capturing match is the key and the second capturing match is the value.  Each key/value extracted is registered as a metric for the check.</parameter>
-  </checkconfig>
-  <examples>
@@ -447 +450 @@
-    check.metric_int32("bytes", client.content_bytes)
-
+    if check.config.extract ~= nil then
+      local exre = noit.pcre(check.config.extract)
+      local rv = true
+      while rv do
+        rv, m, key, value = exre(output or '')
+        if rv and key ~= nil then
+          check.metric(key, value)
+        end
+      end
+    end
+
-    -- check body
-    if check.config.body ~= nil then

src/modules/lua_noit.c

@@ -1200 +1200 @@
-}
-
+struct pcre_global_info {
+  pcre *re;
+  int offset;
+};
-static int
-noit_lua_pcre_match(lua_State *L) {
-  const char *subject;
-pcre **re
+struct pcre_global_info *pgi
-  int i, cnt, ovector[30];
-  size_t inlen;
-
-re = (pcre *
+pgi = (struct pcre_global_info 
-  subject = lua_tolstring(L,1,&inlen);
-  if(!subject) {
@@ -1213 +1217 @@
-    return 1;
-  }
-
+
+
+
+
+
+
-                  ovector, sizeof(ovector)/sizeof(*ovector));
-  if(cnt <= 0) {
@@ -1223 +1232 @@
-    int start = ovector[i*2];
-    int end = ovector[i*2+1];
-
-
+
+
+
-  return cnt+1;
-}
-static int
-nl_pcre(lua_State *L) {
-
+
+
-  const char *expr;
-  const char *errstr;
@@ -1242 +1253 @@
-    return 3;
-  }
-
-
+
+
+
-  luaL_getmetatable(L, "noit.pcre");
-  lua_setmetatable(L, -2);
@@ -1251 +1263 @@
-static int
-noit_lua_pcre_gc(lua_State *L) {
-pcre **holder
-holder = (pcre *
-*holder
+struct pcre_global_info *pgi
+pgi = (struct pcre_global_info 
+pgi->re
-  return 0;
-}