amnesia 1.0.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62ac67cfa06f569559611449d4f3a10cbd05c6683283b8fcbb6299dfcb78481e
-  data.tar.gz: a2cc20ea0a933faf55cb6562d3759c3b6d0a6e87661a0452382a330a7dded612
+  metadata.gz: 6c3e3691f79fa370d7843d33890505ce19004352448f85d4f8255be655c7a5e9
+  data.tar.gz: 40465e097d361a541aab282e9fe12fb4bfb151a801f69be3d61737d9e9c6c5f6
 SHA512:
-  metadata.gz: f3fe2fe59c757c58dfb8c64a2a14f19eec9b0e6028e5140bc32fdbe22def7f09701da13e4413e5e29d078df03c5e39f4132efd4fc52aeecc84290c3a3a801764
-  data.tar.gz: f1e46efebdbf69f3ecc098b81ebb8f1a00cf5f213515c1024c142d2bd7c6e10a4cecd2fb7cfdac799ae845a6e23ecfdd9199ed96d7257a46b414636e0f5fb910
+  metadata.gz: 335ddae603a7561ebcdb175073cbe5074c2bc6701b4728ce5478a9b81886090a5629ec94b0a54030d73eabafeb04f455ed2bb580ed1657ea98bb4d17c8ec3b5e
+  data.tar.gz: 851a96de408e1b67763a690534b070da37b67215bddc4f9d5b9d0d19d45e5ca82ca20b54d9d4998c8d4745aeeac22a69d796cdfea73bebd2954a9dfd5a90d241

data/lib/amnesia/helpers.rb

@@ -10,7 +10,7 @@ module Amnesia
       SIZE_UNITS = %w[ Bytes KB MB GB TB PB EB ]
 
       def graph_url(*data)
-        Gchart.pie(data: data, size: '115x115', bg: 'ffffff00')
+        url "/pie?d="+data.join(',')
       end
 
       # https://github.com/rails/rails/blob/fbe335cfe09bf0949edfdf0c4b251f4d081bd5d7/activesupport/lib/active_support/number_helper/number_to_human_size_converter.rb

data/lib/amnesia/host.rb

@@ -4,9 +4,16 @@ module Amnesia
   class Host
     FLOAT_STATS  = %w[ rusage_user rusage_system ]
     STRING_STATS = %w[ version libevent ]
+    DEFAULT_PORT = 11_211
+
+    def self.normalize_address address
+      return "#{address}:#{DEFAULT_PORT}" unless address.include? ":"
+
+      address
+    end
 
     def initialize(address)
-      @address = address
+      @address = self.class.normalize_address address
     end
 
     def alive?

data/lib/amnesia/public/css/application.css

@@ -47,10 +47,9 @@ header { margin: 1em 0; }
   align-items: center;
   margin: 2em 0;
 }
