sensu-plugins-aws 11.3.1 → 11.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be0422340cb449ec1d4caf7f659831e5d09818df20511bc821afc24fa1a14f8e
-  data.tar.gz: e11fff3a0a1bfc8b8d44eeb5ab12aee032ce99e6b61a847b0c525a958803c834
+  metadata.gz: 759ebb6f5b2c991d44235b5392c64c005e25372b639d77aa561f5d2dc8de9768
+  data.tar.gz: 002bdfa80613f0b1a9499f968175bf81d3a94d758379174a9cd92f356b74cee8
 SHA512:
-  metadata.gz: 7638136dd037cdbe6e4a8e7c72d9d29bd4c6b7fafc11661e5d303a72ad377f65ccff577a7ec5043dbdb64622bef3837addfe8d3b421a2385aac55ecd216e9b74
-  data.tar.gz: cf3f7bb16a9a9329cc0f79927abf93bfa8bb7bd49fea61db7359530e3d5e77c583520c1589a9081a5bb3c9548eabfeda976b719800981918bc80ed061bbd328b
+  metadata.gz: d9bf47beeff3da64504e8a4fa7c47f9c9c3e279e770ec7c806ce5747ddad06acb12fdf51ff59b3550f6aa30d7d64d5e774fb0195231b3e24e08c873a0a6f82ea
+  data.tar.gz: 8576679f7f3fa9702fd12691eb63574dec0102ddc8c5eff7832cb70b093480937d9e3f7c3935ccdabafb5471d3e1a9a332d171a85c57caa8bdc7195597d00896

data/CHANGELOG.md

@@ -5,6 +5,13 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [Unreleased]
 
+## [11.4.0] - 2018-04-28
+### Security
+- updated yard dependency to `~> 0.9.11` per: https://nvd.nist.gov/vuln/detail/CVE-2017-17042 (@yuri-zubov sponsored by Actility, https://www.actility.com)
+
+### Added
+- Added ability to get metrics from WAF (@yuri-zubov sponsored by Actility, https://www.actility.com)
+
 ## [11.3.1] - 2018-04-17
 ### Fixed
 - check-rds-events.rb: fixed issues with queries because the assume local time, now we force UTC timezone (@nadarashwin) (@majormoses)
@@ -459,7 +466,8 @@ WARNING:  This release contains major breaking changes that will impact all user
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/11.3.1...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/11.4.0...HEAD
+[11.4.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/11.3.1...11.4.0
 [11.3.1]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/11.3.0...11.3.1
 [11.3.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/11.2.0...11.3.0
 [11.2.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/11.1.0...11.2.0

data/bin/metrics-waf.rb

@@ -0,0 +1,111 @@
+#! /usr/bin/env ruby
+#
+# metrics-waf
+#
+# DESCRIPTION:
+#   Gets latency metrics from CloudWatch and puts them in Graphite for longer term storage
+#
+# OUTPUT:
+#   metric-data
+#
+# PLATFORMS:
+#   Linux
+#
+# DEPENDENCIES:
+#   gem: aws-sdk
+#   gem: sensu-plugin
+#   gem: sensu-plugin-aws
+#   gem: time
+#
+# USAGE:
+#
+#
+# NOTES:
+#
+# LICENSE:
+#   Zubov Yuri <yury.zubau@gmail.com> sponsored by Actility, https://www.actility.com
+#   Released under the same terms as Sensu (the MIT license); see LICENSE
+#   for details.
+#
+
+require 'sensu-plugin/metric/cli'
+require 'aws-sdk'
+require 'sensu-plugins-aws'
+require 'time'
+
+class WafMetrics < Sensu::Plugin::Metric::CLI::Generic
+  include CloudwatchCommon
+
+  option :scheme,
+         description: 'Metric naming scheme, text to prepend to metric',
+         short: '-s SCHEME',
+         long: '--scheme SCHEME',
+         default: 'aws.waf'
+
+  option :aws_region,
+         short: '-r AWS_REGION',
+         long: '--aws-region REGION',
+         description: 'AWS Region (defaults to us-east-1).',
+         default: 'us-east-1'
+
+  option :metric,
+         description: 'Metric to fetch',
+         short: '-m METRIC',
+         long: '--metric',
+         required: false,
+         in: %w[AllowedRequests BlockedRequests CountedRequests PassedRequests]
+
+  option :end_time,
+         short:       '-t T',
+         long:        '--end-time TIME',
+         default:     Time.now,
+         proc:        proc { |a| Time.parse a },
+         description: 'CloudWatch metric statistics end time'
+
+  option :period,
+         short:       '-p N',
+         long:        '--period SECONDS',
+         default:     60,
+         proc:        proc(&:to_i),
+         description: 'CloudWatch metric statistics period'
+
+  def print_statistics(statistics, config)
+    statistics.each do |key, stats|
+      r = client.get_metric_statistics(metrics_request(config).merge(metric_name: key, statistics: [stats]))
+      keys = [config[:scheme]]
+      keys.concat([key, stats])
+      unless r[:datapoints].first.nil?
+        output metric_name: keys.join('.'), value: r[:datapoints].first[stats.downcase]
+      end
+    end
+  end
+
+  def run
+    statistic = {
+      'AllowedRequests' => 'Sum',
+      'BlockedRequests' => 'Sum',
+      'CountedRequests' => 'Sum',
+      'PassedRequests' => 'Sum'
+    }
+
+    unless config[:metric].nil?
+      statistic.select! { |key, _| key == config[:metric] }
+    end
+
+    new_config = config.clone
+    new_config[:namespace] = 'WAF'
+    new_config[:dimensions] = [
+      {
+        name: 'WebACL',
+        value: 'SecurityAutomationsMaliciousRequesters'
+      },
+      {
+        name: 'Rule',
+        value: 'ALL'
+      }
+    ]
+
+    print_statistics(statistic, new_config)
+    ok
+  end
+end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-aws
 version: !ruby/object:Gem::Version
-  version: 11.3.1
+  version: 11.4.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-18 00:00:00.000000000 Z
+date: 2018-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -240,14 +240,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.9.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.9.11
 description: |-
   This plugin provides native AWS instrumentation
                                 for monitoring and metrics collection, including:
@@ -333,6 +333,7 @@ executables:
 - metrics-s3.rb
 - metrics-ses.rb
 - metrics-sqs.rb
+- metrics-waf.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -416,6 +417,7 @@ files:
 - bin/metrics-s3.rb
 - bin/metrics-ses.rb
 - bin/metrics-sqs.rb
+- bin/metrics-waf.rb
 - lib/sensu-plugins-aws.rb
 - lib/sensu-plugins-aws/cloudwatch-common.rb
 - lib/sensu-plugins-aws/common.rb