oxidized-web 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5586eadd3aa0ab2774fa95043eb58595d9eb9130
-  data.tar.gz: 5f8d7abdf792415c9fe4860725be72030480754b
+  metadata.gz: 9a1b1bab329f725f5bbc8bebdac1b65b1e3f2ef0
+  data.tar.gz: 249d1daababb324eecc66bb10798a231d5bf5aa5
 SHA512:
-  metadata.gz: 996c411916d01fa4dcb3d8d365e5849b47cba06175849db39ec87159bbcc4af4a3b29ef265afb577b242c344b23ff1e3f822c869eafab38f68f6d0a8626f417d
-  data.tar.gz: ed6574c499553a09f86b4d4324bc91d8c5264789757866e42636c4d0878d8ed817c4af9f2b20749920307a230d6c03d5a9123abc80cf3a72044d259b34b03e56
+  metadata.gz: c64337dfa586c61faa0ebbd4ccc28ec2b81b4228e40cba3893779ed2aacf9d348449d0e31c0195010c48ef278040d7e004f8d2a9a2a1b7fbbc0b6ae551b75a4c
+  data.tar.gz: b57db13dd2291c97c8d43c79aa015be238a4adc7a4196e559676ba6ba4d1222ffebf5499247be7c8327d32172e106d86e9fd034b6c20c6e6b11d78f272530e13

data/README.md

@@ -4,6 +4,8 @@ Web userinterface and RESTful API for Oxidized.
 
 This is not useful independently, see https://github.com/ytti/oxidized for install instructions
 
+Live demo: http://oxidized.arahant.net
+
 # License and Copyright
 
 Copyright 2013-2015 Saku Ytti <saku@ytti.fi>

data/lib/oxidized/web/public/scripts/oxidized.js

@@ -71,6 +71,31 @@ $(function() {
   $('.btn-file :file').on('fileSelect', function(e, numFiles, label) {
     $(this).parents('.input-group').find(':text').val(label);
   });
+  
+  // Reloads the nodes from a source by calling the /reload.json URI
+  $('#reload').click(function() {
+    $.get('/reload.json')
+      .done(function(data) {
+        $('#flashMessage')
+        .removeClass('alert-danger')
+        .addClass('alert-success')
+        .text(data);
+      })
+      .fail(function() {
+        var data = 'Unable to reload nodes'
+        $('#flashMessage')
+          .removeClass('alert-success')
+          .addClass('alert-danger')
+          .text(data);
+      })
+      .always(function() {
+        $('#flashMessage').removeClass('hidden');
+      });
+
+  // Update timestamp on next button click for DataTables
+  $('.paginate_button').on('click', function() {    
+    convertTime();
+  });
 });
 
 

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

@@ -2,9 +2,13 @@
   .col-xs-12.col-md-2
     %h4 nodes /
 
+.hidden.alert#flashMessage
+
 .row
   .pull-right
     %form
+      %button.ColVis_Button#reload{type: 'button'}
+        %span.glyphicon.glyphicon-refresh Reload
       %button.ColVis_Button{type: 'button', onclick: 'history.go();'}
         %span.glyphicon.glyphicon-repeat Refresh
 
@@ -28,8 +32,10 @@
             %td
               %a{href: url_for("/node/show/#{node[:name]}")} #{node[:name]}
             %td= node[:ip]
-            %td= node[:model]
-            %td= node[:group]
+            %td
+              %a{href: url_for("/nodes/model/#{node[:model]}")} #{node[:model]}
+            %td
+              %a{href: url_for("/nodes/group/#{node[:group]}")} #{node[:group]}
             %td
               %div{title: node[:status], class: node[:status]}
                 %span{style: 'visibility: hidden'}#{node[:status]}

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

@@ -75,7 +75,7 @@
             %td= total_runs
             %td= failures
             %td #{'%.2f' % failure_rate}%
-            %td #{'%.2f' % avg_time}s
+            %td #{'%.2f' % avg_time}
             %td
               %div{title: status, class: status}
             %td.time= last_success
@@ -90,13 +90,13 @@
         visible: false,
         targets: 1
       }, {
-        type: "string",
-        targets: 3
+        render: function ( data, type, row) {
+            return type === 'display' ? data + 's' : data
+        },
+        targets: 4
       }],
       colVis: {
         exclude: [0, 5]
       }
     });
   });
-
-

data/lib/oxidized/web/webapp.rb

@@ -221,7 +221,7 @@ module Oxidized
 
       private
 
-      def out template = :default
+      def out template = :text
         if @json or params[:format] == 'json'
           if @data.is_a?(String)
             json @data.lines

data/oxidized-web.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'oxidized-web'
-  s.version           = '0.6.1'
+  s.version           = '0.7.0'
   s.licenses          = %w( Apache-2.0 )
   s.platform          = Gem::Platform::RUBY
   s.authors           = ['Saku Ytti', 'Samer Abdel-Hafez']
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.require_path      = 'lib'
 
   s.required_ruby_version =                       '>= 1.9.3'
-  s.add_runtime_dependency 'oxidized',            '~> 0.10'
+  s.add_runtime_dependency 'oxidized',            '~> 0.13'
   s.add_runtime_dependency 'puma',                '~> 2.8'
   s.add_runtime_dependency 'sinatra',             '~> 1.4', '>= 1.4.6'
   s.add_runtime_dependency 'sinatra-contrib',     '~> 1.4', '>= 1.4.6'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oxidized-web
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Saku Ytti
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-10 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oxidized
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: oxidized-web
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: sinatra API + webUI for oxidized