-.stats-graph img { margin-left: -10px; }
 .stats-text {
   flex: 1 1;
-  margin-left: 1em;
+  margin-left: 1.5em;
 }
 
 .graph-indicator { color: #ff9900; }

data/lib/amnesia/routes.rb

@@ -6,6 +6,27 @@ module Amnesia
           haml :index
         end
 
+        get '/pie' do
+          data = params[:d].to_s.split(",").map(&:to_i)
+
+          r = 25
+          c = (2*Math::PI*r).ceil
+          v = data.first.to_f / data.last * 100 * c / 100
+          v = v.nan? ? 0 : v.ceil
+
+          content_type "image/svg+xml"
+          <<~BODY
+            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"
+                 style="transform:rotate(-90deg);">
+              <circle r="#{r*2}" cx="50" cy="50" fill="#FFEBCC" />
+              <circle r="#{r}" cx="50" cy="50"
+                fill="transparent" stroke="#FF9901"
+                stroke-width="#{r*2}" stroke-dasharray="#{v} #{c}"
+              />
+            </svg>
+          BODY
+        end
+
         get '/:address' do
           @host = find_host params[:address]
           @host ? haml(:host) : halt(404)

data/lib/amnesia/views/host.haml

@@ -6,16 +6,16 @@
 
 %article.stats
   %section.stats-graph
-    %img{src: graph_url(@host.bytes, @host.limit_maxbytes) }
+    %img{src: graph_url(@host.bytes, @host.limit_maxbytes), width: 90}
   %section.stats-text
     %h3
-      %span.graph-indicator Used Memory (#{number_to_human_size(@host.bytes)})
-      \/ Free Memory (#{number_to_human_size(@host.limit_maxbytes)})
-    %p The cumulative amount of free memory and total memory across all active hosts.
+      %span.graph-indicator Used (#{number_to_human_size(@host.bytes)})
+      \/ Available Memory (#{number_to_human_size(@host.limit_maxbytes)})
+    %p The cumulative amount of available memory across all active hosts.
 
 %article.stats
   %section.stats-graph
-    %img{src: graph_url(@host.get_hits, @host.get_misses) }
+    %img{src: graph_url(@host.get_hits, @host.get_misses), width: 90}
   %section.stats-text
     %h3
       %span.graph-indicator Hit (#{@host.get_hits})
@@ -24,7 +24,7 @@
 
 %section.stats
   %section.stats-graph
-    %img{src: graph_url(@host.cmd_get, @host.cmd_set) }
+    %img{src: graph_url(@host.cmd_get, @host.cmd_set), width: 90}
   %section.stats-text
     %h3
       %span.graph-indicator Read (#{@host.cmd_get})

data/lib/amnesia/views/index.haml

@@ -1,16 +1,16 @@
 - if alive_hosts.any?
   %article.stats
     %section.stats-graph
-      %img{src: graph_url(bytes_sum, limit_maxbytes_sum)}
+      %img{src: graph_url(bytes_sum, limit_maxbytes_sum), width: 90}
     %section.stats-text
       %h3
-        %span.graph-indicator Used Memory (#{number_to_human_size(bytes_sum)})
-        \/ Free Memory (#{number_to_human_size(limit_maxbytes_sum)})
-      %p The cumulative amount of free memory and total memory across all active hosts.
+        %span.graph-indicator Used (#{number_to_human_size(bytes_sum)})
+        \/ Available Memory (#{number_to_human_size(limit_maxbytes_sum)})
+      %p The cumulative amount of available memory across all active hosts.
 
   %article.stats
     %section.stats-graph
-      %img{src: graph_url(get_hits_sum, get_misses_sum)}
+      %img{src: graph_url(get_hits_sum, get_misses_sum), width: 90}
     %section.stats-text
       %h3
         %span.graph-indicator Hit (#{get_hits_sum})
@@ -19,7 +19,7 @@
 
   %article.stats
     %section.stats-graph
-      %img{src: graph_url(cmd_get_sum, cmd_set_sum)}
+      %img{src: graph_url(cmd_get_sum, cmd_set_sum), width: 90}
     %section.stats-text
       %h3
         %span.graph-indicator Read (#{cmd_get_sum})

data/lib/amnesia/views/layout.haml

@@ -10,7 +10,7 @@
         %a{href: url('/')} Amnesia
       %p Statistics for Memcached. Wait—What?
     %main
-      = yield
+      != yield
     %footer
       %p
         Another

data/lib/amnesia.rb

@@ -1,5 +1,4 @@
 require 'sinatra/base'
-require 'googlecharts'
 require 'haml'
 require 'amnesia/authentication'
 require 'amnesia/helpers'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: amnesia
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Ben Schwarz
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-15 00:00:00.000000000 Z
+date: 2023-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: dalli
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: googlecharts
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.8
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: With Amnesia you'll know exactly whats happening with memory when it
   comes to memcached.
 email:
@@ -116,7 +116,7 @@ files:
 homepage: http://github.com/benschwarz/amnesia
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -131,8 +131,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.4.1
+signing_key:
 specification_version: 4
 summary: Amnesia is what you get when you lose your memory
 test_files: []