netdata-client 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a38a94059003109a2522eef8d8a22b6122aeae8
-  data.tar.gz: fe162ff418f3ce9f94f2e0a37913e5e923eb27e7
+  metadata.gz: 8171602fe100225682a866be89d6670d825847ee
+  data.tar.gz: b23deb081fe6502ce501d0d81b980a90e4244eed
 SHA512:
-  metadata.gz: 9042ec3a4ab22529e4181bf544f995b3cd2dd024e08e36a80f2bc3920efcf3648a019702fa0cfe44637ecfd782cd7fd46de925ac80e275f4ab169d0ff4f36e7b
-  data.tar.gz: bd4f068fb240f3044b9d3f6872e659bdaa129a9e959a39a3be62efc580f2f79f81d32a6c05b46e0cbda9844a504f65e35ba8d7f9960a3d5f8765aeab9d93223a
+  metadata.gz: 61ff2f57377312fe4adf9eb99f6bc4334342bd607ab6c4585076e8267c7f375d383c11a552bdcaf78554d3430d787292d03ae2eda73086e77314b5606ea5204f
+  data.tar.gz: fd23f25cde337bf43050901b879a6f4708a44a96049a6b394a252ffea7c3bd9438c4bfbe68cba2c0d663a39319e832e4ec548763cc84fd0169e6724e3e3c99a2

data/README.md

@@ -24,7 +24,7 @@ instances:
 
 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`).
+1. Rename `com.netdata.monitor.2mins.plist.dist` to `com.netdata.monitor.2mins.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`
 3. `launchtl load -w /Library/LaunchDaemons/com.netdata.monitor.plist`
 

data/com.netdata.monitor.plist.dist

@@ -8,8 +8,11 @@
     <key>ProgramArguments</key>
     <array>
         <string>/Library/Ruby/Gems/2.0.0/gems/netdatacli</string>
+        <string>-m</string>
     </array>
     <key>StartInterval</key>
     <integer>120</integer>
+    <key>RunAtLoad</key>
+    <true/>
 </dict>
 </plist>

data/exe/netdatacli

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

data/lib/netdata/client/controller.rb

@@ -6,8 +6,9 @@ module Netdata
         @config = ::YAML::load_file(File.expand_path("~/.netdatacli.yml"))
       end
 
-      def check
+      def report_interval_2_mins
         aggregator = {}
+        threshold = 50 # numbers higher than this should trigger notifications
 
         return unless @config
 
@@ -42,12 +43,13 @@ module Netdata
           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"]
 
           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?
+          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
@@ -56,9 +58,10 @@ module Netdata
           # 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"]
+            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

data/lib/netdata/client/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: netdata-client
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Ryan Priebe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-10 00:00:00.000000000 Z
+date: 2017-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: notifaction