mission_control-servers 0.2.5 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5eef0e07ac8fee585155c704088b7cbfcbf9736440ee11af15bd780ce5077664
-  data.tar.gz: f219f8ee1ddcfbed49ee3f80c0493bab20d433173a4863e6fba4abbca367e713
+  metadata.gz: 1634257f311403b05c024937a8f0eeb89cac5070505267251ae75c47ba25ff36
+  data.tar.gz: c7fff4907632e22dff943e3699d427968aa3b113044cfc0c3d2cbaccc80e3e42
 SHA512:
-  metadata.gz: 062a231db01dff3d63e7b342dabb170184ec5c9ac0421f3f86f3c9981250c54ccd2a7746854abdc6697c2f1241b8eda3d198c68fe8a158f47a8674e5a31bc6cb
-  data.tar.gz: 060a236e9e8d5651175f328c790fc38fc02689ae01ad7cfb353fd7e589ba9fe35252e54335073dfc4366779f1668e1a446da36a37b862b44cbca5a415606350c
+  metadata.gz: 8cc22c21ca4226bfac07425241ca08959e7bb1a8d4e9b72fd1ad222d5939d319050938dce9f15a4af3ce7629bc373dd90e83c4a33d3ba4291cf6f92475961e1e
+  data.tar.gz: 640d6852cb5a85c74089dd1f3c99a7c4f67cf14843a7efd81514e9d23770fb7aa480006e8e5ec1879f4f5021e295b4602bc8ce2b28cee14813aaaccbb85ff501

data/README.md

@@ -93,14 +93,18 @@ http://localhost:3000/mission_control-servers/projects?interval=30&dark=true&com
 ## Protecting the Dashboard
 
 You can protect the dashboard by using a constraint. This will allow you to only allow certain users to access
-the dashboard. However, the ingress still needs to be accessible by the servers which are being monitored.
+the dashboard. However, the ingress still needs to be accessible by the servers which are being monitored. In
+order to install the script on the servers, you also have to expose the endpoint for the script.
 
 ```ruby
 Rails.application.routes.draw do
+  get '/mission_control-servers/projects/:project_id/script', to: 'mission_control/servers/scripts#show'
+  post '/mission_control-servers/projects/:project_id/ingress', to: 'mission_control/servers/ingresses#create'
+  
   constraints AdminConstraint do
     mount MissionControl::Servers::Engine => "/mission_control-servers"
   end
-  post '/mission_control-servers/projects/:project_id/ingress', to: 'mission_control/servers/ingresses#create'
+  
 end
 ```
 

data/app/controllers/mission_control/servers/dashboards/project_tables_controller.rb

@@ -2,6 +2,7 @@ module MissionControl::Servers
   class Dashboards::ProjectTablesController < ApplicationController
     def show
       @project = Project.includes(:services).find_by(token: params[:project_id])
+      @service_settings = @project.service_settings
     end
   end
 end

data/app/controllers/mission_control/servers/projects_controller.rb

@@ -10,6 +10,8 @@ module MissionControl::Servers
 
     # GET /projects/1
     def show
+      hostnames = @project.services.pluck(:hostname).uniq
+      @service_settings = @project.service_settings.where(hostname: hostnames)
       @services = if params[:hostname]
         @project.services.where(hostname: params[:hostname]).group_by(&:hostname)
       else
@@ -66,7 +68,7 @@ module MissionControl::Servers
 
       # Use callbacks to share common setup or constraints between actions.
       def set_project
-        @project = Project.find(params[:id])
+        @project = Project.includes(:services, :service_settings).find(params[:id])
       end
 
       # Only allow a list of trusted parameters through.

data/app/controllers/mission_control/servers/scripts_controller.rb

@@ -41,43 +41,43 @@ module MissionControl::Servers
         fi
 
         cat <<'EOF' > metrics.sh
-          #!/bin/bash
+        #!/bin/bash
 
-          DEBUG=0
-          if [[ "$1" == "--debug" ]]; then
-            DEBUG=1
-          fi
+        DEBUG=0
+        if [[ "$1" == "--debug" ]]; then
+          DEBUG=1
+        fi
 
-          debug() {
-            if [[ $DEBUG -eq 1 ]]; then
-              echo "Debug: $1"
-            fi
-          }
+        debug() {
+          if [[ $DEBUG -eq 1 ]]; then
+            echo "Debug: $1"
+          fi
+        }
 
-          endpoint="#{project_ingress_url(@project.token)}"
-          cpu_usage=$(vmstat 1 5 | awk 'NR==4 {print 100 - $15}')
-          mem_used=$(free -m | awk '/^Mem:/ {print $3}')
-          mem_free=$(free -m | awk '/^Mem:/ {print $7}')
-          disk_free=$(df -h | awk '$NF=="/"{print $4}')
-          hostname=$(hostname)
+        endpoint="#{project_ingress_url(@project.token)}"
+        cpu_usage=$(vmstat 1 5 | awk 'NR==4 {print 100 - $15}')
+        mem_used=$(free -m | awk '/^Mem:/ {print $3}')
+        mem_free=$(free -m | awk '/^Mem:/ {print $7}')
+        disk_free=$(df -h | awk '$NF=="/"{print $4}')
+        hostname=$(hostname)
 
-          # Debug outputs
-          debug "CPU Usage: $cpu_usage"
-          debug "Memory Used: $mem_used MB"
-          debug "Memory Free: $mem_free MB"
-          debug "Disk Free: $disk_free"
-          debug "Hostname: $hostname"
+        # Debug outputs
+        debug "CPU Usage: $cpu_usage"
+        debug "Memory Used: $mem_used MB"
+        debug "Memory Free: $mem_free MB"
+        debug "Disk Free: $disk_free"
+        debug "Hostname: $hostname"
 
-          data=$(printf "service[cpu]=%s&service[mem_used]=%s&service[mem_free]=%s&service[disk_free]=%s&service[hostname]=%s" \
-            "$cpu_usage" "$mem_used" "$mem_free" "$disk_free" "$hostname")
+        data=$(printf "service[cpu]=%s&service[mem_used]=%s&service[mem_free]=%s&service[disk_free]=%s&service[hostname]=%s" \
+          "$cpu_usage" "$mem_used" "$mem_free" "$disk_free" "$hostname")
 
-          debug "Data being sent: $data"
+        debug "Data being sent: $data"
 
-          if [[ $DEBUG -eq 1 ]]; then
-            curl -v -X POST "$endpoint" -d "$data"
-          else
-            curl -X POST "$endpoint" -d "$data"
-          fi
+        if [[ $DEBUG -eq 1 ]]; then
+          curl -v -X POST "$endpoint" -d "$data"
+        else
+          curl -X POST "$endpoint" -d "$data"
+        fi
         EOF
 
         chmod +x metrics.sh
@@ -85,7 +85,7 @@ module MissionControl::Servers
         cron_job="* * * * * $(pwd)/metrics.sh"
         (crontab -l 2>/dev/null | grep -v -F "$cron_job"; echo "$cron_job") | crontab -
         echo "Sending first request to the server..."
-        $(pwd)/metrics.sh
+        bash $(pwd)/metrics.sh
         echo
         echo "████████████████████████████████████████████████████████████████████████████"
         echo "█                                                                          █"

data/app/controllers/mission_control/servers/service_settings_controller.rb

@@ -0,0 +1,27 @@
+module MissionControl::Servers
+  class ServiceSettingsController < ApplicationController
+    def edit
+      @project = Project.find(params[:project_id])
+      @service_setting = @project.service_settings.find_or_initialize_by(hostname: params[:id])
+      @service_setting.label = params[:id] if @service_setting.new_record?
+      @service_setting.save # To limit having to have a create action
+    end
+
+    def update
+      @project = Project.find(params[:project_id])
+      @service_setting = @project.service_settings.find_by(hostname)
+      @service_setting.update(label)
+      redirect_to projects_path, notice: "Updated Service Settings."
+    end
+
+    private
+
+    def hostname
+      params.require(:service_setting).permit(:hostname)
+    end
+
+    def label
+      params.require(:service_setting).permit(:label)
+    end
+  end
+end

data/app/helpers/mission_control/servers/service_settings_helper.rb

@@ -0,0 +1,4 @@
+module MissionControl::Servers
+  module ServiceSettingsHelper
+  end
+end

data/app/models/mission_control/servers/project.rb

@@ -1,6 +1,7 @@
 module MissionControl::Servers
   class Project < ApplicationRecord
     has_many :services, dependent: :destroy
+    has_many :service_settings, dependent: :destroy
     has_secure_token :token
   end
 end

data/app/models/mission_control/servers/service_setting.rb

