monittr 0.0.1 → 0.0.2

data/README.markdown

@@ -17,16 +17,16 @@ You can try the interface in a IRB console:
 
     $ irb -Ilib -rubygems -rmonittr
 
-You have to pass one or more full URLs to a running Monit web server XML output, eg. `http://admin:monit@example.com:2812/_status?format=xml`.
+You have to pass one or more full URLs to a running Monit web server XML output, eg. `http://admin:monit@example.com:2812/`.
 
 In case you don't have a running Monit handy, fake its output:
 
     require 'fakeweb'
-    FakeWeb.register_uri(:get, 'http://localhost:2812/_status?format=xml', :body => File.read('test/fixtures/status.xml') ); nil
+    FakeWeb.register_uri(:get, 'http://localhost:2812/', :body => File.read('test/fixtures/status.xml') ); nil
 
 Now, retrieve information from the cluster:
 
-    cluster = Monittr::Cluster.new ['http://localhost:2812/_status?format=xml']
+    cluster = Monittr::Cluster.new ['http://localhost:2812/']
     cluster.servers.size
 
     server = cluster.servers.first
@@ -51,7 +51,7 @@ You should see the information about two faked Monit instances in your browser.
 
 Provide the URLs to _Monit_ instances by setting the appropriate option:
 
-    set :monit_urls,  ['http://production.example.com:2812/_status?format=xml', 'http://staging.example.com:2812/_status?format=xml']
+    set :monit_urls,  %w[ http://production.example.com:2812 http://staging.example.com:2812 ]
 
 
 ## Customization ##

data/examples/application.rb

@@ -9,7 +9,7 @@ require 'monittr/sinatra/monittr'
 
 FakeWeb.register_uri(:get, 'http://localhost:2812/_status?format=xml', :body => File.read( File.expand_path('../../test/fixtures/status.xml', __FILE__)))
 
-set :monit_urls,  ['http://localhost:2812/_status?format=xml', 'http://localhost:2812/_status?format=xml']
+set :monit_urls,  %w[ http://localhost:2812 http://localhost:2812 ]
 
 # set :template,   Proc.new { File.join(root, 'template.erb') }
 # set :stylesheet, '/path/to/my/stylesheet'

data/lib/monittr.rb

@@ -22,10 +22,11 @@ module Monittr
   #
   class Server
 
-    attr_reader :xml, :system, :filesystems, :processes
+    attr_reader :url, :xml, :system, :filesystems, :processes
 
-    def initialize(xml)
-      @xml         = Nokogiri::XML(xml)
+    def initialize(url, xml)
+      @url = url
+      @xml = Nokogiri::XML(xml)
       if error = @xml.xpath('error').first
         @system      = Services::Base.new :name    => error.attributes['name'].content,
                                           :message => error.attributes['message'].content,
@@ -39,11 +40,13 @@ module Monittr
 
     # Retrieve Monit status XML from the URL
     #
-    def self.fetch(url=nil)
-      url = url || ENV['MONIT_URL'] || 'http://admin:monit@localhost:2812/_status?format=xml'
-      self.new( RestClient.get(url) )
+    def self.fetch(url='http://admin:monit@localhost:2812')
+      monit_url  = url
+      monit_url += '/' unless url =~ /\/$/
+      monit_url += '_status?format=xml' unless url =~ /_status\?format=xml$/
+      self.new url, RestClient.get(monit_url)
     rescue Exception => e
-      self.new(%Q|<error status="3" name="#{e.class}" message="#{e.message}" />|)
+      self.new url, %Q|<error status="3" name="#{e.class}" message="#{e.message}" />|
     end
 
     def inspect
@@ -59,6 +62,11 @@ module Monittr
     class Base < OpenStruct
       TYPES = { 0 => "Filesystem", 1 => "Directory", 2 => "File", 3 => "Daemon", 4 => "Connection", 5 => "System" }
 
+      def load
+        # Note: the `load` gives some headaches, let's be explicit
+        @table[:load]
+      end
+
       def value(matcher, converter=:to_s)
         @xml.xpath(matcher).first.content.send(converter) rescue nil
       end
@@ -81,7 +89,7 @@ module Monittr
                  :load      => value('system/load/avg01',       :to_f),
                  :cpu       => value('system/cpu/user',         :to_f),
                  :memory    => value('system/memory/percent',   :to_f),
-                 :uptime    => value('//server/uptime',         :to_f)
+                 :uptime    => value('//server/uptime',         :to_i)
                } )
       end
     end

data/lib/monittr/sinatra/monittr.rb

@@ -32,12 +32,33 @@ module Sinatra
         app.settings.stylesheet ? File.read( app.settings.stylesheet ) : ''
       end
 
+      def time_in_words(seconds)
+        case seconds
+        when 0..60
+          "#{seconds        } seconds"
+        when 60..3600
+          value = seconds/60
+          "#{value} minute#{value > 1 ? 's' : ''}"
+        when 3600..86400
+          value = seconds/3600
+          "#{value} hour#{  value > 1 ? 's' : ''}"
+        when 86400..604800
+          value = seconds/86400
+          "#{value} day#{   value > 1 ? 's' : ''}"
+        when 604800..2419200
+          value = seconds/604800
+          "#{value} week#{  value > 1 ? 's' : ''}"
+        else
+          nil
+        end
+      end
+
     end
 
     def self.registered(app)
       app.helpers MonittrHTML::Helpers
 
-      app.set :monit_urls, ['http://admin:monit@localhost:2812/_status?format=xml']
+      app.set :monit_urls, ['http://admin:monit@localhost:2812']
       app.set :template,   File.expand_path('../template.erb', __FILE__)
       app.set :stylesheet, File.expand_path('../style.css', __FILE__)
     end

data/lib/monittr/sinatra/style.css

