rails-server-monitor 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42a5e4efd2fa04d41325825215360f65ae66c648a9a3b117f32b3bec8c59d6b7
-  data.tar.gz: 5ec3f5a55ea2c9fd59b4c667688c16cd8f3a9fd415b37a96bfa4c4a5c1dad6da
+  metadata.gz: 3e47312d01c09679dc3df5b1b4d042bd7a7d7d0290d55902d7fe4ef8dd6e7a22
+  data.tar.gz: b30f2db395c5c25eeae2ffd1fa639aa8f277c35d25d0fd6a3fbeacdeda662dcc
 SHA512:
-  metadata.gz: 3ef74d34f33f862cdccf698e1f5153aff9f6176a19121b4c3b087e9539ee39a46a1d6648de72315f1c152df6f6dd0767b8168af0787b47262d6ce876394d3e65
-  data.tar.gz: f0a805d4f4573b09fb7f65e03dd0c2f872ee9055acc34a42d1db32fec2c164c844436ac83f3d0a5bccf7692f68a55319daa989198ab2218ee447fc35aa90693e
+  metadata.gz: e2b2ad6e4df19eb305bfe9f02e4d1d4034519acdd70d0558960e2d7bcc55e16acccb8ff12dd51639d76927e2ae16cde848f76d62031581145061a556304672cb
+  data.tar.gz: 446a671e8cd3918173c10f82ad5f8f63364224fb05559e860e4fdbcfc758352ef44c28f6ea2edcb8a26e60b761f22b4c9a424a8269d40e94b7678130bcb411b0

data/README.md

@@ -1,28 +1,129 @@
-# 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.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
+```shell
+# 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/lib/rails_server_monitor/compile_locally.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require "rails"
+require_relative "./engine"
+module RailsServerMonitor
+  class CompileLocally
+    class << self
+      def compile
+        new.compile(skip_check: true)
+      end
+
+      def compile_force
+        new.compile(skip_check: false)
+      end
+    end
+
+    def compile(skip_check:)
+      unless skip_check
+        return unless Rails.env.development? || Rails.env.test?
+      end
+      return if Dir.exist?(RailsServerMonitor::Engine.root.join("public", "rails-server-monitor-packs"))
+
+      RailsServerMonitor.webpacker.commands.compile
+    end
+  end
+end

data/lib/rails_server_monitor/configuration.rb

@@ -4,7 +4,7 @@ module RailsServerMonitor
   class Configuration
     attr_writer :update_server_interval, :snapshot_server_interval, :ignore_urls,
                 :cleanup_snapshots_after, :ignore_workers, :high_cpu_usage_threshold,
-                :low_memory_threshold, :low_free_disk_disk_threshold
+                :low_memory_threshold, :low_free_disk_disk_threshold, :hostname
 
     def update_server_interval
       @update_server_interval || 1.hour
@@ -15,7 +15,7 @@ module RailsServerMonitor
     end
 
     def cleanup_snapshots_after
-      @cleanup_snapshots_after || 30.days
+      @cleanup_snapshots_after || 90.days
     end
 
     def ignore_urls
@@ -37,5 +37,9 @@ module RailsServerMonitor
     def low_free_disk_disk_threshold
       @low_free_disk_disk_threshold || 30
     end
+
+    def hostname
+      -> { `hostname` }
+    end
   end
 end

data/lib/rails_server_monitor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsServerMonitor
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/lib/rubygems_plugin.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+Gem.post_install do
+  puts "post_install called for gem"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-server-monitor
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Personal Social Media
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-20 00:00:00.000000000 Z
+date: 2021-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -246,7 +246,9 @@ files:
 - app/views/layouts/rails_server_monitor/application.html.erb
 - app/views/layouts/rails_server_monitor/application_record.rb
 - app/views/rails_server_monitor/home/index.html.erb
+- app/views/rails_server_monitor/page/_footer.html.erb
 - app/views/rails_server_monitor/servers/show.html.erb
+- app/views/rails_server_monitor/servers/show/_chart.html.erb
 - app/views/rails_server_monitor/snapshots/show.html.erb
 - babel.config.js
 - bin/rails
@@ -264,9 +266,11 @@ files:
 - lib/generators/rails_server_monitor/templates/install.rb.tt
 - lib/rails/server/monitor/engine.rb
 - lib/rails_server_monitor.rb
+- lib/rails_server_monitor/compile_locally.rb
 - lib/rails_server_monitor/configuration.rb
 - lib/rails_server_monitor/engine.rb
 - lib/rails_server_monitor/version.rb
+- lib/rubygems_plugin.rb
 - lib/tasks/rails_server_monitor_tasks.rake
 - package.json
 - postcss.config.js