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

[Alex Vandiver]

The branch, master has been updated
       via  face601edc86378ac0002c1d5cdacaa738a8588e (commit)
       via  8481d186e28ea989249eefb1bc36d2318ca5e924 (commit)
      from  20738eb4ffd24ff47ffdf89bb5b23b4e108ec5c2 (commit)

Summary of changes:
 Changes                              | 3 +++
 META.yml                             | 3 ++-
 Makefile.PL                          | 2 ++
 README                               | 7 ++++---
 lib/RT/Action/UpdateNagiosTickets.pm | 7 +++++--
 lib/RT/Extension/Nagios.pm           | 9 +++++----
 6 files changed, 21 insertions(+), 10 deletions(-)

- Log -----------------------------------------------------------------
commit 8481d186e28ea989249eefb1bc36d2318ca5e924
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue Dec 16 12:24:30 2014 -0500

    Support FLAPPINGSTART and FLAPPINGSTOP states

diff --git a/lib/RT/Action/UpdateNagiosTickets.pm b/lib/RT/Action/UpdateNagiosTickets.pm
index d2935f6..456779e 100644
--- a/lib/RT/Action/UpdateNagiosTickets.pm
+++ b/lib/RT/Action/UpdateNagiosTickets.pm
@@ -25,8 +25,11 @@ sub Commit {
     my $subject = $attachment->GetHeader('Subject');
     return unless $subject;
     if ( my ( $type, $category, $host, $problem_type, $problem_severity ) =
-        $subject =~
-m{(PROBLEM|RECOVERY|ACKNOWLEDGEMENT)\s+(Service|Host) Alert: ([^/]+)/?(.*)\s+is\s+(\w+)}i
+        $subject =~ m{(PROBLEM|RECOVERY|ACKNOWLEDGEMENT|FLAPPING(?:START|STOP))
+                      \s+ (Service|Host)
+                      \s+ Alert:
+                      \s+ ([^/]+)/?(.*)
+                      \s+ is \s+ (\w+)}ix
       )
     {
         $problem_type ||= '';
diff --git a/lib/RT/Extension/Nagios.pm b/lib/RT/Extension/Nagios.pm
index 59aa339..b23f4a9 100644
--- a/lib/RT/Extension/Nagios.pm
+++ b/lib/RT/Extension/Nagios.pm
@@ -113,9 +113,10 @@ Nagios notifications from there into other queues, you will want to set:
 =item C<NagiosMergeTickets>
 
 Controls if the extensions merges tickets about the same incident
-together.  By default, each C<PROBLEM>, C<ACKNOWLEDGEMENT>, and
-C<RECOVERY> notification will remain as its own ticket; when the
-C<RECOVERY> email is received by RT, all will be resolved.
+together.  By default, each C<PROBLEM>, C<ACKNOWLEDGEMENT>,
+C<FLAPPINGSTART>, C<FLAPPINGSTOP> and C<RECOVERY> notification will
+remain as its own ticket; when the C<RECOVERY> email is received by RT,
+all will be resolved.
 
 Setting this configuration parameter to C<1> causes the extension to
 merge all old tickets on the same topic into new tickets as they arrive;

commit face601edc86378ac0002c1d5cdacaa738a8588e
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue Dec 16 12:27:26 2014 -0500

    Version 1.01 releng

diff --git a/Changes b/Changes
index 372e382..bd184d3 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+1.01 2014-12-16
+ - Support FLAPPINGSTART and FLAPPINGSTOP states
+
 1.00 2014-12-15
  - Packaging and documentation updates
 
diff --git a/META.yml b/META.yml
index b377ae7..0c3a8e7 100644
--- a/META.yml
+++ b/META.yml
@@ -22,6 +22,7 @@ requires:
   perl: 5.8.3
 resources:
   license: http://opensource.org/licenses/gpl-license.php
-version: '1.00'
+  repository: https://github.com/bestpractical/rt-extension-nagios
+version: '1.01'
 x_module_install_rtx_version: '0.36'
 x_requires_rt: 4.0.0
diff --git a/Makefile.PL b/Makefile.PL
index d9693aa..c5c8f4b 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -2,5 +2,7 @@ use inc::Module::Install;
 
 RTx('RT-Extension-Nagios');
 
+repository('https://github.com/bestpractical/rt-extension-nagios');
+
 sign();
 WriteAll();
diff --git a/README b/README
index 821e5b5..60c30ea 100644
--- a/README
+++ b/README
@@ -78,9 +78,10 @@ CONFIGURATION
 
     NagiosMergeTickets
         Controls if the extensions merges tickets about the same incident
-        together. By default, each PROBLEM, ACKNOWLEDGEMENT, and RECOVERY
-        notification will remain as its own ticket; when the RECOVERY email
-        is received by RT, all will be resolved.
+        together. By default, each PROBLEM, ACKNOWLEDGEMENT, FLAPPINGSTART,
+        FLAPPINGSTOP and RECOVERY notification will remain as its own
+        ticket; when the RECOVERY email is received by RT, all will be
+        resolved.
 
         Setting this configuration parameter to 1 causes the extension to
         merge all old tickets on the same topic into new tickets as they
diff --git a/lib/RT/Extension/Nagios.pm b/lib/RT/Extension/Nagios.pm
index b23f4a9..5b22635 100644
--- a/lib/RT/Extension/Nagios.pm
+++ b/lib/RT/Extension/Nagios.pm
@@ -3,7 +3,7 @@ use strict;
 
 package RT::Extension::Nagios;
 
-our $VERSION = '1.00';
+our $VERSION = '1.01';
 
 1;
 

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