naf 1.1.4 → 2.0.0

data/app/views/naf/shared/_auto_resize_width.html.erb

@@ -0,0 +1,7 @@
+<% content_for :javascripts do %>
+  <script type='text/javascript'>
+    window.onresize = function() {
+      jQuery('<%= div_class %>').width(jQuery(window).width() - 50);
+    }
+  </script>
+<% end %>

data/app/views/naf/shared/_date_select.html.erb

@@ -0,0 +1,65 @@
+<%= select_tag(
+  (prefix + '_year').to_sym,
+  options_for_select([['year', ''], ["2013", 2013], ["2014", 2014]
+  ]),
+  { style: dropdown_width })
+%>
+<%= select_tag(
+  (prefix + '_month').to_sym,
+  options_for_select([
+    ['month', ''], ["January", 1], ["February", 2], ["March", 3], ["April", 4],
+    ["May", 5], ["June", 6], ["July", 7], ["August", 8], ["September", 9],
+    ["October", 10], ["November", 11], ["December", 12]
+  ]),
+  { style: dropdown_width })
+%>
+<%= select_tag(
+  (prefix + '_day').to_sym,
+  options_for_select([
+    ['day', ''], [1, 1], [2, 2], [3, 3], [4, 4], [5, 5], [6, 6], [7, 7], [8, 8],
+    [9, 9], [10, 10], [11, 11], [12, 12], [13, 13], [14, 14], [15, 15], [16, 16],
+    [17, 17], [18, 18], [19, 19], [20, 20], [21, 21], [22, 22], [23, 23], [24, 24],
+    [25, 25], [26, 26], [27, 27], [28, 28], [29, 29], [30, 30], [31, 31]
+  ]),
+  { style: dropdown_width })
+%>
+<%= select_tag(
+  (prefix + '_hour').to_sym,
+  options_for_select([
+    ['hour', ''], ["1am", 1], ["2am", 2], ["3am", 3], ["4am",4 ], ["5am", 5], ["6am", 6],
+    ["7am", 7], ["8am", 8], ["9am", 9], ["10am", 10], ["11am", 11], ["12pm", 12],
+    ["1pm", 13], ["2pm", 14], ["3pm", 15], ["4pm", 16], ["5pm", 17], ["6pm", 18],
+    ["7pm", 19], ["8pm", 20], ["9pm", 21], ["10pm", 22], ["11pm", 23], ["12am", 24]
+  ]),
+  { style: dropdown_width })
+%>
+<%= select_tag(
+  (prefix + '_minute').to_sym,
+  options_for_select([
+    ['minute', ''], [1, 1], [2, 2], [3, 3], [4, 4], [5, 5], [6, 6], [7, 7], [8, 8],
+    [9, 9], [10, 10], [11, 11], [12, 12], [13, 13], [14, 14], [15, 15], [16, 16],
+    [17, 17], [18, 18], [19, 19], [20, 20], [21, 21], [22, 22], [23, 23], [24, 24],
+    [25, 25], [26, 26], [27, 27], [28, 28], [29, 29], [30, 30], [31, 31], [32, 32],
+    [33, 33], [34, 34], [35, 35], [36, 36], [37, 37], [38, 38], [39, 39], [40, 40],
+    [41, 41], [42, 42], [43, 43], [44, 44], [45, 45], [46, 46], [47, 47], [48, 48],
+    [49, 49], [50, 50], [51, 51], [52, 52], [53, 53], [54, 54], [55, 55], [56, 56],
+    [57, 57], [58, 58], [59, 59], [60, 60]
+  ]),
+  { style: dropdown_width })
+%>
+&nbsp;&nbsp;&nbsp;
+<%= button_tag 'clear', id: "#{prefix}_class_button" %>
+
+<% content_for :javascripts do %>
+  <script type='text/javascript'>
+    jQuery(document).ready(function () {
+      jQuery("#<%= prefix %>_class_button").click(function () {
+      	jQuery('#<%= prefix %>_year').val('');
+      	jQuery('#<%= prefix %>_month').val('');
+      	jQuery('#<%= prefix %>_day').val('');
+      	jQuery('#<%= prefix %>_hour').val('');
+      	jQuery('#<%= prefix %>_minute').val('');
+      });
+    });
+  </script>
+<% end %>

data/app/views/naf/shared/_select_per_page.html.erb

