naf 1.1.4 → 2.0.0

data/app/views/naf/log_viewer/_log_layout.html.erb

@@ -0,0 +1,59 @@
+<h2>Logs</h2>
+<div id="stdout_header">
+  <div>
+    <%= text_field_tag :log_search, nil, placeholder: 'Search query' %>
+    &nbsp;/&nbsp;
+    <%= text_field_tag :regex_options, nil, placeholder: 'Regex options' %>
+    &nbsp;&nbsp;
+    <%= button_tag 'Regex Help', id: "regex_help" %>
+    <div class="description">
+      <strong>Regex Options</strong>
+      <table cellpadding="5">
+        <thead>
+          <tr>
+            <td><b>Option</b></td>
+            <td><b>Notes</b></td>
+          </tr>
+          <tr>
+            <td>i</td>
+            <td>case insensitive</td>
+          </tr>
+          <tr>
+            <td>m</td>
+            <td>make dot match newlines</td>
+          </tr>
+          <tr>
+            <td>x</td>
+            <td>ignore whitespace in regex</td>
+          </tr>
+        </thead>
+      </table>
+    </div>
+
+    <div>
+      <%= label_tag :auto_update, 'Grep:' %>
+      <%= check_box_tag :grep, 1, false, id: :grep %>
+    </div>
+    </br>
+
+    <div>
+      <%= label_tag 'From:' %>
+      <%= render partial: 'naf/shared/date_select', locals: { prefix: 'date_select_from', dropdown_width: 'width: 6%;' } %>
+      </br>
+      <%= label_tag 'To:' %>&nbsp;&nbsp;&nbsp;&nbsp;
+      <%= render partial: 'naf/shared/date_select', locals: { prefix: 'date_select_to', dropdown_width: 'width: 6%;' } %>
+    </div>
+
+    <%= link_to 'Auto Scroll (ON)', '#', id: :auto_scroll %>
+    </br></br>
+    <%= submit_tag("Search the logs", id: 'log_search_submit') %>
+    <%= link_to 'Full Screen',
+                { controller: 'log_viewer', action: 'index', record_id: record_id, record_type: record_type },
+                { class: 'full_screen' } %>
+  </div>
+</div>
+
+</br>
+<FONT FACE= "Courier New">
+<div id="stdout" class="scrollable-output" ></div>
+<FONT FACE= "Arial">

data/app/views/naf/log_viewer/_machine_logs.html.erb

@@ -0,0 +1,62 @@
+<div id='naf'>
+  <div id="fluid">
+    <div id='bd'>
+      <div id="record">
+        <FONT FACE= "Courier New">
+        <div id="stdout" class="scrollable-output-expanded"></div>
+        </br>
+        <FONT FACE= "Arial">
+
+        <div id="stdout_header">
+          <div>
+            <%= render partial: 'search_options' %>
+            <div style="width: 100%; display: table;">
+              <div style="display: table-row">
+                <div style="width: 600px; display: table-cell;">
+                  <%= label_tag 'From:' %>
+                  <%= render partial: 'naf/shared/date_select', locals: { prefix: 'date_select_from', dropdown_width: 'width: 15%;' } %>
+                  </br>
+                  <%= label_tag 'To:' %>&nbsp;&nbsp;&nbsp;&nbsp;
+                  <%= render partial: 'naf/shared/date_select', locals: { prefix: 'date_select_to', dropdown_width: 'width: 15%;' } %>
+                </div>
+                <div style="display: table-cell;">
+                  <strong style="margin-left: 10%; size: 10%">Machine Information</strong>
+                  <table id='naf_table_show' style="margin-left: 10%; width: 75%">
+                    <thead>
+                      <tr>
+                        <td width="7%">ID</td>
+                        <td>Server</td>
+                        <td>Last Seen Alive At</td>
+                      </tr>
+                    </thead>
+                    <tbody>
+                      <tr>
+                        <td><%= @machine.id %></td>
+                        <td><%= @machine.hostname %></td>
+                        <td><%= @machine.last_seen_alive_at %></td>
+                      </tr>
+                    </tbody>
+                  </table>
+                </div>
+              </div>
+            </div>
+            </br>
+
+            <%= submit_tag("Search the logs", id: 'log_search_submit') %>
+            &nbsp;&nbsp;&nbsp;
+            <%= link_to 'Back to Machine', { controller: 'machines', action: 'show', id: @machine.id } %>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<%= render partial: 'update_page_title', locals: { title: "Machine(#{@machine.id}) Logs" } %>
+<%= render partial: 'naf/shared/auto_resize_width', locals: { div_class: '.scrollable-output-expanded' } %>
+<%= render partial: 'log_display',
+           locals: {
+             logs_url: "#{http_protocol}#{::Logical::Naf::Machine.new(@machine).runner}#{naf.logs_log_parsers_path}",
+             record_id: @machine.id,
+             record_type: 'machine'
+           } %>

