rboss 0.6.0 → 0.6.1

data/README.md

@@ -50,7 +50,7 @@ Extending mbeans
 
 You can use a file in ~/.rboss/twiddle.rb for mapping new mbeans or overriding the defaults
 
-    JBoss::Twiddle::Monitor.defaults[:http_request] = {
+    RBoss::Twiddle::Monitor.defaults[:http_request] = {
       :description => 'Request for http protocol',
       :pattern => 'jboss.web:type=GlobalRequestProcessor,name=http-127.0.0.1-8080',
       :properties => %W(requestCount errorCount maxTime)
@@ -77,7 +77,7 @@ And used with -c or --config
 Every time you run the twiddle command, this gem will load the ~/.rboss/twiddle.rb file,
 which can be used to customize the mbeans.
 
-    defaults = JBoss::Twiddle::Monitor.defaults
+    defaults = RBoss::Twiddle::Monitor.defaults
     defaults[:logger] = {
       :description => 'Logger Service',
       :pattern => 'jboss.system:service=Logging,type=Logger'

data/bin/jboss-profile

@@ -93,7 +93,7 @@ if params.empty?
 end
 
 params[:jboss_home] ||= Dir.pwd unless ENV["JBOSS_HOME"]
-profile = JBoss::Profile::new params
+profile = RBoss::Profile::new params
 
 if params[:slimming]
   profile.slim *params[:slimming]

data/bin/rboss-cli

@@ -86,7 +86,7 @@ opts.on('-v', '--verbose', 'Displays jboss-cli commands before execution') do
   params[:log_level] = Logger::DEBUG
 end
 
-JBoss::Cli::Mappings.resource_mappings.each do |name, config|
+RBoss::Cli::Mappings.resource_mappings.each do |name, config|
   if config[:scan]
     opts.on("--#{name} [NAMES]", Array, config[:description]) do |resources|
       @components[name] = resources || :all
@@ -98,12 +98,18 @@ JBoss::Cli::Mappings.resource_mappings.each do |name, config|
   end
 end
 
+opts.on('--all', 'Display all available info') do
+  RBoss::Cli::Mappings.resource_mappings.each do |name, config|
+    @components[name] = :all unless config[:derived]
+  end
+end
+
 opts.on("-h", "--help", "Shows this help message") do
   puts opts; exit
 end
 opts.parse!(ARGV) rescue abort 'Invalid Option! Use --help or -h for usage help.'
 
-@jboss_cli = JBoss::Cli::Invoker::new params
+@jboss_cli = RBoss::Cli::Invoker::new params
 
 unless $stdout.isatty
   require 'yummi/no_colors'

data/bin/twiddle

@@ -39,7 +39,7 @@ servers_file = "#{@conf_dir}/twiddle.yaml"
 save = false
 params[:jboss_home] = (ENV["JBOSS_HOME"] or ENV["TWIDDLE_HOME"] or Dir.pwd)
 
-defaults = JBoss::Twiddle::Monitor::defaults
+defaults = RBoss::Twiddle::Monitor::defaults
 
 def load_yaml
   return Hash::new unless File.exist?(@servers_file)
@@ -156,7 +156,7 @@ opts.on("-h", "--help", "Shows this help message") do
 end
 opts.parse!(ARGV) #rescue abort 'Invalid Option! Use --help or -h for usage help.'
 
-@twiddle = JBoss::Twiddle::Invoker::new params
+@twiddle = RBoss::Twiddle::Invoker::new params
 
 if save
   config = load_yaml
@@ -182,7 +182,7 @@ end
 
 puts opts if @mbeans.empty? and @commands.empty?
 
-@actions = JBoss::CommandActions::Twiddle::new @twiddle,
+@actions = RBoss::CommandActions::Twiddle::new @twiddle,
                                                :no_details => no_details,
                                                :mbeans => defaults
 

data/lib/rboss.rb

@@ -21,8 +21,12 @@
 # THE SOFTWARE.
 
 require_relative "rboss/version"
+require_relative "rboss/plaftorm"
 require_relative "rboss/jboss_profile"
 require_relative "rboss/twiddle"
-require_relative "rboss/cli"
+require_relative "rboss/cli/jboss_cli"
 require_relative "rboss/bin/command_actions"
-
+require_relative "rboss/view/colorizers"
+require_relative "rboss/view/formatters"
+require_relative "rboss/view/health_checkers"
+require_relative "rboss/view/table_builder"

data/lib/rboss/bin/command_actions.rb

@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-module JBoss
+module RBoss
   module CommandActions
     class Twiddle
 
@@ -88,7 +88,7 @@ module JBoss
       def detail mbeans
         buff = ""
         mbeans.each do |mbean_id, resources|
-          builder = TableBuilder::new @opts[:mbeans][mbean_id]
+          builder = RBoss::TableBuilder::new @opts[:mbeans][mbean_id]
           rows = []
           if resources.is_a? TrueClass
             row = []
@@ -113,6 +113,7 @@ module JBoss
           table = builder.build_table
           table.data = rows
           buff << table.to_s
+          buff << $/
         end
         buff
       end

data/lib/rboss/cli/jboss_cli.rb

@@ -25,12 +25,12 @@ require_relative 'mappings'
 
 require 'logger'
 
-module JBoss
+module RBoss
 
   module Cli
 
     class Invoker
-      include JBoss::Cli::Mappings
+      include RBoss::Cli::Mappings, RBoss::Platform
 
       attr_reader :server, :host, :port, :user, :password
 
@@ -73,7 +73,7 @@ module JBoss
         components.each do |key, resources|
           if resource_mappings.has_key? key
             mapping = resource_mappings[key]
-            component = JBoss::Cli::Resource::new(self, mapping)
+            component = RBoss::Cli::Resource::new(self, mapping)
             buff << component.content(resources)
           end
         end

data/lib/rboss/cli/mappings.rb

@@ -22,7 +22,7 @@
 
 require 'yaml'
 
-module JBoss
+module RBoss
   module Cli
     module Mappings
 
@@ -35,7 +35,17 @@ module JBoss
       def load_resource(file)
         name = File.basename(file, '.yaml').gsub('_', '-')
         mapping = YAML::load_file(file).symbolize_keys
-        @resource_mappings[name.to_sym] = mapping
+        @resource_mappings[name] = mapping
+        mapping[:print].each do |table|
+          if table[:id]
+            new_mapping = mapping.dup
+            new_mapping[:print] = [table]
+            new_mapping[:description] = table[:title]
+            new_mapping[:derived] = true
+            new_key = "#{name}-#{table[:id]}"
+            @resource_mappings[new_key] = new_mapping
+          end
+        end
       end
 
       def load_resources(dir)

data/lib/rboss/cli/mappings/resources/connector.yaml

@@ -4,7 +4,6 @@ path: /subsystem=web/connector=${NAME}
 scan: ls ${PATH}
 print:
   - title: Connectors
-    command: ${PATH}:read-resource(include-runtime=true)
     layout: vertical
     properties:
     - scheme
@@ -37,39 +36,15 @@ print:
     - Enabled
 
     format:
-      - column: bytes_received
-        component: byte
-
-      - column: bytes_sent
-        component: byte
-
-      - column: max_post_size
-        component: byte
-
-      - column: max_save_post_size
-        component: byte
-
-      - column: enabled
-        component: yes_or_no
-
-      - column: secure
-        component: yes_or_no
+      bytes_received: byte
+      bytes_sent: byte
+      max_post_size: byte
+      max_save_post_size: byte
+      enabled: yes_or_no
+      secure: yes_or_no
 
     color:
-      - column: scheme
-        component: with
-        params:
-          color: purple
-
-      - column: enabled
-        component: boolean
-        params:
-          if_true: green
-          if_false: red
-
-      - column: secure
-        component: boolean
-        params:
-          if_true: green
-          if_false: brown
-
+      scheme:
+        with: purple
+      enabled: boolean
+      secure: boolean

data/lib/rboss/cli/mappings/resources/datasource.yaml

@@ -3,8 +3,8 @@ description: Detail Datasource Information
 path: /subsystem=datasources/data-source=${NAME}
 scan: ls ${PATH}
 print:
-- title: Datasource Details
-  command: ${PATH}:read-resource(include-runtime=true)
+- id: config
+  title: Datasource Details
   layout: vertical
   properties:
   - jndi-name
@@ -27,26 +27,19 @@ print:
   - Max Pool Size
   - Enabled
   format:
-    - column: enabled
-      component: yes_or_no
-
-    - column: using_jta
-      component: yes_or_no
+    enabled: yes_or_no
+    using_jta: yes_or_no
 
   color:
-    - column: jndi_name
-      component: with
-      params:
-        color: purple
-
-    - column: enabled
-      component: boolean
-      params:
-        if_true: green
-        if_false: red
+    jndi_name:
+      with: purple
+    enabled: boolean
+    connection_url:
+      with: brown
 
-- title: Datasource Pool Statistics
-  command: ${PATH}/statistics=pool:read-resource(include-runtime=true)
+- id: pool
+  title: Datasource Pool Statistics
+  command: ${PATH}/statistics=pool:${READ_RESOURCE}
   layout: vertical
   properties:
   - ActiveCount
@@ -76,14 +69,14 @@ print:
   - Total Creation
 
   health:
-  - column: active
-    component: percentage
-    params:
-      max: available
-      using: active
+    active:
+      percentage:
+        max: available
+        using: active
 
-- title: Datasource JDBC Statistics
-  command: ${PATH}/statistics=jdbc:read-resource(include-runtime=true)
+- id: jdbc
+  title: Datasource JDBC Statistics
+  command: ${PATH}/statistics=jdbc:${READ_RESOURCE}
   properties:
   - PreparedStatementCacheCurrentSize
   - PreparedStatementCacheAccessCount

data/lib/rboss/cli/mappings/resources/jdbc_driver.yaml

@@ -4,7 +4,6 @@ path: /subsystem=datasources/jdbc-driver=${NAME}
 scan: ls ${PATH}
 print:
 - title: JDBC Drivers
-  command: ${PATH}:read-resource
   properties:
   - driver-module-name
   - driver-xa-datasource-class-name

data/lib/rboss/cli/mappings/resources/server.yaml

@@ -1,9 +1,28 @@
 ---
 description: Detail Server Information
-path:
+path: /core-service=
 print:
-- title: Server Runtime Information
-  command: /core-service=server-environment:read-resource(include-runtime=true)
+- id: platform
+  title: Operating System Information
+  command: ${PATH}platform-mbean/type=operating-system:${READ_RESOURCE}
+  properties:
+  - name
+  - arch
+  - version
+  - available-processors
+  - system-load-average
+  header:
+  - Name
+  - Arch
+  - Version
+  - Processors
+  - System Load
+  format:
+    system_load: percentage
+
+- id: env
+  title: Server Environment Information
+  command: ${PATH}server-environment:${READ_RESOURCE}
   properties:
   - server-name
   - node-name
@@ -17,33 +36,133 @@ print:
   - Initial Running Mode
   - Launch Type
   color:
-  - column: server_name
-    component: with
-    params:
-      color: white
-
-  - column: node_name
-    component: with
-    params:
-      color: blue
-
-  - column: host_name
-    component: with
-    params:
-      color: brown
-
-  - column: initial_running_mode
-    component: with
-    params:
-      color: purple
-
-  - column: launch_type
-    component: with
-    params:
-      color: cyan
-
-- title: Server Configuration Resources
-  command: /core-service=server-environment:read-resource(include-runtime=true)
+    server_name:
+      with: white
+
+    node_name:
+      with: blue
+
+    host_name:
+      with: brown
+
+    initial_running_mode:
+      with: purple
+
+    launch_type:
+      with: cyan
+
+- id: memory
+  title: Server Memory Usage
+  layout: vertical
+  command: ${PATH}platform-mbean/type=memory:${READ_RESOURCE}
+  properties:
+  - heap-memory-usage -> init
+  - heap-memory-usage -> used
+  - heap-memory-usage -> committed
+  - heap-memory-usage -> max
+  - non-heap-memory-usage -> init
+  - non-heap-memory-usage -> used
+  - non-heap-memory-usage -> committed
+  - non-heap-memory-usage -> max
+  - object-pending-finalization-count
+  header:
+  - Initial Heap
+  - Used Heap
+  - Committed Heap
+  - Max Heap
+  - Initial Non Heap
+  - Used Non Heap
+  - Committed Non Heap
+  - Max Non Heap
+  - Objects Pending Finalization
+  format:
+    initial_heap: byte
+    used_heap: byte
+    committed_heap: byte
+    max_heap: byte
+    initial_non_heap: byte
+    used_non_heap: byte
+    committed_non_heap: byte
+    max_non_heap: byte
+
+  color:
+    max_heap:
+      with: intense_purple
+
+    max_non_heap:
+      with: intense_purple
+
+    committed_heap:
+      with: purple
+
+    committed_non_heap:
+      with: purple
+
+  health:
+    used_heap:
+      percentage:
+        max: max_heap
+        using: used_heap
+
+    used_non_heap:
+      percentage:
+        max: max_non_heap
+        using: used_non_heap
+
+- id: thread
+  title: Server Thread Info
+  command: ${PATH}platform-mbean/type=threading:${READ_RESOURCE}
+  layout: vertical
+  properties:
+  - thread-contention-monitoring-supported
+  - thread-cpu-time-supported
+  - current-thread-cpu-time-supported
+  - object-monitor-usage-supported
+  - synchronizer-usage-supported
+  - thread-contention-monitoring-enabled
+  - thread-cpu-time-enabled
+  - thread-count
+  - peak-thread-count
+  - total-started-thread-count
+  - daemon-thread-count
+  - current-thread-cpu-time
+  - current-thread-user-time
+  header:
+  - Thread Contention Monitoring Supported
+  - Thread CPU Time Supported
+  - Current Thread CPU Time Supported
+  - Object Monitor Usage Supported
+  - Synchronizer Usage Supported
+  - Thread Contention Monitoring Enabled
+  - Thread CPU Time Enabled
+  - Thread Count
+  - Peak Thread Count
+  - Total Started Thread Count
+  - Daemon Thread Count
+  - Current Thread CPU Time
+  - CUrrent Thread User Time
+
+  format:
+    thread_contention_monitoring_supported: yes_or_no
+    thread_cpu_time_supported: yes_or_no
+    current_thread_cpu_time_supported: yes_or_no
+    object_monitor_usage_supported: yes_or_no
+    synchronizer_usage_supported: yes_or_no
+    thread_contention_monitoring_enabled: yes_or_no
+    thread_cpu_time_enabled: yes_or_no
+
+  color:
+    thread_contention_monitoring_supported: boolean
+    thread_cpu_time_supported: boolean
+    current_thread_cpu_time_supported: boolean
+    object_monitor_usage_supported: boolean
+    synchronizer_usage_supported: boolean
+    thread_contention_monitoring_enabled: boolean
+    thread_cpu_time_enabled: boolean
+
+- id: config
+  title: Server Configuration Resources
+  command: ${PATH}server-environment:${READ_RESOURCE}
   layout: vertical
   properties:
   - server-name
@@ -68,7 +187,5 @@ print:
   - Log Directory
   - Temp Directory
   color:
-  - column: server_name
-    component: with
-    params:
-      color: white
+    server_name:
+      with: white