mission_control-servers 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e260e5cc3de9e7b0faf2f5a3c07caddfc398802dbdc95a695e667639c39c394
-  data.tar.gz: 4092d62a7d16bc73d69f504b6c72df2f9360193dd6aec8fd5cd12862c1951d22
+  metadata.gz: 528c4f44febc66f16c62945fa9e7bf9cec90f03dd3ad0395418ebb64e1d3369b
+  data.tar.gz: cf9ed213169883628541b48679c3d8410b06fee630e2c781a528035555fa7fdf
 SHA512:
-  metadata.gz: 55073a06bcfb54e72896f64b1633b9983e394d2cf4f727eb95fa6131b9c32c42f78bd683c1ce27cb81d04f3af956e9e6dab5dd58c0b2ef5b780ef51356714e3c
-  data.tar.gz: 0ce16cfdce72db053874a5cfa6bed60e785f1a1fb49a8b7ab75dd6facdc9b648ad9765370392b5788aa5d52c2335dc914dd9cb2b6f1ead8fc5f68fcf5bc3b98d
+  metadata.gz: 72e1c4ea0a8a93a9fdcb4033d64dd2d92230d333c7475b3218a0386edc91c16c660019ac14b311d37a73bedcb4dc15d95143c4e91a71418212ce0380c26f61f8
+  data.tar.gz: 5fd770c81254b978a83c340240dc57445ddb7377e69238a4be2d72be4e1a54236f26038e4f3394cb984ac8a73bc057b9ff1b4fdb1b17182837e1cf97accd4902

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

@@ -48,8 +48,13 @@ module MissionControl::Servers
 
     # DELETE /projects/1
     def destroy
-      @project.destroy!
-      redirect_to projects_url, notice: "Project was successfully destroyed.", status: :see_other
+      if params[:hostname]
+        @project.services.where(hostname: params[:hostname]).delete_all
+        redirect_to project_dashboards_project_table_path(@project.token), notice: "Service was successfully destroyed.", status: :see_other
+      else
+        @project.destroy!
+        redirect_to projects_url, notice: "Project was successfully destroyed.", status: :see_other
+      end
     end
 
     private

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

@@ -29,10 +29,10 @@ module MissionControl::Servers
         hostname=$(hostname)
 
         data="service[cpu]=$cpu_usage"
-        data+="&service[mem_used]=$mem_used"
-        data+="&service[mem_free]=$mem_free"
-        data+="&service[disk_free]=$disk_free"
-        data+="&service[hostname]=$hostname"
+        data="$data&service[mem_used]=$mem_used"
+        data="$data&service[mem_free]=$mem_free"
+        data="$data&service[disk_free]=$disk_free"
+        data="$data&service[hostname]=$hostname"
 
         curl -X POST $endpoint -d $data
         EOF

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

@@ -2,6 +2,7 @@ module MissionControl::Servers
   class Service < ApplicationRecord
     belongs_to :project
     after_create :trim_old_records
+    before_create :set_hostname
 
     scope :ordered, -> { order(created_at: :desc) }
 
@@ -40,6 +41,7 @@ module MissionControl::Servers
     end
 
     def mem_percent
+      return 0 if mem_used.to_f + mem_free.to_f == 0.0
       (mem_used.to_f / (mem_used.to_f + mem_free.to_f) * 100).to_i
     end
 
@@ -48,5 +50,9 @@ module MissionControl::Servers
     def trim_old_records
       project.services.where(hostname: hostname).where(created_at: ..1.week.ago).delete_all
     end
+
+    def set_hostname
+      self.hostname ||= "unnamed server"
+    end
   end
 end

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

@@ -24,12 +24,13 @@
               <div class="font-medium text-gray-900"><%= hostname%></div>
             </td>
             <td class="px-3 py-3.5 text-sm text-gray-500 lg:table-cell"><%= services.last.cpu %>%</td>
-            <td class="hidden px-3 py-3.5 text-sm text-gray-500 lg:table-cell"><%= number_to_human_size(services.last.mem_used * 1.megabyte) %></td>
+            <td class="hidden px-3 py-3.5 text-sm text-gray-500 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-500 lg:table-cell"><%= services.last.mem_percent %>%</td>
-            <td class="hidden px-3 py-3.5 text-sm text-gray-500 lg:table-cell"><%= number_to_human_size(services.last.mem_free * 1.megabyte) %></td>
+            <td class="hidden px-3 py-3.5 text-sm text-gray-500 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-500 lg:table-cell"><%= services.last.disk_free %></td>
             <td class="relative py-3.5 pl-3 pr-4 text-right text-sm font-medium sm:pr-6">
               <%= link_to "Dashboard", project_path(@project, hostname: hostname), target: :_top, class: "inline-flex items-center rounded-md bg-white px-2.5 py-1.5 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50 disabled:cursor-not-allowed disabled:opacity-30 disabled:hover:bg-white" %>
+              <%= link_to "Remove", project_path(@project, hostname: hostname), data: { "turbo-method": :delete, "turbo-confirm": "Are you sure?" }, class: "inline-flex items-center rounded-md bg-white px-2.5 py-1.5 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50 disabled:cursor-not-allowed disabled:opacity-30 disabled:hover:bg-white" %>
             </td>
           </tr>
         <% end %>

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

@@ -22,5 +22,6 @@
 
   <div class="flex items-center justify-between">
     <%= form.submit class: "bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded focus:outline-none focus:shadow-outline" %>
+    <%= link_to "Cancel", project, class: "text-blue-600 px-4 hover:text-blue-800 transition duration-150 ease-in-out" %>
   </div>
 <% end %>

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

@@ -1,10 +1,9 @@
-<h1>Editing project</h1>
+<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-900 mb-8">Editing project</h1>
 
-<%= render "form", project: @project %>
+  <%= render "form", project: @project %>
 
-<br>
-
-<div>
-  <%= link_to "Show this project", @project %> |
-  <%= link_to "Back to projects", projects_path %>
+  <div class="text-center mt-6">
+    <%= link_to "Back to projects", projects_path, class: "text-blue-600 px-4 hover:text-blue-800 transition duration-150 ease-in-out" %>
+  </div>
 </div>

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

@@ -20,6 +20,7 @@
                 <td class="whitespace-nowrap text-2xl font-bold tracking-tight text-gray-900 sm:text-3xl"><%= project.title %></td>
                 <td class="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6 lg:pr-8">
                   <%= link_to "Dashboards", project, target: :_top, class: "rounded-md bg-indigo-50 px-2.5 py-1.5 text-sm font-semibold text-indigo-600 shadow-sm hover:bg-indigo-100" %>
+                  <%= link_to "Remove", project, data: { "turbo-method": :delete, "turbo-confirm": "Are you sure?" }, class: "inline-flex items-center rounded-md bg-white px-2.5 py-1.5 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50 disabled:cursor-not-allowed disabled:opacity-30 disabled:hover:bg-white" %>
                 </td>
               </tr>
               <tr>

data/lib/mission_control/servers/version.rb

@@ -1,5 +1,5 @@
 module MissionControl
   module Servers
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mission_control-servers
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Dave Kimura
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-07 00:00:00.000000000 Z
+date: 2024-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails