cpee-model-management 1.0.17 → 1.1.1

data/tools/cpee-moma

@@ -8,6 +8,7 @@ require 'zip'
 require 'typhoeus'
 require 'json'
 require 'securerandom'
+require 'redis'
 
 def wrap(s, width=78, indent=18)
 	lines = []
@@ -62,10 +63,12 @@ ARGV.options { |opt|
   opt.on(wrap("[cpui DIR]        scaffolds a sample html client. New versions might require manual merging if you changed something."))
 	opt.on("")
   opt.on(wrap("[convert]         converts all testsets in the current directory to design terminology."))
+	opt.on("")
+  opt.on(wrap("[consistent]      makes the instances db consistent. can only be run in server dir."))
   opt.parse!
 }
 if (ARGV.length == 0) ||
-   (ARGV.length == 1  && !(%w(convert).include?(ARGV[0]))) ||
+   (ARGV.length == 1  && !(%w(convert consistent).include?(ARGV[0]))) ||
    (ARGV.length == 2  && !(%w(cpui new).include?(ARGV[0]))) ||
    (ARGV.length >  2)
   puts ARGV.options
@@ -182,6 +185,62 @@ elsif command == 'convert'
     File.unlink(f + '.creator') rescue nil
     File.unlink(f + '.author') rescue nil
   end
+elsif command == 'consistent'
+  redis = Redis.new(path: 'redis.sock', db: 0)
+  redis.keys('*/instances').each do |instances|
+    engine = File.dirname(instances)
+    s_ready = s_running = s_stopped = 0
+    redis.lrange(instances,0,-1).each do |i|
+      prefix = File.join(engine,i.to_s)
+      url = redis.get(File.join(prefix,'instance-url'))
+      res = Typhoeus.get(url, :followlocation => true)
+      if res.success?
+        oldstate = redis.get(File.join(prefix,'state'))
+        case oldstate
+          when 'ready'
+            s_ready += 1
+          when 'running'
+            s_running += 1
+          when 'stopped'
+            s_stopped += 1
+        end
+      else
+        parent = redis.get(File.join(prefix,'parent'))
+        oldstate = redis.get(File.join(prefix,'state'))
+        children = redis.lrange(File.join(prefix,'children'),0,-1)
+        redis.multi do |multi|
+          multi.decr(File.join(engine,oldstate)) rescue nil
+          multi.incr(File.join(engine,'total_abandoned'))
+          multi.lrem(File.join(engine,'instances'),0,i.to_s)
+          multi.del(File.join(prefix,'instance-url'))
+          multi.del(File.join(prefix,'author'))
+          multi.del(File.join(prefix,'path'))
+          multi.del(File.join(prefix,'name'))
+          multi.del(File.join(prefix,'state'))
+          multi.del(File.join(prefix,'cpu'))
+          multi.del(File.join(prefix,'mem'))
+          multi.del(File.join(prefix,'time'))
+          children.each do |child|
+            if parent
+              multi.set(File.join(engine,child,'parent'),parent)
+            else
+              multi.del(File.join(engine,child,'parent'))
+            end
+          end
+          multi.del(File.join(prefix,'children'))
+          multi.del(File.join(prefix,'parent'))
+          if parent
+            multi.lrem(File.join(engine,parent,'children'),0,i.to_s)
+          end
+        end
+      end
+    end
+    redis.multi do |multi|
+      multi.set(File.join(engine,'ready'),s_ready.to_i)
+      multi.set(File.join(engine,'running'),s_running.to_i)
+      multi.set(File.join(engine,'stopped'),s_stopped.to_i)
+    end
+  end
 elsif command == 'new'
   if !File.exists?(p1)
     FileUtils.mkdir(File.join(p1)) rescue nil

data/ui/css/design.css

@@ -26,6 +26,11 @@ ui-behind {
   color: #d0d0d0;
 }
 
+ui-area > *:first-child {
+  padding-top: 0;
+  margin-top: 0;
+}
+
 ui-behind span {
   cursor: pointer;
 }

data/ui/css/stats.css

@@ -0,0 +1,55 @@
+#resources h1 {
+  font-size: 1.2em;
+  border-bottom: 0.1em solid var(--x-ui-border-color);
+}
+
+#resources table {
+  margin-left: 1.3em;
+}
+
+#instances h1 {
+  font-size: 1.2em;
+  border-bottom: 0.1em solid var(--x-ui-border-color);
+}
+
+.instances .text {
+  white-space: nowrap;
+}
+.instances .text > td {
+  display: inline-block;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  padding-right: 0.5em;
+  padding-left: 0.5em;
+}
+
+.instances .name {
+  width: 12em;
+}
+.instances .state {
+  width: 7em
+}
+.instances .state:not([data-state=ready]):not([data-state=stopped]) > span.abandon {
+  display: none;
+}
+.instances .author {
+  width: 12em
+}
+
+.instances tr.sub, .instances tr.sub > td {
+  margin:0;
+  padding:0;
+}
+
+.instances .sub table {
+  margin-left: 0.8em;
+}
+.instances .sub table > tr.text > td:first-child::before {
+  content: '⤷';
+  margin-right: 0.5em;
+}
+
+.instances tr.text.even td {
+  background-color: var(--x-ui-content-light-background);
+}

data/ui/css/stats_standalone.css

@@ -0,0 +1,7 @@
+[is="x-ui-"] {
+  padding: 1em;
+}
+[is="x-ui-"] *:first-child {
+  padding-top: 0;
+  margin-top: 0;
+}

data/ui/index.html

@@ -35,6 +35,7 @@
     <script type="text/javascript" src="/js_libs/underscore.min.js"></script>
     <script type="text/javascript" src="/js_libs/jquery.caret.min.js"></script>
     <script type="text/javascript" src="/js_libs/jquery.cookie.js"></script>
+    <script type="text/javascript" src="/js_libs/plotly.min.js"></script>
 
     <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery.qrcode/1.0/jquery.qrcode.min.js"></script>
 
@@ -52,20 +53,22 @@
 
     <!-- custom stuff, play arround  -->
     <link   rel="stylesheet"      href="css/design.css" type="text/css"/>
+    <link   rel="stylesheet"      href="css/stats.css" type="text/css"/>
     <script type="text/javascript" src="js/design.js"></script>
+    <script type="text/javascript" src="js/stats.js"></script>
   </head>
   <body is="x-ui-">
     <ui-rest id="main">
       <ui-tabbar>
-        <ui-before                                  ></ui-before>
-        <ui-tab class=""         data-tab="models"  >Models</ui-tab>
-        <ui-tab class="inactive" data-tab="newmodel">New Model</ui-tab>
-        <ui-tab class="inactive" data-tab="newdir"  >New Dir</ui-tab>
-        <ui-space                                   ></ui-space>
-        <ui-tab class="inactive" data-tab="running" >Running</ui-tab>
-        <ui-tab class="inactive" data-tab="stopped" >Stopped</ui-tab>
-        <ui-behind                                  ><span></span></ui-behind>
-        <ui-last                                    ><a class="logo" href=".."></a></ui-last>
+        <ui-before                                   ></ui-before>
+        <ui-tab class=""         data-tab="models"   >Models</ui-tab>
+        <ui-tab class="inactive" data-tab="newmodel" >New Model</ui-tab>
+        <ui-tab class="inactive" data-tab="newdir"   >New Dir</ui-tab>
+        <ui-space                                    ></ui-space>
+        <ui-tab class="inactive" data-tab="instances">Instances</ui-tab>
+        <ui-tab class="inactive" data-tab="resources">Resources</ui-tab>
+        <ui-behind                                   ><span></span></ui-behind>
+        <ui-last                                     ><a class="logo" href=".."></a></ui-last>
       </ui-tabbar>
       <ui-content class="noselect">
         <ui-area data-belongs-to-tab="models">
@@ -160,7 +163,62 @@
             <p>
               <button>New Directory</button>
             </p>
-          </id>
+          </form>
+        </ui-area>
+        <ui-area data-belongs-to-tab="instances" class="inactive">
+          <p>
+            Show ready, running and stopped instances.
+          </p>
+          <template id="stats_instances">
+            <h1 class="stats_title">Engine: </h1>
+            <table class='instances'></table>
+          </template>
+          <template id="stats_instance">
+            <tr class="text">
+              <td class="name"><a href='' target='_blank'><em>no name</em></a></td>
+              <td class="num">(<span></span>)</td>
+              <td class="state"><span class='value'></span> <span class='abandon'>[<a href='#' title='abandon'>a</a>]</span></td>
+              <td class="author"><em>unknown</em></td>
+              <td class="mem"></em></td>
+              <td class="active"></em></td>
+            </tr>
+            <tr class="sub">
+              <td colspan="6"><table></table></td>
+            </tr>
+          </template>
+          <div id='instances'></div>
+        </ui-area>
+        <ui-area data-belongs-to-tab="resources" class="inactive">
+          <p>
+            Show statistics about instances per server, and metrics about the health of the environment.
+          </p>
+          <template id="stats_engine">
+            <h1 class="stats_title">Engine: </h1>
+            <div class="stats_plot"></div>
+            <div class="stats_text">
+              <table>
+                <tbody>
+                  <tr>
+                    <td>Total Instances <strong>Created</strong> / <strong>Finished</strong> / <strong>Abandoned</strong>:</td>
+                    <td class='total_created'></td>
+                    <td>/</td>
+                    <td class='total_finished'></td>
+                    <td>/</td>
+                    <td class='total_abandoned'></td>
+                  </tr>
+                  <tr>
+                    <td>Instances Currently <strong>Ready</strong> / <strong>Running</strong> / <strong>Stopped</strong>:</td>
+                    <td class='current_ready'></td>
+                    <td>/</td>
+                    <td class='current_running'></td>
+                    <td>/</td>
+                    <td class='current_stopped'></td>
+                  </tr>
+                </tbody>
+               </table>
+            </div>
+          </template>
+          <div id='resources'></div>
         </ui-area>
       </ui-content>
     </ui-rest>

data/ui/instances.html

@@ -0,0 +1,89 @@
+<!--
+  This file is part of CPEE-MODEL-MANAGEMENT.
+
+  CPEE-MODEL-MANAGEMENT is free software: you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at your
+  option) any later version.
+
+  CPEE-MODEL-MANAGEMENT is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+  more details.
+
+  You should have received a copy of the GNU General Public License along with
+  CPEE-MODEL-MANAGEMENT (file LICENSE in the main directory).  If not, see
+  <http://www.gnu.org/licenses/>.
+-->
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>Instances</title>
+
+    <!-- libs, do not modify. When local than load local libs. -->
+    <script type="text/javascript" src="/js_libs/jquery.min.js"></script>
+    <script type="text/javascript" src="/js_libs/jquery.browser.js"></script>
+    <script type="text/javascript" src="/js_libs/jquery.svg.min.js"></script>
+    <script type="text/javascript" src="/js_libs/jquery.svgdom.min.js"></script>
+    <script type="text/javascript" src="/js_libs/vkbeautify.js"></script>
+    <script type="text/javascript" src="/js_libs/util.js"></script>
+    <script type="text/javascript" src="/js_libs/printf.js"></script>
+    <script type="text/javascript" src="/js_libs/strftime.min.js"></script>
+    <script type="text/javascript" src="/js_libs/parsequery.js"></script>
+    <script type="text/javascript" src="/js_libs/underscore.min.js"></script>
+    <script type="text/javascript" src="/js_libs/jquery.caret.min.js"></script>
+    <script type="text/javascript" src="/js_libs/jquery.cookie.js"></script>
+    <script type="text/javascript" src="/js_libs/plotly.min.js"></script>
+
+    <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery.qrcode/1.0/jquery.qrcode.min.js"></script>
+
+    <script type="text/javascript" src="/js_libs/relaxngui.js"></script>
+
+    <script type="text/javascript" src="/js_libs/uidash.js"></script>
+    <script type="text/javascript" src="/js_libs/custommenu.js"></script>
+
+    <link   rel="stylesheet"      href="/js_libs/custommenu.css" type="text/css"/>
+    <link   rel="stylesheet"      href="/js_libs/uidash.css" type="text/css"/>
+
+    <link   rel="stylesheet"      href="/global_ui/ui.css" type="text/css"/>
+
+    <link   rel="stylesheet"      href="/js_libs/relaxngui.css" type="text/css"/>
+
+    <!-- custom stuff, play arround  -->
+    <link   rel="stylesheet"      href="css/design.css" type="text/css"/>
+    <link   rel="stylesheet"      href="css/stats.css" type="text/css"/>
+    <link   rel="stylesheet"      href="css/stats_standalone.css" type="text/css"/>
+    <script type="text/javascript" src="js/stats.js"></script>
+    <style>
+      [is="x-ui-"] {
+        overflow: scroll;
+      }
+    </style>
+  </head>
+  <body is="x-ui-">
+    <p>
+      Show ready, running and stopped instances.
+    </p>
+    <template id="stats_instances">
+      <h1 class="stats_title">Engine: </h1>
+      <table class='instances'></table>
+    </template>
+    <template id="stats_instance">
+      <tr class="text">
+        <td class="name"><a href='' target='_blank'><em>no name</em></a></td>
+        <td class="num">(<span></span>)</td>
+        <td class="state"><span class='value'></span> <span class='abandon'>[<a href='#' title='abandon'>a</a>]</span></td>
+        <td class="author"><em>unknown</em></td>
+        <td class="cpu"></td>
+        <td>/</td>
+        <td class="mem"></em></td>
+      </tr>
+      <tr class="sub">
+        <td colspan="6"><table></table></td>
+      </tr>
+    </template>
+    <div id='instances'></div>
+  </body>
+</html>

data/ui/instances_view.html

@@ -0,0 +1,89 @@
+<!--
+  This file is part of CPEE-MODEL-MANAGEMENT.
+
+  CPEE-MODEL-MANAGEMENT is free software: you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at your
+  option) any later version.
+
+  CPEE-MODEL-MANAGEMENT is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+  more details.
+
+  You should have received a copy of the GNU General Public License along with
+  CPEE-MODEL-MANAGEMENT (file LICENSE in the main directory).  If not, see
+  <http://www.gnu.org/licenses/>.
+-->
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>Instances</title>
+
+    <!-- libs, do not modify. When local than load local libs. -->
+    <script type="text/javascript" src="/js_libs/jquery.min.js"></script>
+    <script type="text/javascript" src="/js_libs/jquery.browser.js"></script>
+    <script type="text/javascript" src="/js_libs/jquery.svg.min.js"></script>
+    <script type="text/javascript" src="/js_libs/jquery.svgdom.min.js"></script>
+    <script type="text/javascript" src="/js_libs/vkbeautify.js"></script>
+    <script type="text/javascript" src="/js_libs/util.js"></script>
+    <script type="text/javascript" src="/js_libs/printf.js"></script>
+    <script type="text/javascript" src="/js_libs/strftime.min.js"></script>
+    <script type="text/javascript" src="/js_libs/parsequery.js"></script>
+    <script type="text/javascript" src="/js_libs/underscore.min.js"></script>
+    <script type="text/javascript" src="/js_libs/jquery.caret.min.js"></script>
+    <script type="text/javascript" src="/js_libs/jquery.cookie.js"></script>
+    <script type="text/javascript" src="/js_libs/plotly.min.js"></script>
+
+    <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery.qrcode/1.0/jquery.qrcode.min.js"></script>
+
+    <script type="text/javascript" src="/js_libs/relaxngui.js"></script>
+
+    <script type="text/javascript" src="/js_libs/uidash.js"></script>
+    <script type="text/javascript" src="/js_libs/custommenu.js"></script>
+
+    <link   rel="stylesheet"      href="/js_libs/custommenu.css" type="text/css"/>
+    <link   rel="stylesheet"      href="/js_libs/uidash.css" type="text/css"/>
+
+    <link   rel="stylesheet"      href="/global_ui/ui.css" type="text/css"/>
+
+    <link   rel="stylesheet"      href="/js_libs/relaxngui.css" type="text/css"/>
+
+    <!-- custom stuff, play arround  -->
+    <link   rel="stylesheet"      href="css/design.css" type="text/css"/>
+    <link   rel="stylesheet"      href="css/stats.css" type="text/css"/>
+    <link   rel="stylesheet"      href="css/stats_standalone.css" type="text/css"/>
+    <script type="text/javascript" src="js/stats.js"></script>
+    <style>
+      [is="x-ui-"] {
+        overflow: scroll;
+      }
+    </style>
+  </head>
+  <body is="x-ui-">
+    <p>
+      Show ready, running and stopped instances.
+    </p>
+    <template id="stats_instances">
+      <h1 class="stats_title">Engine: </h1>
+      <table class='instances'></table>
+    </template>
+    <template id="stats_instance">
+      <tr class="text">
+        <td class="name"><a href='' target='_blank'><em>no name</em></a></td>
+        <td class="num">(<span></span>)</td>
+        <td class="state"><span class='value'></span></td>
+        <td class="author"><em>unknown</em></td>
+        <td class="cpu"></td>
+        <td>/</td>
+        <td class="mem"></em></td>
+      </tr>
+      <tr class="sub">
+        <td colspan="6"><table></table></td>
+      </tr>
+    </template>
+    <div id='instances'></div>
+  </body>
+</html>

data/ui/js/design.js

@@ -44,17 +44,17 @@ function delete_it(name) {
   }
 }
 
-function es_init(gdir,gstage) {
+function design_init(gdir,gstage) {
   var es = new EventSource('server/');
   es.onopen = function() {
-    console.log('es open');
+    console.log('design open');
   };
   es.onmessage = function(e) {
     paint(gdir,gstage);
   };
   es.onerror = function() {
-    console.log('es error');
-    // es_init();
+    console.log('design error');
+    // design_init();
   };
 }
 
@@ -114,7 +114,7 @@ $(document).ready(function() {
   gstage = urlParams.get('stage') || 'draft';
   gdir = urlParams.get('dir') ? (urlParams.get('dir') + '/').replace(/\/+/,'/') : '';
 
-  es_init(gdir,gstage);
+  design_init(gdir,gstage);
 
   var shifts = []
   $.ajax({