rails_performance 1.3.2 → 1.4.0.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce8db107a23bdd7c902fa8edcc2ebe260998e1cf7712f0a710131983b28c3fa9
-  data.tar.gz: 82e818c24db06fb74d6d477aba06f0841174894c23f45fab785dd6dd0f808aa8
+  metadata.gz: 524031a11cbbe218cd746b2469a34b05e0867fa33f2f87dc06377a9a6ee983da
+  data.tar.gz: 69ea547a8574ed29550d28057d6d7369f8598509104fdcad002408be71533af6
 SHA512:
-  metadata.gz: 49d48df321943a17cd226f68ace96bbebca96ab6b47dde70e6cc95fd21276338562d3e0dbe365d1133aa6cd93981d2dd0980790cac8f52512ac2fbdb3558263d
-  data.tar.gz: 6c3ec9d24045abc760cba57d2f3d12fe6c3ea0e35a49a138bad3bfec06ae9c8a0ebc11721c5a3c92a9f3dcad6dc80ac98d1b0d6e3fd0a2a8063b11a715dfb5e8
+  metadata.gz: '0122738b6f1fde35c2bca00783e26e1c0f65b84896b4e22130e79dfffd2e59d211d7aec34f9b9b7718c239a713993e8d05656bc87294e253d7695462b9f477ea'
+  data.tar.gz: 5170e8f7e24ce9a9904bf7d9163dbf34eca2063da745fb9824f808793a12e9940b618b5b64ebe8f2fe39e6e12bebcc98f560c9fdd3fd51fb6fc973f880417a8e

data/README.md

@@ -10,9 +10,19 @@ This is a **simple and free alternative** to the New Relic APM, Datadog or other
 
 ![Demo](docs/rails_performance.gif)
 
+A new version with P50, P90, P99, throughput, and more is available.
+
+![Home](docs/rails_performance_updated_home.png)
+
+Detailed p50, p90, p99 response time information.
+
+![Home](docs/rails_performance_recent_requests.png)
+
 It allows you to track:
 
 - real-time monitoring on the Recent tab
+- see your p50, p90, p99 response time
+- monitor system resources (CPU, memory, disk)
 - monitor slow requests
 - throughput report (see amount of RPM (requests per minute))
 - an average response time
@@ -51,7 +61,7 @@ Create `config/initializers/rails_performance.rb` in your app:
 
 ```ruby
 RailsPerformance.setup do |config|
-  config.redis    = Redis::Namespace.new("#{Rails.env}-rails-performance", redis: Redis.new(url: ENV["REDIS_URL"].presence || "redis://127.0.0.1:6379/0"))
+  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>
@@ -165,6 +175,16 @@ You need to configure `config.custom_data_proc`. And you can capture current_use
 ![Custom Data](docs/custom_data.png)
 
 
+### System Monitoring
+
+You can monitor system resources (CPU, memory, disk) by adding a gem to your Gemfile:
+
+```ruby
+gem "sys-filesystem"
+gem "sys-cpu"
+gem "get_process_mem"
+```
+
 ### Custom events
 
 ```ruby
@@ -173,6 +193,20 @@ RailsPerformance.measure("some label", "some namespace") do
 end
 ```
 
+## Using with Rails 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:
+
+```ruby
+  config.redis = Redis::Namespace.new("#{Rails.env}-rails-performance", redis: Redis.new(url: ENV["REDIS_URL"].presence || "redis://127.0.0.1:6379/0"))
+```
+
+and add a gem dependency to the Gemfile:
+
+```ruby
+gem 'redis-namespace'
+```
+
 ## How it works
 
 ![Schema](docs/rails_performance.png)

data/app/controllers/rails_performance/rails_performance_controller.rb

@@ -6,9 +6,7 @@ module RailsPerformance
 
     if RailsPerformance.enabled
       def index
-        @datasource = RailsPerformance::DataSource.new(
-          **prepare_query, type: :requests
-        )
+        @datasource = RailsPerformance::DataSource.new(**prepare_query(params), type: :requests)
         db = @datasource.db
 
         @throughput_report_data = RailsPerformance::Reports::ThroughputReport.new(db).data
@@ -16,17 +14,20 @@ module RailsPerformance
         @percentile_report_data = RailsPerformance::Reports::PercentileReport.new(db).data
       end
 
+      def resources
+        @datasource = RailsPerformance::DataSource.new(**prepare_query(params), type: :resources)
+        db = @datasource.db
+
+        @resources_report = RailsPerformance::Reports::ResourcesReport.new(db)
+      end
+
       def summary
-        @datasource = RailsPerformance::DataSource.new(
-          **prepare_query, type: :requests
-        )
+        @datasource = RailsPerformance::DataSource.new(**prepare_query(params), type: :requests)
         db = @datasource.db
 
         @throughput_report_data = RailsPerformance::Reports::ThroughputReport.new(db).data
         @response_time_report_data = RailsPerformance::Reports::ResponseTimeReport.new(db).data
-        @data = RailsPerformance::Reports::BreakdownReport.new(
-          db, title: "Requests"
-        ).data
+        @data = RailsPerformance::Reports::BreakdownReport.new(db, title: "Requests").data
         respond_to do |format|
           format.js {}
           format.any do
@@ -47,9 +48,7 @@ module RailsPerformance
       end
 
       def crashes
-        @datasource = RailsPerformance::DataSource.new(
-          **prepare_query({status_eq: 500}), type: :requests
-        )
+        @datasource = RailsPerformance::DataSource.new(**prepare_query({status_eq: 500}), type: :requests)
         db = @datasource.db
         @data = RailsPerformance::Reports::CrashReport.new(db).data
 
@@ -62,11 +61,9 @@ module RailsPerformance
       end
 
       def requests
-        @datasource = RailsPerformance::DataSource.new(**prepare_query,
-type: :requests)
+        @datasource = RailsPerformance::DataSource.new(**prepare_query(params), type: :requests)
         db = @datasource.db
-        @data = RailsPerformance::Reports::RequestsReport.new(db,
-          group: :controller_action_format, sort: :count).data
+        @data = RailsPerformance::Reports::RequestsReport.new(db, group: :controller_action_format, sort: :count).data
         respond_to do |format|
           format.html
           format.csv do
@@ -76,8 +73,7 @@ type: :requests)
       end
 
       def recent
-        @datasource = RailsPerformance::DataSource.new(**prepare_query,
-type: :requests)
+        @datasource = RailsPerformance::DataSource.new(**prepare_query(params), type: :requests)
         db = @datasource.db
         @data = RailsPerformance::Reports::RecentRequestsReport.new(db).data(params[:from_timei])
 
@@ -110,8 +106,7 @@ type: :requests)
       end
 
       def slow
-        @datasource = RailsPerformance::DataSource.new(**prepare_query,
-type: :requests)
+        @datasource = RailsPerformance::DataSource.new(**prepare_query(params), type: :requests)
         db = @datasource.db
         @data = RailsPerformance::Reports::SlowRequestsReport.new(db).data
 
@@ -124,9 +119,7 @@ type: :requests)
       end
 
       def sidekiq
-        @datasource = RailsPerformance::DataSource.new(
-          **prepare_query, type: :sidekiq
-        )
+        @datasource = RailsPerformance::DataSource.new(**prepare_query(params), type: :sidekiq)
         db = @datasource.db
         @throughput_report_data = RailsPerformance::Reports::ThroughputReport.new(db).data
         @response_time_report_data = RailsPerformance::Reports::ResponseTimeReport.new(db).data
@@ -134,9 +127,7 @@ type: :requests)
       end
 
       def delayed_job
-        @datasource = RailsPerformance::DataSource.new(
-          **prepare_query, type: :delayed_job
-        )
+        @datasource = RailsPerformance::DataSource.new(**prepare_query(params), type: :delayed_job)
         db = @datasource.db
         @throughput_report_data = RailsPerformance::Reports::ThroughputReport.new(db).data
         @response_time_report_data = RailsPerformance::Reports::ResponseTimeReport.new(db).data
@@ -144,9 +135,7 @@ type: :requests)
       end
 
       def custom
-        @datasource = RailsPerformance::DataSource.new(
-          **prepare_query, type: :custom
-        )
+        @datasource = RailsPerformance::DataSource.new(**prepare_query(params), type: :custom)
         db = @datasource.db
         @throughput_report_data = RailsPerformance::Reports::ThroughputReport.new(db).data
         @response_time_report_data = RailsPerformance::Reports::ResponseTimeReport.new(db).data
@@ -154,18 +143,14 @@ type: :requests)
       end
 
       def grape
-        @datasource = RailsPerformance::DataSource.new(
-          **prepare_query, type: :grape
-        )
+        @datasource = RailsPerformance::DataSource.new(**prepare_query(params), type: :grape)
         db = @datasource.db
         @throughput_report_data = RailsPerformance::Reports::ThroughputReport.new(db).data
         @recent_report_data = RailsPerformance::Reports::RecentRequestsReport.new(db).data
       end
 
       def rake
-        @datasource = RailsPerformance::DataSource.new(
-          **prepare_query, type: :rake
-        )
+        @datasource = RailsPerformance::DataSource.new(**prepare_query(params), type: :rake)
         db = @datasource.db
         @throughput_report_data = RailsPerformance::Reports::ThroughputReport.new(db).data
         @recent_report_data = RailsPerformance::Reports::RecentRequestsReport.new(db).data
@@ -173,7 +158,7 @@ type: :requests)
 
       private
 
-      def prepare_query(query = params)
+      def prepare_query(query = {})
         RailsPerformance::Rails::QueryBuilder.compose_from(query)
       end
     end

data/app/helpers/rails_performance/rails_performance_helper.rb

@@ -132,6 +132,8 @@ module RailsPerformance
         "is-active" if controller_name == "rails_performance" && action_name == "crashes"
       when :requests
         "is-active" if controller_name == "rails_performance" && action_name == "requests"
+      when :resources
+        "is-active" if controller_name == "rails_performance" && action_name == "resources"
       when :recent
         "is-active" if controller_name == "rails_performance" && action_name == "recent"
       when :slow

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

@@ -1,8 +1,5 @@
 function showTIRChart(div, data, addon, name) {
   Highcharts.chart(div, {
-      // time: {
-      //   timezone: 'Europe/Kiev'
-      // },
       chart: {
           type: 'area',
           zoomType: 'x',
@@ -22,7 +19,7 @@ function showTIRChart(div, data, addon, name) {
           },
           formatter: function() {
               if (this.y == 0) {
-                return false; 
+                return false;
               }
             return this.y + addon;
           }
@@ -84,9 +81,6 @@ function showTIRChart(div, data, addon, name) {
 
 function showRTChart(div, data) {
   Highcharts.chart(div, {
-      // time: {
-      //   timezone: 'Europe/Kiev'
-      // },
       chart: {
           type: 'area',
           zoomType: 'x',
@@ -167,6 +161,179 @@ function showRTChart(div, data) {
   });
 };
 
+function showPercentageChart(div, data, addon, name) {
+  Highcharts.chart(div, {
+      chart: {
+          type: 'line',
+          zoomType: 'x',
+      },
+      title: {
+          text: ''
+      },
+      tooltip: {
+          borderWidth: 0,
+          backgroundColor: 'yellow',
+          pointFormat: '{point.y}',
+          //headerFormat: '',
+          shadow: false,
+          style: {
+              fontSize: '16px',
+              color: '#000',
+          },
+          formatter: function() {
+            if (this.y == 0) {
+              return false;
+            }
+            return this.y + ' %';
+        }
+      },
+      xAxis: {
+          crosshair: true,
+          type: 'datetime',
+          labels: {
+            style: {
+              color: "#a6b0cf"
+            }
+          }
+      },
+      yAxis: {
+          min: 0,
+          title: {
+              text: '%',
+              style: {
+                color: "#f6f6f6"
+              }
+          },
+          labels: {
+            style: {
+              color: "#a6b0cf"
+            }
+          }
+      },
+      legend: {
+          enabled: false
+      },
+      exporting: {
+        buttons: {
+          contextButton: {
+            theme: {
+              fill: "#eee"
+            }
+          }
+        }
+      },
+      plotOptions: {
+          area: {
+            color: '#ff5b5b',
+          }
+      },
+      series: [{
+          type: 'line',
+          name: name,
+          data: data,
+          fillOpacity: 0.3,
+          lineWidth: 1,
+          states: {
+            hover: {
+              lineWidth: 2
+            }
+          }
+      }]
+  });
+};
+
+
+function showUsageChart(div, data, addon, name) {
+  Highcharts.chart(div, {
+      chart: {
+          type: 'line',
+          zoomType: 'x',
+      },
+      title: {
+          text: ''
+      },
+      tooltip: {
+          borderWidth: 0,
+          backgroundColor: 'yellow',
+          pointFormat: '{point.y}',
+          //headerFormat: '',
+          shadow: false,
+          style: {
+              fontSize: '16px',
+              color: '#000',
+          },
+          formatter: function() {
+              if (this.y == 0) {
+                return false;
+              }
+            return bytes(this.y, true);
+          }
+      },
+      xAxis: {
+          crosshair: true,
+          type: 'datetime',
+          labels: {
+            style: {
+              color: "#a6b0cf"
+            }
+          }
+      },
+      yAxis: {
+          min: 0,
+          title: {
+              text: '',
+              style: {
+                color: "#f6f6f6"
+              }
+          },
+          labels: {
+            style: {
+              color: "#a6b0cf"
+            }
+          }
+      },
+      legend: {
+          enabled: false
+      },
+      exporting: {
+        buttons: {
+          contextButton: {
+            theme: {
+              fill: "#eee"
+            }
+          }
+        }
+      },
+      plotOptions: {
+          area: {
+            color: '#ff5b5b',
+          }
+      },
+      series: [{
+          type: 'line',
+          name: name,
+          data: data,
+          fillOpacity: 0.3,
+          lineWidth: 1,
+          states: {
+            hover: {
+              lineWidth: 2
+            }
+          }
+      }]
+  });
+};
+
+function bytes(bytes, label) {
+  if (bytes == 0) return '';
+  var s = ['bytes', 'KB', 'MB', 'GB', 'TB', 'PB'];
+  var e = Math.floor(Math.log(bytes)/Math.log(1024));
+  var value = ((bytes/Math.pow(1024, Math.floor(e))).toFixed(2));
+  e = (e<0) ? (-e) : e;
+  if (label) value += ' ' + s[e];
+  return value;
+}
+
 const recent = document.getElementById("recent")
 const autoupdate = document.getElementById("autoupdate")
 

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

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html class="theme-light">
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">

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

@@ -0,0 +1,50 @@
+<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">Disk</h2>
+      <div id="disk_report_<%= server_key.parameterize %>" class="chart"></div>
+      <p class="content is-small">Available disk size</p>
+    </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, ' %', '%');
+
+      var data2 = <%= raw @resources_report.memory[server_key].to_json %>;
+      showUsageChart('memory_report_<%= server_key.parameterize %>', data2, ' Mb', 'Mb');
+
+      var data3 = <%= raw @resources_report.disk[server_key].to_json %>;
+      showUsageChart('disk_report_<%= server_key.parameterize %>', data3, ' Gb', 'Gb');
+    <% end %>
+  </script>
+<% end %>

data/app/views/rails_performance/shared/_header.html.erb

@@ -17,6 +17,9 @@
       <%= link_to 'Dashboard', rails_performance.rails_performance_url, class: "navbar-item #{active?(:dashboard)}" %>
       <%= link_to 'Requests Analysis', rails_performance.rails_performance_requests_url, class: "navbar-item #{active?(:requests)}" %>
       <%= link_to 'Recent Requests', rails_performance.rails_performance_recent_url, class: "navbar-item #{active?(:recent)}" %>
+      <% if RailsPerformance._resource_monitor_enabled %>
+        <%= link_to 'System', rails_performance.rails_performance_resources_url, class: "navbar-item #{active?(:resources)}" %>
+      <% end %>
       <%= link_to 'Slow Requests', rails_performance.rails_performance_slow_url, class: "navbar-item #{active?(:slow)}" %>
       <%= link_to '500 Errors', rails_performance.rails_performance_crashes_url, class: "navbar-item #{active?(:crashes)}" %>
       <% if defined?(Sidekiq) %>