sensu-plugins-strongswan 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb9cfc67e98f78796ff984105ea1c6d1ecfc56a2f4d4e54f15d5e787e41b2341
-  data.tar.gz: dbe509551b2d89bee847ab44df19fb294a96f3480f925aaba327b31782449952
+  metadata.gz: 6874e8d33f5a7e18a4cacee0a01b7dfb5429bb8655f3ce7fd1422cb3f699154d
+  data.tar.gz: f2ae3f153952899dfd0c1455acc8cdf0b19ecd0daaabbd5e2bc531a8221cade0
 SHA512:
-  metadata.gz: bd0a02e6ed04ef147bde40d780e1624adc6b8cd463d388797f8ad4097fd1768cf2d14977da523f9e174b731005d85a0db9ef4950253185ead459b90115dd2560
-  data.tar.gz: 59940dd6fd07b3a199645134aba922cdca164e242f33e086f77f0a311e8be610006e727dd9a761ec38ee64b3b608240b96077f1d378e3ed22f9d8a4763dfd885
+  metadata.gz: 8d9959de1a83620f7fe43400886c7be11e0ca7250d04095861173c9e270883f377087068c106c6b65af35fe28db07e0cb96f2f9f6da9243ce74f5569c9d0e1f1
+  data.tar.gz: 6d1ea2931b01f1136154cb20ff9c3da158802de5e1f6b6e8712b02f8481ea2bac4292107acabcf490b03957e37b1c75591b1e57b27d5f8d1c48c2e274858d019

data/CHANGELOG.md

@@ -5,6 +5,10 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [Unreleased]
 
+## [2.1.0] - 2018-03-17
+### Added
+- Added ability to check all existing connection and get metrics from all connections (@yuri-zubov)
+
 ## [2.0.0] - 2018-03-07
 ### Breaking Changes
 - Dropping ruby `< 2.3` support (@yuri-zubov)
@@ -50,7 +54,8 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 ### Added
 - add check-strongswan.rb and metrics-strongswan.rb plugins
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-strongswan/compare/2.0.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-strongswan/compare/2.1.0...HEAD
+[2.1.0]: https://github.com/sensu-plugins/sensu-plugins-strongswan/compare/2.0.0...2.1.0
 [2.0.0]: https://github.com/sensu-plugins/sensu-plugins-strongswan/compare/1.2.0...2.0.0
 [1.2.0]: https://github.com/sensu-plugins/sensu-plugins-strongswan/compare/1.1.0...1.2.0
 [1.1.0]: https://github.com/sensu-plugins/sensu-plugins-strongswan/compare/1.0.0...1.1.0

data/bin/check-strongswan-connection.rb

@@ -27,23 +27,44 @@
 #
 
 require 'sensu-plugin/check/cli'
+require 'open3'
+require 'set'
 
 # check strongswan connection status
 class CheckStrongswanConnection < Sensu::Plugin::Check::CLI
   option :connection,
          description: 'Connection name to check',
          short: '-c NAME',
-         long: '--connection NAME',
-         required: true
+         long: '--connection NAME'
+
+  def run_ipsec_statusall
+    stdout, stderr, result = Open3.capture3("ipsec statusall #{config[:connection]}")
+    unknown stderr unless result.success?
+    stdout
+  end
 
   def run
-    output = `ipsec statusall #{config[:connection]}`
-    if output.include?('INSTALLED, TUNNEL,')
-      ok "the connection #{config[:connection]} is up"
-    elsif !output.include?(config[:connection])
-      warning "the connection #{config[:connection]} doesn't exist"
+    ipsec_status = run_ipsec_statusall
+    connection_names = Set.new
+    established_connection_name = Set.new
+    ipsec_status.each_line do |line|
+      if line.match(/^Connections:/) .. line.match(/^Security Associations/)
+        result = line.match(/^(?<name>(.*)):.*local/)
+        connection_names << result[:name] if result
+      end
+
+      if line.match(/^Security Associations/) .. false
+        result = line.match(/^(?<name>(.*))\{.*INSTALLED, TUNNEL,/)
+        established_connection_name << result[:name] if result
+      end
+    end
+
+    if connection_names.empty?
+      warning "the connection(s) #{config[:connection]} doesn't exist"
+    elsif connection_names == established_connection_name
+      ok "the connection(s) #{connection_names.to_a.join(', ')} is up"
     else
-      critical "the connection #{config[:connection]} is down"
+      critical "the connection #{(connection_names - established_connection_name).to_a.join(', ')} is down"
     end
   end
 end

data/bin/metrics-strongswan-connection.rb

@@ -41,8 +41,7 @@ class MetricsStrongswanStrongswanConnection < Sensu::Plugin::Metric::CLI::Graphi
   option :connection,
          description: 'Connection name to check',
          short: '-c NAME',
-         long: '--connection NAME',
-         required: true
+         long: '--connection NAME'
 
   def run_ipsec_statusall
     stdout, result = Open3.capture2("ipsec statusall #{config[:connection]}")
@@ -55,7 +54,7 @@ class MetricsStrongswanStrongswanConnection < Sensu::Plugin::Metric::CLI::Graphi
 
     found = false
     ipsec_status.each_line do |line|
-      result = line.match(/(?<name>.*)\{.*(?<bytes_i>\d+)\ bytes_i.*\ (?<bytes_o>\d+)\ bytes_o/)
+      result = line.match(/(?<name>.*)\{.* (?<bytes_i>\d+)\ bytes_i.*\ (?<bytes_o>\d+)\ bytes_o/)
       next unless result
 
       found = true

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

@@ -1,7 +1,7 @@
 module SensuPluginsStrongswan
   module Version
     MAJOR = 2
-    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-strongswan
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-08 00:00:00.000000000 Z
+date: 2018-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin