Skip to content

New Regex flag to filter container using Regex String. #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
parinapatel wants to merge 6 commits into
base: master
Choose a base branch
from
Open

New Regex flag to filter container using Regex String. #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c732771
New Regex flag to filter container using Regex String.
Sep 21, 2018
98dcf39
updated version file
Sep 21, 2018
14f1865
Fix CI failures due to `net-telnet` 0.2.0 not supporting ruby < 2.3 a…
majormoses Sep 23, 2018
4902ea4
Replace empty string check to nil
Oct 11, 2018
c96daea
Merge branch 'master' of github.com:parin921996/sensu-plugins-docker
Oct 11, 2018
3096fc5
Minor fixes
Oct 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ Which is based on [Keep A Changelog](http://keepachangelog.com/)

## [Unreleased]

### Added
- metrics-docker-stats.rb: New option `--container-list-regex` to filter containers using Regex String (@parin921996).

## [3.1.1] - 2018
### Fixed
- check-container-logs.rb: fix nil.gsub condition on empty log lines
Expand Down
17 changes: 17 additions & 0 deletions bin/metrics-docker-stats.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ class DockerStatsMetrics < Sensu::Plugin::Metric::CLI::Graphite
long: '--container-name CONTAINER',
default: ''

option :container_list_regex,
description: 'Regex for container list to collect metrics for',
short: '-R CONTAINER_LIST_REGEX',
long: '--container-list-regex CONTAINER_LIST_REGEX'

option :docker_host,
description: 'Docker API URI. https://host, https://host:port, http://host, http://host:port, host:port, unix:///path',
short: '-H DOCKER_HOST',
Expand Down Expand Up @@ -109,12 +114,24 @@ class DockerStatsMetrics < Sensu::Plugin::Metric::CLI::Graphite
boolean: true,
default: false

def create_container_list(container_list, pattern)
matched_list = []
container_list.each do |container|
if container =~ /#{pattern}/
matched_list.push(container)
end
end
matched_list
end

def run
@timestamp = Time.now.to_i
@client = DockerApi.new(config[:docker_host])

list = if config[:container] != ''
[config[:container]]
elsif !config[:container_list_regex].nil?
create_container_list(list_containers, config[:container_list_regex])
else
list_containers
end
Expand Down
2 changes: 2 additions & 0 deletions sensu-plugins-docker.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ Gem::Specification.new do |s|
s.add_development_dependency 'codeclimate-test-reporter', '~> 0.4'
s.add_development_dependency 'github-markup', '~> 1.3'
s.add_development_dependency 'kitchen-docker', '~> 2.6'
# TODO: remove this pin when we remove ruby 2.3 support, see: https://github.com/ruby/net-telnet/issues/14 for more information
s.add_development_dependency 'net-telnet', '0.1.1'
s.add_development_dependency 'pry', '~> 0.10'
s.add_development_dependency 'rake', '~> 10.0'
s.add_development_dependency 'redcarpet', '~> 3.2'
Expand Down