data/app/views/naf/log_viewer/_runner_logs.html.erb

@@ -0,0 +1,62 @@
+<div id='naf'>
+  <div id="fluid">
+    <div id='bd'>
+      <div id="record">
+        <FONT FACE= "Courier New">
+        <div id="stdout" class="scrollable-output-expanded"></div>
+        </br>
+        <FONT FACE= "Arial">
+
+        <div id="stdout_header">
+          <div>
+            <%= render partial: 'search_options' %>
+            <div style="width: 100%; display: table;">
+              <div style="display: table-row">
+                <div style="width: 600px; display: table-cell;">
+                  <%= label_tag 'From:' %>
+                  <%= render partial: 'naf/shared/date_select', locals: { prefix: 'date_select_from', dropdown_width: 'width: 15%;' } %>
+                  </br>
+                  <%= label_tag 'To:' %>&nbsp;&nbsp;&nbsp;&nbsp;
+                  <%= render partial: 'naf/shared/date_select', locals: { prefix: 'date_select_to', dropdown_width: 'width: 15%;' } %>
+                </div>
+                <div style="display: table-cell;">
+                  <strong style="margin-left: 10%; size: 10%">Runner Information</strong>
+                  <table id='naf_table_show' style="margin-left: 10%; width: 75%">
+                    <thead>
+                      <tr>
+                        <td width="7%">ID</td>
+                        <td>Server</td>
+                        <td>Cwd</td>
+                      </tr>
+                    </thead>
+                    <tbody>
+                      <tr>
+                        <td><%= @runner.id %></td>
+                        <td><%= @runner.machine.hostname %></td>
+                        <td><%= @runner.runner_cwd %></td>
+                      </tr>
+                    </tbody>
+                  </table>
+                </div>
+              </div>
+            </div>
+            </br>
+
+            <%= submit_tag("Search the logs", id: 'log_search_submit') %>
+            &nbsp;&nbsp;&nbsp;
+            <%= link_to 'Back to Runner', { controller: 'machine_runners', action: 'show', id: @runner.id } %>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<%= render partial: 'update_page_title', locals: { title: "Runner(#{@runner.id}) Logs" } %>
+<%= render partial: 'naf/shared/auto_resize_width', locals: { div_class: '.scrollable-output-expanded' } %>
+<%= render partial: 'log_display',
+           locals: {
+             logs_url: "#{http_protocol}#{::Logical::Naf::Machine.new(@runner.machine).runner}#{naf.logs_log_parsers_path}",
+             record_id: @runner.id,
+             record_type: 'runner'
+           } %>

data/app/views/naf/log_viewer/_search_options.html.erb

@@ -0,0 +1,36 @@
+<%= text_field_tag :log_search, nil, placeholder: 'Search query' %>
+&nbsp;/&nbsp;
+<%= text_field_tag :regex_options, nil, placeholder: 'Regex options' %>
+&nbsp;&nbsp;
+<%= button_tag 'Regex Help', id: "regex_help" %>
+<div class="description">
+  &nbsp;
+  <strong>Regex Options</strong>
+  <table cellpadding="5">
+    <thead>
+      <tr>
+        <td><b>Option</b></td>
+        <td><b>Notes</b></td>
+      </tr>
+      <tr>
+        <td>i</td>
+        <td>case insensitive</td>
+      </tr>
+      <tr>
+        <td>m</td>
+        <td>make dot match newlines</td>
+      </tr>
+      <tr>
+        <td>x</td>
+        <td>ignore whitespace in regex</td>
+      </tr>
+    </thead>
+  </table>
+</div>
+
+<%= link_to 'Auto Scroll (ON)', '#', id: :auto_scroll %>
+<div>
+  <%= label_tag :auto_update, 'Grep:' %>
+  <%= check_box_tag :grep, 1, false, id: :grep %>
+</div>
+</br>

data/app/views/naf/log_viewer/_update_page_title.html.erb

@@ -0,0 +1,9 @@
+<% content_for :javascripts do %>
+  <script type='text/javascript'>
+
+	jQuery(document).ready(function () {
+  	document.title = '<%= title %>';
+  });
+
+  </script>
+<% end %>

data/app/views/naf/log_viewer/index.html.erb

@@ -0,0 +1 @@
+<%= render partial: @partial %>

data/app/views/naf/logger_names/_form.html.erb

@@ -1,11 +1,10 @@
 <%= form_for(@logger_name) do |f| %>
-  
   <% if @logger_name.errors.any? %>
   <div id="errorExplanation">
     <h2><%= pluralize(@logger_name.errors.count, "error") %> prohibited Logger Name from being saved:</h2>
   </div>
   <% end %>
- 
+
   <div class="field">
     <%= f.label :name, "Name*" %><br />
     <%= f.text_field :name %>

data/app/views/naf/machine_affinity_slots/_form.html.erb

@@ -10,11 +10,7 @@
 
   <div class="field">
     <%= f.label :affinity_id, "Affinity*" %></br>
-    <%= f.select(:affinity_id,
-                 ::Naf::Affinity.selectable.map{
-                    |a| [a.affinity_classification.affinity_classification_name + ', ' + a.affinity_name, a.id]
-                 },
-                 include_blank: true) %>
+    <%= f.select(:affinity_id, ::Naf::Affinity.names_list, include_blank: true) %>
   </div>
   </br>
 

data/app/views/naf/machine_runner_invocations/show.html.erb

@@ -33,6 +33,10 @@
           <td>Pid</td>
           <td><%= @machine_runner_invocation.pid %></td>
         </tr>
+        <tr>
+          <td>UUID</td>
+          <td><%= @machine_runner_invocation.uuid %></td>
+        </tr>
         <tr>
           <td>Wind Down At</td>
           <td><%= @machine_runner_invocation.wind_down_at %></td>

data/app/views/naf/machine_runners/show.html.erb

@@ -1,40 +1,14 @@
 <% content_for :body do %>
   <div id="flash_message">
-      <% unless notice.blank? %>
-        <script type='text/javascript'>
-          jQuery("<p id='notice'><%= notice %></p>")
-              .appendTo('#flash_message')
-              .slideDown().delay(5000).slideUp();
-        </script>
-      <% end %>
+    <% unless notice.blank? %>
+      <script type='text/javascript'>
+        jQuery("<p id='notice'><%= notice %></p>")
+          .appendTo('#flash_message')
+          .slideDown().delay(5000).slideUp();
+      </script>
+    <% end %>
   </div>
 
