perus 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 599b70600ece749fcd4c4f45ac930f4b795cff09
-  data.tar.gz: ace224657f580232d911a0965426af0696fb5225
+  metadata.gz: 820c3e7205d8bb9dcceb2fd9d52ceeb76db9e39d
+  data.tar.gz: 2ae3ddcda6b97e2c21c01d1fadef7dda294a7c62
 SHA512:
-  metadata.gz: 22e9fb25b86654bdc57454173ba6b29cd444bd15c40785551a535feb54178ba394759e418ae39a4758e95e9c0d25b3dc2e5535d33e34996606c5c6ab2c2e6ef9
-  data.tar.gz: 88c08f91f40ac189bfc48932f60bf4e6489ec8a7147da0ae00eee8ff10f7d36fe2afe38baef5a9595aff25430b482813f70302e20c2cd6b4620167742ac27ba5
+  metadata.gz: 968cf198e14eec35f27faf8b8f6e6a090524c1e6b5b9540197090449d570464dbcf2b113d4165fb3da4d895a37bd4439959b3a61a934c05dcbbcf44aa55ce961
+  data.tar.gz: 31080180df8b4553f3b6cf2cc5073b830fdea47a95874cd10a784fbd35214297c8683bf571f150e2304ecc426987e67945c74529233d87d6e67fb0c0df07d517

data/exe/perus-console

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby
+require 'perus'
+require 'optparse'
+require 'irb'
+
+options_path = Perus::Server::DEFAULT_SERVER_OPTIONS_PATH
+
+OptionParser.new do |opts|
+    opts.banner = "Usage: perus-console [options]"
+
+    opts.on('-c', '--config PATH', "Path to config file (default: #{Perus::Server::DEFAULT_SERVER_OPTIONS_PATH})") do |c|
+        options_path = c
+    end
+
+    opts.on('-h', '--help', 'Prints this help') do
+        puts opts
+        exit
+    end
+end.parse!
+
+include Perus::Server
+Server.load_options(options_path)
+DB.start
+IRB.start

data/lib/perus/server.rb

@@ -16,6 +16,7 @@ module Perus
             require './server/admin'
             require './server/app'
             require './server/db'
+            require './server/stats'
             require './server/server'
         end
     end

data/lib/perus/server/app.rb

@@ -102,6 +102,11 @@ module Perus::Server
             redirect "#{url_prefix}admin/configs/#{params['config_id']}"
         end
 
+        get '/admin/stats' do
+            @stats = Stats.new
+            erb :stats
+        end
+
 
         #----------------------
         # API
@@ -142,30 +147,33 @@ module Perus::Server
 
         # receive data from a client
         post '/systems/:id/ping' do
-            timestamp = Time.now.to_i
+            Server.ping_queue.post do
+                timestamp = Time.now.to_i
 
-            # update the system with its last known ip and update time
-            system = System.with_pk!(params['id'])
-            system.last_updated = timestamp
+                # update the system with its last known ip and update time
+                system = System.with_pk!(params['id'])
+                system.last_updated = timestamp
 
-            if request.ip == '127.0.0.1' && ENV['RACK_ENV'] == 'production'
-                system.ip = request.env['HTTP_X_FORWARDED_FOR']
-            else
-                system.ip = request.ip
-            end
+                if request.ip == '127.0.0.1' && ENV['RACK_ENV'] == 'production'
+                    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)
 
-            # errors is either nil or a hash of the format - module: [err, ...]
-            system.save_metric_errors(params, timestamp)
+                # add each new value, a later process cleans up old values
+                system.save_values(params, timestamp)
 
-            # add each new value, a later process cleans up old values
-            system.save_values(params, timestamp)
+                # save action return values and prevent them from running again
+                system.save_actions(params, timestamp)
 
-            # save action return values and prevent them from running again
-            system.save_actions(params, timestamp)
+                # ip, last updated, uploads and metrics are now updated. these are
+                # stored on the system.
+                system.save
+            end
 
-            # ip, last updated, uploads and metrics are now updated. these are
-            # stored on the system.
-            system.save
             content_type :json
             {success: true}.to_json
         end
@@ -220,6 +228,19 @@ module Perus::Server
             redirect "#{url_prefix}groups/#{params['id']}/systems"
         end
 
+        # delete completed actions in a group
+        delete '/groups/:id/systems/actions' do
+            group = Group.with_pk!(params['id'])
+            group.systems.each do |system|
+                system.actions.each do |action|
+                    next if action.timestamp.nil?
+                    action.destroy
+                end
+            end
+
+            redirect "#{url_prefix}groups/#{params['id']}/systems"
+        end
+
         # create an action for all systems
         post '/systems/actions' do
             System.each do |system|
@@ -229,6 +250,16 @@ module Perus::Server
             redirect "#{url_prefix}systems"
         end
 
+        # delete all completed actions
+        delete '/systems/actions' do
+            Action.each do |action|
+                next if action.timestamp.nil?
+                action.destroy
+            end
+
+            redirect "#{url_prefix}systems"
+        end
+
         # delete an action. deletion also clears any uploaded files.
         delete '/systems/:system_id/actions/:id' do
             action = Action.with_pk!(params['id'])

data/lib/perus/server/db.rb

@@ -4,6 +4,8 @@ require 'concurrent'
 
 module Perus::Server
     module DB
+        MAX_VACUUM_ATTEMPTS = 5
+
         def self.db
             @db
         end
@@ -42,7 +44,31 @@ module Perus::Server
             # restructures the db so system records in the values index should
             # be sequentially stored
             vacuum_task = Concurrent::TimerTask.new do
-                @db.execute('vacuum')
+                attempts = 0
+                complete = false
+
+                while !complete && attempts < MAX_VACUUM_ATTEMPTS
+                    begin
+                        puts "Vacuuming, attempt #{attempts + 1}"
+                        start = Time.now
+                        @db.execute('vacuum')
+                        Stats.vacuumed!(Time.now - start)
+                        complete = true
+                        puts "Vacuuming complete"
+                        
+                    rescue
+                        attempts += 1
+                        if attempts < MAX_VACUUM_ATTEMPTS
+                            puts "Vacuum failed, will reattempt after short sleep"
+                            sleep(5)
+                        end
+                    end
+                end
+
+                if !complete
+                    puts "Vacuum failed more than MAX_VACUUM_ATTEMPTS"
+                    Stats.vacuumed!('failed')
+                end
             end
 
             # fire every 12 hours
@@ -54,7 +80,13 @@ module Perus::Server
             # are removed from a system, the accompanying metric record is also
             # removed.
             cleanup_task = Concurrent::TimerTask.new do
-                Perus::Server::DB.cleanup
+                begin
+                    start = Time.now
+                    Perus::Server::DB.cleanup
+                    Stats.cleaned!(Time.now - start)
+                rescue
+                    Stats.cleaned!('failed')
+                end
             end
 
             # fire every hour
@@ -66,10 +98,16 @@ module Perus::Server
             # cached so lookups can be done against the db, rather than running
             # each alert for each system on a page load.
             cache_alerts_task = Concurrent::TimerTask.new do
-                Perus::Server::Alert.cache_active_alerts
+                begin
+                    start = Time.now
+                    Perus::Server::Alert.cache_active_alerts
+                    Stats.alerts_cached!(Time.now - start)
+                rescue
+                    Stats.alerts_cached!('failed')
+                end
             end
 
-            cache_alerts_task.execution_interval = Server.options.cache_alerts_mins * 60
+            cache_alerts_task.execution_interval = Server.options.cache_alerts_secs
             cache_alerts_task.execute
         end
 

data/lib/perus/server/public/css/style.css

@@ -292,25 +292,25 @@ main {
         width: 450px;
     }
 
-    #meta dl {
+    dl {
         display: inline-block;
         vertical-align: top;
         width: 450px;
     }
 
-        #meta dt, #meta dd {
+        dt, dd {
             display: inline-block;
             vertical-align: top;
             margin-bottom: 10px;
             font-size: 13px;
         }
 
-        #meta dt {
+        dt {
             width: 100px;
             font-weight: 600;
         }
 
-        #meta dd {
+        dd {
             width: 340px;
             line-height: 16px;
         }
@@ -507,3 +507,22 @@ article.graph {
         padding: 15px 20px;
         border-radius: 4px;
     }
+
+#actions-menu {
+}
+
+    #actions-menu p {
+        display: inline-block;
+        float: left;
+    }
+
+    #actions-menu form {
+        display: inline-block;
+        float: right;
+        margin-top: 30px;
+    }
+
+h2.stats {
+    margin-bottom: 10px;
+    margin-top: 20px;
+}

data/lib/perus/server/server.rb

@@ -1,3 +1,4 @@
+require 'concurrent'
 require 'thin'
 
 DEFAULT_SERVER_OPTIONS = {
@@ -10,7 +11,8 @@ DEFAULT_SERVER_OPTIONS = {
         'site_name' => 'Perus',
         'url_prefix' => '/',
         'keep_hours' => 24,
-        'cache_alerts_mins' => 1
+        'cache_alerts_secs' => 20,
+        'stats_path' => '/var/perus.stats'
     }
 }
 
@@ -19,6 +21,8 @@ module Perus::Server
         def initialize(options_path = DEFAULT_SERVER_OPTIONS_PATH, environment = 'development')
             self.class.load_options(options_path)
             ENV['RACK_ENV'] = environment
+
+            # initialise/migrate the db and start cleanup/caching timers
             DB.start
             DB.start_timers
         end
@@ -31,6 +35,19 @@ module Perus::Server
             )
         end
 
+        def self.ping_queue
+            # ping data is processed in a thread pool
+            @ping_queue ||= Concurrent::ThreadPoolExecutor.new(
+                min_threads: 2,
+                max_threads: 2,
+                max_queue: 0
+            )
+        end
+
+        def self.shutdown
+            @ping_queue.shutdown
+        end
+
         def self.options
             @options ||= Perus::Options.new
         end

data/lib/perus/server/stats.rb

@@ -0,0 +1,126 @@
+require 'json'
+
+module Perus::Server
+    class Stats
+        MAX_HISTORY = 10
+        attr_reader :data
+
+        # data format (json):
+        # {
+        #   "vacuums": [
+        #     ["ISO time", duration (int) || 'failed'],
+        #     ...
+        #   ]
+        # }
+
+        def initialize
+            if File.exists?(Server.options.stats_path)
+                data = IO.read(Server.options.stats_path)
+                unless data.empty?
+                    @data = JSON.parse(data)
+                    return
+                end
+            end
+
+            @data = {
+                'vacuums' => [],
+                'alerts_caches' => [],
+                'cleans' => []
+            }
+        end
+
+        def save
+            IO.write(Server.options.stats_path, JSON.dump(@data))
+        end
+
+        # vacuuming
+        def last_vacuum
+            entry = @data['vacuums'].last
+            entry ? entry.first : nil
+        end
+
+        def vacuum_time
+            entry = @data['vacuums'].last
+            entry ? entry.last : nil
+        end
+
+        def average_vacuum_time
+            entries = @data['vacuums']
+            return nil if entries.empty?
+            ints = entries.map(&:last).select {|time| time.is_a?(Numeric)}
+            ints.reduce(:+).to_f / ints.length
+        end
+
+        def self.vacuumed!(time)
+            stats = Stats.new
+            list = stats.data['vacuums']
+            list << [Time.now.to_s, time]
+            
+            if list.length > MAX_HISTORY
+                list.drop(list.length - MAX_HISTORY)
+            end
+
+            stats.save
+        end
+
+        # alerts caching
+        def last_alerts_cache
+            entry = @data['alerts_caches'].last
+            entry ? entry.first : nil
+        end
+
+        def alerts_cache_time
+            entry = @data['alerts_caches'].last
+            entry ? entry.last : nil
+        end
+
+        def average_alerts_cache_time
+            entries = @data['alerts_caches']
+            return nil if entries.empty?
+            ints = entries.map(&:last).select {|time| time.is_a?(Numeric)}
+            ints.reduce(:+).to_f / ints.length
+        end
+
+        def self.alerts_cached!(time)
+            stats = Stats.new
+            list = stats.data['alerts_caches']
+            list << [Time.now.to_s, time]
+            
+            if list.length > MAX_HISTORY
+                list.drop(list.length - MAX_HISTORY)
+            end
+
+            stats.save
+        end
+
+        # cleaning
+        def last_clean
+            entry = @data['cleans'].last
+            entry ? entry.first : nil
+        end
+
+        def clean_time
+            entry = @data['cleans'].last
+            entry ? entry.last : nil
+        end
+
+        def average_clean_time
+            entries = @data['cleans']
+            return nil if entries.empty?
+            ints = entries.map(&:last).select {|time| time.is_a?(Numeric)}
+            ints.reduce(:+).to_f / ints.length
+        end
+
+        def self.cleaned!(time)
+            stats = Stats.new
+            list = stats.data['cleans']
+            list << [Time.now.to_s, time]
+            
+            if list.length > MAX_HISTORY
+                list.drop(list.length - MAX_HISTORY)
+            end
+
+            stats.save
+        end
+    end
+end

data/lib/perus/server/views/layout.erb

@@ -31,6 +31,7 @@
                                 <%= nav_item("#{url_prefix}admin/configs", 'Configs') %>
                                 <%= nav_item("#{url_prefix}admin/alerts", 'Alerts') %>
                                 <%= nav_item("#{url_prefix}admin/scripts", 'Scripts') %>
+                                <%= nav_item("#{url_prefix}admin/stats", 'Stats') %>
                             </ul>
                         <% end %>
                     </li>

data/lib/perus/server/views/stats.erb

