oxidized-web 0.5.2 → 0.6.0

data/lib/oxidized/web/views/stats.haml

@@ -1,23 +1,102 @@
-%html
-  !=haml :head
-  %body
-    %h1 no success in a day
-    %table{:id=>'statsTable', :class=>'center tablesorter'}
+.row.tbl-header
+  .col-xs-12
+    %h4
+      %a{href: url_for('/nodes')} nodes
+      \/ stats
+
+.row
+  .pull-right
+    %button.ColVis_Button{type: 'button', onclick: 'history.go();'}
+      %span.glyphicon.glyphicon-repeat Refresh
+
+  .table-responsive
+    %table.table.table-condensed.table-striped.table-hover#statsTable
+      %caption
+        %span Node Statistics
+
       %thead
         %tr
           %th Name
-          %th Last success
+          %th Total Runs
+          %th Total Failures
+          %th Failure Rate
+          %th Average Run Time
+          %th Last Status
+          %th Last Update
+          %th Last Failure
+
       %tbody
-        -@data.select do |node,stats|
-          - not stats[:success] or (stats[:success].last[:end] < Time.now.utc-60*60*24)
-        - end.map do |node,stats|
-          - last = stats[:success]
-          - last = last.last[:end] if last
-          - last ||= 'never'
-          %tr
+        - @data.map do |node, stats|
+          - status = 'no_connection'
+          - successes = 0
+          - failures = 0
+          - avg_success_time = 0
+          - avg_failure_time = 0
+          - avg_time = 0
+          - row_class = ''
+
+          - if stats[:success]
+            - last_success = stats[:success].last[:end]
+            - successes = stats[:success].length
+            - avg_success_time = stats[:success].collect {|x| x[:time]}
+            - avg_success_time = avg_success_time.inject {|sum, x| sum + x}
+            - avg_success_time /= successes
+
+          - if stats[:no_connection]
+            - last_failure = stats[:no_connection].last[:end]
+            - failures = stats[:no_connection].length
+            - avg_failure_time = stats[:no_connection].collect {|x| x[:time]}
+            - avg_failure_time = avg_failure_time.inject {|sum, x| sum + x}
+            - avg_failure_time /= failures
+
+          - if avg_success_time > 0 && avg_failure_time > 0
+            - avg_time = (avg_success_time + avg_failure_time) / 2
+          - elsif avg_success_time > 0
+            - avg_time = avg_success_time
+          - elsif avg_failure_time > 0
+            - avg_time = avg_failure_time
+          - avg_time = "#{'%.2f' % avg_time}" unless avg_time == 'Unknown'
+
+          - if last_success && last_failure
+            - status = last_success > last_failure ? 'success' : 'no_connection'
+          - elsif last_success
+            - status = 'success'
+            - last_failure = 'never'
+          - else
+            - last_success = 'never'
+
+          - total_runs = successes + failures
+          - failure_rate = (failures / total_runs.to_f) * 100
+          - row_class = 'warning' if failure_rate >= 50
+          - row_class = 'danger' if failure_rate >= 75
+
+          %tr{class: row_class}
             %td= node
-            %td= last
-    :javascript
-      $(function(){
-        $("#statsTable").tablesorter();
-      });
+            %td= total_runs
+            %td= failures
+            %td #{'%.2f' % failure_rate}%
+            %td #{'%.2f' % avg_time}s
+            %td
+              %div{title: status, class: status}
+            %td.time= last_success
+            %td.time= last_failure
+
+:javascript
+  $(function() {
+    $('#statsTable').dataTable({
+      dom: 'C<"clear">lfrtip',
+      "lengthMenu": [[50, 250, 500, -1], [50, 250, 500, "All"]],
+      columnDefs: [{
+        visible: false,
+        targets: 1
+      }, {
+        type: "string",
+        targets: 3
+      }],
+      colVis: {
+        exclude: [0, 5]
+      }
+    });
+  });
+
+

data/lib/oxidized/web/views/version.haml

@@ -1,19 +1,22 @@
-!=haml :head
-%body
-  %h4
-    - if @info[:group] != ''
-      %a{:href=>url_for("/node/version?node_full=#{@info[:group] + '/' + @info[:node]}")} versions
-    - else    
-      %a{:href=>url_for("/node/version?node_full=#{@info[:node]}")} versions
-    \/ version #{@info[:num]}  for Node 
-    %span{:class=>'node_title'} #{@info[:node]}
-    
-  - date_version = Time.parse @info[:date]
-  Date of version: #{date_version.strftime("%d-%m-%y at %r")}
-  %br
-  %br
-  %div{:class=>'diffs'}
-    - @data.each_line do |line|
-      %div #{line}
+.row
+  .col-sm-12
+    %h4
+      - if @info[:group] != ''
+        - params = "node_full=#{@info[:group] + '/' + @info[:node]}"
+      - else
+        - params = "node_full=#{@info[:node]}"
+      %a{href: url_for("/node/version?#{params}")} versions
+      \/ version #{@info[:num]} for Node
+      %span.node_title #{@info[:node]}
+.row
+  .col-sm-12
+    - date_version = Time.parse @info[:date]
+    Date of version:
+    %span.time #{date_version.strftime('%Y-%m-%d %H:%M:%S %Z')}
+
+.row
+  .col-sm-12
+    .diffs
+      - @data.each_line do |line|
+        %div> #{line}
 
-  

data/lib/oxidized/web/views/versions.haml

@@ -1,60 +1,51 @@
-%script{:src=>url_for('/scripts/jquery-2.1.1.min.js')}
-%script{:src=>url_for('/scripts/jquery.dataTables.min.js')}
-%script{:src=>url_for('/scripts/dataTables.bootstrap.js')}
-%script{:src=>url_for('/scripts/dataTables.colVis.js')}
-%link{:rel=>'stylesheet', :href=>url_for('/css/dataTables.bootstrap.css')}
-%link{:rel=>'stylesheet', :href=>url_for('/css/dataTables.colVis.css')}
+.row.tbl-header
+  .col-xs-12
+    %h4
+      %a{href: url_for('/nodes')} nodes
+      \/ Versions for Node 
+      %span.node_title #{@node}
+
+.row
+  .pull-right
+    %form
+      %button.ColVis_Button{type: 'button', onclick: 'history.go();'}
+        %span.glyphicon.glyphicon-repeat Refresh
+  .table-responsive
+    %table.table.table-condensed.table-striped.table-hover#versionsTable
+      %thead
+        %tr
+          %th Version
+          %th Dates
+          %th Author
+          %th Message
+          %th Actions
+
+      %tbody
+        - nb = @data.count + 1
+        - @data.each do |x|
+          %tr
+            %td #{nb -= 1}
+            %td #{time_from_now x[:date]}
+            %td #{x[:author][:name]}
+            %td #{x[:message]}
+            %td
+              - params = "node=#{@node}&group=#{@group}&oid=#{x[:oid]}"
+              - params = "#{params}&date=#{x[:date]}&num=#{nb}"
+              %a{title: 'configuration',
+                 href: url_for("/node/version/view?#{params}")}
+                %span.glyphicon.glyphicon-cloud-download
+                
+              %a{title: 'diff', href: url_for("/node/version/diffs?#{params}")}
+                %img{src: url_for('/images/diff_15x17.png')}
+
 :javascript
   $(function() {
     $('#versionsTable').dataTable({
       dom: 'C<"clear">lfrtip',
-      "order": [[ 0, "desc" ]],
-      columnDefs: [
-            { visible: false, targets: [2, 3] }
-        }
+      "order": [[0, "desc"]],
+      columnDefs: [{
+        visible: false,
+        targets: [2, 3]
+      }]
     });
   });
-%div{:class=>'row tbl-header'}
-  %div{:class=>'col-xs-12 '}
-    %h4
-      %a{:href=>url_for('/nodes')} nodes
-      \/ Versions for Node 
-      %span{:class=>'node_title'} #{@node}
-  
-%div{:class=>'row'}
-  %div{:class=>'refresh-div'}
-    %form
-      %button{:class => "ColVis_Button", :type => "button", :onclick => "history.go();"}
-        %span{:class=>"glyphicon glyphicon-repeat"}
-        Refresh
-  %table{:id=>'versionsTable', :class=>'table table-responsive tablesorter'}
-    %thead
-      %tr
-        %th Version
-        %th Dates
-        %th Author
-        %th Message
-        %th Actions
-
-    %tbody
-      -trclass = %w(even odd)
-      - nb = @data.count + 1
-      - @data.each do |x|
-        %tr
-          %td
-            #{nb -= 1}
-          %td
-            #{time_from_now x[:date]}
-          %td
-            #{x[:author][:name]}
-          %td
-            #{x[:message]}
-          %td
-            %a{:title => "configuration", :href => url_for("/node/version/view?node=#{@node}&group=#{@group}&oid=#{x[:oid]}&date=#{x[:date]}&num=#{nb}") }
-              %span{:class=>'glyphicon glyphicon-cloud-download'} 
-            &nbsp;&nbsp;
-            %a{:title => "diff", :href => url_for("/node/version/diffs?node=#{@node}&group=#{@group}&oid=#{x[:oid]}&date=#{x[:date]}&num=#{nb}") }
-              %img{:src=>url_for('/images/diff_15x17.png')}
-          
-
-    

data/lib/oxidized/web/webapp.rb

@@ -9,7 +9,7 @@ module Oxidized
   module API
     class WebApp < Sinatra::Base
       helpers Sinatra::UrlForHelper
-      set :public_folder, Proc.new { File.join(root, "public") }
+      set :public_folder, Proc.new { File.join(root, 'public') }
 
       get '/' do
         redirect url_for('/nodes')
@@ -46,14 +46,14 @@ module Oxidized
       end
 
       post '/nodes/conf_search' do
-        @to_research = params[:search_in_conf_textbox]
+        @to_research = Regexp.new params[:search_in_conf_textbox]
         nodes_list = nodes.list.map
         @nodes_match = []
         nodes_list.each do |n|
           node, @json = route_parse n[:name]
           config = nodes.fetch node, n[:group]
-          if config.include? @to_research
-            @nodes_match.push({:node => n[:name], :full_name => n[:full_name]})
+          if config[@to_research]
+            @nodes_match.push({ node: n[:name], full_name: n[:full_name] })
           end
         end
         out :conf_search
@@ -116,12 +116,12 @@ module Oxidized
         out :node
       end
 
-      #redirect to the web page for rancid - oxidized migration
+      # redirect to the web page for rancid - oxidized migration
       get '/migration' do
         out :migration
       end
 
-      #get the files send
+      # get the files send
       post '/migration' do
         number = params[:number].to_i
         cloginrc_file = params['cloginrc'][:tempfile]
@@ -131,27 +131,26 @@ module Oxidized
 
         i = 1
         while i <= number do
-          router_db_files.push({:file=>(params["file"+i.to_s][:tempfile]), :group=>params["group"+i.to_s]})
-          i = i+1
+          router_db_files.push({ file: params["file#{i}"][:tempfile], group: params["group#{i}"] })
+          i = i + 1
         end
 
         migration = Mig.new(router_db_files, cloginrc_file, path_new_file)
         migration.go_rancid_migration
-        redirect url_for("//nodes")
-
+        redirect url_for('//nodes')
       end
 
       get '/css/*.css' do
         sass "sass/#{params[:splat].first}".to_sym
       end
 
-      #show the lists of versions for a node
+      # show the lists of versions for a node
       get '/node/version.?:format?' do
         @data = nil
         @group = nil
         @node = nil
         node_full = params[:node_full]
-        if node_full.include? "/"
+        if node_full.include? '/'
           node_full = node_full.split('/')
           @group = node_full[0]
           @node = node_full[1]
@@ -163,19 +162,26 @@ module Oxidized
         out :versions
       end
 
-      #show the blob of a version
+      # show the blob of a version
       get '/node/version/view.?:format?' do
         node, @json = route_parse :node
-        @info = {:node => node, :group => params[:group],:oid => params[:oid],:date => params[:date],:num => params[:num]}
+        @info = {
+          node: node,
+          group: params[:group],
+          oid: params[:oid],
+          date: params[:date],
+          num: params[:num]
+        }
+
         @data = nodes.get_version node, @info[:group], @info[:oid]
         out :version
       end
 
-      #show diffs between 2 version
+      # show diffs between 2 version
       get '/node/version/diffs' do
         node, @json = route_parse :node
         @data = nil
-        @info = {:node => node, :group => params[:group],:oid => params[:oid],:date => params[:date],:num => params[:num], :num2 => (params[:num].to_i - 1)}
+        @info = {node: node, group: params[:group], oid: params[:oid], date: params[:date], num: params[:num], num2: (params[:num].to_i - 1)}
         group = nil
         if @info[:group] != ''
           group = @info[:group]
@@ -197,25 +203,25 @@ module Oxidized
         else
           @data = nodes.get_diff node, @info[:group], @info[:oid], nil
         end
-        @stat = ["null","null"]
+        @stat = ['null', 'null']
         if @data != 'no diffs' && @data != nil
           @stat = @data[:stat]
           @data = @data[:patch]
         else
-          @data = "no available"
+          @data = 'no available'
         end
         @diff = diff_view @data
         out :diffs
       end
 
-      #used for diff between 2 distant commit
+      # used for diff between 2 distant commit
       post '/node/version/diffs' do
         redirect url_for("/node/version/diffs?node=#{params[:node]}&group=#{params[:group]}&oid=#{params[:oid]}&date=#{params[:date]}&num=#{params[:num]}&oid2=#{params[:oid2]}")
       end
 
       private
 
-      def out template=:default
+      def out template = :default
         if @json or params[:format] == 'json'
           if @data.is_a?(String)
             json @data.lines
@@ -226,7 +232,7 @@ module Oxidized
           content_type :text
           @data
         else
-          haml template, :layout => true
+          haml template, layout: true
         end
       end
 
@@ -248,12 +254,12 @@ module Oxidized
         [e.join('.'), json]
       end
 
-      #give the time enlapsed between now and a date
+      # give the time enlapsed between now and a date
       def time_from_now date
         if date
-          #if the + is missing
-          unless date.include? "+"
-            date.insert(21, "+")
+          # if the + is missing
+          unless date.include? '+'
+            date.insert(21, '+')
           end
           date = DateTime.parse date
           now = DateTime.now
@@ -262,7 +268,7 @@ module Oxidized
           hh, mm = mm.divmod(60)
           dd, hh = hh.divmod(24)
           if dd > 0
-           date = "#{dd} days #{hh} hours ago"
+            date = "#{dd} days #{hh} hours ago"
           elsif hh > 0
             date = "#{hh} hours #{mm} min ago"
           else
@@ -272,7 +278,7 @@ module Oxidized
         date
       end
 
-      #method the give diffs in separate view (the old and the new) as in github
+      # method the give diffs in separate view (the old and the new) as in github
       def diff_view diff
         old_diff = []
         new_diff = []
@@ -295,20 +301,20 @@ module Oxidized
             break
           end
           if (/^\-.*/.match(old_diff[i])) && !(/^\+.*/.match(new_diff[i]))
-            #tag removed latter to add color syntax
+            # tag removed latter to add color syntax
             insert = 'empty_line'
-            #ugly way to avoid asymmetry if at display the line takes 2 line on the screen
+            # ugly way to avoid asymmetry if at display the line takes 2 line on the screen
             insert = "&nbsp;\n"
-            new_diff.insert(i,insert)
+            new_diff.insert(i, insert)
             length_n += 1
           elsif !(/^\-.*/.match(old_diff[i])) && (/^\+.*/.match(new_diff[i]))
             insert = 'empty_line'
             insert = "&nbsp;\n"
-            old_diff.insert(i,insert)
+            old_diff.insert(i, insert)
             length_o += 1
           end
         end
-        {:old_diff => old_diff, :new_diff => new_diff}
+        { old_diff: old_diff, new_diff: new_diff }
       end
     end
   end