rboss 0.5.1 → 0.5.2

data/Gemfile

@@ -1,6 +1,5 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in rboss.gemspec
 gemspec
 
-#gem 'pretty-monitor'
+gem 'yummi'

data/bin/twiddle

@@ -27,10 +27,11 @@ require 'optparse'
 require 'logger'
 require 'yaml'
 require 'fileutils'
+require 'yummi'
 
 params = {}
-mbeans = {}
-commands = {}
+@mbeans = {}
+@commands = {}
 no_details = false
 @conf_dir = File.expand_path "~/.rboss"
 servers_file = "#{@conf_dir}/twiddle.yaml"
@@ -69,13 +70,16 @@ end
 opts.on('--save SERVER_NAME', "Saves the server configuration in #{servers_file}") do |server|
   save = server
 end
-
+opts.on('--loop INTERVAL', Float, 'Runs the mbean inside a loop') do |interval|
+  @loop = true
+  @interval = interval
+end
 opts.on('--all', "Detail all mapped mbeans") do
   defaults.each do |mbean_id, mbean|
     if mbean[:scan]
-      mbeans[mbean_id] = :all
+      @mbeans[mbean_id] = :all
     elsif mbean[:properties]
-      mbeans[mbean_id] = true
+      @mbeans[mbean_id] = true
     end
   end
 end
@@ -85,34 +89,34 @@ end
   if mbean[:scan]
     opts.on("--#{command} [name_a,name_b,...]", Array,
             "Detail \"#{mbean[:description]}\" based on the given names (no names for scan)") do |names|
-      mbeans[mbean_id] = names || :all
+      @mbeans[mbean_id] = names || :all
     end
   elsif mbean[:properties]
     opts.on("--#{command}", "Detail \"#{mbean[:description]}\"") do
-      mbeans[mbean_id] = true
+      @mbeans[mbean_id] = true
     end
   end
 end
 
 opts.on('--set mbean_id[:resource_name],property,value', Array,
         'Sets a value to a resource that the monitor knows') do |set|
-  commands[:set] = set
+  @commands[:set] = set
 end
 opts.on('--get mbean_id[:resource_name],property', Array,
         'Gets a value to a resource that the monitor knows') do |get|
-  commands[:get] = get
+  @commands[:get] = get
 end
 opts.on('--query mbean_id[:resource_name],[arguments]', Array,
         'Queries the mbean') do |query|
-  commands[:query] = query
+  @commands[:query] = query
 end
 opts.on('--info mbean_id[:resource_name],[arguments]', Array,
         'List mbean info') do |info|
-  commands[:info] = info
+  @commands[:info] = info
 end
 opts.on('--invoke mbean_id[:resource_name],method,[,args...]', Array,
         'Invokes a resoruce method') do |invoke|
-  commands[:invoke] = invoke
+  @commands[:invoke] = invoke
 end
 opts.on("-l", "--list", "List the mbeans mappings") do
   (defaults.sort_by { |k, v| k }).each do |mbean_id, mbean|
@@ -127,6 +131,9 @@ end
 opts.on('--no-detail', 'Do not detail mbeans that needs a name') do
   no_details = true
 end
+opts.on('--no-color', 'Do not colorize output') do
+  require 'yummi/no_colors'
+end
 opts.on('-u', '--user USER', 'Defines the JMX User') do |user|
   params[:user] = user
 end
@@ -134,7 +141,7 @@ opts.on('-p', '--password PASSWORD', 'Defines the JMX Password') do |password|
   params[:password] = password
 end
 opts.on('-n COMMAND', '--native COMMAND', 'Executes the given command as is') do |command|
-  commands[:native] = command
+  @commands[:native] = command
 end
 opts.on('-v', '--verbose', 'Shows the twiddle commands before execution') do
   params[:log_level] = Logger::DEBUG
@@ -174,13 +181,24 @@ def normalize args
   end
 end
 
-puts opts if mbeans.empty? and commands.empty?
+puts opts if @mbeans.empty? and @commands.empty?
 
-actions = JBoss::CommandActions::Twiddle::new @twiddle,
+@actions = JBoss::CommandActions::Twiddle::new @twiddle,
   :no_details => no_details,
   :mbeans => defaults
 
-actions.parse_and_execute commands
+def execute_actions
+  buff = ""
+  buff << Yummi.colorize(Time.now.strftime("At %H:%M:%S%n"), :white) if @loop
+  buff << @actions.parse_and_execute(@commands)
+  buff << @actions.detail(@mbeans)
+  system "clear" if @loop
+  puts buff
+end
 
