bin/check-vpc-vpn.rb in sensu-plugins-aws-3.2.1 vs bin/check-vpc-vpn.rb in sensu-plugins-aws-4.0.0

@@ -11,11 +11,12 @@
 # PLATFORMS:
 #   all
 #
 # DEPENDENCIES:
 #   gem: sensu-plugin
-#   gem: aws-sdk-v1
+#   gem: aws-sdk
+#   gem: sensu-plugins-aws
 #
 # USAGE:
 #  ./check-vpc-vpn.rb --aws-region us-east-1 --vpn-connection-id vpn-abc1234
 #
 # NOTES:
@@ -23,65 +24,54 @@
 #
 # LICENSE:
 #   John Dyer [e-mail]
 #   Released under the same terms as Sensu (the MIT license); see LICENSE
 #   for details.
+#   Updated by Peter Hoppe <[e-mail]> to aws-sdk-v2
 #
 
+require 'sensu-plugins-aws'
 require 'sensu-plugin/check/cli'
-require 'aws-sdk-v1'
+require 'aws-sdk'
 
 class CheckAwsVpcVpnConnections < Sensu::Plugin::Check::CLI
-  @aws_config = {}
-  # rubocop:disable Style/AlignParameters
-  option :access_key,
-    short: '-a AWS_ACCESS_KEY',
-    long: '--aws-access-key AWS_ACCESS_KEY',
-    description: 'AWS Access Key',
-    default: ENV['AWS_ACCESS_KEY_ID']
-
-  option :secret_key,
-    short: '-s AWS_SECRET_ACCESS_KEY',
-    long: '--aws-secret-access-key AWS_SECRET_ACCESS_KEY',
-    description: 'AWS Secret Access Key.',
-    default: ENV['AWS_SECRET_ACCESS_KEY']
-
-  option :use_iam_role,
-    short: '-u',
-    long: '--use-iam',
-    description: 'Use IAM authentication'
-
+  include Common
   option :vpn_id,
-    short: '-v VPN_ID',
-    long: '--vpn-connection-id VPN_ID',
-    required: true,
-    description: 'VPN connection ID'
+         short: '-v VPN_ID',
+         long: '--vpn-connection-id VPN_ID',
+         required: true,
+         description: 'VPN connection ID'
 
   option :aws_region,
-    short: '-r AWS_REGION',
-    long: '--aws-region REGION',
-    description: 'AWS Region (such as eu-west-1).',
-    default: 'us-east-1'
+         short: '-r AWS_REGION',
+         long: '--aws-region REGION',
+         description: 'AWS Region (defaults to us-east-1).',
+         default: ENV['AWS_REGION']
 
-  def aws_config
-    aws_connection_config = { region: config[:aws_region] }
-    if config[:use_iam_role].nil?
-      aws_connection_config[:access_key_id] = config[:access_key]
-      aws_connection_config[:secret_access_key] = config[:secret_key]
-    end
-    aws_connection_config
-  end
+  option :warn_count,
+         short: '-W WARN_COUNT',
+         long: '--warn_count WARN_COUNT',
+         description: 'Warn when the count of down tunnels is at or above this number',
+         default: 1,
+         proc: proc(&:to_i)
 
+  option :crit_count,
+         short: '-C CRIT_COUNT',
+         long: '--crit_count CRIT_COUNT',
+         description: 'Critical when the count of down tunnels is at or above this number',
+         default: 2,
+         proc: proc(&:to_i)
+
   def fetch_connection_data
     begin
-      ec2 = AWS::EC2::Client.new(aws_config)
-      vpn_info = ec2.describe_vpn_connections(vpn_connection_ids: [config[:vpn_id]]).vpn_connection_set
+      ec2 = Aws::EC2::Client.new
+      vpn_info = ec2.describe_vpn_connections(vpn_connection_ids: [config[:vpn_id]]).vpn_connections
       down_connections = vpn_info.first.vgw_telemetry.select { |x| x.status != 'UP' }
       results = { down_count: down_connections.count }
-      results[:down_connection_status] = down_connections.map { |x| "#{x.outside_ip_address} => #{x.status_message.nil? ? 'none' : x.status_message}" }
-      results[:connection_name] = vpn_info[0].tag_set.find { |x| x.key == 'Name' }.value
-    rescue AWS::EC2::Errors::InvalidVpnConnectionID::NotFound
+      results[:down_connection_status] = down_connections.map { |x| "#{x.outside_ip_address} => #{x.status_message.empty? ? 'none' : x.status_message}" }
+      results[:connection_name] = vpn_info[0].tags.find { |x| x.key == 'Name' }.value
+    rescue Aws::EC2::Errors::ServiceError
       warning "The vpnConnection ID '#{config[:vpn_id]}' does not exist"
     rescue => e
       warning e.backtrace.join(' ')
     end
     results
@@ -90,14 +80,19 @@
   def run
     data = fetch_connection_data
     msg = data[:down_connection_status].join(' | ')
     name = data[:connection_name]
     case data[:down_count]
-    when 2 then critical "'#{name}' shows both tunnels as DOWN - [ #{msg} ]"
-    when 1 then warning "'#{name}' shows 1 of 2 tunnels as DOWN - [ #{msg} ]"
-    when 0 then ok "'#{name}' shows 2 of 2 tunnels as UP"
+    when 2 then message = "'#{name}' shows both tunnels as DOWN - [ #{msg} ]"
+    when 1 then message = "'#{name}' shows 1 of 2 tunnels as DOWN - [ #{msg} ]"
+    end
+
+    if data[:down_count] >= config[:crit_count]
+      critical message
+    elsif data[:down_count] >= config[:warn_count]
+      warning message
     else
-      # Not sure this could ever happen
-      unknown "Unknown connection count - #{data[:down_count]}"
+      up_count = 2 - data[:down_count]
+      ok "'#{name}' shows #{up_count} of 2 tunnels as UP"
     end
   end
 end