oxidized-web 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f2141a314c305db613162f80f719b6aeed8fc57
-  data.tar.gz: d05d6cfb6ab41defa817cabe57b5ecd87444ff05
+  metadata.gz: 1d6d01a9cc5ccc9c98d97a28166667c205f32286
+  data.tar.gz: 4a87180d8b75f7c94a1d5135296e31e60bd2ab97
 SHA512:
-  metadata.gz: 9fe6ef62c8faffb1f439dcb40aac2516b4455bd73ce197b39cc49a6a844f5f82adfb453d11c00d10a0e07df881dd277ff7801f8d751daf9ed6d541388d1b9aa6
-  data.tar.gz: 74b9a6f8cd4c7163cc3d356b8923e8e858d0c8b8992f996cff8a6594a3043d9a8cff6a92870b5aef1dde969b9f55bc352f71c2ba1e38d94420b041a183bee45b
+  metadata.gz: 56238ef9618517581efbdb29d9309ab02cf6d41210f1511c147bf6d33224a019fe2508b08cd35cf9eea31bcae203f47a3a59232e2d4fa8cd2c707d7e26b85002
+  data.tar.gz: 9cd62137cd2ce3b23302de68d3ae750829abca616bc469df3c18db14c8c3d8e68e22d110ba6ef104502e9790459e75b3c6f5533d39ec4b89c178ec3f2dd9c330

data/README.md

@@ -3,3 +3,21 @@
 Web userinterface and RESTful API for Oxidized.
 
 This is not useful independently, see https://github.com/ytti/oxidized for install instructions
+
+# License and Copyright
+
+Copyright 2013-2015 Saku Ytti <saku@ytti.fi>
+          2013-2015 Samer Abdel-Hafez <sam@arahant.net>
+
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

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

@@ -0,0 +1,43 @@
+%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')}
+:javascript
+  $(function() {
+    $('#versionsTable').dataTable({
+      dom: 'C<"clear">lfrtip',
+      "order": [[ 0, "desc" ]]
+    });
+  });
+%div{:class=>'row tbl-header'}
+  %div{:class=>'col-xs-12 '}
+    %h4
+      %a{:href=>url_for('/nodes')} nodes
+      \/ Nodes that contain 
+      %span " #{@to_research} "
+  
+%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 Name
+        %th Configuration
+
+    %tbody
+      -trclass = %w(even odd)
+      - @nodes_match.each do |x|
+        %tr
+          %td
+            #{x[:node]}
+          %td
+            %a{:title => "configuration", :href => url_for("/node/fetch/#{x[:full_name]}") }
+              %span{:class=>'glyphicon glyphicon-cloud-download'} 
+
+          

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

@@ -4,6 +4,13 @@
     %a{:href=>url_for('/nodes')} nodes
     %span /
     =@data[:name]
+     
+    %a{:title => "configuration", :href => url_for("/node/fetch/#{@data[:full_name]}") }
+      %span{:class=>'glyphicon glyphicon-cloud-download', :style => "color: #000; font-size: 14px;"}
+    %a{:title => "versions", :href => url_for("/node/version?node_full=#{@data[:full_name]}") }
+      %img{:src=>url_for('/images/versioning_18px.png')}
+    %a{:title => "update", :href => url_for("/node/next/#{@data[:full_name]}") }
+      %span{:class=>'glyphicon glyphicon-repeat', :style => "color: #000; font-size: 14px;"}
   -out='';PP.pp(@data,out)
   %pre
     = preserve "#{out}"

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

@@ -23,6 +23,12 @@
     %h4 nodes /
 %button{:onclick => "location.href='/migration'" }
   %span migration
+%form{ :action => "/nodes/conf_search", :method => "post"}
+  %div{:name => "to_search_in_config", :id => "to_search_in_config"}
+    %input{:type => "submit", :value => "Search in confs"}
+    %input{:type => "text", :name => "search_in_conf_textbox"}
+  
+  
 %div{:class=>'row'}
   %div{:class=>'refresh-div'}
     %form
@@ -34,6 +40,7 @@
       %tr
         %th Name
         %th IP
+        %th Model
         %th Group
         %th Last Status
         %th Last Update
@@ -47,6 +54,7 @@
           %td
             %a{:href => url_for("/node/show/#{node[:name]}") } #{node[:name]}
           %td= node[:ip]
+          %td= node[:model]
           %td= node[:group]
           %td
             %div{:title=>node[:status], :class=>node[:status]}

data/lib/oxidized/web/views/sass/oxidized.sass

@@ -131,3 +131,6 @@ th#file
 td#file
     @extend th#file
     padding: 15px
+
+div#to_search_in_config
+    padding-top: 5px

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

@@ -9,8 +9,8 @@
     $('#versionsTable').dataTable({
       dom: 'C<"clear">lfrtip',
       "order": [[ 0, "desc" ]],
-      colVis: {
-            exclude: [ 2 ]
+      columnDefs: [
+            { visible: false, targets: [2, 3] }
         }
     });
   });
@@ -32,6 +32,8 @@
       %tr
         %th Version
         %th Dates
+        %th Author
+        %th Message
         %th Actions
 
     %tbody
@@ -43,6 +45,10 @@
             #{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'} 

data/lib/oxidized/web/webapp.rb

@@ -4,7 +4,6 @@ require 'sinatra/url_for'
 require 'haml'
 require 'sass'
 require 'pp'
-require 'pp'
 require 'oxidized/web/mig'
 module Oxidized
   module API
@@ -29,6 +28,20 @@ module Oxidized
         end
         out :nodes
       end
+      
+      post '/nodes/conf_search' do 
+        @to_research = 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]})
+          end
+        end
+        out :conf_search
+      end
 
       get '/nodes/stats.?:format?' do
         @data = {}
@@ -117,7 +130,7 @@ module Oxidized
       end
       
       #show the lists of versions for a node
-      get '/node/version' do
+      get '/node/version.?:format?' do
         @data = nil
         @group = nil
         @node = nil
@@ -135,7 +148,7 @@ module Oxidized
       end
       
       #show the blob of a version
-      get '/node/version/view' do
+      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]}
         @data = nodes.get_version node, @info[:group], @info[:oid]
@@ -188,8 +201,12 @@ module Oxidized
 
       def out template=:default
         if @json or params[:format] == 'json'
-          json @data
-        elsif template == :text
+          if @data.is_a?(String)
+            json @data.lines
+          else
+            json @data
+          end
+        elsif template == :text or params[:format] == 'text'
           content_type :text
           @data
         else
@@ -203,7 +220,11 @@ module Oxidized
 
       def route_parse param
         json = false
-        e = params[param].split '.'
+        if param.respond_to?(:to_str)
+          e = param.split '.'
+        else
+          e = params[param].split '.'
+        end
         if e.last == 'json'
           e.pop
           json = true

data/oxidized-web.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'oxidized-web'
-  s.version           = '0.4.0'
+  s.version           = '0.5.0'
   s.licenses          = %w( Apache-2.0 )
   s.platform          = Gem::Platform::RUBY
   s.authors           = [ 'Saku Ytti', 'Samer Abdel-Hafez' ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oxidized-web
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Saku Ytti
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2015-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oxidized
@@ -147,6 +147,7 @@ files:
 - lib/oxidized/web/public/scripts/jquery.dataTables.min.js
 - lib/oxidized/web/public/scripts/jquery.min.js
 - lib/oxidized/web/public/scripts/script-migration.js
+- lib/oxidized/web/views/conf_search.haml
 - lib/oxidized/web/views/default.haml
 - lib/oxidized/web/views/diffs.haml
 - lib/oxidized/web/views/head.haml
@@ -182,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: oxidized-web
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: sinatra API + webUI for oxidized