sensu-plugins-cpu-checks 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55e3ae922696b6984288e8ffe3ecb1868b18898ae495f6c624465443b990815d
-  data.tar.gz: 874ee5b3b456775a16f637ff9034df18accfa09f853c20b40472ac35489f96ca
+  metadata.gz: 5c35d99b197f2c02882d0ed2f782386437368deea7bce60099a52efb41648e7c
+  data.tar.gz: d96d35dfff48d9cf6606c4b060176bbcd91f271c52b216255c3b181704766028
 SHA512:
-  metadata.gz: 4c738aa70f8fb2f5addd7d32e5e1980d80b32a259e2b0f0d3bce8201c847f4f97b507b9b392042bc0466d761972b0bdccfa9673f198b53c1de6e1abe6e0d50e2
-  data.tar.gz: d5fa90907cfe760211081103fd0ec634433f2b33110aa2e84968a1861af5454ef30b38e45c7ae63610b45252e095c85ddf00c675d03b8eba9a5bf59d1744acd5
+  metadata.gz: 364bc2203e9f747e33c34621bec7a2e1b6d61535fd7730b9933e3f119130d1fc5abeb0f859358c32250d0794b0f537729c7f070503104dce6d45841af1f3dd7d
+  data.tar.gz: 32b8cd8665438156b8d06ae7f34f7e521fca4a83b9a0e65012bd76865835242c027bc78068ceaa0076034119895c0d4d0886b0ede3462db9b656caa827c185d1

data/CHANGELOG.md

@@ -5,6 +5,12 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [Unreleased]
 
