barbeque 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3707becb45358885573f40c06905837a35c1896
-  data.tar.gz: 9ee199c83b68136aca685ef570eb53dba597c05d
+  metadata.gz: 7811c426dbfc4b9b7514f444e45845ce6f894a67
+  data.tar.gz: 32fb25ca095959abc65c0e751d8edcfd36efee9d
 SHA512:
-  metadata.gz: 1a71ed42d5a4055f093339f7eb3dd3a3b46cc4dbed3e56ce7fbf73b3a9ab883d23680f16e8d2fa13b15140072f229094a87ad990419d2da7a923807b47599d3c
-  data.tar.gz: 6e07242cd9d27bcd55485fae725d9d36c8cc072e801009c52883ecef94ed29a604cdbfa33f1ba610470df7da34858c59d4d8d77424d9de1500aef41b575cb563
+  metadata.gz: ab8d6fb436a2dedbd01be1e094199ffb580bcfe5091bb457dd8260223421ed7afd26d02699b0be7aae18ca998a9283bffa54d53a0f1593074e459d728b65b119
+  data.tar.gz: 8fb3fedcce8573d92bb6019583d229db768c8ed24e6c107874ea2a02f86fb11d2ad29e68d46013b3b379e191c7d861619b6b389917b557dea8481ad8d3a9df8b

data/app/controllers/barbeque/job_executions_controller.rb

@@ -2,6 +2,7 @@ class Barbeque::JobExecutionsController < Barbeque::ApplicationController
   def show
     @job_execution = Barbeque::JobExecution.find(params[:id])
     @log = @job_execution.execution_log
+    @job_retries = @job_execution.job_retries.order(id: :desc)
   end
 
   def retry

data/app/controllers/barbeque/monitors_controller.rb

@@ -0,0 +1,38 @@
+class Barbeque::MonitorsController < Barbeque::ApplicationController
+  def index
+    hour_sql = "date_format(#{Barbeque::JobExecution.table_name}.created_at, '%Y-%m-%d %H:00:00')"
+    now = Time.zone.now
+    from = 6.hours.ago(now.beginning_of_hour)
+    rows = Barbeque::JobExecution.
+      joins(job_definition: :app).
+      where(created_at: from .. now).
+      group("#{hour_sql}, #{Barbeque::JobDefinition.table_name}.id").
+      pluck("#{hour_sql}, #{Barbeque::App.table_name}.id, #{Barbeque::App.table_name}.name, #{Barbeque::JobDefinition.table_name}.id, #{Barbeque::JobDefinition.table_name}.job, count(1)")
+
+    jobs = {}
+    rows.each do |_, app_id, app_name, job_id, job_name, _|
+      job = {
+        app_id: app_id,
+        app_name: app_name,
+        job_id: job_id,
+        job_name: job_name,
+      }
+      jobs[job_id] = job
+    end
+
+    @recently_processed_jobs = {}
+    t = from
+    while t < now
+      @recently_processed_jobs[t] = {}
+      jobs.each do |job_id, job|
+        @recently_processed_jobs[t][job_id] = job.merge(count: 0)
+      end
+      t += 1.hour
+    end
+
+    rows.each do |date_hour, _, _, job_id, _, count|
+      date_hour = Time.zone.parse("#{date_hour} UTC")
+      @recently_processed_jobs[date_hour][job_id] = jobs[job_id].merge(count: count)
+    end
+  end
+end

data/app/views/barbeque/job_definitions/edit.html.haml

@@ -1,3 +1,3 @@
 = render 'form'
 
-= link_to 'Back', job_definitions_path
+= link_to 'Back', job_definition_path(@job_definition)

data/app/views/barbeque/job_executions/show.html.haml

@@ -49,7 +49,7 @@
           Retries
 
       .box-body
-        - if @job_execution.job_retries.present?
+        - if @job_retries.present?
           %table.table.table-bordered
             %thead
               %tr
@@ -59,7 +59,7 @@
                 %th Elapsed Time
                 %th
             %tbody
-              - @job_execution.job_retries.each do |job_retry|
+              - @job_retries.each do |job_retry|
                 %tr
                   %td= job_retry.id
                   %td= status_label(job_retry.status)

data/app/views/barbeque/monitors/index.html.haml

@@ -0,0 +1,50 @@
+.row
+  .col-sm-12
+    .box.box-primary
+      .box-header
+        %h3.box-title.with_padding Recently processed jobs (hourly)
+      .box-body
+        #recently-processed-jobs-chart{data: { jobs: @recently_processed_jobs.to_json }}
+        %table.table
+          %thead
+            %tr
+              %th Hour
+              %th Application
+              %th Job
+              %th Count
+          %tbody
+            - @recently_processed_jobs.keys.sort { |x, y| y <=> x }.each do |date_hour|
+              - jobs = @recently_processed_jobs[date_hour]
+              - jobs.keys.sort.each do |job_id|
+                - job = jobs[job_id]
+                %tr
+                  %td= date_hour
+                  %td= link_to(job[:app_name], app_path(job[:app_id]))
+                  %td= link_to(job[:job_name], job_definition_path(job[:job_id]))
+                  %td= job[:count]
+
+:coffee
+  chartDiv = document.getElementById('recently-processed-jobs-chart')
+  recentlyProcesedJobs = JSON.parse(chartDiv.dataset.jobs)
+
+  countsPerJob = {}
+  for own dateHour, jobs of recentlyProcesedJobs
+    for own jobId, job of jobs
+      name = job.app_name + ' - ' + job.job_name
+      countsPerJob[name] ||= []
+      countsPerJob[name][dateHour] ||= job.count
+
+  plotlyArgs = []
+  for own name, series of countsPerJob
+    x = []
+    y = []
+    for own dateHour, count of series
+      x.push(dateHour)
+      y.push(count)
+    plotlyArgs.push({
+      type: 'scatter',
+      name: name,
+      x: x,
+      y: y,
+    })
+  Plotly.plot(chartDiv, plotlyArgs)

data/app/views/layouts/barbeque/_sidebar.html.haml

@@ -2,15 +2,19 @@
   %section.sidebar
     %ul.sidebar-menu
       %li.header Menu
-      %li{ class: ('active' if controller_path == 'apps') }
+      %li{ class: ('active' if controller_path == 'barbeque/apps') }
         = link_to root_path do
           %i.fa.fa-users
           %span Applications
-      %li{ class: ('active' if controller_path == 'job_definitions') }
+      %li{ class: ('active' if controller_path == 'barbeque/job_definitions') }
         = link_to job_definitions_path do
           %i.fa.fa-tasks
           %span Job Definitions
-      %li{ class: ('active' if controller_path == 'job_queues') }
+      %li{ class: ('active' if controller_path == 'barbeque/job_queues') }
         = link_to job_queues_path do
           %i.fa.fa-cubes
           %span Queues
+      %li{ class: ('active' if controller_path == 'barbeque/monitors') }
+        = link_to monitors_path do
+          %i.fa.fa-tachometer
+          %span Monitors

data/app/views/layouts/barbeque/monitors.html.haml

@@ -0,0 +1,6 @@
+- content_for(:header) do
+  %h1
+    .fa.fa-tachometer
+    Monitors
+
+= render template: 'layouts/barbeque/application'

data/config/routes.rb

@@ -16,6 +16,8 @@ Barbeque::Engine.routes.draw do
 
   resources :job_queues
 
+  resources :monitors, only: %i[index]
+
   scope :v1, module: 'api', as: :v1 do
     resources :apps, only: [], param: :name, constraints: { name: /[\w-]+/ } do
       resource :revision_lock, only: [:create, :destroy]

data/lib/barbeque/version.rb

@@ -1,3 +1,3 @@
 module Barbeque
-  VERSION = '0.2.4'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barbeque
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-05 00:00:00.000000000 Z
+date: 2017-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adminlte2-rails
@@ -288,6 +288,7 @@ files:
 - app/controllers/barbeque/job_executions_controller.rb
 - app/controllers/barbeque/job_queues_controller.rb
 - app/controllers/barbeque/job_retries_controller.rb
+- app/controllers/barbeque/monitors_controller.rb
 - app/helpers/barbeque/application_helper.rb
 - app/helpers/barbeque/job_definitions_helper.rb
 - app/helpers/barbeque/job_executions_helper.rb
@@ -325,6 +326,7 @@ files:
 - app/views/barbeque/job_queues/new.html.haml
 - app/views/barbeque/job_queues/show.html.haml
 - app/views/barbeque/job_retries/show.html.haml
+- app/views/barbeque/monitors/index.html.haml
 - app/views/layouts/barbeque/_header.html.haml
 - app/views/layouts/barbeque/_sidebar.html.haml
 - app/views/layouts/barbeque/application.html.haml
@@ -332,6 +334,7 @@ files:
 - app/views/layouts/barbeque/job_definitions.html.haml
 - app/views/layouts/barbeque/job_executions.html.haml
 - app/views/layouts/barbeque/job_queues.html.haml
+- app/views/layouts/barbeque/monitors.html.haml
 - config/initializers/garage.rb
 - config/routes.rb
 - db/migrate/20160217020910_create_job_queues.rb