mission_control-servers 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07defb87c30b22a7001663636eb16b9840b17f335681bb029915e8aa7a093874
-  data.tar.gz: 1d9ce1269f6b5d445c7defa11c536f8d0fdc4fc87ec6fa084c7aa999baacbed3
+  metadata.gz: 5eef0e07ac8fee585155c704088b7cbfcbf9736440ee11af15bd780ce5077664
+  data.tar.gz: f219f8ee1ddcfbed49ee3f80c0493bab20d433173a4863e6fba4abbca367e713
 SHA512:
-  metadata.gz: 4b2ee33384343c673dff194caf62bf23da4b44dcc4bf0a6a24e1921c1f55474272ee7c1e455f1d58271df3024876bf1bcc62e5f0a31b0b0247feed22564a3f17
-  data.tar.gz: 5d1a4036a7286d36dc7e98c92e12ee890499f8bc1c14be8969680f6d9f4dba592c6fc6fb0941f53de4ec043b12ec937ddbc981c5689129136396be9e5868c477
+  metadata.gz: 062a231db01dff3d63e7b342dabb170184ec5c9ac0421f3f86f3c9981250c54ccd2a7746854abdc6697c2f1241b8eda3d198c68fe8a158f47a8674e5a31bc6cb
+  data.tar.gz: 060a236e9e8d5651175f328c790fc38fc02689ae01ad7cfb353fd7e589ba9fe35252e54335073dfc4366779f1668e1a446da36a37b862b44cbca5a415606350c

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

@@ -4,10 +4,9 @@ module MissionControl::Servers
     before_action :set_project
 
     def create
-      head :unprocessable_entity and return unless @project
       ingress = @project.services.new(ingress_params)
 
-      if ingress.save!
+      if ingress.save
         head :ok
       else
         head :unprocessable_entity
@@ -17,7 +16,7 @@ module MissionControl::Servers
     private
       # Use callbacks to share common setup or constraints between actions.
       def set_project
-        @project = Project.find_by(token: params[:project_id])
+        @project = Project.find_by!(token: params[:project_id])
       end
 
       def ingress_params

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

@@ -3,7 +3,6 @@ module MissionControl::Servers
     before_action :set_project
 
     def show
-      head :not_found and return unless @project
       response.content_type = 'text/plain'
 
       # Render the script directly or from a file
@@ -13,7 +12,7 @@ module MissionControl::Servers
     private
       # Use callbacks to share common setup or constraints between actions.
       def set_project
-        @project = Project.find_by(token: params[:project_id])
+        @project = Project.find_by!(token: params[:project_id])
       end
 
       def script_content
@@ -42,22 +41,43 @@ module MissionControl::Servers
         fi
 
         cat <<'EOF' > metrics.sh
-        #!/bin/bash
-
-        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)
-
-        data="service[cpu]=$cpu_usage"
-        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
+          #!/bin/bash
+
+          DEBUG=0
+          if [[ "$1" == "--debug" ]]; then
+            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)
+
+          # 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")
+
+          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
         EOF
 
         chmod +x metrics.sh

data/lib/mission_control/servers/version.rb

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

metadata

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