@@ -0,0 +1,5 @@
+module MissionControl::Servers
+  class ServiceSetting < ApplicationRecord
+    belongs_to :project
+  end
+end

data/app/views/mission_control/servers/dashboards/last_seens/show.html.erb

@@ -6,7 +6,7 @@
     <dd class="card-heading">Last Seen</dd>
     <dt class="connected-chart">
       <%= @service.created_at.strftime("%Y-%-m-%-d") %><br><br>
-      <%= @service.created_at.strftime("%I:%M:%S %p") %>
+      <%= @service.created_at.strftime("%-I:%M:%S %p") %>
     </dt>
   </div>
 <% end %>

data/app/views/mission_control/servers/dashboards/project_tables/show.html.erb

@@ -12,6 +12,7 @@
           <th scope="col" class="hidden px-3 py-3.5 text-left text-sm font-semibold text-gray-normal lg:table-cell">Memory Used %</th>
           <th scope="col" class="hidden px-3 py-3.5 text-left text-sm font-semibold text-gray-normal lg:table-cell">Memory Free</th>
           <th scope="col" class="hidden px-3 py-3.5 text-left text-sm font-semibold text-gray-normal lg:table-cell">Disk Free</th>
+          <th scope="col" class="hidden px-3 py-3.5 text-left text-sm font-semibold text-gray-normal lg:table-cell">Last Seen</th>
           <th scope="col" class="relative py-3.5 pl-3 pr-4 sm:pr-6">
             <span class="sr-only">Select</span>
           </th>
@@ -21,14 +22,26 @@
         <% @project.services.group_by(&:hostname).each do |hostname, services| %>
           <tr>
             <td class="relative py-4 pl-4 pr-3 text-sm sm:pl-6">
-              <div class="font-medium text-gray-normal"><%= hostname%></div>
+              <div class="font-medium text-gray-normal">
+                <% service_setting = @service_settings.find { |s| s.hostname == hostname } %>
+                <% if service_setting %>
+                  <%= service_setting.label %>
+                  (<%= hostname %>)
+                <% else %>
+                  <%= hostname %>
+                <% end %>
+              </div>
             </td>
             <td class="px-3 py-3.5 text-sm text-gray-light lg:table-cell"><%= services.last.cpu %>%</td>
             <td class="hidden px-3 py-3.5 text-sm text-gray-light lg:table-cell"><%= number_to_human_size(services.last.mem_used.to_f * 1.megabyte) %></td>
             <td class="hidden px-3 py-3.5 text-sm text-gray-light lg:table-cell"><%= services.last.mem_percent %>%</td>
             <td class="hidden px-3 py-3.5 text-sm text-gray-light lg:table-cell"><%= number_to_human_size(services.last.mem_free.to_f * 1.megabyte) %></td>
             <td class="hidden px-3 py-3.5 text-sm text-gray-light lg:table-cell"><%= services.last.disk_free %></td>
+            <td class="hidden px-3 py-3.5 text-sm text-gray-light lg:table-cell">
+              <%= services.last.created_at.strftime("%Y-%-m-%-d %-I:%M:%S %p") %>
+            </td>
             <td class="relative py-3.5 pl-3 pr-4 text-right text-sm font-medium sm:pr-6">
+              <%= link_to "Settings", edit_project_service_setting_path(@project, id: hostname), target: :_top, class: "btn btn-default" %>
               <%= link_to "Dashboard", project_path(@project, hostname: hostname), target: :_top, class: "btn btn-default" %>
               <%= link_to "Remove", project_path(@project, hostname: hostname), data: { "turbo-method": :delete, "turbo-confirm": "Are you sure?" }, class: "btn btn-danger" %>
             </td>

data/app/views/mission_control/servers/projects/_form.html.erb

@@ -17,7 +17,7 @@
   </div>
 
   <div class="mb-6">
-    <%= form.hidden_field :token %>
+    <%= form.hidden_field :hostname %>
   </div>
 
   <div class="flex items-center justify-between">

data/app/views/mission_control/servers/projects/show.html.erb

@@ -54,7 +54,12 @@
           "data-target": hostname,
           "data-tabs-target": "link",
           class: "tab-link flex items-center justify-center #{first_tab_class} #{last_tab_class}" do %>
-          <%= hostname %>
+          <% service_setting = @service_settings.find { |s| s.hostname == hostname } %>
+          <% if service_setting %>
+            <%= service_setting.label %>
+          <% else %>
+            <%= hostname %>
+          <% end %>
         <% end %>
       <% end %>
     </nav>

