perus 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f56e61b3219419f836bbae92b49cfc35330f89d
-  data.tar.gz: e6728c4313c0068683998ae1f0afd3a5ac93af21
+  metadata.gz: cb71157c8e99e2d438be1de8effd475492a88e20
+  data.tar.gz: 937cae814206ed5fc94d1ef613d76881b1139247
 SHA512:
-  metadata.gz: cb8f44cea18719b51eb9887bb02d07836e5742f57c0bf5ca2987fffce41665aea8ae483b18860f1c7cf97a6accd269ed940521cc4b655117f5a77c22975bed78
-  data.tar.gz: 0aab536725d3c43c4404fec26ecae26afc34cc3577d4bd430a0b8ee92e048ae5817fc9aabba11a9fb534cd327fb32f7339b1b6537952dccad0d633cbaca20b63
+  metadata.gz: b29144c8a6f3b45bd0038dbfbeea93d52adde137368557dddf049c9a1faacfe2235c1a9c1e208e07634bf146024dfb3f4a06a672955df683122813af399a4942
+  data.tar.gz: 9cd259d515b06c7c25da09cfec9f7f133b337688afbcb883ee30263bb040bd42d75cf5602ca037a12d7b6a9cea0e2c4dff2c06619163cb71980618df9320d8ee

data/lib/perus/options.rb

@@ -2,7 +2,7 @@ require 'iniparse'
 
 module Perus
     class Options
-        def initialize()
+        def initialize
             @defaults = {}
         end
 
@@ -12,7 +12,12 @@ module Perus
             else
                 user_options = {}
             end
-            @options = defaults.merge(user_options)
+
+            # options are only one level deep, so resolve conflicts
+            # by just merging the two conflicting hashes again
+            @options = defaults.merge(user_options) do |key, default, user|
+                default.merge(user)
+            end
         end
 
         def method_missing(name, *params, &block)

data/lib/perus/pinger/command.rb

@@ -126,8 +126,15 @@ module Perus::Pinger
         class ShellCommandError < StandardError; end
         def shell(command)
             out, err, status = Open3.capture3(command)
-            raise ShellCommandError.new(err.strip) unless err.empty?
-            raise ShellCommandError.new(out.strip) if status.exitstatus > 0
+
+            unless err.empty?
+                raise ShellCommandError.new(err.strip)
+            end
+
+            if status.exitstatus > 0
+                raise ShellCommandError.new("#{out.strip}; exit: #{status.exitstatus}")
+            end
+
             out
         end
 

data/lib/perus/pinger/commands/upstart_start.rb

@@ -0,0 +1,12 @@
+module Perus::Pinger
+    class UpstartStart < Command
+        description 'Start the upstart job specified with "job". Valid values
+                     for "job" are contained in the pinger config file.'
+        option :job, restricted: true
+
+        def run
+            result = shell("sudo start #{option.job}")
+            true # shell will capture any errors
+        end
+    end
+end

data/lib/perus/pinger/commands/upstart_stop.rb

@@ -0,0 +1,12 @@
+module Perus::Pinger
+    class UpstartStop < Command
+        description 'Stop the upstart job specified with "job". Valid values
+                     for "job" are contained in the pinger config file.'
+        option :job, restricted: true
+
+        def run
+            result = shell("sudo stop #{option.job}")
+            true # shell will capture any errors
+        end
+    end
+end

data/lib/perus/pinger/metrics/running.rb

@@ -0,0 +1,20 @@
+module Perus::Pinger
+    class Running < Command
+        description 'Reports "yes" if "process_path" is running, "no"
+                     otherwise. Valid values for "process_path" are contained
+                     in the pinger config file.'
+        option :process_path, restricted: true
+        metric!
+        
+        def run
+            begin
+                ps_result = shell("ps aux | grep -v grep | grep #{options.process_path}")
+            rescue ShellCommandError
+                ps_result = ''
+            end
+            
+            metric_name = "#{File.basename(options.process_path)}_running"
+            {metric_name => ps_result.empty? ? 'no' : 'yes'}
+        end
+    end
+end

data/lib/perus/pinger/pinger.rb

@@ -69,8 +69,8 @@ module Perus::Pinger
 
         def run
             load_config
-            run_metrics
             run_actions
+            run_metrics
             send_response
             cleanup
         end

data/lib/perus/pinger.rb

@@ -15,6 +15,8 @@ module Perus
             require './pinger/commands/upgrade'
             require './pinger/commands/script'
             require './pinger/commands/sleep'
+            require './pinger/commands/upstart_start'
+            require './pinger/commands/upstart_stop'
 
             # metrics
             require './pinger/metrics/chrome'
@@ -26,6 +28,7 @@ module Perus
             require './pinger/metrics/temp'
             require './pinger/metrics/value'
             require './pinger/metrics/uptime'
+            require './pinger/metrics/running'
 
             # pinger
             require './pinger/pinger'

data/lib/perus/server/app.rb

@@ -147,7 +147,12 @@ module Perus::Server
             # update the system with its last known ip and update time
             system = System.with_pk!(params['id'])
             system.last_updated = timestamp
-            system.ip = request.ip
+
+            if request.ip == '127.0.0.1'
+                system.ip = request.env['HTTP_X_FORWARDED_FOR']
+            else
+                system.ip = request.ip
+            end
 
             # errors is either nil or a hash of the format - module: [err, ...]
             system.save_metric_errors(params, timestamp)

data/lib/perus/server/db.rb

@@ -62,7 +62,7 @@ module Perus::Server
             keep_hours = Server.options.keep_hours
 
             # remove old values
-            min_timestamp = Time.now.to_i - (keep_hours * 60)
+            min_timestamp = Time.now.to_i - (keep_hours * 60 * 60)
             values = Value.where("timestamp < #{min_timestamp}")
             puts "Deleting #{values.count} values"
             values.each(&:destroy)

data/lib/perus/server/models/metric.rb

@@ -32,6 +32,17 @@ module Perus::Server
             system.values_dataset.where(metric: name)
         end
 
+        def values_over_period(period)
+            raise 'invalid period' unless period.keys.include?(:hours)
+            min_timeout = Time.now.to_i - (period[:hours] * 60 * 60)
+            values_dataset.where("timestamp >= #{min_timeout}")
+        end
+
+        def num_values_over_period(period)
+            values = values_over_period(period)
+            values.map(&:num_value)
+        end
+
         def after_destroy
             super
             File.unlink(path) if file && File.exists?(path)

data/lib/perus/server/models/system.rb

@@ -94,7 +94,11 @@ module Perus::Server
         end
 
         def latest(name)
-            values_dataset.where(metric: name).order_by('timestamp desc').first
+            values_dataset.where(metric: name.to_s).order_by(:timestamp).last
+        end
+
+        def metric(name)
+            metrics_dataset.where(name: name.to_s).first
         end
 
 

data/lib/perus/version.rb

@@ -1,3 +1,3 @@
 module Perus
-    VERSION = "0.1.6"
+    VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: perus
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Will Cannings
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-11 00:00:00.000000000 Z
+date: 2015-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -214,11 +214,14 @@ files:
 - lib/perus/pinger/commands/sleep.rb
 - lib/perus/pinger/commands/upgrade.rb
 - lib/perus/pinger/commands/upload.rb
+- lib/perus/pinger/commands/upstart_start.rb
+- lib/perus/pinger/commands/upstart_stop.rb
 - lib/perus/pinger/metrics/chrome.rb
 - lib/perus/pinger/metrics/cpu.rb
 - lib/perus/pinger/metrics/hd.rb
 - lib/perus/pinger/metrics/mem.rb
 - lib/perus/pinger/metrics/process.rb
+- lib/perus/pinger/metrics/running.rb
 - lib/perus/pinger/metrics/screenshot.rb
 - lib/perus/pinger/metrics/temp.rb
 - lib/perus/pinger/metrics/uptime.rb