lbrt 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e85c3504123cdcc53dc2257c34ffca1fe6077f4
-  data.tar.gz: 03a9362c3dd7f9bc111ef3398c3b0b97a2192b0d
+  metadata.gz: f78090ca27e8694fc5661159b0cd3d0bc30e1c40
+  data.tar.gz: a5bca51feaef822ca735d078dd5c88587fb307cd
 SHA512:
-  metadata.gz: 1fea3878cabf7dc3ef6cebd89de6cdbc38a63925e819b8a2a3879f7ed82c6b1fe5d684074e9ebee6fda9141b63093200f791e1ceb971653635f5adc933a0e835
-  data.tar.gz: eb40f7bfeb5b325369a0f30c0e2d78f97a8cb874181fc4ee5dc28ea6de2cb6127fdae43b1a75d8473eb1517966678149ccfcd742f6c84cf5e30860da25f38171
+  metadata.gz: b201f773aab280ecf430d30c6cb33f66e28bcf9e45ff85f5440ee5a13c913a8e6150cebb6518a26ac2fc9e34a266b0962cc50ea5159c05323d581ab0347db4e1
+  data.tar.gz: 2a89819c67f14f3c8484a35fed219d1574cc51c7f69df19514edceb5517260d443474fe70a296dbd03cdc44a0e152e595565367d7e9ee2185ee26794814b455d

data/README.md

@@ -45,6 +45,7 @@ Commands:
   lbrt alert apply FILE      # Apply alerts
   lbrt alert export [FILE]   # Export alerts
   lbrt alert help [COMMAND]  # Describe subcommands or one specific subcommand
+  lbrt alert list            # Show alerts
   lbrt alert peco            # Show alert by peco
 
 Options:
@@ -55,7 +56,8 @@ Options:
 $ brt help metric
 Commands:
   lbrt metric help [COMMAND]  # Describe subcommands or one specific subcommand
-  lbrt metric peco REGRXP     # Show alert by peco
+  lbrt metric list            # Show metrics
+  lbrt metric peco REGRXP     # Show metric by peco
 
 Options:
   [--target=TARGET]
@@ -67,6 +69,7 @@ Commands:
   lbrt service apply FILE      # Apply services
   lbrt service export [FILE]   # Export services
   lbrt service help [COMMAND]  # Describe subcommands or one specific subcommand
+  lbrt service list            # Show services
 
 Options:
   [--target=TARGET]
@@ -78,11 +81,12 @@ Commands:
   lbrt space apply FILE      # Apply spaces
   lbrt space export [FILE]   # Export spaces
   lbrt space help [COMMAND]  # Describe subcommands or one specific subcommand
+  lbrt space list            # Show spaces
   lbrt space peco            # Show space by peco
 
 Options:
   [--target=TARGET]
