sensu-plugins-dcos 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f5bef184b73bafd43bf11d77eeb36805130a8fe3
-  data.tar.gz: 9b20f2a650dbd83d4171dd4366affecf4fdede07
+SHA256:
+  metadata.gz: dfa5914cbbb7627eafcd35db775a0a83b38313548bfc97026e14e9417e8c57e8
+  data.tar.gz: f3d0711e149dc6253f9444496a9c1f63dd4756ddc8fe97dc0e169cfd5be2002a
 SHA512:
-  metadata.gz: 589059efd1c7f0adba27cdef8fe214a36a63a7654195f2531945c10e34164df1fe71174efbe3680a1dc1f739c854b07919baf75cbea1a5ccc86f7ed65b855e6f
-  data.tar.gz: 2635d39d94065930f64017e5435573b4015b949bb72279a639f7840b9bdfa2c263f42cc503e67f8a4506dd0e6ebfb8279be5b9df66087e37a3b1b8b2cf1ffca5
+  metadata.gz: a88a6c284fa0eb7c5ec7ed682af8668bf4d3e6e7d400cb69841a764667298dc699ec5b03fa4b03991b1254ceea4b378fa81ad30aaf4db90f6f0c0885a3429b5e
+  data.tar.gz: b894dfdb90803710a43a19ad0d674c264f41129452b9b17f3fce81f50f4da4a763401adcf55f2c9e41a48733f3194aee709467ba78d8bc533778024ea83d4085

data/CHANGELOG.md

@@ -6,6 +6,10 @@ Which is based on [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
 
+## [0.4.1] - 2018-01-15
+### Fixed
+- fixed the handling of empty container metrics issue from dcos-metrics
+
 ## [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)
@@ -65,7 +69,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.4.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-dcos/compare/0.4.1...HEAD
+[0.4.1]: https://github.com/sensu-plugins/sensu-plugins-dcos/compare/0.4.0...0.4.1
 [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

data/bin/metrics-dcos-containers.rb

@@ -69,6 +69,18 @@ class DCOSMetrics < Sensu::Plugin::Metric::CLI::Graphite
          required: false,
          default: '61001'
 
+  option :agent_ip_discovery_command,
+         description: 'DCOS agent ip discovery command',
+         long: '--agent-ip-discovery-command COMMAND',
+         required: false,
+         default: '/opt/mesosphere/bin/detect_ip'
+
+  option :agent_port,
+         description: 'DCOS agent port',
+         long: '--agent-port PORT',
+         required: false,
+         default: '5051'
+
   option :uri,
          description: 'Endpoint URI',
          short: '-u URI',
@@ -81,19 +93,47 @@ class DCOSMetrics < Sensu::Plugin::Metric::CLI::Graphite
          long: '--dimensions DIMENSIONS',
          required: false
 
+  def mesos_frameworks
+    # Return the memoized result if exists. This will ensure that the mesos
+    # state endpoint will be called only once and when needed and return the
+    # cached result immediately for subsequent calls.
+    return @mesos_frameworks if @mesos_frameworks
+    agent_ip = `#{config[:agent_ip_discovery_command]}`
+    state = get_data("http://#{agent_ip}:#{config[:agent_port]}/state")
+    @mesos_frameworks = {}
+    %w[frameworks completed_frameworks].each do |fw_key|
+      state[fw_key].each do |framework|
+        @mesos_frameworks[framework['id']] = framework['name']
+      end
+    end
+    @mesos_frameworks
+  end
+
+  def get_extra_tags(dimensions)
+    extra_tags = []
+    return extra_tags unless config[:dimensions]
+    config[:dimensions].tr(' ', '').split(',').each do |d|
+      # Special case for app metrics, framework_name dimension does not exist
+      # in app metrics and in some cases app metrics/dimensions are not
+      # available, see https://jira.mesosphere.com/browse/DCOS_OSS-2043 for
+      # upstream issue.
+      if d == 'framework_name' && !dimensions.key?('framework_name')
+        extra_tags.push(mesos_frameworks[dimensions['framework_id']])
+      else
+        extra_tags.push(dimensions[d])
+      end
+    end
+    extra_tags
+  end
+
   def run
     containers = get_data("http://#{config[:server]}:#{config[:port]}#{config[:uri]}")
     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|
+      containers.each do |container|
+        container_metrics = get_data("http://#{config[:server]}:#{config[:port]}#{config[:uri]}/#{container}")
+        if container_metrics.key?('datapoints')
+          extra_tags = get_extra_tags(container_metrics['dimensions'])
+          container_metrics['datapoints'].each do |metric|
             metric['name'].tr!('/', '.')
             metric['name'].squeeze!('.')
             output([config[:scheme], extra_tags, container, metric['unit'], metric['name']].compact.join('.'), metric['value'])
@@ -101,6 +141,10 @@ class DCOSMetrics < Sensu::Plugin::Metric::CLI::Graphite
         end
         app_metrics = get_data("http://#{config[:server]}:#{config[:port]}#{config[:uri]}/#{container}/app")
         next if app_metrics['datapoints'].nil?
+        app_dimensions = app_metrics['dimensions']
+        # merge container dimensions into app dimensions since app dimensions does have less
+        app_dimensions = container_metrics['dimensions'].merge(app_dimensions) if container_metrics.key?('dimensions')
+        extra_tags = get_extra_tags(app_dimensions)
         app_metrics['datapoints'].each do |metric|
           unless metric['tags'].nil?
             metric['tags'].each do |k, v|

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-dcos
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - PTC and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-20 00:00:00.000000000 Z
+date: 2018-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -274,15 +274,15 @@ description: |-
 email: "<sensu-users@googlegroups.com>"
 executables:
 - check-dcos-metrics.rb
-- check-dcos-node-health.rb
-- metrics-dcos-host.rb
+- metrics-dcos-containers.rb
 - check-dcos-container-count.rb
-- check-dcos-container-metrics.rb
+- check-dcos-node-health.rb
 - check-dcos-component-health.rb
-- check-dcos-jobs-health.rb
 - metrics-dcos-system-health.rb
+- metrics-dcos-host.rb
 - check-dcos-ping.rb
-- metrics-dcos-containers.rb
+- check-dcos-container-metrics.rb
+- check-dcos-jobs-health.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -328,7 +328,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for dcos-metrics checks and metrics