uzebba 0.1.3 → 0.1.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/uzebba/uzebba.js +1 -1
  3. data/app/controllers/uzebba/application_controller.rb +6 -3
  4. data/app/controllers/uzebba/terminals_controller.rb +2 -2
  5. data/app/views/uzebba/terminals/_cpu_usage.html.erb +2 -2
  6. data/app/views/uzebba/terminals/_memory_usage.html.erb +3 -2
  7. data/app/views/uzebba/terminals/_system_info.html.erb +1 -1
  8. data/lib/generators/uzebba/templates/cronotab.rb +2 -2
  9. data/lib/uzebba/version.rb +1 -1
  10. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e927cc221b1145848fc0e3acbb967121893b0a84
4
- data.tar.gz: be2be2183c69ced1dd2fd9a2df51ce5fba3e2889
3
+ metadata.gz: 1e488f4a324b87ea438697e5e20f083e6eaffe62
4
+ data.tar.gz: 76cf3fe89dee9f2ae2e2b90759a289022f394beb
5
5
  SHA512:
6
- metadata.gz: bde10cbbc683302586a8ef23a0c0c1b01c51bb156561940768d613caaa0d0e18a879bc6d03d81cff13f5d497a8fb2d1ba700c069ee4020baad9a8b1d83e5d734
7
- data.tar.gz: a0c6953278d7d9ecd3dc3ed83efcb6d419b0c52805e205b02bbfd124757401fb3343d36134318abb3dfd6508231fa9b8638fc84e660d371335cff1f0702931ea
6
+ metadata.gz: 6b3150c115089f56232fd196cec064efc3073bb85f07a9494f7d23fc53514117c074f526f35fab7eac285c4d28006db5a99602aa5f48e903a414e8b63c72b513
7
+ data.tar.gz: 474c54cdbc2bfaa39f8fea604a4bd28b3a789370859a80d2de2c6679e5ff97ef581fd375c13a359ebf4bcfc06729540f27a1ea4a888a7a4b26733b3de9110e84
data/app/assets/javascripts/uzebba/uzebba.js CHANGED
@@ -1,7 +1,7 @@
1
1
  // UZEBBA MONITORING TOOL JS
2
2
  //
3
3
  // require rails-ujs
4
- //= require jquery3.min
4
+ //= require jquery3
5
5
  //= require Chart.bundle
6
6
  //= require chartkick
7
7
 
data/app/controllers/uzebba/application_controller.rb CHANGED
@@ -1,4 +1,7 @@
1
- class Uzebba::ApplicationController < ::ApplicationController
2
- protect_from_forgery with: :exception
3
-
1
+ module Uzebba
2
+ class ApplicationController < ActionController::Base
3
+ protect_from_forgery with: :exception
4
+
5
+ end
4
6
  end
7
+
data/app/controllers/uzebba/terminals_controller.rb CHANGED
@@ -5,11 +5,11 @@ module Uzebba
5
5
  def index
6
6
  @terminals = Terminal.order(Arel.sql(" created_at DESC")).all.first(10)
7
7
  if Gem.win_platform?
8
- @terminal = Terminal.create :memory_usage => (`wmic OS get TotalVisibleMemorySize /Value`.scan(/\d/).join('').to_d - `wmic OS get FreePhysicalMemory /Value`.scan(/\d/).join('').to_d)/1000,
8
+ @terminal = Terminal.limit(10).create :memory_usage => (`wmic OS get TotalVisibleMemorySize /Value`.scan(/\d/).join('').to_d - `wmic OS get FreePhysicalMemory /Value`.scan(/\d/).join('').to_d)/1000,
9
9
  :cpu_usage => `wmic cpu get loadpercentage`.scan(/\d/).join('').to_i
10
10
  else
11
11
  @terminal = Terminal.create :memory_usage => (`cat /proc/meminfo | grep MemTotal`.scan(/\d/).join('').to_d - `cat /proc/meminfo | grep MemFree`.scan(/\d/).join('').to_d)/1000,
12
- :cpu_usage => `(grep 'cpu ' /proc/stat;sleep 0.1;grep 'cpu ' /proc/stat)|awk -v RS="" '{print "CPU "($13-$2+$15-$4)*100/($13-$2+$15-$4+$16-$5)"%"}'`.scan(/\d/).join('').to_f
12
+ :cpu_usage => `(grep 'cpu ' /proc/stat;sleep 0.1;grep 'cpu ' /proc/stat)|awk -v RS="" '{print "CPU "($13-$2+$15-$4)*100/($13-$2+$15-$4+$16-$5)"%"}'`.scan(/\d/).join('').to_s.first(2).to_f
13
13
  end
14
14
  end
15
15
  end
data/app/views/uzebba/terminals/_cpu_usage.html.erb CHANGED
@@ -1,11 +1,11 @@
1
1
  <h3>CPU USAGE</h3>
