Fix travis issues

sensu-plugins · Mar 25, 2015 · 7c57159 · 7c57159
1 parent 93fe980
commit 7c57159
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 8 deletions.
diff --git a/bin/check-es-cluster-status.rb b/bin/check-es-cluster-status.rb
@@ -15,6 +15,7 @@
 # DEPENDENCIES:
 #   gem: sensu-plugin
 #   gem: rest-client
+#   gem: json
 #
 # USAGE:
 #   #YELLOW
@@ -27,11 +28,13 @@
 #   for details.
 #
 
-require 'rubygems' if RUBY_VERSION < '1.9.0'
 require 'sensu-plugin/check/cli'
 require 'rest-client'
 require 'json'
 
+#
+# ES Cluster Status
+#
 class ESClusterStatus < Sensu::Plugin::Check::CLI
   option :host,
          description: 'Elasticsearch host',

diff --git a/bin/check-es-file-descriptors.rb b/bin/check-es-file-descriptors.rb
@@ -27,12 +27,14 @@
 #   for details.
 #
 
-require 'rubygems' if RUBY_VERSION < '1.9.0'
 require 'sensu-plugin/check/cli'
 require 'rest-client'
 require 'json'
 
-class ESClusterStatus < Sensu::Plugin::Check::CLI
+#
+# ES File Descriptiors
+#
+class ESFileDescriptors < Sensu::Plugin::Check::CLI
   option :host,
          description: 'Elasticsearch host',
          short: '-h HOST',

diff --git a/bin/check-es-heap.rb b/bin/check-es-heap.rb
@@ -14,6 +14,7 @@
 # DEPENDENCIES:
 #   gem: sensu-plugin
 #   gem: rest-client
+#   gem: json
 #
 # USAGE:
 #   example commands
@@ -26,11 +27,13 @@
 #   for details.
 #
 
-require 'rubygems' if RUBY_VERSION < '1.9.0'
 require 'sensu-plugin/check/cli'
 require 'rest-client'
 require 'json'
 
+#
+# ES Heap
+#
 class ESHeap < Sensu::Plugin::Check::CLI
   option :host,
          description: 'Elasticsearch host',

diff --git a/bin/metrics-es-cluster.rb b/bin/metrics-es-cluster.rb
@@ -29,11 +29,13 @@
 #   for details.
 #
 
-require 'rubygems' if RUBY_VERSION < '1.9.0'
 require 'sensu-plugin/metric/cli'
 require 'rest-client'
 require 'json'
 
+#
+# ES Cluster Metrics
+#
 class ESClusterMetrics < Sensu::Plugin::Metric::CLI::Graphite
   option :scheme,
          description: 'Metric naming scheme, text to prepend to metric',

diff --git a/bin/metrics-es-node-graphite.rb b/bin/metrics-es-node-graphite.rb
@@ -36,12 +36,14 @@
 #   for details.
 #
 
-require 'rubygems' if RUBY_VERSION < '1.9.0'
 require 'sensu-plugin/metric/cli'
 require 'rest-client'
 require 'json'
 
-class ESMetrics < Sensu::Plugin::Metric::CLI::Graphite
+#
+# ES Node Graphite Metrics
+#
+class ESNodeGraphiteMetrics < Sensu::Plugin::Metric::CLI::Graphite
   option :scheme,
          description: 'Metric naming scheme, text to prepend to queue_name.metric',
          short: '-s SCHEME',

diff --git a/bin/metrics-es-node.rb b/bin/metrics-es-node.rb
@@ -15,6 +15,8 @@
 #
 # DEPENDENCIES:
 #   gem: sensu-plugin
+#   gem: rest-client
+#   gem: json
 #
 # USAGE:
 #   #YELLOW
@@ -27,11 +29,14 @@
 #   for details.
 #
 
-require 'rubygems' if RUBY_VERSION < '1.9.0'
+
 require 'sensu-plugin/metric/cli'
 require 'rest-client'
 require 'json'
 
+#
+# ES Node Metrics
+#
 class ESMetrics < Sensu::Plugin::Metric::CLI::Graphite
   option :scheme,
          description: 'Metric naming scheme, text to prepend to queue_name.metric',