@@ -0,0 +1,31 @@
+<h1>Background Stats</h1>
+
+<h2 class="stats">Vacuuming</h2>
+<dl>
+    <dt>Last Vacuum</dt>
+    <dd><%= @stats.last_vacuum || 'nil' %></dd>
+    <dt>Vacuum Time</dt>
+    <dd><%= "%0.4f" % @stats.vacuum_time rescue 'nil' %></dd>
+    <dt>Average Vacuum Time</dt>
+    <dd><%= "%0.4f" % @stats.average_vacuum_time rescue 'nil' %></dd>
+</dl>
+
+<h2 class="stats">Alerts Caching</h2>
+<dl>
+    <dt>Last Alerts Cache</dt>
+    <dd><%= @stats.last_alerts_cache || 'nil' %></dd>
+    <dt>Alerts Cache Time</dt>
+    <dd><%= "%0.4f" % @stats.alerts_cache_time rescue 'nil' %></dd>
+    <dt>Average Alerts Cache Time</dt>
+    <dd><%= "%0.4f" % @stats.average_alerts_cache_time rescue 'nil' %></dd>
+</dl>
+
+<h2 class="stats">Cleaning</h2>
+<dl>
+    <dt>Last Clean</dt>
+    <dd><%= @stats.last_clean || 'nil' %></dd>
+    <dt>Clean Time</dt>
+    <dd><%= "%0.4f" % @stats.clean_time rescue 'nil' %></dd>
+    <dt>Average Clean Time</dt>
+    <dd><%= "%0.4f" % @stats.average_clean_time rescue 'nil' %></dd>
+</dl>

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

@@ -17,22 +17,29 @@
 <% end %>
 <p id="no-systems" <% unless @systems.empty? %>style="display: none"<% end %>>No Systems</p>
 
-<p id="add-command">
-    Add action to <%= @title %>:
-    <select id="command-select">
-        <option></option>
-        <optgroup label="Commands">
-            <% command_actions.each do |command| %>
-                <option value="<%= command.name %>"><%= command.human_name %></option>
-            <% end %>
-        </optgroup>
-        <optgroup label="Scripts">
-            <% @scripts.each do |script| %>
-                <option value="<%= script.code_name %>"><%= script.name %></option>
-            <% end %>
-        </optgroup>
-    </select>
-</p>
+
+<menu id="actions-menu">
+    <p id="add-command">
+        Add Action to <%= @title %>:
+        <select id="command-select">
+            <option></option>
+            <optgroup label="Commands">
+                <% command_actions.each do |command| %>
+                    <option value="<%= command.name %>"><%= command.human_name %></option>
+                <% end %>
+            </optgroup>
+            <optgroup label="Scripts">
+                <% @scripts.each do |script| %>
+                    <option value="<%= script.code_name %>"><%= script.name %></option>
+                <% end %>
+            </optgroup>
+        </select>
+    </p>
+    <form id="delete-completed" method="POST" action="<%= url_prefix %><%= @action_url %>">
+        <input type="hidden" name="_method" value="DELETE">
+        <input type="submit" value="Delete Completed Actions">
+    </form>
+</menu>
 
 <!-- new commands -->
 <% command_actions.each do |command| %>
@@ -48,6 +55,11 @@
 <% end %>
 
 <script>
+    $('#delete-completed').submit(function(event) {
+        if (!confirm('Are you sure you want to delete all completed actions? Their results will no longer be available.'))
+            event.preventDefault();
+    });
+    
     $('#command-select').change(function() {
         $('form.command').hide();
         $('form[data-command="' + $(this).val() + '"]').show();

data/lib/perus/version.rb

@@ -1,3 +1,3 @@
 module Perus
-    VERSION = "0.1.11"
+    VERSION = "0.1.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: perus
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Will Cannings
@@ -196,6 +196,7 @@ description:
 email:
 - me@willcannings.com
 executables:
+- perus-console
 - perus-pinger
 - perus-server
 extensions: []
@@ -210,6 +211,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- exe/perus-console
 - exe/perus-pinger
 - exe/perus-server
 - lib/perus.rb
@@ -304,6 +306,7 @@ files:
 - lib/perus/server/public/js/dygraph-combined.js
 - lib/perus/server/public/js/jquery.js
 - lib/perus/server/server.rb
+- lib/perus/server/stats.rb
 - lib/perus/server/views/admin/edit.erb
 - lib/perus/server/views/admin/index.erb
 - lib/perus/server/views/admin/new.erb
@@ -317,6 +320,7 @@ files:
 - lib/perus/server/views/layout.erb
 - lib/perus/server/views/scripts/edit.erb
 - lib/perus/server/views/scripts/form.erb
+- lib/perus/server/views/stats.erb
 - lib/perus/server/views/system.erb
 - lib/perus/server/views/systems.erb
 - lib/perus/server/views/systems/form.erb
@@ -347,3 +351,4 @@ signing_key:
 specification_version: 4
 summary: Simple system overview server
 test_files: []
+has_rdoc: