perus 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 733c49d83f2675c9e1a47508ca3694f14a946803
-  data.tar.gz: 93067c4ab61180c3fc09ef70cf1315be28e5eab4
+  metadata.gz: 8c4b29dd1042da5633dbfe9fea75bca98cac4514
+  data.tar.gz: 7fea3792cac47ccc059e36d2ebd7737132d80b61
 SHA512:
-  metadata.gz: f396acf003664d9c11cb6d40aed7ad545f4a683e68895ee8c1a803350d8dc79d954f9d60bc2e282a32d0a10dc702f3a4dbacaf646c31a0815a3a86261336c6cb
-  data.tar.gz: db0c3585362f6226cb32a523271b980fe82f2932243c474eae216ddf4c522a4336fa09e5d3f3cf736030e9f9f5b44f82c3cd09751991fb44ddb449b7a08e369c
+  metadata.gz: a13fbf9079d45005f7ac934791f706987b786281fe8b4a35e701bbfcb6960780f2ceb10f12a7933d17e20e713b48f8b5687b24cdbb5edccf57868fe446f6bc5a
+  data.tar.gz: 6b8d5737db4686ad3f6a50ae4b6fd69b34b0daa4343aa78e51f114a141afc4eb5d1a1e65bfc89080a321efba36d24e497d8a735d117efee15661ecffb0c8f5d3

data/lib/perus/pinger/pinger.rb

@@ -6,7 +6,7 @@ require 'uri'
 
 DEFAULT_PINGER_OPTIONS = {
     '__anonymous__' => {
-        'server' => 'http://127.0.0.1:3000/'
+        'server' => 'http://127.0.0.1:5000/'
     },
 
     # restricted values

data/lib/perus/server/db.rb

@@ -17,7 +17,7 @@ module Perus::Server
             Sequel.extension :inflector
 
             # connect/create the database and run any new migrations
-            @db = Sequel.postgres('perus', host: 'localhost')
+            @db = Sequel.postgres('perus', host: 'localhost', username: Server.options.db['username'], password: Server.options.db['password'])
             Sequel::Migrator.run(@db, File.join(__dir__, 'migrations'))
 
             # load models - these rely on an existing db connection

data/lib/perus/server/migrations/008_create_metrics.rb

@@ -3,7 +3,7 @@ Sequel.migration do
         create_table(:metrics) do
             primary_key :id
             String  :name, null: false
-            String  :system_id, null: false
+            Integer :system_id, null: false
             String  :type, null: false
             String  :file, text: true
             index   [:system_id, :name]

data/lib/perus/server/migrations/015_configs_have_maintenance_window.rb

@@ -0,0 +1,13 @@
+Sequel.migration do
+    up do
+        alter_table(:configs) do
+            add_column :maintenance, String
+        end
+    end
+
+    down do
+        alter_table(:configs) do
+            drop_column :maintenance
+        end
+    end
+end

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

@@ -2,7 +2,7 @@ module Perus::Server
     class Config < Sequel::Model
         plugin :validation_helpers
         one_to_many :systems
-        one_to_many :config_metrics, order: 'name asc'
+        one_to_many :config_metrics, order: :order
 
         def metric_hashes
             config_metrics.collect(&:config_hash)
@@ -20,6 +20,22 @@ module Perus::Server
             systems_dataset.empty?
         end
 
+        def in_maintenance?
+            return false unless maintenance.is_a?(String)
+            from, to = maintenance.split('-')
+            now = Time.now
+
+            from_hour, from_min = from.split(':').map(&:to_i)
+            return false if now.hour < from_hour
+            return false if now.hour == from_hour && now.min < from_min
+
+            to_hour, to_min = to.split(':').map(&:to_i)
+            return false if now.hour > to_hour
+            return false if now.hour == to_hour && now.min > to_min
+
+            true
+        end
+
         def validate
             super
             validates_presence  :name

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

@@ -1,7 +1,7 @@
 module Perus::Server
     class Script < Sequel::Model
         plugin :validation_helpers
-        one_to_many :script_commands, order: 'name asc'
+        one_to_many :script_commands, order: :order
         one_to_many :actions
 
         def code_name

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

@@ -65,6 +65,8 @@ module Perus::Server
         # metrics
         # ---------------------------------------
         def save_metric_errors(params, timestamp)
+            # ignore errors during maintenance window
+            return if config.in_maintenance?
             errors = JSON.parse(params['metric_errors'])
 
             errors.each do |module_name, module_errors|

data/lib/perus/server/server.rb

@@ -7,12 +7,16 @@ DEFAULT_SERVER_OPTIONS = {
         'uploads_url' => 'http://localhost:3000/uploads/',
         'db_path' => './perus.db',
         'listen' => '0.0.0.0',
-        'port' => 3000,
+        'port' => 5000,
         'site_name' => 'Perus',
         'url_prefix' => '/',
         'keep_hours' => 24,
         'cache_alerts_secs' => 20,
         'stats_path' => '/var/perus.stats'
+    },
+    'db' => {
+        'username' => '',
+        'password' => ''
     }
 }
 

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

@@ -1 +1,2 @@
 <%= @form.field :name %>
+<%= @form.field :maintenance %>

data/lib/perus/version.rb

@@ -1,3 +1,3 @@
 module Perus
-    VERSION = "0.1.15"
+    VERSION = "0.1.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: perus
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Will Cannings
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-17 00:00:00.000000000 Z
+date: 2015-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -266,6 +266,7 @@ files:
 - lib/perus/server/migrations/012_create_config_metrics.rb
 - lib/perus/server/migrations/013_create_active_alerts.rb
 - lib/perus/server/migrations/014_alerts_can_have_errors.rb
+- lib/perus/server/migrations/015_configs_have_maintenance_window.rb
 - lib/perus/server/models/action.rb
 - lib/perus/server/models/active_alert.rb
 - lib/perus/server/models/alert.rb