@@ -2,11 +2,8 @@
   <script type='text/javascript'>
 
     function initPageSelect() {
-      var pageSelect = jQuery('#page-select-container');
-      var refreshPage = jQuery('#refresh-page-container');
-      jQuery('#datatable_paginate').append(pageSelect).append(refreshPage);
-      pageSelect.show();
-      refreshPage.show();
+      jQuery('#page-select-container').show();
+      jQuery('#refresh-page-container').show();
     }
 
     function getDisplayLength() {
@@ -19,6 +16,7 @@
     // Redraw datatable.
     var redrawDatatable = function() {
       jQuery("#datatable").dataTable().fnDraw(false);
+      checkRunnersAndSchedules();
       if ( jQuery('#auto_refresh').is(':checked') ) {
         timeout_id = setTimeout(redrawDatatable, 10000);
       }
@@ -39,6 +37,7 @@
 
       jQuery('#refresh_datatable').click(function(){
         jQuery('#datatable').dataTable().fnDraw();
+        checkRunnersAndSchedules();
       });
 
       // Set change event to enabled/disable auto-refresh
@@ -52,21 +51,57 @@
       });
     });
 
+    function checkRunnersAndSchedules() {
+      <% if controller_name == 'historical_jobs' %>
+        updateRunnerCount();
+        updateLastCheckedScheduleAt();
+      <% end %>
+    }
+
+    function updateRunnerCount() {
+      jQuery.ajax({
+        url: '/job_system/machine_runners/runner_count',
+        type: 'GET',
+        dataType: 'json',
+        success:function (data) {
+          jQuery('.running-count').text(data['running'] + ' running');
+          jQuery('.winding-down-count').text(data['winding_down'] + ' winding down');
+          jQuery('.down-count').text(data['down'] + ' down');
+        }
+      });
+    }
+
+    function updateLastCheckedScheduleAt() {
+      jQuery.ajax({
+        url: '/job_system/machines/last_checked_schedule_at',
+        type: 'GET',
+        dataType: 'json',
+        success:function (data) {
+          if(data['last_checked_schedule_at'] == null){
+            jQuery('.last_checked_schedule_at').text('');
+          }
+          else{
+            jQuery('.last_checked_schedule_at').text(data['last_checked_schedule_at']);
+          }
+        }
+      });
+    }
+
   </script>
 <% end %>
 
-<div id='refresh-page-container'>
-  <%= link_to "Refresh Table", "#", id: :refresh_datatable %>
-  &nbsp;&nbsp;
-  <%= label_tag :auto_refresh, 'Auto Refresh:' %>
-  <%= check_box_tag :auto_refresh, 1, false, id: :auto_refresh %>
-</div>
-
 <div id="page-select-container" class="ui-state-default ui-corner-all">
   <%= form_tag({ controller: params[:controller], action: params[:action], format: 'js' }, method: :get) do %>
     <%= label_tag :iDisplayLength, "Rows Per Page:", class: "label" %>
     <%= select_tag :iDisplayLength,
-        options_for_select(::Naf.configuration.default_page_options,  @rows_per_page),
+        options_for_select(::Naf.configuration.default_page_options, @rows_per_page),
         class: "page-select datatable_variable ui-state-default ui-corner-all" %>
   <% end %>
 </div>
+
+<div id='refresh-page-container'>
+  <%= link_to "Refresh Table", "#", id: :refresh_datatable %>
+  &nbsp;&nbsp;
+  <%= label_tag :auto_refresh, 'Auto Refresh:' %>
+  <%= check_box_tag :auto_refresh, 1, false, id: :auto_refresh %>
+</div>

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

@@ -0,0 +1,27 @@
+<% content_for :body do %>
+  <div id="record">
+    <h2>Status</h2>
+
+    <table id="naf_table_show">
+      <thead>
+        <tr>
+          <th>Server</th>
+          <th>Status</th>
+          <th>Notes</th>
+        </tr>
+      </thead>
+      <tbody>
+      	<% @machines.each do |machine| -%>
+	        <tr>
+	          <td><%= machine[:server_name] %></td>
+	          <td><%= machine[:status] %></td>
+	          <td><%= machine[:notes] %></td>
+	        </tr>
+        <% end %>
+      </tbody>
+    </table>
+    </br>
+
+  </div>
+<% end %>
+<%= render partial: 'naf/shared/application' %>

data/bin/naf

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "bundle exec naf" from the root of your application.
+
+action, option = ARGV
+if action == 'runner'
+  if option == 'up'
+    puts "Bringing up the runner(s)..."
+    `screen -d -m bash -c 'source /root/.bash_profile && cd /root/current && a=\`uuidgen\` && script/rails runner ::Process::Naf::Runner.run --invocation-uuid $a 2>&1 |
+      script/rails runner ::Process::Naf::RunnerLog.run --invocation-uuid $a'`
+
+  elsif option == 'status'
+    num_runners = Integer(`ps -ef | grep Process::Naf::Runner.run | grep -v grep | grep -v uuidgen | wc -l`.strip)
+    hostname = `hostname`.strip
+    if num_runners == 0
+      puts "down: #{hostname}"
+    elsif num_runners == 1
+      puts "up: #{hostname}"
+    else
+      puts "up/w: #{hostname} (#{num_runners})"
+    end
+
+  elsif option == 'down'
+    puts 'Bringing down runner(s)...'
+    `kill $(ps -ef | grep Process::Naf::Runner.run | grep -v grep | grep -v uuidgen | awk '{ print $2 }') | cat`
+  end
+end

data/config/initializers/naf.rb

@@ -1,3 +1,15 @@
 module Naf
-  DEFAULT_PAGE_OPTIONS = [10, 20, 50, 100, 250, 500, 750, 1000, 1500, 2000]
+	DEFAULT_PAGE_OPTIONS = [10, 20, 50, 100, 250, 500, 750, 1000, 1500, 2000]
+	LOGGING_ARCHIVE_DIRECTORY = "/archive"
+	if ['test', 'development'].include?(Rails.env)
+		LOGGING_ROOT_DIRECTORY = 'var/log'
+	else
+		LOGGING_ROOT_DIRECTORY = '/var/log'
+	end
+
+  NAF_DATABASE_HOSTNAME = Rails.configuration.database_configuration[Rails.env]['host'].present? ?
+    Rails.configuration.database_configuration[Rails.env]['host'] : 'localhost'
+  NAF_DATABASE = Rails.configuration.database_configuration[Rails.env]['database']
+  PREFIX_PATH = "#{LOGGING_ROOT_DIRECTORY}/naf/#{NAF_DATABASE_HOSTNAME}/#{NAF_DATABASE}"
+
 end

data/config/routes.rb

@@ -1,5 +1,5 @@
 Naf::Engine.routes.draw do
-  resources :historical_jobs do
+  resources :historical_jobs, except: [:edit] do
     resources :historical_job_affinity_tabs, except: [:destroy]
   end
 
@@ -11,9 +11,16 @@ Naf::Engine.routes.draw do
 
   resources :machines, except: [:destroy] do
     resources :machine_affinity_slots
+    collection do
+      get :last_checked_schedule_at
+    end
   end
 
-  resources :machine_runners, only: [:index, :show]
+  resources :machine_runners, only: [:index, :show] do
+    collection do
+      get :runner_count
+    end
+  end
   resources :machine_runner_invocations, only: [:index, :show, :update] do
     collection do
       get :wind_down_all
@@ -22,6 +29,13 @@ Naf::Engine.routes.draw do
   resources :logger_styles
   resources :logger_names
   resources :affinities
+  resources :log_parsers, only: [] do
+    collection do
+      get :logs
+    end
+  end
+  resources :status, only: [:index]
+  resources :log_viewer, only: [:index]
 
   resources :janitorial_archive_assignments, controller: "janitorial_assignments",
                                              type: "Naf::JanitorialArchiveAssignment",

data/db/migrate/20131106162436_add_uuid_column_to_machine_runner_invocations.rb

@@ -0,0 +1,15 @@
+class AddUuidColumnToMachineRunnerInvocations < ActiveRecord::Migration
+
+	def up
+    execute <<-SQL
+      ALTER TABLE #{Naf.schema_name}.machine_runner_invocations ADD COLUMN uuid text unique;
+    SQL
+	end
+
+	def down
+    execute <<-SQL
+      ALTER TABLE #{Naf.schema_name}.machine_runner_invocations DROP COLUMN uuid;
+    SQL
+	end
+
+end

data/db/migrate/20131121185222_move_tabs_column_from_historical_jobs_to_running_jobs.rb

@@ -0,0 +1,15 @@
+class MoveTabsColumnFromHistoricalJobsToRunningJobs < ActiveRecord::Migration
+  def up
+    execute <<-SQL
+      ALTER TABLE #{Naf.schema_name}.historical_jobs DROP COLUMN tags;
+      ALTER TABLE #{Naf.schema_name}.running_jobs ADD COLUMN tags text[];
+    SQL
+  end
+
+  def down
+    execute <<-SQL
+      ALTER TABLE #{Naf.schema_name}.historical_jobs ADD COLUMN tags text[];
+      ALTER TABLE #{Naf.schema_name}.running_jobs DROP COLUMN tags;
+    SQL
+  end
+end

data/lib/generators/templates/config/logging/naf.yml

@@ -12,11 +12,3 @@ log4r_config:
         date_pattern: '%y%m%d %H:%M:%S.%L'
         pattern     : '%d pid=%p jid=%g %C %l %M'
         type        : PatternFormatter
-
-    - type: PapertrailOutputter
-      name: papertrail
-      port: 0 # XXX put your papertrail port here
-      program: naf_application
-      formatter:
-        pattern     : 'pid=%p %C %l %M'
-        type        : PatternFormatter

data/lib/generators/templates/config/logging/nafjob.yml

@@ -6,11 +6,3 @@ log4r_config:
         date_pattern: '%y%m%d %H:%M:%S.%L'
         pattern     : '%d pid=%p jid=%g %C %l %M'
         type        : PatternFormatter
-
-    - type: PapertrailOutputter
-      name: papertrail
-      port: 0 # XXX put your papertrail port here
-      program: jid(%g)
-      formatter:
-        pattern     : '%C %l %M'
-        type        : PatternFormatter

data/lib/generators/templates/config/logging/nafrunner.yml

@@ -7,11 +7,3 @@ log4r_config:
         date_pattern: '%y%m%d %H:%M:%S.%L'
         pattern     : '%d runner_pid=%p %C %l %M'
         type        : PatternFormatter
-
-    - type: PapertrailOutputter
-      name: papertrail
-      port: 0 # XXX put your papertrail port here
-      program: runner
-      formatter:
-        pattern     : '%C %l %M'
-        type        : PatternFormatter

data/lib/generators/templates/naf.rb

@@ -1,11 +1,3 @@
 Naf.configure do |config|
-
   config.schema_name = '<%= schema_name %>'
-
-  # Setting up papertrail links
-  # config.papertrail_group_id =
-
-  # Please get it from your profile on Papertrail
-  # config.papertrail_token =
-
 end

data/lib/naf.rb

@@ -29,14 +29,6 @@ module Naf
       configuration.title
     end
 
-    def papertrail_group_id
-      configuration.papertrail_group_id
-    end
-
-    def papertrail_token
-      configuration.papertrail_token
-    end
-
     def layout
       configuration.layout
     end

data/lib/naf/configuration.rb

@@ -4,8 +4,6 @@ module Naf
                   :model_class,
                   :controller_class,
                   :title,
-                  :papertrail_group_id,
-                  :papertrail_token,
                   :layout,
                   :default_page_options
 
@@ -13,8 +11,6 @@ module Naf
       @model_class = "::ActiveRecord::Base"
       @controller_class = "::ApplicationController"
       @title = "Naf - a Rails Job Scheduling Engine"
-      @papertrail_group_id = nil
-      @papertrail_token = nil
       @layout = "naf_layout"
       @default_page_options = [10, 20, 50, 100, 250, 500, 750, 1000, 1500, 2000]
     end

data/lib/naf/version.rb

@@ -1,3 +1,3 @@
 module Naf
-  VERSION = "1.1.4"
+  VERSION = "2.0.0"
 end

data/lib/tasks/naf_tasks.rake

@@ -63,6 +63,24 @@ namespace :naf do
     end
   end
 
+  namespace :logs do
+    desc "Archive logs (moves logs to a different directory)"
+    task archive: :environment do
+      # When installing Naf, check the filesystem for existence of naflogs.
+      # If so, archive the logs before you start using the system.
+      if File.directory?(Naf::LOGGING_ROOT_DIRECTORY + "/naf")
+        # Each archive will have a unique path based on the time archived
+        time = Time.zone.now.to_s
+        FileUtils.mkdir_p(Naf::LOGGING_ROOT_DIRECTORY + Naf::LOGGING_ARCHIVE_DIRECTORY + "/#{time}")
+
+        puts "Moving naf logs into archive directory: #{Naf::LOGGING_ROOT_DIRECTORY + Naf::LOGGING_ARCHIVE_DIRECTORY}/#{time.gsub(' ', '\ ')}"
+        # Move the naf logs into the archive directory
+        system "mv #{Naf::LOGGING_ROOT_DIRECTORY}/naf " +
+          "#{Naf::LOGGING_ROOT_DIRECTORY + Naf::LOGGING_ARCHIVE_DIRECTORY}/#{time.gsub(' ', '\ ')}"
+      end
+    end
+  end
+
   namespace :db do
     desc "Custom migrate task, connects to correct database, migrations found in db/naf/migrate"
     task migrate: :environment do

data/naf.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.name        = "naf"
   s.version     = Naf::VERSION
   s.license     = 'New BSD License'
-  s.date        = '2013-12-18'
+  s.date        = '2013-12-19'
   s.summary     = "Creates infrastructure for a customizable and robust Postgres-backed script scheduling/running"
   s.description = "A cloud based distributed cron, application framework and operations console. Naf works as a distributed script running " +
                   "system that provides scheduling, logging, alarming, machine redundancy, and the ability to set constraint during script execution"
@@ -28,4 +28,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec-rails"
   s.add_development_dependency "factory_girl_rails", "~> 4.0.0"
   s.add_development_dependency 'awesome_print'
+
+  s.executables   = ["naf"]
 end