wavefront-cli 2.13.0 → 2.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9007cbf188f6962a31b04002c5b64c86e85bbc2ddad05e5299647706970ad65
-  data.tar.gz: 6b5daf8e04b6d5090837620f51dc9e1b5ce3c9d45227fe66d118a2adb94e758b
+  metadata.gz: acd004964f7c14a26b9857cdb8f2fc1781b52cfa1a1deee654db16a501203b69
+  data.tar.gz: 141f7be085e49e02624348da8edb1c37c5adac283ffd15d8574015c5230c6ad4
 SHA512:
-  metadata.gz: c224961d3690bed9d069d689d632c726262342ad4cc278b1942d4e70cc54a4263e0d89eda027b156cd93fde9184db04f831f75cbad3fe374f5a45f3eb7f30769
-  data.tar.gz: 2b20581ec22ae10242eea44ff07862b43eeb5bac057774b56aa6f3a363379298dbaca416859d1c274770edb376fe4bf3f85484876e16db23a475c457b850ac1b
+  metadata.gz: c88f783fe7710432538c7a583df5789034a583736cbcb2bc3356e4a1e3d6b4f415aa282aa710c0f72f5c6e9210f0fd173a0a54579b90d1578fefeff3b9adf212
+  data.tar.gz: 7dce2b8ac086b16353f1a73280398874e858e906893cd81a0d948e144727f8ebdcaf94c9001532bf8e1ca86f6b21fa4b959f6801c54405271d92800af85d9522

data/HISTORY.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 2.15.0 (18/12/2018)
+* Gracefully handle ctrl-c.
+* Add `install` and `uninstall` subcommands to `wf alert`.
+* Add `enable` and `disable` subcommands to `wf cloudintegration`.
+* Add `fav` and `unfav` commands to `wf dashboard`.
+* Add `alert install`, `alert uninstall`, `installed`, and
+  `manifest` commands to `wf integration`.
+* Require 2.2.0 of [wavefront-sdk](https://github.com/snltd/wavefront-sdk).
+
+## 2.14.0 (15/12/2018)
+* Add `-n` to `dashboard`'s `list` and `queries` commands to omit
+  system-owned dashboards.
+* Let `queries` subcommand accept an optional ID.
+
 ## 2.13.0 (11/12/2018)
 * Add CSV output for `query` command.
 * Add multiple format outputs for all applicable `alert`

data/lib/wavefront-cli/alert.rb

@@ -55,11 +55,23 @@ module WavefrontCli
     end
 
     def do_queries
-      wf.list(0, :all).tap do |r|
-        r.response.items.map! { |a| { id: a.id, condition: a.condition } }
+      resp, data = one_or_all
+
+      resp.tap do |r|
+        r.response.items = data.map do |a|
+          { id: a.id, condition: a.condition }
+        end
       end
     end
 
+    def do_install
+      wf.install(options[:'<id>'])
+    end
+
+    def do_uninstall
+      wf.uninstall(options[:'<id>'])
+    end
+
     # How many alerts are in the given state? If none, say so,
     # rather than just printing nothing.
     #

data/lib/wavefront-cli/base.rb

@@ -352,8 +352,13 @@ module WavefrontCli
     # harm inheriting unneeded things. Some classes override them.
     #
     def do_list
-      return wf.list(ALL_PAGE_SIZE, :all) if options[:all]
-      wf.list(options[:offset] || 0, options[:limit] || 100)
+      list = if options[:all]
+               wf.list(ALL_PAGE_SIZE, :all)
+             else
+               wf.list(options[:offset] || 0, options[:limit] || 100)
+             end
+
+      respond_to?(:list_filter) ? list_filter(list) : list
     end
 
     def do_describe
@@ -457,5 +462,21 @@ module WavefrontCli
     def import_to_create(raw)
       raw.delete_if { |k, _v| k == 'id' }
     end
+
+    # Return a detailed description of one item, if an ID has been
+    # given, or all items if it has not.
+    #
+    def one_or_all
+      if options[:'<id>']
+        resp = wf.describe(options[:'<id>'])
+        data = [resp.response]
+      else
+        options[:all] = true
+        resp = do_list
+        data = resp.response.items
+      end
+
+      [resp, data]
+    end
   end
 end

data/lib/wavefront-cli/cloudintegration.rb

@@ -8,5 +8,13 @@ module WavefrontCli
     def validator_exception
       Wavefront::Exception::InvalidCloudIntegrationId
     end
+
+    def do_enable
+      wf.enable(options[:'<id>'])
+    end
+
+    def do_disable
+      wf.disable(options[:'<id>'])
+    end
   end
 end

data/lib/wavefront-cli/commands/alert.rb

@@ -26,7 +26,9 @@ class WavefrontCommandAlert < WavefrontCommandBase
      "tag add #{CMN} <id> <tag>",
      "tag delete #{CMN} <id> <tag>",
      "currently #{CMN} [-f format] <state>",
-     "queries #{CMN} [-f format] [-b]",
+     "queries #{CMN} [-f format] [-b] [<id>]",
+     "install #{CMN} <id>",
+     "uninstall #{CMN} <id>",
      "summary #{CMN} [-f format] [-a]"]
   end
 

data/lib/wavefront-cli/commands/cloudintegration.rb

@@ -20,6 +20,8 @@ class WavefrontCommandCloudintegration < WavefrontCommandBase
      "describe #{CMN} [-f format] <id>",
      "delete #{CMN} <id>",
      "undelete #{CMN} <id>",
+     "enable #{CMN} <id>",
+     "disable #{CMN} <id>",
      "import #{CMN} <file>",
      "search #{CMN} [-al] [-f format] [-o offset] [-L limit] <condition>..."]
   end

data/lib/wavefront-cli/commands/dashboard.rb

@@ -8,7 +8,7 @@ class WavefrontCommandDashboard < WavefrontCommandBase
   end
 
   def _commands
-    ["list #{CMN} [-al] [-f format] [-o offset] [-L limit]",
+    ["list #{CMN} [-alN] [-f format] [-o offset] [-L limit]",
      "describe #{CMN} [-f format] [-v version] <id>",
      "import #{CMN} [-f format] <file>",
      "update #{CMN} <key=value> <id>",
@@ -16,7 +16,9 @@ class WavefrontCommandDashboard < WavefrontCommandBase
      "undelete #{CMN} <id>",
      "history #{CMN} [-f format] [-o offset] [-L limit] <id>",
      "search #{CMN} [-al] [-f format] [-o offset] [-L limit] <condition>...",
-     "queries #{CMN} [-f format] [-b]",
+     "queries #{CMN} [-f format] [-b] [<id>]",
+     "fav #{CMN} <id>",
+     "unfav #{CMN} <id>",
      tag_commands]
   end
 
@@ -28,6 +30,7 @@ class WavefrontCommandDashboard < WavefrontCommandBase
      '-L, --limit=COUNT        number of dashboards or revisions to list',
      '-v, --version=INTEGER    version of dashboard',
      '-b, --brief              do not show dashboard names',
+     '-N, --no-system          do not show system-owned dashboards',
      '-f, --format=STRING      output format']
   end
 end

data/lib/wavefront-cli/commands/integration.rb

@@ -15,6 +15,10 @@ class WavefrontCommandIntegration < WavefrontCommandBase
      "manifests #{CMN}",
      "status #{CMN} <id>",
      "statuses #{CMN}",
+     "alert install #{CMN} <id>",
+     "alert uninstall #{CMN} <id>",
+     "installed #{CMN} [-f format]",
+     "manifests #{CMN} [-f format]",
      "search #{CMN} [-al] [-f format] [-o offset] [-L limit] <condition>..."]
   end
 

data/lib/wavefront-cli/controller.rb

@@ -102,6 +102,8 @@ class WavefrontCliController
   def run_command(cli_class_obj)
     cli_class_obj.validate_opts
     cli_class_obj.run
+  rescue Interrupt
+    abort "\nOperation aborted at user request."
   rescue WavefrontCli::Exception::CredentialError => e
     abort "Credential error. #{e.message}"
   rescue WavefrontCli::Exception::UnsupportedOutput => e

data/lib/wavefront-cli/dashboard.rb

@@ -5,6 +5,11 @@ module WavefrontCli
   # CLI coverage for the v2 'dashboard' API.
   #
   class Dashboard < WavefrontCli::Base
+    def list_filter(list)
+      return list unless options[:nosystem]
+      list.tap { |l| l.response.items.delete_if { |d| d[:systemOwned] } }
+    end
+
     def do_describe
       wf.describe(options[:'<id>'], options[:version])
     end
@@ -25,15 +30,23 @@ module WavefrontCli
     end
 
     def do_queries
-      resp = wf.list(0, :all)
+      resp, data = one_or_all
 
-      queries = resp.response.items.each_with_object({}) do |d, a|
+      queries = data.each_with_object({}) do |d, a|
         a[d.id] = extract_values(d, 'query')
       end
 
       resp.tap { |r| r.response.items = queries }
     end
 
+    def do_fav
+      wf.favorite(options[:'<id>'])
+    end
+
+    def do_unfav
+      wf.unfavorite(options[:'<id>'])
+    end
+
     # @param obj [Object] the thing to search
     # @param key [String, Symbol] the key to search for
     # @param aggr [Array] values of matched keys

data/lib/wavefront-cli/display/cloudintegration.rb

@@ -14,5 +14,13 @@ module WavefrontDisplay
       drop_fields(:forceSave, :inTrash, :deleted)
       long_output
     end
+
+    def do_enable
+      puts "Enabled #{options[:'<id>']}."
+    end
+
+    def do_disable
+      puts "Disabled #{options[:'<id>']}."
+    end
   end
 end

data/lib/wavefront-cli/display/dashboard.rb

@@ -26,5 +26,13 @@ module WavefrontDisplay
         long_output
       end
     end
+
+    def do_fav
+      puts "Added #{options[:'<id>']} to favourites."
+    end
+
+    def do_unfav
+      puts "Removed #{options[:'<id>']} from favourites."
+    end
   end
 end

data/lib/wavefront-cli/display/integration.rb

@@ -8,5 +8,17 @@ module WavefrontDisplay
     def do_list_brief
       multicolumn(:id, :name, :description)
     end
+
+    def do_installed
+      multicolumn(:id, :name, :description)
+    end
+
+    def do_install_all_alerts
+      puts "Installed alerts for #{options[:'<id>']}."
+    end
+
+    def do_uninstall_all_alerts
+      puts "Uninstalled alerts for #{options[:'<id>']}."
+    end
   end
 end

data/lib/wavefront-cli/integration.rb

@@ -10,6 +10,10 @@ module WavefrontCli
     end
 
     def do_manifests
+      if options[:format] == 'human'
+        abort 'Human-readable manifest output is not supported.'
+      end
+
       wf.manifests
     end
 
@@ -21,8 +25,20 @@ module WavefrontCli
       wf.uninstall(options[:'<id>'])
     end
 
+    def do_alert_install
+      wf.install_all_alerts(options[:'<id>'])
+    end
+
+    def do_alert_uninstall
+      wf.uninstall_all_alerts(options[:'<id>'])
+    end
+
     def do_statuses
       wf.statuses
     end
+
+    def do_installed
+      wf.installed
+    end
   end
 end

data/lib/wavefront-cli/version.rb

@@ -1 +1 @@
-WF_CLI_VERSION = '2.13.0'.freeze
+WF_CLI_VERSION = '2.15.0'.freeze

data/spec/wavefront-cli/alert_spec.rb

@@ -47,9 +47,14 @@ describe "#{word} command" do
               path:   "/api/v2/#{word}/#{id}/snooze?seconds=800")
   cmd_to_call(word, "unsnooze #{id}",
               method: :post, path: "/api/v2/#{word}/#{id}/unsnooze")
+  cmd_to_call(word, "install #{id}",
+              method: :post, path: "/api/v2/#{word}/#{id}/install")
+  cmd_to_call(word, "uninstall #{id}",
+              method: :post, path: "/api/v2/#{word}/#{id}/uninstall")
   cmd_to_call(word, 'summary', path: "/api/v2/#{word}/summary")
   invalid_ids(word, ["describe #{bad_id}", "delete #{bad_id}",
                      "undelete #{bad_id}", "snooze #{bad_id}",
+                     "install #{bad_id}", "uninstall #{bad_id}",
                      "snooze -T 500 #{bad_id}"])
   tag_tests(word, id, bad_id)
 end

data/spec/wavefront-cli/cloudintegration_spec.rb

@@ -28,6 +28,13 @@ describe 'cloudintegration command' do
   cmd_to_call(word, "undelete #{id}",
               { method: :post,
                 path:    "/api/v2/cloudintegration/#{id}/undelete" }, k)
+  cmd_to_call(word, "enable #{id}",
+              { method: :post,
+                path:    "/api/v2/cloudintegration/#{id}/enable" }, k)
+  cmd_to_call(word, "disable #{id}",
+              { method: :post,
+                path:    "/api/v2/cloudintegration/#{id}/disable" }, k)
   invalid_ids(word, ["describe #{bad_id}", "delete #{bad_id}",
-                     "undelete #{bad_id}"])
+                     "undelete #{bad_id}", "disable #{bad_id}",
+                     "enable #{bad_id}"])
 end

data/spec/wavefront-cli/dashboard_spec.rb

@@ -39,6 +39,10 @@ describe "#{word} command" do
                         sort: { field: 'id', ascending: true } },
               headers: JSON_POST_HEADERS)
 
+  cmd_to_call(word, "fav #{id}",
+              method: :post, path: "/api/v2/#{word}/#{id}/favorite")
+  cmd_to_call(word, "unfav #{id}",
+              method: :post, path: "/api/v2/#{word}/#{id}/unfavorite")
   cmd_to_call(word, "undelete #{id}",
               method: :post, path: "/api/v2/#{word}/#{id}/undelete")
   invalid_ids(word, ["describe #{bad_id}", "delete #{bad_id}",

data/spec/wavefront-cli/integration_spec.rb

@@ -12,12 +12,33 @@ describe "#{word} command" do
                        "uninstall #{id}", "status #{id}", 'statuses',
                        'manifests'])
   list_tests(word)
-  cmd_to_call(word, "describe #{id}", path: "/api/v2/#{word}/#{id}")
+
+  cmd_to_call(word, "status #{id}", path: "/api/v2/#{word}/#{id}/status")
+
   cmd_to_call(word, "install #{id}",
               method: :post, path: "/api/v2/#{word}/#{id}/install")
+
   cmd_to_call(word, "uninstall #{id}",
               method: :post, path: "/api/v2/#{word}/#{id}/uninstall")
+
+  cmd_to_call(word, "alert install #{id}",
+              method: :post,
+              path:   "/api/v2/#{word}/#{id}/install-all-alerts")
+
+  cmd_to_call(word, "alert uninstall #{id}",
+              method: :post,
+              path:   "/api/v2/#{word}/#{id}/uninstall-all-alerts")
+
+  cmd_to_call(word, "describe #{id}", path: "/api/v2/#{word}/#{id}")
+
   cmd_to_call(word, "status #{id}", path: "/api/v2/#{word}/#{id}/status")
+
+  cmd_to_call(word, 'installed', path: "/api/v2/#{word}/installed")
+
+  cmd_to_call(word, 'manifests', path: "/api/v2/#{word}/manifests")
+
   invalid_ids(word, ["describe #{bad_id}", "install #{bad_id}",
+                     "alert install #{bad_id}",
+                     "alert uninstall #{bad_id}",
                      "uninstall #{bad_id}", "status #{bad_id}"])
 end

data/wavefront-cli.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = %w[lib]
 
   gem.add_runtime_dependency 'docopt', '~> 0.6.0'
-  gem.add_runtime_dependency 'wavefront-sdk', '~> 2.1', '>= 2.1.0'
+  gem.add_runtime_dependency 'wavefront-sdk', '~> 2.2', '>= 2.2.0'
 
   gem.add_development_dependency 'bundler', '~> 1.3'
   gem.add_development_dependency 'minitest', '~> 5.11', '>= 5.11.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wavefront-cli
 version: !ruby/object:Gem::Version
-  version: 2.13.0
+  version: 2.15.0
 platform: ruby
 authors:
 - Robert Fisher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-12 00:00:00.000000000 Z
+date: 2018-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -30,20 +30,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement