wavefront-cli 2.4.0 → 2.5.0

data/spec/wavefront-cli/commands/alert_spec.rb

@@ -4,7 +4,7 @@ require 'pathname'
 require_relative(File.join('../../../lib/wavefront-cli/commands',
                            Pathname.new(__FILE__).basename
                            .to_s.sub('_spec.rb', '')))
-require_relative './base_spec'
+require_relative 'base_spec'
 
 # Test Alert commands and options
 #

data/spec/wavefront-cli/commands/base_spec.rb

@@ -4,7 +4,7 @@ require 'pathname'
 require_relative(File.join('../../../lib/wavefront-cli/commands',
                            Pathname.new(__FILE__).basename
                            .to_s.sub('_spec.rb', '')))
-require_relative './spec_helper'
+require_relative 'spec_helper'
 
 # Test base class for commands
 #

data/spec/wavefront-cli/commands/cloudintegration_spec.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require_relative('../../../lib/wavefront-cli/commands/cloudintegration')
-require_relative './base_spec'
+require_relative 'base_spec'
 
 # Test Cloud Integration commands and options
 #

data/spec/wavefront-cli/commands/dashboard_spec.rb

@@ -4,7 +4,7 @@ require 'pathname'
 require_relative(File.join('../../../lib/wavefront-cli/commands',
                            Pathname.new(__FILE__).basename
                            .to_s.sub('_spec.rb', '')))
-require_relative './base_spec'
+require_relative 'base_spec'
 
 # Test Dashboard commands and options
 #

data/spec/wavefront-cli/commands/derivedmetric_spec.rb

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+require 'pathname'
+require_relative(File.join('../../../lib/wavefront-cli/commands',
+                           Pathname.new(__FILE__).basename
+                           .to_s.sub('_spec.rb', '')))
+require_relative 'base_spec'
+
+# Test derived metric commands and options
+#
+class WavefrontCommmandDerivedMetricTest < WavefrontCommmandBaseTest
+  def setup
+    @wf = WavefrontCommandDerivedmetric.new
+    @col_width = 22
+  end
+end

data/spec/wavefront-cli/commands/event_spec.rb

@@ -4,7 +4,7 @@ require 'pathname'
 require_relative(File.join('../../../lib/wavefront-cli/commands',
                            Pathname.new(__FILE__).basename
                            .to_s.sub('_spec.rb', '')))
-require_relative './base_spec'
+require_relative 'base_spec'
 
 # Test Event commands and options
 #

data/spec/wavefront-cli/commands/link_spec.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require_relative('../../../lib/wavefront-cli/commands/link')
-require_relative './base_spec'
+require_relative 'base_spec'
 
 # Test External Link commands and options
 #

data/spec/wavefront-cli/commands/message_spec.rb

@@ -4,7 +4,7 @@ require 'pathname'
 require_relative(File.join('../../../lib/wavefront-cli/commands',
                            Pathname.new(__FILE__).basename
                            .to_s.sub('_spec.rb', '')))
-require_relative './base_spec'
+require_relative 'base_spec'
 
 # Test Message commands and options
 #

data/spec/wavefront-cli/commands/metric_spec.rb

@@ -4,7 +4,7 @@ require 'pathname'
 require_relative(File.join('../../../lib/wavefront-cli/commands',
                            Pathname.new(__FILE__).basename
                            .to_s.sub('_spec.rb', '')))
-require_relative './base_spec'
+require_relative 'base_spec'
 
 # Test Metric commands and options
 #

data/spec/wavefront-cli/commands/proxy_spec.rb

@@ -4,7 +4,7 @@ require 'pathname'
 require_relative(File.join('../../../lib/wavefront-cli/commands',
                            Pathname.new(__FILE__).basename
                            .to_s.sub('_spec.rb', '')))
-require_relative './base_spec'
+require_relative 'base_spec'
 
 # Test Proxy commands and options
 #

data/spec/wavefront-cli/commands/query_spec.rb

@@ -4,7 +4,7 @@ require 'pathname'
 require_relative(File.join('../../../lib/wavefront-cli/commands',
                            Pathname.new(__FILE__).basename
                            .to_s.sub('_spec.rb', '')))
-require_relative './base_spec'
+require_relative 'base_spec'
 
 # Test Query commands and options
 #

data/spec/wavefront-cli/commands/webhook_spec.rb

@@ -4,7 +4,7 @@ require 'pathname'
 require_relative(File.join('../../../lib/wavefront-cli/commands',
                            Pathname.new(__FILE__).basename
                            .to_s.sub('_spec.rb', '')))
-require_relative './base_spec'
+require_relative 'base_spec'
 
 # Test Webhook commands and options
 #

data/spec/wavefront-cli/commands/window_spec.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require_relative('../../../lib/wavefront-cli/commands/window')
-require_relative './base_spec'
+require_relative 'base_spec'
 
 # Test Maintenance Window commands and options
 #

data/spec/wavefront-cli/commands/write_spec.rb

@@ -4,7 +4,7 @@ require 'pathname'
 require_relative(File.join('../../../lib/wavefront-cli/commands',
                            Pathname.new(__FILE__).basename
                            .to_s.sub('_spec.rb', '')))
-require_relative './base_spec'
+require_relative 'base_spec'
 
 # Test Write commands and options
 #

data/spec/wavefront-cli/derivedmetric_spec.rb

@@ -0,0 +1,79 @@
+#!/usr/bin/env ruby
+
+word = 'derivedmetric'
+
+require_relative '../spec_helper'
+require_relative "../../lib/wavefront-cli/#{word}"
+
+id     = '1529938767979'
+bad_id = '>_<'
+
+k = WavefrontCli::DerivedMetric
+
+describe "#{word} command" do
+  missing_creds(word, ['list', "describe #{id}", "delete #{id}",
+                       "undelete #{id}", "history #{id}"])
+  list_tests(word, nil, k)
+  cmd_to_call(word, "describe #{id}", { path: "/api/v2/#{word}/#{id}" }, k)
+  cmd_to_call(word, "describe -v 7 #{id}",
+              { path: "/api/v2/#{word}/#{id}/history/7" }, k)
+  cmd_to_call(word, "history #{id}",
+              { path: "/api/v2/#{word}/#{id}/history" }, k)
+
+  it 'deletes with a check on inTrash' do
+    stub_request(:get,
+                 "https://other.wavefront.com/api/v2/#{word}/#{id}")
+      .with(headers: { 'Accept': '*/*',
+                       'Accept-Encoding':
+                          'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+                       'Authorization': 'Bearer 0123456789-ABCDEF',
+                       'User-Agent': /wavefront.*/ })
+      .to_return(status: 200, body: '', headers: {})
+    cmd_to_call(word, "delete #{id}",
+                {  method: :delete, path: "/api/v2/#{word}/#{id}" }, k)
+  end
+
+  cmd_to_call(word, "search id=#{id}",
+              { method: :post, path: "/api/v2/search/#{word}",
+                body:   { limit: 10,
+                          offset: 0,
+                          query: [{ key: 'id',
+                                    value: id,
+                                    matchingMethod: 'EXACT' }],
+                          sort: { field: 'id', ascending: true } },
+                headers: JSON_POST_HEADERS }, k)
+
+  cmd_to_call(word, "undelete #{id}",
+              { method: :post, path: "/api/v2/#{word}/#{id}/undelete" }, k)
+  invalid_ids(word, ["describe #{bad_id}", "delete #{bad_id}",
+                     "undelete #{bad_id}"])
+  tag_tests(word, id, bad_id, nil, k)
+
+  cmd_to_call(word, 'create test_dm ts(series)',
+              { method: :post, path: '/api/v2/derivedmetric',
+                body: { minutes:                5,
+                        name:                   'test_dm',
+                        includeObsoleteMetrics: false,
+                        processRateMinutes:     1,
+                        query:                  'ts(series)' },
+                headers: JSON_POST_HEADERS }, k)
+
+  cmd_to_call(word, 'create -i 3 -r 7 -O test_dm ts(series)',
+              { method: :post, path: '/api/v2/derivedmetric',
+                body: { minutes:                7,
+                        name:                   'test_dm',
+                        includeObsoleteMetrics: true,
+                        processRateMinutes:     3,
+                        query:                  'ts(series)' },
+                headers: JSON_POST_HEADERS }, k)
+
+  cmd_to_call(word, 'create -i 3 -T tag1 -T tag2 test_dm ts(series)',
+              { method: :post, path: '/api/v2/derivedmetric',
+                body: { minutes:                5,
+                        name:                   'test_dm',
+                        includeObsoleteMetrics: false,
+                        processRateMinutes:     3,
+                        tags:                   ['tag1', 'tag2'],
+                        query:                  'ts(series)' },
+                headers: JSON_POST_HEADERS }, k)
+end

data/spec/wavefront-cli/display/base_spec.rb

@@ -6,7 +6,7 @@ require 'pathname'
 require_relative(File.join('../../../lib/wavefront-cli/display',
                            Pathname.new(__FILE__).basename
                            .to_s.sub('_spec.rb', '')))
-require_relative './spec_helper'
+require_relative 'spec_helper'
 
 S_DATA = Map.new
 S_OPTIONS = { '<id>': 'abc123' }.freeze

data/spec/wavefront-cli/string_spec.rb

@@ -28,7 +28,7 @@ class StringTest < MiniTest::Test
     pad = "\n" + ' ' * 12
     assert_equal("  -o, --option PARAMETER a#{pad}rather pointless" \
                  "#{pad}option with a#{pad}needlessly wordy#{pad}" \
-                 "description#{pad}string\n",str.opt_fold(30, 10))
+                 "description#{pad}string\n", str.opt_fold(30, 10))
   end
 
   def test_fold_options

data/wavefront-cli.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = %w(lib)
 
   gem.add_dependency 'docopt', '~> 0.6.0'
-  gem.add_runtime_dependency 'wavefront-sdk', '~> 1.4', '>= 1.4.0'
+  gem.add_runtime_dependency 'wavefront-sdk', '~> 1.5', '>= 1.5.0'
 
   gem.add_development_dependency 'bundler', '~> 1.3'
   gem.add_development_dependency 'rake', '~> 12.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wavefront-cli
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Robert Fisher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-10 00:00:00.000000000 Z
+date: 2018-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -30,20 +30,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -157,9 +157,11 @@ extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
+- HISTORY.md
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -172,6 +174,7 @@ files:
 - lib/wavefront-cli/commands/base.rb
 - lib/wavefront-cli/commands/cloudintegration.rb
 - lib/wavefront-cli/commands/dashboard.rb
+- lib/wavefront-cli/commands/derivedmetric.rb
 - lib/wavefront-cli/commands/event.rb
 - lib/wavefront-cli/commands/integration.rb
 - lib/wavefront-cli/commands/link.rb
@@ -190,10 +193,12 @@ files:
 - lib/wavefront-cli/constants.rb
 - lib/wavefront-cli/controller.rb
 - lib/wavefront-cli/dashboard.rb
+- lib/wavefront-cli/derivedmetric.rb
 - lib/wavefront-cli/display/alert.rb
 - lib/wavefront-cli/display/base.rb
 - lib/wavefront-cli/display/cloudintegration.rb
 - lib/wavefront-cli/display/dashboard.rb
+- lib/wavefront-cli/display/derivedmetric.rb
 - lib/wavefront-cli/display/event.rb
 - lib/wavefront-cli/display/externallink.rb
 - lib/wavefront-cli/display/integration.rb
@@ -203,6 +208,7 @@ files:
 - lib/wavefront-cli/display/notificant.rb
 - lib/wavefront-cli/display/printer/base.rb
 - lib/wavefront-cli/display/printer/long.rb
+- lib/wavefront-cli/display/printer/sparkline.rb
 - lib/wavefront-cli/display/printer/terse.rb
 - lib/wavefront-cli/display/proxy.rb
 - lib/wavefront-cli/display/query.rb
@@ -229,7 +235,6 @@ files:
 - lib/wavefront-cli/output/hcl/notificant.rb
 - lib/wavefront-cli/output/json.rb
 - lib/wavefront-cli/output/ruby.rb
-- lib/wavefront-cli/output/wavefront.tf
 - lib/wavefront-cli/output/yaml.rb
 - lib/wavefront-cli/proxy.rb
 - lib/wavefront-cli/query.rb
@@ -250,6 +255,7 @@ files:
 - spec/wavefront-cli/commands/base_spec.rb
 - spec/wavefront-cli/commands/cloudintegration_spec.rb
 - spec/wavefront-cli/commands/dashboard_spec.rb
+- spec/wavefront-cli/commands/derivedmetric_spec.rb
 - spec/wavefront-cli/commands/event_spec.rb
 - spec/wavefront-cli/commands/link_spec.rb
 - spec/wavefront-cli/commands/message_spec.rb
@@ -262,6 +268,7 @@ files:
 - spec/wavefront-cli/commands/write_spec.rb
 - spec/wavefront-cli/controller_spec.rb
 - spec/wavefront-cli/dashboard_spec.rb
+- spec/wavefront-cli/derivedmetric_spec.rb
 - spec/wavefront-cli/display/base_spec.rb
 - spec/wavefront-cli/display/printer/base_spec.rb
 - spec/wavefront-cli/display/printer/long_spec.rb
@@ -303,7 +310,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: CLI for Wavefront API v2
@@ -317,6 +324,7 @@ test_files:
 - spec/wavefront-cli/commands/base_spec.rb
 - spec/wavefront-cli/commands/cloudintegration_spec.rb
 - spec/wavefront-cli/commands/dashboard_spec.rb
+- spec/wavefront-cli/commands/derivedmetric_spec.rb
 - spec/wavefront-cli/commands/event_spec.rb
 - spec/wavefront-cli/commands/link_spec.rb
 - spec/wavefront-cli/commands/message_spec.rb
@@ -329,6 +337,7 @@ test_files:
 - spec/wavefront-cli/commands/write_spec.rb
 - spec/wavefront-cli/controller_spec.rb
 - spec/wavefront-cli/dashboard_spec.rb
+- spec/wavefront-cli/derivedmetric_spec.rb
 - spec/wavefront-cli/display/base_spec.rb
 - spec/wavefront-cli/display/printer/base_spec.rb
 - spec/wavefront-cli/display/printer/long_spec.rb

data/lib/wavefront-cli/output/wavefront.tf

@@ -1,257 +0,0 @@
-MERP MERP
-resource "wavefront_dashboard" "9f8d3f29-d965-4f7e-8473-43571e431b99" {
-  name = "JPC Website Host"
-  description = "overview of SmartOS zones"
-  url = "jpc-webhost"
-  section = [
-    { name = "Memory"
-      row = [
-        { chart = [
-          {
-            units = "B"
-            name = "Swap Free"
-            description = "Remember, on Solaris, \"swap\" means backing store, so this is all memory."
-            source = [
-          {
-            scatter_plot_source = "Y"
-            query_builder_enabled = false
-            source_description = ""
-            name = "New Query"
-            query = "ts(\"tenant.swapresv.value\", env=${env}) - ts(\"tenant.swapresv.usage\", env=${env})"
-          }]
-          },
-          {
-            units = ""
-            name = "Free Physical Memory"
-            source = [
-          {
-            scatter_plot_source = "Y"
-            query_builder_enabled = false
-            source_description = ""
-            name = "physical memory"
-            query = "ts(\"tenant.physicalmem.value\", env=${env}) - ts(\"tenant.physicalmem.usage\", env=${env})"
-          },
-          {
-            scatter_plot_source = "Y"
-            query_builder_enabled = true
-            source_description = ""
-            name = "out of memory"
-            query = "0"
-          }]
-          },
-          {
-            units = ""
-            name = "times over memory"
-            source = [
-          {
-            scatter_plot_source = "Y"
-            query_builder_enabled = false
-            source_description = ""
-            name = "times over memory"
-            query = "deriv(ts(\"tenant.memory_cap.nover\", env=${env}))"
-          }]
-          }]
-        },
-        { chart = [
-          {
-            units = "B"
-            name = "Sinatra application memory"
-            source = [
-          {
-            scatter_plot_source = "Y"
-            query_builder_enabled = false
-            source_description = ""
-            name = "New Query"
-            query = "sum(ts(\"process.memory.pr_rssize.*\", svc=\"svc:/application/sinatra/*\" and env=${env}), svc)"
-          }]
-          },
-          {
-            units = ""
-            name = "top memory consumers"
-            source = [
-          {
-            scatter_plot_source = "Y"
-            query_builder_enabled = false
-            source_description = ""
-            name = "by process name"
-            query = "sum(ts(\"process.memory.pr_rssize.*\", env=${env}), metrics)"
-          }]
-          }]
-        }]
-    },
-    { name = "nginx"
-      row = [
-        { chart = [
-          {
-            units = "req/s"
-            name = "\"200\" HTTP requests"
-            source = [
-          {
-            scatter_plot_source = "Y"
-            query_builder_enabled = false
-            source_description = ""
-            name = "Query"
-            query = "rate(ts(\"nginx.code.200\"))"
-          }]
-          },
-          {
-            units = "ms"
-            name = "request latency"
-            source = [
-          {
-            scatter_plot_source = "Y"
-            query_builder_enabled = false
-            source_description = ""
-            name = "total response time"
-            query = "ts(\"nginx.time.response.*\")"
-          },
-          {
-            scatter_plot_source = "Y"
-            query_builder_enabled = false
-            source_description = ""
-            name = "upstream response time"
-            query = "ts(\"nginx.time.upstream_response.*\")"
-          }]
-          },
-          {
-            units = "req/s"
-            name = "HTTP Errors"
-            source = [
-          {
-            scatter_plot_source = "Y"
-            query_builder_enabled = false
-            source_description = ""
-            name = "40x"
-            query = "ceil(rate(ts(\"nginx.code.4*\")))"
-          },
-          {
-            scatter_plot_source = "Y"
-            query_builder_enabled = false
-            source_description = ""
-            name = "50x"
-            query = "ceil(rate(ts(\"nginx.code.5*\")))"
-          }]
-          }]
-        }]
-    },
-    { name = "Processes and Services"
-      row = [
-        { chart = [
-          {
-            units = "processes"
-            name = "processes"
-            description = "number active processes in zone"
-            source = [
-          {
-            scatter_plot_source = "Y"
-            query_builder_enabled = true
-            source_description = ""
-            name = "running processes"
-            query = "ts(\"tenant.nprocs.usage\", env=${env})"
-          }]
-          },
-          {
-            units = "services"
-            name = "Service States"
-            description = "count of services in each possible state. Disabled service are not shown,"
-            source = [
-          {
-            scatter_plot_source = "Y"
-            query_builder_enabled = false
-            source_description = ""
-            name = "New Query"
-            query = "ts(\"smf.svcs.*\", env=${env})"
-          }]
-          }]
-        }]
-    },
-    { name = "Network"
-      row = [
-        { chart = [
-          {
-            units = "bytes"
-            name = "Network In"
-            source = [
-          {
-            scatter_plot_source = "Y"
-            query_builder_enabled = false
-            source_description = ""
-            name = "New Query"
-            query = "deriv(ts(\"network.*.net0.rbytes64\", env=${env}))"
-          }]
-          },
-          {
-            units = "bytes"
-            name = "Network Out"
-            source = [
-          {
-            scatter_plot_source = "Y"
-            query_builder_enabled = false
-            source_description = ""
-            name = "network out"
-            query = "deriv(ts(\"network.*.net0.obytes64\", env=${env}))"
-          }]
-          }]
-        },
-        { chart = [
-          {
-            units = "s"
-            name = "Puppet Run Time"
-            source = [
-          {
-            scatter_plot_source = "Y"
-            query_builder_enabled = false
-            source_description = ""
-            name = "time"
-            query = "ts(\"puppet.time.*\", env=${env})"
-          }]
-          },
-          {
-            units = "Units"
-            name = "Puppet Changes"
-            description = ""
-            source = [
-          {
-            scatter_plot_source = "Y"
-            query_builder_enabled = false
-            source_description = ""
-            name = "New Query"
-            query = "ts(\"puppet.changes.total\")"
-          }]
-          }]
-        }]
-    },
-    { name = "Page Impressions"
-      row = [
-        { chart = [
-          {
-            units = ""
-            name = "Most read posts"
-            source = [
-          {
-            scatter_plot_source = "Y"
-            query_builder_enabled = false
-            source_description = ""
-            name = "Query"
-            query = "sum(ts(\"nginx.code.200\", vhost=sysdef.xyz and path=\"/post/*\"), pointTags)"
-          }]
-          }]
-        },
-        { chart = [
-          {
-            units = ""
-            name = "most viewed pieces"
-            description = ""
-            source = [
-          {
-            scatter_plot_source = "Y"
-            query_builder_enabled = false
-            source_description = ""
-            name = "Query"
-            query = "sum(ts(\"nginx.code.200\", vhost=\"rdfisher.co.uk\" and path=\"/piece/*\"), pointTags)"
-          }]
-          }]
-        }]
-    }]
-  tags = []
-}