rails-server-monitor 0.1.5 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a28660e227e2a0701f542756d32600432ed967b8e5c27cff87ac658825ed11a8
-  data.tar.gz: 333c2c0a15ce0e3d265520ff493a48a5083d9e081ec4c0061d962a31fcd5364a
+  metadata.gz: 268207f2f8ac3e85b708ffeaa1832fa6d73695e0607d563da57f8aa10cde2cf7
+  data.tar.gz: 2b95fab09530776702bdc9e69f0a3d76e35a3d6e09e1c046c5ac3c0406c037a3
 SHA512:
-  metadata.gz: a741d2f197efdd0edd78fd177b6b677bb27643a584153cd268b4773432daa5d080429abf8f1d32ec83bba2c7e8b7de6329c239896a70bcb83d7324ed8cca9e52
-  data.tar.gz: 6bfe3922c4991c4cddc035ff731c06843fc78aaf477087b38791787eb365ad9439ad54f1f9b840a8a6dbf2212b733afc1337e820ee3cd9aef2f72c8767cf291f
+  metadata.gz: 4425081d0efb0055834413d5bbbd5915c2501e1511e0ac018c0e5e33cc90d2f503e521bf95795bf8db5beee95d20c57b4db835e02b558bfc3a9f2a41396e2e8b
+  data.tar.gz: 94d6118f89a7f467f7182a07d3fde1075414b27dc99671303c91df2fc454ca97d953d9cb06e3a236586bdedd484ce309b76221c7554967f9cdb16c5f5e10d284

data/README.md

@@ -1,28 +1,130 @@
-# Rails::Server::Monitor
-Short description and motivation.
+# Rails Server Monitor
+A performance dashboard for rails applications which work with one or multiple servers at once.
+Stats can be collected from a Rack application or Sidekiq.
 
