Skip to content

Commit

Permalink
deploy
Browse files Browse the repository at this point in the history
  • Loading branch information
Matt Jones committed Aug 12, 2015
1 parent 8183cd9 commit 5df82a7
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 16 deletions.
20 changes: 12 additions & 8 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).

This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)

## Unreleased
## [Unreleased][unreleased]

## [0.1.2] - 2015-08-11
### Added
- add parameters for elasticsearch auth

Expand All @@ -12,7 +14,6 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
- updated sensu-plugin gem to 1.2.0

## [0.1.0] - 2015-07-06

### Added
- `check-es-node-status` node status check

Expand All @@ -25,16 +26,19 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
- put deps in alpha order in gemspec
- update documentation links in README and CONTRIBUTING

## 0.0.1 - 2015-05-21

### Added
- initial release

## [0.0.2] - 2015-06-02

### Fixed
- added binstubs

### Changed
- removed cruft from /lib

## 0.0.1 - 2015-05-21
### Added
- initial release

[unreleased]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/0.1.2...HEAD
[0.1.2]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/0.1.1...0.1.2
[0.1.1]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/0.1.0...0.1.1
[0.1.0]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/0.0.2...0.1.0
[0.0.2]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/0.0.1...0.0.2
2 changes: 1 addition & 1 deletion bin/check-es-file-descriptors.rb
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def acquire_max_fds
end
end

def run # rubocop:disable all
def run
open = acquire_open_fds
max = acquire_max_fds
used_percent = ((open.to_f / max.to_f) * 100).to_i
Expand Down
4 changes: 2 additions & 2 deletions bin/check-es-heap.rb
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def acquire_es_resource(resource)
warning 'Elasticsearch API returned invalid JSON'
end

def acquire_heap_data(return_max = false) # rubocop:disable all
def acquire_heap_data(return_max = false)
if Gem::Version.new(acquire_es_version) >= Gem::Version.new('1.0.0')
stats = acquire_es_resource('/_nodes/_local/stats?jvm=true')
node = stats['nodes'].keys.first
Expand All @@ -125,7 +125,7 @@ def acquire_heap_data(return_max = false) # rubocop:disable all
end
end

def run # rubocop:disable all
def run
if config[:percentage]
heap_used, heap_max = acquire_heap_data(true)
heap_used_ratio = ((100 * heap_used) / heap_max).to_i
Expand Down
4 changes: 2 additions & 2 deletions bin/metrics-es-node-graphite.rb
Original file line number Diff line number Diff line change
Expand Up @@ -210,15 +210,15 @@ def run # rubocop:disable all
node['indices'].each do |type, index|
index.each do |k, v|
# #YELLOW
unless k =~ /(_time$)/ || v =~ /\d+/ # rubocop:disable IfUnlessModifier
unless k =~ /(_time$)/ || v =~ /\d+/
metrics["indices.#{type}.#{k}"] = v
end
end
end

node['transport'].each do |k, v|
# #YELLOW
unless k =~ /(_size$)/ # rubocop:disable IfUnlessModifier
unless k =~ /(_size$)/
metrics["transport.#{k}"] = v
end
end
Expand Down
2 changes: 1 addition & 1 deletion bin/metrics-es-node.rb
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class ESMetrics < Sensu::Plugin::Metric::CLI::Graphite
short: '-P PASS',
long: '--password PASS'

def run # rubocop:disable all
def run
headers = {}
if config[:user] && config[:password]
auth = 'Basic ' + Base64.encode64("#{config[:user]}:#{config[:password]}").chomp
Expand Down
2 changes: 1 addition & 1 deletion lib/sensu-plugins-elasticsearch/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module SensuPluginsElasticsearch
module Version
MAJOR = 0
MINOR = 1
PATCH = 1
PATCH = 2

VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
end
Expand Down
2 changes: 1 addition & 1 deletion sensu-plugins-elasticsearch.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Gem::Specification.new do |s|
s.add_development_dependency 'pry', '~> 0.10'
s.add_development_dependency 'rake', '~> 10.0'
s.add_development_dependency 'redcarpet', '~> 3.2'
s.add_development_dependency 'rubocop', '0.30'
s.add_development_dependency 'rubocop', '0.32.1'
s.add_development_dependency 'rspec', '~> 3.1'
s.add_development_dependency 'yard', '~> 0.8'
end

0 comments on commit 5df82a7

Please sign in to comment.