wavefront-cli 5.0.1 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b6dd6a0dbe70c8b5b32da314ee85ed859954a1c65b6ab068413d655bb0ef9ed
-  data.tar.gz: 8b4606d212c1be7e8020946fc3a584774d1e0caa88add714683c896e39822b0c
+  metadata.gz: 2500c3c1046355e74eaa41f1e612a2f05054ffc54f752f79cac8f4c8f47dfd07
+  data.tar.gz: 9676df59ed6592399703de971ea8b2f691fe09443c74147d60096b3789d83ae5
 SHA512:
-  metadata.gz: 906ad829f658c803f7fb9666172ffc78c5b6b5db9918edf5203fe8477ddbc0b1e5e8772cd9ba479160e6e3d4173a2ca363490de7763049174934364989a4a9ad
-  data.tar.gz: 856022412c9a6ab3aca5ea88870f115bf11373bd1cbac64f6ba52710fda2cdada21c3c385dc416daa3ff94c4a58fca1490b2fdc071b3cc3a8590d4471017e05d
+  metadata.gz: 441cf573c9c17603679bd39d3b1f9d0dcf15ca0fc68f8f0b72fa2969fc9384931d9b549e54b0659e5103f0f09f04d50b45987758ddcd54115ceb450bda832366
+  data.tar.gz: d4236668320cc4167100784cc7c265c22a5d6bddf5e1a44da54c4b20c8b657e782582046551989800b0c4548f611c06aa900f5eb5ed3daaa46e1472d62f0f35a

data/HISTORY.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 5.1.0 (2020-02-20)
+* Add `-U` (`--upsert`) option to `import` sub-commands.
+
 ## 5.0.1 (2020-02-18)
 * Bugfix: threshold alerts could not be imported.
 

data/lib/wavefront-cli/base.rb

@@ -476,13 +476,23 @@ module WavefrontCli
       raw = preprocess_rawfile(raw) if respond_to?(:preprocess_rawfile)
       prepped = import_to_create(raw)
 
-      if options[:update]
+      if options[:upsert]
+        import_upsert(raw, prepped)
+      elsif options[:update]
         import_update(raw)
       else
         wf.create(prepped)
       end
     end
 
+    def import_upsert(raw, prepped)
+      update_call = import_update(raw)
+      return update_call if update_call.ok?
+
+      puts 'update failed, inserting' if options[:verbose] || options[:debug]
+      wf.create(prepped)
+    end
+
     def import_update(raw)
       wf.update(raw[:id], raw, false)
     end

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

@@ -16,7 +16,7 @@ class WavefrontCommandAlert < WavefrontCommandBase
      "history #{CMN} [-o offset] [-L limit] <id>",
      "latest #{CMN} <id>",
      "dump #{CMN}",
-     "import #{CMN} [-u] <file>",
+     "import #{CMN} [-uU] <file>",
      "snooze #{CMN} [-T time] <id>",
      "set #{CMN} <key=value> <id>",
      "unsnooze #{CMN} <id>",
@@ -39,6 +39,7 @@ class WavefrontCommandAlert < WavefrontCommandBase
      "-L, --limit=COUNT        number of #{things} to list",
      '-O, --fields=F1,F2,...   only show given fields',
      "-u, --update             update an existing #{thing}",
+     "-U, --upsert             import new or update existing #{thing}",
      '-T, --time=SECONDS       how long to snooze (default 3600)',
      "-b, --brief              do not show #{thing} names"]
   end

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

@@ -25,7 +25,7 @@ class WavefrontCommandCloudintegration < WavefrontCommandBase
      "enable #{CMN} <id>",
      "disable #{CMN} <id>",
      "dump #{CMN}",
-     "import #{CMN} [-u] <file>",
+     "import #{CMN} [-uU] <file>",
      "search #{CMN} [-al] [-o offset] [-L limit] [-O fields] <condition>..."]
   end
 