@@ -1,5 +1,5 @@
 #monittr
-  { font-family: sans-serif; }
+  { color: #222; font-family: sans-serif; }
 
 #monittr .clear
   { clear:both; display:block; overflow:hidden; visibility:hidden; width:0; height:0 }
@@ -9,6 +9,13 @@
 	  -webkit-border-radius: 0.5em;
 	  border-radius: 0.5em }
 
+#monittr a
+  { color: #222;
+    text-decoration: none; }
+
+#monittr a:hover
+  { text-decoration: underline; }
+
 #monittr #toggle
   { font-size: 80%;
     text-decoration: underline;

data/lib/monittr/sinatra/template.erb

@@ -11,7 +11,7 @@
         <strong>
           <span class="dot status <%= server.system.status == 0 ? 'running' : 'failure' %>">&middot;</span>
           <span class="dot monitored <%= server.system.monitored == 1 ? 'running' : 'failure' %>">&middot;</span>
-          <%= server.system.name %>
+          <a href="<%= server.url %>"><%= server.system.name %></a>
           <%= "<em>#{server.system.message}</em>" if server.system.message %>
         </strong>
 
@@ -19,7 +19,7 @@
           <span class="info"><span class="label">load:   </span><%= server.system.load   || 'N/A' %></span>
           <span class="info"><span class="label">cpu:    </span><%= server.system.cpu    || 'N/A' %></span>
           <span class="info"><span class="label">memory: </span><%= server.system.memory || 'N/A' %></span>
-          <span class="info"><span class="label">uptime: </span><%= server.system.uptime || 'N/A' %></span>
+          <span class="info"><span class="label">uptime: </span><%= time_in_words(server.system.uptime) || 'N/A' %></span>
         </small>
       </h2>
 
@@ -56,7 +56,7 @@
               <small>
                 <span class="info"><span class="label">cpu:    </span><%= process.cpu    || 'N/A' %></span>
                 <span class="info"><span class="label">memory: </span><%= process.memory || 'N/A' %></span>
-                <span class="info"><span class="label">uptime: </span><%= process.uptime || 'N/A' %></span>
+                <span class="info"><span class="label">uptime: </span><%= time_in_words(process.uptime) || 'N/A' %></span>
               </small>
             </li>
             <% end %>

data/lib/monittr/version.rb

@@ -1,3 +1,3 @@
 module Monittr
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/monittr_test.rb

@@ -8,8 +8,8 @@ module Monittr
 
       should "be initialized with URLs" do
         assert_nothing_raised do
-          cluster = Monittr::Cluster.new %w[ http://admin:monit@localhost:2812/_status?format=xml
-                                             http://admin:monit@localhost:2812/_status?format=xml ]
+          cluster = Monittr::Cluster.new %w[ http://admin:monit@localhost:2812
+                                             http://admin:monit@localhost:2812 ]
           assert_not_nil cluster.servers
           assert_equal 2, cluster.servers.size
         end
@@ -17,16 +17,18 @@ module Monittr
 
       should "not fail on invalid URLS" do
         assert_nothing_raised do
-          cluster = Monittr::Cluster.new %w[ NOTVALID
-                                             http://admin:monit@localhost:2812/_status?format=xml ]
+          cluster = Monittr::Cluster.new %w[ ~INVALID
+                                             http://admin:monit@localhost:2812 ]
           assert_not_nil cluster.servers
           assert_equal 2, cluster.servers.size
+          assert_equal 3, cluster.servers.first.system.status
+          assert cluster.servers.first.system.message =~ /bad hostname/, "Should be bad hostname"
         end
       end
 
       should "not fail on out-of-order URLs" do
-        cluster = Monittr::Cluster.new %w[ http://not-working/_status?format=xml
-                                           http://admin:monit@localhost:2812/_status?format=xml ]
+        cluster = Monittr::Cluster.new %w[ http://not-working
+                                           http://admin:monit@localhost:2812 ]
         assert_not_nil cluster.servers
         assert_equal 2, cluster.servers.size
         assert_equal 3, cluster.servers.first.system.status
@@ -38,19 +40,25 @@ module Monittr
     context "Server" do
 
       setup do
-        @server = Server.new( fixture_file('status.xml') )
+        @server = Server.new( 'http://localhost:2812', fixture_file('status.xml') )
       end
 
       should "parse error XML on initialization" do
         assert_nothing_raised do
-          server = Server.new(%Q|<error status="3" name="ERROR" message="MESSAGE" />|)
+          server = Server.new 'http://example.com', %Q|<error status="3" name="ERROR" message="MESSAGE" />|
           assert_equal 'ERROR', server.system.name
         end
       end
 
       should "fetch info from Monit embedded web server" do
         assert_nothing_raised { Server.fetch }
-        assert_nothing_raised { Server.fetch('http://admin:monit@localhost:2812/_status?format=xml') }
+        assert_nothing_raised { Server.fetch('http://admin:monit@localhost:2812') }
+        assert_nothing_raised { Server.fetch('http://admin:monit@localhost:2812/') }
+      end
+
+      should "return the URL" do
+        server = Server.fetch('http://admin:monit@localhost:2812')
+        assert_equal 'http://admin:monit@localhost:2812', server.url
       end
 
       should "return system info" do

data/test/test_helper.rb

@@ -17,7 +17,7 @@ class Test::Unit::TestCase
   def setup
     FakeWeb.register_uri(:get, 'http://admin:monit@localhost:2812/_status?format=xml', :body => fixture_file('status.xml'))
     FakeWeb.register_uri(:get, 'http://not-working/_status?format=xml', :body => '', :status => ['500'])
-    # FakeWeb.allow_net_connect = false
+    FakeWeb.allow_net_connect = false
   end
 
   def fixtures_path

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Karel Minarik