-  <script type='text/javascript'>
-    // Action: Wind Down Runner
-    jQuery(document).delegate('.wind_down', "click", function() {
-      var answer = confirm("You are winding down this runner. Are you sure you want to do this?");
-      if (!answer) {
-        return false;
-      }
-      var id = <%= @machine_runner.machine_runner_invocations.last.id %>;
-      var url = '/job_system/machine_runner_invocations/' + id;
-      jQuery.ajax({
-        url: url,
-        type: 'POST',
-        dataType: 'json',
-        data: { "machine_runner_invocation[request_to_wind_down]": 1, "machine_runner_invocation_id": id, "_method": "put" },
-        success:function (data) {
-          if (data.success) {
-            jQuery("<p id='notice'>The machine runner is winding down!</p>").
-            appendTo('#flash_message').slideDown().delay(5000).slideUp();
-            jQuery('#datatable').dataTable().fnDraw();
-            window.location.reload()
-          }
-        }
-      });
-    });
-  </script>
-
   <div id="record">
     <h2>Machine Runner</h2>
     <%= link_to 'Back to Machine Runners', machine_runners_path %>
@@ -107,7 +81,43 @@
       </tbody>
     </table>
     </br>
-
+    <%= render partial: 'naf/log_viewer/log_layout', locals: { record_id: @machine_runner.id, record_type: 'runner' } %>
   </div>
 <% end %>
+
 <%= render partial: 'naf/shared/application' %>
+<%= render partial: 'naf/shared/auto_resize_width', locals: { div_class: '.scrollable-output' } %>
+<%= render partial: 'naf/log_viewer/log_display',
+           locals: {
+             logs_url: "#{http_protocol}#{::Logical::Naf::Machine.new(@machine_runner.machine).runner}#{naf.logs_log_parsers_path}",
+             record_id: @machine_runner.id,
+             record_type: 'runner'
+           } %>
+
+<% content_for :javascripts do %>
+  <script type='text/javascript'>
+    // Action: Wind Down Runner
+    jQuery(document).delegate('.wind_down', "click", function() {
+      var answer = confirm("You are winding down this runner. Are you sure you want to do this?");
+      if (!answer) {
+        return false;
+      }
+      var id = <%= @machine_runner.machine_runner_invocations.last.id %>;
+      var url = '/job_system/machine_runner_invocations/' + id;
+      jQuery.ajax({
+        url: url,
+        type: 'POST',
+        dataType: 'json',
+        data: { "machine_runner_invocation[request_to_wind_down]": 1, "machine_runner_invocation_id": id, "_method": "put" },
+        success:function (data) {
+          if (data.success) {
+            jQuery("<p id='notice'>The machine runner is winding down!</p>").
+            appendTo('#flash_message').slideDown().delay(5000).slideUp();
+            jQuery('#datatable').dataTable().fnDraw();
+            window.location.reload()
+          }
+        }
+      });
+    });
+  </script>
+<% end %>

data/app/views/naf/machines/index.json.erb

@@ -1,14 +1,22 @@
  <%
   rows = @machines.each do |machine|
-    machine[11] = link_to image_tag('papertrail_machine.png',
+    machine[11] = link_to image_tag('machine.png',
                                     class: 'action',
-                                    title: "View machine(id: #{machine[0]}, server:#{machine[1].blank? ? machine[2] : machine[1]}) log in Papertrail"),
-                                    machine[11], { target: '_blank', class: "papertrail", id: machine[0] }
+                                    title: "View machine(id: #{machine[0]}, server:#{machine[1].blank? ? machine[2] : machine[1]}) log"),
+                                    url_for({ controller: 'log_viewer',
+                                              action: 'index',
+                                              record_id: machine[0],
+                                              record_type: 'machine' }),
+                                    { target: '_blank', id: machine[0] }
     machine[11] << "&nbsp;&nbsp;".html_safe
