hieraviz 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c977dce78504ac761d4d7d6acd75ad95e873d2a7
-  data.tar.gz: 9afaf6f7186ec5365fe685ff73ad4ce49a401f8d
+  metadata.gz: e4ae953c395227dd73942bc1faa14ab82e0d670c
+  data.tar.gz: 5a1e231af94bedf3f98770dab19e305d022c938d
 SHA512:
-  metadata.gz: ee55dacc40305aec815eb61c1b718aff566fe8d8697f50eccd60dc6f645940ca27632395e1b3f1a11391e1223d003e85f698c551a93d8fd9fb7a1e20df072cbf
-  data.tar.gz: 80e725f5a210c00e2e17b56ec50b1497dfe736292dbc9a8c0c1e70d3e1da69a9082cc5f0ddb097c4d15e3d191913af229c1980702dd376c0b8713c61e4130d73
+  metadata.gz: 8866fb2b55e06453abfbc2c22a6ec425c20c16c0aff3a4692baa11a495256bd8082eb8579507ab1bc310094b97d78518d2054a25bcdf6df9f6bae07878953f6c
+  data.tar.gz: b34d079696205abd7f81902f796cef8e1577b0215ae004532ae867195152d2117b87c7b5e0cf16fb84cf8504f7e73dcceee582720763e64009c9af0460afc619

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 Hieraviz Changelog
 ========================
 
+### v0.1.2 - 2016-02-22
+- add a way to write custom local facts
+- add display of nodes info on node panel
+- make possible to change hiera variables per node
+- fix farms list to read local files instead of puppetdb
+- show actual number of nodes in farms list
+- add storage of custom params per user
+
 ### v0.1.1 - 2016-01-29
 - add multibase ability
 - fix node navigation info/params/allparams

data/app/apiv1.rb

@@ -17,20 +17,33 @@ module HieravizApp
       enable :sessions
     end
 
-    helpers do
-      def check_authorization
-        if !session['access_token'] && !request.env['HTTP_X_AUTH']
-          redirect '/v1/not_logged'
-        else
-          token = session['access_token'] || request.env['HTTP_X_AUTH']
-          session_info = Hieraviz::Store.get(token, settings.configdata['session_renew'])
-          if !session_info
-            redirect '/v1/unauthorized'
+    case settings.configdata['auth_method']
+    when 'dummy'
+      helpers do
+        def check_authorization
+          true
+        end
+      end
+    when 'gitlab', 'http'
+      helpers do
+        def check_authorization
+          if !session['access_token'] && !request.env['HTTP_X_AUTH']
+            redirect '/v1/not_logged'
+          else
+            token = session['access_token'] || request.env['HTTP_X_AUTH']
+            session_info = Hieraviz::Store.get(token, settings.configdata['session_renew'])
+            if !session_info
+              redirect '/v1/unauthorized'
+            end
           end
         end
       end
     end
 
+    helpers do
+
+    end
+
     get %r{^/?([-_\.a-zA-Z0-9]+)?/nodes} do |base|
       check_authorization
       hieracles_config = prepare_config(base)
@@ -46,21 +59,43 @@ module HieravizApp
 
     get %r{^/?([-_\.a-zA-Z0-9]+)?/node/([-_\.a-zA-Z0-9]+)/params} do |base, node|
       check_authorization
-      hieracles_config = prepare_config(base)
+      hieracles_config = prepare_config(base, node)
       node = Hieracles::Node.new(node, hieracles_config)
       json node.params
     end
 
     get %r{^/?([-_\.a-zA-Z0-9]+)?/node/([-_\.a-zA-Z0-9]+)/allparams} do |base, node|
       check_authorization
-      hieracles_config = prepare_config(base)
+      hieracles_config = prepare_config(base, node)
       node = Hieracles::Node.new(node, hieracles_config)
       json node.params(false)
     end
 
+    get %r{^/?([-_\.a-zA-Z0-9]+)?/node/([-_\.a-zA-Z0-9]+)/facts} do |base, node|
+      check_authorization
+      hieracles_config = prepare_config(base, node)
+      facts = Hieraviz::Facts.new(settings.configdata['tmpdir'], base, node, get_username)
+      json facts.read
+    end
+
+    post %r{^/?([-_\.a-zA-Z0-9]+)?/node/([-_\.a-zA-Z0-9]+)/facts} do |base, node|
+      check_authorization
+      hieracles_config = prepare_config(base, node)
+      facts = Hieraviz::Facts.new(settings.configdata['tmpdir'], base, node, get_username)
+      data = JSON.parse(request.body.read.to_s)
+      json facts.write(data)
+    end
+
+    delete %r{^/?([-_\.a-zA-Z0-9]+)?/node/([-_\.a-zA-Z0-9]+)/facts} do |base, node|
+      check_authorization
+      hieracles_config = prepare_config(base, node)
+      facts = Hieraviz::Facts.new(settings.configdata['tmpdir'], base, node, get_username)
+      json facts.remove
+    end
+
     get %r{^/?([-_\.a-zA-Z0-9]+)?/node/([-_\.a-zA-Z0-9]+)$} do |base, node|
       check_authorization
-      hieracles_config = prepare_config(base)
+      hieracles_config = prepare_config(base, node)
       node = Hieracles::Node.new(node, hieracles_config)
       json node.params
     end
@@ -68,15 +103,49 @@ module HieravizApp
     get %r{^/?([-_\.a-zA-Z0-9]+)?/farms} do |base|
       check_authorization
       hieracles_config = prepare_config(base)
-      json Hieracles::Registry.farms(hieracles_config)
+      json Hieracles::Registry.farms_counted(hieracles_config, base)
+    end
+
+    get %r{^/?([-_\.a-zA-Z0-9]+)?/vars} do |base|
+      check_authorization
+      hieracles_config = prepare_config(base)
+      hiera = Hieracles::Hiera.new(hieracles_config)
+      json hiera.params
+    end
+
+    get %r{^/?([-_\.a-zA-Z0-9]+)?/node/([-_\.a-zA-Z0-9]+)/hierarchy} do |base, node|
+      check_authorization
+      hieracles_config = prepare_config(base, node)
+      hiera = Hieracles::Hiera.new(hieracles_config)
+      nodeinfo = Hieracles::Node.new(node, hieracles_config)
+      facts = Hieraviz::Facts.new(settings.configdata['tmpdir'], base, node, get_username)
+      puts facts.instance_variable_get(:@filename)
+      res = { 
+        'hiera'    => hiera.hierarchy,
+        'vars'     => hiera.params,
+        'info'     => nodeinfo.info,
+        'files'    => nodeinfo.files,
+        'facts'    => facts.read,
+        'defaults' => settings.configdata['defaultscope']
+      }
+      json res
+    end
+
+    get %r{^/?([-_\.a-zA-Z0-9]+)?/farm/([-_\.a-zA-Z0-9]+)$} do |base, farm|
+      check_authorization
+      hieracles_config = prepare_config(base)
+      nodes =  Hieracles::Registry.nodes_data(hieracles_config, base).reduce({}) do |a, (k, v)|
+        a[k] = v if v['farm'] == farm
+        a
+      end
+      json nodes
     end
 
-    # get '/farm/:n' do |farm|
-    #   check_authorization
-    #   req = Hieracles::Puppetdb::Request.new(settings.configdata['puppetdb'])
-    #   farm_nodes = req.facts('farm', farm)
-    #   json farm_nodes.data
-    # end
+    get '/ppdb/events' do
+      check_authorization
+      puppetdb = Hieraviz::Puppetdb.new settings.configdata['puppetdb']
+      json puppetdb.events
+    end
 
     get '/not_logged' do
       json({ error: "Not connected." })
@@ -87,7 +156,7 @@ module HieravizApp
     end
 
     not_found do
-      json({ error: "data not found" })
+      json({ error: "endpoint not found" })
     end
 
   end

data/app/common.rb

@@ -14,23 +14,74 @@ module HieravizApp
     end
 
     helpers do
