serf-handler 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d2e6cee9ab2833b5eeb3c4fe1484fee5b5d7c7a24d1a98b3e735e2f4bd1e03d
-  data.tar.gz: f99e818cd3a518b3c8d1663f94a30e84f0d62017393727a28a43dcdbc00de2ac
+  metadata.gz: 48f16ac0381c521948215348df104390279cfeda21e67b6b50c7179a6b6c908e
+  data.tar.gz: 13c6799240875a2129a68490f86ef450c7c3d181a4255664410360cb390a4576
 SHA512:
-  metadata.gz: c11ea7a90739f36badf59be7d7fcaebcc90ba21021dc1ddb390162473213f7aeeae07e0035081e5c9b11a35e290a09507c56fa37f4e45c6340b89492c3a95abd
-  data.tar.gz: 64868a16ff22aa911637f54f9f057f1ddf2d193bbca57e5ebd9cb5290066397432bc91d940198a89a373dfaca98f5459454ab4b2750cea1f804549a4a2cb8a41
+  metadata.gz: b083aaf44acd027885c1f60a0f10375e16cdce66b8c470bee10c009b16f77045f900c1b2671fe63df6fb5767319d563aed99335d3be7bb87eed9a82864e08946
+  data.tar.gz: a66e7373378ad0189b6465f31e1c42aef41315839888af0216d45721228576ed1982e8b53a1b6383d52fa80e8d6451aa34f97daaa8f30c3766a15fba27ab0e93

data/lib/serf/handler/events/df.rb

@@ -4,5 +4,5 @@ include Serf::Handler
 describe "Return a comma separated table of filesystem information."
 
 on :query, 'df' do |event|
-  `/bin/df -k`.split(/\n/).collect {|r| r.split.join(',').sub(/Mounted,on/,"Mounted on")}.join("\n")
+  `/bin/df -h`.split(/\n/).collect {|r| r.split.join(',').sub(/Mounted,on/,"Mounted on")}.join("\n")
 end

data/lib/serf/handler/events/freemem.rb

@@ -0,0 +1,22 @@
+require 'serf/handler' unless Object.const_defined?(:Serf) && Serf.const_defined?(:Handler)
+include Serf::Handler
+
+describe "Return current memory and swap status as a csv"
+
+on :query, 'freemem' do |event|
+  data = `free -ht`
+  lines = data.split("\n").collect {|line| line.split(/\s+/)}
+  maxlength = lines.collect {|l| l.length}.max
+  output = lines.collect do |line|
+    Array
+      .new(maxlength)
+      .zip(line)
+      .collect do |pair|
+        pair.sort_by {|item| item.to_s}
+          .last
+          .to_s
+      end
+      .collect {|item| "\"#{item}\""}
+      .join(',')
+  end.join("\n")
+end

data/lib/serf/handler/events/load_average.rb

@@ -5,5 +5,10 @@ describe "Return the 1-minute, 5-minute, and 15-minute load averages as a",
          "comma separated list of values."
 
 on :query, 'load-average' do |event|
-  `/usr/bin/uptime`.gsub(/^.*load\s+averages:\s+/,'').split.join(',').strip
+  data = `uptime`.match(/\s*(\d+:\d+:\d+)\s+up\s+(.*?),\s*(\d+\s+\w+),\s*load\s+average:\s+([\d\.]+),\s*([\d\.]+),\s*([\d\.]+)/)
+
+  <<~ECSV
+  "time","uptime","users","1 minute load","5 minute load","15 minute load"
+  #{data[1..6].collect {|d| "\"#{d}\""}.join(',')}
+  ECSV
 end

data/lib/serf/handler/events/monit-status.rb

@@ -0,0 +1,25 @@
+require 'serf/handler' unless Object.const_defined?(:Serf) && Serf.const_defined?(:Handler)
+include Serf::Handler
+
+describe "If monit is running on the system, extract all current",
+  "status information and return it as CSV data."
+
+on :query, 'monit-status' do |event|
+  data = `monit status`
+  chunks = data.scan(/((?:System|Process).*?)\n\n/m)
+
+  output = "\"field\",\"data\"\n" +
+    chunks.collect do |chunk|
+    chunk
+      .first
+      .split("\n")
+      .collect do |line|
+        Array
+          .new(2)
+          .zip(line.strip.split(/\s{2,}/,2))
+          .collect do |pair|
+            "\"#{pair.sort_by {|item| item.to_s}.last.to_s}\""
+        end.join(',')
+     end.join("\n")
+  end.join("\n\" \",\" \"\n")
+end

data/lib/serf/handler/version.rb

@@ -1,5 +1,5 @@
 module Serf
   module Handler
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serf-handler
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Kirk Haines
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-29 00:00:00.000000000 Z
+date: 2019-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,10 +81,12 @@ files:
 - lib/serf/handler/event.rb
 - lib/serf/handler/events/describe-handler.rb
 - lib/serf/handler/events/df.rb
+- lib/serf/handler/events/freemem.rb
 - lib/serf/handler/events/git-index-deploy.rb
 - lib/serf/handler/events/git-index-list.rb
 - lib/serf/handler/events/list-handlers.rb
 - lib/serf/handler/events/load_average.rb
+- lib/serf/handler/events/monit-status.rb
 - lib/serf/handler/events/mpstat.rb
 - lib/serf/handler/events/ping.rb
 - lib/serf/handler/task.rb