sensu-plugins-varnish 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eafe1d0cd64b1b6943a54de896db5e5d2a0a5bd4
-  data.tar.gz: 3f7c677aef159ed669a4598b41851a9d9f3abf2c
+  metadata.gz: e5e0f886fc302904f4fbec469d3d29bb3ede8093
+  data.tar.gz: 2a9a72e264fb432cc0ff878257a784ca2ab015f4
 SHA512:
-  metadata.gz: 0ee4bb0c9f9bc288fe147f611e778f240aa81b137ccdf1a92f97f440f8f0d845017a2cb2c5c12bcf732361eaa63fea6b114df4c737b0054d62e485256b5e70ae
-  data.tar.gz: 4f04863dd2cd80ff2718f6cb439c78974eacc64187f8ed4c6fe7885d33b92ae23838840340dbde2b28f449fc252ff907d18e1aef588b58c52988760b6c76e557
+  metadata.gz: 33b7405d02ff2acd1065f87e449d6bda8a85e3794914b65604e8fc4224cd24230ebef4592dd99c905ff615f01594b5b266183dd633382ee17b3687375682186b
+  data.tar.gz: 62fc22513eb76c53caeff5b61d5e88f1066411ad71ff8c6b34f65ae088f2ef3226244403584661b8379635703f53e6c99a5f5ab0be61af1ecdc3b47cafd7efe0

data/CHANGELOG.md

@@ -1,10 +1,17 @@
-#Change Log
+# Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
 
+## [1.1.0] - 2017-08-01
+### Changed
+- Use full path for varnish scripts to allow sudoers files with explicit binaries to work (@warmfusion)
+
+### Removed
+- Removed legacy Rake code that prevented rubocop running during Ruby 1.9.3 tests (@thomasriley)
+
 ## [1.0.0] - 2017-07-02
 ### Breaking Changes
 - removed ruby 1.9 support (@majormoses)
@@ -41,7 +48,8 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-varnish/compare/1.0.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-varnish/compare/1.1.0...HEAD
+[1.1.0]: https://github.com/sensu-plugins/sensu-plugins-varnish/compare/1.0.0...1.1.0
 [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-varnish/compare/0.1.0...1.0.0
 [0.1.0]: https://github.com/sensu-plugins/sensu-plugins-varnish/compare/0.0.5...0.1.0
 [0.0.5]: https://github.com/sensu-plugins/sensu-plugins-varnish/compare/0.0.4...0.0.5

data/README.md

@@ -14,6 +14,16 @@
 
 ## Usage
 
+These checks need to sudo certain varnish scripts to be able to get status and metrics data.
+To ensure sensu can run these commands, add the following to `/etc/sudoers.d/sensu-varnish` or wherever you
+manage your sudo lists;
+
+```
+# Assuming that your varnish scripts are located in /usr/bin;
+sensu ALL=(ALL) NOPASSWD: /usr/bin/varnishadm /usr/bin/varnishstat
+```
+
+
 ## Installation
 
 [Installation and Setup](http://sensu-plugins.io/docs/installation_instructions.html)

data/bin/check-varnish-status.rb

@@ -76,8 +76,10 @@ class CheckVarnishStatus < Sensu::Plugin::Check::CLI
 
   # Main Function
   def run
-    unknown 'varnishadm is not installed!' unless `which varnishadm 2>/dev/null`.to_s.include? 'varnish'
-    command = `sudo varnishadm -T #{config[:host]}:#{config[:port]} -S #{config[:secret]} -t #{config[:timeout]} #{config[:command]}`
+    # Keep a full reference for the varnish binary so sudo uses a full path
+    varnishadm = `which varnishadm 2>/dev/null`.to_s
+    unknown 'varnishadm is not installed!' unless varnishadm.include? 'varnish'
+    command = `sudo #{varnishadm} -T #{config[:host]}:#{config[:port]} -S #{config[:secret]} -t #{config[:timeout]} #{config[:command]}`
     if config[:command] == 'status'
       if command.include? 'state running'
         ok 'Up & Running'

data/bin/metrics-varnish.rb

@@ -61,6 +61,10 @@ class VarnishMetrics < Sensu::Plugin::Metric::CLI::Graphite
   end
 
   def run
+    # Keep a full reference for the varnish binary so sudo uses a full path
+    varnishstat_command = `which varnishstat 2>/dev/null`.to_s
+    unknown 'varnishstat is not installed!' unless varnishstat_command.include? 'varnish'
+
     begin
       fieldargs = ''
       if config[:fields]
@@ -74,10 +78,11 @@ class VarnishMetrics < Sensu::Plugin::Metric::CLI::Graphite
       end
 
       varnishstat = if config[:varnish_name]
-                      `varnishstat -x -n #{config[:varnish_name]} #{fieldargs}`
+                      `sudo #{varnishstat_command} -x -n #{config[:varnish_name]} #{fieldargs}`
                     else
-                      `varnishstat -x #{fieldargs}`
+                      `sudo #{varnishstat_command} -x #{fieldargs}`
                     end
+
       stats = Crack::XML.parse(varnishstat)
       if stats['varnishstat']['stat']
         stats['varnishstat']['stat'].each do |stat|

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

@@ -1,7 +1,7 @@
 module SensuPluginsVarnish
   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-varnish
 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-07-02 00:00:00.000000000 Z
+date: 2017-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: crack