spiderfw 0.5.13 → 0.5.14

data/apps/core/forms/widgets/inputs/select/select.rb

@@ -4,7 +4,7 @@ module Spider; module Forms
         tag 'select'
         i_attr_accessor :model
         is_attr_accessor :multiple
-        is_attr_accessor :blank_option, :type => TrueClass, :default => true
+        is_attr_accessor :blank_option, :type => TrueClass, :default => nil
         is_attr_accessor :condition
         attr_accessor :data
         
@@ -22,12 +22,20 @@ module Spider; module Forms
         
         def prepare_value(p)
             if (p && p['value'])
-                self.value = p['value']
+                p['value']
+            elsif p.is_a?(Hash)
+                nil
             else
-                self.value = nil
+                p
             end
         end
         
+        def prepare
+            super
+            @blank_option = ((@multiple || @required) ? false : true) if @blank_option.nil?
+            @scene.blank_option = blank_option
+        end
+        
         def run
             
             @scene.data = @data || @model.all
@@ -41,8 +49,6 @@ module Spider; module Forms
                 @scene.data.condition.and(conn_cond)
             end
             @scene.values = {}
-            debug("SELECT VALUE:")
-            debug(@value)
             @scene.selected = {}
             if (@value)
                 val = @multiple ? @value : [@value]
@@ -58,9 +64,10 @@ module Spider; module Forms
 
         
         def value=(val)
-            debug("SETTING SELECT VALUE TO")
-            debug(val)
-            return if (val.nil? || (val.is_a?(String) && val.empty?))
+            if (val.nil? || (val.is_a?(String) && val.empty?))
+                @value = nil
+                return
+            end
             if (val.is_a?(@model) || val.is_a?(Spider::Model::QuerySet))
                 return super
             else
@@ -94,7 +101,6 @@ module Spider; module Forms
         end
         
         def connection_condition
-#           debugger
             if (@connections && @form)
                 conn_cond = Spider::Model::Condition.and
                 conn_param = params['connected'] || {}

data/apps/core/forms/widgets/inputs/select/select.shtml

@@ -1,4 +1,4 @@
-<select name="{ @value_param }" sp:attr-if="@multiple,multiple" class="">
+<select name="{ @value_param }" sp:attr-if="@multiple,multiple" title="">
 	<tpl:asset type="js" src="input.js" />
 	<tpl:asset type="js" src="select.js" />
 	<tpl:asset type="js" app="core/components" src="js/jquery/plugins/asmselect/jquery.asmselect.js" if="@multiple" />

data/apps/core/forms/widgets/inputs/time_span/time_span.rb

@@ -0,0 +1,42 @@
+module Spider; module Forms
+    
+    class TimeSpan < Input
+        
+        def prepare_value(params)
+            val = params['val']
+            return nil unless val
+            val = val.to_i
+            case params['unit']
+            when 'hours'
+                val * 3600
+            when 'min'
+                val * 60
+            else
+                val
+            end
+            
+        end
+        
+        def prepare_scene(scene)
+            super
+            val = self.value.to_i
+            if val
+                if val % 3600 == 0
+                    scene.unit = 'hours'
+                    scene.formatted_value = val / 3600
+                elsif val % 60 == 0
+                    scene.unit = 'min'
+                    scene.formatted_value = val / 60
+                else
+                    scene.unit = 'sec'
+                    scene.formatted_value = val
+                end
+            else
+                scene.unit = 'min'
+                scene.formatted_value = 0
+            end
+        end
+        
+    end
+    
+end; end

data/apps/core/forms/widgets/inputs/time_span/time_span.shtml

@@ -0,0 +1,8 @@
+<sp:template>
+    <input type="text" name="{ @name }[val]" value="{ @formatted_value }" size="8" >
+    <select name="{ @name }[unit]">
+        <option value="sec" sp:attr-if="(@unit == 'sec'),selected">_(Seconds)</option>
+        <option value="min" sp:attr-if="(@unit == 'min'),selected">_(Minutes)</option>
+        <option value="hours" sp:attr-if="(@unit == 'hours'),selected">_(Hours)</option>
+    </select>
+</sp:template>

data/apps/master/_init.rb

@@ -1,12 +1,30 @@
 module Spider
     module Master
+        @short_name = 'master'
         include Spider::App
         @controller = :MasterController
+        
+        
+        
     end
 end
 
+require 'apps/master/master'
 
+require 'apps/master/models/admin'
 require 'apps/master/models/customer'
 require 'apps/master/models/servant'
+require 'apps/master/models/scout_plugin_info'
+require 'apps/master/models/scout_plugin_instance'
+require 'apps/master/models/scout_report'
+require 'apps/master/models/scout_error'
+require 'apps/master/models/scout_alert'
+require 'apps/master/lib/scout_plugin'
 require 'apps/master/controllers/master_controller'
 require 'apps/app_server/app_server'
+require 'apps/master/controllers/scout_controller'
+require 'apps/master/lib/site_type'
+require 'apps/master/plugins/site_types/spider/spider'
+
+Spider.home.controller.route 'clients', Spider::Master::ScoutController
+

data/apps/master/cmd.rb

@@ -0,0 +1,57 @@
+require 'cmdparse'
+
+module Spider; module Master
+
+    class Cmd < ::CmdParse::Command
+
+        def initialize
+            super('master', true)
+            
+            update_averages = CmdParse::Command.new('averages', false )
+            update_averages.short_desc = _("Update report averages")
+            update_averages.options = CmdParse::OptionParserWrapper.new do |opt|
+                opt.on("--instance id", _("Plugin instance id"), "-i"){ |i| @instance_id = i }
+                opt.on("--server id", _("Server id"), "-s"){ |i| @server_id = i }
+                opt.on("--type t", _("Average type (hour, day, week)"), "-t"){ |t| @type = t.to_sym }
+                opt.on("--days n", _("Compute averages until n days ago"), "-d"){ |d| @days = d.to_i }
+            end
+            
+            update_averages.set_execution_block do
+                @days ||= 7
+                @type ||= :hour
+                instances = []
+                unless @instance_id || @server_id
+                    puts _("Please provide an instance id or a server id")
+                    exit
+                end
+                if @instance_id
+                    instances = [@instance_id]
+                elsif @server_id
+                    instances = ScoutPluginInstance.where{ |i| (i.servant == @server_id) }.map{ |i| i.id }
+                # else
+                #     instances = ScoutPluginInstance.all.map{ |i| i.id }
+                end
+                instances.each do |i|
+                    update_averages(i, @days, @type)
+                end
+                    
+            end
+            self.add_command(update_averages)
+            
+            
+            
+        end
+        
+        def update_averages(instance_id, days_back, type= :hour)
+            last = Date.today - days_back
+            i = ScoutPluginInstance.new(instance_id)
+            puts _("Updating averages for %s until #{last}") % i.to_s
+            i.fields_to_averages(last, type)
+        end
+
+    end
+
+ 
+
+
+end; end

data/apps/master/config/options.rb

@@ -0,0 +1,6 @@
+module Spider
+    
+    config_option 'master.scout_plugins_path', _("Path to the scout plugins folder"), :type => String
+    config_option 'master.from_email', _("From address for e-mail sent by master"), :type => String, :default => 'spider-master@spiderfw.net'
+    
+end

data/apps/master/controllers/login_controller.rb

@@ -0,0 +1,22 @@
+module Spider; module Master
+
+    class LoginController < Spider::Auth::LoginController
+    
+        layout 'login'
+    
+        def before(action='', *params)
+            @scene.login_title = "Spider Master"
+            super
+        end
+    
+        def self.users
+            [Master::Admin, Spider::Auth::SuperUser]
+        end
+    
+        def self.default_redirect
+            Master.url
+        end
+    
+    end
+
+end; end

data/apps/master/controllers/master_controller.rb

@@ -1,20 +1,96 @@
+require 'apps/master/controllers/servant_controller'
+require 'apps/master/controllers/login_controller'
+
+
 module Spider; module Master
     
     class MasterController < Spider::PageController
+        include Spider::Auth::AuthHelper
+        include StaticContent
         
         layout 'master'
         
         route /customers\/(\d+)\/installations\//, :installations
+        route /customers\/(\d+)\/servants\//, :servants
+        route /servants\/(\d+)\/plugins\/(\d+)(?:\/(\w+))?(?:\/(.+))?/, :plugin_instance
+        route /servants\/(\d+)\/sites\/(\d+|new|create)(?:\/(\w+))?(?:\/(.+))?/, :site
+        #route /servants\/([^\/]+)/, ServantController, :do => lambda{ |id| @request.misc[:servant] = Servant.new(id) }
+        route 'login', LoginController
         
+        require_user Master::Admin, :unless => [:login, :admin], :redirect => 'login'
+        require_user Spider::Auth::SuperUser, :only => [:admin]
+        
+        
+        def before(action='', *args)
+            super
+            @user = @request.auth(Master::Admin)
+            @scene.user = @user
+            @navigation = []
+            @scene.navigation = @navigation
+        end
+                
         __.html :template => 'index'
         def index
+            customers = @user.customers
+            if customers.length == 1
+                redirect "customers/#{customers[0].id}"
+            end
+        end
+    
+        __.html :template => 'admin', :layout => 'admin', :action_to => :admin
+        def admin
+        end
+        
+        def load_customer(id)
+            customer = Customer.new(id)
+            check_access(customer)
+        end
+        
+        def prepare_scene(scene)
+            @navigation << {:url => "#{Master.url}/customers", :name => _("Customers") } if @user.global?
+            trigger = @trigger
+            instance = @instance
+            instance ||= trigger.instance if trigger
+            servant = @servant
+            servant ||= instance.servant if instance
+            customer = @customer
+            customer ||= servant.customer if servant
+            @navigation << { :url => "#{Master.url}/customers/#{customer.id}", :name => customer.name } if customer
+            @navigation << { :url => "#{Master.url}/customers/#{customer.id}/servants/#{servant.id}", :name => servant.name } if servant
+            @navigation << { :url => "#{Master.url}/servants/#{servant.id}/plugins/#{instance.id}", :name => instance.name } if instance
+            @navigation << { 
+                :url => "#{Master.url}/servants/#{servant.id}/plugins/#{instance.id}/triggers/#{trigger.id}", 
+                :name => "#{_('Trigger')} #{trigger.label}"
+            } if trigger
+            @scene << {
+                :trigger => trigger,
+                :instance => instance,
+                :servant => servant,
+                :customer => customer
+            }
+            super
+        end
+        
+        def check_access(obj)
+            customer = nil
+            if obj.is_a?(Customer)
+                customer = obj
+            elsif obj.is_a?(Servant)
+                customer = obj.customer
+            end
+            raise Spider::Auth::Unauthorized.new(_("No customer")) if !customer && !@user.global?
+            unless @user.can_manage_customer?(customer)
+                raise Spider::Auth::Unauthorized.new(_("User can't access this customer"))     
+            end
+            obj
         end
         
+        
         __.html
         def customers(id=nil)
             if id
                 visual_params[:template] = 'customer'
-                @scene.customer = Customer.new(id) if id && id != 'new'
+                @customer = load_customer(id) if id && id != 'new'
                 @scene.edit = (@request.params['_w'] && @request.params['_w'].key?('customer_form')) || @request.params.key?('edit') || id == 'new'
                 @scene.pk = id
                 get_template
@@ -22,7 +98,10 @@ module Spider; module Master
                     @template.widgets[:customer_form].attributes[:auto_redirect] = Master.url+'/customers'
                 end
             else
-                @scene.customers = Customer.all
+                unless @user.can_manage_customers?
+                    raise Spider::Auth::Unauthorized.new(_("User can't list customers")) 
+                end
+                @scene.customers = @user.customers.map{ |c| c.customer }
                 visual_params[:template] = 'customers'
             end
         end
@@ -31,7 +110,7 @@ module Spider; module Master
         
         __.html :template => 'installation'
         def installations(id, customer_id)
-            @customer = Customer.new(customer_id)
+            @customer = load_customer(customer_id)
             @installation = Installation.new(id) unless id == 'new'
             if id == 'new'
                 if @request.params.key?('installation_create') && !@request.params['installation_name'].empty?
@@ -56,15 +135,180 @@ module Spider; module Master
         end
         
         __.html
-        def servants(id=nil)
+        def servants(id=nil, customer_id=nil)
+            customer_id ||= @request.params['customer']
+            customer_id ||= @user.customers[0] unless @user.global?
+            available_plugins = Master.scout_plugins.map{ |p| ScoutPlugin.new(p) }
+            @scene.available_plugins = available_plugins
             if id
-                @scene.servant = Servant.new(id)
-                render('servant')
+                visual_params[:template] = 'servant'
+                @servant = Servant.new(id) if id && id != 'new'
+                check_access(@servant) if @servant
+                @scene.edit = (@request.params['_w'] && @request.params['_w'].key?('servant_form')) || @request.params.key?('edit') || id == 'new'
+                @scene.pk = id
+                get_template
+                if id == 'new' && @template.widgets[:servant_form]
+                    @template.widgets[:servant_form].attributes[:auto_redirect] = Master.url+'/servants'
+                else
+                    if @request.params['submit_add_plugin']
+                        plugin = ScoutPlugin.new(@request.params['plugin'])
+                        current = ScoutPluginInstance.where(:servant => @servant, :plugin_id => plugin.id).total_rows
+                        name = plugin.name
+                        name += " #{current + 1}" if current > 0
+                        instance = ScoutPluginInstance.create(:servant => @servant, :plugin_id => plugin.id, :name => name)
+                        @servant.scout_plan_changed = DateTime.now
+                        @servant.save
+                        redirect(@request.path)
+                    end
+                    if @request.params['remove_plugin']
+                        instance = ScoutPluginInstance.load(:id => @request.params['remove_plugin'], :servant => id)
+                        instance.delete if instance
+                        @servant.scout_plan_changed = DateTime.now
+                        @servant.save
+                        redirect(@request.path)
+                    end
+                end
+                if customer_id
+                    @customer = Customer.new(customer_id) 
+                    if @template.widgets[:servant_form]
+                        @template.widgets[:servant_form].attributes[:auto_redirect] = Master.url+"/customers/#{customer_id}"
+                        @template.widgets[:servant_form].fixed = {:customer => @customer}
+                    end
+                end
             else
                 @scene.servants = Servant.all
-                render('servants')
+                if customer_id
+                    @scene.servants.where(:customer => @request.params['customer'])
+                end
+                visual_params[:template] = 'servants'
             end
-            
+        end
+        
+        __.html
+        def plugin_instance(servant_id, id, action=nil, sub_action=nil)
+            instance = ScoutPluginInstance.load(:id => id, :servant => servant_id)
+            raise NotFound.new("Plugin #{id} for servant #{servant_id}") unless instance
+            @servant = Servant.new(:id => servant_id)
+            @scene.plugin = instance.plugin
+            fields = []
+            last = instance.last_reported
+            if last
+                fields = last.fields.map{ |f| f.name }
+            end
+            @scene.last_reported = last
+            @scene.fields = fields
+            @scene.last = last
+            labels = {}
+            fields.each{ |key|
+                labels[key] = instance.metadata[key] && instance.metadata[key]["label"] ? \
+                    instance.metadata[key]["label"] : key
+            }
+            @scene.labels = labels
+            @scene.metadata = instance.metadata
+            @instance = instance
+            if instance.status.id.to_sym == :error
+                @scene.last_error = instance.last_error
+            end
+            if @request.params['remove_trigger']
+                trigger = ScoutPluginTrigger.load(:id => @request.params['remove_trigger'], :plugin_instance => instance)
+                trigger.delete if trigger
+                redirect @request.path
+            end 
+            if action == "edit"
+                plugin_edit(@servant, @scene.plugin, @instance)
+            elsif action == "triggers"
+                trigger_edit(sub_action)
+            elsif action == "data"
+                plugin_data(instance, sub_action)
+            else
+                render('plugin_instance')
+            end
+        end
+        
+        __.html
+        def site(servant_id, id, action=nil, sub_action=nil)
+            if @request.params['submit']
+            end
+            @servant = Servant.new(servant_id)
+            @scene.site_type = @request.params['site_type']
+            if @request.params['edit'] || id == 'new' || id == 'create'
+                render('site_edit')
+            else
+                render('site')
+            end
+        end
+        
+        __.html
+        def plugin_edit(servant, plugin, instance)
+            if @request.params['submit']
+                instance.name = @request.params['name']
+                instance.settings = @request.params['settings']
+                instance.poll_interval = @request.params['poll_interval'] unless @request.params['poll_interval'].blank?
+                instance.timeout = @request.params['timeout'] unless @request.params['timeout'].blank?
+                instance.save
+                redirect("#{Master.url}/servants/#{@servant.id}/plugins/#{@instance.id}")
+            end
+            render('plugin_edit')
+        end
+        
+        __.html
+        def trigger_edit(id)
+            if id == 'new'
+                trigger = ScoutPluginTrigger.new(:plugin_instance => @instance)
+                trigger.trigger_type = @request.params['trigger_type']
+                trigger.data = @request.params['data_series']
+            else
+                trigger = ScoutPluginTrigger.load(:id => id, :plugin_instance => @instance)
+                raise NotFound.new("Trigger #{id} of servant #{@scene.servant}") unless trigger
+            end
+            @trigger = trigger
+            if @request.params['submit'] && (id != 'new' || @request.params['data'])
+                @request.params.each do |k, v|
+                    next if ['trigger_type', 'data'].include?(k) && trigger.id
+                    trigger.set(k, v) if trigger.class.elements[k.to_sym]
+                end
+                trigger.save
+                redirect("#{Master.url}/servants/#{@servant.id}/plugins/#{@instance.id}")
+            end
+            render 'trigger_edit'
+        end
+        
+        def plugin_data(instance, key)
+            return chart_data(instance) if key == 'chart_data'
+            @scene.key = key
+            @scene.label = instance.plugin.metadata[key]["label"] if instance.plugin.metadata[key]
+            @scene.label = key if @scene.label.blank?
+            @scene.values = ScoutReportField.where('report.plugin_instance' => instance, :name => key)
+            render 'plugin_data'
+        end
+        
+        def chart_data(instance)
+            key = @request.params["data"]
+            columns = [[instance, key]]
+            if @request.params["compare"]
+                columns += @request.params["compare"].map do |c|
+                    instance_id, c_key = c.split('|')
+                    [ScoutPluginInstance.new(instance_id), c_key]
+                end
+            end
+            res = {
+                :labels => columns.map{ |i, k| i.plugin.label(k) }
+            }
+            data = {}
+            columns.each_with_index do |pair, i|
+                inst, k = pair
+                values = ScoutReportField.where(:plugin_instance => inst, :name => k)
+                values.request.merge!(:name => true, :value => true)
+                values.each do |v|
+                    data[v.report_date] ||= []
+                    data[v.report_date][i] = v.value
+                    
+                end
+            end
+            data = data.map{ |k, v| [k] + v }.sort{ |a, b| a[0] <=> b[0] }
+            res[:data] = data 
+            content_type :json
+            $out << res.to_json
         end
         
         __.action
@@ -102,9 +346,16 @@ module Spider; module Master
             else
                 servant.update
             end
-            $out << 'ok'
+            response = {
+                :pong => DateTime.new
+            }
+            servant.pending_commands.each do |command|
+                response[:commands] ||= []
+                response[:commands] << command.to_h
+            end
+            $out << response.to_json
         end
         
     end
     
-end; end
+end; end