data/app/views/mission_control/servers/service_settings/edit.html.erb

@@ -0,0 +1,23 @@
+<div class="lg:flex lg:items-center lg:justify-between">
+  <div class="min-w-0 flex-1"></div>
+  <div class="mt-5 flex lg:ml-4 lg:mt-0">
+    <span class="hidden sm:block">
+      <button data-controller="dark-mode" data-action="click->dark-mode#toggle" class="btn btn-default">Dark Mode</button>
+    </span>
+  </div>
+</div>
+
+<div class="max-w-4xl mx-auto px-4 sm:px-6 lg:px-8 my-10">
+  <h1 class="text-2xl text-center font-semibold text-gray-normal mb-8">Editing <%= @service_setting.hostname %></h1>
+  <%= form_with(model: [@project, @service_setting], class: "max-w-lg mx-auto my-10") do |form| %>
+    <%= form.hidden_field :hostname %>
+    <div class="mb-4">
+      <%= form.label :label, class: "block text-gray-700 text-sm font-bold mb-2" %>
+      <%= form.text_field :label, class: "shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline" %>
+    </div>
+    <div class="flex items-center justify-between">
+      <%= form.submit class: "btn btn-primary btn-block" %>
+      <%= link_to "Cancel", projects_path, class: "text-gray-light px-4 transition duration-150 ease-in-out" %>
+    </div>
+  <% end %>
+</div>

data/config/routes.rb

@@ -1,5 +1,6 @@
 MissionControl::Servers::Engine.routes.draw do
   resources :projects do
+    resources :service_settings, only: [:edit, :update]
     resource :ingress, only: :create
     resource :script, only: :show
     namespace :dashboards do

data/db/migrate/20240211190130_create_mission_control_servers_service_settings.rb

@@ -0,0 +1,11 @@
+class CreateMissionControlServersServiceSettings < ActiveRecord::Migration[7.1]
+  def change
+    create_table :mission_control_servers_service_settings do |t|
+      t.belongs_to :project, null: false, foreign_key: { to_table: :mission_control_servers_projects }
+      t.string :hostname
+      t.string :label
+
+      t.timestamps
+    end
+  end
+end

data/lib/mission_control/servers/version.rb

@@ -1,5 +1,5 @@
 module MissionControl
   module Servers
-    VERSION = "0.2.5"
+    VERSION = "0.2.8"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mission_control-servers
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.8
 platform: ruby
 authors:
 - Dave Kimura
@@ -119,7 +119,9 @@ files:
 - app/controllers/mission_control/servers/ingresses_controller.rb
 - app/controllers/mission_control/servers/projects_controller.rb
 - app/controllers/mission_control/servers/scripts_controller.rb
+- app/controllers/mission_control/servers/service_settings_controller.rb
 - app/helpers/mission_control/servers/application_helper.rb
+- app/helpers/mission_control/servers/service_settings_helper.rb
 - app/javascript/mission_control/servers/application.js
 - app/javascript/mission_control/servers/controllers/application.js
 - app/javascript/mission_control/servers/controllers/combo_chart_controller.js
@@ -136,6 +138,7 @@ files:
 - app/models/mission_control/servers/application_record.rb
 - app/models/mission_control/servers/project.rb
 - app/models/mission_control/servers/service.rb
+- app/models/mission_control/servers/service_setting.rb
 - app/views/layouts/mission_control/servers/application.html.erb
 - app/views/mission_control/servers/dashboards/combo_histories/show.html.erb
 - app/views/mission_control/servers/dashboards/cpu_histories/show.html.erb
@@ -151,11 +154,13 @@ files:
 - app/views/mission_control/servers/projects/index.html.erb
 - app/views/mission_control/servers/projects/new.html.erb
 - app/views/mission_control/servers/projects/show.html.erb
+- app/views/mission_control/servers/service_settings/edit.html.erb
 - config/importmap.rb
 - config/routes.rb
 - config/tailwind.config.js
 - db/migrate/20240205020304_create_mission_control_servers_projects.rb
 - db/migrate/20240205031009_create_mission_control_servers_services.rb
+- db/migrate/20240211190130_create_mission_control_servers_service_settings.rb
 - lib/mission_control/servers.rb
 - lib/mission_control/servers/configuration.rb
 - lib/mission_control/servers/engine.rb