-    machine[11] << (link_to image_tag('papertrail_machine_runner.png',
+    machine[11] << (link_to image_tag('machine_runner.png',
                                       class: 'action',
-                                      title: "View machine(id: #{machine[0]}, server:#{machine[1].blank? ? machine[2] : machine[1]}) runner log in Papertrail"),
-                                      machine[12], { target: '_blank', class: "papertrail", id: machine[0] })
+                                      title: "View machine(id: #{machine[0]}, server:#{machine[1].blank? ? machine[2] : machine[1]}) runner log"),
+                                      url_for({ controller: 'log_viewer',
+                                                action: 'index',
+                                                record_id: ::Naf::Machine.find_by_id(machine[0]).machine_runners.order(:id).last.try(:id),
+                                                record_type: 'runner' }),
+                                      { target: '_blank', id: machine[0] })
     machine[11] << "&nbsp;&nbsp;".html_safe
     unless machine[10]
       machine[11] << (link_to image_tag('terminate.png',

data/app/views/naf/machines/show.html.erb

@@ -1,42 +1,14 @@
 <% content_for :body do %>
   <div id="flash_message">
-      <% unless notice.blank? %>
-        <script type='text/javascript'>
-          jQuery("<p id='notice'><%= notice %></p>")
-              .appendTo('#flash_message')
-              .slideDown().delay(5000).slideUp();
-        </script>
-      <% end %>
+    <% unless notice.blank? %>
+      <script type='text/javascript'>
+        jQuery("<p id='notice'><%= notice %></p>")
+          .appendTo('#flash_message')
+          .slideDown().delay(5000).slideUp();
+      </script>
+    <% end %>
   </div>
 
-  <% content_for :javascripts do %>
-  <script type='text/javascript'>
-      jQuery(document).ready(function () {
-          jQuery(document).delegate('.terminate', "click", function(){
-              var answer = confirm("You are going to mark machine down. Are you sure you want to do this?");
-              if (!answer) {
-                  return false;
-              }
-              var id = <%= @machine.id %>;
-              var url = '/job_system/machines/' + id;
-              jQuery.ajax({
-                  url: url,
-                  type: 'POST',
-                  dataType: 'json',
-                  data: { "machine[marked_down]": 1, "terminate": true, "_method": "put" },
-                  success:function (data) {
-                      if (data.success) {
-                          jQuery("<p id='notice'>Machine was marked down!</p>").
-                                  appendTo('#flash_message').slideDown().delay(5000).slideUp();
-                          setTimeout('window.location.reload()', 5600);
-                      }
-                  }
-              });
-          });
-      });
-  </script>
-  <% end %>
-
   <div id="record">
     <h2>Machine</h2>
     <%= link_to 'Back to Machines', machines_path %>
@@ -82,11 +54,43 @@
       </tbody>
     </table>
     </br>
-
-    <h2>Stdout</h2>
-    <iframe src="<%= naf_papertrail_link(@machine, true) %>" id="stdout" class="scrollable-output">
-      Your browser doesn't support iframe!
-    </iframe>
+    <%= render partial: 'naf/log_viewer/log_layout', locals: { record_id: @machine.id, record_type: 'machine' } %>
   </div>
 <% end %>
+
 <%= render partial: 'naf/shared/application' %>
+<%= render partial: 'naf/shared/auto_resize_width', locals: { div_class: '.scrollable-output' } %>
+<%= render partial: 'naf/log_viewer/log_display',
+           locals: {
+             logs_url: "#{http_protocol}#{::Logical::Naf::Machine.new(@machine).runner}#{naf.logs_log_parsers_path}",
+             record_id: @machine.id,
+             record_type: 'machine'
+           } %>
+
+<% content_for :javascripts do %>
+  <script type='text/javascript'>
+      jQuery(document).ready(function () {
+          jQuery(document).delegate('.terminate', "click", function(){
+              var answer = confirm("You are going to mark machine down. Are you sure you want to do this?");
+              if (!answer) {
+                  return false;
+              }
+              var id = <%= @machine.id %>;
+              var url = '/job_system/machines/' + id;
+              jQuery.ajax({
+                  url: url,
+                  type: 'POST',
+                  dataType: 'json',
+                  data: { "machine[marked_down]": 1, "terminate": true, "_method": "put" },
+                  success:function (data) {
+                      if (data.success) {
+                          jQuery("<p id='notice'>Machine was marked down!</p>").
+                                  appendTo('#flash_message').slideDown().delay(5000).slideUp();
+                          setTimeout('window.location.reload()', 5600);
+                      }
+                  }
+              });
+          });
+      });
+  </script>
+<% end %>