sensu-plugins-vsphere 0.1.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c618fc17950229282d819c2b173f1c79e4e9edd9
-  data.tar.gz: d0fec8c6153f07024be6d09f3ffc0001fbf426fd
+SHA256:
+  metadata.gz: 6921eacbded2bf97ddd89deef66667ada03d4b314a7c3fadd950afc4cd5c5e2c
+  data.tar.gz: bf04b9603c2baf30fe9ac9264819c56719d1a74831aaaaf67f57cda318cd1951
 SHA512:
-  metadata.gz: 706a2574669a7bbb5146738c91c866f5338b2a5fe182d20bf6e9ab3a50ce698d8775abc086777d5ec46f6208779d91e1ab44ed16f8543fa0c420961f7534bb6c
-  data.tar.gz: de3bf7b5a1e22edbdbb4aa16a00ba3f37d7a9b4132bf5a0fb20243e07c2c1a97fc1a6bbced970be34e6d8ec62ffe079f5fbbfca71ceb4466fd21b9115af5f90b
+  metadata.gz: 663ce3df3f45b13d3f26bfaffaa925423c8c6d276bfe5162c2e8d0ea7797e05eba6c1bed8b69cf4cb84d174bbacc79b8885d4c850291f4f214b98d9bb00c3b41
+  data.tar.gz: 0961ffdf6715502ebde1067c48ce73e6033b3efa85632936191c4c851768091a2b621f3fdccfb42510dfe56eb8818e6b6053027482be789bd642f66c8818957f

data/CHANGELOG.md

@@ -5,6 +5,13 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## Unreleased
 
+## [1.0.0] - 2018-05-03
+### Breaking Changes
+- bumped dependency of `sensu-plugin` to 2.4 you can read about it [here](https://github.com/sensu-plugins/sensu-plugin/blob/master/CHANGELOG.md#240---2018-02-08)
+
+### Added
+- Added ability to find machines (@yuri-zubov)
+
 ## [0.1.1] - 2018-02-27
 ### Security
 - updated rubocop dependency to `~> 0.51.0` per: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-8418 (@majormoses)
@@ -21,6 +28,7 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 ### Breaking Changes
 - removed ruby 2.0 support (@majormoses)
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-vsphere/compare/0.1.1...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-vsphere/compare/1.0.0...HEAD
+[1.0.0]: https://github.com/sensu-plugins/sensu-plugins-vsphere/compare/0.1.1...1.0.0
 [0.1.1]: https://github.com/sensu-plugins/sensu-plugins-vsphere/compare/0.1.0...0.1.1
 [0.1.0]: https://github.com/sensu-plugins/sensu-plugins-vsphere/compare/ec87eef66e3c4f28f13072176c517dc02cd57aa4...0.1.0

data/bin/metrics-vsphere.rb

@@ -30,7 +30,7 @@ require 'rbvmomi'
 #
 # VSphere Graphite
 #
-class VsphereGraphite < Sensu::Plugin::Metric::CLI::Graphite
+class VsphereGraphite < Sensu::Plugin::Metric::CLI::Generic
   option :host,
          description: 'ESX or ESXi hostname',
          short: '-H HOST',
@@ -79,8 +79,8 @@ class VsphereGraphite < Sensu::Plugin::Metric::CLI::Graphite
 
   option :period,
          description: ' Sampling Period in seconds. Basic historic intervals: 300, 1800, 7200 or 86400. See config for any changes.',
-         short: '-p',
-         long: '--period',
+         short: '-r PERIOD',
+         long: '--period PERIOD',
          proc: proc(&:to_i),
          default: 300
 
@@ -90,6 +90,10 @@ class VsphereGraphite < Sensu::Plugin::Metric::CLI::Graphite
          long: '--scheme SCHEME',
          default: "#{Socket.gethostname}.vsphere"
 
+  option :find_resource,
+         description: 'Help to find resource and path to it',
+         long: '--find_resource NAME'
+
   def vim
     @vim ||= RbVmomi::VIM.connect(
       host: config[:host],
@@ -99,6 +103,37 @@ class VsphereGraphite < Sensu::Plugin::Metric::CLI::Graphite
     )
   end
 
+  def build_tree_resources(datacenters)
+    result = {}
+    datacenters.grep(RbVmomi::VIM::Datacenter) do |datacenter|
+      result[datacenter] ||= {}
+      datacenter.hostFolder.children.grep(RbVmomi::VIM::ComputeResource) do |compute_resource|
+        result[datacenter][compute_resource] ||= {}
+        compute_resource.host.grep(RbVmomi::VIM::HostSystem) do |host_system|
+          result[datacenter][compute_resource][host_system] ||= {}
+          host_system.vm.grep(RbVmomi::VIM::VirtualMachine) do |virtual_machine|
+            result[datacenter][compute_resource][host_system][virtual_machine] = nil
+          end
+        end
+      end
+    end
+    result
+  end
+
+  def find_resource_by_name(resources, name, path = '')
+    result = []
+    resources.each do |key, value|
+      new_path = "#{path}=> #{key.name}"
+      if key.name == name
+        result << new_path
+      end
+
+      result += find_resource_by_name(value, name, new_path) if value
+    end
+
+    result
+  end
+
   def find_or_take_first(resources, resource_name)
     result = nil
     if resource_name
@@ -124,46 +159,59 @@ class VsphereGraphite < Sensu::Plugin::Metric::CLI::Graphite
 
   def run
     data_centers = vim.serviceInstance.content.rootFolder.childEntity.grep(RbVmomi::VIM::Datacenter)
-    dc = find_or_take_first(data_centers, config[:data_center])
-
-    pm = vim.serviceInstance.content.perfManager
 
-    compute_resources = dc.hostFolder.children.grep(RbVmomi::VIM::ComputeResource)
-    if config[:vm_name] || config[:host_name] || config[:compute_resource]
-      compute_resource = find_or_take_first(compute_resources, config[:compute_resource])
-    end
-    host = find_or_take_first(compute_resource.host, config[:host_name]) if config[:vm_name] || config[:host_name]
-
-    if config[:vm_name]
-      vms = host.vm.grep(RbVmomi::VIM::VirtualMachine)
-      resource = find_or_take_first(vms, config[:vm_name])
-    elsif config[:host_name]
-      resource = host
-    elsif config[:compute_resource] && compute_resource.is_a?(RbVmomi::VIM::ClusterComputeResource)
-      resource = compute_resource
+    if config[:find_resource]
+      result = find_resource_by_name(build_tree_resources(data_centers), config[:find_resource])
+      if result.empty?
+        puts 'Not found'
+      else
+        result.each do |line|
+          puts line
+        end
+      end
+      ok
     else
-      resource = dc
-    end
+      dc = find_or_take_first(data_centers, config[:data_center])
+      pm = vim.serviceInstance.content.perfManager
 
-    regexp = Regexp.new("^#{config[:command_type]}")
-    stats_hash = {
-      multi_instance: true,
-      interval: config[:period],
-      start_time: (Time.now - config[:period])
-    }
-    metrics = pm.retrieve_stats([resource],
-                                [],
-                                stats_hash)
-
-    if metrics
-      filtered_metrics = metrics[resource][:metrics].select { |(metric, _), _| metric.to_s.match(regexp) && metric }
-      filtered_metrics.each do |(metric, instance), value|
-        output "#{config[:scheme]}.#{[instance, metric].flatten.reject { |e| e == '' }.join('.')}", value.first
+      compute_resources = dc.hostFolder.children.grep(RbVmomi::VIM::ComputeResource)
+      if config[:vm_name] || config[:host_name] || config[:compute_resource]
+        compute_resource = find_or_take_first(compute_resources, config[:compute_resource])
+      end
+      host = find_or_take_first(compute_resource.host, config[:host_name]) if config[:vm_name] || config[:host_name]
+
+      if config[:vm_name]
+        vms = host.vm.grep(RbVmomi::VIM::VirtualMachine)
+        resource = find_or_take_first(vms, config[:vm_name])
+      elsif config[:host_name]
+        resource = host
+      elsif config[:compute_resource] && compute_resource.is_a?(RbVmomi::VIM::ClusterComputeResource)
+        resource = compute_resource
+      else
+        resource = dc
       end
 
-      ok
-    else
-      warning
+      regexp = Regexp.new("^#{config[:command_type]}")
+      metrics = pm.retrieve_stats([resource],
+                                  [],
+                                  multi_instance: true, interval: config[:period],
+                                  start_time: (Time.now - config[:period] * 10))
+
+      if metrics
+        timestamp = metrics[resource][:sampleInfo].first[:timestamp].to_i
+        filtered_metrics = metrics[resource][:metrics].select { |(metric, _), _| metric.to_s.match(regexp) && metric }
+        filtered_metrics.each do |(metric, instance), value|
+          output(
+            metric_name: "#{config[:scheme]}.#{[instance, metric].flatten.reject { |e| e == '' }.join('.')}",
+            value: value.first,
+            timestamp: timestamp
+          )
+        end
+
+        ok
+      else
+        warning
+      end
     end
   end
 end

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

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

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-27 00:00:00.000000000 Z
+date: 2018-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sensu-plugin
+  name: rbvmomi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.11.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.11.6
 - !ruby/object:Gem::Dependency
-  name: rbvmomi
+  name: sensu-plugin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.6
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.6
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -203,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for vSphere