mmtop 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c77d53f05e5d2b75090ab37c8a5008ec9f8d31e
-  data.tar.gz: aa11864d9175f6bad1b189329889b1dffbcb8b18
+  metadata.gz: e09aabaa1c7521869f8c71ebcdf377ccef19aafd
+  data.tar.gz: c22ad8441828e01e33666721b19f925329344926
 SHA512:
-  metadata.gz: 62610dc63a6b3b9c292c90624aa31b5823ed8055fe22cc36c692bd0c267c59c3e829dbe6f0686a87bf5027aa54d95ab486820cbaee98a50683b3f066a7187e78
-  data.tar.gz: 920420531c2b71f30f2def59baf9f735cf0fa47c105624af20d3419ce9397b4abcbe10a3ffe07822800a31f5a1e519e9c5e6c98fa2c20111068f85a1616d83fb
+  metadata.gz: a6ce83931dc20eeeec853c65eaba81af6454f9095eb5346947cf4316171e8d3766d8d1db7f843819ce11fc43eac60644ca19f4c8dbeb70f88d25712ad8be32a0
+  data.tar.gz: aa329db7374794f7e2f2d586da596728bd8324b072e340d6a0507d5ab3cd1ac663979e1776b3afe520925facef293b5f9a5441ee73b9a6195021ab5848d2adc3

data/lib/mmtop/commands/basic.rb

@@ -137,3 +137,31 @@ MMTop::Command.register do |c|
     system("mysql --user='#{opt['user']}' --host='#{opt['host']}' --password='#{opt['password']}'")
   end
 end
+
+MMTop::Command.register do |c|
+  c.regexp /^narrow (.*)/
+  c.usage   "narrow HOST|off"
+  c.explain "only display queries on the cluster that contains HOST"
+
+
+  c.command do |cmd, config|
+    cmd =~ c.regexp
+    narrow_host = $1
+ 
+    MMTop::Topology.discover(config) # force discovery even if not configured
+
+    clusters = [[]]
+    config.hosts.each do |h|
+      if h.display_name =~ /^\s+\\/  # slave, starts with '\'.  i know, i know.
+        clusters.last << h
+      else
+        clusters << [h]
+      end
+    end
+
+    clusters.each do |cluster|
+      matches = cluster.any? { |c| c.name == narrow_host || narrow_host.downcase == "off" }
+      cluster.each { |c| c.hide = !matches } 
+    end
+  end
+end

data/lib/mmtop/filters/map_topology.rb

@@ -4,6 +4,14 @@ require 'socket'
 
 module MMTop
   class Topology
+    def self.discover(config)
+      if !config.options['topology.discovered']
+        config.options['topology.discovered'] = true
+        config.hosts = MMTop::Topology.new(config).new_hostlist
+      end
+      config
+    end
+
     def initialize(config)
       @config = config
     end
@@ -113,10 +121,7 @@ module MMTop
   end
 
   Filter.add_filter("discover_topology") do |queries, hostinfo, config|
-    if config.options['discover_topology'] && !config.options['topology.discovered']
-      config.options['topology.discovered'] = true
-      config.hosts = MMTop::Topology.new(config).new_hostlist
-    end
+    MMTop::Topology.discover(config) if config.options['discover_topology'] 
   end
 
   MMTop::Command.register do |c|

data/lib/mmtop/host.rb

@@ -17,6 +17,7 @@ module MMTop
       @last_queries = nil
       @port = options['port'] || 3306
       @hide_if_empty = options['hide_if_empty']
+      @hide = false
 
       initialize_mysql2_cx(m2opts)
     end
@@ -35,7 +36,7 @@ module MMTop
       end
     end
 
-    attr_accessor :display_name, :name, :comment, :options, :ip
+    attr_accessor :display_name, :name, :comment, :options, :ip, :hide
     attr_reader :port
 
     def hide_if_empty?

data/lib/mmtop/term_printer.rb

@@ -143,7 +143,7 @@ module MMTop
     end
 
     def print_host(info)
-      return if info.processlist.empty? && info.host.hide_if_empty?
+      return if (info.processlist.empty? && info.host.hide_if_empty?) || info.host.hide
 
       display_name = info.host.display_name
       if info.host.dead?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mmtop
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Ben Osheroff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-12 00:00:00.000000000 Z
+date: 2015-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -139,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: A mytop-ish variant that can watch many mysql servers