presto-metrics 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67e17b9feb19f715c198b3aa1dfb024acecdf4f3
-  data.tar.gz: e8cb9299fd641dfa73a2e2e7fe9a30d4df5e5759
+  metadata.gz: a43804112e1f231ae1f0385b6d4c23909d4b0c37
+  data.tar.gz: ee961aa3796169912449f4db7c4fac1870dd8362
 SHA512:
-  metadata.gz: 66c4ab07df7446d229dcd61c99aba4c5c964afad16dd810901eff29004c228535fd545468700a6eba913e182c4d3a9be1eccde0f3d96012b1479c8b940fa00ca
-  data.tar.gz: 2fbc03bc8ab865032b384ce3ed6c40628faa82efd91b2fa7b6e4b92e403dec135414d8e73a1f9ed8f291a49d57c6ffc0d0720bb9499b2b7ab431363e9381d107
+  metadata.gz: ac35fadd641b03a7609d3067bef8b0fbca98e8869c9130f0a6ac19aba5c1c3e0675da3788572ff3cf2eb5b223822f4c895955d5dd2c5b44e053189923281ccd0
+  data.tar.gz: c6856141ac447e3b2eed0b07025ad5856e5f64ba6e75e1806598ea3a0730387c4d5069010210d9f706cc19e8ab95355b1437e37cc934865a2e0c07b348edde81

data/README.md

@@ -29,7 +29,8 @@ require 'presto/metrics'
 client = Presto::Metrics::Client.new  # Access to http://localhost:8080 in default
 
 # Alternatively, you can specify the host name and port number to use
-client = Presto::Metrics::Client.new(:host => "localhost", :port=>8081) 
+client = Presto::Metrics::Client.new(:host => "localhost", :port=>8080) 
+
 
 
 client.os_metrics
@@ -38,12 +39,23 @@ client.os_metrics
 # This is equivalent to write as follows
 client.get_metrics("java.lang:type=OperatingSystem")
 
-# Retrieve a set of parameters
+# Retrieve a specific set of parameters
 client.query_manager_metrics(["executor.active_count", "executor.completed_task_count"])
 # => {:"executor.active_count"=>0, :"executor.completed_task_count"=>0}
+
 client.os_metrics([:system_load_average, :free_physical_memory_size])
 #=> {:free_physical_memory_size=>3690512384, :system_load_average=>2.33056640625}
 
+
+# Path queries
+client.path("os:physical_memory_size")
+# => {"os.free_physical_memory_size"=>55034294272}
+
+# You can use comma-separated list of path queries
+client.path("memory:heap_memory_usage.used,non_heap_memory_usage.used")
+# => {"heap_memory_usage.used"=>926714864, "non_heap_memory_usage.used"=>108948488}
+
+
 # Retrieve standard metrics
 client.memory_usage_metrics      # java.lang:Type=Memory
 client.os_metrics                # java.lang:type=OperatingSystm
@@ -58,11 +70,32 @@ client.task_manager_metrics      # com.facebook.presto.execution:name=TaskManage
 # Retrieve the JSON representation of JMX properties
 client.get_json("java.lang:Type=Memory")
 
+# Pretty print 
+require 'pp'
+pp c.memory_usage_metrics
+#{
+#  "verbose": false,
+#  "object_pending_finalization_count": 0,
+#  "heap_memory_usage": {
+#    "committed": 259522560,
+#    "init": 268435456,
+#    "max": 14962655232,
+#    "used": 84478072
+#  },
+#  "non_heap_memory_usage": {
+#    "committed": 163250176,
+#    "init": 159842304,
+#    "max": 471859200,
+#    "used": 53369528
+3  },
+#  "object_name": "java.lang:type=Memory"
+#}
+
 ```
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/presto-metrics/fork )
+1. Fork it ( https://github.com/xerial/presto-metrics/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/presto/metrics.rb

@@ -1,30 +1,97 @@
 require "presto/metrics/version"
 require 'httparty'
 require 'json'
+require 'jsonpath'
 
 module Presto
   module Metrics
 
+  	class Query 
+  		def initialize(client)
+  			@client = client
+  		end
+
+	  	def list
+	  		query_list().each {|q|
+	  			s = q['session'] || {}
+	  			query = q['query'].gsub(/[\r\n]/, " ")[0..50]
+	  			c = [q['queryId'], s['user'], s['catalog'], s['schema'], s['source'], query]
+	  			puts c.join("\t")
+	  		}
+	  		0
+	  	end
+
+	  	def find(id)
+	  		@client.get_query_json(id)
+	  	end
+
+	  	def query_list(path="")
+	  		JSON.parse(@client.get_query_json(path))
+	  	end
+
+  	end
+
   	class Client 
 	  	def initialize(opts={})
  			@host = opts[:host] || "localhost"
   			@port = opts[:port] || "8080"
 		 	@endpoint = opts[:endpoint] || "http://#{@host}:#{@port}"
-		 	@mbean_path = opts[:mbean_path] || "/v1/jmx/mbean/"
+		 	@mbean_path = opts[:mbean_path] || "/v1/jmx/mbean"
+		 	@query_path = opts[:query_path] || "/v1/query"
 		 	@caml_case = opts[:caml_case] || false
 		end
 
-		def get(mbean)
-			JSON.parse(get_json(mbean))
+	  	@@MBEAN_ALIAS = {
+	  		"memory" => "java.lang:type=Memory",
+	  		"gc_cms" => "java.lang:type=GarbageCollector,name=ConcurrentMarkSweep",
+	  		"gc_parnew" => "java.lang:type=GarbageCollector,name=ParNew",
+	  		"os" => "java.lang:type=OperatingSystem",
+	  		"query_manager" => "com.facebook.presto.execution:name=QueryManager",
+	  		"query_execution" => "com.facebook.presto.execution:name=QueryExecution", 
+	  		"node_scheduler" => "com.facebook.presto.execution:name=NodeScheduler",
+	  		"task_executor" => "com.facebook.presto.execution:name=TaskExecutor",
+	  		"task_manager" => "com.facebook.presto.execution:name=TaskManager"
+	  	}
+
+
+		def path(path) 
+			c = path.split(/:/)
+			target = c[0]
+			mbean = @@MBEAN_ALIAS[target] || target
+			json = get_metrics(mbean)
+			return json if c.size <= 1
+			query_list = (c[1] || "").split(/,/)
+			result = {}
+			query_list.each{|q|
+				json_path = JsonPath.new(q)
+				result[q] = json_path.first(json)
+			}
+			result
+		end
+
+		def query 
+			Query.new(self)
+		end
+
+		def get_mbean(mbean)
+			JSON.parse(get_mbean_json(mbean))
+	  	end
+
+	  	def get(path) 
+	  		resp = HTTParty.get("#{@endpoint}#{path}")
+	  		resp.body
 	  	end
 
-	  	def get_json(mbean) 
-			resp = HTTParty.get("#{@endpoint}#{@mbean_path}#{mbean}")
-			resp.body
+	  	def get_mbean_json(mbean) 
+	  		get("#{@mbean_path}/#{mbean}")
 	  	end 
 
+	  	def get_query_json(path="")
+			get("#{@query_path}/#{path}")
+	  	end
+
 	  	def get_attributes(mbean) 
-			json = get(mbean)
+			json = get_mbean(mbean)
 			json['attributes'] || []
 	  	end
 
@@ -57,13 +124,14 @@ module Presto
 	  		 	.each {|attr| 
 	  		 		c_name = to_canonical_name(attr['name'])
 	  		 		if c_target_attr.empty? || c_target_attr.include?(c_name)
-	  		 			key = @caml_case ? attr['name'] : underscore(attr['name']).to_sym 
+	  		 			key = @caml_case ? attr['name'] : underscore(attr['name'])
 	  		 			kv[key] = attr['value'] 
 	  		 		end
 	  		 	}
 	  		kv
 	  	end
 
+
 	  	def memory_usage_metrics(target_attr=[])
 	  		get_metrics("java.lang:type=Memory", target_attr)
 	  	end

data/lib/presto/metrics/version.rb

@@ -1,5 +1,5 @@
 module Presto
   module Metrics
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/presto-metrics.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Taro L. Saito"]
   spec.email         = ["leo@xerial.org"]
   spec.summary       = "A library for collecting metrics of Presto, a distributed SQL engine"
-  spec.description   = "Monitoring the states of Presto coordinator and worker processes through JMX REST API (/v1/jmx/mbean)"
+  spec.description   = "Monitoring Presto coordinator and worker processes through JMX REST API (/v1/jmx/mbean)"
   spec.homepage      = "https://github.com/xerial/presto-metrics"
   spec.license       = "MIT"
 
@@ -23,4 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
 
   spec.add_runtime_dependency "httparty"
+  spec.add_runtime_dependency "jsonpath"
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: presto-metrics
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Taro L. Saito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,8 +66,22 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Monitoring the states of Presto coordinator and worker processes through
-  JMX REST API (/v1/jmx/mbean)
+- !ruby/object:Gem::Dependency
+  name: jsonpath
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Monitoring Presto coordinator and worker processes through JMX REST API
+  (/v1/jmx/mbean)
 email:
 - leo@xerial.org
 executables: []
@@ -113,3 +127,4 @@ summary: A library for collecting metrics of Presto, a distributed SQL engine
 test_files:
 - spec/presto/metrics_spec.rb
 - spec/spec_helper.rb
+has_rdoc: