sensu-plugins-graylog 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: da4694237b3238a129ced488fbff3d1c436517c9
-  data.tar.gz: cf04b79263c1e08b0523f7ff4517f325df14245f
+SHA256:
+  metadata.gz: f1ef17b6895951710792467ad9d98343ae6ad08b693f3b18261a29a20e1b5c01
+  data.tar.gz: 7421c04082c3971bb740b45af4f2081c83c9dd5a48270f4da7c3b93f92533a9a
 SHA512:
-  metadata.gz: 89ac214d73ffd88c1567b36ae53170a146ad79175cc98fa4b977c48c7e2fdc58595aa6d1b3fbf06b90b489b0c7d7da0597ae2d38b10a32c8d2cb7e20797a6384
-  data.tar.gz: 4a73a7e2a90208990037136b3c1e3a8c89299a2d7cfdd935bf225f5027e7cc38af8b70551af87d1962fee863ad49ea491b4227b0aa7c1989d703b1065cc21d6a
+  metadata.gz: 14f63394c4ba8f7df73c026a0492bae39a018299e5df17650ac81b4065ea802b2f7b598c667def64d53a07477f2a7eb05e4abb11f3e144334eda3ea69862c226
+  data.tar.gz: f3944ac86f28dd9ae3c1bb7456b3fabb8d0455a07c2cde81309c56016ace034069f9ab8b2399405e4d43d623752a82a8d890c6f37d8934dde2dc86a0539fcb42

data/CHANGELOG.md

@@ -1,11 +1,19 @@
 # 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.2.0] 2017-07-13
+## [1.3.0] - 2018-02-16
+### Added
+- Add `protocol` option to all scripts which can be passed as an argument to specify which protocol to use (@jothoma1)
+- added `insecure` option to make SSL connections even when the CA certificate is not verified. Defaults to use secure connections only (@majormoses)
+
+### Changed
+- updated Changelog locations guideline (@majormoses)
+
+## [1.2.0] - 2017-07-13
 ### Added
 - Ruby 2.4.1 testing
 
@@ -57,7 +65,8 @@ in your environment is encouraged.
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-graylog/compare/1.2.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-graylog/compare/1.3.0...HEAD
+[1.3.0]: https://github.com/sensu-plugins/sensu-plugins-graylog/compare/1.2.0...1.3.0
 [1.2.0]: https://github.com/sensu-plugins/sensu-plugins-graylog/compare/1.1.0...1.2.0
 [1.1.0]: https://github.com/sensu-plugins/sensu-plugins-graylog/compare/1.0.0...1.1.0
 [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-graylog/compare/0.1.0...1.0.0

data/bin/check-graylog-buffers.rb

@@ -37,6 +37,18 @@ require 'json'
 require 'rest-client'
 
 class CheckGraylogBuffers < Sensu::Plugin::Check::CLI
+  option :protocol,
+         description: 'Protocol for connecting to Graylog',
+         long: '--protocol PROTOCOL',
+         default: 'http'
+
+  option :insecure,
+         description: 'Use insecure connections by not verifying SSL certs',
+         short: '-k',
+         long: '--insecure',
+         boolean: true,
+         default: false
+
   option :host,
          description: 'Graylog host',
          short: '-h',
@@ -87,12 +99,18 @@ class CheckGraylogBuffers < Sensu::Plugin::Check::CLI
     else
       check_210_buffers
     end
-  rescue => e
+  rescue StandardError => e
     unknown e.message
   end
 
   def call_api(path, postdata = nil)
-    resource = RestClient::Resource.new "http://#{config[:host]}:#{config[:port]}#{config[:apipath]}#{path}", config[:username], config[:password]
+    resource = RestClient::Resource.new(
+      "#{config[:protocol]}://#{config[:host]}:#{config[:port]}#{config[:apipath]}#{path}",
+      user: config[:username],
+      password: config[:password],
+      verify_ssl: !config[:insecure]
+    )
+
     if !postdata
       JSON.parse(resource.get)
     else

data/bin/check-graylog-streams.rb

@@ -26,6 +26,19 @@ require 'rest-client'
 require 'json'
 
 class CheckGraylogStreams < Sensu::Plugin::Check::CLI
+  option :protocol,
+         description: 'Protocol for connecting to Graylog',
+         long: '--protocol PROTOCOL',
+         default: 'http',
+         in: %w(http https)
+
+  option :insecure,
+         description: 'Use insecure connections by not verifying SSL certs',
+         short: '-k',
+         long: '--insecure',
+         boolean: true,
+         default: false
+
   option :username,
          short:       '-u',
          long:        '--username USERNAME',
@@ -58,9 +71,10 @@ class CheckGraylogStreams < Sensu::Plugin::Check::CLI
 
   def graylog_streams
     resource = RestClient::Resource.new(
-      "http://#{config[:host]}:#{config[:port]}#{config[:apipath]}/streams",
+      "#{config[:protocol]}://#{config[:host]}:#{config[:port]}#{config[:apipath]}/streams",
       user: config[:username],
       password: config[:password],
+      verify_ssl: !config[:insecure],
       timeout: 10
     )
     JSON.parse(resource.get, symbolize_names: true)

data/bin/check-graylog2-alive.rb

@@ -37,6 +37,19 @@ require 'json'
 require 'rest-client'
 
 class CheckGraylog2Alive < Sensu::Plugin::Check::CLI
+  option :protocol,
+         description: 'Protocol for connecting to Graylog',
+         long: '--protocol PROTOCOL',
+         default: 'http',
+         in: %w(http https)
+
+  option :insecure,
+         description: 'Use insecure connections by not verifying SSL certs',
+         short: '-k',
+         long: '--insecure',
+         boolean: true,
+         default: false
+
   option :host,
          description: 'Graylog2 host',
          short: '-h',
@@ -81,6 +94,7 @@ class CheckGraylog2Alive < Sensu::Plugin::Check::CLI
   end
 
   def vhost_alive?
+    protocol = config[:protocol]
     host     = config[:host]
     port     = config[:port]
     username = config[:username]
@@ -90,7 +104,12 @@ class CheckGraylog2Alive < Sensu::Plugin::Check::CLI
     lifecycle_ok = ['override lb:alive', 'running']
 
     begin
-      resource = RestClient::Resource.new "http://#{host}:#{port}#{apipath}/system", username, password
+      resource = RestClient::Resource.new(
+        "#{protocol}://#{host}:#{port}#{apipath}/system",
+        user: username,
+        password: password,
+        verify_ssl: !config[:insecure]
+      )
       # Attempt to parse response (just to trigger parse exception)
       response = JSON.parse(resource.get)
       status_text = "#{response['lifecycle']}/#{response['is_processing']}/#{response['lb_status']}"

data/bin/metrics-graylog.rb

@@ -38,6 +38,19 @@ require 'json'
 require 'rest-client'
 
 class MetricsGraylog < Sensu::Plugin::Metric::CLI::Graphite
+  option :protocol,
+         description: 'Protocol for connecting to Graylog',
+         long: '--protocol PROTOCOL',
+         default: 'http',
+         in: %w(http https)
+
+  option :insecure,
+         description: 'Use insecure connections by not verifying SSL certs',
+         short: '-k',
+         long: '--insecure',
+         boolean: true,
+         default: false
+
   option :host,
          description: 'Graylog host',
          short: '-h',
@@ -88,12 +101,17 @@ class MetricsGraylog < Sensu::Plugin::Metric::CLI::Graphite
       original_output
     end
     ok
-  rescue => e
+  rescue StandardError => e
     unknown e.message
   end
 
   def acquire_stats
-    resource = RestClient::Resource.new "http://#{config[:host]}:#{config[:port]}#{config[:apipath]}/system/metrics", config[:username], config[:password]
+    resource = RestClient::Resource.new(
+      "#{config[:protocol]}://#{config[:host]}:#{config[:port]}#{config[:apipath]}/system/metrics",
+      user: config[:username],
+      password: config[:password],
+      verify_ssl: !config[:insecure]
+    )
     JSON.parse(resource.get)
   rescue Errno::ECONNREFUSED => e
     critical e.message

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-graylog
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-13 00:00:00.000000000 Z
+date: 2018-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -225,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for graylog