[Pkg-nagios-changes] [SCM] Debian packaging for mod gearman. branch, upstream, updated. upstream/1.0.6-34-gd3fb2ec

Sven Nierlein sven at nierlein.de
Wed Aug 24 09:21:53 UTC 2011 

The following commit has been merged in the upstream branch:
commit 53a3b5701c72380dc83da0e5e67f40bbe6531d7f
Author: Sven Nierlein <sven at nierlein.de>
Date:   Fri Jul 22 22:46:10 2011 +0200

    released 1.0.8

diff --git a/Changes b/Changes
index 1f4f9da..afd452a 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,6 @@
 This file documents the revision history for mod_gearman.
 
-1.0.8  Fri Jul 15 20:24:27 CEST 2011
+1.0.8  Fri Jul 22 22:21:34 CEST 2011
           - use identifier for error messages if set
           - fixed ld options (fixes debian bug #632431) thanks Ilya Barygin
           - fixed memory leak in gearman_top
diff --git a/README.asciidoc b/README.asciidoc
index 5be246b..0881643 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -21,6 +21,17 @@ servicegroups.
 http://labs.consol.de/wp-content/uploads/2010/09/Mod-Gearman.pdf[Have a look at the slides from the Nagios Workshop 2011 in Hannover]
 
 
+Download
+--------
+
+* Latest stable release http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.0.8.tar.gz[version
+  1.0.8] from on July 22 2011
+* Mod Gearman is available for download at: http://labs.consol.de/nagios/mod-gearman
+* Source is available at GitHub: http://github.com/sni/mod_gearman
+* Older versions are available in the <<_archive,download archive>>.
+
+
+
 
 Support & Questions
 -------------------
@@ -34,16 +45,16 @@ Support & Questions
 
 How does it work
 ----------------
-When the broker module is loaded, it captures all servicecheck,
-hostcheck and the eventhandler events. Eventhandler are sent to a
-generic 'eventhandler' queue. Checks for hosts which are in one of the
-specified hostgroups, are sent into a seperate hostgroup queue. All
-non matching hosts are sent to a generic 'hosts' queue. Checks for
-services are first checked against the list of servicegroups, then
-against the hostgroups and if none matches they will be sent into a
-generic 'service' queue.
-The NEB module starts a single thread, which monitors the
-'check_results' where all results come in.
+When the Mod-Gearman broker module is loaded, it intercepts all
+servicechecks, hostchecks and the eventhandler events. Eventhandler
+are then sent to a generic 'eventhandler' queue. Checks for hosts
+which are in one of the specified hostgroups, are sent into a seperate
+hostgroup queue. All non matching hosts are sent to a generic 'hosts'
+queue.  Checks for services are first checked against the list of
+servicegroups, then against the hostgroups and if none matches they
+will be sent into a generic 'service' queue.  The NEB module starts a
+single thread, which monitors the 'check_results' where all results
+come in.
 
 ++++
 <a title="mod gearman architecture" rel="lightbox[mod_gm]" href="http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-e1284455350110.png"><img src="http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-e1284455350110.png" alt="mod_gearman architecture" width="480" height="300" style="float:none" /></a>
@@ -222,7 +233,7 @@ broker_module=.../mod_gearman.o server=localhost:4730 eventhandler=yes services=
 see <<_configuration,Configuration>> for details on all parameters
 
 
-The last step is to start one or more worker. You may use the same
+The next step is to start one or more worker. You may use the same
 configuration file as for the neb module.
 
 --------------------------------------
@@ -232,7 +243,7 @@ or use the supplied init script.
 
 
 NOTE: Make sure you have started your Gearmand job server. Usually
-it can be started with 
+it can be started with
 
 --------------------------------------
 /usr/sbin/gearmand -t 10 -j 0
@@ -249,11 +260,11 @@ NOTE: The needed patch is already included since Nagios 3.2.2. Use the patch if
 use an older version.
 
 It is not possible to distribute eventhandler with Nagios versions
-prior 3.2.2. Just apply the patch from the patches directory to your
-Nagios sources and build Nagios again if you want to use an older
-version. You only need to replace the nagios binary. Nothing else has
-changed.  If you plan to distribute only Host/Servicechecks, no patch
-is needed.
+prior 3.2.2. Just apply the patch from the ./extras/patches directory
+to your Nagios sources and build Nagios again if you want to use an
+older version. You only need to replace the nagios binary. Nothing
+else has changed. If you plan to distribute only Host/Servicechecks,
+no patch is needed.
 
 
 
@@ -460,14 +471,15 @@ value if your result queue is not processed fast enough.
 
 
 perfdata::
-defines if the module should distribute perfdata to gearman. Note: processing
-of perfdata is not part of mod_gearman. You will need additional worker for
-handling performance data. For example: http://www.pnp4nagios.org[PNP4Nagios] 
-Performance data is just written to the gearman queue.
+Defines if the module should distribute perfdata to gearman.
 +
 ====
     perfdata=yes
 ====
+NOTE: processing of perfdata is not part of mod_gearman. You will need
+additional worker for handling performance data. For example:
+http://www.pnp4nagios.org[PNP4Nagios]. Performance data is just
+written to the gearman queue.
 
 
 perfdata_mode::
@@ -680,6 +692,29 @@ nagios box. The amount of worker boxes depends on your check types.
 <a title="mod gearman performance" rel="lightbox[mod_gm]" href="http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman_performance_1.png"><img src="http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman_performance_1.png" alt="mod_gearman performance" width="424" height="176" style="float:none" /></a>
 ++++
 
+
+Exports
+-------
+Exports export data structures from the Nagios core as JSON data. For
+each configurable event one job will be created. At the moment, the
+only useful event type is the logdata event which allows you to create
+a json data job for every logged line. This can be very useful for
+external reporting tools.
+
+exports::
+Set the queue name to create the jobs in. The return code will be sent
+back to the core (Not all callbacks support return codes). Callbacks
+are a list of callbacks for which you want to export json data.
++
+====
+    export=<queue>:<returncode>:<callback>[,<callback>,...]
+
+    export=log_queue:1:NEBCALLBACK_LOG_DATA
+====
+
+
+
+
 How To
 ------
 
@@ -770,18 +805,10 @@ Hints
 
 
 
-Download
---------
-
-* http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.0.8.tar.gz[version 1.0.8 - July 09 2011]
-* Mod Gearman is available for download at: http://labs.consol.de/nagios/mod-gearman
-* The source is available at GitHub: http://github.com/sni/mod_gearman
-
-
 Archive
-~~~~~~~
+-------
 
-* http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.0.8.tar.gz[version 1.0.8 - July 09 2011]
+* http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.0.8.tar.gz[version 1.0.8 - July 22 2011]
 * http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.0.7.tar.gz[version 1.0.7 - July 03 2011]
 * http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.0.6.tar.gz[version 1.0.6 - June 04 2011]
 * http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.0.5.tar.gz[version 1.0.5 - May 17 2011]
diff --git a/docs/README.html b/docs/README.html
index adfb947..ed35946 100644
--- a/docs/README.html
+++ b/docs/README.html
@@ -587,6 +587,32 @@ You need at least one <a href="http://gearman.org">Gearman Job Server</a> runnin
 </ul></div>
 <div class="paragraph"><p><a href="http://labs.consol.de/wp-content/uploads/2010/09/Mod-Gearman.pdf">Have a look at the slides from the Nagios Workshop 2011 in Hannover</a></p></div>
 </div>
+<h2 id="_download">Download</h2>
+<div class="sectionbody">
+<div class="ulist"><ul>
+<li>
+<p>
+Latest stable release <a href="http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.0.8.tar.gz">version
+  1.0.8</a> from on July 22 2011
+</p>
+</li>
+<li>
+<p>
+Mod Gearman is available for download at: <a href="http://labs.consol.de/nagios/mod-gearman">http://labs.consol.de/nagios/mod-gearman</a>
+</p>
+</li>
+<li>
+<p>
+Source is available at GitHub: <a href="http://github.com/sni/mod_gearman">http://github.com/sni/mod_gearman</a>
+</p>
+</li>
+<li>
+<p>
+Older versions are available in the <a href="#_archive">download archive</a>.
+</p>
+</li>
+</ul></div>
+</div>
 <h2 id="_support_amp_questions">Support & Questions</h2>
 <div class="sectionbody">
 <div class="ulist"><ul>
@@ -616,16 +642,16 @@ Debian users may be interested in the <a href="http://labs.consol.de/nagios/mod-
 </div>
 <h2 id="_how_does_it_work">How does it work</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>When the broker module is loaded, it captures all servicecheck,
-hostcheck and the eventhandler events. Eventhandler are sent to a
-generic <em>eventhandler</em> queue. Checks for hosts which are in one of the
-specified hostgroups, are sent into a seperate hostgroup queue. All
-non matching hosts are sent to a generic <em>hosts</em> queue. Checks for
-services are first checked against the list of servicegroups, then
-against the hostgroups and if none matches they will be sent into a
-generic <em>service</em> queue.
-The NEB module starts a single thread, which monitors the
-<em>check_results</em> where all results come in.</p></div>
+<div class="paragraph"><p>When the Mod-Gearman broker module is loaded, it intercepts all
+servicechecks, hostchecks and the eventhandler events. Eventhandler
+are then sent to a generic <em>eventhandler</em> queue. Checks for hosts
+which are in one of the specified hostgroups, are sent into a seperate
+hostgroup queue. All non matching hosts are sent to a generic <em>hosts</em>
+queue.  Checks for services are first checked against the list of
+servicegroups, then against the hostgroups and if none matches they
+will be sent into a generic <em>service</em> queue.  The NEB module starts a
+single thread, which monitors the <em>check_results</em> where all results
+come in.</p></div>
 <a title="mod gearman architecture" rel="lightbox[mod_gm]" href="http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-e1284455350110.png"><img src="http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-e1284455350110.png" alt="mod_gearman architecture" width="480" height="300" style="float:none" /></a>
 <div class="paragraph"><p>A simple example queue would look like:</p></div>
 <div class="listingblock">
@@ -793,7 +819,7 @@ broker line to your nagios.cfg:</p></div>
 <pre><tt>broker_module=.../mod_gearman.o server=localhost:4730 eventhandler=yes services=yes hosts=yes</tt></pre>
 </div></div>
 <div class="paragraph"><p>see <a href="#_configuration">Configuration</a> for details on all parameters</p></div>
-<div class="paragraph"><p>The last step is to start one or more worker. You may use the same
+<div class="paragraph"><p>The next step is to start one or more worker. You may use the same
 configuration file as for the neb module.</p></div>
 <div class="listingblock">
 <div class="content">
@@ -825,11 +851,11 @@ use an older version.</td>
 </tr></table>
 </div>
 <div class="paragraph"><p>It is not possible to distribute eventhandler with Nagios versions
-prior 3.2.2. Just apply the patch from the patches directory to your
-Nagios sources and build Nagios again if you want to use an older
-version. You only need to replace the nagios binary. Nothing else has
-changed.  If you plan to distribute only Host/Servicechecks, no patch
-is needed.</p></div>
+prior 3.2.2. Just apply the patch from the ./extras/patches directory
+to your Nagios sources and build Nagios again if you want to use an
+older version. You only need to replace the nagios binary. Nothing
+else has changed. If you plan to distribute only Host/Servicechecks,
+no patch is needed.</p></div>
 </div>
 <h2 id="_configuration">Configuration</h2>
 <div class="sectionbody">
@@ -1178,10 +1204,7 @@ perfdata
 </dt>
 <dd>
 <p>
-defines if the module should distribute perfdata to gearman. Note: processing
-of perfdata is not part of mod_gearman. You will need additional worker for
-handling performance data. For example: <a href="http://www.pnp4nagios.org">PNP4Nagios</a>
-Performance data is just written to the gearman queue.
+Defines if the module should distribute perfdata to gearman.
 </p>
 <div class="exampleblock">
 <div class="exampleblock-content">
@@ -1191,6 +1214,19 @@ Performance data is just written to the gearman queue.
 </div></div>
 </div></div>
 </dd>
+</dl></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<div class="title">Note</div>
+</td>
+<td class="content">processing of perfdata is not part of mod_gearman. You will need
+additional worker for handling performance data. For example:
+<a href="http://www.pnp4nagios.org">PNP4Nagios</a>. Performance data is just
+written to the gearman queue.</td>
+</tr></table>
+</div>
+<div class="dlist"><dl>
 <dt class="hdlist1">
 perfdata_mode
 </dt>
@@ -1510,6 +1546,37 @@ nagios box. The amount of worker boxes depends on your check types.</p></div>
 <a title="mod gearman performance" rel="lightbox[mod_gm]" href="http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman_performance_2.png"><img src="http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman_performance_2.png" alt="mod_gearman performance" width="473" height="122" style="float:none" /></a>
 <a title="mod gearman performance" rel="lightbox[mod_gm]" href="http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman_performance_1.png"><img src="http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman_performance_1.png" alt="mod_gearman performance" width="424" height="176" style="float:none" /></a>
 </div>
+<h2 id="_exports">Exports</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Exports export data structures from the Nagios core as JSON data. For
+each configurable event one job will be created. At the moment, the
+only useful event type is the logdata event which allows you to create
+a json data job for every logged line. This can be very useful for
+external reporting tools.</p></div>
+<div class="dlist"><dl>
+<dt class="hdlist1">
+exports
+</dt>
+<dd>
+<p>
+Set the queue name to create the jobs in. The return code will be sent
+back to the core (Not all callbacks support return codes). Callbacks
+are a list of callbacks for which you want to export json data.
+</p>
+<div class="exampleblock">
+<div class="exampleblock-content">
+<div class="literalblock">
+<div class="content">
+<pre><tt>export=<queue>:<returncode>:<callback>[,<callback>,...]</tt></pre>
+</div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>export=log_queue:1:NEBCALLBACK_LOG_DATA</tt></pre>
+</div></div>
+</div></div>
+</dd>
+</dl></div>
+</div>
 <h2 id="_how_to">How To</h2>
 <div class="sectionbody">
 <h3 id="_how_to_monitor_job_server_and_worker">How to Monitor Job Server and Worker</h3><div style="clear:left"></div>
@@ -1616,30 +1683,12 @@ Make sure all your worker have the nagios-plugins available under
 </li>
 </ul></div>
 </div>
-<h2 id="_download">Download</h2>
+<h2 id="_archive">Archive</h2>
 <div class="sectionbody">
 <div class="ulist"><ul>
 <li>
 <p>
-<a href="http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.0.8.tar.gz">version 1.0.8 - July 09 2011</a>
-</p>
-</li>
-<li>
-<p>
-Mod Gearman is available for download at: <a href="http://labs.consol.de/nagios/mod-gearman">http://labs.consol.de/nagios/mod-gearman</a>
-</p>
-</li>
-<li>
-<p>
-The source is available at GitHub: <a href="http://github.com/sni/mod_gearman">http://github.com/sni/mod_gearman</a>
-</p>
-</li>
-</ul></div>
-<h3 id="_archive">Archive</h3><div style="clear:left"></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<a href="http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.0.8.tar.gz">version 1.0.8 - July 09 2011</a>
+<a href="http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.0.8.tar.gz">version 1.0.8 - July 22 2011</a>
 </p>
 </li>
 <li>
@@ -1718,7 +1767,7 @@ The source is available at GitHub: <a href="http://github.com/sni/mod_gearman">h
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2011-07-09 11:51:10 CEST
+Last updated 2011-07-22 22:45:23 CEST
 </div>
 </div>
 </body>

-- 
Debian packaging for mod gearman.

More information about the Pkg-nagios-changes mailing list