netdata-client 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a76ba3f0828f2b0719f2848ed2b0681443fc4bf1
-  data.tar.gz: 9bdee103bac5e5d08959aec2432297c7a20a4b19
+  metadata.gz: 5a38a94059003109a2522eef8d8a22b6122aeae8
+  data.tar.gz: fe162ff418f3ce9f94f2e0a37913e5e923eb27e7
 SHA512:
-  metadata.gz: fc05f3d5c9bdb037531cfbf21db6454c7b6c9dd7fb25a1ed87f7ba4247815bbc90a6f0dd4663fe5302706df027343ea53e483175c55d987df53e49bd3f268d7c
-  data.tar.gz: 18216020adade42b17236ff94b3d24961303098a93c5951ed579b6f8f554cbe5c6ed2140582f0785fd316fa62cb2cd27615a911973ec8f7f627be98b770cc7ae
+  metadata.gz: 9042ec3a4ab22529e4181bf544f995b3cd2dd024e08e36a80f2bc3920efcf3648a019702fa0cfe44637ecfd782cd7fd46de925ac80e275f4ab169d0ff4f36e7b
+  data.tar.gz: bd4f068fb240f3044b9d3f6872e659bdaa129a9e959a39a3be62efc580f2f79f81d32a6c05b46e0cbda9844a504f65e35ba8d7f9960a3d5f8765aeab9d93223a

data/README.md

@@ -2,7 +2,7 @@
 
 `netdatacli` is a command line client intended to be run as a cron/launchd job.  It will check your servers every 2 minutes and give you a desktop notification if certain conditions exist.
 
-This is very early stage software, it's just a proof of concept for now.  Features I'm hoping to add include:
+This is a prototype.  It will be rebuilt as an OSX/iOS app at some point in the future.  Features I'm hoping to add at this stage include:
 
 * Data aggregation between each report point (every 2 minutes).  So you don't just get a notification about what is happening right now, but also what happened since the last check in (if anything).
 * More datapoints.  Currently it only supports system.cpu.
@@ -14,10 +14,18 @@ Installation:
 
 ## Usage
 
+First, create `~/.netdatacli.yml`.  Populate it as follows.
+
+```yml
+instances:
+    http://my.instance.tld:19999
+    http://my.otherinstance.tld:19999
+```
+
 If you're using OSX > 10.4:
 
 1. Rename `com.netdata.monitor.plist.dist` to `com.netdata.monitor.plist` and update the ProgramArguments value to point to where the gem lives (i.e. `/Library/Ruby/Gems/2.0.0`).
-2. `cp com.netdata.monitor.plist /Library/LaunchDaemons`.
+2. `cp com.netdata.monitor.plist /Library/LaunchDaemons`
 3. `launchtl load -w /Library/LaunchDaemons/com.netdata.monitor.plist`
 
 If using *nix:

data/com.netdata.monitor.plist.dist

@@ -7,7 +7,7 @@
     <string>com.netdata.monitor</string>
     <key>ProgramArguments</key>
     <array>
-        <string>/path/to/the/gem/netdatacli</string>
+        <string>/Library/Ruby/Gems/2.0.0/gems/netdatacli</string>
     </array>
     <key>StartInterval</key>
     <integer>120</integer>

data/lib/netdata/client/controller.rb

@@ -12,21 +12,56 @@ 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 = JSON.parse(alarms.body)
 
-          cpu = @network.get("data?chart=system.cpu&format=array&points=540&group=average&options=absolute|jsonwrap|nonzero&after=-540", url)
+          # system CPU stats
+          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
 
+          # CPU on a per-user basis
+          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_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 }
+          aggregator[alarms_resp["hostname"]]["alarms"] = alarms_resp unless alarms_resp["alarms"].empty?
         end
 
+        pp aggregator
+
         aggregator.each_pair do |host, data|
-          Notify.bubble("CPU Warning on #{host} - #{data["cpu"]}", "Netdata Warning") if data["cpu"] > 50
+          # 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"] > 50
+            message += "#{data['users_cpu']['users'].size} system users active (#{data["users_cpu"]["value"].round(2)}% CPU)\n" if data["users_cpu"]["value"] > 50
+            message += "Alarms are ringing" if data["alarms"]
+
+            Notify.bubble(message, "Netdata Warning on #{host}") if message.size > 0
+          }.join
         end
       end
     end

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

@@ -9,17 +9,22 @@ 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, version = "v1")
-          req_url = "#{url}/api/#{version}/#{endpoint}"
-          _request(req_url, :GET)
+        def get(endpoint, url, args, version = "v1")
+          qs = build_qs(args)
+          req_url = "#{url}/api/#{version}/#{endpoint}?#{qs}"
+
+          request(req_url, :GET)
         end
 
         # Perform a POST request to a specified URL
         # Params:
         # +url+:: The URL you want to hit
         # +key+:: The authentication key to pass via headers to the URL
-        def post(url)
-          _request(url, :POST)
+        def post(endpoint, url, args, version = "v1")
+          qs = build_qs(args)
+          req_url = "#{url}/api/#{version}/#{endpoint}?#{qs}"
+
+          request(req_url, :POST)
         end
 
         private
@@ -29,7 +34,7 @@ module Netdata
         # +url+:: The URL you want to hit
         # +type+:: The HTTP method to send
         # +key+:: The authentication key to pass via headers to the URL
-        def _request(url, type)
+        def request(url, type)
           url = URI(URI.encode(url))
           type ||= :GET
           req_path = "#{url.path}?#{url.query}"
@@ -46,6 +51,13 @@ module Netdata
 
           res
         end
+
+        # Create a query string from a hash
+        # Params:
+        # +args+:: The hash
+        def build_qs(args)
+          args.map{|k, v| "#{k}=#{v}"}.join("&")
+        end
       end
     end
   end

data/lib/netdata/client/version.rb

@@ -1,5 +1,5 @@
 module Netdata
   module Client
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/lib/netdata/client.rb

@@ -2,6 +2,7 @@ require "yaml"
 require "json"
 require "net/http"
 require "notifaction"
+require "pp"
 
 require "netdata/client/controller"
 require "netdata/client/helper/network"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: netdata-client
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Ryan Priebe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-09 00:00:00.000000000 Z
+date: 2016-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: notifaction
@@ -86,9 +86,7 @@ files:
 - exe/netdatacli
 - lib/netdata/client.rb
 - lib/netdata/client/controller.rb
-- lib/netdata/client/custom_alarms.rb
 - lib/netdata/client/helper/network.rb
-- lib/netdata/client/netdata_alarms.rb
 - lib/netdata/client/version.rb
 - netdata-client.gemspec
 homepage: http://github.com/aapis/netdata-client