bipbip 0.7.19 → 0.7.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e272fc463e770c79d01fd9e30183d2846142a37
-  data.tar.gz: 9f3e612b9879b8fda84c5cf737e2301d3d1695a0
+  metadata.gz: 90e8c71cebad832f0d96d828e0abefb250dba0ad
+  data.tar.gz: 3a2695000f9f91f6b7557bd08e9c2f01611709f9
 SHA512:
-  metadata.gz: cadf7109ef21c7b8470081d62fd88d62fd8f1e2b210be002ce39afd9cae05492c51fda824b0a2de84728f15565ef915aa82093e3de8a73a3c772b2fd159162c0
-  data.tar.gz: a738a759be9fbf930e180fcc8925ef3af9ea23a73f0cbb7afe671999f8c284b91fa1e96144f7b3d5ad194e1e3187b38c98216ba45c45c1433d3b3a423ddbc0dd
+  metadata.gz: 1bb14231582c6e2a176df2ff1de446ca9df55cda5084b0aa973e72c07518aa09521aa03676758c3da15101b78d4e3859e019dd70f386750cd6092d8bda507f35
+  data.tar.gz: 4648dcc12942ba1f5f0532440a18a39751abf981533333aa56ed2080d4c6e09b7b0f7f4bb31ab98bde6867e2acad680ce0bd38c437eb40ba9c8ad01b95ad0258

data/lib/bipbip/plugin/systemd_unit.rb

@@ -6,13 +6,39 @@ module Bipbip
   class Plugin::SystemdUnit < Plugin
     def metrics_schema
       [
-        { name: 'all_units_running', type: 'gauge', unit: 'Boolean' }
+        { name: 'all_units_active', type: 'gauge', unit: 'Boolean' },
+        { name: 'any_unit_failed', type: 'gauge', unit: 'Boolean' },
+        { name: 'any_unit_stopped', type: 'gauge', unit: 'Boolean' }
       ]
     end
 
     def monitor
       main_unit = config['unit_name']
-      { 'all_units_running' => unit_dependencies(main_unit).all? { |unit| unit_is_active(unit) } ? 1 : 0 }
+      failed_units = []
+      stopped_units = []
+      status_list = unit_dependencies(main_unit).map do |unit|
+        is_active = unit_is_active(unit)
+        is_failed = unit_is_failed(unit)
+        is_stopped = !is_active && !is_failed
+
+        failed_units.push(unit) if is_failed
+        stopped_units.push(unit) if is_stopped
+        {
+          name: unit,
+          is_active: is_active,
+          is_failed: is_failed,
+          is_stopped: is_stopped
+        }
+      end
+
+      log(Logger::WARN, "#{main_unit} unit failed: #{failed_units.join(', ')}") unless failed_units.empty?
+      log(Logger::WARN, "#{main_unit} unit stopped: #{stopped_units.join(', ')}") unless stopped_units.empty?
+
+      {
+        'all_units_active' => (status_list.all? { |status| status[:is_active] } ? 1 : 0),
+        'any_unit_failed' => (status_list.any? { |status| status[:is_failed] } ? 1 : 0),
+        'any_unit_stopped' => (status_list.any? { |status| status[:is_stopped] } ? 1 : 0)
+      }
     end
 
     # @param [String] main_unit
@@ -29,5 +55,11 @@ module Bipbip
     def unit_is_active(unit)
       Komenda.run(['systemctl', 'is-active', unit]).success?
     end
+
+    # @param [String] unit
+    # @return [TrueClass, FalseClass]
+    def unit_is_failed(unit)
+      Komenda.run(['systemctl', 'is-failed', unit]).success?
+    end
   end
 end

data/lib/bipbip/version.rb

@@ -1,3 +1,3 @@
 module Bipbip
-  VERSION = '0.7.19'.freeze
+  VERSION = '0.7.20'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bipbip
 version: !ruby/object:Gem::Version
-  version: 0.7.19
+  version: 0.7.20
 platform: ruby
 authors:
 - Cargo Media
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: copperegg-revealmetrics
@@ -358,7 +358,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Gather services data and store in CopperEgg