bin/metrics-rds.rb in sensu-plugins-aws-8.1.0 vs bin/metrics-rds.rb in sensu-plugins-aws-8.2.0

- old
+ new

@@ -32,10 +32,15 @@ require 'aws-sdk' require 'time' class RDSMetrics < Sensu::Plugin::Metric::CLI::Graphite include Common + option :scheme, + description: 'Metric naming scheme, text to prepend to metric', + short: '-s SCHEME', + long: '--scheme SCHEME' + option :aws_region, short: '-r AWS_REGION', long: '--aws-region REGION', description: 'AWS Region (defaults to us-east-1).', default: ENV['AWS_REGION'] @@ -118,13 +123,19 @@ @message = "#{config[:db_instance_id]}: " result = {} rdsname = @db_instance.db_instance_identifier + full_scheme = + if config[:scheme].nil? + rdsname + else + config[:scheme] + '.' + rdsname + end statistic_type.each do |key, _value| r = cloud_watch_metric key, rdsname - result[rdsname + '.' + key] = r[:datapoints][0] unless r[:datapoints][0].nil? + result[full_scheme + '.' + key] = r[:datapoints][0] unless r[:datapoints][0].nil? end unless result.nil? result.each do |key, value| output key.downcase.to_s, value.average, value[:timestamp].to_i end