rails_performance 1.4.1 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a493c11a3166ec07cfc2b6f2d4956cc09b867c24d280ba97836d411df384679
-  data.tar.gz: 700cf3ac2d08eed0fcd0a8549e8488b88e1b92b79019efc8db17c7f4a0370d6b
+  metadata.gz: 60fc2568e878c07db112623ef55985422852996f3eea18fd972c9ccc0288fd1a
+  data.tar.gz: 3ff0036deb507e91fd9ac1ab63cafac95e98aeb59646ca566dff403a2bcdc1d6
 SHA512:
-  metadata.gz: 49eef9ff013e574007cea89b8fe288fa4d627e8a72cfc3770a4a8e291d599d99905f61eb5c103ad5c3f749158cffb4179f8fd39a40159f6ee759fee6422dc548
-  data.tar.gz: 7d17c31b43b65a912c05f9de138959e19442412c9fe3dbecb70973c8133d6cf341ad409e1abf99f71a2511edec9664a71ed14cd39d2ac96ee113874f994818b3
+  metadata.gz: 28a6b7d3918eaabb97a4cabcdbc95e66cca45dba61c416f90ed083e6508df79333a0e2c209fb3d1d1654a1516587dda5387eb88a42518a4b602cb77b4c83922e
+  data.tar.gz: '0179ca0fdece9492e9053820aa025d0210391957d9eee2cac714bc0e8611003b467ff8d06bf91cb27d0eb8024bc4a8d77a56410aa7879a701be0d9df59ed8ee1'

data/README.md

@@ -2,7 +2,9 @@
 
 [![Tests](https://github.com/igorkasyanchuk/rails_performance/actions/workflows/ruby.yml/badge.svg)](https://github.com/igorkasyanchuk/rails_performance/actions/workflows/ruby.yml)
 [![RailsJazz](https://github.com/igorkasyanchuk/rails_time_travel/blob/main/docs/my_other.svg?raw=true)](https://www.railsjazz.com)
-[![Listed on OpenSource-Heroes.com](https://opensource-heroes.com/badge-v1.svg)](https://opensource-heroes.com/r/igorkasyanchuk/rails_performance)
+[My Cheatsheets](https://cheatsheetshero.com/user/igor-kasyanchuk)
+
+[!["Buy Me A Coffee"](https://github.com/igorkasyanchuk/get-smart/blob/main/docs/snapshot-bmc-button-small.png?raw=true)](https://buymeacoffee.com/igorkasyanchuk)
 
 A self-hosted tool to monitor the performance of your Ruby on Rails application.
 
@@ -43,7 +45,7 @@ All data are stored in `local` Redis and not sent to any 3rd party servers.
 
 ## Production
 
-Gem is production-ready. At least on my 2 applications with ~800 unique users per day it works perfectly.
+Gem is production-ready. At least in my 2 applications with ~800 unique users per day it works perfectly.
 
 Just don't forget to protect performance dashboard with http basic auth or check of current_user.
 
@@ -66,7 +68,7 @@ RailsPerformance.setup do |config|
   config.redis    = Redis.new(url: ENV["REDIS_URL"].presence || "redis://127.0.0.1:6379/0") # or Redis::Namespace.new("rails-performance", redis: Redis.new), see below in README
   config.duration = 4.hours
 
-  config.debug    = false # currently not used>
+  config.debug    = false # currently not used
   config.enabled  = true
 
   # configure Recent tab (time window and limit of requests)
@@ -170,6 +172,7 @@ After installation and configuration, start your Rails application, make a few r
 
 If you, for whatever reason (company policy, devise, ...) need to mount RailsPerformance yourself, feel free to do so by using the following snippet as inspiration.
 You can skip the `mount_at` and `http_basic_authentication_*` configurations then, if you like.
+Under certain constraints (i.e. subdomains) it may be necessary to set `url_options` in the config so that RailsPeformance can generate links correctly.
 
 ```ruby
 # config/routes.rb
@@ -221,10 +224,10 @@ env:
     RAILS_PERFORMANCE_SERVER_ID: "server"
 ```
 
-You can also specifify custom "context" and "role" for monitoring, by changing the env variables:
+You can also specify custom "context" and "role" for monitoring, by changing the env variables:
 
 ```ruby
-RailsPerformance::Extensions::ResourceMonitor.new(
+RailsPerformance::SystemMonitor::ResourcesMonitor.new(
   ENV["RAILS_PERFORMANCE_SERVER_CONTEXT"].presence || "rails",
   ENV["RAILS_PERFORMANCE_SERVER_ROLE"].presence || "web"
 )
@@ -242,7 +245,7 @@ RailsPerformance.measure("some label", "some namespace") do
 end
 ```
 
-## Using with Rails Namespace
+## Using with Redis Namespace
 
 If you want to use Redis namespace (for example when you have multiple apps running on the same server), you can configure it like this:
 
@@ -321,6 +324,15 @@ The idea of this gem grew from curiosity how many RPM my app receiving per day.
 - sinatra?
 - tests to check what is actually stored in redis db after request
 - upgrade bulma
+- optimize svg icons, remove inline svg (switch to base64 or assets)
+
+## Development
+
+1. Clone the repo
+2. Run `bundle install`
+3. Setup dummy app `cd test/dummy && bundle install && rails db:create && rails db:migrate`
+4. Run `rails s` in the root folder
+5. Run `rails test` to run tests
 
 ## Contributing
 
@@ -332,14 +344,11 @@ If "schema" how records are stored i Redis is changed, and this is a breaking ch
 
 https://github.com/igorkasyanchuk/rails_performance/graphs/contributors
 
-## Other
-
-[<img src="https://opensource-heroes.com/svg/embed/igorkasyanchuk/rails_performance"
-/>](https://opensource-heroes.com/r/igorkasyanchuk/rails_performance)
-
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
 
 [<img src="https://github.com/igorkasyanchuk/rails_time_travel/blob/main/docs/more_gems.png?raw=true"
 />](https://www.railsjazz.com/?utm_source=github&utm_medium=bottom&utm_campaign=rails_performance)
+
+[!["Buy Me A Coffee"](https://github.com/igorkasyanchuk/get-smart/blob/main/docs/snapshot-bmc-button.png?raw=true)](https://buymeacoffee.com/igorkasyanchuk)

data/app/assets/images/details.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
+  <path stroke-linecap="round" stroke-linejoin="round" d="m21 21-5.197-5.197m0 0A7.5 7.5 0 1 0 5.196 5.196a7.5 7.5 0 0 0 10.607 10.607ZM10.5 7.5v6m3-3h-6" />
+</svg>

data/app/assets/images/external.svg

@@ -0,0 +1 @@
+<?xml version="1.0"?><svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g><path d="M0 0h24v24H0z" fill="none"/><path d="M10 6v2H5v11h11v-5h2v6a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V7a1 1 0 0 1 1-1h6zm11-3v8h-2V6.413l-7.793 7.794-1.414-1.414L17.585 5H13V3h8z"/></g></svg>

data/app/controllers/rails_performance/base_controller.rb

@@ -4,6 +4,7 @@ module RailsPerformance
     layout "rails_performance/layouts/rails_performance"
 
     before_action :verify_access
+    after_action :set_permissive_csp
 
     if RailsPerformance.http_basic_authentication_enabled
       http_basic_authenticate_with \
@@ -11,11 +12,19 @@ module RailsPerformance
         password: RailsPerformance.http_basic_authentication_password
     end
 
+    def url_options
+      RailsPerformance.url_options.nil? ? super : RailsPerformance.url_options
+    end
+
     private
 
     def verify_access
       result = RailsPerformance.verify_access_proc.call(self)
       redirect_to("/", error: "Access Denied", status: 401) unless result
     end
+
+    def set_permissive_csp
+      response.headers["Content-Security-Policy"] = "default-src 'self' https:; script-src 'self' 'unsafe-inline' 'unsafe-eval' https:; style-src 'self' 'unsafe-inline' https:"
+    end
   end
 end

data/app/helpers/rails_performance/rails_performance_helper.rb

@@ -23,6 +23,10 @@ module RailsPerformance
     end
 
     def extract_duration(str)
+      if str.is_a?(Hash)
+        return str[:duration].to_s if str[:duration]
+      end
+
       if str =~ /Duration: (\d+.?\d+?ms)/i
         $1
       else

data/app/views/rails_performance/javascripts/app.js

@@ -6,6 +6,7 @@ function showChart(element_id, type, title, options) {
       chart: {
         type: type,
         height: 300,
+        width: '100%',
         zoom: {
           type: 'x',
         },

data/app/views/rails_performance/rails_performance/_recent_row.html.erb

@@ -9,12 +9,24 @@
   <td><%= format_datetime e[:datetime] %></td>
   <td>
     <% controller_action_info = e[:controller] + '#' + e[:action]%>
-    <%= link_to truncate(controller_action_info, length: 40), rails_performance.rails_performance_summary_path({controller_eq: e[:controller], action_eq: e[:action]}), remote: true, title: controller_action_info %>
+    <%= link_to rails_performance.rails_performance_summary_path({controller_eq: e[:controller], action_eq: e[:action]}), remote: true, title: controller_action_info do %>
+      <span class="details_icon">
+        <%= icon 'details' %>
+      </span>
+      <%= truncate(controller_action_info, length: 40) %>
+    <% end %>
   </td>
   <td><%= e[:method] %></td>
   <td><%= e[:format] %></td>
   <td><%= bot_icon e["user_agent"] %></td>
-  <td><%= link_to_path(e) %></td>
+  <td>
+    <span class="with_external_icon">
+      <%= link_to_path(e) %>
+      <span class="icon external_icon">
+        <%= icon('external') %>
+      </span>
+    </span>
+  </td>
   <td><%= status_tag e[:status] %></td>
   <td class="nowrap"><%= ms e[:duration] %></td>
   <td class="nowrap"><%= ms e[:view_runtime] %></td>

data/app/views/rails_performance/rails_performance/_summary.html.erb

@@ -5,7 +5,7 @@
 <div id="response_time_report_chart_mini" class="chart_mini"></div>
 
 <h2 class="subtitle"><%= title %></h2>
-<table class="table is-fullwidth is-hoverable is-narrow is-size-9">
+<table class="table is-fullwidth is-hoverable is-narrow is-size-8">
   <thead>
     <tr>
       <th data-sort="string">Datetime</th>
@@ -25,7 +25,14 @@
         <td><%= format_datetime e[:datetime] %></td>
         <td><%= e[:method] %></td>
         <td><%= bot_icon e["user_agent"] %></td>
-        <td><%= link_to_path(e) %></td>
+        <td>
+          <span class="with_external_icon">
+            <%= link_to_path(e) %>
+            <span class="icon external_icon">
+              <%= icon('external') %>
+            </span>
+          </span>
+        </td>
         <td><%= e[:format] %></td>
         <td><%= status_tag e[:status] %></td>
         <td class="nowrap"><%= ms e[:duration] %></td>

data/app/views/rails_performance/rails_performance/crashes.html.erb

@@ -35,11 +35,25 @@
         <% @data.each do |e| %>
           <tr>
             <td><%= format_datetime e[:datetime] %></td>
-            <td><%= link_to e[:controller] + '#' + e[:action], rails_performance.rails_performance_summary_path({controller_eq: e[:controller], action_eq: e[:action]}), remote: true %></td>
+            <td>
+              <%= link_to rails_performance.rails_performance_summary_path({controller_eq: e[:controller], action_eq: e[:action]}), remote: true do %>
+                <span class="details_icon">
+                  <%= icon 'details' %>
+                </span>
+                <%= e[:controller] + '#' + e[:action] %>
+              <% end %>
+            </td>
             <td><%= e[:method] %></td>
             <td><%= e[:format] %></td>
             <td><%= bot_icon e["user_agent"] %></td>
-            <td><%= link_to_path(e) %></td>
+            <td>
+              <span class="with_external_icon">
+                <%= link_to_path(e) %>
+                <span class="icon external_icon">
+                  <%= icon('external') %>
+                </span>
+              </span>
+            </td>
             <td><%= e[:exception] %></td>
             <td class="very-small-text">
               <%= raw e[:backtrace]&.join("<br/>") %>

data/app/views/rails_performance/rails_performance/requests.html.erb

@@ -36,7 +36,14 @@
           <% groups = e[:group].split("|") %>
           <% c, a = groups[0].split("#") %>
           <tr>
-            <td><%= link_to groups[0],  rails_performance.rails_performance_summary_path({controller_eq: c, action_eq: a}), remote: true %></td>
+            <td>
+              <%= link_to rails_performance.rails_performance_summary_path({controller_eq: c, action_eq: a}), remote: true do %>
+                <span class="details_icon">
+                  <%= icon 'details' %>
+                </span>
+                <%= groups[0] %>
+              <% end %>
+            </td>
             <td><%= link_to groups[1].try(:upcase),  rails_performance.rails_performance_summary_path({controller_eq: c, action_eq: a, format_eq: groups[1]}), remote: true %></td>
             <td><%= e[:count] %></td>
             <td class="nowrap attention"><%= ms e[:p50_duration] %></td>

data/app/views/rails_performance/rails_performance/resources.html.erb

@@ -1,50 +1,23 @@
 <title>System Resources</title>
 
-<% @resources_report.data.keys.each do |server_key| %>
-  <h1 class="title mt-8 pt-8"><%= server_key.split("///"). join(", ") %></h1>
-
-  <div class="card">
-    <div class="card-content">
-      <h2 class="subtitle">CPU</h2>
-      <div id="cpu_report_<%= server_key.parameterize %>" class="chart"></div>
-      <p class="content is-small">CPU usage %, average per 1 minute</p>
-    </div>
-  </div>
-
-  <br/>
-
-  <div class="card">
-    <div class="card-content">
-      <h2 class="subtitle">Memory</h2>
-      <div id="memory_report_<%= server_key.parameterize %>" class="chart"></div>
-      <p class="content is-small">App memory usage</p>
-    </div>
-  </div>
-
-  <br/>
-
-  <div class="card">
-    <div class="card-content">
-      <h2 class="subtitle">Storage</h2>
-      <div id="disk_report_<%= server_key.parameterize %>" class="chart"></div>
-      <p class="content is-small">Available storage size (local disk size)</p>
+<% @resources_report.servers.each do |server| %>
+  <h1 class="title mt-8 pt-8"><%= server.name %></h1>
+
+  <% server.charts.each.with_index do |chart, index| %>
+    <div class="card">
+      <div class="card-content">
+        <h2 class="subtitle"><%= chart.subtitle %></h2>
+        <div class="chart" id="<%= chart.id %>"></div>
+        <p class="content is-small"><%= chart.description %></p>
+      </div>
     </div>
-  </div>
-
-  <br>
-<% end %>
-
-<% content_for :on_load do %>
-  <script>
-    <% @resources_report.data.keys.each do |server_key| %>
-      var data1 = <%= raw @resources_report.cpu[server_key].to_json %>;
-      showPercentageChart('cpu_report_<%= server_key.parameterize %>', data1, 'CPU');
 
-      var data2 = <%= raw @resources_report.memory[server_key].to_json %>;
-      showUsageChart('memory_report_<%= server_key.parameterize %>', data2, 'Usage', 2);
+    <br/>
 
-      var data3 = <%= raw @resources_report.disk[server_key].to_json %>;
-      showUsageChart('disk_report_<%= server_key.parameterize %>', data3, 'Available', 3);
+    <% content_for :on_load do %>
+      <script>
+        show<%= chart.type %>Chart('<%= chart.id %>', <%= raw chart.data.to_json %>, '<%= chart.legend %>', <%= index %>);
+      </script>
     <% end %>
-  </script>
+  <% end %>
 <% end %>

data/app/views/rails_performance/stylesheets/panel.css

@@ -32,13 +32,25 @@
 .cd-panel__container {
   z-index: 100;
   position: fixed;
-  width: 800px;
+  width: 1200px;
   height: 100%;
   top: 0;
   transition: transform 0.3s 0s;
   overflow: scroll;
 }
 
+@media (max-width: 1200px) {
+  .cd-panel__container {
+    width: 800px;
+  }
+}
+
+@media (max-width: 768px) {
+  .cd-panel__container {
+    width: 500px;
+  }
+}
+
 .cd-panel--from-right .cd-panel__container {
   right: 0;
   transform: translate3d(100%, 0, 0);
@@ -57,4 +69,4 @@
 .cd-panel__container .panel {
   background: white;
   min-height: 100vh;
-}
+}

data/app/views/rails_performance/stylesheets/style.css

@@ -62,6 +62,33 @@
   color: red;
 }
 
+.external_icon svg {
+  width: 12px;
+  height: 12px;
+  color: #eee;
+  margin-left: -4px;
+  opacity: 0;
+}
+
+.details_icon {
+  position: relative;
+  width: 14px;
+  height: 14px;
+}
+
+.details_icon svg {
+  position: relative;
+  top: 2px;
+  width: 14px;
+  height: 14px;
+}
+
+.with_external_icon:hover {
+  .external_icon svg {
+    opacity: 1;
+  }
+}
+
 .user-agent-icon svg {
   width: 12px;
   height: 12px;
@@ -77,7 +104,19 @@
 
 .chart_mini {
   height: 200px;
-  width: 720px;
+  width: 1160px;
+}
+
+@media (max-width: 1200px) {
+  .chart_mini {
+    width: 770px;
+  }
+}
+
+@media (max-width: 768px) {
+  .chart_mini {
+    width: 400px;
+  }
 }
 
 .red {

data/lib/generators/rails_performance/install/templates/initializer.rb

@@ -8,11 +8,11 @@ if defined?(RailsPerformance)
 
     # Recent Requests configuration
     config.recent_requests_time_window = 60.minutes
-    # confog.recent_requests_limit = nil # numnber of recent requests
+    # config.recent_requests_limit = nil # number of recent requests
 
     # Slow Requests configuration
     config.slow_requests_time_window = 4.hours
-    # config.slow_requests_limit = 500 # numnber of slow requests
+    # config.slow_requests_limit = 500 # number of slow requests
     config.slow_requests_threshold = 500 # ms
 
     config.debug = false # currently not used>
@@ -31,6 +31,9 @@ if defined?(RailsPerformance)
     # for example when you have `current_user`
     # config.verify_access_proc = proc { |controller| controller.current_user && controller.current_user.admin? }
 
+    # Override engine url options, necessary if hosting under a unique domain
+    # config.url_options = {host: "sub.example.com"}
+
     # You can ignore endpoints with Rails standard notation controller#action
     # config.ignored_endpoints = ['HomeController#contact']
 

data/lib/rails_performance/engine.rb

@@ -2,7 +2,7 @@ require "action_view/log_subscriber"
 require_relative "rails/middleware"
 require_relative "models/collection"
 require_relative "instrument/metrics_collector"
-require_relative "extensions/resources_monitor"
+require_relative "system_monitor/resources_monitor"
 
 module RailsPerformance
   class Engine < ::Rails::Engine
@@ -16,7 +16,7 @@ module RailsPerformance
       next if $rails_performance_running_mode == :console # rubocop:disable Style/GlobalVars
 
       # start monitoring
-      RailsPerformance._resource_monitor = RailsPerformance::Extensions::ResourceMonitor.new(
+      RailsPerformance._resource_monitor = RailsPerformance::SystemMonitor::ResourcesMonitor.new(
         ENV["RAILS_PERFORMANCE_SERVER_CONTEXT"].presence || "rails",
         ENV["RAILS_PERFORMANCE_SERVER_ROLE"].presence || "web"
       )
@@ -44,7 +44,7 @@ module RailsPerformance
               RailsPerformance._resource_monitor.stop_monitoring
               RailsPerformance._resource_monitor = nil
               # start background monitoring
-              RailsPerformance._resource_monitor = RailsPerformance::Extensions::ResourceMonitor.new(
+              RailsPerformance._resource_monitor = RailsPerformance::SystemMonitor::ResourcesMonitor.new(
                 ENV["RAILS_PERFORMANCE_SERVER_CONTEXT"].presence || "sidekiq",
                 ENV["RAILS_PERFORMANCE_SERVER_ROLE"].presence || "background"
               )

data/lib/rails_performance/models/resource_record.rb

@@ -26,16 +26,13 @@ module RailsPerformance
       end
 
       def record_hash
-        {
+        value.symbolize_keys.merge({
           server: server,
           role: role,
           context: context,
           datetime: datetime,
-          datetimei: RailsPerformance::Utils.from_datetimei(datetimei.to_i),
-          cpu: value["cpu"],
-          memory: value["memory"],
-          disk: value["disk"]
-        }
+          datetimei: RailsPerformance::Utils.from_datetimei(datetimei.to_i)
+        })
       end
 
       def save

data/lib/rails_performance/reports/resources_report.rb

@@ -1,40 +1,42 @@
 module RailsPerformance
   module Reports
     class ResourcesReport < BaseReport
-      def data
-        @data ||= db.data
-          .collect { |e| e.record_hash }
-          .group_by { |e| e[:server] + "///" + e[:context] + "///" + e[:role] }
-          # .transform_values { |v| v.sort { |a, b| b[sort] <=> a[sort] } }
-          .transform_values { |v| v.map { |e| e.merge({datetimei: e[:datetimei].to_i}) } }
-      end
+      Server = Struct.new(:report, :key) do
+        def name
+          key.split("///").join(", ")
+        end
 
-      def cpu
-        @cpu ||= data.transform_values do |v|
-          prepare_report(v.each_with_object({}) do |e, res|
-            res[e[:datetimei] * 1000] = e[:cpu]["one_min"].to_f.round(2)
-          end)
+        def charts
+          RailsPerformance.system_monitors.map do |class_name|
+            SystemMonitor.const_get(class_name).new(self)
+          end
         end
       end
 
-      def memory
-        @memory ||= data.transform_values do |v|
-          prepare_report(v.each_with_object({}) do |e, res|
-            res[e[:datetimei] * 1000] = e[:memory].to_f.round(2)
-          end)
+      def servers
+        data.keys.map do |key|
+          Server.new(self, key)
         end
       end
 
-      def disk
-        @disk ||= data.transform_values do |v|
+      def extract_signal &block
+        data.transform_values do |v|
           prepare_report(v.each_with_object({}) do |e, res|
-            res[e[:datetimei] * 1000] = e[:disk]["available"].to_f.round(2)
+            res[e[:datetimei] * 1000] = block.call(e)
           end)
         end
       end
 
       private
 
+      def data
+        @data ||= db.data
+          .collect { |e| e.record_hash }
+          .group_by { |e| e[:server] + "///" + e[:context] + "///" + e[:role] }
+          # .transform_values { |v| v.sort { |a, b| b[sort] <=> a[sort] } }
+          .transform_values { |v| v.map { |e| e.merge({datetimei: e[:datetimei].to_i}) } }
+      end
+
       def prepare_report(input)
         nullify_data(input, RailsPerformance.system_monitor_duration)
       end

data/lib/rails_performance/reports/slow_requests_report.rb

@@ -10,7 +10,7 @@ module RailsPerformance
           .collect { |e| e.record_hash }
           .select { |e| e if e[sort] > RailsPerformance.slow_requests_time_window.ago.to_i }
           .sort { |a, b| b[sort] <=> a[sort] }
-          .filter { |e| e[:duration] > RailsPerformance.slow_requests_threshold.to_i }
+          .filter { |e| e[:duration].to_f > RailsPerformance.slow_requests_threshold.to_i }
           .first(limit)
       end
 

data/lib/rails_performance/system_monitor/resource_chart.rb

@@ -0,0 +1,105 @@
+module RailsPerformance
+  module SystemMonitor
+    ResourceChart = Struct.new(:server, :key, :type, :subtitle, :description, :legend, keyword_init: true) do
+      def id
+        [key, "report", server.key.parameterize].join("_")
+      end
+
+      def data
+        all_data = server.report.extract_signal { |e| signal(e) }
+        all_data[server.key]
+      end
+
+      def signal e
+        format(e[key])
+      end
+
+      def format measurement
+        measurement
+      end
+    end
+
+    class CPULoad < ResourceChart
+      def initialize server
+        super(
+          server:,
+          key: :cpu,
+          type: "Percentage",
+          subtitle: "CPU",
+          description: "CPU load average (1 min), average per 1 minute",
+          legend: "CPU",
+        )
+      end
+
+      def format measurement
+        measurement["one_min"].to_f.round(2)
+      end
+
+      def measure
+        load_averages = Sys::CPU.load_avg
+        {
+          one_min: load_averages[0],
+          five_min: load_averages[1],
+          fifteen_min: load_averages[2]
+        }
+      rescue => e
+        ::Rails.logger.error "Error fetching CPU usage: #{e.message}"
+        {one_min: 0.0, five_min: 0.0, fifteen_min: 0.0}
+      end
+    end
+
+    class MemoryUsage < ResourceChart
+      def initialize server
+        super(
+          server:,
+          key: :memory,
+          type: "Usage",
+          subtitle: "Memory",
+          description: "App memory usage",
+          legend: "Usage",
+        )
+      end
+
+      def format measurement
+        measurement.to_f.round(2)
+      end
+
+      def measure
+        GetProcessMem.new.bytes
+      rescue => e
+        ::Rails.logger.error "Error fetching memory usage: #{e.message}"
+        0
+      end
+    end
+
+    class DiskUsage < ResourceChart
+      def initialize server
+        super(
+          server:,
+          key: :disk,
+          type: "Usage",
+          subtitle: "Storage",
+          description: "Available storage size (local disk size)",
+          legend: "Usage",
+        )
+      end
+
+      def signal measurement
+        measurement["available"].to_f.round(2)
+      end
+
+      def measure
+        path = "/"
+        stat = Sys::Filesystem.stat(path)
+        {
+          available: stat.blocks_available * stat.block_size,
+          total: stat.blocks * stat.block_size,
+          used: (stat.blocks - stat.blocks_available) * stat.block_size
+        }
+      rescue => e
+        ::Rails.logger.error "Error fetching disk space: #{e.message}"
+        {available: 0, total: 0, used: 0}
+      end
+    end
+  end
+end

data/lib/rails_performance/{extensions → system_monitor}/resources_monitor.rb

@@ -1,6 +1,8 @@
+require "rails_performance/system_monitor/resource_chart"
+
 module RailsPerformance
-  module Extensions
-    class ResourceMonitor
+  module SystemMonitor
+    class ResourcesMonitor
       attr_reader :context, :role
 
       def initialize(context, role)
@@ -39,43 +41,20 @@ module RailsPerformance
         end
       end
 
-      def run
-        cpu = fetch_process_cpu_usage
-        memory = fetch_process_memory_usage
-        disk = fetch_disk_usage
-
-        store_data({cpu:, memory:, disk:})
-      end
-
-      def fetch_process_cpu_usage
-        load_averages = Sys::CPU.load_avg
-        {
-          one_min: load_averages[0],
-          five_min: load_averages[1],
-          fifteen_min: load_averages[2]
-        }
-      rescue => e
-        ::Rails.logger.error "Error fetching CPU usage: #{e.message}"
-        {one_min: 0.0, five_min: 0.0, fifteen_min: 0.0}
+      def payload
+        monitors.reduce({}) do |data, monitor|
+          data.merge(monitor.key => monitor.measure)
+        end
       end
 
-      def fetch_process_memory_usage
-        GetProcessMem.new.bytes
-      rescue => e
-        ::Rails.logger.error "Error fetching memory usage: #{e.message}"
-        0
+      def monitors
+        @monitors ||= RailsPerformance.system_monitors.map do |class_name|
+          RailsPerformance::SystemMonitor.const_get(class_name).new(nil)
+        end
       end
 
-      def fetch_disk_usage(path = "/")
-        stat = Sys::Filesystem.stat(path)
-        {
-          available: stat.blocks_available * stat.block_size,
-          total: stat.blocks * stat.block_size,
-          used: (stat.blocks - stat.blocks_available) * stat.block_size
-        }
-      rescue => e
-        ::Rails.logger.error "Error fetching disk space: #{e.message}"
-        {available: 0, total: 0, used: 0}
+      def run
+        store_data(payload)
       end
 
       def store_data(data)

data/lib/rails_performance/version.rb

@@ -1,4 +1,4 @@
 module RailsPerformance
-  VERSION = "1.4.1"
+  VERSION = "1.4.3"
   SCHEMA = "1.0.2"
 end

data/lib/rails_performance.rb

@@ -119,10 +119,20 @@ module RailsPerformance
   mattr_accessor :ignore_trace_headers
   @@ignore_trace_headers = ["datetimei"]
 
+  mattr_accessor :url_options
+  @@url_options = nil
+
   # System monitor duration (expiration time)
   mattr_accessor :system_monitor_duration
   @@system_monitor_duration = 24.hours
 
+  mattr_accessor :system_monitors
+  @@system_monitors = [
+    "CPULoad",
+    "MemoryUsage",
+    "DiskUsage"
+  ]
+
   # -- internal usage --
   #
   #

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rails_performance
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.3
 platform: ruby
 authors:
 - Igor Kasyanchuk
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-27 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -291,8 +290,10 @@ files:
 - app/assets/images/activity.svg
 - app/assets/images/bot.svg
 - app/assets/images/close.svg
+- app/assets/images/details.svg
 - app/assets/images/download.svg
 - app/assets/images/export.svg
+- app/assets/images/external.svg
 - app/assets/images/git.svg
 - app/assets/images/github.svg
 - app/assets/images/home.svg
@@ -346,7 +347,6 @@ files:
 - lib/rails_performance.rb
 - lib/rails_performance/data_source.rb
 - lib/rails_performance/engine.rb
-- lib/rails_performance/extensions/resources_monitor.rb
 - lib/rails_performance/extensions/trace.rb
 - lib/rails_performance/gems/custom_ext.rb
 - lib/rails_performance/gems/delayed_job_ext.rb
@@ -377,6 +377,8 @@ files:
 - lib/rails_performance/reports/slow_requests_report.rb
 - lib/rails_performance/reports/throughput_report.rb
 - lib/rails_performance/reports/trace_report.rb
+- lib/rails_performance/system_monitor/resource_chart.rb
+- lib/rails_performance/system_monitor/resources_monitor.rb
 - lib/rails_performance/thread/current_request.rb
 - lib/rails_performance/utils.rb
 - lib/rails_performance/version.rb
@@ -384,7 +386,6 @@ homepage: https://github.com/igorkasyanchuk/rails_performance
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -399,8 +400,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Simple Rails Performance tracker. Alternative to the NewRelic, Datadog or
   other services.