metricsgeek 0.0.5 → 0.0.6

data/README.md

@@ -43,6 +43,10 @@ expands to
 
     --from server1.dc,server2.dc,server3.dc,server5.dc,server8.dc,server9.dc,server10.dc,server11.dc
 
+The above two features can be combined:
+
+    --from server[1..3,5,8].dc,server-prod-us-east[11..13].aws.com
+
 Metrics selection
 =================
 You can use the --list_keys option together with --from to list all the metrics keys available for querying.
@@ -68,4 +72,8 @@ Or, to sum up the POST rate from metric com.abc.webservice.posts.m1 across the c
 
 How to contribute
 =================
+You can run the test like this:
+
+    rspec metrics_downloader_spec.rb
+
 Pull requests are welcome!

data/bin/metricsgeek

@@ -23,18 +23,23 @@ class Array
 end
 
 def format(number)
-  "%7.3f" % [number]
+  "%7.3f" % [number] rescue number
 end
 
-expanded_hosts = opts[:from].split(",").map { |expr| MetricsDownloader.expand_host_expr(expr) }.flatten
-urls = MetricsDownloader.create_urls_from_host_params(expanded_hosts, opts[:port], opts[:route])
-json_trees = MetricsDownloader.download_and_parse_json_from_urls(urls, opts[:timeout])
+if !opts[:from]
+  puts "You must specify --from.  Use --help for options."
+  exit 1
+end
+
+json_trees = MetricsDownloader.parse_json_from(MetricsDownloader.split_host_exprs(opts[:from]),
+                                               opts[:port], opts[:route],
+                                               opts[:timeout])
 
 if opts[:list_keys]
-  MetricsParser.list_keys_for_hashes(json_trees).each { |key| puts key }
+  MetricsParser.list_keys_for_hashes(json_trees.values).each { |key| puts key }
 else
   keys = opts[:select].split(",")
-  host_key_value = expanded_hosts.zip(json_trees).map do |host, json_tree|
+  host_key_value = json_trees.map do |host, json_tree|
     matching_key_values = MetricsParser.glob_key_values(json_tree, keys)
     matching_key_values.map do |flatkey, value|
       {:host => host, :key => flatkey, :value => value}

data/lib/metrics_downloader.rb

@@ -45,4 +45,41 @@ module MetricsDownloader
       [host_expr]
     end
   end
+
+  # @param host_exprs A single string with multiple host expressions separated by commas
+  # Splits a comma-delimited string of host exprs.  This is tricky since there may be commas within brackets
+  def self.split_host_exprs(host_exprs_str)
+    host_exprs = []
+    expr = ""
+    in_brackets = false
+    host_exprs_str.each_char do |c|
+      if c == "," && !in_brackets
+        host_exprs << expr
+        expr = ""
+        next
+      elsif c == "["
+        in_brackets = true
+      elsif c == "]"
+        in_brackets = false
+      end
+      expr << c
+    end
+    host_exprs << expr if expr != ""
+    host_exprs
+  end
+
+  # Parses JSON from a list of host expressions, as passed to expand_host_expr.  Basically a combination
+  # of expand_host_expr, create_urls_from_host_params, and download_and_parse_json_from_urls.
+  #
+  # @param hosts A list of host expressions, as passed to expand_host_expr
+  # @param port The integer port to query
+  # @param route The string after / for getting metrics, defaults to "metricz/"
+  # @param timeout The timeout in seconds for fetching data
+  # @returns A hash { hostname => json_tree }
+  def self.parse_json_from(hosts, port, route = "metricz/", timeout = 5)
+    expanded_hosts = hosts.map { |expr| MetricsDownloader.expand_host_expr(expr) }.flatten
+    urls = MetricsDownloader.create_urls_from_host_params(expanded_hosts, port, route)
+    json_trees = MetricsDownloader.download_and_parse_json_from_urls(urls, timeout)
+    Hash[expanded_hosts.zip(json_trees)]
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metricsgeek
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-16 00:00:00.000000000Z
+date: 2013-04-03 00:00:00.000000000Z
 dependencies: []
 description: ! 'Easily grok and analyze your application metrics from a cluster, in
   real time, with this command line tool /