sensu-plugins-docker-swarm 3.3.5 → 3.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c74843d5a39656183f6d06921db6657353d2965d7d6fd5faa4b8eafa04bd30e
-  data.tar.gz: e36938112a208cffcb8bf064a62a4252486de4c072fd413476fa4f97d4580816
+  metadata.gz: 3a8018dfa539b579a08be6a2ce8bcf15af1db70b57a6b504145287036145f501
+  data.tar.gz: 562ea4c3bd22afe19ed43cb8f5c2a1265667c9cb6b4e68db306f4b418c72e78b
 SHA512:
-  metadata.gz: 2fbc6c8e255b385de68737500284bf413bf22390eb5f1cafae23e297481c2b35fc335ea6fffd7777ff580960e75e4ede9bd65570a3061c30e921090d658db3b8
-  data.tar.gz: 430bd8b2f0980f32ee34b48ab7b7011a05886787a2a3f918dc5d6470fb3eadaa5771c0b770e36caab02610d9ee99bfee9197b963fdd71e864111fd3bb863072e
+  metadata.gz: 9e86dde287a7e4e6b7fb57b8e2feca28a4dc5f23b48b918814e5354cb1fddddf70f9021f270b7f7f920bd050009f14f55f4e9832ca5c7621aa992c558ba86769
+  data.tar.gz: f8b8cef5f4ea173eea496e3d145713c29059ad42ecf9f9cfb4496ec26fe35794dfe3580ccf6553c219bb4d4cff9c7546864349a01300c3dcca8562add915688f

data/bin/check-service.rb

@@ -75,18 +75,30 @@ class CheckDockerService < Sensu::Plugin::Check::CLI
 
     # Pass the number of replicas the service should be running
     body = parse_json(response)
+
+    # Currently there is an outstanding issue in docker where the filter by name returns any services / tasks
+    # contain the name. ref - https://github.com/moby/moby/issues/32985
+    # Since there is no way to define an exact name filter, we iterate over the services and manually check the name
+    service_index = -1
+    body.each_with_index do |service, index|
+      if service['Spec']['Name'] == config[:service]
+        service_index = index
+      end
+    end
+
+    if service_index == -1
+      critical "service #{config[:service]} is not running on #{@client.uri}"
+    end
+
+    # Get the number of replicas that should be running
     intended_replicas = 0
     begin
-      intended_replicas = body[0]['Spec']['Mode']['Replicated']['Replicas']
+      intended_replicas = body[service_index]['Spec']['Mode']['Replicated']['Replicas']
     rescue Exception => e
       critical "service #{config[:service]} is not running on #{@client.uri}, but was returned by the API"
     end
 
-    # Currently there is an outstanding issue in docker where the filter by name returns any services / tasks
-    # contain the name. ref - https://github.com/moby/moby/issues/32985
-    # Since there is no way to define an exact name filter, we assume the first record returned is the exact
-    # match and extract the ID to be used in tasks
-    service_id = body[0]['ID']
+    service_id = body[service_index]['ID']
 
     # Call /tasks to get the number of running replicas (this is how `docker service ls` works)
     running_replicas = 0

data/lib/sensu-plugins-docker/version.rb

@@ -2,7 +2,7 @@ module SensuPluginsDocker
   module Version
     MAJOR = 3
     MINOR = 3
-    PATCH = 5
+    PATCH = 6
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-docker-swarm
 version: !ruby/object:Gem::Version
-  version: 3.3.5
+  version: 3.3.6
 platform: ruby
 authors:
 - Veea Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-24 00:00:00.000000000 Z
+date: 2019-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin