sensu-plugins-dcos 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72e507ad43fb1065b853a85b712d06ae861442e3
-  data.tar.gz: 8c559824697de4eb48e860fc0a92708d4d3c0392
+  metadata.gz: f5bef184b73bafd43bf11d77eeb36805130a8fe3
+  data.tar.gz: 9b20f2a650dbd83d4171dd4366affecf4fdede07
 SHA512:
-  metadata.gz: 958266b51628e79e1a34aed90cd901c260874f4cbeb6cffc81927212c8733ea030efc7d17389ba5b29d57c5bbd12d62fdae13384265dad4d0f1a68cb76bbf9a2
-  data.tar.gz: 9f56d654e5fdce81cf3fc84d576d5b67aab842579367b02a9962dc4118e875255dbaf689f2e44448046168ef0fcc52bcf9a4c28ec51c4baef0c15a9a824b9179
+  metadata.gz: 589059efd1c7f0adba27cdef8fe214a36a63a7654195f2531945c10e34164df1fe71174efbe3680a1dc1f739c854b07919baf75cbea1a5ccc86f7ed65b855e6f
+  data.tar.gz: 2635d39d94065930f64017e5435573b4015b949bb72279a639f7840b9bdfa2c263f42cc503e67f8a4506dd0e6ebfb8279be5b9df66087e37a3b1b8b2cf1ffca5

data/CHANGELOG.md

@@ -6,6 +6,11 @@ Which is based on [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
 
+## [0.4.0] - 2017-10-20
+### Added
+- todo item is added: metrics-dcos-containers.rb Add dimentions to the metric name framework_name, framework_role, executor_id (@1fox1)
+- added dimensions argument, argument takes a comma seperated list of the dimensions you wish to output (@1fox1)
+
 ## [0.3.0] - 2017-09-19
 ### Added
 - started re-testing all supported ruby versions again (@majormoses)
@@ -60,7 +65,8 @@ Which is based on [Keep A Changelog](http://keepachangelog.com/)
 ### Added
 - Initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-dcos/compare/0.3.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-dcos/compare/0.4.0...HEAD
+[0.4.0]: https://github.com/sensu-plugins/sensu-plugins-dcos/compare/0.3.0...0.4.0
 [0.3.0]: https://github.com/sensu-plugins/sensu-plugins-dcos/compare/0.2.1...0.3.0
 [0.2.1]: https://github.com/sensu-plugins/sensu-plugins-dcos/compare/0.1.1...0.2.1
 [0.1.1]: https://github.com/sensu-plugins/sensu-plugins-dcos/compare/0.1.0...0.1.1

data/README.md

@@ -9,12 +9,16 @@
 ## Functionality
 
 ## Files
- * bin/check-dcos-metrics.rb
- * check-dcos-container-metrics.rb
+ * bin/check-dcos-component-health.rb
  * bin/check-dcos-container-count.rb
+ * bin/check-dcos-container-metrics.rb
+ * bin/check-dcos-jobs-health.rb
  * bin/check-dcos-metrics.rb
+ * bin/check-dcos-node-health.rb
  * bin/check-dcos-ping.rb
- * bin/check-dcos-component-health.rb
+ * bin/metrics-dcos-containers.rb
+ * bin/metrics-dcos-host.rb
+ * bin/metrics-dcos-system-health.rb
 
 ## Usage
 
@@ -59,6 +63,9 @@ This is an example how to use this plugin to ship metrics to InfluxDB using the
 }
 ```
 
+metrics-dcos-containers.rb can be used in the same way to ship container metrics (from frameworks not apps) specify a comma seperated list of the dimensions you require in the oupput to the --dimensions flag. example metrics-dcos-containers.rb --dimensions 'framework_name,excutor_id'  
+
+
 ### Host Health Check
 
 The `check-dcos-ping.rb` will return `OK` if the host reports itself as heathy or `CRITICAL` otherwize

data/bin/metrics-dcos-containers.rb

@@ -39,8 +39,6 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
-# TODO:
-#    Add dimentions to the metric name (framework_name; framework_role, executor_id)
 
 require 'sensu-plugin/metric/cli'
 require 'json'
@@ -77,16 +75,28 @@ class DCOSMetrics < Sensu::Plugin::Metric::CLI::Graphite
          long: '--uri URI',
          default: '/system/v1/metrics/v0/containers'
 
+  option :dimensions,
+         description: 'comma seperated list of dimensions to add into the output',
+         short: '-d DIMENSIONS',
+         long: '--dimensions DIMENSIONS',
+         required: false
+
   def run
     containers = get_data("http://#{config[:server]}:#{config[:port]}#{config[:uri]}")
-    unless containers.nil? || containers.empty? # rubocop:desable Style/MultilineIfModifier
-      containers.each do |container|
+    unless containers.nil? || containers.empty?
+      containers.each do |container| # rubocop:disable Metrics/BlockLength
         all_metrics = get_data("http://#{config[:server]}:#{config[:port]}#{config[:uri]}/#{container}")
+        if config[:dimensions]
+          extra_tags = []
+          config[:dimensions].tr(' ', '').split(',').each do |d|
+            extra_tags.push(all_metrics['dimensions'][d]) if all_metrics['dimensions'][d]
+          end
+        end
         if all_metrics.key?('datapoints')
           all_metrics['datapoints'].each do |metric|
             metric['name'].tr!('/', '.')
             metric['name'].squeeze!('.')
-            output([config[:scheme], container, metric['unit'], metric['name']].join('.'), metric['value'])
+            output([config[:scheme], extra_tags, container, metric['unit'], metric['name']].compact.join('.'), metric['value'])
           end
         end
         app_metrics = get_data("http://#{config[:server]}:#{config[:port]}#{config[:uri]}/#{container}/app")
@@ -100,7 +110,7 @@ class DCOSMetrics < Sensu::Plugin::Metric::CLI::Graphite
           metric['name'].tr!('/', '.')
           metric['name'].squeeze!('.')
           metric['unit'] = 'na' if metric['unit'].empty?
-          output([config[:scheme], container, 'app', metric['unit'], metric['name']].join('.'), metric['value'])
+          output([config[:scheme], extra_tags, container, 'app', metric['unit'], metric['name']].compact.join('.'), metric['value'])
         end
       end
     end

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

@@ -3,7 +3,7 @@
 module SensuPluginsDcos
   module Version
     MAJOR = 0
-    MINOR = 3
+    MINOR = 4
     PATCH = 0
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-dcos
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - PTC and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-19 00:00:00.000000000 Z
+date: 2017-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -328,7 +328,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for dcos-metrics checks and metrics