prometheus-splash 0.8.0 → 0.8.5

data/lib/splash/webadmin/portal/views/processes.slim

@@ -1,10 +1,69 @@
-h2 <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medium "></i>&nbsp;&nbsp;Processes configured in Splash
+h2.uk-text-success <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medium "></i>&nbsp;&nbsp;Processes configured in Splash
+
+- unless @process_saved.nil?
+  javascript:
+    UIkit.notify("Process record #{@process_saved} saved", {status:'success'});
+- unless @process_failed.nil?
+  javascript:
+    UIkit.notify("Process record #{@process_saved} not saved", {status:'danger'});
+
+
+javascript:
+  $(document).on( 'click','input.delete-process',function(){
+    var id = this.id;
+    var url = "/api/config/deleteprocess/" +  id + ".json";
+    UIkit.modal.confirm('Are you sure?', function(){
+      console.debug(url)
+      $.ajax({
+        url: url,
+        type: 'DELETE',
+        success: function( data ) {
+          console.debug(data)
+          if (data['status'] == 'success') {
+            $('table#processrecords tr#' + id).remove();
+            UIkit.notify("Deleting process for " + id + " done", {status:'success'});
+          }
+          else
+          {
+            UIkit.notify("Deleting process for " + id + " failed !", {status:'danger'});
+          }
+        },
+        error: function(e) {
+          UIkit.notify("Deleting process for " + id + " failed !", {status:'danger'});
+        }
+      });
+    });
+  });
+
+  $(document).on( 'click','input.monitor-process',function(){
+    var url = "/api/processes/monitor.json";
+    UIkit.modal.confirm('Are you sure?', function(){
+      console.debug(url)
+      $.ajax({
+        url: url,
+        type: 'POST',
+        success: function( data ) {
+          console.debug(data)
+          if (data['status'] == 'success') {
+            UIkit.notify("Forced monitoring done", {status:'success'});
+          }
+          else
+          {
+            UIkit.notify("Forced monitoring failed !", {status:'danger'});
+          }
+        },
+        error: function(e) {
+          UIkit.notify("Forced monitoring failed !", {status:'danger'});
+        }
+      });
+    });
+  });
 
 div.uk-width-medium-1-1
   div.uk-panel.uk-panel-box
     span.uk-text-large.uk-text-bold List of processes monitored
     br
-    table.uk-table.uk-table-hover.uk-table-striped
+    table#processrecords.uk-table.uk-table-hover.uk-table-striped
       thead
         tr
           th Process record
@@ -12,18 +71,32 @@ div.uk-width-medium-1-1
           th Status
         tbody
           - @data.each do |process|
-            tr
-              td <b>Process</b> : #{process[:process]}
+            tr id="#{process[:process].to_s}"
+              td <i class="uk-icon-cog"></i>&nbsp;<b>Process</b> : #{process[:process]}
               td
-                span.uk-text-bold Patterns
+                - if process[:retention].class == Hash
+                  div <i class="uk-icon-calendar-minus-o"></i>&nbsp;<b>History retention</b> : #{process[:retention].flatten.reverse.join(' ')}
+                span.uk-text-bold <i class="uk-icon-binoculars"></i>&nbsp; Patterns
                 ul
                   - process[:patterns].each do |pattern|
                     li= pattern
+
               td
                 - if @result[process[:process]][:status] == :inexistant
                   div.uk-badge.uk-badge-danger not running
                 - if @result[process[:process]][:status] == :running
                   div.uk-badge.uk-badge-success running
                   ul
-                    li <b>CPU usage</b> : #{@result[process[:process]][:cpu]}
-                    li <b>MEM usage</b> : #{@result[process[:process]][:mem]}
+                    li <i class="uk-icon-percent"></i>&nbsp;<b>CPU usage</b> : #{@result[process[:process]][:cpu]}
+                    li <i class="uk-icon-percent"></i>&nbsp;<b>MEM usage</b> : #{@result[process[:process]][:mem]}
+              td
+                input.delete-process.uk-button.uk-button-mini.uk-button-danger id="#{process[:process].to_s}" value="Delete"
+                br
+                input.modify-process.uk-button.uk-button-mini.uk-button-primary id="#{process[:process].to_s}" value="Modify" onclick="location.href='/add_modify_process/#{process[:process].to_s}';"
+                br
+                input.history-process.uk-button.uk-button-mini.uk-button-primary id="#{process[:process].to_s}" value="History" onclick="location.href='/get_process_history/#{process[:process].to_s}';"
+  div.uk-align-right
+    form.uk-form.uk-form-horizontal#query action="/add_modify_process" method="GET"
+      div &nbsp;
+      input.monitor-process.uk-button value="Force monitoring"&nbsp;
+      input.add-process.uk-button type="submit" value="Add new process"

data/lib/splash/webadmin/portal/views/proxy.slim

@@ -1,7 +1,7 @@
 - if @proxy
-  h2 <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medium "></i>&nbsp;&nbsp;Proxies for Prometheus components
+  h2.uk-text-success <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medium "></i>&nbsp;&nbsp;Proxies for Prometheus components
 - else
-  h2 <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medium "></i>&nbsp;&nbsp;Links for Prometheus components
+  h2.uk-text-success <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medium "></i>&nbsp;&nbsp;Links for Prometheus components
 div.uk-width-medium-1-1
   div.uk-panel.uk-panel-box
     ul.uk-list

data/lib/splash/webadmin/portal/views/restclient.slim

@@ -1,4 +1,4 @@
-h2 <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medium "></i>&nbsp;&nbsp;REST Client
+h2.uk-text-success <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medium "></i>&nbsp;&nbsp;REST Client
 
 div.uk-grid
   div.uk-width-1-1
@@ -7,7 +7,7 @@ div.uk-grid
         <i class="uk-icon-question-circle"></i> &nbsp;&nbsp;Request
       form.uk-form.uk-form-horizontal#query action="/restclient/query" method="POST"
         label.uk-form-label for="method" Method
-        select.uk-form-large#method name="method"
+        select#method name="method"
           option GET
           option POST
           option DELETE
@@ -15,8 +15,11 @@ div.uk-grid
         div &nbsp;
         label.uk-form-label for="url" Endpoint
         input.uk-form-width-large#url type="text" placeholder="url" name="url"
-        dev.uk-align-right
-          input.uk-button.uk-button-primary type="submit" value="Send"
+        div &nbsp;
+        label.uk-form-label for="body" Body
+        textarea.uk-form-large cols="50" name="body" rows="5" placeholder="body"
+        div.uk-align-right
+          input.uk-button.uk-button-small-primary type="submit" value="Send"
 
 div.uk-grid
   div.uk-width-1-1

data/lib/splash/webadmin/portal/views/restclient_result.slim

@@ -1,28 +1,32 @@
-di  
+div  
 ul.uk-list
   li <b>HTTP Method</b> : #{@method}
   li <b>URL</b> : #{@url}
 h3 Result :
 - unless @result == false
-  table.uk_table
-    tr
-      td.uk-width-2-10
-        i.uk-icon-dollar
-        | &nbsp;<b>Return code :</b>
-      td.uk-width-8-10 #{@result.code}
-    tr
-      td.uk-width-2-10
-        i.uk-icon-file-o
-        | &nbsp;<b>Body :</b>
-      td.uk-width-8-10.uk-scrollable-text <pre><code>#{@result}</code></pre>
-    tr
-      td.uk-width-2-10
-        i.uk-icon-header
-        | &nbsp;<b>Headers :</b>
-      td.uk-width-8-10
-        ul
-          - @result.headers.each do |hkey,value|
-            li <i><b>#{hkey}:</b> &nbsp; &nbsp; #{value}</i>
+  div.uk-grid.uk-text-small
+    div.uk-width-1-2
+      table.uk-table
+        tr
+          td.uk-width-2-10
+            i.uk-icon-file-o
+            | &nbsp;<b>Body :</b>
+          td.uk-width-8-10.uk-scrollable-text <pre><code>#{@result}</code></pre>
+    div.uk-width-1-2
+      table.uk-table
+        tr
+          td.uk-width-2-10
+            i.uk-icon-dollar
+            | &nbsp;<b>Return code :</b>
+          td.uk-width-8-10 #{@result.code}
+        tr
+          td.uk-width-2-10
+            i.uk-icon-header
+            | &nbsp;<b>Headers :</b>
+          td.uk-width-8-10
+            ul
+              - @result.headers.each do |hkey,value|
+                li <i><b>#{hkey}:</b> &nbsp; &nbsp; #{value}</i>
 
 - else
   div.uk-alert.uk-alert-danger

data/lib/splash/webadmin/portal/views/sequences.slim

@@ -1,4 +1,4 @@
-h2 <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medium "></i>&nbsp;&nbsp;Sequences configured in Splash
+h2.uk-text-success <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medium "></i>&nbsp;&nbsp;Sequences configured in Splash
 
 div.uk-width-medium-1-1
   div.uk-panel.uk-panel-box

data/prometheus-splash.gemspec

@@ -25,9 +25,9 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'redis','~> 4.1.3'
   spec.add_runtime_dependency 'bunny','~> 2.15.0'
   spec.add_runtime_dependency 'ps-ruby','~> 0.0.4'
-  spec.add_runtime_dependency 'tty-markdown','~> 0.6.0'
-  spec.add_runtime_dependency 'tty-pager','~> 0.12.0'
-  spec.add_runtime_dependency 'tty-table','~> 0.11.0'
+  spec.add_runtime_dependency 'tty-markdown','~> 0.7.0'
+  spec.add_runtime_dependency 'tty-pager','~> 0.14.0'
+  spec.add_runtime_dependency 'tty-table','~> 0.12.0'
   spec.add_runtime_dependency 'net-ssh','~> 6.1.0'
   spec.add_runtime_dependency 'net-scp','~> 3.0.0'
   spec.add_runtime_dependency 'colorize','~> 0.8.1'
@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'thin','~> 1.7.2'
   spec.add_runtime_dependency 'rest-client','~> 2.1.0'
   spec.add_runtime_dependency 'slim','~> 4.1.0'
-  spec.add_runtime_dependency 'kramdown','~> 1.16.2'
+  spec.add_runtime_dependency 'kramdown','~> 2.3.0'
   spec.add_runtime_dependency 'rack-reverse-proxy','~> 0.12.0'
   spec.add_development_dependency 'rake', '~> 13.0.1'
   spec.add_development_dependency 'rspec', '~> 3.9.0'

data/ultragreen_roodi_coding_convention.yml

@@ -1,18 +1,18 @@
 AssignmentInConditionalCheck:
 CaseMissingElseCheck:
 ClassLineCountCheck:             
-  line_count: 300
+  line_count: 400
 ClassNameCheck:                  
   pattern: !ruby/regexp /^[A-Z][a-zA-Z0-9]*$/
 #ClassVariableCheck:
 CyclomaticComplexityBlockCheck:  
-  complexity: 5
+  complexity: 20
 CyclomaticComplexityMethodCheck: 
-  complexity: 10
+  complexity: 30
 EmptyRescueBodyCheck:
 ForLoopCheck:
 MethodLineCountCheck:            
-  line_count: 30 
+  line_count: 100
 MethodNameCheck:                 
   pattern: !ruby/regexp /^[_a-z<>=\[|+-\/\*`]+[_a-z0-9_<>=~@\[\]]*[=!\?]?$/ 
 # MissingForeignKeyIndexCheck:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-splash
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.5
 platform: ruby
 authors:
 - Romain GEORGES
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-15 00:00:00.000000000 Z
+date: 2020-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -100,42 +100,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: tty-pager
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: tty-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -240,14 +240,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.2
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.2
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: rack-reverse-proxy
   requirement: !ruby/object:Gem::Requirement
@@ -431,6 +431,7 @@ files:
 - lib/splash/loggers/dual.rb
 - lib/splash/loggers/web.rb
 - lib/splash/logs.rb
+- lib/splash/monkeys.rb
 - lib/splash/processes.rb
 - lib/splash/sequences.rb
 - lib/splash/templates.rb
@@ -456,6 +457,7 @@ files:
 - lib/splash/webadmin/portal/controllers/sequences.rb
 - lib/splash/webadmin/portal/init.rb
 - lib/splash/webadmin/portal/public/css/ultragreen.css
+- lib/splash/webadmin/portal/public/favicon.ico
 - lib/splash/webadmin/portal/public/fonts/FontAwesome.otf
 - lib/splash/webadmin/portal/public/fonts/fontawesome-webfont.ttf
 - lib/splash/webadmin/portal/public/fonts/fontawesome-webfont.woff
@@ -463,13 +465,19 @@ files:
 - lib/splash/webadmin/portal/public/images/logo_splash.png
 - lib/splash/webadmin/portal/public/images/logo_splash_reduce.png
 - lib/splash/webadmin/portal/public/images/logo_splash_tiny.png
+- lib/splash/webadmin/portal/views/command_form.slim
+- lib/splash/webadmin/portal/views/command_history.slim
 - lib/splash/webadmin/portal/views/commands.slim
 - lib/splash/webadmin/portal/views/documentation.slim
 - lib/splash/webadmin/portal/views/home.slim
 - lib/splash/webadmin/portal/views/layout.slim
+- lib/splash/webadmin/portal/views/log_form.slim
+- lib/splash/webadmin/portal/views/log_history.slim
 - lib/splash/webadmin/portal/views/logs.slim
 - lib/splash/webadmin/portal/views/nav.slim
 - lib/splash/webadmin/portal/views/not_found.slim
+- lib/splash/webadmin/portal/views/process_form.slim
+- lib/splash/webadmin/portal/views/process_history.slim
 - lib/splash/webadmin/portal/views/processes.slim
 - lib/splash/webadmin/portal/views/proxy.slim
 - lib/splash/webadmin/portal/views/restclient.slim