rails_performance 1.4.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d387037eea90f299a14499105f68cd78794ee7a36122d45081c488b9ca3fb6dd
-  data.tar.gz: 1c49de1b612f86f8089fdd2765b53bcbdddb2bb65d4890eacdf068f0ca14ecc3
+  metadata.gz: 10d13bdf7ddb45da1783c3665a64a89730639a3b13061c496e4502a59158c329
+  data.tar.gz: 738313bc41c6af0d1cfee519679519639acda8781dd4dd74602e3c55a6b1f6de
 SHA512:
-  metadata.gz: 208578b1cc4a8a4b261c9607d89b045983ab2be0cc1ef811059be38a3c02dd4f9b333a0937900733b04ad8058c1c920c02f333bc31b9fae13c1629123456a99d
-  data.tar.gz: 9066e380c0d9309554e7574298d8bda95570e4f0851fdfa586c675f998bcdfaed993decd336d9de4c6b1b6ed55b0065fc368aba8ba23c7627690db18bedae36b
+  metadata.gz: 33dcfe7183c335961e7716acc301b7c38877c9409c911ff0b6dfa0f5046ed40fc3f36fd9994cb8053367e467cb8c427eb042c218731cf7ada935fc6857c70b8d
+  data.tar.gz: e5e07d09bac167200fda9ff4e5b8d1bcd2e9558e4bc4a7bc9bf9c78d15f76d829f049c83793e7ef89c057bd83eda2ee2613ef6a01265a92aa6834dd891721047

data/README.md

@@ -34,6 +34,7 @@ It allows you to track:
 - total duration of time spent per request, views rendering, DB
 - SQL queries, rendering logs in "Recent Requests" section
 - simple 500-crashes reports
+- deployment events (or custom events)
 - Sidekiq jobs
 - Delayed Job jobs
 - Grape API inside Rails app
@@ -45,7 +46,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.
 
@@ -68,7 +69,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)
@@ -172,6 +173,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
@@ -223,10 +225,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"
 )
@@ -236,6 +238,31 @@ More information here: `lib/rails_performance/engine.rb`.
 
 PS: right now it can only distinguish between web app servers and the sidekiq servers.
 
+#### Deployment Events + Custom Events on the Charts
+
+![Deployments](docs/deploys.png)
+
+#### For Kamal
+
+- edit `.kamal/hooks/post-deploy` (rename .sample if needed)
+- add `kamal app exec -p './bin/rails runner "RailsPerformance.create_event(name: \"Deploy\")"'`
+- kamal deploy
+
+#### Custom Events on the Charts
+
+You can specify colors, orientation for the event label.
+
+```ruby
+RailsPerformance.create_event(name: "Deploy", options: {
+  borderColor: "#00E396",
+  label: {
+    borderColor: "#00E396",
+    orientation: "horizontal",
+    text: "Deploy"
+  }
+})
+```
+
 ### Custom events
 
 ```ruby
@@ -323,6 +350,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
 

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

@@ -12,6 +12,10 @@ 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

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',
         },
@@ -78,7 +79,8 @@ function showTIRChart(element_id, data, addon, name) {
     series: [{
       name: name,
       data: data
-    }]
+    }],
+    annotations: window?.annotationsData || {}
   });
 }
 
@@ -89,6 +91,7 @@ function showRTChart(element_id, data) {
       name: 'Response Time',
       data: data,
     }],
+    annotations: window?.annotationsData || {}
   });
 }
 

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

@@ -8,6 +8,9 @@
     <%= csp_meta_tag if ::Rails::VERSION::STRING.to_f >= 5.2 %>
     <%= render '/rails_performance/stylesheets/stylesheets' %>
     <link rel="shortcut icon" href="/favicon.ico">
+    <script>
+      window.annotationsData = <%= raw RailsPerformance::Reports::AnnotationsReport.new.data.to_json %>;
+    </script>
   </head>
 
   <body class="has-sticky-footer">

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

@@ -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/data_source.rb

@@ -22,7 +22,7 @@ module RailsPerformance
 
     def db
       result = RailsPerformance::Models::Collection.new
-      now = RailsPerformance::Utils.time
+      now = RailsPerformance::Utils.kind_of_now
       (0..days).to_a.reverse_each do |e|
         RailsPerformance::DataSource.new(q: q.merge({on: (now - e.days).to_date}), type: type).add_to(result)
       end

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/events/record.rb

@@ -0,0 +1,62 @@
+module RailsPerformance
+  module Events
+    class Record
+      attr_reader :name, :datetimei, :options
+
+      DEFAULT_COLOR = "#FF00FF"
+      DEFAULT_LABEL_COLOR = "#FF00FF"
+      DEFAULT_LABEL_ORIENTATION = "horizontal"
+
+      class << self
+        def create(name:, datetimei: Time.now.to_i, options: {})
+          instance = new(name: name, datetimei: datetimei, options: options)
+          instance.save
+          instance
+        end
+
+        def all
+          _, values = RailsPerformance::Utils.fetch_from_redis("rails_performance:records:events:*")
+          Array(values).map do |value|
+            json = JSON.parse(value)
+            new(name: json["name"], datetimei: json["datetimei"], options: Hash(json["options"]))
+          end
+        end
+      end
+
+      def initialize(name:, datetimei:, options: {})
+        @name = name
+        @datetimei = datetimei
+        @options = options
+      end
+
+      def save
+        RailsPerformance::Utils.save_to_redis(rails_performance_key, value)
+      end
+
+      def rails_performance_key
+        "rails_performance:records:events:#{datetimei}|#{RailsPerformance::EVENTS_SCHEMA}"
+      end
+
+      def value
+        {
+          name: name,
+          datetime: RailsPerformance::Utils.from_datetimei(datetimei.to_i),
+          datetimei: datetimei,
+          options: options
+        }
+      end
+
+      def to_annotation
+        {
+          x: datetimei * 1000,
+          borderColor: options.dig("borderColor") || DEFAULT_COLOR,
+          label: {
+            borderColor: options.dig("label", "borderColor") || DEFAULT_LABEL_COLOR,
+            orientation: options.dig("label", "orientation") || DEFAULT_LABEL_ORIENTATION,
+            text: options.dig("label", "text") || name
+          }
+        }
+      end
+    end
+  end
+end

data/lib/rails_performance/gems/custom_ext.rb

@@ -24,6 +24,7 @@ module RailsPerformance
             datetime: now.strftime(RailsPerformance::FORMAT),
             datetimei: now.to_i
           ).save
+          CurrentRequest.cleanup
         end
       end
     end

data/lib/rails_performance/gems/delayed_job_ext.rb

@@ -23,6 +23,7 @@ module RailsPerformance
               status: status
             )
             record.save
+            CurrentRequest.cleanup
           end
         end
 

data/lib/rails_performance/gems/grape_ext.rb

@@ -25,6 +25,7 @@ module RailsPerformance
 
           if name == "format_response.grape"
             CurrentRequest.current.record.save
+            CurrentRequest.cleanup
           end
         end
       end

data/lib/rails_performance/gems/rake_ext.rb

@@ -23,6 +23,7 @@ module RailsPerformance
                 duration: (RailsPerformance::Utils.time - now) * 1000,
                 status: status
               ).save
+              CurrentRequest.cleanup
             end
           end
 

data/lib/rails_performance/gems/sidekiq_ext.rb

@@ -27,6 +27,7 @@ module RailsPerformance
           # store in ms instead of seconds
           record.duration = (RailsPerformance::Utils.time - now) * 1000
           record.save
+          CurrentRequest.cleanup
         end
       end
     end

data/lib/rails_performance/interface.rb

@@ -0,0 +1,7 @@
+module RailsPerformance
+  module Interface
+    def create_event(name:, datetime: RailsPerformance::Utils.time, options: {})
+      RailsPerformance::Events::Record.create(name: name, datetimei: datetime.to_i, options: options)
+    end
+  end
+end

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/annotations_report.rb

@@ -0,0 +1,13 @@
+class RailsPerformance::Reports::AnnotationsReport
+  def data
+    {
+      xaxis: xaxis
+    }
+  end
+
+  private
+
+  def xaxis
+    RailsPerformance::Events::Record.all.map(&:to_annotation)
+  end
+end

data/lib/rails_performance/reports/base_report.rb

@@ -32,7 +32,7 @@ module RailsPerformance
 
       # TODO: simplify this method, and combine with nullify_data
       def calculate_data
-        now = RailsPerformance::Utils.time
+        now = RailsPerformance::Utils.kind_of_now
         now = now.change(sec: 0, usec: 0)
         stop = now # Time.at(60 * (now.to_i / 60), in:)
         offset = 0 # RailsPerformance::Reports::BaseReport.time_in_app_time_zone(now).utc_offset
@@ -66,7 +66,7 @@ module RailsPerformance
       def nil_data(duration = RailsPerformance.duration)
         @nil_data ||= begin
           result = {}
-          now = RailsPerformance::Utils.time
+          now = RailsPerformance::Utils.kind_of_now
           now = now.change(sec: 0, usec: 0)
           stop = now # Time.at(60 * (now.to_i / 60))
           offset = 0 # RailsPerformance::Reports::BaseReport.time_in_app_time_zone(now).utc_offset

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/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,49 +41,26 @@ module RailsPerformance
         end
       end
 
-      def run
-        cpu = fetch_process_cpu_usage
-        memory = fetch_process_memory_usage
-        disk = fetch_disk_usage
-
-        store_data({cpu: cpu, memory: memory, disk: 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)
         ::Rails.logger.info("Server: #{server_id}, Context: #{context}, Role: #{role}, data: #{data}")
 
-        now = RailsPerformance::Utils.time
+        now = RailsPerformance::Utils.kind_of_now
         now = now.change(sec: 0, usec: 0)
         RailsPerformance::Models::ResourceRecord.new(
           server: server_id,

data/lib/rails_performance/utils.rb

@@ -1,9 +1,15 @@
 module RailsPerformance
   class Utils
+    DEFAULT_TIME_OFFSET = 1.minute
+
     def self.time
       Time.now.utc
     end
 
+    def self.kind_of_now
+      time + DEFAULT_TIME_OFFSET
+    end
+
     def self.from_datetimei(datetimei)
       Time.at(datetimei, in: "+00:00")
     end

data/lib/rails_performance/version.rb

@@ -1,4 +1,5 @@
 module RailsPerformance
-  VERSION = "1.4.2"
+  VERSION = "1.5.0"
   SCHEMA = "1.0.2"
+  EVENTS_SCHEMA = "1.0.0"
 end

data/lib/rails_performance.rb

@@ -26,10 +26,15 @@ require_relative "rails_performance/reports/breakdown_report"
 require_relative "rails_performance/reports/trace_report"
 require_relative "rails_performance/reports/percentile_report"
 require_relative "rails_performance/reports/resources_report"
+require_relative "rails_performance/reports/annotations_report"
+require_relative "rails_performance/events/record"
 require_relative "rails_performance/extensions/trace"
 require_relative "rails_performance/thread/current_request"
+require_relative "rails_performance/interface"
 
 module RailsPerformance
+  extend RailsPerformance::Interface
+
   FORMAT = "%Y%m%dT%H%M"
 
   mattr_accessor :redis
@@ -119,10 +124,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,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rails_performance
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
 platform: ruby
 authors:
 - Igor Kasyanchuk
 bindir: bin
 cert_chain: []
-date: 2025-05-28 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -290,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
@@ -345,7 +347,7 @@ 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/events/record.rb
 - lib/rails_performance/extensions/trace.rb
 - lib/rails_performance/gems/custom_ext.rb
 - lib/rails_performance/gems/delayed_job_ext.rb
@@ -353,6 +355,7 @@ files:
 - lib/rails_performance/gems/rake_ext.rb
 - lib/rails_performance/gems/sidekiq_ext.rb
 - lib/rails_performance/instrument/metrics_collector.rb
+- lib/rails_performance/interface.rb
 - lib/rails_performance/models/base_record.rb
 - lib/rails_performance/models/collection.rb
 - lib/rails_performance/models/custom_record.rb
@@ -365,6 +368,7 @@ files:
 - lib/rails_performance/models/trace_record.rb
 - lib/rails_performance/rails/middleware.rb
 - lib/rails_performance/rails/query_builder.rb
+- lib/rails_performance/reports/annotations_report.rb
 - lib/rails_performance/reports/base_report.rb
 - lib/rails_performance/reports/breakdown_report.rb
 - lib/rails_performance/reports/crash_report.rb
@@ -376,6 +380,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
@@ -397,7 +403,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Simple Rails Performance tracker. Alternative to the NewRelic, Datadog or
   other services.