naf 2.1.12 → 2.1.13

data/Gemfile

@@ -7,12 +7,13 @@ group :assets do
   gem 'coffee-rails', '~> 3.2.1'
   gem 'uglifier', '>= 1.0.3'
 end
+
 gem 'jquery-ui-rails'
-gem 'awesome_print'
 gem 'will_paginate'
 gem 'facter', '1.7.5'
 gem 'shoulda-matchers', '2.0.0'
 gem 'timecop', '0.4.5'
-gem 'yajl-ruby'
-gem 'aws-sdk'
+gem 'yajl-ruby', '>= 1.1.0'
+gem 'aws-sdk', '>= 1.1.0'
 gem 'fiksu-af'
+gem 'dogstatsd-ruby', '>= 1.2.0' 

data/RELEASE_NOTES.rdoc

@@ -1,5 +1,18 @@
 = Release Notes
 
+=== Version 2.1.13
+Bug fixes:
+* Large run interval for application schedule causes argument out of range error
+
+Features/Changes:
+* Cleanup script to remove data from the Naf schema
+* aws-sdk and yajl-ruby gems added in naf.gemspec
+* Html escape characters in log display instead of log files
+* Scripts tab renamed to Applications
+* Ability to download job logs
+* Ability to re-enqueue finished/errored/terminated job
+* Send Datadog metrics on runners
+
 === Version 2.1.12
 Bug fixes:
 * Logical::Naf::ConstructionZone#enqueue_application missing application_schedule parameter
@@ -10,7 +23,7 @@ Bug fixes:
 * Adding application schedule prerequisites works correctly
 * Log display outputs custom message when record id is not present
 
-Changes:
+Features/Changes:
 * Only show affinities associated with machines that are not deleted
 * Runner will cleanup other runners after they are dead
 * Machine manager updates machines row if server address or server name match
@@ -23,7 +36,7 @@ Bug fixes:
 * Custom validation for machine marked as enabled and deleted
 * UI links behave correctly if the engine's mount path is different than '/job_system'
 
-Changes:
+Features/Changes:
 * Improved memory management
 * Removed machine log display
 
@@ -46,7 +59,7 @@ Bug fixes:
 * Deleted application still runs if it has an enabled schedule
 * LogArchiver did not delete empty folders
 
-Changes:
+Features/Changes:
 * Created a log archival queuer script
 * Created Api Authenticator for logs
 
@@ -56,7 +69,7 @@ Bug fixes:
 * Pagination of application schedules on the index page was not properly working.
 * When mouse hovered over the application schedule on the applicaiton show page, it did not show a detailed information about the schedule.
 
-Changes:
+Features/Changes:
 * Included application name when editing an application schedule
 
 === Version 2.1.5

data/app/assets/javascripts/dataTablesTemplates/jobs.js

@@ -75,6 +75,43 @@ jQuery(document).ready(function() {
       }
     });
   });