-actions.detail mbeans
+while @loop
+  execute_actions
+  sleep @interval
+end
 
+execute_actions

data/lib/rboss/bin/command_actions.rb

@@ -33,56 +33,58 @@ module JBoss
       end
 
       def parse_and_execute commands
+        buff = ""
         commands.each do |method, args|
-          send method, *args
+          buff << send(method, *args)
         end
+        buff
       end
 
       def native command
-        puts @twiddle.execute(command)
+        @twiddle.execute(command)
       end
 
       def set id, property, value
         mbean, name = extract id
-        puts @twiddle.set :mbean => mbean.to_sym,
-                          :name => name,
-                          :property => property,
-                          :value => value
+        @twiddle.set :mbean => mbean.to_sym,
+                     :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
+        @twiddle.get :mbean => mbean.to_sym,
+                     :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)
+        @twiddle.invoke :mbean => mbean.to_sym,
+                        :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)
+        @twiddle.query :mbean => mbean.to_sym,
+                       :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)
+        @twiddle.info :mbean => mbean.to_sym,
+                      :name => name,
+                      :args => normalize(args)
       end
 
       def detail mbeans
+        buff = ""
         mbeans.each do |mbean_id, resources|
-          table = TableBuilder::new @opts[:mbeans][mbean_id]
-          table.title = @opts[:mbeans][mbean_id][:description]
+          table_builder = TableBuilder::new @opts[:mbeans][mbean_id]
           rows = []
           if resources.is_a? TrueClass
             row = []
@@ -91,8 +93,9 @@ module JBoss
             end
             rows << row
           elsif @opts[:no_details]
+            table_builder.no_details
             @monitor.mbean(mbean_id).scan.each do |name|
-              rows << name
+              rows << [name]
             end
           else
             @monitor.mbean(mbean_id).detail resources do |resource, detail|
@@ -103,9 +106,10 @@ module JBoss
               rows << row
             end
           end
-          rows.each { |row| table.add :normal, *row }
-          table.print
+          table_builder.data = rows
+          buff << table_builder.table.to_s
         end
+        buff
       end
 
     end

data/lib/rboss/jboss_profile.rb

@@ -26,6 +26,7 @@ require_relative "component_processor"
 require_relative "jboss_path"
 
 require "logger"
+require "yummi"
 require "ostruct"
 require "fileutils"
 
@@ -124,9 +125,7 @@ module JBoss
       unless @logger
         @logger = Logger::new STDOUT
         @logger.level = opts[:log_level] || Logger::INFO
-        formatter = Logger::Formatter.new
-
-        def formatter.call(severity, time, program_name, message)
+        formatter = Yummi::Formatter::LogFormatter.new do |severity, time, program_name, message|
           "#{severity} : #{message}\n"
         end
 
@@ -135,10 +134,10 @@ module JBoss
       @profile = @opts[:profile].to_s
       @base_profile = @opts[:base_profile].to_s
       @jboss = JBoss::Path::new @jboss_home,
-        :profile => @profile,
-        :type => @opts[:type],
-        :version => @opts[:version],
-        :logger => @logger
+                                :profile => @profile,
+                                :type => @opts[:type],
+                                :version => @opts[:version],
+                                :logger => @logger
       initialize_components
     end
 

data/lib/rboss/table_builder.rb

@@ -20,155 +20,62 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'wirble'
+require 'yummi'
 
 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}"
+    @params = params
+    @table = Yummi::Table::new
+    @table.title = params[:description]
+    @table.header = params[:header]
+    if params[:layout] == :vertical
+      @table.layout = :vertical
+      @table.default_align = :left
     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
+    if params[:health]
+      @table.row_colorizer HealthColorizer::new params[:health]
     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]
+    if params[:formatter]
+      params[:formatter].each do |column|
+        @table.format column do |value|
+          Yummi::Formatter::Unit.format :byte, value.to_i
         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
+  def no_details
+    @table.header = @params[:header][0]
   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
+  def data= data
+    @table.data = data
   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
+  def table
+    @table
   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
+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
+class HealthColorizer
 
-  def colorize(type, value)
-    Wirble::Colorize::colorize_string(value, @colors[type])
+  def initialize params
+    @max = params[:max]
+    @free = params[:free]
+    @using = params[:using]
   end
 
-  def max_width column
-    max = 0
-    @data.each do |row|
-      max = [row[column].to_s.length, max].max
-    end
-    max
+  def call index, data
+    max = data[@max].to_f
+    free = @using ? max - data[@using].to_f : data[@free].to_f
+
+    percentage = free / max
+
+    return :red if percentage <= 0.15
+    return :brown if percentage <= 0.30
+    :green
   end
 
 end

data/lib/rboss/twiddle/monitor.rb

@@ -33,12 +33,9 @@ module JBoss
             :description => 'Deployed webapps',
             :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'],
-            ],
+                                    expiredSessions rejectedSessions),
+            :header => ["Context", "Active\nSessions", "Max\nSessions", "Distributable",
+                        "Max Active\nSession", "Expired\nSessions", "Rejected\nSessions"],
             :scan => proc do
               query "jboss.web:type=Manager,*" do |path|
                 path.gsub! "jboss.web:type=Manager,path=/", ""
@@ -57,10 +54,8 @@ module JBoss
             :properties => %W(maxThreads currentThreadCount currentThreadsBusy),
             :header => ['Connector', 'Max Threads', 'Current Threads', 'Busy Threads'],
             :health => {
-              :indexes => {
-                :max => 1,
-                :using => 2
-              }
+              :max => :max_threads,
+              :using => :current_threads
             },
             :scan => proc do
               query "jboss.web:type=ThreadPool,*" do |path|
@@ -73,7 +68,6 @@ module JBoss
             :pattern => 'jboss.jca:service=CachedConnectionManager',
             :properties => %W(InUseConnections),
             :header => ['In Use Connections'],
-            :print_as => :single_list
           },
           :main_deployer => {
             :description => 'Main Deployer',
@@ -84,45 +78,39 @@ module JBoss
             :pattern => 'jboss.web:type=Engine',
             :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),
             :header => ['Default Server Log Threshold'],
-            :print_as => :single_list
           },
           :server => {
             :description => 'JBoss Server specifications',
             :pattern => 'jboss.system:type=Server',
             :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
-                              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,
+                                    JavaVendor JavaVersion OSName OSArch),
+            :header => ["Active Threads", "Max Memory", "Free Memory",
+                        "Processors", "Java Vendor", "Java Version", "OS Name", "OS Arch"],
+            :layout => :vertical,
+            :formatter => [:max_memory, :free_memory],
             :health => {
-              :indexes => {
-                :max => 1,
-                :free => 2
-              }
+              :max => :max_memory,
+              :free => :free_memory
             },
           },
           :server_config => {
             :description => 'JBoss Server configuration',
             :pattern => 'jboss.system:type=ServerConfig',
             :properties => %W(ServerName HomeDir ServerLogDir ServerHomeURL),
+            :layout => :vertical,
             :header => ['Server Name', 'Home Dir', 'Log Dir', 'Home URL'],
-            :print_as => :single_list
           },
           :system_properties => {
             :description => 'System properties',
@@ -134,10 +122,8 @@ module JBoss
             :properties => %W(requestCount errorCount maxTime),
             :header => ['Connector', 'Requests', 'Errors', 'Max Time'],
             :health => {
-              :indexes => {
-                :max => 1,
-                :using => 2
-              }
+              :max => :request,
+              :using => :errors
             },
             :scan => proc do
               query "jboss.web:type=ThreadPool,*" do |path|
@@ -149,16 +135,12 @@ module JBoss
             :description => 'Datasource',
             :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']
-            ],
+                                      InUseConnectionCount ConnectionCount),
+            :header => ["JNDI Name", "Min\nSize", "Max\nSize", "Avaliable\nConnections",
+                        "In Use\nConnections", "Connection\nCount"],
             :health => {
-              :indexes => {
-                :max => 2,
-                :using => 4
-              }
+              :max => :max_size,
+              :using => :in_use_connections
             },
             :scan => proc do
               query "jboss.jca:service=ManagedConnectionPool,*" do |path|
@@ -170,7 +152,7 @@ module JBoss
             :description => 'JMS Queue',
             :pattern => 'jboss.messaging.destination:service=Queue,name=#{resource}',
             :properties => %W(JNDIName MessageCount DeliveringCount
-              ScheduledMessageCount MaxSize FullSize Clustered ConsumerCount),
+                    ScheduledMessageCount MaxSize FullSize Clustered ConsumerCount),
             :header => ['Name', 'JNDI', 'Messages', 'Deliveries', 'Scheduleded', 'Max Size',
                         'Full Size', 'Clustered', 'Consumed'],
             :scan => proc do
@@ -224,3 +206,4 @@ module JBoss
   end
 
 end
+

data/lib/rboss/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rboss
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-27 00:00:00.000000000Z
+date: 2012-05-01 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."