netdata-client 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8171602fe100225682a866be89d6670d825847ee
-  data.tar.gz: b23deb081fe6502ce501d0d81b980a90e4244eed
+  metadata.gz: 98909afdec410b912d32322eb69a25308d26cb64
+  data.tar.gz: b3fd0a0da36948ea9e825ed78b8f3c3684f535dd
 SHA512:
-  metadata.gz: 61ff2f57377312fe4adf9eb99f6bc4334342bd607ab6c4585076e8267c7f375d383c11a552bdcaf78554d3430d787292d03ae2eda73086e77314b5606ea5204f
-  data.tar.gz: fd23f25cde337bf43050901b879a6f4708a44a96049a6b394a252ffea7c3bd9438c4bfbe68cba2c0d663a39319e832e4ec548763cc84fd0169e6724e3e3c99a2
+  metadata.gz: 15e94291b79e885ea9fa105a8dfb4f0180254b1d0e16206f388ab2ca2042aa0b712050425d19f7740b83e658e959df91f9fb05986ee5987f9f9f111f340567b1
+  data.tar.gz: 288114bb9add9eb929f79386d59f017eee038fb27b4547db68593be1a5805e861fc1702c190181e59947207cc5cf16cd0550bd7292ae2f4512ba0050f34c1eaf

data/lib/netdata/client/controller.rb

@@ -17,10 +17,55 @@ module Netdata
 
           return unless alarms
 
-          alarms_resp = JSON.parse(alarms.body)
+          alarms_resp = parse_alarms(JSON.parse(alarms.body))
 
           # system CPU stats
-          cpu_opts = {
+          cpu_value = get_cpu(url)
+
+          # CPU on a per-user basis
+          users_cpu_value_history, users_cpu_value, users_cpu_users = get_cpu_users(url)
+
+          aggregator[alarms_resp["hostname"]] = {}
+          aggregator[alarms_resp["hostname"]][:cpu] = cpu_value
+          aggregator[alarms_resp["hostname"]][:users_cpu] = { users: users_cpu_users, value: users_cpu_value, history: users_cpu_value_history.select { |val| val > threshold } }
+          aggregator[alarms_resp["hostname"]][:alarms] = alarms_resp unless alarms_resp["alarms"].nil?
+        end
+
+        pp aggregator
+
+        aggregator.each_pair do |host, data|
+          # new thread for each host so we can see mulitple notifications
+          Thread.new {
+            message = ""
+            message += "CPU Warning - #{data[:cpu].round(2)}%\n" if data[:cpu] > threshold
+            message += "#{data[:users_cpu][:users].size} system users active (#{data[:users_cpu][:value].round(2)}% CPU)\n" if data[:users_cpu][:value] > threshold
+            message += "Alarms are ringing\n" if data[:alarms]
+            message += "#{data[:users_cpu][:history].size} CPU instance(s) > #{threshold}%\n" if data[:users_cpu][:history].size > 0
+
+            Notify.bubble(message, "Netdata Warning on #{host}") if message.size > 0
+          }.join
+        end
+      end
+
+      private
+
+      def parse_alarms(data)
+        out = data.dup
+        out["alarms"] = nil
+
+        return {} if data["alarms"].empty?
+
+        data['alarms'].each do |alarm|
+          alarm_name = alarm[0]
+          alarm_value = alarm[1]
+          out["alarms"] = alarm_value unless alarm_value["recipient"] == 'silent'
+        end
+
+        out
+      end
+
+      def get_cpu(url)
+        cpu_opts = {
             "chart" => "system.cpu",
             "format" => "array",
             "points" => 54,
@@ -30,9 +75,10 @@ module Netdata
           }
           cpu = @network.get("data", url, cpu_opts)
           cpu_value = JSON.parse(cpu.body)["result"].first
+      end
 
-          # CPU on a per-user basis
-          users_cpu_opts = {
+      def get_cpu_users(url)
+        users_cpu_opts = {
             "chart" => "users.cpu",
             "format" => "array",
             "points" => 54,
@@ -46,26 +92,7 @@ module Netdata
           users_cpu_value_history = users_cpu_resp["result"][0..119]
           users_cpu_users = users_cpu_resp["dimension_names"]
 
-          aggregator[alarms_resp["hostname"]] = {}
-          aggregator[alarms_resp["hostname"]][:cpu] = cpu_value
-          aggregator[alarms_resp["hostname"]][:users_cpu] = { users: users_cpu_users, value: users_cpu_value, history: users_cpu_value_history.select { |val| val > threshold } }
-          aggregator[alarms_resp["hostname"]][:alarms] = alarms_resp unless alarms_resp["alarms"].empty?
-        end
-
-        pp aggregator
-
-        aggregator.each_pair do |host, data|
-          # new thread for each host so we can see mulitple notifications
-          Thread.new {
-            message = ""
-            message += "CPU Warning - #{data[:cpu].round(2)}%\n" if data[:cpu] > threshold
-            message += "#{data[:users_cpu][:users].size} system users active (#{data[:users_cpu][:value].round(2)}% CPU)\n" if data[:users_cpu][:value] > threshold
-            message += "Alarms are ringing" if data[:alarms]
-            message += "#{data[:users_cpu][:history].size} CPU instance(s) > #{threshold}%" if data[:users_cpu][:history].size > 0
-
-            Notify.bubble(message, "Netdata Warning on #{host}") if message.size > 0
-          }.join
-        end
+          [users_cpu_value_history, users_cpu_value, users_cpu_users]
       end
     end
   end

data/lib/netdata/client/version.rb

@@ -1,5 +1,5 @@
 module Netdata
   module Client
-    VERSION = "1.2.0"
+    VERSION = "1.3.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netdata-client
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Ryan Priebe