rboss 0.4.1 → 0.5.0

data/Gemfile

@@ -2,3 +2,5 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in rboss.gemspec
 gemspec
+
+gem 'wirble'

data/bin/twiddle

@@ -58,7 +58,7 @@ end
 opts.on('--port PORT', 'Defines the JBoss jnp port') do |port|
   params[:port] = port
 end
-opts.on('-c', '--config SERVER_NAME',
+opts.on('-c', '--connect SERVER_NAME',
         "Uses a configured server in #{servers_file}") do |server|
   config = load_yaml[server]
   abort "No configuration for #{server}" unless config

data/lib/rboss/bin/command_actions.rb

@@ -20,6 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require_relative '../table_builder'
+
 module JBoss
   module CommandActions
     class Twiddle
@@ -43,59 +45,66 @@ module JBoss
       def set id, property, value
         mbean, name = extract id
         puts @twiddle.set :mbean => mbean.to_sym,
-                         :name => name,
-                         :property => property,
-                         :value => value
+                          :name => name,
+                          :property => property,
+                          :value => value
       end
 
       def get id, property
         mbean, name = extract id
         puts @twiddle.get :mbean => mbean.to_sym,
-                         :name => name,
-                         :property => property
+                          :name => name,
+                          :property => property
       end
 
       def invoke id, method, *args
         mbean, name = extract id
         puts @twiddle.invoke :mbean => mbean.to_sym,
-                            :name => name,
-                            :method => method,
-                            :args => normalize(args)
+                             :name => name,
+                             :method => method,
+                             :args => normalize(args)
       end
 
       def query id, *args
         mbean, name = extract id
         puts @twiddle.query :mbean => mbean.to_sym,
-                           :name => name,
-                           :args => normalize(args)
+                            :name => name,
+                            :args => normalize(args)
       end
 
       def info id, *args
         mbean, name = extract id
         puts @twiddle.info :mbean => mbean.to_sym,
-                          :name => name,
-                          :args => normalize(args)
+                           :name => name,
+                           :args => normalize(args)
       end
 
       def detail mbeans
         mbeans.each do |mbean_id, resources|
-          puts "  - #{@opts[:mbeans][mbean_id][:description]}"
+          table = TableBuilder::new @opts[:mbeans][mbean_id]
+          table.title = @opts[:mbeans][mbean_id][:description]
+          rows = []
           if resources.is_a? TrueClass
+            row = []
             @monitor.mbean(mbean_id).detail do |name, value|
-              puts "    - #{name}=#{value}"
+              row << value
             end
+            rows << row
           elsif @opts[:no_details]
             @monitor.mbean(mbean_id).scan.each do |name|
               puts "    - #{name}"
             end
           else
             @monitor.mbean(mbean_id).detail resources do |resource, detail|
-              puts "    - #{resource}"
+              row = [resource]
               detail.each do |name, value|
-                puts "      - #{name}=#{value}"
+                row << value
               end
+              rows << row
             end
           end
+          rows.each { |row| table.add :normal, *row }
+          table.print
         end
       end
 
@@ -104,4 +113,3 @@ module JBoss
   end
 
 end
-

data/lib/rboss/table_builder.rb

@@ -0,0 +1,174 @@
+#                         The MIT License
+#
+# Copyright (c) 2011 Marcelo Guimarães <ataxexe@gmail.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'wirble'
+
+class TableBuilder
+
+  attr_writer :title
+
+  def initialize params = {}
+    params[:colors] ||= {}
+    @colors = {
+      :title => :yellow,
+      :header => :light_blue,
+      :good => :green,
+      :bad => :red,
+      :warn => :brown,
+      :line => :purple,
+      :normal => nil
+    }.merge! params[:colors]
+    @health = params[:health]
+    @header = params[:header]
+    @formatter = params[:formatter]
+    @print_type = (params[:print_as] or :table)
+    @single_result = params[:single_result]
+
+    @data = []
+    @types = []
+    @title = nil
+  end
+
+  def add(type, *args)
+    @types << type
+    @data << args
+  end
+
+  def print
+    build_header @header
+    check_health
+    puts colorize(:title, @title)
+    print_as_table if @print_type == :table
+    print_as_single_list if @print_type == :single_list
+  end
+
+  def print_as_single_list
+    header = @data[0]
+    data ||= @data[1]
+    type = @types[1]
+    format_row(1, type)
+
+    line = colorize :line, '-'
+    data.each_index do |i|
+      description = colorize :header, header[i]
+      value = colorize type, data[i]
+      puts "  #{line} #{description} = #{value}"
+    end
+  end
+
+  def print_as_table colspan = 2
+    @data.each_index do |i|
+      type = @types[i]
+      format_row(i, type)
+      @data[i].each_index do |j|
+        column = @data[i][j]
+        width = max_width j
+        value = column.to_s.ljust(width) if j == 0
+        value ||= column.to_s.rjust(width)
+        printf colorize(type, value)
+        printf(" " * colspan)
+      end
+      puts
+    end
+  end
+
+  def format_row(i, type)
+    if @formatter and type != :header
+      if @formatter.is_a? Hash
+        @formatter[:humanize].each do |index|
+          @data[i][index] = humanize @data[i][index]
+        end
+      else
+        @data[i] = @formatter.call(@data[i])
+      end
+    end
+  end
+
+  def check_health
+    return unless @health
+    @data.each_index do |i|
+      if @types[i] == :normal
+        row = @data[i]
+        if @health.is_a? Hash
+          indexes = @health[:indexes]
+          @health[:max] = row[indexes[:max]].to_f
+          @health[:using] = row[indexes[:using]].to_f if indexes[:using]
+          @health[:free] = row[indexes[:free]].to_f if indexes[:free]
+          @types[i] = health @health
+        else
+          @types[i] = @health.call(row)
+        end
+      end
+    end
+  end
+
+  def health params
+    warn_limit = (params[:warn_at] or 0.3)
+    bad_limit = (params[:alert_at] or 0.15)
+    return :bad if under_limit? bad_limit, params
+    return :warn if warn_limit and under_limit? warn_limit, params
+    :good
+  end
+
+  def under_limit? threshold, params
+    if params[:free]
+      free = (params[:free] / params[:max].to_f)
+      (free < threshold)
+    elsif params[:using]
+      free = params[:max] - params[:using]
+      under_limit? threshold, :free => free, :max => params[:max]
+    end
+  end
+
+  def humanize bytes
+    bytes = bytes.to_i
+    return (bytes / (1024 * 1024)).to_s << " MB" if bytes > (1024 * 1024)
+    (bytes / (1024)).to_s << " KB" if bytes > (1024)
+  end
+
+  def build_header header
+    return unless header
+    if header.is_a? Array
+      if header.first.is_a? Array
+        header.reverse.each do |value|
+          build_header value
+        end
+      else
+        @data = [header] + @data
+        @types = [:header] + @types
+      end
+    end
+  end
+
+  def colorize(type, value)
+    Wirble::Colorize::colorize_string(value, @colors[type])
+  end
+
+  def max_width column
+    max = 0
+    @data.each do |row|
+      max = [row[column].to_s.length, max].max
+    end
+    max
+  end
+
+end

data/lib/rboss/twiddle/monitor.rb

@@ -34,6 +34,11 @@ module JBoss
             :pattern => 'jboss.web:type=Manager,host=localhost,path=/#{resource}',
             :properties => %W(activeSessions maxActive distributable maxActiveSessions
                               expiredSessions rejectedSessions),
+            :header => [
+              ['Context', 'Active', 'Max', 'Distributable', 'Max Active', 'Expired', 'Rejected'],
+              ['', 'Sessions', 'Active', '',
+               'Sessions', 'Sessions', 'Sessions'],
+            ],
             :scan => proc do
               query "jboss.web:type=Manager,*" do |path|
                 path.gsub! "jboss.web:type=Manager,path=/", ""
@@ -50,6 +55,13 @@ module JBoss
             :description => 'JBossWeb connector',
             :pattern => 'jboss.web:type=ThreadPool,name=#{resource}',
             :properties => %W(maxThreads currentThreadCount currentThreadsBusy),
+            :header => ['Connector', 'Max Threads', 'Current Threads', 'Busy Threads'],
+            :health => {
+              :indexes => {
+                :max => 1,
+                :using => 2
+              }
+            },
             :scan => proc do
               query "jboss.web:type=ThreadPool,*" do |path|
                 path.gsub "jboss.web:type=ThreadPool,name=", ""
@@ -59,7 +71,9 @@ module JBoss
           :cached_connection_manager => {
             :description => 'JBoss JCA cached connections',
             :pattern => 'jboss.jca:service=CachedConnectionManager',
-            :properties => %W(InUseConnections)
+            :properties => %W(InUseConnections),
+            :header => ['In Use Connections'],
+            :print_as => :single_list
           },
           :main_deployer => {
             :description => 'Main Deployer',
@@ -68,29 +82,47 @@ module JBoss
           :engine => {
             :description => 'JBossWeb engine',
             :pattern => 'jboss.web:type=Engine',
-            :properties => %W(jvmRoute name defaultHost)
+            :properties => %W(jvmRoute name defaultHost),
+            :header => ['JVM Route', 'Name', 'Default Host'],
+            :print_as => :single_list
           },
           :log4j => {
             :description => 'JBoss Log4J Service',
             :pattern => 'jboss.system:service=Logging,type=Log4jService',
-            :properties => %W(DefaultJBossServerLogThreshold)
+            :properties => %W(DefaultJBossServerLogThreshold),
+            :header => ['Default Server Log Threshold'],
+            :print_as => :single_list
           },
           :server => {
             :description => 'JBoss Server specifications',
             :pattern => 'jboss.system:type=Server',
-            :properties => %W(VersionName VersionNumber Version)
+            :properties => %W(VersionName VersionNumber Version),
+            :header => ['Version Name', 'Version Number', 'Version'],
+            :print_as => :single_list
           },
           :server_info => {
             :description => 'JBoss Server runtime info',
             :pattern => 'jboss.system:type=ServerInfo',
             :properties => %W(ActiveThreadCount MaxMemory FreeMemory AvailableProcessors
-                              HostAddress JavaVendor JavaVersion JavaVMVersion
-                              JavaVMVendor JavaVMName OSName OSArch)
+                              JavaVendor JavaVersion OSName OSArch),
+            :header => ['Active Threads', 'Max Memory', 'Free Memory',
+                        'Processors', 'Java Vendor',
+                        'Java Version', 'OS Name', 'OS Arch'],
+            :formatter => {:humanize => [1, 2]},
+            :print_as => :single_list,
+            :health => {
+              :indexes => {
+                :max => 1,
+                :free => 2
+              }
+            },
           },
           :server_config => {
             :description => 'JBoss Server configuration',
             :pattern => 'jboss.system:type=ServerConfig',
-            :properties => %W(ServerName HomeDir ServerLogDir ServerHomeURL)
+            :properties => %W(ServerName HomeDir ServerLogDir ServerHomeURL),
+            :header => ['Server Name', 'Home Dir', 'Log Dir', 'Home URL'],
+            :print_as => :single_list
           },
           :system_properties => {
             :description => 'System properties',
@@ -100,6 +132,13 @@ module JBoss
             :description => 'JBossWeb connector requests',
             :pattern => 'jboss.web:type=GlobalRequestProcessor,name=#{resource}',
             :properties => %W(requestCount errorCount maxTime),
+            :header => ['Connector', 'Requests', 'Errors', 'Max Time'],
+            :health => {
+              :indexes => {
+                :max => 1,
+                :using => 2
+              }
+            },
             :scan => proc do
               query "jboss.web:type=ThreadPool,*" do |path|
                 path.gsub "jboss.web:type=ThreadPool,name=", ""
@@ -111,6 +150,16 @@ module JBoss
             :pattern => 'jboss.jca:service=ManagedConnectionPool,name=#{resource}',
             :properties => %W(MinSize MaxSize AvailableConnectionCount
                                 InUseConnectionCount ConnectionCount),
+            :header => [
+              ['JNDI Name', 'Min', 'Max', 'Connections', 'Connections', 'Connection'],
+              ['', 'Size', 'Size', 'Avaliable', 'In Use', 'Count']
+            ],
+            :health => {
+              :indexes => {
+                :max => 2,
+                :using => 4
+              }
+            },
             :scan => proc do
               query "jboss.jca:service=ManagedConnectionPool,*" do |path|
                 path.gsub "jboss.jca:service=ManagedConnectionPool,name=", ""
@@ -120,8 +169,10 @@ module JBoss
           :queue => {
             :description => 'JMS Queue',
             :pattern => 'jboss.messaging.destination:service=Queue,name=#{resource}',
-            :properties => %W(Name JNDIName MessageCount DeliveringCount
+            :properties => %W(JNDIName MessageCount DeliveringCount
               ScheduledMessageCount MaxSize FullSize Clustered ConsumerCount),
+            :header => ['Name', 'JNDI', 'Messages', 'Deliveries', 'Scheduleded', 'Max Size',
+                        'Full Size', 'Clustered', 'Consumed'],
             :scan => proc do
               query "jboss.messaging.destination:service=Queue,*" do |path|
                 path.gsub "jboss.messaging.destination:service=Queue,name=", ""
@@ -136,6 +187,7 @@ module JBoss
             :description => 'EJB',
             :pattern => 'jboss.j2ee:#{resource},service=EJB3',
             :properties => %W(CreateCount RemoveCount CurrentSize AvailableCount),
+            :header => ['EJB', 'Created', 'Removed', 'Current', 'Available'],
             :scan => proc do
               result = query "jboss.j2ee:*"
               (result.find_all do |path|
@@ -146,14 +198,12 @@ module JBoss
             end
           }
         }
-        @@defaults
       end
 
       module_function :defaults
 
       def mbeans
         @mbeans ||= {}
-        @mbeans
       end
 
       def monitor mbean_id, params
@@ -174,4 +224,3 @@ module JBoss
   end
 
 end
-

data/lib/rboss/version.rb

@@ -21,5 +21,5 @@
 # THE SOFTWARE.
 
 module RBoss
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rboss
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-21 00:00:00.000000000Z
+date: 2012-03-22 00:00:00.000000000Z
 dependencies: []
 description: ! "A tool to create profiles for JBoss Application Server and use\n twiddle
   to manage a running JBoss AS."
@@ -57,6 +57,7 @@ files:
 - lib/rboss/resources/mod_cluster.sar/META-INF/mod_cluster-jboss-beans.xml
 - lib/rboss/resources/mod_cluster.sar/mod_cluster-1.1.2.Final.jar
 - lib/rboss/resources/run.conf.erb
+- lib/rboss/table_builder.rb
 - lib/rboss/twiddle.rb
 - lib/rboss/twiddle/base_monitor.rb
 - lib/rboss/twiddle/mbean.rb