2
- <%= line_chart Uzebba::Terminal.group_by_minute(:created_at).maximum(:cpu_usage) %>
2
+ <%= line_chart Uzebba::Terminal.group_by_minute(:created_at, last: 45).maximum(:cpu_usage) %>
3
3
  <h3>
4
4
  <% if Gem.win_platform? %>
5
5
  <small style="color: green;">
6
6
  CPU USAGE(win) => <%= `wmic cpu get loadpercentage`.scan(/\d/).join('').to_i %> %
7
7
  </small>
8
8
  <% else %>
9
- <%= `(grep 'cpu ' /proc/stat;sleep 0.1;grep 'cpu ' /proc/stat)|awk -v RS="" '{print "CPU "($13-$2+$15-$4)*100/($13-$2+$15-$4+$16-$5)"%"}'`.scan(/\d/).join('').to_d %>
9
+ <%= `(grep 'cpu ' /proc/stat;sleep 0.1;grep 'cpu ' /proc/stat)|awk -v RS="" '{print "CPU "($13-$2+$15-$4)*100/($13-$2+$15-$4+$16-$5)"%"}'`.scan(/\d/).join('').to_s.first(2).to_i %>
10
10
  <% end %>
11
11
  </h3>
data/app/views/uzebba/terminals/_memory_usage.html.erb CHANGED
@@ -1,7 +1,8 @@
1
1
  <h3>
2
- MEMORY [ TotalMemory: <%= total_mem %> MB ]
2
+ MEMORY [Total: <%= number_with_delimiter(total_mem.ceil, :delimiter => ',') %> MB]
3
+ [<%= (total_mem/1000).to_s[0,4] %> GB]
3
4
  </h3>
4
- <%= area_chart Uzebba::Terminal.group_by_minute(:created_at).maximum(:memory_usage), min: @terminal.memory_usage.to_d - 1000, xtitle: "Time", ytitle: "in Megabytes" %>
5
+ <%= area_chart Uzebba::Terminal.group_by_minute(:created_at, last: 40).maximum(:memory_usage), min: @terminal.memory_usage.to_d - 1000, xtitle: "Time", ytitle: "in Megabytes" %>
5
6
  <br>
6
7
  <h3>
7
8
  <small style="color: blue;">
data/app/views/uzebba/terminals/_system_info.html.erb CHANGED
@@ -4,7 +4,7 @@
4
4
  <tbody>
5
5
  <tr>
6
6
  <th>Tool Name</th>
7
- <td><strong>Uzebba Monitoring Tool</strong> </td>
7
+ <td><strong><a href="https://github.com/ohiodn8/uzebba" target="_blank">Uzebba Monitoring Tool</a></strong> </td>
8
8
  </tr>
9
9
  <tr>
10
10
  <th>Computer Name</th>
data/lib/generators/uzebba/templates/cronotab.rb CHANGED
@@ -14,7 +14,7 @@
14
14
  if Gem.win_platform?
15
15
  @terminal = Uzebba::Terminal.create :memory_usage => (`wmic OS get TotalVisibleMemorySize /Value`.scan(/\d/).join('').to_d - `wmic OS get FreePhysicalMemory /Value`.scan(/\d/).join('').to_d)/1000, :cpu_usage => `wmic cpu get loadpercentage`.scan(/\d/).join('').to_i
16
16
  else
17
- @terminal = Uzebba::Terminal.create :memory_usage => (`cat /proc/meminfo | grep MemTotal`.scan(/\d/).join('').to_d - `cat /proc/meminfo | grep MemFree`.scan(/\d/).join('').to_d)/1000
17
+ @terminal = Uzebba::Terminal.create :memory_usage => (`cat /proc/meminfo | grep MemTotal`.scan(/\d/).join('').to_d - `cat /proc/meminfo | grep MemFree`.scan(/\d/).join('').to_d)/1000, :cpu_usage => `(grep 'cpu ' /proc/stat;sleep 0.1;grep 'cpu ' /proc/stat)|awk -v RS="" '{print "CPU "($13-$2+$15-$4)*100/($13-$2+$15-$4+$16-$5)"%"}'`.scan(/\d/).join('').to_s.first(2).to_f
18
18
  end
19
19
  end
20
20
  end
@@ -25,4 +25,4 @@
25
25
  end
26
26
  end
27
27
  Crono.perform(TerminalsJob).every 1.minute
28
- Crono.perform(TerminalsDeleteJob).every 4.hours
28
+ Crono.perform(TerminalsDeleteJob).every 1.hours
data/lib/uzebba/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Uzebba
2
- VERSION = '0.1.3'
2
+ VERSION = '0.1.4'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: uzebba
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.3
4
+ version: 0.1.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - odion ohio
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-11-08 00:00:00.000000000 Z
11
+ date: 2018-12-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: jquery-rails