prometheus-splash 0.6.0 → 0.8.2

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

@@ -0,0 +1,24 @@
+- unless @data.empty?
+  h2.uk-text-success <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medium "></i>&nbsp;&nbsp;Modify Splash log monitoring : #{@data[:label]}
+- else
+  h2.uk-text-success <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medium "></i>&nbsp;&nbsp;Add new Splash log monitoring
+
+script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.2/jquery.validate.min.js"
+
+form.uk-form.uk-form-horizontal#query action="/save_log" method="POST"
+  label.uk-form-label for="label" Label
+  <input class="uk-form-width-large" id="label" type="text" placeholder="label" name="label" value="#{@data[:label].to_s}" required>
+  div &nbsp;
+  label.uk-form-label for="pattern" Pattern
+  <input class="uk-form-width-large" id="pattern" type="text" placeholder="pattern" name="pattern" value="#{@data[:pattern]}" required>
+    div &nbsp;
+  label.uk-form-label for="log" Log file
+  <input class="uk-form-width-large" id="log" type="text" placeholder="log" name="log" value="#{@data[:log]}" required>
+  div &nbsp;
+  - unless @data.empty?
+    input type="hidden" name="update" value="true"
+    input type="hidden" name="old_label" value="#{@data[:old_label].to_s}"
+  div.uk-align-right
+    input.uk-button.uk-button-small-primary type="submit" value="Submit"
+javascript:
+  $("#query").validate();

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

@@ -3,7 +3,7 @@ nav.uk-navbar.uk-navbar-attached(data-uk-sticky)
   ul.uk-navbar-nav.uk-hidden-small
     - for item in @menu
       li class=( (item == @current_item)? "uk-active" : "uk-inactive")
-        a href="/#{item.downcase}" title="Access to #{item.capitalize}" <i class="uk-icon-#{@menu_icons[item]}"></i> #{item.capitalize}
+        a.uk-navbar-nav-subtitle href="/#{item.downcase}" title="Access to #{item.capitalize}" <i class="uk-icon-#{@menu_icons[item]}"></i><div> #{item.capitalize}</div>
   a.uk-navbar-toggle.uk-visible-small(href="#offcanvas" data-uk-offcanvas)
   div.uk-navbar-brand.uk-navbar-left.uk-visible-small
     <i class="uk-icon-arrow-left"></i> Menu

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

@@ -1,3 +1,3 @@
-h2 404 : Page not found
+h2.uk-text-danger 404 : Page not found
 p Ressource or page #{@path} not found
 p Please click <a href='/'>here</a> to return home

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

@@ -1,4 +1,4 @@
-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
 
 div.uk-width-medium-1-1
   div.uk-panel.uk-panel-box

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
@@ -11,3 +11,6 @@ div.uk-width-medium-1-1
       li
         i.uk-icon-hand-o-right
         a href="#{@pushgateway_url}" &nbsp;Prometheus PushGateway
+      li
+        i.uk-icon-hand-o-right
+        a href="#{@alertmanager_url}" &nbsp;Prometheus Alertmanager

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

@@ -0,0 +1,50 @@
+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
+    span.uk-text-large.uk-text-bold List of sequences availables
+    br
+
+    div.uk-accordion(data-uk-accordion)
+      - @data.each do |sequence,content|
+        h3.uk-accordion-title <b>Name</b> : #{sequence}
+        div.uk-accordion-content
+          table.uk-table.uk-table-hover.uk-table-striped
+            thead
+              tr
+                th Options
+                th Definition
+                th Actions
+            tbody
+              tr
+                td
+                  dl.uk-description-list-horizontal
+
+                    - if content[:options]
+                      - if content[:options][:continue]
+                        ul
+                          li <i class="uk-icon-check-square-o"></i>&nbsp;<b>Continue execution on error</b> : #{content[:options][:continue]}
+                    - if content[:schedule]
+                      ul
+                        li <i class="uk-icon-calendar"></i>&nbsp;<b>Scheduling</b> :
+                          <ul>
+                            <li> <b><i>Type</b></i> : #{content[:schedule].keys.first}</li>
+                            <li> <b><i>Value</b></i> : #{content[:schedule].values.first}</li>
+                          </ul>
+                td
+                  dl.uk-description-list-horizontal
+                    - content[:definition].each_with_index do |step,i|
+                      dt <i class="uk-icon-check-square-o"></i>&nbsp;Step #{i+1} :
+                      dd #{step[:step]}
+                      ul
+                        li <i class="uk-icon-cog"></i>&nbsp;<b>Command</b> : #{step[:command]}
+                        - if step[:on_host]
+                          li <i class="uk-icon-chevron-circle-right"></i>&nbsp;<b>Remote execution target</b> : #{step[:on_host]}
+                        - if not step[:callback].nil?
+                          li <i class="uk-icon-share-square-o"></i>&nbsp;<b>Execute Callback</b> : #{step[:callback]}
+                        - if not step[:trace].nil?
+                          li <i class="uk-icon-pencil-square-o"></i>&nbsp;<b>Trace Execution</b> : #{step[:trace]}
+                        - if not step[:notify].nil?
+                          li <i class="uk-icon-external-link"></i>&nbsp;<b>Notify Execution in Prometheus</b> : #{step[:notify]}
+
+                td

data/prometheus-splash.gemspec

@@ -26,7 +26,10 @@ Gem::Specification.new do |spec|
   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.1'
+  spec.add_runtime_dependency 'tty-pager','~> 0.12.0'
+  spec.add_runtime_dependency 'tty-table','~> 0.11.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'
   spec.add_runtime_dependency 'sinatra','~> 2.1.0'
   spec.add_runtime_dependency 'thin','~> 1.7.2'
@@ -41,6 +44,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'roodi', '~> 5.0.0'
   spec.add_development_dependency 'code_statistics', '~> 0.2.13'
   spec.add_development_dependency 'yard-rspec', '~> 0.1'
-
+  spec.add_development_dependency 'bundler', '~> 2.1.4'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-splash
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.2
 platform: ruby
 authors:
 - Romain GEORGES
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-07 00:00:00.000000000 Z
+date: 2020-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -114,14 +114,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.12.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.0
+- !ruby/object:Gem::Dependency
+  name: tty-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.1.0
+- !ruby/object:Gem::Dependency
+  name: net-scp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -318,6 +360,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.4
 description: Prometheus Logs and Batchs supervision over PushGateway and commands
   orchestration
 email:
@@ -350,6 +406,8 @@ files:
 - lib/splash/cli/documentation.rb
 - lib/splash/cli/logs.rb
 - lib/splash/cli/process.rb
+- lib/splash/cli/sequences.rb
+- lib/splash/cli/transfers.rb
 - lib/splash/cli/webadmin.rb
 - lib/splash/commands.rb
 - lib/splash/config.rb
@@ -374,7 +432,9 @@ files:
 - lib/splash/loggers/web.rb
 - lib/splash/logs.rb
 - lib/splash/processes.rb
+- lib/splash/sequences.rb
 - lib/splash/templates.rb
+- lib/splash/transfers.rb
 - lib/splash/transports.rb
 - lib/splash/transports/rabbitmq.rb
 - lib/splash/webadmin.rb
@@ -383,6 +443,7 @@ files:
 - lib/splash/webadmin/api/routes/init.rb
 - lib/splash/webadmin/api/routes/logs.rb
 - lib/splash/webadmin/api/routes/process.rb
+- lib/splash/webadmin/api/routes/sequences.rb
 - lib/splash/webadmin/main.rb
 - lib/splash/webadmin/portal/controllers/commands.rb
 - lib/splash/webadmin/portal/controllers/documentation.rb
@@ -392,8 +453,10 @@ files:
 - lib/splash/webadmin/portal/controllers/processes.rb
 - lib/splash/webadmin/portal/controllers/proxy.rb
 - lib/splash/webadmin/portal/controllers/restclient.rb
+- 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
@@ -406,12 +469,14 @@ files:
 - lib/splash/webadmin/portal/views/home.slim
 - lib/splash/webadmin/portal/views/layout.slim
 - lib/splash/webadmin/portal/views/logs.slim
+- lib/splash/webadmin/portal/views/logs_form.slim
 - lib/splash/webadmin/portal/views/nav.slim
 - lib/splash/webadmin/portal/views/not_found.slim
 - lib/splash/webadmin/portal/views/processes.slim
 - lib/splash/webadmin/portal/views/proxy.slim
 - lib/splash/webadmin/portal/views/restclient.slim
 - lib/splash/webadmin/portal/views/restclient_result.slim
+- lib/splash/webadmin/portal/views/sequences.slim
 - prometheus-splash.gemspec
 - spec/helpers_spec.rb
 - spec/templates_spec.rb