bin/riemann-rabbitmq in riemann-tools-dgvz-0.2.2.2 vs bin/riemann-rabbitmq in riemann-tools-dgvz-0.2.2.3

@@ -55,10 +55,15 @@
         connection = Faraday.new(uri)
         response = connection.get do |req|
           req.options[:timeout] = options[:read_timeout]
           req.options[:open_timeout] = options[:open_timeout]
         end
+        report(:host => event_host,
+          :service => "rabbitmq monitoring",
+          :state   => 'ok',
+          :description => "Monitoring operational"
+        )
       rescue => e
         report(:host => event_host,
           :service => "rabbitmq monitoring",
           :state => "critical",
           :description => "HTTP connection error: #{e.class} - #{e.message}"
@@ -104,13 +109,19 @@
 
         if (max_size_check_filter.nil? or queue['name'] !~ max_size_check_filter) and queue['messages_ready'] > options[:max_queue_size]
           errs << "Queue has #{queue['messages_ready']} jobs"
         end
 
-        unless errs.empty?
+        if errs.empty?
           report(:host    => event_host,
                  :service => svc,
+                 :state   => "ok",
+                 :description => "Queue is looking good"
+          )
+        else
+          report(:host    => event_host,
+                 :service => svc,
                  :state   => "critical",
                  :description => errs.join("; ")
           )
         end
 
@@ -232,9 +243,15 @@
           :state     => "critical",
           :description => "Disk free alarm has triggered; job submission throttled"
         )
         return
       end
+
+      report(:host => event_host,
+        :service => "rabbitmq.node.#{n}",
+        :state   => "ok",
+        :description => "Node looks OK to me"
+      )
     end
   end
 
   def tick
     check_overview