perus 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4911b71f00064a5f01539c97568c31b26d0d5063
-  data.tar.gz: 981d5cab3874924a489e37f65db1a5bd56e052fa
+  metadata.gz: a4c31e7e80547a4efe91311c2f149e943eb52ea4
+  data.tar.gz: 676cbbb27a25a6a2778e540cb9c9641ee0c07601
 SHA512:
-  metadata.gz: fb415cc96cd26f0c28f427877e89cadb1b0d45a94f03ee08e02e3e6bf1f4a0e3192f46c14ae2da0e27850dff46e3fa8e2f9732bb1cb8e4986d150313b72959bf
-  data.tar.gz: 2f5986c3718a2628379955c59cbbda33cea524a16909d8256476ef5f33cb78ae193e98a1c50ab8035ada4edb4df7f3c42ee1d698c38e3276797a2e33a68e1bf5
+  metadata.gz: d5926cc09e9a6267fc6b00d6a6449791c464431a55446624dd56a51ba8b35f5cf1e56e38202bf53d712fa31806dc9ba329e43f8193e7b71195f08f9713d167d8
+  data.tar.gz: 3dfd536f991cf0f7b125901fea602361b667027a6a1e36ff76353798ae5e2e4abe3204480a933f7ce6fba7159c83ddfe3dd818b383c629ef579c0420e49f83e0

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

@@ -3,7 +3,7 @@ module Perus::Pinger
         description 'Kills all instances of a process. Valid values for
                      "process_name" are contained in the pinger config file.'
         option :process_name, restricted: true
-        option :signal, default: 'KILL'
+        option :signal, default: 'TERM'
 
         def run
             result = shell("killall -#{options.signal} #{options.process_name}")

data/lib/perus/pinger/pinger.rb

@@ -6,7 +6,6 @@ require 'uri'
 
 DEFAULT_PINGER_OPTIONS = {
     '__anonymous__' => {
-        'system_id' => 1,
         'server' => 'http://127.0.0.1:3000/'
     },
 
@@ -72,15 +71,7 @@ module Perus::Pinger
 
         def initialize(options_path = DEFAULT_PINGER_OPTIONS_PATH)
             Pinger.options.load(options_path, DEFAULT_PINGER_OPTIONS)
-
-            # cache urls on initialisation since the urls depend on values known
-            # at startup and that won't change over the object lifetime
-            config_path = URI("systems/#{Pinger.options.system_id}/config")
-            pinger_path = URI("systems/#{Pinger.options.system_id}/ping")
-            server_uri  = URI(Pinger.options.server)
-
-            @config_url = (server_uri + config_path).to_s
-            @pinger_url = (server_uri + pinger_path).to_s
+            @server_uri  = URI(Pinger.options.server)
 
             @metrics = []
             @metric_results = {}
@@ -103,10 +94,19 @@ module Perus::Pinger
         # configuration
         #----------------------
         def load_config
+            if Pinger.options.system_id.nil?
+                config_path = URI("systems/config_for_ip")
+            else
+                config_path = URI("systems/#{Pinger.options.system_id}/config")
+            end
+
+            config_url = (@server_uri + config_path).to_s
+
             # load the system config by requesting it from the perus server
-            json = JSON.parse(RestClient.get(@config_url))
+            json = JSON.parse(RestClient.get(config_url))
             json['metrics'] ||= []
             json['actions'] ||= []
+            @system_id = json['id']
 
             # load metric and command modules based on the config
             json['metrics'].each do |config|
@@ -207,8 +207,11 @@ module Perus::Pinger
             @metric_errors.reject! {|metric, errors| errors.empty?}
             add_to_payload(payload, 'metric_errors', @metric_errors)
 
+            pinger_path = URI("systems/#{@system_id}/ping")
+            pinger_url = (@server_uri + pinger_path).to_s
+
             begin
-                RestClient.post(@pinger_url, payload)
+                RestClient.post(pinger_url, payload)
             rescue => e
                 puts 'Ping failed with exception'
                 puts format_exception(e)

data/lib/perus/server/app.rb

@@ -148,7 +148,7 @@ module Perus::Server
             system = System.with_pk!(params['id'])
             system.last_updated = timestamp
 
-            if request.ip == '127.0.0.1'
+            if request.ip == '127.0.0.1' && ENV['RACK_ENV'] == 'production'
                 system.ip = request.env['HTTP_X_FORWARDED_FOR']
             else
                 system.ip = request.ip
@@ -173,12 +173,21 @@ module Perus::Server
         # system config
         get '/systems/:id/config' do
             system = System.with_pk!(params['id'])
-            config = {
-                metrics: system.config.metric_hashes,
-                actions: system.pending_actions.map(&:config_hash).flatten
-            }
             content_type :json
-            config.to_json
+            system.config_hash.to_json
+        end
+
+        # config of system based on request ip
+        get '/systems/config_for_ip' do
+            if request.ip == '127.0.0.1' && ENV['RACK_ENV'] == 'production'
+                ip = request.env['HTTP_X_FORWARDED_FOR']
+            else
+                ip = request.ip
+            end
+
+            system = System.where(ip: ip).first
+            content_type :json
+            system.config_hash.to_json
         end
 
         # render all errors in html to replace the shortened subset on the system page

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

@@ -33,8 +33,14 @@ module Perus::Server
         end
 
         def values_over_period(period)
-            raise 'invalid period' unless period.keys.include?(:hours)
-            min_timeout = Time.now.to_i - (period[:hours] * 60 * 60)
+            if period.keys.include?(:hours)
+                min_timeout = Time.now.to_i - (period[:hours] * 60 * 60)
+            elsif period.keys.include?(:mins)
+                min_timeout = Time.now.to_i - (period[:mins] * 60)
+            else
+                raise 'invalid period - must be :hours or :mins'
+            end
+            
             values_dataset.where("timestamp >= #{min_timeout}")
         end
 

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

@@ -52,6 +52,14 @@ module Perus::Server
             pending_actions.collect(&:config_hashes).flatten
         end
 
+        def config_hash
+            {
+                id: id,
+                metrics: config.metric_hashes,
+                actions: pending_actions.map(&:config_hash).flatten
+            }
+        end
+
 
         # ---------------------------------------
         # metrics

data/lib/perus/server/views/systems/form.erb

@@ -1,5 +1,6 @@
 <%= @form.field :name %>
 <%= @form.field :logical_name %>
+<%= @form.field :ip %>
 <%= @form.field :links %>
 <%= @form.field :orientation, 'select', %w{Other Portrait Landscape} %>
 <%= @form.field :group %>

data/lib/perus/version.rb

@@ -1,3 +1,3 @@
 module Perus
-    VERSION = "0.1.9"
+    VERSION = "0.1.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: perus
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Will Cannings