Various tweakies

hschne · Oct 26, 2024 · d7c3509 · d7c3509
1 parent 884b3cf
commit d7c3509
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 45 deletions.
diff --git a/README.md b/README.md
@@ -8,12 +8,17 @@
 
 </div>
 
+<p align="center">
+  <img alt="Screenshot of Puny Monitor" src="screenshot.png" width="90%">
+</p>
+
 ## Features
 
 - Just enough data to be useful 🔍
 - Install in 30 seconds 🏎️
 - Perfect for [Kamal](https://kamal-deploy.org/) and other containerized setups 🐋
 
+
 ## Getting Started
 
 Puny Monitor works best with Docker. Run this command to check it out quickly: 
@@ -26,7 +31,7 @@ docker run --rm \
   hschne/puny-monitor:latest
 ```
 
-Visit [localhost:4567](http://localhost:4567) to check your system data. To see how to deploy Puny Monitor in a production environment see [Deployment]
+Visit [localhost:4567](http://localhost:4567) to check your system data. To see how to deploy Puny Monitor in a production environment see [Deployment].
 
 ## Deployment
 

diff --git a/app/puny_monitor.rb b/app/puny_monitor.rb
@@ -28,10 +28,8 @@ class App < Sinatra::Base
 
     get "/data/cpu_usage" do
       content_type :json
-      end_time = Time.now
-      start_time = start_time(end_time)
-      cpu_loads = CpuUsage.where(created_at: start_time..end_time)
-                          .group_by_period(group_by, :created_at, series: true)
+      cpu_loads = CpuUsage.where(created_at: start_time..)
+                          .group_by_period(group_by, :created_at, expand_range: true)
                           .average(:used_percent)
                           .transform_values { |value| value&.round(2) }
       cpu_loads.to_json
@@ -40,73 +38,64 @@ class App < Sinatra::Base
     get "/data/cpu_load" do
       content_type :json
       end_time = Time.now
-      start_time = start_time(end_time)
       [
         { name: "1 minute", data: CpuLoad.where(created_at: start_time..end_time)
-                                         .group_by_period(group_by, :created_at, series: true)
+                                         .group_by_period(group_by, :created_at)
                                          .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)
+                                          .group_by_period(group_by, :created_at)
                                           .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)
+                                           .group_by_period(group_by, :created_at)
                                            .average(:fifteen_minutes)
                                            .transform_values { |value| value&.round(2) } }
       ].to_json
     end
 
     get "/data/memory_usage" do
       content_type :json
-      end_time = Time.now
-      start_time = start_time(end_time)
-      memory_usage = MemoryUsage.where(created_at: start_time..end_time)
-                                .group_by_period(group_by, :created_at, series: true)
+      memory_usage = MemoryUsage.where(created_at: start_time..)
+                                .group_by_period(group_by, :created_at)
                                 .average(:used_percent)
                                 .transform_values { |value| value&.round(2) }
       memory_usage.to_json
     end
 
     get "/data/filesystem_usage" do
       content_type :json
-      end_time = Time.now
-      start_time = start_time(end_time)
-      filesystem_usage = FilesystemUsage.where(created_at: start_time..end_time)
-                                        .group_by_period(group_by, :created_at, series: true)
+      filesystem_usage = FilesystemUsage.where(created_at: start_time..)
+                                        .group_by_period(group_by, :created_at)
                                         .average(:used_percent)
                                         .transform_values { |value| value&.round(2) }
       filesystem_usage.to_json
     end
 
     get "/data/disk_io" do
       content_type :json
-      end_time = Time.now
-      start_time = start_time(end_time)
       [
-        { name: "Read MB/s", data: DiskIO.where(created_at: start_time..end_time)
-                                         .group_by_period(group_by, :created_at, series: true)
+        { name: "Read MB/s", data: DiskIO.where(created_at: start_time..)
+                                         .group_by_period(group_by, :created_at)
                                          .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)
+        { name: "Write MB/s", data: DiskIO.where(created_at: start_time..)
+                                          .group_by_period(group_by, :created_at)
                                           .average(:write_mb_per_sec)
                                           .transform_values { |value| value&.round(2) } }
       ].to_json
     end
 
     get "/data/bandwidth" do
       content_type :json
-      end_time = Time.now
-      start_time = start_time(end_time)
       group_by = group_by()
       [
-        { name: "Incoming Mbps", data: Bandwidth.where(created_at: start_time..end_time)
-                                                .group_by_period(group_by, :created_at, series: true)
+        { name: "Incoming Mbps", data: Bandwidth.where(created_at: start_time..)
+                                                .group_by_period(group_by, :created_at)
                                                 .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)
+        { name: "Outgoing Mbps", data: Bandwidth.where(created_at: start_time..)
+                                                .group_by_period(group_by, :created_at)
                                                 .average(:outgoing_mbps)
                                                 .transform_values { |value| value&.round(2) } }
       ].to_json
@@ -125,19 +114,19 @@ def duration
       params[:duration] || "1d"
     end
 
-    def start_time(end_time)
+    def start_time
       case duration
-      when "1h" then end_time - 1.hour
-      when "3d" then end_time - 3.days
-      when "1w" then end_time - 1.week
-      when "1m" then end_time - 1.month
-      else end_time - 1.day
+      when "1h" then 1.hour.ago
+      when "3d" then 3.days.ago
+      when "1w" then 1.week.ago
+      when "1m" then 1.month.ago
+      else 1.day.ago
       end
     end
 
     def group_by
       case duration
-      when "1h" then :minute
+      when "1h", "1d" then :minute
       else :hour
       end
     end

diff --git a/app/views/layout.erb b/app/views/layout.erb
@@ -5,10 +5,13 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>Puny Monitor - Lightweight System Monitoring</title>
-    <meta name="description" content="Puny Monitor is a lightweight system monitoring tool that tracks CPU usage, memory usage, disk I/O, and network bandwidth.">
+    <meta
+      name="description"
+      content="Puny Monitor is a lightweight system monitoring tool that tracks CPU usage, memory usage, disk I/O, and network bandwidth."
+    >
     <meta name="robots" content="noindex">
-    <link rel="icon" href="/favicon.ico" sizes="32x32">
-    <link rel="icon" href="/public/puny-monitor.svg" type="image/svg+xml">
+    <link rel="icon" href="favicon.ico" sizes="32x32">
+    <link rel="icon" href="icon.svg" type="image/svg+xml">
 
     <script
       src="https://cdn.jsdelivr.net/npm/[email protected]/dist/chartkick.min.js"
@@ -36,6 +39,8 @@
       <%= yield %>
     </main>
     <footer>
+      Found an issue or need a feature? File an issue on
+      <a href="https://github.com/hschne/puny-monitor">GitHub!</a>
     </footer>
   </body>
 </html>
diff --git a/config/initializers/chartkick.rb b/config/initializers/chartkick.rb
@@ -3,7 +3,6 @@
 # # frozen_string_literal: true
 
 Chartkick.options = {
-  height: "25rem",
   xtitle: "Time",
   points: false,
   curve: false

diff --git a/favicon.ico → public/favicon.ico b/favicon.ico → public/favicon.ico
diff --git a/public/icon.svg b/public/icon.svg
diff --git a/public/style.css b/public/style.css
@@ -85,6 +85,14 @@ h1 {
   font-size: var(--font-size-2xl);
 }
 
+a:visited {
+  color: var(--color-link-hover);
+}
+
+footer {
+  padding: var(--space-sm) 0;
+}
+
 .charts {
   display: grid;
   grid-template-columns: 1fr;
@@ -98,7 +106,7 @@ h1 {
   padding: var(--space-md);
   border: solid 1px var(--color-border);
   border-radius: 10px;
-  height: 25rem;
+  height: 20rem;
 }
 
 .controls {
@@ -136,6 +144,10 @@ h1 {
   .charts {
     grid-template-columns: repeat(2, 1fr);
   }
+
+  .tile {
+    height: 25rem;
+  }
 }
 
 @media (prefers-color-scheme: dark) {

diff --git a/screenshot.png b/screenshot.png
diff --git a/todo.txt b/todo.txt