[Reconnoiter-devel] [reconnoiter commit] Reconnoiter branch, master, updated. fbf2b3181e1cc48410fe39bb0f0c291d73095a8f

git at labs.omniti.com git at labs.omniti.com
Sat Nov 5 19:37:08 EDT 2011


Pushed by: jesus
The branch, master has been updated
       via  fbf2b3181e1cc48410fe39bb0f0c291d73095a8f (commit)
       via  51773e8c4dc20d3bb5f6268d0d2e9fe1b5c192b4 (commit)
       via  6df259e7c95cbacb24cd57f5f1e5d70345e506a7 (commit)
       via  3d84df203288f50b595551aef51beb98b81b939d (commit)
      from  e2528977abb772a67afc5670a6f4628d7ce9b684 (commit)

Summary of changes:
 docs/config/modules/noit.module.http.xml           |   28 ++++++++++++
 docs/config/modules/noit.module.jezebel.xml        |    2 +-
 ...it.module.varnish.xml => noit.module.nginx.xml} |   32 ++++++--------
 docs/config/modules/noit.module.tcp.xml            |   44 ++++++++++++++++++++
 src/modules-lua/noit/module/http.lua               |    3 +-
 src/modules-lua/noit/module/jezebel.lua            |    2 +-
 src/modules-lua/noit/module/nginx.lua              |    8 ++--
 7 files changed, 93 insertions(+), 26 deletions(-)
 copy docs/config/modules/{noit.module.varnish.xml => noit.module.nginx.xml} (56%)

Log:
commit fbf2b3181e1cc48410fe39bb0f0c291d73095a8f
Author: Theo Schlossnagle <jesus at omniti.com>
Date:   Sat Nov 5 19:37:05 2011 -0400

    fix a horribly broken XML description

diff --git a/docs/config/modules/noit.module.nginx.xml b/docs/config/modules/noit.module.nginx.xml
new file mode 100644
index 0000000..ae17a8f
--- /dev/null
+++ b/docs/config/modules/noit.module.nginx.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<section>
+  <title>nginx</title>
+  <para>The nginx module gathers information from the nginx stub_status module</para>
+  <variablelist>
+    <varlistentry>
+      <term>loader</term>
+      <listitem>
+        <para>lua</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>object</term>
+      <listitem>
+        <para>noit.module.nginx</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+  <section>
+    <title>Module Configuration</title>
+  </section>
+  <section>
+    <title>Check Configuration</title>
+    <variablelist>
+      <varlistentry>
+        <term>url</term>
+        <listitem>
+          <variablelist>
+            <varlistentry>
+              <term>required</term>
+              <listitem>
+                <para>required</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term>allowed</term>
+              <listitem>
+                <para>.+</para>
+              </listitem>
+            </varlistentry>
+          </variablelist>
+          <para>The URL including schema and hostname for the status output from nginx.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </section>
+  <example>
+    <title>Monitor an nginx server with a status page available at http://10.1.2.3/nginx_status</title>
+    <para>The following example pulls metrics from Nginx's status module (http://wiki.nginx.org/HttpStubStatusModule) from http://10.1.2.3/nginx_status</para>
+    <programlisting>
+      <noit>
+        <modules>
+          <loader image="lua" name="lua">
+            <config><directory>/opt/reconnoiter/libexec/modules-lua/?.lua</directory></config>
+          </loader>
+          <module loader="lua" name="nginx" object="noit.module.nginx"/>
+        </modules>
+        <checks>
+         <check uuid="CAC1A58F-1670-4F71-8D15-21461D3F6624" name="nginx_10123" module="nginx" target="10.1.2.3">
+           <config>
+             <url>http://10.1.2.3/nginx_status</url>
+           </config>
+        </checks>
+      </noit>
+      </programlisting>
+  </example>
+</section>
diff --git a/src/modules-lua/noit/module/nginx.lua b/src/modules-lua/noit/module/nginx.lua
index 24d9f83..c48c0f4 100644
--- a/src/modules-lua/noit/module/nginx.lua
+++ b/src/modules-lua/noit/module/nginx.lua
@@ -37,10 +37,10 @@ function onload(image)
   image.xml_description([=[
 <module>
   <name>nginx</name>
-  <desccription><para>The nginx module gathers information from the nginx stub_status module</para>
+  <description><para>The nginx module gathers information from the nginx stub_status module</para>
   </description>
   <loader>lua</loader>
-  <object>noit.module.nginx</module>
+  <object>noit.module.nginx</object>
   <checkconfig>
     <parameter name="url"
                required="required"
@@ -48,7 +48,7 @@ function onload(image)
   </checkconfig>
   <examples>
     <example>
-      <title>Monitor an nginx server with a status page available at http://10.1.2.3/nginx_status</status>
+      <title>Monitor an nginx server with a status page available at http://10.1.2.3/nginx_status</title>
       <para>The following example pulls metrics from Nginx's status module (http://wiki.nginx.org/HttpStubStatusModule) from http://10.1.2.3/nginx_status</para>
       <programlisting><![CDATA[
       <noit>
@@ -65,7 +65,7 @@ function onload(image)
            </config>
         </checks>
       </noit>
-      ]]</programlisting>
+      ]]></programlisting>
     </example>
   </examples>
 </module>

commit 51773e8c4dc20d3bb5f6268d0d2e9fe1b5c192b4
Author: Theo Schlossnagle <jesus at omniti.com>
Date:   Sat Nov 5 19:36:45 2011 -0400

    update docs

diff --git a/docs/config/modules/noit.module.tcp.xml b/docs/config/modules/noit.module.tcp.xml
index ecb5ada..1a76814 100644
--- a/docs/config/modules/noit.module.tcp.xml
+++ b/docs/config/modules/noit.module.tcp.xml
@@ -67,6 +67,50 @@
     </variablelist>
     <variablelist>
       <varlistentry>
+        <term>send_body</term>
+        <listitem>
+          <variablelist>
+            <varlistentry>
+              <term>required</term>
+              <listitem>
+                <para>optional</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term>allowed</term>
+              <listitem>
+                <para>.+</para>
+              </listitem>
+            </varlistentry>
+          </variablelist>
+          <para>Data to send on the socket once connected and optionally SSL is negotiated, but before the body match is tested.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <variablelist>
+      <varlistentry>
+        <term>body_match</term>
+        <listitem>
+          <variablelist>
+            <varlistentry>
+              <term>required</term>
+              <listitem>
+                <para>optional</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term>allowed</term>
+              <listitem>
+                <para>.+</para>
+              </listitem>
+            </varlistentry>
+          </variablelist>
+          <para>This regular expression is matched against the body (the leftover data up to 1024 bytes) after the banner.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <variablelist>
+      <varlistentry>
         <term>use_ssl</term>
         <listitem>
           <variablelist>

commit 6df259e7c95cbacb24cd57f5f1e5d70345e506a7
Author: Theo Schlossnagle <jesus at omniti.com>
Date:   Sat Nov 5 19:36:31 2011 -0400

    fix documentation, had a trailing slash on the URL

diff --git a/docs/config/modules/noit.module.jezebel.xml b/docs/config/modules/noit.module.jezebel.xml
index 6abaa81..50a0500 100644
--- a/docs/config/modules/noit.module.jezebel.xml
+++ b/docs/config/modules/noit.module.jezebel.xml
@@ -101,7 +101,7 @@
           </loader>
           <jezebel>
             <config>
-              <url>http://127.0.0.1:8083/dispatch/</url>
+              <url>http://127.0.0.1:8083/dispatch</url>
             </config>
             <module loader="lua" name="com.omniti.jezebel.SampleCheck"
                     object="noit.module.jezebel"/>
diff --git a/src/modules-lua/noit/module/jezebel.lua b/src/modules-lua/noit/module/jezebel.lua
index 9134311..b050fed 100644
--- a/src/modules-lua/noit/module/jezebel.lua
+++ b/src/modules-lua/noit/module/jezebel.lua
@@ -63,7 +63,7 @@ function onload(image)
           </loader>
           <jezebel>
             <config>
-              <url>http://127.0.0.1:8083/dispatch/</url>
+              <url>http://127.0.0.1:8083/dispatch</url>
             </config>
             <module loader="lua" name="com.omniti.jezebel.SampleCheck"
                     object="noit.module.jezebel"/>

commit 3d84df203288f50b595551aef51beb98b81b939d
Author: Theo Schlossnagle <jesus at omniti.com>
Date:   Sat Nov 5 19:36:06 2011 -0400

    fix XML in docs

diff --git a/docs/config/modules/noit.module.http.xml b/docs/config/modules/noit.module.http.xml
index e032617..c3733e7 100644
--- a/docs/config/modules/noit.module.http.xml
+++ b/docs/config/modules/noit.module.http.xml
@@ -397,6 +397,34 @@
         </listitem>
       </varlistentry>
     </variablelist>
+    <variablelist>
+      <varlistentry>
+        <term>include_body</term>
+        <listitem>
+          <variablelist>
+            <varlistentry>
+              <term>required</term>
+              <listitem>
+                <para>optional</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term>default</term>
+              <listitem>
+                <para>false</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term>allowed</term>
+              <listitem>
+                <para>^(?:true|false|on|off)$</para>
+              </listitem>
+            </varlistentry>
+          </variablelist>
+          <para>Include whole response body as a metric with the key 'body'.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
   </section>
   <example>
     <title>Checking an HTTP and HTTPS URL.</title>
diff --git a/src/modules-lua/noit/module/http.lua b/src/modules-lua/noit/module/http.lua
index be7cb32..06a7575 100644
--- a/src/modules-lua/noit/module/http.lua
+++ b/src/modules-lua/noit/module/http.lua
@@ -94,8 +94,7 @@ function onload(image)
     <parameter name="include_body"
                required="optional"
                allowed="^(?:true|false|on|off)$"
-               default="false"
-               allowed="\d+">Include whole response body as a metric with the key 'body'.</parameter>
+               default="false">Include whole response body as a metric with the key 'body'.</parameter>
 
   </checkconfig>
   <examples>




hooks/post-receive
-- 
Reconnoiter


More information about the Reconnoiter-devel mailing list