-## Usage
-How to use my plugin.
+[See it in action](https://rails-sever-monitor.herokuapp.com)
 
-## Installation
-Add this line to your application's Gemfile:
+![demo](https://github.com/personal-social-media/rails-server-monitor/raw/master/resources/screenshot-dashboard.jpg)
+![demo](https://github.com/personal-social-media/rails-server-monitor/raw/master/resources/screenshot1.jpg)
 
+## Usage
+#### 1)
 ```ruby
-gem 'rails-server-monitor'
+gem 'rails-server-monitor', require: "rails_server_monitor"
 ```
 
-And then execute:
+#### 2) generate Rails Server Monitor tables
 ```bash
-$ bundle
+rails g rails_server_monitor:install
+rails db:migrate
 ```
 
-Or install it yourself as:
-```bash
-$ gem install rails-server-monitor
+#### 3) hook Rails Server Monitor's rack middleware
+```ruby
+# inside config/application.rb
+config.middleware.use RailsServerMonitor::RackMiddleware
+```
+
+#### 4) compile Rails Server Monitor assets locally
+if you aren't using webpacker already
+```shell
+# you don't need to do this in production, it's prepended to rake assets:precompile
+# but you need to do it again after you after you update the gem locally
+rake webpacker:compile 
+```
+
+or if you are using
+
+```ruby
+# inside bin/webpack-dev-server
+require "rails_server_monitor/compile_locally"
+RailsServerMonitor::CompileLocally.compile 
+
+# insert before this before
+# Dir.chdir(APP_ROOT) do
+#   Webpacker::DevServerRunner.run(ARGV)
+# end
+```
+
+#### 5) (Optional) configure gem
+
+```ruby
+# inside config/initializers/rails_server_monitor
+
+RailsServerMonitor.config do |c|
+  c.update_server_interval = 1.hour 
+  c.snapshot_server_interval = 15.minutes
+  c.cleanup_snapshots_after = 90.days
+  c.ignore_workers = %w(MyIgnoredWorker)
+  c.ignore_urls = ["/", /ignored-url/]
+  
+  c.high_cpu_usage_threshold = 95
+  c.low_memory_threshold = 20
+  c.low_free_disk_disk_threshold = 30
+  c.hostname = -> do
+    `hostname`
+  end # how to retrieve server hostname, heroku generates a hostname each time your app reboots
+end
+```
+
+#### 6) Mount engine to routes
+
+```ruby
+# inside config/routes.rb
+constraints LoggedInAsAdmin do
+  mount RailsServerMonitor::Engine => "/system-information"
+end
 ```
 
+Your should define a constraint to protect against unauthorized access
+
+```ruby
+# example LoggedInAsAdmin, this is a basic implementation
+
+class LoggedInAsAdmin
+  def self.matches?(request)
+    AdminUser.find_by(id: request.session[:admin_id]).present?
+  end
+end
+
+
+```
+
+#### 7) (Optional) Add sidekiq middleware
+
+```ruby
+# append to config/sidekiq.rb
+
+Sidekiq.configure_server do |config|
+  config.server_middleware do |chain|
+    chain.add RailsServerMonitor::SidekiqMiddleware
+  end
+end
+```
+
+### 8) Result
+
+you should now go to http://localhost:3000/system-information
+
 ## Contributing
-Contribution directions go here.
+
+Everyone is encouraged to help improve this project. Here are a few ways you can help:
+
+- [Report bugs](https://github.com/personal-social-media/rails-server-monitor/issues)
+- Fix bugs and [submit pull requests](https://github.com/personal-social-media/rails-server-monitor/pulls)
+- Write, clarify, or fix documentation
+- Suggest or add new features
+
+### Development
+
+```shell
+# fork project, clone
+bundle install
+yarn install
+
+bin/start # to start local server
+bin/rspec # to run specs
+```
 
 ## License
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/app/controllers/rails_server_monitor/servers_controller.rb

@@ -6,11 +6,20 @@ module RailsServerMonitor
 
     def show
       @server = current_server
-      @chart = RailsServerMonitor::ChartForServer.new(@server)
+      @chart = RailsServerMonitor::ChartForServer.new(@server, timeline: params[:timeline])
 
       @title = @server.display_name
     end
 
+    def update
+      update_params = params.require(:server).permit(:custom_name, :custom_description)
+      current_server.update!(update_params)
+      redirect_to server_path(current_server)
+
+    rescue ActiveRecord::RecordInvalid => e
+      render json: { error: e.message }, status: 422
+    end
+
     def current_server
       @current_server ||= RailsServerMonitor::Server.find_by(id: params[:id])
     end

data/app/helpers/rails_server_monitor/application_helper.rb

@@ -25,5 +25,9 @@ module RailsServerMonitor
 
       stylesheet_pack_tag(name, **options)
     end
+
+    def server_version
+      RailsServerMonitor::VERSION
+    end
   end
 end

data/app/models/rails_server_monitor/server.rb

@@ -20,8 +20,14 @@ module RailsServerMonitor
              foreign_key: :rails_server_monitor_server_id,
              dependent: :delete_all
 
+    before_save :squish_text
+
     def display_name
       @display_name ||= custom_name.present? ? custom_name : hostname
     end
+
+    def squish_text
+      self.custom_name = self.custom_name&.squish
+    end
   end
 end

data/app/services/rails_server_monitor/chart_for_server.rb

@@ -2,10 +2,11 @@
 
 module RailsServerMonitor
   class ChartForServer
+    AVAILABLE_TIMELINES = %w(today week month all)
     attr_reader :server, :timeline
-    def initialize(server, timeline: :today)
+    def initialize(server, timeline:)
       @server = server
-      @timeline = timeline
+      @timeline = timeline.blank? ? "today" : timeline
     end
 
     def render_chart
@@ -23,10 +24,9 @@ module RailsServerMonitor
     end
 
     def today?
-      timeline == :today
+      timeline == "today"
     end
 
-
     def last_record
       @last_record = scope.last
     end
@@ -36,6 +36,12 @@ module RailsServerMonitor
       query = server.server_snapshots.order(id: :asc)
       if today?
         query = query.where("created_at > ?", 1.day.ago)
+      elsif timeline == "week"
+        query = query.where("created_at > ?", 7.day.ago)
+      elsif timeline == "month"
+        query = query.where("created_at > ?", 30.day.ago)
+      else
+        query = query.all
       end
       @scope = query.to_a
     end

data/app/services/rails_server_monitor/server_setup.rb

@@ -19,7 +19,7 @@ module RailsServerMonitor
 
     private
       def hostname
-        @hostname ||= `hostname`.squish
+        @hostname ||= config.hostname.call.squish
       end
 
       def update_server

data/app/views/layouts/rails_server_monitor/application.html.erb

@@ -9,17 +9,22 @@
   <%= safe_render_css "rails-server-application", 'data-turbolinks-track': "reload" %>
 </head>
 <body>
+<div class="flex min-h-screen flex-col justify-between">
+  <div class="flex">
+    <div class="overflow-y-auto fixed top-0 left-0 bottom-0 bg-white w-1/5">
+      <%= render RailsServerMonitor::LeftbarComponent.new(ctx: self) %>
+    </div>
+    <div class="w-1/5 mr-4"></div>
 
-<div class="flex">
-  <div class="overflow-y-auto fixed top-0 left-0 bottom-0 bg-white w-1/5">
-    <%= render RailsServerMonitor::LeftbarComponent.new(ctx: self) %>
-  </div>
-  <div class="w-1/5 mr-4"></div>
+    <div class="flex-1">
+      <%= yield %>
+    </div>
 
-  <div class="flex-1">
-    <%= yield %>
+  </div>
+  <div class="p-4 flex">
+    <div class="w-1/5 mr-4"></div>
+    <%= render "rails_server_monitor/page/footer" %>
   </div>
 </div>
-
 </body>
 </html>

data/app/views/rails_server_monitor/page/_footer.html.erb

@@ -0,0 +1,8 @@
+<div class="flex-1">
+  <a href="https://github.com/personal-social-media/rails-server-monitor" target="_blank" class="flex items-center mx-auto w-1/4">
+    <i class="fab fa-github fa-3x"></i>
+    <span class="ml-2">
+      Rails Server Monitor V<%= server_version %>
+    </span>
+  </a>
+</div>

data/app/views/rails_server_monitor/servers/show.html.erb

@@ -3,11 +3,8 @@
    <%= @server.display_name %>
  </div>
 
-
   <div class="flex mt-4">
-    <%= content_tag :div, class: "#{@chart.today? ? "w-1/2" : "w-full"}" do %>
-      <%= line_chart @chart.render_chart %>
-    <% end %>
+    <%= render(partial: "rails_server_monitor/servers/show/chart") %>
 
     <% if @chart.today? && @chart.last_record.present? %>
       <div class="w-1/2 p-2">
@@ -49,7 +46,7 @@
     <% end %>
   </div>
 
-  <div class="mt-20">
+  <%= form_with model: @server, html: { class: "mt-20" } do |f| %>
     <div class="mb-2 text-xl">
       Sever information:
     </div>
@@ -64,13 +61,13 @@
         Custom name:
       </div>
       <div class="p-1">
-        <%= @server.custom_name %>
+        <%= f.text_field :custom_name, class: "border border-solid border-gray-200 p-2 focus:border-gray-300 w-full" %>
       </div>
       <div class="bg-blue-300 text-gray-800 p-1">
         Custom description:
       </div>
       <div class="p-1">
-        <%= @server.custom_description %>
+        <%= f.text_area :custom_description, class: "border border-solid border-gray-200 p-2 focus:border-gray-300 w-full" %>
       </div>
       <div class="mb-2 text-xl">
         OS information
@@ -110,7 +107,7 @@
       )) %>
 
       <%= render(RailsServerMonitor::ServerTableRow.new(
-        title: "CPU Codes",
+        title: "CPU Cores",
         value: @server.system_cpu_cores
       )) %>
 
@@ -129,5 +126,9 @@
         value: "#{@server.system_hdd_available_in_gb} GB"
       )) %>
     </div>
-  </div>
+
+    <div class="mt-20 w-1/2">
+      <%= f.submit "Save custom information", class: "p-2 w-full bg-blue-500 text-white" %>
+    </div>
+  <% end %>
 </div>

data/app/views/rails_server_monitor/servers/show/_chart.html.erb

@@ -0,0 +1,10 @@
+<%= content_tag :div, class: "#{@chart.today? ? "w-1/2" : "w-full"}" do %>
+  <%= line_chart @chart.render_chart %>
+
+  <div class="flex justify-between">
+    <% RailsServerMonitor::ChartForServer::AVAILABLE_TIMELINES.each do |timeline| %>
+      <%= link_to timeline.humanize, server_path(@server, timeline: timeline),
+                  class: "#{@chart.timeline == timeline ? "bg-blue-500 text-white" : "bg-gray-300 text-gray-800" } p-2 rounded hover:bg-blue-400"  %>
+    <% end %>
+  </div>
+<% end %>

data/babel.config.js

@@ -0,0 +1,91 @@
+module.exports = function(api) {
+  var validEnv = ['development', 'test', 'production']
+  var currentEnv = api.env()
+  var isDevelopmentEnv = api.env('development')
+  var isProductionEnv = api.env('production')
+  var isTestEnv = api.env('test')
+
+  if (!validEnv.includes(currentEnv)) {
+    throw new Error(
+      'Please specify a valid `NODE_ENV` or ' +
+        '`BABEL_ENV` environment variables. Valid values are "development", ' +
+        '"test", and "production". Instead, received: ' +
+        JSON.stringify(currentEnv) +
+        '.'
+    )
+  }
+
+  return {
+    presets: [
+      isTestEnv && [
+        '@babel/preset-env',
+        {
+          targets: {
+            node: 'current'
+          },
+          modules: 'commonjs'
+        },
+        [
+          '@babel/preset-react',
+          {
+            development: true,
+            useBuiltIns: true,
+            runtime: "automatic",
+          }
+        ]
+      ],
+      (isProductionEnv || isDevelopmentEnv) && [
+        '@babel/preset-env',
+        {
+          forceAllTransforms: true,
+          useBuiltIns: 'entry',
+          corejs: 3,
+          modules: false,
+          loose: false,
+          exclude: ['transform-typeof-symbol']
+        }
+      ],
+      [
+        '@babel/preset-react',
+        {
+          development: isDevelopmentEnv || isTestEnv,
+          useBuiltIns: true,
+          runtime: "automatic"
+        }
+      ]
+    ].filter(Boolean),
+    plugins: [
+      'babel-plugin-macros',
+      '@babel/plugin-syntax-dynamic-import',
+      isTestEnv && 'babel-plugin-dynamic-import-node',
+      '@babel/plugin-transform-destructuring',
+      '@babel/plugin-proposal-class-properties',
+      [
+        '@babel/plugin-proposal-object-rest-spread',
+        {
+          useBuiltIns: true
+        }
+      ],
+      [
+        '@babel/plugin-transform-runtime',
+        {
+          helpers: false,
+          regenerator: true,
+          corejs: false
+        }
+      ],
+      [
+        '@babel/plugin-transform-regenerator',
+        {
+          async: false
+        }
+      ],
+      isProductionEnv && [
+        'babel-plugin-transform-react-remove-prop-types',
+        {
+          removeImport: true
+        }
+      ]
+    ].filter(Boolean)
+  }
+}