itrp 0.1.0 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7c7be689b35c3a9ecd1366e922c6228421bbb6f6
-  data.tar.gz: e8fda01c50ddbd918d98468578d9393f422f98c9
+SHA256:
+  metadata.gz: 3ffff7019757ae2b6033b49cf1c54aa1b54ca1ac10047cb6834ef0803e2c3e47
+  data.tar.gz: d78afca17d762a712ff0b2e7f61ee35c025ceb42e0a99d1b24b1f99ab18128c6
 SHA512:
-  metadata.gz: a79941d2881c42119fac067f13356443f319b7da5344e0e3670ca7bf59a3473434b413042c0d3d19aa62e7889d0a4449311d2efebc889459190d8df96c44c23f
-  data.tar.gz: 9538ae8217593e32407ac23afb50d5d537cb05ed01bbc9279d9fef051883b8059fe72bc48d7fdefd0868563c0c38774c596b94dee71b4cabd0e167b7b2e981aa
+  metadata.gz: dc5c42293f99045c833b0706b64664194ffd381305a7926d7acfd667bea2f152f5a17e78673c77ec74b1b1adbba95555aceda9bdf4b55d495bc03ba742a4fc75
+  data.tar.gz: 389a0ac9c3106132373288b947cec78e9f60104664508a2c5072f1ceaf939b14ac144dc284f4c35b74747278f7d34622df47f8718872ff5b7bdabac3f608117a

data/Gemfile

@@ -11,9 +11,8 @@ gem "terminal-table"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "shoulda", ">= 0"
-  gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.0"
-  gem "jeweler", "~> 2.0.1"
-  gem "simplecov", ">= 0"
+  gem "shoulda"
+  gem "bundler"
+  gem "juwelier"
+  gem "simplecov"
 end

data/Gemfile.lock

@@ -1,86 +1,103 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (4.2.5)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    addressable (2.4.0)
-    builder (3.2.2)
+    activesupport (7.0.2.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    builder (3.2.4)
+    concurrent-ruby (1.1.9)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    docile (1.1.5)
-    faraday (0.9.2)
+    docile (1.3.2)
+    faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    git (1.2.9.1)
-    github_api (0.13.0)
-      addressable (~> 2.3)
+    git (1.5.0)
+    github_api (0.18.2)
+      addressable (~> 2.4)
       descendants_tracker (~> 0.0.4)
-      faraday (~> 0.8, < 0.10)
-      hashie (>= 3.4)
-      multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.6)
-      oauth2
-    hashie (3.4.3)
-    highline (1.7.8)
-    i18n (0.7.0)
-    jeweler (2.0.1)
+      faraday (~> 0.8)
+      hashie (~> 3.5, >= 3.5.2)
+      oauth2 (~> 1.0)
+    hashie (3.6.0)
+    highline (2.0.2)
+    i18n (1.10.0)
+      concurrent-ruby (~> 1.0)
+    json (2.5.1)
+    juwelier (2.4.9)
       builder
-      bundler (>= 1.0)
-      git (>= 1.2.5)
+      bundler
+      git
       github_api
-      highline (>= 1.6.15)
-      nokogiri (>= 1.5.10)
+      highline
+      kamelcase (~> 0)
+      nokogiri
+      psych
       rake
       rdoc
-    json (1.8.3)
-    jwt (1.5.2)
-    mini_portile2 (2.0.0)
-    minitest (5.8.3)
-    multi_json (1.11.2)
-    multi_xml (0.5.5)
-    multipart-post (2.0.0)
-    nokogiri (1.6.7)
-      mini_portile2 (~> 2.0.0.rc2)
-    oauth2 (1.0.0)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0)
+      semver2
+    jwt (2.2.1)
+    kamelcase (0.0.2)
+      semver2 (~> 3)
+    middleware (0.1.0)
+    minitest (5.15.0)
+    multi_json (1.15.0)
+    multi_xml (0.6.0)
+    multipart-post (2.1.1)
+    nokogiri (1.13.3-x86_64-linux)
+      racc (~> 1.4)
+    oauth2 (1.4.1)
+      faraday (>= 0.8, < 0.16.0)
+      jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (~> 1.2)
-    rack (1.6.4)
-    rake (10.4.2)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    ruby-protocol-buffers (1.6.1)
-    shoulda (3.5.0)
+      rack (>= 1.2, < 3)
+    protobuf (3.10.5)
+      activesupport (>= 3.2)
+      middleware
+      thor
+      thread_safe
+    psych (3.3.2)
+    public_suffix (4.0.6)
+    racc (1.6.0)
+    rack (2.2.3)
+    rake (13.0.6)
+    rdoc (6.3.3)
+    semver2 (3.4.2)
+    shoulda (3.6.0)
       shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (>= 1.4.1, < 3.0)
-    shoulda-context (1.2.1)
-    shoulda-matchers (2.8.0)
-      activesupport (>= 3.0.0)
-    simplecov (0.11.1)
-      docile (~> 1.1.0)
-      json (~> 1.8)
+      shoulda-matchers (~> 3.0)
+    shoulda-context (1.2.2)
+    shoulda-matchers (3.1.3)
+      activesupport (>= 4.0.0)
+    simplecov (0.17.0)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    terminal-table (1.5.2)
-    thread_safe (0.3.5)
-    trisulrp (2.4.1)
-      ruby-protocol-buffers
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
+    simplecov-html (0.10.2)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    thor (1.2.1)
+    thread_safe (0.3.6)
+    trisulrp (3.2.32)
+      protobuf
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.1.0)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
-  bundler (~> 1.0)
-  jeweler (~> 2.0.1)
-  rdoc (~> 3.12)
+  bundler
+  juwelier
   shoulda
   simplecov
   terminal-table
   trisulrp
+
+BUNDLED WITH
+   2.3.7

data/Rakefile

@@ -11,8 +11,8 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
+require 'juwelier'
+Juwelier::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://guides.rubygems.org/specification-reference/ for more options
   gem.name = "itrp"
   gem.homepage = "http://github.com/vivekrajan/itrp"
@@ -23,7 +23,7 @@ Jeweler::Tasks.new do |gem|
   gem.authors = ["vivekrajan"]
   # dependencies defined in Gemfile
 end
-Jeweler::RubygemsDotOrgTasks.new
+Juwelier::RubygemsDotOrgTasks.new
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.5

data/itrp.gemspec

@@ -0,0 +1,93 @@
+# Generated by juwelier
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+# stub: itrp 0.1.5 ruby lib
+
+Gem::Specification.new do |s|
+  s.name = "itrp".freeze
+  s.version = "0.1.5"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["vivekrajan".freeze]
+  s.date = "2022-06-02"
+  s.description = "iTRP is an extensible CLI app with tab completion for Network Security and Traffic Monitoring (NSM)".freeze
+  s.email = "vivek@unleashnetworks.com".freeze
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "itrp.gemspec",
+    "lib/cmd_base.rb",
+    "lib/cmd_root.rb",
+    "lib/handlers/agg_flow.rb",
+    "lib/handlers/alert.rb",
+    "lib/handlers/counter.rb",
+    "lib/handlers/delete_alerts.rb",
+    "lib/handlers/edges.rb",
+    "lib/handlers/flow.rb",
+    "lib/handlers/fts.rb",
+    "lib/handlers/getlabel.rb",
+    "lib/handlers/grep.rb",
+    "lib/handlers/help.rb",
+    "lib/handlers/keyspace.rb",
+    "lib/handlers/list.rb",
+    "lib/handlers/list_counters.rb",
+    "lib/handlers/meters.rb",
+    "lib/handlers/metric_summ.rb",
+    "lib/handlers/options.rb",
+    "lib/handlers/pcap.rb",
+    "lib/handlers/probe.rb",
+    "lib/handlers/query_alerts.rb",
+    "lib/handlers/query_flow.rb",
+    "lib/handlers/query_fts.rb",
+    "lib/handlers/query_resource.rb",
+    "lib/handlers/resource.rb",
+    "lib/handlers/searchkey.rb",
+    "lib/handlers/set.rb",
+    "lib/handlers/setlabel.rb",
+    "lib/handlers/timeslices.rb",
+    "lib/handlers/toppers.rb",
+    "lib/handlers/toptrend.rb",
+    "lib/handlers/trackers.rb",
+    "lib/handlers/traffic.rb",
+    "lib/handlers/volume.rb",
+    "lib/itrp.rb",
+    "test/helper.rb",
+    "test/test_itrp.rb"
+  ]
+  s.homepage = "http://github.com/vivekrajan/itrp".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "3.2.32".freeze
+  s.summary = "iTRP - Command Line Interface to Trisul Network Analytics".freeze
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+  end
+
+  if s.respond_to? :add_runtime_dependency then
+    s.add_runtime_dependency(%q<trisulrp>.freeze, [">= 0"])
+    s.add_runtime_dependency(%q<terminal-table>.freeze, [">= 0"])
+    s.add_development_dependency(%q<shoulda>.freeze, [">= 0"])
+    s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
+    s.add_development_dependency(%q<juwelier>.freeze, [">= 0"])
+    s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
+  else
+    s.add_dependency(%q<trisulrp>.freeze, [">= 0"])
+    s.add_dependency(%q<terminal-table>.freeze, [">= 0"])
+    s.add_dependency(%q<shoulda>.freeze, [">= 0"])
+    s.add_dependency(%q<bundler>.freeze, [">= 0"])
+    s.add_dependency(%q<juwelier>.freeze, [">= 0"])
+    s.add_dependency(%q<simplecov>.freeze, [">= 0"])
+  end
+end
+

data/lib/cmd_base.rb

@@ -21,6 +21,10 @@ class Cmd
 
 	def enter(s); end
 
+	def is_root?
+		return @trigger.empty?
+	end
+
 	def find_node(linebuffer_arr)
 
 		return self if linebuffer_arr.empty?

data/lib/cmd_root.rb

@@ -11,9 +11,10 @@ class Cmd_root < Cmd
 	
 
 	def enter(cmdline)
-		unless ["","reload", "clear" ].member? cmdline.strip
-			print("#{cmdline}  #{@enabled_in_state} : not found\n");
-		end
+	end
+
+	def notfound(cmdline)
+		print("#{cmdline}  : not found\n");
 	end
 end
 

data/lib/handlers/agg_flow.rb

@@ -0,0 +1,91 @@
+module ITRP
+
+# usage agg proto=11 group_by:nf_routerid,nf_ifindex_out,nf_ifindex_in 
+
+class Cmd_agg_flow   < Cmd 
+	def initialize (e)
+		super(e)
+		@enabled_in_state = :flow
+		@attach_cmd  = ''
+		@trigger = 'agg'
+	end
+
+	def completions(patt)
+		TRP::AggregateSessionsRequest
+		        .fields
+				.collect { |a| a.name.to_s  }
+				.grep( /^#{Regexp.escape(patt)}/i)
+	end
+
+    def enter(patt)
+
+		terms = patt.scan( /(\w+)\s*=\s*([\w\-_\.\:,]+)+/ )
+		qparams = terms.inject({}) { |acc,t| acc.store( t[0].to_sym, t[1]);acc}
+
+	    print("Query Params=#{qparams}\n")
+
+		group_by = patt.scan( /group_by:(\S+)/ )
+		group_by.flatten! 
+		if not group_by.empty? then 
+		  group_by  = group_by[0]
+	    else
+		  group_by = "" 
+        end 
+
+	    print("Group By =#{group_by}\n")
+
+
+		# meter names 
+		req =mk_request(TRP::Message::Command::AGGREGATE_SESSIONS_REQUEST ,
+						{
+						 :session_group  => appstate(:cgguid),
+                         :time_interval => appstate(:time_interval),
+						 :resolve_keys => true,
+						 :group_by_fields => group_by.split(',') 
+						}.merge(qparams))
+
+
+		get_response_zmq(@appenv.zmq_endpt,req) do |resp|
+
+			%w(dest_port  nf_routerid nf_ifindex_in nf_ifindex_out ).each do |fieldname| 
+
+				rows = [] 
+				rows << resp.send(fieldname).collect  do |item|
+					 [item.key.key, item.key.readable, item.key.label, item.count, item.metric]
+				end
+
+				table = Terminal::Table.new( 
+						:headings => [fieldname, 'Readable', 'Label', 'Flows', 'Metric'  ],
+						:rows => rows.first )
+				puts(table) 
+
+			end 
+
+			# tags
+			resp.tag_group.each do |tg|
+
+				puts(tg.group_name)
+
+				rows = [] 
+				rows << tg.tag_metrics.collect  do |item|
+					 [item.key.key, item.count, item.metric]
+				end
+
+				table = Terminal::Table.new( 
+						:headings => ['Tag', 'Flows', 'Metric'  ],
+						:rows => rows.first )
+				puts(table) 
+
+
+			end 
+
+		end
+
+
+    end
+
+
+end
+end
+
+

data/lib/handlers/alert.rb

@@ -10,16 +10,21 @@ class Cmd_alert < Cmd
 
 
     def completions(patt)
-        [  "External IDS           {9AFD8C08-07EB-47E0-BF05-28B4A7AE8DC9}",
-           "Blacklist activity BL  {5E97C3A3-41DB-4E34-92C3-87C904FAB83E}",
-           "Threshold crossing TCA {03AC6B72-FDB7-44C0-9B8C-7A1975C1C5BA}",
-           "System Alerts SYS      {18CE5961-38FF-4AEA-BAF8-2019F3A09063}",
-           "Threshold Band TB      {0E7E367D-4455-4680-BC73-699D81B7CBE0}"
+        [  "IDS           {9AFD8C08-07EB-47E0-BF05-28B4A7AE8DC9}",
+           "Blacklist {5E97C3A3-41DB-4E34-92C3-87C904FAB83E}",
+           "TCA {03AC6B72-FDB7-44C0-9B8C-7A1975C1C5BA}",
+           "SYS      {18CE5961-38FF-4AEA-BAF8-2019F3A09063}",
+           "TB      {0E7E367D-4455-4680-BC73-699D81B7CBE0}"
         ].grep( /#{Regexp.escape(patt)}/i)  
     end
 
 	def enter(s)
-		puts("Process set alert ");
+        patt = s.scan(/set\s+alert\s+(\S+)\s+({.*}$)/).flatten 
+		print("\nContext set to alert group [#{patt[0]}] [#{patt[1]}]\n\n")
+		@appenv.prompt = "iTRP A:(#{patt[0]})> "
+		@appenv.context_data[:cgguid] = patt[1]
+		@appenv.context_data[:cgname] = patt[0]
+		@appenv.context = :alerts
 
 	end
 end

data/lib/handlers/delete_alerts.rb

@@ -19,7 +19,7 @@ class Cmd_delete_alerts  < Cmd
 
     def enter(cmdline)
 
-		terms = patt.scan( /(\w+)\s*=\s*([\w\-_\.\:,]+)+/ )
+		terms = cmdline.scan( /(\w+)\s*=\s*([\w\-=\%_\.\:,]+)+/ )
 		qparams = terms.inject({}) { |acc,t| acc.store( t[0].to_sym, t[1]);acc}
 
 	    p qparams 
@@ -27,7 +27,7 @@ class Cmd_delete_alerts  < Cmd
 		# meter names 
 		req =mk_request(TRP::Message::Command::DELETE_ALERTS_REQUEST,
 						 { 	:alert_group  => appstate(:cgguid),
-                         	:time_interval =>  apstate(:time_interval) 
+                         	:time_interval =>  appstate(:time_interval) 
 						 }.merge(qparams))
 
 

data/lib/handlers/edges.rb

@@ -0,0 +1,60 @@
+module ITRP
+
+class Cmd_edges < Cmd 
+	def initialize (e)
+		super(e)
+		@enabled_in_state = :counter
+		@attach_cmd  = ''
+		@trigger = 'edges'
+	end
+
+
+
+    def enter(cmdline)
+
+        patt = cmdline.scan(/edges\s+(.*)/).flatten
+
+		p patt 
+
+		use_key = patt.empty? ? appstate(:cgkey)  : patt[0]
+
+		# meter names 
+		req =mk_request(TRP::Message::Command::GRAPH_REQUEST,
+						 :time_interval =>  appstate( :time_interval), 
+						 :subject_group => @appenv.context_data[:cgguid],
+						 :subject_key => use_key )
+
+		rows  = [] 
+
+		print "Request sent at  #{Time.now}\n"
+	
+		TrisulRP::Protocol.get_response_zmq(@appenv.zmq_endpt,req) do |resp|
+
+				print "=====  RESPONSE  =====\n"
+				print "\tSUBJECT GUID = #{resp.subject_group}\n"
+				print "\tSUBJECT KEY  = #{resp.subject_key.key}\n"
+
+			resp.graphs.each do |g|
+
+				print "=====  GRAPH  =====\n"
+				print "\t\tTIME FROM = #{Time.at(g.time_interval.from.tv_sec)}\n"
+				print "\t\tTIME TO   = #{Time.at(g.time_interval.to.tv_sec)}\n"
+
+				g.vertex_groups.each do |vg|
+
+					vertices_labels = vg.vertex_keys.collect { |k| k.label }.join(',')
+
+					print "\t\t\t---------------------------------------------\n"
+					print "\t\t\tVERTEX   GROUP  = #{vg.vertex_group}\n"
+					print "\t\t\tVERTICES LABELS = #{vertices_labels}\n"
+				end
+
+			end 
+
+		end
+
+	end
+
+end
+end
+

data/lib/handlers/grep.rb

@@ -0,0 +1,47 @@
+module ITRP
+
+class Cmd_grep   < Cmd 
+	def initialize (e)
+		super(e)
+		@enabled_in_state = :any
+		@attach_cmd  = ''
+		@trigger = 'grep'
+	end
+
+	def enter(cmdline)
+
+		patt = cmdline.scan(/grep\s+(\w+)/).flatten.first 
+
+		req =TrisulRP::Protocol.mk_request(TRP::Message::Command::GREP_REQUEST,
+			 :time_interval => appstate(:time_interval),
+			 :pattern_text => patt  )
+
+		rows = []
+		TrisulRP::Protocol.get_response_zmq(@appenv.zmq_endpt,req) do |resp|
+			sz = resp.sessions.size
+			(0..sz-1).each  do |i|
+                s = resp.sessions[i]
+                rows << [ s.session_key,  s.time_interval.from.tv_sec, s.time_interval.to.tv_sec, s.key1A.label, s.key1Z.label, resp.hints[i]]
+			end
+		end
+
+		table = Terminal::Table.new( 
+				:headings => %w(key tmFrom tmTo IPA IPZ hints ),
+				:rows => rows)
+		puts(table) 
+
+        if cmdline  =~ /savefilter/
+
+            
+            fkeys  = rows.collect{ |r| r[0] }.join(",")
+            @appenv.context_data[:filter] = '{99A78737-4B41-4387-8F31-8077DB917336}='  + fkeys  
+            puts "Filter string saved as @appenv.context_data[:filter] " + @appenv.context_data[:filter] 
+
+        end
+
+
+	end
+
+end
+end
+

data/lib/handlers/keyspace.rb

@@ -0,0 +1,51 @@
+module ITRP
+
+class Cmd_keyspace < Cmd 
+	def initialize (e)
+		super(e)
+		@enabled_in_state = :counter
+		@attach_cmd  = ''
+		@trigger = 'keyspace'
+	end
+
+
+
+    def enter(cmdline)
+
+        patt = cmdline.scan(/keyspace\s+(\S+)\s*(\S+)/).flatten
+
+		p "#{patt[0]} to #{patt[1]}" 
+
+         use_spaces =  [ TRP::KeySpaceRequest::KeySpace.new(
+                      :from_key => TRP::KeyT.new( :label => patt[0]), 
+                      :to_key   => TRP::KeyT.new( :label => patt[1]) ) ]
+
+		req =TrisulRP::Protocol.mk_request(TRP::Message::Command::KEYSPACE_REQUEST,
+			 :counter_group => @appenv.context_data[:cgguid],
+			 :time_interval =>  appstate( :time_interval),
+			 :totals_only => true )
+
+		rows  = [] 
+
+	
+		TrisulRP::Protocol.get_response_zmq(@appenv.zmq_endpt,req) do |resp|
+
+                resp.hits.each_with_index  do |kt,i | 
+                    rows << [ i, kt.key, kt.label, kt.readable ]
+                end 
+
+				p "TOTAL HITS = #{resp.total_hits}" 
+		end
+
+
+
+		table = Terminal::Table.new( 
+				:headings => %w(# Key Label Readable ),
+				:rows => rows)
+		puts(table) 
+
+	end
+
+end
+end
+

data/lib/handlers/list_counters.rb

@@ -10,19 +10,28 @@ class Cmd_cglist  < Cmd
 
 
 	def enter(cmdline)
-		req =mk_request(TRP::Message::Command::COUNTER_GROUP_INFO_REQUEST)
+		req =mk_request(TRP::Message::Command::COUNTER_GROUP_INFO_REQUEST, {:get_meter_info=>true} )
 
 		rows = []
 		get_response_zmq(@appenv.zmq_endpt,req) do |resp|
 			  resp.group_details.each do |group_detail|
+			  	cstr=""
+			    if group_detail.crosskey 
+					cstr = [group_detail.crosskey.parentguid, 
+						    group_detail.crosskey.crosskeyguid_1,
+						    group_detail.crosskey.crosskeyguid_2].join(",") 
+
+				end 
 			  	rows << [ group_detail.name,
 						  group_detail.guid,
-						  group_detail.bucket_size.to_i/1000
+						  group_detail.bucket_size.to_i/1000,
+						  group_detail.meters.size,
+						  cstr
 				        ]
 			  end
 		end
 
-		table = Terminal::Table.new :headings => %w(name guid bs), :rows => rows
+		table = Terminal::Table.new :headings => %w(name guid bs num_meters), :rows => rows
 		puts(table) 
 	end