[Bps-public-commit] RT-Extension-Nagios branch, master, updated. 46d0f655d5adb98b436aca5f75311bca380bc7aa

[? sunnavy]

The branch, master has been updated
       via  46d0f655d5adb98b436aca5f75311bca380bc7aa (commit)
      from  12308008b50f1c4a1cda4ad115a71bd549245c2b (commit)

Summary of changes:
 README                     |   11 ++++++++++-
 lib/RT/Extension/Nagios.pm |    6 +++---
 2 files changed, 13 insertions(+), 4 deletions(-)

- Log -----------------------------------------------------------------
commit 46d0f655d5adb98b436aca5f75311bca380bc7aa
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Wed May 25 15:03:43 2011 +0800

    pod and readme tweak

diff --git a/README b/README
index 1a444cc..f6a40cf 100644
--- a/README
+++ b/README
@@ -14,10 +14,19 @@ INSTALLATION
         make install
         make initdb # first time only
 
-    with RT 3.8 or later, you need to add update "Plugins" configuration:
+    with RT 3.8 or later, you need to update "Plugins" configuration:
 
         Set( @Plugins, qw(... RT::Extension::Nagios) );
 
+    below are the extra options:
+    (check out lib/RT/Extension/Nagios.pm if you are confused):
+
+        Set($NagiosSearchAllQueues, 1);
+        Set($NagiosMergeTickets, 0); # false, don't merge
+        Set($NagiosMergeTickets, 1); # merge into the newest ticket.
+        Set($NagiosMergeTickets, -1); # merge into the oldest ticket.
+        Set($NagiosResolvedStatus, "resolved");
+
 AUTHOR
 
 sunnavy  C<< <sunnavy at bestpractical.com> >>
diff --git a/lib/RT/Extension/Nagios.pm b/lib/RT/Extension/Nagios.pm
index 63b25e6..2a29120 100644
--- a/lib/RT/Extension/Nagios.pm
+++ b/lib/RT/Extension/Nagios.pm
@@ -58,9 +58,9 @@ config items like C<NagiosSearchAllQueues> and C<NagiosMergeTickets> can be set
 in etc/RT_SiteConfig.pm like this:
 
     Set($NagiosSearchAllQueues, 1); # true
-    Set($NagiosMergeTickets, 0); # false, no merge will be done
-    Set($NagiosMergeTickets, 1); # merged to the newest ticket.
-    Set($NagiosMergeTickets, -1); # merged to the oldest ticket.
+    Set($NagiosMergeTickets, 0); # false, don't merge
+    Set($NagiosMergeTickets, 1); # merge into the newest ticket.
+    Set($NagiosMergeTickets, -1); # merge into the oldest ticket.
 
 by default, tickets will be resolved with status C<resolved>, you can
 customize this via config item C<NagiosResolvedStatus>, e.g.

-----------------------------------------------------------------------