sensu-plugins-ceph 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82da058290436a2a50ca288a5cce48691721c71b
-  data.tar.gz: 9f267a9dfb46ed3e0364d6053b434b4cc0de7646
+  metadata.gz: 93a68877548d810e932c6d3b36e3746543d8e4f0
+  data.tar.gz: dca6658840c0ce6a28b41f648fe41b66f9625b18
 SHA512:
-  metadata.gz: e43b4a99c9cf26dc0c933660761e3ab4df621ab1cf55b6a153af63c8480e5cbd47b44e32003cf37680c32d6f032f8d999f9262f2a242bcd0d59e69f053e6dc2b
-  data.tar.gz: d6da11a682a38a33fae3188c5c5c618201f5470b1a198b911bfa03079a89d2a6ce0981b322eccfe0d3abf31833ab614bfab6e5b48e2dbcc1317a4fef816fbc8c
+  metadata.gz: 6443f403216c08bf5615bae0052fa075445602fb58bf38c4ba1fe4e1bc6543b2dee9018f35dd2f4536b877dbbfa3eaf065af79f2c990500dd29b5b7665c31878
+  data.tar.gz: 0b1b600d1f443758359e3b4b596951832fca9cbae83bcd3e3f8bd6b4b23e89bdbe97d127f2c71c48892d871a9046533ffe031d42db02226cddfebc18b2c0769c

checksums.yaml.gz.sig

@@ -1,2 +1 @@
-A1���W]J�����@��s��O���w��U��Ӗެ�@���1�'�t�>c!�V��������ңȆ�Kٻݴ$"�v�p�E���|��zKT�����1������v��%��K�t�$Nu/ZOZy
-��vi��b���hM�[+�C��`�z����P�m���Z���[[��2qbR��A����x�!��rU#K���qzZ	�mke�M�6U�za~�sn�ޘYV��P�<v�SR�����eo�o|��>�ar'r�c
+Q��O��B���oHcD��v>D�=+�-pYY��Ǘ޽H���ҫq�O����m����9尞œ���~��X���)|2gIH�{�
v

data/CHANGELOG.md

@@ -6,6 +6,14 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ## Unreleased
 - nothing
 
+## [0.0.5] - 2015-11-26
+### Added
+- include client name option when interacting with ceph
+- metrics script
+### Fixes
+- use upstram output
+- default prefix includes hostname
+
 ## [0.0.4] - 2015-07-31
 ### Changed
 - updated documentation links

data/bin/check-ceph.rb

@@ -64,6 +64,12 @@ class CheckCephHealth < Sensu::Plugin::Check::CLI
          long: '--cluster',
          proc: proc { |c| " --cluster=#{c}" }
 
+  option :name,
+         description: 'Optional client name',
+         short: '-n NAME',
+         long: '--name',
+         proc: proc { |n| " --name=#{n}" }
+
   option :timeout,
          description: 'Timeout (default 10)',
          short: '-t SEC',
@@ -91,12 +97,13 @@ class CheckCephHealth < Sensu::Plugin::Check::CLI
          boolean: true,
          default: false
 
-  def run_cmd(cmd) # rubocop:disable all
+  def run_cmd(cmd)
     pipe, status = nil
     begin
       cmd += config[:cluster] if config[:cluster]
       cmd += config[:keyring] if config[:keyring]
       cmd += config[:monitor] if config[:monitor]
+      cmd += config[:name] if config[:name]
       cmd += ' 2>&1'
       Timeout.timeout(config[:timeout]) do
         pipe = IO.popen(cmd)
@@ -136,7 +143,7 @@ class CheckCephHealth < Sensu::Plugin::Check::CLI
     end
   end
 
-  def run # rubocop:disable all
+  def run
     result = check_ceph_health
     ok result if result.start_with?('HEALTH_OK')
 

data/bin/metrics-ceph-osd.rb

@@ -68,9 +68,9 @@ class CephOsdMetrics < Sensu::Plugin::Metric::CLI::Graphite
     end
   end
 
-  def run # rubocop:disable all
+  def run
     # #YELLOW
-    Dir.glob(config[:pattern]).each do |socket| # rubocop:disable Style/Next
+    Dir.glob(config[:pattern]).each do |socket|
       data = `ceph --admin-daemon #{socket} perf dump`
       if $CHILD_STATUS.exitstatus == 0
         # Left side of wildcard

data/bin/metrics-ceph.rb

@@ -0,0 +1,117 @@
+#! /usr/bin/env ruby
+#
+# metrics-ceph
+#
+# DESCRIPTION:
+#   Overall ceph throughput
+#
+# OUTPUT:
+#   metric data
+#
+# PLATFORMS:
+#   Linux
+#
+# DEPENDENCIES:
+#   gem: sensu-plugin
+#   gem: english
+#   ceph client
+#
+# USAGE:
+#   #YELLOW
+#
+# NOTES:
+#   Runs 'ceph status' command to output cluster status and metrics,
+#   May need read access to ceph keyring and/or root access for
+#   authentication.
+#
+# LICENSE:
+#   Released under the same terms as Sensu (the MIT license); see LICENSE
+#   for details.
+#
+
+require 'sensu-plugin/metric/cli'
+require 'json'
+require 'timeout'
+require 'English'
+require 'socket'
+
+class CephMetrics < Sensu::Plugin::Metric::CLI::Graphite
+  option :keyring,
+         description: 'Path to cephx authentication keyring file',
+         short: '-k KEY',
+         long: '--keyring',
+         proc: proc { |k| " -k #{k}" }
+
+  option :monitor,
+         description: 'Optional monitor IP',
+         short: '-m MON',
+         long: '--monitor',
+         proc: proc { |m| " -m #{m}" }
+
+  option :cluster,
+         description: 'Optional cluster name',
+         short: '-c NAME',
+         long: '--cluster',
+         proc: proc { |c| " --cluster=#{c}" }
+
+  option :name,
+         description: 'Optional client name',
+         short: '-n NAME',
+         long: '--name',
+         proc: proc { |n| " --name=#{n}" }
+
+  option :timeout,
+         description: 'Timeout (default 10)',
+         short: '-t SEC',
+         long: '--timeout',
+         proc: proc(&:to_i),
+         default: 10
+
+  option :prefix,
+         description: 'Metric prefix',
+         short: '-p PREFIX',
+         long: '--prefix',
+         default: "#{Socket.gethostname}.ceph"
+
+  def run_cmd(cmd)
+    pipe, status = nil
+    begin
+      cmd += config[:cluster] if config[:cluster]
+      cmd += config[:keyring] if config[:keyring]
+      cmd += config[:monitor] if config[:monitor]
+      cmd += config[:name] if config[:name]
+      cmd += ' 2>&1'
+      Timeout.timeout(config[:timeout]) do
+        pipe = IO.popen(cmd)
+        Process.wait(pipe.pid)
+        status = $CHILD_STATUS.exitstatus
+      end
+    rescue Timeout::Error
+      begin
+        Process.kill(9, pipe.pid)
+        Process.wait(pipe.pid)
+      rescue Errno::ESRCH, Errno::EPERM
+        # Catch errors from trying to kill the timed-out process
+        # We must do something here to stop travis complaining
+        critical 'Execution timed out'
+      ensure
+        critical 'Execution timed out'
+      end
+    end
+    output = pipe.read
+    critical "Command '#{cmd}' returned no output" if output.to_s == ''
+    critical output unless status == 0
+    output
+  end
+
+  def run
+    result = run_cmd('ceph status --format=json')
+    data = JSON.parse(result)
+    ignore_keys = %w(pgs_by_state version)
+    timestamp = Time.now.to_i
+    data['pgmap'].each do |key, val|
+      output "#{config[:prefix]}.#{key}", val, timestamp unless ignore_keys.include? key
+    end
+    ok
+  end
+end

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-ceph
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Sensu Plugins and contributors
@@ -30,7 +30,7 @@ cert_chain:
   8sHuVruarogxxKPBzlL2is4EUb6oN/RdpGx2l4254+nyR+abg//Ed27Ym0PkB4lk
   HP0m8WSjZmFr109pE/sVsM5jtOCvogyujQOjNVGN4gz1wwPr
   -----END CERTIFICATE-----
-date: 2015-07-31 00:00:00.000000000 Z
+date: 2015-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: english
@@ -189,6 +189,7 @@ dependencies:
 description: Sensu plugins for ceph
 email: "<sensu-users@googlegroups.com>"
 executables:
+- metrics-ceph.rb
 - metrics-ceph-osd.rb
 - check-ceph.rb
 extensions: []
@@ -199,6 +200,7 @@ files:
 - README.md
 - bin/check-ceph.rb
 - bin/metrics-ceph-osd.rb
+- bin/metrics-ceph.rb
 - lib/sensu-plugins-ceph.rb
 - lib/sensu-plugins-ceph/version.rb
 homepage: https://github.com/sensu-plugins/sensu-plugins-ceph
@@ -227,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for ceph