@@ -36,6 +36,7 @@ class WavefrontCommandCloudintegration < WavefrontCommandBase
      "-o, --offset=n           start from nth #{thing}",
      '-O, --fields=F1,F2,...   only show given fields',
      "-L, --limit=COUNT        number of #{things} to list",
-     "-u, --update             update an existing #{thing}"]
+     "-u, --update             update an existing #{thing}",
+     "-U, --upsert             import new or update existing #{thing}"]
   end
 end

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

@@ -23,7 +23,7 @@ class WavefrontCommandCluster < WavefrontCommandBase
      "delete #{CMN} <id>",
      "create #{CMN} [-v version] <platform> <name> <id>",
      "dump #{CMN}",
-     "import #{CMN} [-u] <file>",
+     "import #{CMN} [-uU] <file>",
      "set #{CMN} <key=value> <id>",
      tag_commands,
      "search #{CMN} [-al] [-o offset] [-L limit] [-O fields] <condition>...",
@@ -38,6 +38,7 @@ class WavefrontCommandCluster < WavefrontCommandBase
      '-O, --fields=F1,F2,...  only show given fields',
      "-L, --limit=COUNT       number of #{things} to list",
      "-u, --update            update an existing #{thing}",
+     "-U, --upsert            import new or update existing #{thing}",
      "-v, --version=VERSION   version of #{thing}"]
   end
 end

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

@@ -9,7 +9,7 @@ class WavefrontCommandDashboard < WavefrontCommandBase
     ["list #{CMN} [-alN] [-O fields] [-o offset] [-L limit]",
      "describe #{CMN} [-v version] <id>",
      "dump #{CMN}",
-     "import #{CMN} [-u] <file>",
+     "import #{CMN} [-uU] <file>",
      "set #{CMN} <key=value> <id>",
      "delete #{CMN} <id>",
      "undelete #{CMN} <id>",
@@ -31,6 +31,7 @@ class WavefrontCommandDashboard < WavefrontCommandBase
      "-L, --limit=COUNT        number of #{things} or revisions to list",
      '-O, --fields=F1,F2,...   only show given fields',
      "-u, --update             update an existing #{thing}",
+     "-U, --upsert             import new or update existing #{thing}",
      '-T, --time=SECONDS       how long to snooze (default 3600)',
      "-v, --version=INTEGER    version of #{thing}",
      "-b, --brief              do not show #{thing} names",

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

@@ -23,7 +23,7 @@ class WavefrontCommandDerivedmetric < WavefrontCommandBase
      "create #{CMN} [-d description] [-T tag...] [-b] [-i interval] " \
      '[-r range] <name> <query>',
      "dump #{CMN}",
-     "import #{CMN} [-u] <file>",
+     "import #{CMN} [-uU] <file>",
      "set #{CMN} <key=value> <id>",
      "delete #{CMN} <id>",
      "undelete #{CMN} <id>",
@@ -46,6 +46,7 @@ class WavefrontCommandDerivedmetric < WavefrontCommandBase
      '-i, --interval=INTEGER  execute query every n minutes [default: 1]',
      '-r, --range=INTEGER     include results in the last n minutes ' \
                               '[default: 5]',
-     "-u, --update             update an existing #{thing}"]
+     "-u, --update            update an existing #{thing}",
+     "-U, --upsert            import new or update existing #{thing}"]
   end
 end

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

@@ -23,7 +23,7 @@ class WavefrontCommandIngestionpolicy < WavefrontCommandBase
      "describe #{CMN} <id>",
      "delete #{CMN} <id>",
      "dump #{CMN}",
-     "import #{CMN} [-u] <file>",
+     "import #{CMN} [-uU] <file>",
      "set #{CMN} <key=value> <id>",
      "add user #{CMN} <id> <user>...",
      "remove user #{CMN} <id> <user>...",
@@ -40,6 +40,7 @@ class WavefrontCommandIngestionpolicy < WavefrontCommandBase
      '-O, --fields=F1,F2,...  only show given fields',
      "-L, --limit=COUNT       number of #{things} to list",
      "-d, --desc=STRING       reason for #{thing}",
-     "-u, --update            update an existing #{thing}"]
+     "-u, --update            update an existing #{thing}",
+     "-U, --upsert            import new or update existing #{thing}"]
   end
 end

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

@@ -24,7 +24,7 @@ class WavefrontCommandLink < WavefrontCommandBase
      '<description> <template>',
      "delete #{CMN} <id>",
      "dump #{CMN}",
-     "import #{CMN} [-u] <file>",
+     "import #{CMN} [-uU] <file>",
      "set #{CMN} <key=value> <id>",
      "search #{CMN} [-al] [-o offset] [-L limit] [-O fields] <condition>..."]
   end
@@ -39,6 +39,7 @@ class WavefrontCommandLink < WavefrontCommandBase
      '-m, --metric-regex=REGEX metric filter regular expression',
      '-s, --source-regex=REGEX source filter regular expression',
      '-p, --point-regex=REGEX  point filter regular expression',
-     "-u, --update             update an existing #{thing}"]
+     "-u, --update             update an existing #{thing}",
+     "-U, --upsert             import new or update existing #{thing}"]
   end
 end

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

@@ -17,7 +17,7 @@ class WavefrontCommandNotificant < WavefrontCommandBase
     ["list #{CMN} [-al] [-O fields] [-o offset] [-L limit]",
      "describe #{CMN} <id>",
      "dump #{CMN}",
-     "import #{CMN} [-u] <file>",
+     "import #{CMN} [-uU] <file>",
      "delete #{CMN} <id>",
      "test #{CMN} <id>",
      "set #{CMN} <key=value> <id>",
@@ -31,6 +31,7 @@ class WavefrontCommandNotificant < WavefrontCommandBase
      "-o, --offset=n           start from nth #{thing}",
      '-O, --fields=F1,F2,...   only show given fields',
      "-L, --limit=COUNT        number of #{things} to list",
-     "-u, --update             update an existing #{thing}"]
+     "-u, --update             update an existing #{thing}",
+     "-U, --upsert             import new or update existing #{thing}"]
   end
 end

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

@@ -26,7 +26,7 @@ class WavefrontCommandSavedsearch < WavefrontCommandBase
      "describe #{CMN} <id>",
      "delete #{CMN} <id>",
      "dump #{CMN}",
-     "import #{CMN} [-u] <file>",
+     "import #{CMN} [-uU] <file>",
      "search #{CMN} [-al] [-o offset] [-L limit] [-O fields] <condition>..."]
   end
 
@@ -37,6 +37,7 @@ class WavefrontCommandSavedsearch < WavefrontCommandBase
      "-o, --offset=n           start from nth #{thing}",
      '-O, --fields=F1,F2,...   only show given fields',
      "-L, --limit=COUNT        number of #{things} to list",
-     "-u, --update             update an existing #{thing}"]
+     "-u, --update             update an existing #{thing}",
+     "-U, --upsert             import new or update existing #{thing}"]
   end
 end

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

@@ -33,7 +33,7 @@ class WavefrontCommandServiceaccount < WavefrontCommandBase
      "grant #{CMN} <permission> to <id>",
      "revoke #{CMN} <permission> from <id>",
      "set #{CMN} <key=value> <id>",
-     "import #{CMN} [-u] <file>",
+     "import #{CMN} [-uU] <file>",
      "apitoken list #{CMN} [-O fields] <id>",
      "apitoken create #{CMN} [-N name] <id>",
      "apitoken delete #{CMN} <id> <token_id>",
@@ -49,6 +49,7 @@ class WavefrontCommandServiceaccount < WavefrontCommandBase
      "-L, --limit=COUNT        number of #{things} to list",
      '-O, --fields=F1,F2,...   only show given fields',
      "-u, --update             update an existing #{thing}",
+     "-U, --upsert             import new or update existing #{thing}",
      "-I, --inactive           create an inactive #{thing}",
      "-d, --desc=STRING        description of #{thing}",
      "-p, --permission=STRING  give #{thing} this permission",

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

@@ -20,7 +20,7 @@ class WavefrontCommandUser < WavefrontCommandBase
      "invite #{CMN} [-m permission...] [-g group...] <id>",
      "delete #{CMN} <user>...",
      "dump #{CMN}",
-     "import #{CMN} [-u] <file>",
+     "import #{CMN} [-uU] <file>",
      "groups #{CMN} <id>",
      "privileges #{CMN} <id>",
      "join #{CMN} <id> <group>...",
@@ -40,6 +40,7 @@ class WavefrontCommandUser < WavefrontCommandBase
      "-L, --limit=COUNT        number of #{things} to list",
      '-O, --fields=F1,F2,...   only show given fields',
      "-u, --update             update an existing #{thing}",
+     "-U, --upsert             import new or update existing #{thing}",
      "-e, --email              send e-mail to #{thing} on account creation",
      "-m, --permission=STRING  give #{thing} this permission",
      "-g, --group=STRING       add #{thing} to this user group"]

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

@@ -27,7 +27,7 @@ class WavefrontCommandUsergroup < WavefrontCommandBase
      "create #{CMN} [-p permission...] <name>",
      "delete #{CMN} <id>",
      "dump #{CMN}",
-     "import #{CMN} [-u] <file>",
+     "import #{CMN} [-uU] <file>",
      "set #{CMN} <key=value> <id>",
      "users #{CMN} <id>",
      "permissions #{CMN} <id>",
@@ -46,6 +46,7 @@ class WavefrontCommandUsergroup < WavefrontCommandBase
      "-L, --limit=COUNT        number of #{things} to list",
      '-O, --fields=F1,F2,...   only show given fields',
      "-u, --update             update an existing #{thing}",
+     "-U, --upsert             import new or update existing #{thing}",
      '-p, --permission=STRING  Wavefront permission']
   end
 

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

@@ -10,7 +10,7 @@ class WavefrontCommandWebhook < WavefrontCommandBase
      "describe #{CMN} <id>",
      "delete #{CMN} <id>",
      "dump #{CMN}",
-     "import #{CMN} [-u] <file>",
+     "import #{CMN} [-uU] <file>",
      "set #{CMN} <key=value> <id>",
      "search #{CMN} [-al] [-o offset] [-L limit] [-O fields] <condition>..."]
   end
@@ -22,6 +22,7 @@ class WavefrontCommandWebhook < WavefrontCommandBase
      "-o, --offset=n           start list from nth #{thing}",
      '-O, --fields=F1,F2,...   only show given fields',
      "-L, --limit=COUNT        number of #{things} to list",
-     "-u, --update             update an existing #{thing}"]
+     "-u, --update             update an existing #{thing}",
+     "-U, --upsert             import new or update existing #{thing}"]
   end
 end

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

@@ -26,7 +26,7 @@ class WavefrontCommandWindow < WavefrontCommandBase
      "extend #{CMN} (by|to) <time> <id>",
      "delete #{CMN} <id>",
      "dump #{CMN}",
-     "import #{CMN} [-u] <file>",
+     "import #{CMN} [-uU] <file>",
      "set #{CMN} <key=value> <id>",
      "search #{CMN} [-al] [-o offset] [-L limit] [-O fields] <condition>...",
      "ongoing #{CMN}",
@@ -41,6 +41,7 @@ class WavefrontCommandWindow < WavefrontCommandBase
      '-O, --fields=F1,F2,...  only show given fields',
      "-L, --limit=COUNT       number of #{things} to list",
      "-u, --update            update an existing #{thing}",
+     "-U, --upsert             import new or update existing #{thing}",
      "-d, --desc=STRING       reason for #{thing}",
      "-s, --start=TIME        time at which #{thing} begins",
      "-e, --end=TIME          time at which #{thing} ends",

data/lib/wavefront-cli/version.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-WF_CLI_VERSION = '5.0.1'
+WF_CLI_VERSION = '5.1.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wavefront-cli
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.1.0
 platform: ruby
 authors:
 - Robert Fisher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-18 00:00:00.000000000 Z
+date: 2020-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt