spiderfw 0.6.5 → 0.6.6

data/apps/master/models/remote_log.rb

@@ -0,0 +1,11 @@
+module Spider; module Master
+    
+    class RemoteLog < Spider::Model::Managed
+        element :text, String
+        element :level, String
+        element :time, DateTime
+        element :installation, Spider::Master::Installation, :add_multiple_reverse => :log
+        element :acknowledged, Spider::Bool
+    end
+    
+end; end

data/apps/master/models/scout_plugin_instance.rb

@@ -7,7 +7,7 @@ module Spider; module Master
     class ScoutPluginInstance < Spider::Model::Managed
         element :plugin_id, String
         element :name, String
-        element :servant, Servant, :add_multiple_reverse => :scout_plugins
+        element :server, Server, :add_multiple_reverse => :scout_plugins
         element :settings_json, Text
         element :timeout, Fixnum, :default => 60
         element :poll_interval, Fixnum, :default => 0
@@ -98,7 +98,7 @@ module Spider; module Master
         end
         
         def to_s
-            "#{self.name} - #{self.servant}"
+            "#{self.name} - #{self.server}"
         end
         
         def average(field, type)
@@ -269,11 +269,11 @@ module Spider; module Master
             
             def before_save(obj, mode)
                 if mode == :insert
-                    obj.servant.admins.each do |servant_adm|
+                    obj.server.admins.each do |server_adm|
                         obj.admins << ScoutPluginInstance::Admins.new(
-                           :admin => servant_adm.admin,
-                           :receive_notifications => servant_adm.receive_notifications,
-                           :manage => servant_adm.manage_plugins
+                           :admin => server_adm.admin,
+                           :receive_notifications => server_adm.receive_notifications,
+                           :manage => server_adm.manage_plugins
                         )
                     end
                 end
@@ -288,9 +288,9 @@ module Spider; module Master
                         trigger.save
                     end
                 end
-                if obj.servant
-                    obj.servant.scout_plan_changed = DateTime.now
-                    obj.servant.save
+                if obj.server
+                    obj.server.scout_plan_changed = DateTime.now
+                    obj.server.save
                 end
                 super
             end

data/apps/master/models/scout_plugin_trigger.rb

@@ -247,8 +247,8 @@ module Spider; module Master
             path_html = MasterController.find_resource_path(:email, template+'.html', nil, MasterController)
             
             # ERB data
-            server_id = self.plugin_instance.servant.id
-            server_name = self.plugin_instance.servant.name
+            server_id = self.plugin_instance.server.id
+            server_name = self.plugin_instance.server.name
             plugin_id = self.plugin_instance.id
             plugin_name = self.plugin_instance.name
             message = msg

data/apps/master/models/{servant.rb → server.rb}

@@ -3,19 +3,19 @@ require 'apps/master/models/command'
 
 module Spider; module Master
     
-    class Servant < Spider::Model::Managed
+    class Server < Spider::Model::Managed
         element :uuid, UUID
         element :name, String
         element :last_check, DateTime, :read_only => true
         element :system_status, Text, :read_only => true
         element :scout_poll_interval, Fixnum, :default => 5
         # element :url, String
-        many :commands, Master::Command, :add_reverse => :servant
+        many :commands, Master::Command, :add_reverse => :server
         element_query :pending_commands, :commands, :condition => Spider::Model::Condition.new{ |c| c.status == 'pending' }
         many :resources, Master::Resource, :delete_cascade => true
-        choice :customer, Master::Customer, :add_multiple_reverse => :servants
+        choice :customer, Master::Customer, :add_multiple_reverse => :server
         element :scout_plan_changed, DateTime, :hidden => true
-        multiple_choice :admins, Master::Admin, :add_multiple_reverse => :servants do
+        multiple_choice :admins, Master::Admin, :add_multiple_reverse => :server do
             element :receive_notifications, Bool, :default => true
             element :manage_plugins, Bool, :default => true
         end
@@ -34,7 +34,7 @@ module Spider; module Master
             if self.url
                 # send_command(name, arguments)
             else
-                c = Command.new(:name => name, :arguments => arguments.to_json, :servant => self)
+                c = Command.new(:name => name, :arguments => arguments.to_json, :server => self)
                 c.save
             end
         end
@@ -77,7 +77,7 @@ module Spider; module Master
                  if mode == :insert
                      if obj.customer
                          obj.customer.admins.each do |customer_adm|
-                             obj.admins << Servant::Admins.new(
+                             obj.admins << Server::Admins.new(
                                 :admin => customer_adm.admin,
                                 :receive_notifications => customer_adm.receive_notifications,
                                 :manage_plugins => customer_adm.manage_plugins

data/apps/master/po/it/{spider_master.po → master.po}

@@ -5,92 +5,106 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Spider::Master\n"
-"POT-Creation-Date: 2010-09-24 20:50+0200\n"
-"PO-Revision-Date: 2010-09-24 20:51+0100\n"
+"Project-Id-Version: Spider::Master 0.1\n"
+"POT-Creation-Date: 2011-07-05 18:34+0200\n"
+"PO-Revision-Date: 2011-07-05 18:39+0100\n"
 "Last-Translator: Ivan Pirlik <ivan.pirlik@soluzionipa.it>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: controllers/master_controller.rb:48
+#: controllers/master_controller.rb:51
 #: views/customers.shtml:3
 #: views/index.shtml:2
-#: views/master.layout.shtml:18
+#: views/master.layout.shtml:20
 msgid "Customers"
 msgstr "Clienti"
 
-#: controllers/master_controller.rb:79
+#: controllers/master_controller.rb:82
 msgid "No customer"
 msgstr "Nessun cliente"
 
-#: controllers/master_controller.rb:81
+#: controllers/master_controller.rb:84
 msgid "User can't access this customer"
 msgstr "L'utente non è autorizzato a vedere questo cliente"
 
-#: controllers/master_controller.rb:100
+#: controllers/master_controller.rb:103
 msgid "User can't list customers"
 msgstr "L'utente non è autorizzato a vedere la lista cliente"
 
-#: models/scout_plugin_trigger.rb:6
+#: models/scout_plugin_instance.rb:21
+msgid "Ok"
+msgstr "Ok"
+
+#: models/scout_plugin_instance.rb:22
+msgid "Error"
+msgstr "Errore"
+
+#: models/scout_plugin_instance.rb:23
+msgid "Alert"
+msgstr "Avviso"
+
+#: models/scout_plugin_trigger.rb:8
 msgid "Peak trigger"
 msgstr "Trigger di picco"
 
-#: models/scout_plugin_trigger.rb:7
+#: models/scout_plugin_trigger.rb:9
 msgid "Plateau trigger"
 msgstr "Trigger di plateau"
 
-#: models/scout_plugin_trigger.rb:8
+#: models/scout_plugin_trigger.rb:10
 msgid "Trend trigger"
 msgstr "Trigger di tendenza"
 
-#: models/scout_plugin_trigger.rb:13
+#: models/scout_plugin_trigger.rb:15
 msgid "Up"
 msgstr "Su"
 
-#: models/scout_plugin_trigger.rb:14
+#: models/scout_plugin_trigger.rb:16
 msgid "Down"
 msgstr "Giù"
 
-#: models/scout_plugin_trigger.rb:15
+#: models/scout_plugin_trigger.rb:17
 msgid "Either"
 msgstr "Su o giù"
 
-#: models/scout_plugin_trigger.rb:20
+#: models/scout_plugin_trigger.rb:22
 #: views/trigger_edit.shtml:76
 msgid "yesterday's average"
 msgstr "media di ieri"
 
-#: models/scout_plugin_trigger.rb:21
+#: models/scout_plugin_trigger.rb:23
 #: views/trigger_edit.shtml:79
 msgid "previous 7-day average"
 msgstr "media dei 7 giorni precedenti"
 
-#: models/scout_plugin_trigger.rb:22
+#: models/scout_plugin_trigger.rb:24
 #: views/trigger_edit.shtml:82
 msgid "preceding window"
 msgstr "finestra precedente"
 
-#: models/scout_plugin_trigger.rb:25
+#: models/scout_plugin_trigger.rb:27
 msgid "normal"
 msgstr "normale"
 
-#: models/scout_plugin_trigger.rb:26
+#: models/scout_plugin_trigger.rb:28
 msgid "fired"
 msgstr "scattato"
 
-#: models/scout_plugin_trigger.rb:90
-#: models/scout_plugin_trigger.rb:98
+#: models/scout_plugin_trigger.rb:93
+#: models/scout_plugin_trigger.rb:101
+#: models/scout_plugin_trigger.rb:230
 msgid "%d minutes"
 msgstr "%d minuti"
 
-#: models/scout_plugin_trigger.rb:108
+#: models/scout_plugin_trigger.rb:111
 msgid "Alert me when %s exceeds %s"
 msgstr "Avvisami quando %s supera %s"
 
-#: models/scout_plugin_trigger.rb:110
+#: models/scout_plugin_trigger.rb:113
 msgid ""
 "Alert me when %s goes %s more than %s over the preceding %s (relative to %s), \n"
 "                as long as the value is at least %s"
@@ -98,10 +112,22 @@ msgstr ""
 "Avvisami quando %s va %s più di %s nei precedenti %s (relativo a %s), \n"
 "               purché il valore sia almeno %s"
 
-#: models/scout_plugin_trigger.rb:116
+#: models/scout_plugin_trigger.rb:119
 msgid "Alert me when %s stays above %s for %s or more"
 msgstr "Avvisami quando %s sta sopra %s per %s o più"
 
+#: models/scout_plugin_trigger.rb:224
+msgid "%s exceeded %s, increasing to %s at %s"
+msgstr "%s ha superato %s, salendo fino a %s alle %s"
+
+#: models/scout_plugin_trigger.rb:232
+msgid "%s went %s more than %s over the preceding %s minutes with respect to %s, and is now %s"
+msgstr "%s è andato %s più di %s  nei precendenti %s minuti rispetto a %s, e ora è %s"
+
+#: models/scout_plugin_trigger.rb:241
+msgid "%s exceeded %s, increasing to %s at %s, and is still continuing at %s as of %s"
+msgstr "%s ha superato %s, salendo a %s alle %s, e sta continuando a %s alle %s"
+
 #: views/admin.layout.shtml:5
 msgid "\"Administration\""
 msgstr "\"Amministrazione\""
@@ -111,20 +137,20 @@ msgid "New customer"
 msgstr "Nuovo cliente"
 
 #: views/customer.shtml:8
-#: views/servant.shtml:6
+#: views/server.shtml:6
 msgid "Edit"
 msgstr "Modifica"
 
 #: views/customer.shtml:21
 #: views/index.shtml:3
-#: views/master.layout.shtml:19
-msgid "Servants"
+#: views/master.layout.shtml:21
+msgid "Servers"
 msgstr "Server"
 
 #: views/customer.shtml:21
 #: views/customer.shtml:32
 #: views/customers.shtml:3
-#: views/plugin_instance.shtml:20
+#: views/plugin_instance.shtml:33
 msgid "Add"
 msgstr "Aggiungi"
 
@@ -165,10 +191,18 @@ msgstr "Salva"
 msgid "Targets"
 msgstr "Destinazioni"
 
-#: views/master.layout.shtml:17
+#: views/master.layout.shtml:19
 msgid "Home"
 msgstr "Home"
 
+#: views/plugin_data.shtml:13
+msgid "Compare"
+msgstr "Confronta"
+
+#: views/plugin_data.shtml:22
+msgid "Show in same scale"
+msgstr "Mostra nella stessa scala"
+
 #: views/plugin_edit.shtml:3
 msgid "Edit plugin \"%s\""
 msgstr "Modifica plugin \"%s\""
@@ -197,70 +231,105 @@ msgstr "Timeout"
 msgid "Update"
 msgstr "Aggiorna"
 
-#: views/plugin_instance.shtml:4
+#: views/plugin_instance.shtml:5
 msgid "Edit settings"
 msgstr "Modifica impostazioni"
 
 #: views/plugin_instance.shtml:8
-#: views/trigger_edit.shtml:12
-msgid "Servant"
-msgstr "Server"
+msgid "Last report"
+msgstr "Ultimo report"
 
-#: views/plugin_instance.shtml:12
-#: views/servant.shtml:14
-#: views/trigger_edit.shtml:8
-msgid "Customer"
-msgstr "Cliente"
+#: views/plugin_instance.shtml:19
+msgid "Field"
+msgstr "Campo"
 
 #: views/plugin_instance.shtml:20
+msgid "Value"
+msgstr "Valore"
+
+#: views/plugin_instance.shtml:24
+msgid "@labels[key]"
+msgstr "@labels[key]"
+
+#: views/plugin_instance.shtml:33
 msgid "Triggers"
 msgstr "Trigger"
 
-#: views/plugin_instance.shtml:25
+#: views/plugin_instance.shtml:38
 msgid "edit"
 msgstr "modifica"
 
-#: views/servant.shtml:23
-#: views/servants.shtml:4
-msgid "New servant"
+#: views/server.shtml:14
+#: views/trigger_edit.shtml:8
+msgid "Customer"
+msgstr "Cliente"
+
+#: views/server.shtml:23
+#: views/servers.shtml:4
+msgid "New server"
 msgstr "Nuovo server"
 
-#: views/servant.shtml:23
+#: views/server.shtml:23
 msgid "for customer %s"
 msgstr "per il cliente %s"
 
-#: views/servant.shtml:31
+#: views/server.shtml:31
+msgid "Sites"
+msgstr "Siti"
+
+#: views/server.shtml:32
+msgid "New site"
+msgstr "Nuovo sito"
+
+#: views/server.shtml:33
+msgid "Add existing site"
+msgstr "Aggiungi sito esistente"
+
+#: views/server.shtml:39
+#: views/server.shtml:62
+msgid "Remove"
+msgstr "Elimina"
+
+#: views/server.shtml:44
 msgid "Plugins"
 msgstr "Plugin"
 
-#: views/servant.shtml:34
+#: views/server.shtml:47
 msgid "Add plugin"
 msgstr "Aggiungi plugin"
 
-#: views/servant.shtml:49
-msgid "Remove"
-msgstr "Elimina"
-
-#: views/servant.shtml:57
+#: views/server.shtml:70
 msgid "Servant %s"
 msgstr "Server %s"
 
-#: views/servant.shtml:60
+#: views/server.shtml:73
 msgid "Last check"
 msgstr "Ultimo controllo"
 
-#: views/servant.shtml:65
+#: views/server.shtml:78
 msgid "Manage resources"
 msgstr "Gestisci risorse"
 
-#: views/servant.shtml:68
+#: views/server.shtml:81
 msgid "Resources"
 msgstr "Risorse"
 
-#: views/servant.shtml:81
+#: views/server.shtml:94
 msgid "System details"
 msgstr "Dettagli sistema"
 
+#: views/site_edit.shtml:3
+msgid "Edit Site %s"
+msgstr "Modifica Sito %s"
+
+#: views/site_edit.shtml:4
+msgid "Create new Site for %s"
+msgstr "Crea nuovo Sito per %s"
+
+#: views/site_edit.shtml:7
+msgid "Choose site type"
+msgstr "Scegli tipo di sito"
+
 #: views/trigger_edit.shtml:3
 msgid "Edit Trigger %s"
 msgstr "Modifica Trigger %s"
@@ -269,6 +338,10 @@ msgstr "Modifica Trigger %s"
 msgid "New Trigger for plugin %s"
 msgstr "Nuovo Trigger per il plugin %s"
 
+#: views/trigger_edit.shtml:12
+msgid "Server"
+msgstr "Server"
+
 #: views/trigger_edit.shtml:16
 msgid "Plugin"
 msgstr "Plugin"

data/apps/master/po/master.pot

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Spider::Master 0.1\n"
-"POT-Creation-Date: 2011-05-09 17:37+0200\n"
+"POT-Creation-Date: 2011-07-05 18:34+0200\n"
 "PO-Revision-Date: 2011-05-09 17:31+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,20 +17,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: controllers/master_controller.rb:50 views/customers.shtml:3
+#: controllers/master_controller.rb:51 views/customers.shtml:3
 #: views/index.shtml:2 views/master.layout.shtml:20
 msgid "Customers"
 msgstr ""
 
-#: controllers/master_controller.rb:81
+#: controllers/master_controller.rb:82
 msgid "No customer"
 msgstr ""
 
-#: controllers/master_controller.rb:83
+#: controllers/master_controller.rb:84
 msgid "User can't access this customer"
 msgstr ""
 
-#: controllers/master_controller.rb:102
+#: controllers/master_controller.rb:103
 msgid "User can't list customers"
 msgstr ""
 
@@ -134,12 +134,12 @@ msgstr ""
 msgid "New customer"
 msgstr ""
 
-#: views/customer.shtml:8 views/servant.shtml:6
+#: views/customer.shtml:8 views/server.shtml:6
 msgid "Edit"
 msgstr ""
 
 #: views/customer.shtml:21 views/index.shtml:3 views/master.layout.shtml:21
-msgid "Servants"
+msgid "Servers"
 msgstr ""
 
 #: views/customer.shtml:21 views/customer.shtml:32 views/customers.shtml:3
@@ -251,59 +251,59 @@ msgstr ""
 msgid "edit"
 msgstr ""
 
-#: views/servant.shtml:14 views/trigger_edit.shtml:8
+#: views/server.shtml:14 views/trigger_edit.shtml:8
 msgid "Customer"
 msgstr ""
 
-#: views/servant.shtml:23 views/servants.shtml:4
-msgid "New servant"
+#: views/server.shtml:23 views/servers.shtml:4
+msgid "New server"
 msgstr ""
 
-#: views/servant.shtml:23
+#: views/server.shtml:23
 msgid "for customer %s"
 msgstr ""
 
-#: views/servant.shtml:31
+#: views/server.shtml:31
 msgid "Sites"
 msgstr ""
 
-#: views/servant.shtml:32
+#: views/server.shtml:32
 msgid "New site"
 msgstr ""
 
-#: views/servant.shtml:33
+#: views/server.shtml:33
 msgid "Add existing site"
 msgstr ""
 
-#: views/servant.shtml:39 views/servant.shtml:62
+#: views/server.shtml:39 views/server.shtml:62
 msgid "Remove"
 msgstr ""
 
-#: views/servant.shtml:44
+#: views/server.shtml:44
 msgid "Plugins"
 msgstr ""
 
-#: views/servant.shtml:47
+#: views/server.shtml:47
 msgid "Add plugin"
 msgstr ""
 
-#: views/servant.shtml:70
+#: views/server.shtml:70
 msgid "Servant %s"
 msgstr ""
 
-#: views/servant.shtml:73
+#: views/server.shtml:73
 msgid "Last check"
 msgstr ""
 
-#: views/servant.shtml:78
+#: views/server.shtml:78
 msgid "Manage resources"
 msgstr ""
 
-#: views/servant.shtml:81
+#: views/server.shtml:81
 msgid "Resources"
 msgstr ""
 
-#: views/servant.shtml:94
+#: views/server.shtml:94
 msgid "System details"
 msgstr ""
 
@@ -328,7 +328,7 @@ msgid "New Trigger for plugin %s"
 msgstr ""
 
 #: views/trigger_edit.shtml:12
-msgid "Servant"
+msgid "Server"
 msgstr ""
 
 #: views/trigger_edit.shtml:16

data/apps/master/templates/email/alert.html.erb

@@ -1,7 +1,7 @@
 <div>
     <div>
         <label>Server:</label>
-        <a href="<%=Spider::Master.url_for_servant(server_id)%>"><%=server_name%></a>
+        <a href="<%=Spider::Master.url_for_server(server_id)%>"><%=server_name%></a>
     </div>
     <div>
         <label>Plugin:</label>

data/apps/master/views/customer.shtml

@@ -18,12 +18,12 @@
     </tpl:pass>
     <tpl:pass sp:if="@customer && !@edit">
         <div class="list-title title-block">
-            <h3>_(Servants):</h3><a sp:if="@user.can_manage_customers?" href="{ @customer.id }/servants/new" class="add manage">_(Add)</a>
+            <h3>_(Servers):</h3><a sp:if="@user.can_manage_customers?" href="{ @customer.id }/servers/new" class="add manage">_(Add)</a>
         </div>
         <table class="list-table">
-            <tr sp:each="@customer.servants |servant|">
+            <tr sp:each="@customer.servers |server|">
                 <td>
-                    <a href="{ customer.id }/servants/{ servant.id }">{ servant.name }</a>
+                    <a href="{ customer.id }/server/{ server.id }">{ server.name }</a>
                 </td>
             </tr>
         </table>

data/apps/master/views/index.shtml

@@ -1,4 +1,3 @@
 <div>
-    <a href="{ Master.url }/customers">_(Customers)</a>
-    <a href="{ Master.url }/servants">_(Servants)</a>
+    
 </div>