Round stuff

hschne · Oct 23, 2024 · 981a9b3 · 981a9b3
1 parent 213d150
commit 981a9b3
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/app/puny_monitor.rb b/app/puny_monitor.rb
@@ -33,6 +33,7 @@ class App < Sinatra::Base
       cpu_loads = CpuUsage.where(created_at: start_time..end_time)
                           .group_by_period(group_by, :created_at, series: true)
                           .average(:used_percent)
+                          .transform_values { |value| value&.round(2) }
       cpu_loads.to_json
     end
 
@@ -43,13 +44,16 @@ class App < Sinatra::Base
       [
         { name: "1 minute", data: CpuLoad.where(created_at: start_time..end_time)
                                          .group_by_period(group_by, :created_at, series: true)
-                                         .average(:one_minute) },
+                                         .average(:one_minute)
+                                         .transform_values { |value| value&.round(2) } },
         { name: "5 minutes", data: CpuLoad.where(created_at: start_time..end_time)
                                           .group_by_period(group_by, :created_at, series: true)
-                                          .average(:five_minutes) },
+                                          .average(:five_minutes)
+                                          .transform_values { |value| value&.round(2) } },
         { name: "15 minutes", data: CpuLoad.where(created_at: start_time..end_time)
                                            .group_by_period(group_by, :created_at, series: true)
-                                           .average(:fifteen_minutes) }
+                                           .average(:fifteen_minutes)
+                                           .transform_values { |value| value&.round(2) } }
       ].to_json
     end
 
@@ -60,6 +64,7 @@ class App < Sinatra::Base
       memory_usage = MemoryUsage.where(created_at: start_time..end_time)
                                 .group_by_period(group_by, :created_at, series: true)
                                 .average(:used_percent)
+                                .transform_values { |value| value&.round(2) }
       memory_usage.to_json
     end
 
@@ -70,6 +75,7 @@ class App < Sinatra::Base
       filesystem_usage = FilesystemUsage.where(created_at: start_time..end_time)
                                         .group_by_period(group_by, :created_at, series: true)
                                         .average(:used_percent)
+                                        .transform_values { |value| value&.round(2) }
       filesystem_usage.to_json
     end
 
@@ -80,10 +86,12 @@ class App < Sinatra::Base
       [
         { name: "Read MB/s", data: DiskIO.where(created_at: start_time..end_time)
                                          .group_by_period(group_by, :created_at, series: true)
-                                         .average(:read_mb_per_sec) },
+                                         .average(:read_mb_per_sec)
+                                         .transform_values { |value| value&.round(2) } },
         { name: "Write MB/s", data: DiskIO.where(created_at: start_time..end_time)
                                           .group_by_period(group_by, :created_at, series: true)
-                                          .average(:write_mb_per_sec) }
+                                          .average(:write_mb_per_sec)
+                                          .transform_values { |value| value&.round(2) } }
       ].to_json
     end
 
@@ -95,10 +103,12 @@ class App < Sinatra::Base
       [
         { name: "Incoming Mbps", data: Bandwidth.where(created_at: start_time..end_time)
                                                 .group_by_period(group_by, :created_at, series: true)
-                                                .average(:incoming_mbps) },
+                                                .average(:incoming_mbps)
+                                                .transform_values { |value| value&.round(2) } },
         { name: "Outgoing Mbps", data: Bandwidth.where(created_at: start_time..end_time)
                                                 .group_by_period(group_by, :created_at, series: true)
-                                                .average(:outgoing_mbps) }
+                                                .average(:outgoing_mbps)
+                                                .transform_values { |value| value&.round(2) } }
       ].to_json
     end
 

diff --git a/lib/system_utils.rb b/lib/system_utils.rb
@@ -24,11 +24,13 @@ def cpu_usage_percent
       idle_diff = idle - prev_idle
 
       cpu_percentage = ((total_diff - idle_diff).to_f / total_diff * 100).round(2)
-      [cpu_percentage, 100.0].min
+      [cpu_percentage, 100.0].min.round(2)
     end
 
     def cpu_load_average
-      File.read("#{proc_path}/loadavg").split.take(3).map(&:to_f)
+      File.read("#{proc_path}/loadavg").split.take(3)
+          .map(&:to_f)
+          .map { |value| value.round(2) }
     end
 
     def memory_usage_percent
@@ -47,7 +49,7 @@ def filesystem_usage_percent
       available_blocks = stat.blocks_available
       used_blocks = total_blocks - available_blocks
       used_percent = (used_blocks.to_f / total_blocks * 100).round(2)
-      [used_percent, 100.0].min
+      [used_percent, 100.0].min.round(2)
     end
 
     def disk_io_stats