+## [2.1.0] - 2018-04-2018
+### Added
+- Added metrics-cpu-interrupts.rb (@yuri-zubov sponsored by Actility, https://www.actility.com)
+- Added metrics-cpu-softirqs.rb (@yuri-zubov sponsored by Actility, https://www.actility.com)
+- Added metrics-softnet-stat.rb (@yuri-zubov sponsored by Actility, https://www.actility.com)
+
 ## [2.0.1] - 2018-03-27
 ### Security
 - updated yard dependency to `~> 0.9.11` per: https://nvd.nist.gov/vuln/detail/CVE-2017-17042 (@majormoses)
@@ -83,7 +89,8 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 - initial release
 
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-cpu-checks/compare/2.0.1...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-cpu-checks/compare/2.1.0...HEAD
+[2.1.0]: https://github.com/sensu-plugins/sensu-plugins-cpu-checks/compare/2.0.1...2.1.0
 [2.0.1]: https://github.com/sensu-plugins/sensu-plugins-cpu-checks/compare/2.0.0...2.0.1
 [2.0.0]: https://github.com/sensu-plugins/sensu-plugins-cpu-checks/compare/1.1.3...2.0.0
 [1.1.3]: https://github.com/sensu-plugins/sensu-plugins-cpu-checks/compare/1.1.2...1.1.3

data/bin/metrics-cpu-interrupts.rb

@@ -0,0 +1,49 @@
+#! /usr/bin/env ruby
+#
+#   metrics-cpu-interrupts
+#
+# DESCRIPTION:
+#
+# OUTPUT:
+#   metric data
+#
+# PLATFORMS:
+#   Linux
+#
+# DEPENDENCIES:
+#   gem: sensu-plugin
+#
+# USAGE:
+#
+# NOTES:
+#
+# LICENSE:
+#   Zubov Yuri <yury.zubau@gmail.com> sponsored by Actility, https://www.actility.com
+#   Released under the same terms as Sensu (the MIT license); see LICENSE
+#   for details.
+#
+require 'sensu-plugin/metric/cli'
+require 'sensu-plugins-cpu-checks'
+require 'socket'
+
+#
+# CPU Graphite
+#
+class MetricsCPUInterrupts < Sensu::Plugin::Metric::CLI::Graphite
+  include SensuPluginsCpuChecks::CommonInterrupts
+  option :scheme,
+         description: 'Metric naming scheme, text to prepend to metric',
+         short: '-s SCHEME',
+         long: '--scheme SCHEME',
+         default: "#{Socket.gethostname}.interrupts"
+
+  option :proc_path,
+         long: '--proc-path /proc',
+         proc: proc(&:to_s),
+         default: '/proc'
+
+  def run
+    output_metrics('interrupts')
+    ok
+  end
+end

data/bin/metrics-cpu-softirqs.rb

@@ -0,0 +1,49 @@
+#! /usr/bin/env ruby
+#
+#   metrics-cpu-softirqs
+#
+# DESCRIPTION:
+#
+# OUTPUT:
+#   metric data
+#
+# PLATFORMS:
+#   Linux
+#
+# DEPENDENCIES:
+#   gem: sensu-plugin
+#
+# USAGE:
+#
+# NOTES:
+#
+# LICENSE:
+#   Zubov Yuri <yury.zubau@gmail.com> sponsored by Actility, https://www.actility.com
+#   Released under the same terms as Sensu (the MIT license); see LICENSE
+#   for details.
+#
+require 'sensu-plugin/metric/cli'
+require 'sensu-plugins-cpu-checks'
+require 'socket'
+
+#
+# CPU Graphite
+#
+class MetricsCPUSoftirqs < Sensu::Plugin::Metric::CLI::Graphite
+  include SensuPluginsCpuChecks::CommonInterrupts
+  option :scheme,
+         description: 'Metric naming scheme, text to prepend to metric',
+         short: '-s SCHEME',
+         long: '--scheme SCHEME',
+         default: "#{Socket.gethostname}.softirqs"
+
+  option :proc_path,
+         long: '--proc-path /proc',
+         proc: proc(&:to_s),
+         default: '/proc'
+
+  def run
+    output_metrics('softirqs')
+    ok
+  end
+end

data/bin/metrics-cpu.rb

@@ -59,7 +59,7 @@ class CpuGraphite < Sensu::Plugin::Metric::CLI::Graphite
 
       output "#{config[:scheme]}.#{name}", info.first if other_metrics.include? name
     end
-    if cpu_count > 0
+    if cpu_count.positive?
       # writes the number of cpus, the minus 1 is because /proc/stat/
       # first line is a "cpu" which is stats for total cpus
       output "#{config[:scheme]}.cpu_count", cpu_count - 1

data/bin/metrics-softnet-stat.rb

@@ -0,0 +1,55 @@
+#! /usr/bin/env ruby
+#
+#   metrics-softnet-stat
+#
+# DESCRIPTION:
+#
+# OUTPUT:
+#   metric data
+#
+# PLATFORMS:
+#   Linux
+#
+# DEPENDENCIES:
+#   gem: sensu-plugin
+#
+# USAGE:
+#
+# NOTES:
+#
+# LICENSE:
+#   Zubov Yuri <yury.zubau@gmail.com> sponsored by Actility, https://www.actility.com
+#   Released under the same terms as Sensu (the MIT license); see LICENSE
+#   for details.
+#
+require 'sensu-plugin/metric/cli'
+require 'socket'
+
+#
+# CPU Graphite
+#
+class MetricsSoftnetStat < Sensu::Plugin::Metric::CLI::Graphite
+  option :scheme,
+         description: 'Metric naming scheme, text to prepend to metric',
+         short: '-s SCHEME',
+         long: '--scheme SCHEME',
+         default: "#{Socket.gethostname}.softnet-stat"
+
+  option :proc_path,
+         long: '--proc-path /proc',
+         proc: proc(&:to_s),
+         default: '/proc'
+
+  def run
+    name_metrics = %w[processed dropped time_squeeze cpu_collision received_rps flow_limit_count]
+
+    File.open("#{config[:proc_path]}/net/softnet_stat", 'r').each_line.with_index do |line, cpu_index|
+      result = line.split(' ')
+      array = result[0..2] + result[-3..-1]
+      array.each_with_index do |value, index|
+        output "#{config[:scheme]}.CPU#{cpu_index}.#{name_metrics[index]}", value.to_i(16)
+      end
+    end
+    ok
+  end
+end

data/lib/sensu-plugins-cpu-checks.rb

@@ -1 +1,2 @@
 require 'sensu-plugins-cpu-checks/version'
+require 'sensu-plugins-cpu-checks/common_interrupts'

data/lib/sensu-plugins-cpu-checks/common_interrupts.rb

@@ -0,0 +1,31 @@
+module SensuPluginsCpuChecks
+  module CommonInterrupts
+    def build_regexp(line)
+      regexp_string = '[[:space:]]*(?<irq_number>.+):'
+      cpu_list = line.scan(/CPU\d+/)
+      cpu_list.each do |name|
+        regexp_string += "[[:space:]]*(?<#{name}>\\d+)"
+      end
+      regexp_string += '[[:space:]]*(?<irq_type>.*)'
+      [Regexp.new(regexp_string), cpu_list]
+    end
+
+    def output_metrics(filename)
+      regexp = nil
+      cpu_list = []
+      File.open("#{config[:proc_path]}/#{filename}", 'r').each_line.with_index do |line, index|
+        if index.zero?
+          regexp, cpu_list = build_regexp(line)
+        else
+          result = line.match(regexp)
+          if result
+            cpu_list.each do |name|
+              key = [config[:scheme], name, result[:irq_type].split.join('-'), result[:irq_number]].reject(&:empty?)
+              output key.join('.').to_s, result[name]
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sensu-plugins-cpu-checks/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-cpu-checks
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Sensu Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-27 00:00:00.000000000 Z
+date: 2018-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -171,10 +171,13 @@ description: |-
 email: "<sensu-users@googlegroups.com>"
 executables:
 - check-cpu.rb
+- metrics-cpu-interrupts.rb
 - metrics-cpu-mpstat.rb
 - metrics-cpu-pcnt-usage.rb
+- metrics-cpu-softirqs.rb
 - metrics-cpu.rb
 - metrics-numastat.rb
+- metrics-softnet-stat.rb
 - metrics-user-pct-usage.rb
 extensions: []
 extra_rdoc_files: []
@@ -184,12 +187,16 @@ files:
 - README.md
 - bin/check-cpu.rb
 - bin/check-cpu.sh
+- bin/metrics-cpu-interrupts.rb
 - bin/metrics-cpu-mpstat.rb
 - bin/metrics-cpu-pcnt-usage.rb
+- bin/metrics-cpu-softirqs.rb
 - bin/metrics-cpu.rb
 - bin/metrics-numastat.rb
+- bin/metrics-softnet-stat.rb
 - bin/metrics-user-pct-usage.rb
 - lib/sensu-plugins-cpu-checks.rb
+- lib/sensu-plugins-cpu-checks/common_interrupts.rb
 - lib/sensu-plugins-cpu-checks/version.rb
 homepage: https://github.com/sensu-plugins/sensu-plugins-cpu-checks
 licenses: