sensu-plugins-springboot 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 78660b6bf3362072c108d5833b34ab5a88376776
-  data.tar.gz: ffb2081ef012ada80b9ca302af1379dca7f9e133
+SHA256:
+  metadata.gz: 9ca2a212734404edb77929a04af4534ae43c70fc3ea527434a3a38810a47555d
+  data.tar.gz: 1d045425c9cea4ce2baaa2963104597834b6796d4fa2d4519d3cc5e3eb307dc3
 SHA512:
-  metadata.gz: 2162df394c59d47362f4955b0f1becfc88415d8b79b7786de68d0ad15090cbd07c9a04b5d700673e53a2daeaa4a27497d5a713f59309d4b8a768d117aa18efb7
-  data.tar.gz: 06b6b0c0d1abaf0b415ab14a62716655af2483706693e61583398007371e6db39a4fec7001f81bd27cf126e1a0c57c8e171c3954781ff0828b4e5a657204c6bf
+  metadata.gz: 68d890f176f2bbafa86eb43d9a3fbf13e2d3393a8cb30dee3c4f265d3e2bf97b4359e6a6ad39a90c527124fdf02cdb4abbb5e218b2729fdc6150e1482b787056
+  data.tar.gz: 30cbe0c4c0bdfbf40fc55ee4344124b58068024711e9c2a2dfac28a2cb48c6d1bc0980e4af30c224017b2a3003c4e11c4e7a50c64758a280feb3dfcb275e66c2

data/CHANGELOG.md

@@ -1,10 +1,21 @@
 # Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
+This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins/community/blob/master/HOW_WE_CHANGELOG.md)
 
 ## [Unreleased]
 
+## [1.1.0] - 2018-01-24
+### Added
+- metrics-springboot.rb: new option `--protocol` to allow specifying https connection for requests  (@seanrobb)
+- metrics-springboot.rb: new option `--url` to be used as a single parameter instead of specifying `--protocol`, `--host`, `--port`, and `--path` (@seanrobb)
+
+### Changed
+- updated changelog guidelines location (@majormoses)
+
+### Fixed
+- spelling in PR template (@majormoses)
+
 ## [1.0.0] - 2017-06-25
 ### Added
 - Support for Ruby 2.3 and 2.4 (@eheydrick)
@@ -32,6 +43,7 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 - initial release
 
 [Unreleased]: https://github.com/sensu-plugins/sensu-plugins-springboot/compare/1.0.0...HEAD
+[1.1.0]: https://github.com/sensu-plugins/sensu-plugins-springboot/compare/1.0.0...1.1.0
 [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-springboot/compare/0.0.3...1.0.0
 [0.0.3]: https://github.com/sensu-plugins/sensu-plugins-springboot/compare/0.0.2...0.0.3
 [0.0.2]: https://github.com/sensu-plugins/sensu-plugins-springboot/compare/0.0.1...0.0.2

data/bin/metrics-springboot.rb

@@ -27,6 +27,11 @@
 #     springboot-metrics.rb --host=192.168.1.1 &
 #       --port=8081 &
 #       --username=admin --password=secret --path=/metrics
+#   Use with insecure SSL:
+#     springboot-metrics.rb --host=192.168.1.1 &
+#       --port=443 &
+#       --username=admin --password=secret &
+#       --path=/metrics --insecure --protocol http
 #
 # NOTES:
 #   Check with Spring Boot 1.2.0 actuator endpoints
@@ -44,20 +49,47 @@ require 'json'
 require 'uri'
 
 class SpringBootMetrics < Sensu::Plugin::Metric::CLI::Graphite
+  option :url,
+         short: '-u URL',
+         long: '--url URL',
+         description: 'The url for your app metrics',
+         required: false
+
   option :host,
          short: '-h HOST',
          long: '--host HOST',
          description: 'Your spring boot actuator endpoint',
-         required: true,
+         required: false,
          default: 'localhost'
 
   option :port,
          short: '-P PORT',
          long: '--port PORT',
          description: 'Your app port',
-         required: true,
+         required: false,
          default: 8080
 
+  option :path,
+         short: '-e PATH',
+         long: '--path PATH',
+         description: 'Metrics endpoint path',
+         required: false,
+         default: '/metrics'
+
+  option :protocol,
+         short: '-l PROTO',
+         long: '--protocol PROTO',
+         description: 'The protocol used to make requests',
+         in:  %w(http https),
+         default: 'http'
+
+  option :insecure,
+         short: '-k',
+         long: '--insecure',
+         description: 'Insecure SSL Certificate',
+         boolean: true,
+         default: false
+
   option :username,
          short: '-u USERNAME',
          long: '--username USERNAME',
@@ -70,13 +102,6 @@ class SpringBootMetrics < Sensu::Plugin::Metric::CLI::Graphite
          description: 'Your app password',
          required: false
 
-  option :path,
-         short: '-e PATH',
-         long: '--path PATH',
-         description: 'Metrics endpoint path',
-         required: true,
-         default: '/metrics'
-
   option :scheme,
          description: 'Metric naming scheme, text to prepend to metric',
          short: '-s SCHEME',
@@ -106,12 +131,17 @@ class SpringBootMetrics < Sensu::Plugin::Metric::CLI::Graphite
   end
 
   def run
-    endpoint = "http://#{config[:host]}:#{config[:port]}"
-    url      = URI.parse(endpoint)
+    unless config[:url]
+      config[:url] = "#{config[:protocol]}://#{config[:host]}:#{config[:port]}#{config[:path]}"
+    end
+
+    uri = URI.parse(config[:url])
+
+    verify_mode = config[:insecure] ? OpenSSL::SSL::VERIFY_NONE : OpenSSL::SSL::VERIFY_PEER
 
     begin
-      res = Net::HTTP.start(url.host, url.port) do |http|
-        req = Net::HTTP::Get.new(config[:path])
+      res = Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https', verify_mode: verify_mode) do |http|
+        req = Net::HTTP::Get.new(uri.path)
         if config[:username] && config[:password]
           req.basic_auth(config[:username], config[:password])
         end

data/lib/sensu-plugins-springboot/version.rb

@@ -1,7 +1,7 @@
 module SensuPluginsSpringboot
   module Version
     MAJOR = 1
-    MINOR = 0
+    MINOR = 1
     PATCH = 0
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-springboot
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-26 00:00:00.000000000 Z
+date: 2018-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -52,6 +52,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  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: rdoc
+  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: byebug
+  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: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -189,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for Springboot