netdata-client 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98909afdec410b912d32322eb69a25308d26cb64
-  data.tar.gz: b3fd0a0da36948ea9e825ed78b8f3c3684f535dd
+  metadata.gz: f135a517b6df6c479328589612bb49daaecd1146
+  data.tar.gz: 85847fd61b274f20155eb9dafdd10fcabbd4adf3
 SHA512:
-  metadata.gz: 15e94291b79e885ea9fa105a8dfb4f0180254b1d0e16206f388ab2ca2042aa0b712050425d19f7740b83e658e959df91f9fb05986ee5987f9f9f111f340567b1
-  data.tar.gz: 288114bb9add9eb929f79386d59f017eee038fb27b4547db68593be1a5805e861fc1702c190181e59947207cc5cf16cd0550bd7292ae2f4512ba0050f34c1eaf
+  metadata.gz: 3ea7479044223aa0a6f17639ddc3f3a017918d19181f3e6b121ad958c7b77751c4535abafcba1eace7b4bf947c1db9d53331504ec0f6e103047a5ca0c03e54e6
+  data.tar.gz: dc7916e2f0f0ece3c45e071b96345ab555ffdddfcaf9ab3f5caef990d191a3af6b298858da495453af22f3345eb3b785ee139865300d217a0f56083f1c38a4bd

data/Rakefile

@@ -1,9 +1,9 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
+  t.libs << 'test'
+  t.libs << 'lib'
   t.test_files = FileList['test/**/*_test.rb']
 end
 

data/exe/netdatacli

@@ -2,15 +2,15 @@
 lib = File.expand_path('../../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-require "netdata/client"
-require "optparse"
+require 'netdata/client'
+require 'optparse'
 
 main = false
 
 OptionParser.new do |opt|
-  # opt.banner = "netdatacli [...flags]"
+  # opt.banner = 'netdatacli [...flags]'
 
-  opt.on("-m", "--2min", "Trigger the 2 minute actions") { |o| main = true }
+  opt.on('-m', '--2min', 'Trigger the 2 minute actions') { |o| main = true }
 end.parse!
 
 client = Netdata::Client::Controller.new

data/lib/netdata/client/controller.rb

@@ -3,7 +3,8 @@ module Netdata
     class Controller
       def initialize
         @network = Helper::Network.new
-        @config = ::YAML::load_file(File.expand_path("~/.netdatacli.yml"))
+        @aggregator = Helper::DataAggregator.new
+        @config = ::YAML::load_file(File.expand_path('~/.netdatacli.yml'))
       end
 
       def report_interval_2_mins
@@ -13,22 +14,19 @@ module Netdata
         return unless @config
 
         @config["instances"].each do |url|
-          alarms = @network.get("alarms", url, {})
+          alarms = @network.get('alarms', url, {})
 
           return unless alarms
 
-          alarms_resp = parse_alarms(JSON.parse(alarms.body))
-
-          # system CPU stats
-          cpu_value = get_cpu(url)
+          alarms_resp = @aggregator.parse_alarms(JSON.parse(alarms.body))
 
           # CPU on a per-user basis
-          users_cpu_value_history, users_cpu_value, users_cpu_users = get_cpu_users(url)
+          users_cpu_value_history, users_cpu_value, users_cpu_users = @aggregator.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?
+          aggregator[alarms_resp['hostname']] = {}
+          aggregator[alarms_resp['hostname']][:cpu] = @aggregator.get_cpu(url)
+          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
@@ -36,7 +34,7 @@ module Netdata
         aggregator.each_pair do |host, data|
           # new thread for each host so we can see mulitple notifications
           Thread.new {
-            message = ""
+            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]
@@ -46,54 +44,6 @@ module Netdata
           }.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,
-            "group" => "average",
-            "options" => "absolute|jsonwrap|nonzero",
-            "after" => -540
-          }
-          cpu = @network.get("data", url, cpu_opts)
-          cpu_value = JSON.parse(cpu.body)["result"].first
-      end
-
-      def get_cpu_users(url)
-        users_cpu_opts = {
-            "chart" => "users.cpu",
-            "format" => "array",
-            "points" => 54,
-            "group" => "average",
-            "options" => "absolute|jsonwrap|nonzero",
-            "after" => -540
-          }
-          users_cpu = @network.get("data", url, users_cpu_opts)
-          users_cpu_resp = JSON.parse(users_cpu.body)
-          users_cpu_value = users_cpu_resp["result"].first
-          users_cpu_value_history = users_cpu_resp["result"][0..119]
-          users_cpu_users = users_cpu_resp["dimension_names"]
-
-          [users_cpu_value_history, users_cpu_value, users_cpu_users]
-      end
     end
   end
-end
+end

data/lib/netdata/client/helper/data_aggregator.rb

@@ -0,0 +1,72 @@
+module Netdata
+  module Client
+    module Helper
+      # Organize and parse data for certain flags
+      class DataAggregator
+        # Initializer
+        def initialize
+          @network = Network.new
+
+          # CPU usage per-user request options
+          @users_cpu_opts = {
+            'chart' => 'users.cpu',
+            'format' => 'array',
+            'points' => 54,
+            'group' => 'average',
+            'options' => 'absolute|jsonwrap|nonzero',
+            'after' => -540
+          }
+
+          # raw CPU request options
+          @cpu_opts = {
+            'chart' => 'system.cpu',
+            'format' => 'array',
+            'points' => 54,
+            'group' => 'average',
+            'options' => 'absolute|jsonwrap|nonzero',
+            'after' => -540
+          }
+        end
+
+        # ...
+        # Params:
+        def parse_alarms(data)
+          out = data.dup
+
+          return { 'hostname' => data['hostname'] } if data['alarms'].empty?
+
+          out['alarms'] = nil
+
+          data['alarms'].each do |alarm|
+            alarm_value = alarm[1]
+            recipient = alarm_value['recipient']
+            out['alarms'] = alarm_value unless recipient == 'silent'
+          end
+
+          out
+        end
+
+        # ...
+        # Params:
+        def get_cpu(url)
+          cpu = @network.get('data', url, @cpu_opts)
+
+          JSON.parse(cpu.body)['result'].first
+        end
+
+        # ...
+        # Params:
+        def get_cpu_users(url)
+          users_cpu = @network.get('data', url, @users_cpu_opts)
+
+          users_cpu_resp = JSON.parse(users_cpu.body)
+          users_cpu_value = users_cpu_resp['result'].first
+          users_cpu_value_history = users_cpu_resp['result'][0..119]
+          users_cpu_users = users_cpu_resp['dimension_names']
+
+          [users_cpu_value_history, users_cpu_value, users_cpu_users]
+        end
+      end
+    end
+  end
+end

data/lib/netdata/client/helper/network.rb

@@ -1,6 +1,7 @@
 module Netdata
   module Client
     module Helper
+      # Perform HTTP requests
       class Network
         # Access the configuration object instance externally
         attr_accessor :config
@@ -9,7 +10,7 @@ module Netdata
         # Params:
         # +url+:: The URL you want to hit
         # +key+:: The authentication key to pass via headers to the URL
-        def get(endpoint, url, args, version = "v1")
+        def get(endpoint, url, args, version = 'v1')
           qs = build_qs(args)
           req_url = "#{url}/api/#{version}/#{endpoint}?#{qs}"
 
@@ -20,7 +21,7 @@ module Netdata
         # Params:
         # +url+:: The URL you want to hit
         # +key+:: The authentication key to pass via headers to the URL
-        def post(endpoint, url, args, version = "v1")
+        def post(endpoint, url, args, version = 'v1')
           qs = build_qs(args)
           req_url = "#{url}/api/#{version}/#{endpoint}?#{qs}"
 
@@ -56,7 +57,7 @@ module Netdata
         # Params:
         # +args+:: The hash
         def build_qs(args)
-          args.map{|k, v| "#{k}=#{v}"}.join("&")
+          args.map { |k, v| "#{k}=#{v}" }.join('&')
         end
       end
     end

data/lib/netdata/client/version.rb

@@ -1,5 +1,5 @@
 module Netdata
   module Client
-    VERSION = "1.3.0"
+    VERSION = '1.3.1'.freeze
   end
 end

data/lib/netdata/client.rb

@@ -1,14 +1,16 @@
-require "yaml"
-require "json"
-require "net/http"
-require "notifaction"
-require "pp"
+require 'yaml'
+require 'json'
+require 'net/http'
+require 'notifaction'
+require 'pp'
 
-require "netdata/client/controller"
-require "netdata/client/helper/network"
-require "netdata/client/version"
+require 'netdata/client/controller'
+require 'netdata/client/helper/network'
+require 'netdata/client/helper/data_aggregator'
+require 'netdata/client/version'
 
 module Netdata
+  # Client module
   module Client
     # something...
   end

data/netdata-client.gemspec

@@ -4,22 +4,22 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'netdata/client/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "netdata-client"
+  spec.name          = 'netdata-client'
   spec.version       = Netdata::Client::VERSION
-  spec.authors       = ["Ryan Priebe"]
-  spec.email         = ["rpriebe@me.com"]
+  spec.authors       = ['Ryan Priebe']
+  spec.email         = ['rpriebe@me.com']
 
-  spec.summary       = "Monitor your netdata instances, spawn OS notifications"
-  spec.homepage      = "http://github.com/aapis/netdata-client"
-  spec.license       = "MIT"
+  spec.summary       = 'Monitor your netdata instances, spawn OS notifications'
+  spec.homepage      = 'http://github.com/aapis/netdata-client'
+  spec.license       = 'MIT'
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'notifaction'
 
-  spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency 'bundler', '~> 1.12'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'minitest', '~> 5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netdata-client
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Ryan Priebe
@@ -86,6 +86,7 @@ files:
 - exe/netdatacli
 - lib/netdata/client.rb
 - lib/netdata/client/controller.rb
+- lib/netdata/client/helper/data_aggregator.rb
 - lib/netdata/client/helper/network.rb
 - lib/netdata/client/version.rb
 - netdata-client.gemspec