+
+  jQuery(document).delegate('.re-enqueue', "click", function(){
+    var url = jQuery(this).attr('content');
+    var new_params = { data: jQuery(this).attr('data') };
+    new_params['job_id'] = jQuery(this).attr('id');
+
+    if (jQuery(this).attr('app_id')) {
+      new_params['app_id'] = jQuery(this).attr('app_id');
+    }
+    
+    if (jQuery(this).attr('link')) {
+      new_params['link'] = jQuery(this).attr('link');
+    }
+    
+    if (jQuery(this).attr('title_name')) {
+      new_params['title_name'] = jQuery(this).attr('title_name');
+    }
+    
+    var answer = confirm("Would you like to enqueue this job?");
+    
+    if (!answer) {
+      return false;
+    }
+    jQuery.post(url, new_params, function (data) {
+      if (data.success) {
+        jQuery("<p id='notice'>Congratulations, a Job " + data.title + " was added!</p>").
+        appendTo('#flash_message').slideDown().delay(5000).slideUp();
+        setTimeout('window.location.reload()', 5600);
+      }
+      else {
+        jQuery("<div class='error'>Sorry, \'" +  data.title +
+          "\' cannot add a Job to the queue right now!</div>").
+          appendTo('#flash_message').slideDown().delay(5000).slideUp();
+        jQuery('#datatable').dataTable().fnDraw();
+      }
+    });
+  });
 });
 
 function addLinkToJob(nRow, aData) {

data/app/controllers/naf/historical_jobs_controller.rb

@@ -44,6 +44,36 @@ module Naf
       @historical_job = Naf::HistoricalJob.new
     end
 
+    # If there is an application id specified, then the controller enqueues that application
+    def reenqueue
+      job = Naf::HistoricalJob.find(params[:job_id].to_i)
+      success = false
+      if params[:app_id].present?
+        app = Naf::Application.find(params[:app_id].to_i)
+        title = app.title
+        @historical_job = ::Logical::Naf::ConstructionZone::Boss.new.enqueue_application(
+          app,
+          job.application_run_group_restriction,
+          job.application_run_group_name,
+          job.application_run_group_limit,
+          job.priority,
+          job.job_affinities,
+          job.prerequisites,
+          false,
+          job.application_schedule)
+        if @historical_job.present?
+          success = true
+        end
+      else
+        title = job.command
+        @historical_job = ::Logical::Naf::ConstructionZone::Boss.new.reenqueue(job)
+        if @historical_job.present?
+          success = true
+        end
+      end
+      render json: { success: success, title: title }.to_json
+    end
+
     def create
       @historical_job = Naf::HistoricalJob.new(params[:historical_job])
       if params[:historical_job][:application_id] &&

data/app/controllers/naf/log_parsers_controller.rb

@@ -24,5 +24,14 @@ module Naf
       end
     end
 
+    def download
+      job_log_downloader = Logical::Naf::LogParser::JobDownloader.new({ 
+        'record_id' => params[:record_id]
+      })
+      logs = job_log_downloader.logs_for_download + "\n"
+      send_data logs, filename: "job_#{params[:record_id]}_log.txt",
+        type: "text/plain", disposition: 'attachment'
+    end
+
   end
 end

data/app/helpers/naf/application_helper.rb

@@ -168,7 +168,7 @@ module Naf
         when "runners"
           link_to "Runners", naf.machine_runners_path
         when "scripts"
-          link_to "Scripts", naf.applications_path
+          link_to "Applications", naf.applications_path
         when "janitorial_assignments"
           link_to "Janitorial Assignments", naf.janitorial_archive_assignments_path
         when "janitorial_archive_assignments"

data/app/models/logical/naf/application_schedule.rb

@@ -128,7 +128,7 @@ module Logical
         output = ''
         time = schedule.run_interval
         if schedule.run_interval_style.name == 'at beginning of day'
-          output = exact_time_of_day(time)
+          output = exact_time_of_day
         else
           output = interval_time(time)
         end
@@ -136,11 +136,15 @@ module Logical
         output
       end
 
-      def exact_time_of_day(time)
+      def exact_time_of_day
         output = ''
         minutes = schedule.run_interval % 60
         hours =   schedule.run_interval / 60
-        output << hours.to_s + ':'
+        if hours >= 24
+          output << (hours % 24).to_s + ':'
+        else
+          output << hours.to_s + ':'
+        end
         output << '%02d' % minutes
         output = Time.parse(output).strftime('%I:%M %p')
 

data/app/models/logical/naf/log_parser/base.rb

@@ -95,6 +95,7 @@ module Logical::Naf
             if self.class.to_s == 'Logical::Naf::LogParser::Runner'
               log['id'] = get_invocation_id(file.scan(UUID_REGEX).first)
             end
+            log['message'] = CGI::escapeHTML(log['message'])
             filter_log_messages(log)
           end
 

data/app/models/logical/naf/log_parser/job.rb

@@ -1,5 +1,3 @@
-require 'yajl'
-
 module Logical::Naf
   module LogParser
     class Job < Base
@@ -15,7 +13,10 @@ module Logical::Naf
       private
 
       def insert_log_line(elem)
-        "&nbsp;&nbsp;<span>#{elem['line_number']} #{elem['output_time']}: #{elem['message']}</br></span>"
+        output_line = "<span><pre style='display: inline; word-wrap: break-word;'>"
+        output_line += "#{elem['line_number']} #{elem['output_time']}: #{elem['message']}"
+        output_line += "</pre></br></span>"
+        output_line
       end
 
       def sort_jsons

data/app/models/logical/naf/log_parser/job_downloader.rb

@@ -0,0 +1,156 @@
+module Logical::Naf
+  module LogParser
+    class JobDownloader < Base
+
+      ############################################################################
+      # Description
+      # -----------
+      # Logical model to return the contents of all log files
+      #   associated with a specific job ID.
+      #
+      # Interface
+      # ---------
+      # initialize: Pass intitialize a hash of only one parameter ('record_id')
+      #     Initializes the JobDownloader by linking it to a record_id
+      #
+      # logs_for_download: Takes no arguments
+      #     Returns a string containing all parsed log messages (plain text)
+      #     from all local and S3 files associated with the JobDownloader's
+      #     record_id.
+      #
+      ############################################################################
+
+      # Description: Initializes instance variables for the class
+      # params: Params must include 'record_id' key/value
+      # Note: Only uses record_id from params 
+      def initialize(params)
+        @jsons = []
+        @record_id = params['record_id']
+        @read_from_s3 = true;
+      end
+
+      # Description: Public method used to return a string of all logs
+      #     The string contains all parsed json elements from all
+      #     accessible files (local and s3) for @record_id
+      # Returns: String (of logs)
+      def logs_for_download
+        retrieve_logs_for_download
+      end
+
+      ###################################################
+      private
+      ###################################################
+
+      # Description: Returns a string containing all parsed json elements form all
+      #     accessible files (local and s3) for @record_id
+      # Returns: String (of logs)
+      def retrieve_logs_for_download
+        parse_files_for_download
+
+        output = ''
+        jsons.reverse_each do |elem|
+          output.insert(0, insert_log_line_for_download(elem))
+        end
+
+        output
+      end
+
+      # Description: Formats a single log line
+      # elem: Takes in a hash of a single log entry,
+      #     (originating from Yajl::Parser parsing json)
+      # Returns: String (single log line, formatted as plain text, without any added html)
+      def insert_log_line_for_download(elem)
+        if elem['message'].include? "AWS S3 Access Denied. Please check your permissions"
+          # If it cannot access AWS S3, the JobDownlaoder will still return all the logs stored locally.
+          output_line = ""
+        else
+          output_line = "#{elem['line_number']} #{elem['output_time']}: #{elem['message']}\n"
+        end
+
+        return output_line
+      end
+
+      # Acts on instance variable @jsons (sorts them)
+      def sort_jsons
+        # Sort log lines based on timestamp
+        @jsons = jsons.sort { |x, y| x['line_number'] <=> y['line_number'] }
+      end
+
+      # Calls the Logical::Naf::LogReader retrieve_job_files method for record_id
+      # Returns: Array of file names on S3 corresponding to record_id
+      def retrieve_log_files_from_s3
+        s3_log_reader.retrieve_job_files(record_id)
+      end
+
+      # Description: Finds file names (across local and S3) associated with record_id
+      # Returns: Hash (file_name => is_on_s3_bool)
+      def get_files_for_download
+        files_to_download = {}
+        s3_files = []
+       
+        # S3
+        get_s3_files do
+          @s3_log_reader = ::Logical::Naf::LogReader.new
+          s3_files = retrieve_log_files_from_s3
+        end
+
+        # Add S3 files to the hash, mapping them to true (need to read from s3)
+        s3_files.each do |file_to_add|
+          files_to_download[file_to_add] = true
+        end
+
+        return files_to_download unless record_id.present?
+
+        # Non-S3
+        if File.directory?("#{::Naf::PREFIX_PATH}/#{::Naf.schema_name}/jobs/#{record_id}")
+          files = Dir["#{::Naf::PREFIX_PATH}/#{::Naf.schema_name}/jobs/#{record_id}/*"]
+        else
+          return files_to_download
+        end
+
+        if files.present?
+          # Sort log files based on time and add them the hash (mapped to false)
+          files.sort { |x, y| Time.parse(y.scan(DATE_REGEX)[0][0]) <=> Time.parse(x.scan(DATE_REGEX)[0][0]) }.each do |file_to_add|
+            files_to_download[file_to_add] = false
+          end
+        end
+
+        return files_to_download
+      end
+
+      # Either read local file or retrieve contents from s3 as needed
+      # Returns contents of file
+      def get_json_from_log_file_for_download(file)
+        if @read_from_s3 == true
+          if s3_log_reader.present?
+            s3_log_reader.retrieve_file(file)
+          end
+        else
+          File.new(file, 'r')
+        end
+      end
+
+      # Retrieves file_names and iterates through them, using yajl to parse the json
+      # Adds all jsons to the instance variable @jsons
+      def parse_files_for_download
+        files = get_files_for_download # now a hash
+
+        unless files.present?
+          return ""
+        else
+          files.each_pair do |file, s3_needed|
+            # Use Yajl JSON library to parse the log files, as they contain multiple JSON blocks
+            parser = Yajl::Parser.new
+            @read_from_s3 = s3_needed
+            json = get_json_from_log_file_for_download(file)
+            parser.parse(json) do |log|
+              @jsons << log
+            end
+            sort_jsons
+          end
+        end
+      end
+
+    end
+  end
+end

data/app/models/logical/naf/log_parser/runner.rb

@@ -1,5 +1,3 @@
-require 'yajl'
-
 module Logical::Naf
   module LogParser
     class Runner < Base
@@ -18,7 +16,10 @@ module Logical::Naf
       private
 
       def insert_log_line(elem)
-        "&nbsp;&nbsp;<span>#{elem['output_time']} #{invocation_link(elem['id'])}: #{elem['message']}</br></span>"
+        output_line = "<span><pre style='display: inline; word-wrap: break-word;'>"
+        output_line += CGI::unescapeHTML("#{elem['output_time']} #{invocation_link(elem['id'])}:")
+        output_line += " #{elem['message']}</pre></br></span>"
+        output_line
       end
 
       def invocation_link(id)

data/app/models/logical/naf/metric_sender.rb

@@ -0,0 +1,62 @@
+require 'statsd'
+
+module Logical
+  module Naf
+    class MetricSender
+
+      attr_reader :statsd,
+                  :machine,
+                  :metric_send_delay
+
+      attr_accessor :last_sent_metrics
+
+      def initialize(metric_send_delay, machine)
+        @metric_send_delay = metric_send_delay
+        @statsd = Statsd.new
+        @last_sent_metrics = nil
+        @machine = machine
+      end
+
+      # Instance methods
+
+      def send_metrics
+        if last_sent_metrics.nil? || (Time.zone.now - last_sent_metrics) > metric_send_delay.seconds
+          running_job_count = ::Naf::HistoricalJob.where(
+                  "(started_at IS NOT NULL AND finished_at IS NULL AND " +
+                  "started_on_machine_id = ?)",
+                  machine.id).count +
+                  ::Naf::HistoricalJob.where(
+                  "(started_at IS NOT NULL AND finished_at > ? AND " +
+                  "started_on_machine_id = ?)",
+                  Time.zone.now - metric_send_delay.seconds, machine.id).count
+          terminating_job_count = ::Naf::HistoricalJob.where(
+                  "(finished_at IS NULL AND request_to_terminate = true AND " +
+                  "started_on_machine_id = ?)",
+                  machine.id).count
+          long_terminating_job_count = ::Naf::HistoricalJob.where(
+                  "(finished_at IS NULL AND request_to_terminate = true AND " +
+                  "updated_at < ? AND started_on_machine_id = ?)",
+                  Time.zone.now - 30.minutes, machine.id).count
+          recent_errored_job_count = ::Naf::HistoricalJob.where(
+                  "(finished_at IS NOT NULL AND exit_status > 0 AND " +
+                  "finished_at > ? AND request_to_terminate = false " +
+                  "AND started_on_machine_id = ?)",
+                  Time.zone.now - metric_send_delay.seconds, machine.id).count
+
+          statsd.gauge("naf.runner.alive",
+              1, tags: ::Naf.configuration.metric_tags)
+          statsd.gauge("naf.jobs.running",
+              running_job_count, tags: ::Naf.configuration.metric_tags)
+          statsd.gauge("naf.jobs.terminating",
+              terminating_job_count, tags: ::Naf.configuration.metric_tags)
+          statsd.gauge("naf.jobs.terminating-long",
+              long_terminating_job_count, tags: ::Naf.configuration.metric_tags)
+          statsd.gauge("naf.jobs.recent-errored",
+              recent_errored_job_count, tags: ::Naf.configuration.metric_tags)
+          last_sent_metrics = Time.zone.now
+        end
+      end
+      
+    end
+  end
+end