sensu-plugins-kubernetes 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36157c792a8bec58626218b903748035f536c988
-  data.tar.gz: 5b423f2c185b3f00527889355469884182d866f1
+  metadata.gz: e6e9801561b6f7f63ceea10650267e2b4659c431
+  data.tar.gz: 97e11b5bf9920db1c6f190b778f0f58cbaf05711
 SHA512:
-  metadata.gz: c350b9c7ab40bfa371b2df8ddacdb56207203e2294252b9c7f34a4e92f7845082bbeab91dcaf9debb794c7b67e1342d5e6f39c8652432eabd7c3a737d7c56af7
-  data.tar.gz: e025312b7dbcaaf10c85c48ddb5c1d0964ee6a4ce5c5510a5563ad327268c7cdf0affe3f6a91ec4e330b11c0533df8da2b66c9eafe19848b165778845b82a42f
+  metadata.gz: e9353e3c892afcb2d17c4dfbb0c718ecb5f819577e3aed14a07e0c7dfdece9b014671a065beb791277a4ba556d150913020b93078c96404f90a503ab9c3edf2a
+  data.tar.gz: bbf266b3c306f50b971f388d9f28f8e7fd48575082fdcdff1272973d33af899936f98f9bbde9cd78ef344f5102f091b0ffb1214ff1914fe854bb232dadb2bb63

data/CHANGELOG.md

@@ -5,6 +5,13 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [2.0.0] - 2017-08-28
+### Added
+ - Add option to explicitly include specific namespaces (@simulalex)
+ 
+### Breaking Change
+ - Drops support for Ruby-2.0, now requires Ruby >= 2.1.0 (@simulalex)
+
 ## [1.1.0] - 2017-08-11
 ### Added
 - Ruby 2.4.1 testing (@thomasriley)
@@ -54,7 +61,8 @@ pending pods, the restart count portion has been split into it's own check, `che
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-kubernetes/compare/1.1.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-kubernetes/compare/2.0.0...HEAD
+[2.0.0]: https://github.com/sensu-plugins/sensu-plugins-kubernetes/compare/1.1.0...2.0.0
 [1.1.0]: https://github.com/sensu-plugins/sensu-plugins-kubernetes/compare/1.0.0...1.1.0
 [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-kubernetes/compare/0.1.2...1.0.0
 [0.1.2]: https://github.com/sensu-plugins/sensu-plugins-kubernetes/compare/0.1.1...0.1.2

data/README.md

@@ -68,6 +68,8 @@ Usage: check-kube-pods-pending.rb (options)
     -v, --api-version VERSION        API version
     -n NAMESPACES,                   Exclude the specified list of namespaces
         --exclude-namespace
+    -i NAMESPACES,                   Include the specified list of namespaces, an 
+        --include-namespace          empty list includes all namespaces
     -t, --timeout TIMEOUT            Threshold for pods to be in the pending state
     -f, --filter FILTER              Selector filter for pods to be checked
     -p, --pods PODS                  List of pods to check
@@ -128,6 +130,8 @@ Usage: ./check-kube-pods-running.rb (options)
     -v, --api-version VERSION        API version
     -n NAMESPACES,                   Exclude the specified list of namespaces
         --exclude-namespace
+    -i NAMESPACES,                   Include the specified list of namespaces, an 
+        --include-namespace          empty list includes all namespaces
     -f, --filter FILTER              Selector filter for pods to be checked
     -p, --pods PODS                  List of pods to check
         --kube-config KUBECONFIG     Path to a kube config file
@@ -149,6 +153,8 @@ Usage: ./check-kube-pods-restarting.rb (options)
     -v, --api-version VERSION        API version
     -n NAMESPACES,                   Exclude the specified list of namespaces
         --exclude-namespace
+    -i NAMESPACES,                   Include the specified list of namespaces, an 
+        --include-namespace          empty list includes all namespaces
     -f, --filter FILTER              Selector filter for pods to be checked
     -p, --pods PODS                  List of pods to check
     -r, --restart COUNT              Threshold for number of restarts allowed

data/bin/check-kube-pods-pending.rb

@@ -28,6 +28,8 @@
 #     --token-file TOKEN-FILE      File containing bearer token for authorization
 # -n NAMESPACES,                   Exclude the specified list of namespaces
 #     --exclude-namespace
+# -i NAMESPACES,                   Include the specified list of namespaces, an
+#     --include-namespace          empty list includes all namespaces
 # -t, --timeout TIMEOUT            Threshold for pods to be in the pending state
 # -f, --filter FILTER              Selector filter for pods to be checked
 # -p, --pods PODS                  Optional list of pods to check.
@@ -73,6 +75,13 @@ class AllPodsAreReady < Sensu::Plugins::Kubernetes::CLI
          proc: proc { |a| a.split(',') },
          default: ''
 
+  option :include_namespace,
+         description: 'Include the specified list of namespaces',
+         short: '-i NAMESPACES',
+         long: '--include-namespace',
+         proc: proc { |a| a.split(',') },
+         default: ''
+
   def run
     pods_list = []
     failed_pods = []
@@ -89,7 +98,7 @@ class AllPodsAreReady < Sensu::Plugins::Kubernetes::CLI
     end
     pods.each do |pod|
       next if pod.nil?
-      next if config[:exclude_namespace].include?(pod.metadata.namespace)
+      next if should_exclude_namespace(pod.metadata.namespace)
       next unless pods_list.include?(pod.metadata.name) || pods_list.include?('all')
       # Check for pending state
       next unless pod.status.phase == 'Pending'
@@ -113,4 +122,9 @@ class AllPodsAreReady < Sensu::Plugins::Kubernetes::CLI
     return [list] if list
     ['']
   end
+
+  def should_exclude_namespace(namespace)
+    return !config[:include_namespace].include?(namespace) unless config[:include_namespace].empty?
+    config[:exclude_namespace].include?(namespace)
+  end
 end

data/bin/check-kube-pods-restarting.rb

@@ -28,6 +28,8 @@
 #    -v, --api-version VERSION        API version
 #    -n NAMESPACES,                   Exclude the specified list of namespaces
 #        --exclude-namespace
+#    -i NAMESPACES,                   Include the specified list of namespaces, an
+#        --include-namespace          empty list includes all namespaces
 #    -f, --filter FILTER              Selector filter for pods to be checked
 #    -p, --pods PODS                  List of pods to check
 #    -r, --restart COUNT              Threshold for number of restarts allowed
@@ -72,6 +74,13 @@ class PodsRestarting < Sensu::Plugins::Kubernetes::CLI
          proc: proc { |a| a.split(',') },
          default: ''
 
+  option :include_namespace,
+         description: 'Include the specified list of namespaces',
+         short: '-i NAMESPACES',
+         long: '--include-namespace',
+         proc: proc { |a| a.split(',') },
+         default: ''
+
   def run
     pods_list = []
     restarted_pods = []
@@ -88,7 +97,7 @@ class PodsRestarting < Sensu::Plugins::Kubernetes::CLI
     end
     pods.each do |pod|
       next if pod.nil?
-      next if config[:exclude_namespace].include?(pod.metadata.namespace)
+      next if should_exclude_namespace(pod.metadata.namespace)
       next unless pods_list.include?(pod.metadata.name) || pods_list.include?('all')
       # Check restarts
       next if pod.status.containerStatuses.nil?
@@ -113,4 +122,9 @@ class PodsRestarting < Sensu::Plugins::Kubernetes::CLI
     return [list] if list
     ['']
   end
+
+  def should_exclude_namespace(namespace)
+    return !config[:include_namespace].include?(namespace) unless config[:include_namespace].empty?
+    config[:exclude_namespace].include?(namespace)
+  end
 end

data/bin/check-kube-pods-running.rb

@@ -28,6 +28,8 @@
 #     -v, --api-version VERSION        API version
 #     -n NAMESPACES,                   Exclude the specified list of namespaces
 #         --exclude-namespace
+#     -i NAMESPACES,                   Include the specified list of namespaces, an
+#         --include-namespace          empty list includes all namespaces
 #     -f, --filter FILTER              Selector filter for pods to be checked
 #     -p, --pods PODS                  List of pods to check
 # NOTES:
@@ -63,6 +65,13 @@ class AllPodsAreRunning < Sensu::Plugins::Kubernetes::CLI
          proc: proc { |a| a.split(',') },
          default: ''
 
+  option :include_namespace,
+         description: 'Include the specified list of namespaces',
+         short: '-i NAMESPACES',
+         long: '--include-namespace',
+         proc: proc { |a| a.split(',') },
+         default: ''
+
   def run
     pods_list = []
     failed_pods = []
@@ -79,7 +88,7 @@ class AllPodsAreRunning < Sensu::Plugins::Kubernetes::CLI
     end
     pods.each do |pod|
       next if pod.nil?
-      next if config[:exclude_namespace].include?(pod.metadata.namespace)
+      next if should_exclude_namespace(pod.metadata.namespace)
       next unless pods_list.include?(pod.metadata.name) || pods_list.include?('all')
       next unless pod.status.phase != 'Succeeded' && !pod.status.conditions.nil?
       if pod.status.conditions[1].status == 'False' # This is the Ready state
@@ -101,4 +110,9 @@ class AllPodsAreRunning < Sensu::Plugins::Kubernetes::CLI
     return [list] if list
     ['']
   end
+
+  def should_exclude_namespace(namespace)
+    return !config[:include_namespace].include?(namespace) unless config[:include_namespace].empty?
+    config[:exclude_namespace].include?(namespace)
+  end
 end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-kubernetes
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-11 00:00:00.000000000 Z
+date: 2017-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -227,7 +227,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="