sensu-plugins-kubernetes 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1b3b5137ced0c6f5389c7758feb32414c642e6892f097d72e504d50c3239e24
-  data.tar.gz: 18be79eb55bc1f39e24701dc515289c600e375e640bfa410efb01204307bd98b
+  metadata.gz: 45a45dc3c0d473178c20e48f82d9963c11f44d6cedd3bfe5ee7485834042ed95
+  data.tar.gz: 24b10e2d96052d3519623e615b3e256232fa49b9a9f09f1a137901407d7b2c10
 SHA512:
-  metadata.gz: 14cda7064913e1b125fecc685c38f8632c4d40d9af234002ca5fffb63e5c1bbc28016d0fa3df2f3d37b08c5b4ebe964696b99e7c7d180fb6541d62e29ccea96c
-  data.tar.gz: c00a75f45747398767f47cc810c85d6f22832ba49c2c5cfe97542add001f0e10749ecc236e5feb73749b199e82a3bb357bfec0dd5d9022893ae96f6b2696b074
+  metadata.gz: b91a158f2ca9de86fe65a2d2b063f2fac90711b83dad7557d2e04f5310f3c765a2aecafe5518324026ec7e32b89e206fbeba62150eed8c861a72a31c94b0a6a8
+  data.tar.gz: c75419669faf06fd1e852f6580165aa75d009651257ef6dfe14da67026e9f333146ac1ee7fa54035a6aedb93aa387e49a5e1a4d2b53e15fdefbe17d85532861e

data/CHANGELOG.md

@@ -5,6 +5,10 @@ This CHANGELOG follows the format listed [here ](https://github.com/sensu-plugin
 
 ## [Unreleased]
 
+## [3.1.0] - 2018-10-29
+### Added
+ - `check-kube-nodes-ready.rb`, `check-kube-pods-pending.rb`, `check-kube-pods-restarting.rb`, `check-kube-pods-running.rb`: added options `--included-nodes` and `--excluded-nodes` which support a comma separated list so you can filter nodes (@ttarczynski)
+
 ### Fixed
 - check-kube-pods-running.rb no longer throws an exception when there are no 3 conditions in the status information. Issue #39 (@AgarFu)
 
@@ -68,7 +72,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/3.0.1...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-kubernetes/compare/3.1.0...HEAD
+[3.1.0]: https://github.com/sensu-plugins/sensu-plugins-kubernetes/compare/3.0.1...3.1.0
 [3.0.1]: https://github.com/sensu-plugins/sensu-plugins-kubernetes/compare/3.0.0...3.0.0.1
 [3.0.0]: https://github.com/sensu-plugins/sensu-plugins-kubernetes/compare/2.0.0...3.0.0
 [2.0.0]: https://github.com/sensu-plugins/sensu-plugins-kubernetes/compare/1.1.0...2.0.0

data/README.md

@@ -36,6 +36,10 @@ Usage: check-kube-nodes-ready.rb (options)
     -u, --user USER                  User with access to API
     -v, --api-version VERSION        API version
         --kube-config KUBECONFIG     Path to a kube config file
+        --exclude-nodes              Exclude the specified nodes (comma separated list)
+                                     Exclude wins when a node is in both include and exclude lists
+        --include-nodes              Include the specified nodes (comma separated list), an
+                                     empty list includes all nodes
 ```
 
 **check-kube-apiserver-available.rb**
@@ -70,6 +74,10 @@ Usage: check-kube-pods-pending.rb (options)
         --exclude-namespace
     -i NAMESPACES,                   Include the specified list of namespaces, an 
         --include-namespace          empty list includes all namespaces
+        --exclude-nodes              Exclude the specified nodes (comma separated list)
+                                     Exclude wins when a node is in both include and exclude lists
+        --include-nodes              Include the specified nodes (comma separated list), an
+                                     empty list includes all nodes
     -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
@@ -132,6 +140,10 @@ Usage: ./check-kube-pods-running.rb (options)
         --exclude-namespace
     -i NAMESPACES,                   Include the specified list of namespaces, an 
         --include-namespace          empty list includes all namespaces
+        --exclude-nodes              Exclude the specified nodes (comma separated list)
+                                     Exclude wins when a node is in both include and exclude lists
+        --include-nodes              Include the specified nodes (comma separated list), an
+                                     empty list includes all nodes
     -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
@@ -155,6 +167,10 @@ Usage: ./check-kube-pods-restarting.rb (options)
         --exclude-namespace
     -i NAMESPACES,                   Include the specified list of namespaces, an 
         --include-namespace          empty list includes all namespaces
+        --exclude-nodes              Exclude the specified nodes (comma separated list)
+                                     Exclude wins when a node is in both include and exclude lists
+        --include-nodes              Include the specified nodes (comma separated list), an
+                                     empty list includes all nodes
     -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-nodes-ready.rb

@@ -26,6 +26,10 @@
 # -p, --password PASSWORD          If user is passed, also pass a password
 # -t, --token TOKEN                Bearer token for authorization
 #     --token-file TOKEN-FILE      File containing bearer token for authorization
+#     --exclude-nodes              Exclude the specified nodes (comma separated list)
+#                                  Exclude wins when a node is in both include and exclude lists
+#     --include-nodes              Include the specified nodes (comma separated list), an
+#                                  empty list includes all nodes
 #
 # LICENSE:
 #   Kel Cecil <kelcecil@praisechaos.com>
@@ -34,9 +38,23 @@
 #
 
 require 'sensu-plugins-kubernetes/cli'
+require 'sensu-plugins-kubernetes/exclude'
 
 class AllNodesAreReady < Sensu::Plugins::Kubernetes::CLI
   @options = Sensu::Plugins::Kubernetes::CLI.options.dup
+  include Sensu::Plugins::Kubernetes::Exclude
+
+  option :exclude_nodes,
+         description: 'Exclude the specified nodes (comma separated list)',
+         long: '--exclude-nodes NODES',
+         proc: proc { |a| a.split(',') },
+         default: ''
+
+  option :include_nodes,
+         description: 'Include the specified nodes (comma separated list)',
+         long: '--include-nodes NODES',
+         proc: proc { |a| a.split(',') },
+         default: ''
 
   def run
     failed_nodes = []
@@ -45,6 +63,7 @@ class AllNodesAreReady < Sensu::Plugins::Kubernetes::CLI
       if item.nil?
         warning "#{node.name} does not have a status"
       elsif item.status != 'True'
+        next if should_exclude_node(node.metadata.name)
         failed_nodes << node.metadata.name unless node.spec.unschedulable
       end
     end

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

@@ -30,6 +30,10 @@
 #     --exclude-namespace
 # -i NAMESPACES,                   Include the specified list of namespaces, an
 #     --include-namespace          empty list includes all namespaces
+#     --exclude-nodes              Exclude the specified nodes (comma separated list)
+#                                  Exclude wins when a node is in both include and exclude lists
+#     --include-nodes              Include the specified nodes (comma separated list), an
+#                                  empty list includes all nodes
 # -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.
@@ -46,9 +50,11 @@
 #
 
 require 'sensu-plugins-kubernetes/cli'
+require 'sensu-plugins-kubernetes/exclude'
 
 class AllPodsAreReady < Sensu::Plugins::Kubernetes::CLI
   @options = Sensu::Plugins::Kubernetes::CLI.options.dup
+  include Sensu::Plugins::Kubernetes::Exclude
 
   option :pod_list,
          description: 'List of pods to check',
@@ -82,6 +88,18 @@ class AllPodsAreReady < Sensu::Plugins::Kubernetes::CLI
          proc: proc { |a| a.split(',') },
          default: ''
 
+  option :exclude_nodes,
+         description: 'Exclude the specified nodes (comma separated list)',
+         long: '--exclude-nodes NODES',
+         proc: proc { |a| a.split(',') },
+         default: ''
+
+  option :include_nodes,
+         description: 'Include the specified nodes (comma separated list)',
+         long: '--include-nodes NODES',
+         proc: proc { |a| a.split(',') },
+         default: ''
+
   def run
     pods_list = []
     failed_pods = []
@@ -99,6 +117,7 @@ class AllPodsAreReady < Sensu::Plugins::Kubernetes::CLI
     pods.each do |pod|
       next if pod.nil?
       next if should_exclude_namespace(pod.metadata.namespace)
+      next if should_exclude_node(pod.spec.nodeName)
       next unless pods_list.include?(pod.metadata.name) || pods_list.include?('all')
       # Check for pending state
       next unless pod.status.phase == 'Pending'

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

@@ -30,6 +30,10 @@
 #        --exclude-namespace
 #    -i NAMESPACES,                   Include the specified list of namespaces, an
 #        --include-namespace          empty list includes all namespaces
+#        --exclude-nodes              Exclude the specified nodes (comma separated list)
+#                                     Exclude wins when a node is in both include and exclude lists
+#        --include-nodes              Include the specified nodes (comma separated list), an
+#                                     empty list includes all nodes
 #    -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
@@ -45,9 +49,11 @@
 #
 
 require 'sensu-plugins-kubernetes/cli'
+require 'sensu-plugins-kubernetes/exclude'
 
 class PodsRestarting < Sensu::Plugins::Kubernetes::CLI
   @options = Sensu::Plugins::Kubernetes::CLI.options.dup
+  include Sensu::Plugins::Kubernetes::Exclude
 
   option :pod_list,
          description: 'List of pods to check',
@@ -81,6 +87,18 @@ class PodsRestarting < Sensu::Plugins::Kubernetes::CLI
          proc: proc { |a| a.split(',') },
          default: ''
 
+  option :exclude_nodes,
+         description: 'Exclude the specified nodes (comma separated list)',
+         long: '--exclude-nodes NODES',
+         proc: proc { |a| a.split(',') },
+         default: ''
+
+  option :include_nodes,
+         description: 'Include the specified nodes (comma separated list)',
+         long: '--include-nodes NODES',
+         proc: proc { |a| a.split(',') },
+         default: ''
+
   def run
     pods_list = []
     restarted_pods = []
@@ -98,6 +116,7 @@ class PodsRestarting < Sensu::Plugins::Kubernetes::CLI
     pods.each do |pod|
       next if pod.nil?
       next if should_exclude_namespace(pod.metadata.namespace)
+      next if should_exclude_node(pod.spec.nodeName)
       next unless pods_list.include?(pod.metadata.name) || pods_list.include?('all')
       # Check restarts
       next if pod.status.containerStatuses.nil?

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

@@ -30,6 +30,10 @@
 #         --exclude-namespace
 #     -i NAMESPACES,                   Include the specified list of namespaces, an
 #         --include-namespace          empty list includes all namespaces
+#         --exclude-nodes              Exclude the specified nodes (comma separated list)
+#                                      Exclude wins when a node is in both include and exclude lists
+#         --include-nodes              Include the specified nodes (comma separated list), an
+#                                      empty list includes all nodes
 #     -f, --filter FILTER              Selector filter for pods to be checked
 #     -p, --pods PODS                  List of pods to check
 # NOTES:
@@ -43,9 +47,11 @@
 #
 
 require 'sensu-plugins-kubernetes/cli'
+require 'sensu-plugins-kubernetes/exclude'
 
 class AllPodsAreRunning < Sensu::Plugins::Kubernetes::CLI
   @options = Sensu::Plugins::Kubernetes::CLI.options.dup
+  include Sensu::Plugins::Kubernetes::Exclude
 
   option :pod_list,
          description: 'List of pods to check',
@@ -72,6 +78,18 @@ class AllPodsAreRunning < Sensu::Plugins::Kubernetes::CLI
          proc: proc { |a| a.split(',') },
          default: ''
 
+  option :exclude_nodes,
+         description: 'Exclude the specified nodes (comma separated list)',
+         long: '--exclude-nodes NODES',
+         proc: proc { |a| a.split(',') },
+         default: ''
+
+  option :include_nodes,
+         description: 'Include the specified nodes (comma separated list)',
+         long: '--include-nodes NODES',
+         proc: proc { |a| a.split(',') },
+         default: ''
+
   def run
     pods_list = []
     failed_pods = []
@@ -89,6 +107,7 @@ class AllPodsAreRunning < Sensu::Plugins::Kubernetes::CLI
     pods.each do |pod|
       next if pod.nil?
       next if should_exclude_namespace(pod.metadata.namespace)
+      next if should_exclude_node(pod.spec.nodeName)
       next unless pods_list.include?(pod.metadata.name) || pods_list.include?('all')
       next unless pod.status.phase != 'Succeeded' && !pod.status.conditions.nil?
       failed_pods << pod.metadata.name unless ready? pod

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

@@ -0,0 +1,33 @@
+module Sensu
+  module Plugins
+    # Namespace for the Kubernetes sensu-plugin.
+    module Kubernetes
+      # A mixin module that provides filtering functions.
+      module Exclude
+        # Filters the list of pods or nodes based on include/exclude options.
+        #
+        # @option options [String] :exclude_nodes
+        #   Exclude the specified nodes (comma separated list)
+        #   Exclude wins when a node is in both include and exclude lists
+        # @option options [String] :include-nodes
+        #   Include the specified nodes (comma separated list), an
+        #   empty list includes all nodes
+        def node_included?(node_name)
+          if config[:include_nodes].empty?
+            true
+          else
+            config[:include_nodes].include?(node_name)
+          end
+        end
+
+        def node_excluded?(node_name)
+          config[:exclude_nodes].include?(node_name)
+        end
+
+        def should_exclude_node(node_name)
+          node_excluded?(node_name) || !node_included?(node_name)
+        end
+      end
+    end
+  end
+end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-kubernetes
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-03 00:00:00.000000000 Z
+date: 2018-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -181,15 +181,15 @@ dependencies:
 description: Provides monitoring for Kubernetes via Sensu
 email: "<sensu-users@googlegroups.com>"
 executables:
-- check-kube-apiserver-available.rb
-- check-kube-nodes-ready.rb
-- check-kube-pods-pending.rb
-- check-kube-pods-restarting.rb
-- check-kube-pods-running.rb
-- check-kube-pods-runtime.rb
 - check-kube-service-available.rb
+- check-kube-pods-running.rb
 - handler-kube-pod.rb
+- check-kube-pods-runtime.rb
 - metrics-pods.rb
+- check-kube-pods-pending.rb
+- check-kube-nodes-ready.rb
+- check-kube-pods-restarting.rb
+- check-kube-apiserver-available.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -208,6 +208,7 @@ files:
 - lib/sensu-plugins-kubernetes.rb
 - lib/sensu-plugins-kubernetes/cli.rb
 - lib/sensu-plugins-kubernetes/client.rb
+- lib/sensu-plugins-kubernetes/exclude.rb
 - lib/sensu-plugins-kubernetes/version.rb
 homepage: https://github.com/sensu-plugins/sensu-plugins-kubernetes
 licenses:
@@ -235,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for kubernetes