-      def prepare_config(e)
-        e = File.basename(settings.configdata['basepath']) unless e
+
+      case settings.configdata['auth_method']
+      when 'dummy'
+
+        def get_username
+          'Dummy'
+        end
+        def get_userinfo
+          { 'username' => 'Dummy' }
+        end
+
+      when 'http'
+
+        def get_username
+          settings.configdata['http_auth']['username']
+        end
+        def get_userinfo
+          { 'username' => settings.configdata['http_auth']['username'] }
+        end
+
+      when 'gitlab'
+        
+        def get_username
+          if session['access_token']
+            session_info = Hieraviz::Store.get(session['access_token'], settings.configdata['session_renew'])
+            if session_info
+              session_info['username']
+            else
+              ''
+            end
+          end
+        end
+
+        def get_userinfo
+          Hieraviz::Store.get(session['access_token'], settings.configdata['session_renew'])
+        end
+        
+      end
+
+      def prepare_config(e, node = nil)
+        e ||= File.basename(settings.configdata['basepath'])
         path = get_path(e)[0]
         if path
           @base = get_base(path)
           @base_name = @base.gsub(/\//,'')
-          get_config(path)
+          get_config(path, cached_params(e, node))
         end
       end
+
+      def cached_params(base, node)
+        if node
+          cache = Hieraviz::Facts.new settings.configdata['tmpdir'], base, node, get_username
+          if cache.exist?
+            return cache.read
+          end
+        end
+        {}
+      end
+
       def prepare_params(e)
-        e = File.basename(settings.configdata['basepath']) unless e
+        e ||= File.basename(settings.configdata['basepath'])
         path = get_path(e)[0]
         if path
           settings.configdata['basepath'] = path
           settings.configdata
         end        
       end
+      
       def get_path(path)
         if settings.basepaths
           settings.basepaths.select do |p|
@@ -40,21 +91,29 @@ module HieravizApp
           [ settings.configdata['basepath'] ]
         end
       end
-      def get_config(path)
+      
+      def get_config(path, extra)
+        args = { config: Hieraviz::Config.configfile }
         if path
-          Hieracles::Config.new({ 
-            config: Hieraviz::Config.configfile,
-            basepath: path
-            })
-        else
-          Hieracles::Config.new({ 
-            config: Hieraviz::Config.configfile
-            })
-        end     
+          args[:basepath] = path
+        end
+        if extra.length > 0
+          args[:params] = format_params(extra)
+        end
+        Hieracles::Config.new args
       end
+
       def get_base(path)
         "/#{File.basename(path)}"
       end
+
+      def format_params(params)
+        params.reduce([]) do |a, (k, v)|
+          a << "#{k}=#{v}"
+          a
+        end.join(',')
+      end
+
     end
 
   end

data/app/public/css/main.css

@@ -171,7 +171,7 @@ input {
   font-size: 1.2em;
   line-height: 1.4em;
   height: 1.4em;
-  width: 100%;
+  width: 330px;
   position: fixed;
 }
 .side .filter input {
@@ -198,8 +198,14 @@ input {
 .side ul li.focus {
   background-color: #fff;
 }
-
-  /* ----- Meat ---- */
+.side ul li.none {
+  color: #999;
+}
+.side ul li .count {
+  float: right;
+  font-family: monospace;
+}
+/* ----- Meat ---- */
 .meat {
   border: 2px solid #999;
   background-color: #fff;
@@ -271,6 +277,7 @@ input {
 }
 .meat .rows {
   margin-top: 3.8em;
+  margin-right: 330px;
 }
 .meat .row {
   word-wrap: break-word;
@@ -296,8 +303,9 @@ input {
 }
 .meat .row .value {
   font-family: monospace;
-  padding: .1em 1em .6em;
+  padding: .1em 1em .4em;
   margin: 0;
+  margin-bottom: .2em;
 }
 .meat .row:hover {
   background-color: #f3f3de;
@@ -308,12 +316,95 @@ input {
 .meat .row:hover .data {
   background-color: #dd6;
 }
-.meat.farms div {
+.meat.farms .node {
   padding: .5em 1em;
 }
-.meat.farms div:hover {
+.meat.farms .node:hover {
   background-color: #f3f3de;
 }
+.meat .hierarchy {
+  margin-top: 3.8em;
+  background-color: #ccc;
+  position: fixed;
+  display: inline-block;
+  float: right;
+  width: 330px;
+  right: 0;
+  height: 80%;
+  overflow-y: auto;
+  overflow-x: hidden;
+}
+.meat .hierarchy .hierafiles {
+  padding: 1em;
+  font-family: monospace;
+}
+.meat .hierarchy .hierafiles div {
+  padding: .2em 0;
+}
+.meat .hierarchy .nodeinfo {
+  padding: 1em;
+}
+.meat .hierarchy .nodeinfo .var {
+  padding: .2em 0;
+}
+.meat .hierarchy .nodeinfo .label {
+  padding: 0 .5em;
+}
+.meat .hierarchy .nodeinfo input {
+  width: 100%;
+  padding: .2em .5em;
+}
+.meat .hierarchy .factinfo {
+  padding: 1em;
+}
+.meat .hierarchy .factinfo .var {
+  padding: .2em 0;
+}
+.meat .hierarchy .factinfo .label {
+  padding: 0 .5em;
+}
+.meat .hierarchy .factinfo .label i {
+  font-size: .8em;
+  color: #666;
+}
+.meat .hierarchy .factinfo input {
+  width: 100%;
+  padding: .2em .5em;
+}
+.meat .hierarchy .updateinfo {
+  padding: 0 1em 1em;
+}
+.meat .hierarchy .updateinfo button#updateinfo {
+  -webkit-box-shadow: 0px 0px 2px 3px rgba(0,0,0,0.7);
+  -moz-box-shadow: 0px 0px 2px 3px rgba(0,0,0,0.7);
+  box-shadow: 0px 0px 2px 3px rgba(0,0,0,0.7);
+  border-radius: .2em;
+  cursor: pointer;
+  margin-right: 1em;
+}
+
+.meat .hierarchy .updateinfo button {
+  -webkit-box-shadow: 0px 0px 2px 3px rgba(0,0,0,0.3);
+  -moz-box-shadow: 0px 0px 2px 3px rgba(0,0,0,0.3);
+  box-shadow: 0px 0px 2px 3px rgba(0,0,0,0.3);
+  border-radius: .2em;
+  cursor: pointer;
+  margin-right: 1em;
+}
+
+.meat .hierarchy .updateinfo button:hover {
+  -webkit-box-shadow: 0px 0px 0px 3px rgba(34,168,230,1);
+  -moz-box-shadow: 0px 0px 0px 3px rgba(34,168,230,1);
+  box-shadow: 0px 0px 0px 3px rgba(34,168,230,1);
+}
+.meat .hierarchy .nodefiles {
+  padding: 1em;
+  font-family: monospace;
+}
+.meat .hierarchy .nodefiles div {
+  padding: .2em 0;
+}
+
 /* ----- info ---- */
 .meat .info {
   margin-top: 4.8em;

data/app/public/js/farms.js

@@ -18,44 +18,84 @@ function ready(fn) {
 }
 
 ready( () => {
-  focusNav('farms');
-
   var farms = document.querySelectorAll('li.farm');
   var meat = document.querySelector('div.meat');
+  var base = window.location.pathname.split('/')[1];
+  focusNav('farms');
+  filterBox(".side .filter input", farms);
+
+  function restore_url(list) {
+    if (window.location.hash != '') {
+      var target = window.location.hash.replace(/#/,'');
+      var parts = target.split('/');
+      Array.prototype.forEach.call(list, (item, i) => {
+        if (item.textContent == parts[0]) {
+          if (parts[1] != undefined) {
+            Farm[parts[1]](parts[0]);
+          } else {
+            var event = document.createEvent('HTMLEvents');
+            event.initEvent('click', true, false);
+            item.dispatchEvent(event);
+          }
+        }
+      });
+    }
+  }
 
-  filterBox(".filter input", farms);
 
-  function build_list(top, title, array) {
+  function build_list(top, title, hash) {
     window.location.hash = '#'+title;
     top.innerHTML = "<h3>Farm "+title+"</h3>";
-    if (array.length > 0)
-      Array.prototype.forEach.call(array, (item, i) => {
-        addTo(top,  "<div><a href=\"/nodes#"+ item +"\">" +
-                    item +
-                    "</a></div>\n");
+    if (Object.keys(hash).length > 0) 
+      Array.prototype.forEach.call(Object.keys(hash), (item, i) => {
+        var node = document.createElement('div');
+        node.className = "node";
+        top.appendChild(node);
+        var node_title = document.createElement('div');
+        node_title.innerHTML = '<div><a href="/'+base+'/nodes#'+ item +'">' + item + '</a></div>';
+        node.appendChild(node_title);
+        Array.prototype.forEach.call(Object.keys(hash[item]), (itemvar, i) => {
+          addTo(node, "<div>"+itemvar+": "+hash[item][itemvar]+"</div>")
+        });
       });
     else
       addTo(top, "<div>There is no node in this farm.</div>\n");
   }
 
-  Array.prototype.forEach.call(farms, (item, i) => {
-    item.addEventListener('click', (ev) => {
+  function show_error(meat, message) {
+    meat.innerHTML = "<div class=\"error\">" + message + "</div>\n";
+  }
+
+
+  var Farm = {
+    show: function(el) {
       addClass(meat, 'wait');
-      el = ev.target;
-      fetch('/v1/farm/' + el.dataset.item, auth_header()).
+      farm = el.dataset.item;
+      fetch('/v1/' + base + '/farm/' + farm, auth_header()).
         then(res => res.json()).
         then(j => {
-          build_list(meat, el.dataset.item, j);
-          Array.prototype.forEach.call(farms, (item, i) => {
-            removeClass(item, 'focus')
-          });
-          addClass(el, 'focus');
-          update_footer('/v1/farm/' + el.dataset.item);
+          if (j.error != undefined) {
+            show_error(meat, j['error']);
+          } else {
+            build_list(meat, farm, j);
+            Array.prototype.forEach.call(farms, (item, i) => {
+              removeClass(item, 'focus');
+            });
+            addClass(el, 'focus');
+            update_footer('/v1/' + base + '/farm/' + farm);
+          }
           removeClass(meat, 'wait');
         });
+    },
+  };
+
+  Array.prototype.forEach.call(farms, (item, i) => {
+    item.addEventListener('click', (ev) => {
+      Farm.show(ev.target);
     });
   });
 
+  update_footer('/v1/' + base + '/farms');
   restore_url(farms);
 
 });