-  [--export-concurrency=N]
+  [--concurrency=N]
                             # Default: 32
 ```
 

data/lbrt.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'diffy'
   spec.add_dependency 'hashie'
-  spec.add_dependency 'librato-client'
+  spec.add_dependency 'librato-client', '>= 0.1.1'
   spec.add_dependency 'parallel'
   spec.add_dependency 'peco_selector'
   spec.add_dependency 'term-ansicolor'

data/lib/lbrt/alert.rb

@@ -1,27 +1,45 @@
 class Lbrt::Alert
   include Lbrt::Logger::Helper
 
+  DEFAULT_CONCURRENCY = 32
+
   def initialize(client, options = {})
     @client = client
     @options = options
     @driver = Lbrt::Driver.new(@client, @options)
   end
 
-  def peco
-    alert_by_name = {}
+  def list
+    json = {}
+    alert_by_name = build_alert_by_name
 
-    @client.alerts.get.each do |alrt|
-      alert_id = alrt.fetch('id')
-      name = alrt.fetch('name')
-      next unless Lbrt::Utils.matched?(name, @options[:target])
-      alert_by_name[name] = alert_id
+    alert_by_name.each do |name, alrt|
+      alert_id = alrt[:id]
+
+      json[alert_id] = {
+        name: name,
+        url: alert_url(alert_id),
+        status: alrt[:status],
+      }
     end
 
-    result = PecoSelector.select_from(alert_by_name)
+    puts JSON.pretty_generate(json)
+  end
+
+  def peco
+    alert_id_by_name = {}
+
+    build_alert_by_name.select {|name, alrt|
+      @options[:status].nil? or @options[:status] == alrt[:status]
+    }.map {|name, alrt| alert_id_by_name[name] = alrt[:id] }
 
-    result.each do |alert_id|
-      url = "https://metrics.librato.com/alerts#/#{alert_id}"
-      Lbrt::Utils.open(url)
+    unless alert_id_by_name.empty?
+      result = PecoSelector.select_from(alert_id_by_name)
+
+      result.each do |alert_id|
+        url = alert_url(alert_id)
+        Lbrt::Utils.open(url)
+      end
     end
   end
 
@@ -36,6 +54,31 @@ class Lbrt::Alert
 
   private
 
+  def build_alert_by_name
+    alert_by_name = {}
+
+    @client.alerts.get.each do |alrt|
+      alert_id = alrt.fetch('id')
+      name = alrt.fetch('name')
+      next unless Lbrt::Utils.matched?(name, @options[:target])
+      alert_by_name[name] = {id: alert_id}
+    end
+
+    concurrency = @options[:concurrency] || DEFAULT_CONCURRENCY
+
+    Parallel.each(alert_by_name, :in_threads => concurrency) do |name, alrt|
+      alert_id = alrt[:id]
+      status = @client.alerts(alert_id).status.get
+      alrt[:status] = status['status']
+    end
+
+    alert_by_name
+  end
+
+  def alert_url(alert_id)
+    "https://metrics.librato.com/alerts#/#{alert_id}"
+  end
+
   def walk(file)
     expected = load_file(file)
     actual = Lbrt::Alert::Exporter.export(@client, @options)

data/lib/lbrt/cli/alert.rb

@@ -3,7 +3,16 @@ class Lbrt::CLI::Alert < Thor
 
   class_option :target
 
+  desc 'list', 'Show alerts'
+  option :'status'
+  option :'concurrency', :type => :numeric, :default => 32
+  def list
+    client(Lbrt::Alert).list
+  end
+
   desc 'peco', 'Show alert by peco'
+  option :'status'
+  option :'concurrency', :type => :numeric, :default => 32
   def peco
     client(Lbrt::Alert).peco
   end

data/lib/lbrt/cli/metric.rb

@@ -3,6 +3,11 @@ class Lbrt::CLI::Metric < Thor
 
   class_option :target
 
+  desc 'list', 'Show metrics'
+  def list
+    client(Lbrt::Metric).list
+  end
+
   desc 'peco', 'Show metric by peco'
   def peco
     client(Lbrt::Metric).peco

data/lib/lbrt/cli/service.rb

@@ -3,6 +3,11 @@ class Lbrt::CLI::Service < Thor
 
   class_option :target
 
+  desc 'list', 'Show services'
+  def list
+    client(Lbrt::Service).list
+  end
+
   desc 'apply FILE', 'Apply services'
   option :'dry-run', :type => :boolean, :default => false
   def apply(file)

data/lib/lbrt/cli/space.rb

@@ -2,7 +2,12 @@ class Lbrt::CLI::Space < Thor
   include Lbrt::Utils::CLIHelper
 
   class_option :target
-  class_option :'export-concurrency', :type => :numeric, :default => 32
+  class_option :'concurrency', :type => :numeric, :default => 32
+
+  desc 'list', 'Show spaces'
+  def list
+    client(Lbrt::Space).list
+  end
 
   desc 'peco', 'Show space by peco'
   def peco

data/lib/lbrt/metric.rb

@@ -6,18 +6,42 @@ class Lbrt::Metric
     @options = options
   end
 
+  def list
+    json = {}
+    metric_names = build_metric_names
+
+    metric_names.each do |name|
+      json[name] = {
+        url: metric_url(name),
+      }
+    end
+
+    puts JSON.pretty_generate(json)
+  end
+
   def peco
+    metric_names = build_metric_names
+    result = PecoSelector.select_from(metric_names)
+
+    result.each do |name|
+      url = metric_url(name)
+      Lbrt::Utils.open(url)
+    end
+  end
+
+  private
+
+  def build_metric_names
     metric_names = @client.metrics.get.map {|mtrc|
       mtrc.fetch('name')
     }.select {|name|
       Lbrt::Utils.matched?(name, @options[:target])
     }
 
-    result = PecoSelector.select_from(metric_names)
+    metric_names
+  end
 
-    result.each do |name|
-      url = "https://metrics.librato.com/s/metrics/#{name}"
-      Lbrt::Utils.open(url)
-    end
+  def metric_url(name)
+    "https://metrics.librato.com/s/metrics/#{name}"
   end
 end

data/lib/lbrt/service.rb

@@ -1,6 +1,23 @@
 class Lbrt::Service
   include Lbrt::Logger::Helper
 
+  def list
+    json = {}
+    service_by_key = build_service_by_key
+
+    service_by_key.each do |service_key, srvc|
+      service_id = srvc.delete('id')
+      type, title = service_key
+
+      json[service_id] = {
+        type: type,
+        title: title,
+      }.merge(srvc)
+    end
+
+    puts JSON.pretty_generate(json)
+  end
+
   def initialize(client, options = {})
     @client = client
     @options = options
@@ -18,6 +35,20 @@ class Lbrt::Service
 
   private
 
+  def build_service_by_key
+    service_by_key = {}
+
+    @client.services.get.each do |srvc|
+      type = srvc.delete('type')
+      title = srvc.delete('title')
+      service_key = [type, title]
+      next unless service_key.any? {|i| Lbrt::Utils.matched?(i, @options[:target]) }
+      service_by_key[service_key] = srvc
+    end
+
+    service_by_key
+  end
+
   def walk(file)
     expected = load_file(file)
     actual = Lbrt::Service::Exporter.export(@client, @options)

data/lib/lbrt/space/exporter.rb

@@ -21,7 +21,7 @@ class Lbrt::Space::Exporter
 
   def normalize_spaces(spaces)
     space_by_name_or_id = {}
-    concurrency = @options[:export_concurrency] || DEFAULT_CONCURRENCY
+    concurrency = @options[:concurrency] || DEFAULT_CONCURRENCY
 
     Parallel.each(spaces, :in_threads => concurrency) do |spc|
       space_id = spc.fetch('id')

data/lib/lbrt/space.rb

@@ -7,20 +7,26 @@ class Lbrt::Space
     @driver = Lbrt::Driver.new(@client, @options)
   end
 
-  def peco
-    space_by_name_or_id = {}
-
-    @client.spaces.get.each do |spc|
-      space_id = spc.fetch('id')
-      name_or_id = spc.fetch('name') || space_id
-      next unless Lbrt::Utils.matched?(name_or_id, @options[:target])
-      space_by_name_or_id[name_or_id] = space_id
+  def list
+    json = {}
+    space_by_name_or_id = build_space_by_name_or_id
+
+    space_by_name_or_id.each do |name_or_id, space_id|
+      json[space_id] = {
+        name: name_or_id,
+        url: space_url(space_id),
+      }
     end
 
+    puts JSON.pretty_generate(json)
+  end
+
+  def peco
+    space_by_name_or_id = build_space_by_name_or_id
     result = PecoSelector.select_from(space_by_name_or_id)
 
     result.each do |space_id|
-      url = "https://metrics.librato.com/s/spaces/#{space_id}"
+      url = space_url(space_id)
       Lbrt::Utils.open(url)
     end
   end
@@ -36,6 +42,23 @@ class Lbrt::Space
 
   private
 
+  def build_space_by_name_or_id
+    space_by_name_or_id = {}
+
+    @client.spaces.get.each do |spc|
+      space_id = spc.fetch('id')
+      name_or_id = spc.fetch('name') || space_id
+      next unless Lbrt::Utils.matched?(name_or_id, @options[:target])
+      space_by_name_or_id[name_or_id] = space_id
+    end
+
+    space_by_name_or_id
+  end
+
+  def space_url(space_id)
+    "https://metrics.librato.com/s/spaces/#{space_id}"
+  end
+
   def walk(file)
     expected = load_file(file)
     actual = Lbrt::Space::Exporter.export(@client, @options)

data/lib/lbrt/version.rb

@@ -1,3 +1,3 @@
 module Lbrt
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lbrt
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Genki Sugawara
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement