lita-nagios 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47c44656f16b7da317f21677ea42f7b8e60c77d6
-  data.tar.gz: 4a39170f725faf85d8cd3400c8f5a2c7dd55ee3d
+  metadata.gz: aebcf98f262d143c01d14c6578dc817ac99b289a
+  data.tar.gz: 99449e4ffc1b4ce9b6410b0a437a206ab36e9f5a
 SHA512:
-  metadata.gz: 9bcb83b3f12db66c0902748793df671583c16f7802e608ab145d4425fde3c2615210f29adb139c57714b42f46b407b85400c902117049d676d13957205b50773
-  data.tar.gz: a039c8f62ddd61175db75d81380f0ccbf73434a2ec336214c6ae0438bea52d971fba6484eba07a92d9a2bcc0f69224f45cc8b1d6f872f5bce99d8a1d16c605d4
+  metadata.gz: c496d8326859e44b31ed05488497b39eaa2cd78d70251cea5680a9b61a4a156486112e493cdadc0241389f4c4d8f382b1b53cbda23d61bc70ffa1fab329b7613
+  data.tar.gz: b1d490206425af2b14f804853ae484db65589947d28f208a9fd78cc5ad91b5e68f8751383689020f9b939d8edd62e3de81b2c786380d2d42dc1aa2ebb8959702

data/contrib/nagios_config.txt

@@ -3,9 +3,9 @@ define command {
   command_line /usr/bin/curl --request POST --connect-timeout 1 --max-time 2 $CONTACTADDRESS1$ \
                              --data-urlencode "room=#chan" \
                              --data-urlencode "type=host" \
-                             --data-urlencode "host="$HOSTNAME$" \
-                             --data-urlencode "output="$HOSTOUTPUT$" \
-                             --data-urlencode "state="$HOSTSTATE$" \
+                             --data-urlencode "host=$HOSTNAME$" \
+                             --data-urlencode "output=$HOSTOUTPUT$" \
+                             --data-urlencode "state=$HOSTSTATE$" \
                              --data-urlencode "notificationtype=$NOTIFICATIONTYPE$"
 }
 
@@ -23,7 +23,7 @@ define command {
 
 define contact{
   contact_name                  bot
-  alias                         Lita IRC
+  alias                         Lita
   service_notification_period   24x7
   host_notification_period      24x7
   service_notification_options  w,u,c,r

data/lib/lita/handlers/nagios.rb

@@ -157,62 +157,41 @@ module Lita
       http.post "/nagios/notifications", :receive
 
       def receive(request, response)
-        if request.params.has_key?("type")
-          notif_type = request.params["type"].to_sym
-          unless respond_to?(notif_type, true)
-            raise "'#{notif_type}' is not supported by Nagios handler"
-          end
-        else
-          raise "Notification type must be defined in Nagios command"
-        end
+        params = request.params
 
-        if request.params.has_key?("room")
-          room = request.params["room"]
+        if params.has_key?("room")
+          room = params["room"]
         elsif config.default_room
           room = config.default_room
         else
           raise "Room must be defined. Either fix your command or specify a default room ('config.handlers.nagios.default_room')"
         end
 
-        message = send(notif_type, request.params)
+        message = nil
+        case params["notificationtype"]
+        when "ACKNOWLEDGEMENT"
+          message = "[ACK] "
+        when "PROBLEM", "RECOVERY"
+          message = ""
+        else
+          # Don't process FLAPPING* and DOWNTIME* events for now
+          return
+        end
+
+        case params["type"]
+        when "service"
+          message += "#{params["host"]}:#{params["description"]} is #{params["state"]}: #{params["output"]}"
+        when "host"
+          message += "#{params["host"]} is #{params["state"]}: #{params["output"]}"
+        else
+          raise "Notification type must be defined in Nagios command ('host' or 'service')"
+        end
 
         target = Source.new(room: room)
         robot.send_message(target, "nagios: #{message}")
       rescue Exception => e
         Lita.logger.error(e)
       end
-
-      private
-
-      def host(params)
-        case params["state"]
-        when "UP"
-          color = :light_green
-        when "DOWN"
-          color = :light_red
-        when "UNREACHABLE"
-          color = :orange
-        end
-        status = params["state"]
-
-        message = "#{params["host"]} is #{status}: #{params["output"]}"
-      end
-
-      def service(params)
-        case params["state"]
-        when "OK"
-          color = :light_green
-        when "WARNING"
-          color = :yellow
-        when "CRITICAL"
-          color = :light_red
-        when "UNKNOWN"
-          color = :orange
-        end
-        status = params["state"]
-
-        message = "#{params["host"]}:#{params["description"]} is #{status}: #{params["output"]}"
-      end
     end
 
     Lita.register_handler(Nagios)

data/lita-nagios.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-nagios"
-  spec.version       = "0.1.0"
+  spec.version       = "0.1.1"
   spec.authors       = ["Jonathan Amiez"]
   spec.email         = ["jonathan.amiez@gmail.com"]
   spec.description   = "Nagios interaction with Lita"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-nagios
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jonathan Amiez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-20 00:00:00.000000000 Z
+date: 2014-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita