riemann-tools 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5a792bfad2f53aed8b440a4077dfe9cb062fa93634ca2a89d6a1ee0d95b9d58
-  data.tar.gz: 3a66ce44d7ce2c1c092e2730d7648fb2175dc3c145d227a1800dc67d1d9aec8d
+  metadata.gz: 9a03d7a3dbe3175c3c9e3ab9af1ff80cf37affafed4af3f8b8c84dd11a91b2d9
+  data.tar.gz: e789e77e2ceaac35acc00fc3d4136497d3410056d22d4ea1f5c0ab884b05f967
 SHA512:
-  metadata.gz: 70e5dd74454d5306a10ced4e20428b900e8ef94d8b1c245db5d10be2460342e1b8b9de10de789091a87c06b2e9131dfb427824353ac25ca1435d84b0b15dd99a
-  data.tar.gz: 38c2b16254f90c75badf6f0d44cd99d7b5cf880dbabe4e985248d58a90f2c34ac87cd4da470b915d459a53bae7bcfd0628464c917893a4cdac6d578987d85af3
+  metadata.gz: 599e8b4b8923501cad11bce865c3ba9aa6420411d9e515fcd33b349308c3f8ee6200d8db648ad0a8ce1b701fe88e1858dae26a800fb599f5297c7a5175e58f5b
+  data.tar.gz: a34dbd525e45f4c71ad3fec639f81d339848034aeede60efa6de5081e28d1afd6bc18ceb39d67c4dd223d04a2dba006cc74ddc6f288ce612ea16d454577d6e1c

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [v1.4.0](https://github.com/riemann/riemann-tools/tree/v1.4.0) (2022-08-30)
+
+[Full Changelog](https://github.com/riemann/riemann-tools/compare/v1.3.0...v1.4.0)
+
+**Implemented enhancements:**
+
+- Improve zpool state reporting [\#239](https://github.com/riemann/riemann-tools/pull/239) ([smortex](https://github.com/smortex))
+
+**Fixed bugs:**
+
+- Fix zpool/md informational messages reporting [\#238](https://github.com/riemann/riemann-tools/pull/238) ([smortex](https://github.com/smortex))
+- Fix detection of degraded zpool [\#237](https://github.com/riemann/riemann-tools/pull/237) ([smortex](https://github.com/smortex))
+
 ## [v1.3.0](https://github.com/riemann/riemann-tools/tree/v1.3.0) (2022-08-29)
 
 [Full Changelog](https://github.com/riemann/riemann-tools/compare/v1.2.0...v1.3.0)

data/lib/riemann/tools/md.rb

@@ -20,13 +20,13 @@ module Riemann
 
         report(
           service: 'mdstat',
-          message: status,
+          description: status,
           state: state,
         )
       rescue Errno::ENOENT => e
         report(
           service: 'mdstat',
-          message: e.message,
+          description: e.message,
           state: 'critical',
         )
       end

data/lib/riemann/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Riemann
   module Tools # :nodoc:
-    VERSION = '1.3.0'
+    VERSION = '1.4.0'
   end
 end

data/lib/riemann/tools/zpool.rb

@@ -12,15 +12,26 @@ module Riemann
       def tick
         output, status = Open3.capture2e('zpool status -x')
 
+        state = if status.success?
+                  case output
+                  when "all pools are healthy\n" then 'ok'
+                  when /state: (DEGRADED|FAULTED)/ then 'critical'
+                  else
+                    'warning'
+                  end
+                else
+                  'critical'
+                end
+
         report(
           service: 'zpool health',
-          message: output,
-          state: status.success? ? 'ok' : 'critical',
+          description: output,
+          state: state,
         )
       rescue Errno::ENOENT => e
         report(
           service: 'zpool health',
-          message: e.message,
+          description: e.message,
           state: 'critical',
         )
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riemann-tools
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Kyle Kingsbury
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-29 00:00:00.000000000 Z
+date: 2022-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -321,7 +321,7 @@ metadata:
   homepage_uri: https://github.com/aphyr/riemann-tools
   source_code_uri: https://github.com/aphyr/riemann-tools
   changelog_uri: https://github.com/aphyr/riemann-tools
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -336,8 +336,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.19
-signing_key:
+rubygems_version: 3.2.5
+signing_key: 
 specification_version: 4
 summary: Utilities which submit events to Riemann.
 test_files: []