Use strict Base64 encoding to fix base64 encoding/netty issue (#59)

* Update check-es-node-status.rb * Update check-es-circuit-breakers.rb * Update check-es-cluster-status.rb * Update metrics-es-node.rb * Update check-es-heap.rb * Update check-es-file-descriptors.rb * Update metrics-es-cluster.rb * Update metrics-es-node-graphite.rb * Update CHANGELOG.md * Update CHANGELOG.md * Update CHANGELOG.md
sensu-plugins · May 8, 2017 · 12f1808 · 12f1808
1 parent f736c05
commit 12f1808
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
+### Fixed
+- Use strict Base64 encoding to fix base64 encoding/netty issue (@msblum)
+
 ## [1.2.0] - 2017-05-03
 ### Fixed
 - metrics-es-cluster.rb: Check to see if cluster key exists in transient_settings before trying to use it. (@RAR)

diff --git a/bin/check-es-circuit-breakers.rb b/bin/check-es-circuit-breakers.rb
@@ -79,7 +79,7 @@ class ESCircuitBreaker < Sensu::Plugin::Check::CLI
   def get_es_resource(resource)
     headers = {}
     if config[:user] && config[:password]
-      auth = 'Basic ' + Base64.encode64("#{config[:user]}:#{config[:password]}").chomp
+      auth = 'Basic ' + Base64.strict_encode64("#{config[:user]}:#{config[:password]}").chomp
       headers = { 'Authorization' => auth }
     end
 

diff --git a/bin/check-es-cluster-status.rb b/bin/check-es-cluster-status.rb
@@ -86,7 +86,7 @@ class ESClusterStatus < Sensu::Plugin::Check::CLI
   def get_es_resource(resource)
     headers = {}
     if config[:user] && config[:password]
-      auth = 'Basic ' + Base64.encode64("#{config[:user]}:#{config[:password]}").chomp
+      auth = 'Basic ' + Base64.strict_encode64("#{config[:user]}:#{config[:password]}").chomp
       headers = { 'Authorization' => auth }
     end
 

diff --git a/bin/check-es-file-descriptors.rb b/bin/check-es-file-descriptors.rb
@@ -85,7 +85,7 @@ class ESFileDescriptors < Sensu::Plugin::Check::CLI
   def get_es_resource(resource)
     headers = {}
     if config[:user] && config[:password]
-      auth = 'Basic ' + Base64.encode64("#{config[:user]}:#{config[:password]}").chomp
+      auth = 'Basic ' + Base64.strict_encode64("#{config[:user]}:#{config[:password]}").chomp
       headers = { 'Authorization' => auth }
     end
 

diff --git a/bin/check-es-heap.rb b/bin/check-es-heap.rb
@@ -98,7 +98,7 @@ def acquire_es_version
   def acquire_es_resource(resource)
     headers = {}
     if config[:user] && config[:password]
-      auth = 'Basic ' + Base64.encode64("#{config[:user]}:#{config[:password]}").chomp
+      auth = 'Basic ' + Base64.strict_encode64("#{config[:user]}:#{config[:password]}").chomp
       headers = { 'Authorization' => auth }
     end
 

diff --git a/bin/check-es-node-status.rb b/bin/check-es-node-status.rb
@@ -71,7 +71,7 @@ class ESNodeStatus < Sensu::Plugin::Check::CLI
   def get_es_resource(resource)
     headers = {}
     if config[:user] && config[:password]
-      auth = 'Basic ' + Base64.encode64("#{config[:user]}:#{config[:password]}").chomp
+      auth = 'Basic ' + Base64.strict_encode64("#{config[:user]}:#{config[:password]}").chomp
       headers = { 'Authorization' => auth }
     end
 

diff --git a/bin/metrics-es-cluster.rb b/bin/metrics-es-cluster.rb
@@ -98,7 +98,7 @@ def acquire_es_version
   def get_es_resource(resource)
     headers = {}
     if config[:user] && config[:password]
-      auth = 'Basic ' + Base64.encode64("#{config[:user]}:#{config[:password]}").chomp
+      auth = 'Basic ' + Base64.strict_encode64("#{config[:user]}:#{config[:password]}").chomp
       headers = { 'Authorization' => auth }
     end
 

diff --git a/bin/metrics-es-node-graphite.rb b/bin/metrics-es-node-graphite.rb
@@ -118,7 +118,7 @@ class ESNodeGraphiteMetrics < Sensu::Plugin::Metric::CLI::Graphite
   def get_es_resource(resource)
     headers = {}
     if config[:user] && config[:password]
-      auth = 'Basic ' + Base64.encode64("#{config[:user]}:#{config[:password]}").chomp
+      auth = 'Basic ' + Base64.strict_encode64("#{config[:user]}:#{config[:password]}").chomp
       headers = { 'Authorization' => auth }
     end
 

diff --git a/bin/metrics-es-node.rb b/bin/metrics-es-node.rb
@@ -79,7 +79,7 @@ def acquire_es_version
   def get_es_resource(resource)
     headers = {}
     if config[:user] && config[:password]
-      auth = 'Basic ' + Base64.encode64("#{config[:user]}:#{config[:password]}").chomp
+      auth = 'Basic ' + Base64.strict_encode64("#{config[:user]}:#{config[:password]}").chomp
       headers = { 'Authorization' => auth }
     end