unsub 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7573632df7e513045df45faf213a4ceb43711a9
-  data.tar.gz: cb65143b20481d3f8981248a2493dc577d23ce2f
+  metadata.gz: a36fa0ea577e9dec28f7c2554c22e37babeacba4
+  data.tar.gz: c1a75f248f941788c3c4fcbb065942c7832957ce
 SHA512:
-  metadata.gz: 4ed4f03b1f05827b24d18a0d0f967dbcbdc2c9b8e868b433323a2aaf0de093abe132be95f7722f0c28ebc37dbb0c5940414b54fe89b9655eec6ca26149c03b0c
-  data.tar.gz: 2df0645c5915ac9a6227331d53de395fc9667a7981b0f509f3099e1498d0b795fdde425648c8e818fc3d9729e0eff4055a171548da101a7dcb1ceb094f017095
+  metadata.gz: 5a897aede7e4bb20662b28a4040f70c1554f9ed275c9f1059e4030790854e540bdd1a6eadc61ebb14dedebd0eb69793428a923d057567c9b003d180b7fded8ff
+  data.tar.gz: 986f34b160d774a1f890ee3853c5804b30aee7b0fda6007afaffb5c14b81e0a127aeb6cbcc2f543bc69a4f296fd36c3c5a2d6f783073979a4e663ac24ebe1d5c

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/unsub/main.rb

@@ -98,13 +98,13 @@ module Unsub
 
           success = case event.kind
           when :launch
-            s1 = services[:icinga].disable_downtime event.host
+            s1 = services[:icinga].enable_notifications event.host
             s2 = services[:chef].remove_tag event.host, 'terminated'
             s3 = services[:chef].add_tag event.host, 'launched'
             s1 && s2 && s3
           when :terminate
             s1 = services[:sensu].delete_client event.host
-            s2 = services[:icinga].enable_downtime event.host
+            s2 = services[:icinga].disable_notifications event.host
             s3 = services[:chef].remove_tag event.host, 'launched'
             s4 = services[:chef].add_tag event.host, 'terminated'
             db.delete! event.host[:id]

data/lib/unsub/service/chef.rb

@@ -20,7 +20,7 @@ module Unsub
 
       def extend_host host
         name = if ip = host[:ip]
-          api.search.query(:node, 'ipaddress:"%s"' % ip).rows.shift.name rescue nil
+          api.search.query(:node, 'ipaddress:"%s"' % ip).rows.shift['name'] rescue nil
         end
 
         old_host = host.dup ; host.merge! chef_name: name if name

data/lib/unsub/service/icinga.rb

@@ -10,16 +10,16 @@ module Unsub
       end
 
 
-      def enable_downtime host
-        success = cgi_command 28, host # CMD_ENABLE_HOST_SVC_NOTIFICATIONS
-        log.info service: 'icinga', event: 'enable_downtime', host: host, success: success
+      def disable_notifications host
+        success = cgi_command 29, host # CMD_DISABLE_HOST_SVC_NOTIFICATIONS
+        log.info service: 'icinga', event: 'disable_notifications', host: host, success: success
         success
       end
 
 
-      def disable_downtime host
-        success = cgi_command 29, host # CMD_DISABLE_HOST_SVC_NOTIFICATIONS
-        log.info service: 'icinga', event: 'disable_downtime', host: host, success: success
+      def enable_notifications host
+        success = cgi_command 28, host # CMD_ENABLE_HOST_SVC_NOTIFICATIONS
+        log.info service: 'icinga', event: 'enable_notifications', host: host, success: success
         success
       end
 

data/lib/unsub/service/sensu.rb

@@ -12,10 +12,7 @@ module Unsub
 
       def extend_host host
         name = if ip = host[:ip]
-          get_clients = Net::HTTP::Get.new '/clients?limit=1000000'
-          response = http.request get_clients
-          clients  = JSON.parse response.body, symbolize_names: true
-          client   = clients.select { |c| c[:address] == ip }.shift
+          client = sensu_clients.select { |c| c[:address] == ip }.shift
           client.nil? ? nil : client[:name]
         end
 
@@ -35,6 +32,23 @@ module Unsub
         log.info service: 'sensu', event: 'delete_client', host: host, success: success
         success
       end
+
+
+    private
+
+      def sensu_clients limit=1000, offset=0, results=[]
+        loop do
+          endpoint = '/clients?limit=%d&offset=%d' % [ limit, offset ]
+          request  = Net::HTTP::Get.new endpoint
+          response = http.request request
+          clients  = JSON.parse response.body, symbolize_names: true
+
+          return results if clients.empty?
+          results += clients
+          offset  += limit
+        end
+      end
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unsub
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Sean Clemmer