sensu-plugins-nginx 0.0.6 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cc0a2122ad36a866b456269567c28e1dc90afc4
-  data.tar.gz: 50cd2bb952354c97cb18d67f025df1e0ea8bd113
+  metadata.gz: 4929bc899f1b85b16f1568ae7cf81524895b7ee6
+  data.tar.gz: 50943d1afac42702f95a50ac2751da88171c3f20
 SHA512:
-  metadata.gz: 360688aff8cf8a453d4bdf43b4e01dd1d79a82abfe8742247691aab97f5a60dd3b4d332861a9c77c3cee8209f4ed65647f6ddead4301da878d6cb6d035511371
-  data.tar.gz: 66e1dd76f5ebcbaa0a6e906176ca593671df034a9c748a140ce5f36627542f38172498cb5a03517389de5c4e07aa85e546292dd95cc888bdafa2cb5fe30f8c42
+  metadata.gz: d0acdcb24b8fb792989353206aee966bece39b930c2e6133a9df6259e2813f544d710352773131fb60cb99073ade348e8bdaa76aa0cb4c60de2102c4360644db
+  data.tar.gz: 668fa7cccc1096cee779fadd1db308e3f4d7ff9913b4efe9c34f38242ff28ce5ce9e45d641d28439876b33e051ac0014f549762de99425dc485a41762feb25e8

data/CHANGELOG.md

@@ -4,7 +4,17 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## Unreleased
--nothing
+
+[1.0.0] - 2015-12-03
+### Added
+- metrics-nginx.rb: Added default hostname of 'localhost'
+- metrics-nginx.rb: Added usage
+
+### Removed
+- Removed nginx-metrics.rb; use metrics-nginx.rb instead
+
+### Changed
+- Update to rubocop 0.32.1
 
 ## [0.0.6] - 2015-08-04
 ### Changed
@@ -13,7 +23,6 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ## [0.0.5] - 2015-07-15
 - bump version due to wrong file name, no code changes
 
-
 ## [0.0.4] - 2015-07-14 **YANKED**
 ### Changed
 - updated sensu-plugin gem to 1.2.0

data/README.md

@@ -1,20 +1,20 @@
 ## Sensu-Plugins-nginx
 
-[ ![Build Status](https://travis-ci.org/sensu-plugins/sensu-plugins-nginx.svg?branch=master)](https://travis-ci.org/sensu-plugins/sensu-plugins-nginx)
+[![Build Status](https://travis-ci.org/sensu-plugins/sensu-plugins-nginx.svg?branch=master)](https://travis-ci.org/sensu-plugins/sensu-plugins-nginx)
 [![Gem Version](https://badge.fury.io/rb/sensu-plugins-nginx.svg)](http://badge.fury.io/rb/sensu-plugins-nginx)
 [![Code Climate](https://codeclimate.com/github/sensu-plugins/sensu-plugins-nginx/badges/gpa.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-nginx)
 [![Test Coverage](https://codeclimate.com/github/sensu-plugins/sensu-plugins-nginx/badges/coverage.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-nginx)
 [![Dependency Status](https://gemnasium.com/sensu-plugins/sensu-plugins-nginx.svg)](https://gemnasium.com/sensu-plugins/sensu-plugins-nginx)
-[ ![Codeship Status for sensu-plugins/sensu-plugins-nginx](https://codeship.com/projects/cb4b6810-cb1c-0132-b746-0ab4e5d2e01d/status?branch=master)](https://codeship.com/projects/75658)
+[![Codeship Status for sensu-plugins/sensu-plugins-nginx](https://codeship.com/projects/cb4b6810-cb1c-0132-b746-0ab4e5d2e01d/status?branch=master)](https://codeship.com/projects/75658)
 
 ## Functionality
 
-**nginx-metrics**
+**metrics-nginx**
 
 Fetch the nginx status page and convert the response into graphite metrics
 
 ## Files
- * bin/nginx-metrics.rb
+ * bin/metrics-nginx.rb
 Get the nginx metrics from the status page url for use with Graphite
 
 ## Usage

data/bin/metrics-nginx.rb

@@ -15,7 +15,8 @@
 #   gem: sensu-plugin
 #
 # USAGE:
-#   #YELLOW
+#   metrics-nginx.rb -h hostname -p port -q status_path
+#   metrics-nginx.rb -u http://hostname:port/status_path
 #
 # NOTES:
 #
@@ -42,10 +43,11 @@ class NginxMetrics < Sensu::Plugin::Metric::CLI::Graphite
   option :hostname,
          short: '-h HOSTNAME',
          long: '--host HOSTNAME',
-         description: 'Nginx hostname'
+         description: 'Nginx hostname',
+         default: 'localhost'
 
   option :port,
-         short: '-P PORT',
+         short: '-p PORT',
          long: '--port PORT',
          description: 'Nginx  port',
          default: '80'
@@ -64,7 +66,7 @@ class NginxMetrics < Sensu::Plugin::Metric::CLI::Graphite
 
   # Main function
   #
-  def run # rubocop:disable all
+  def run
     found = false
     attempts = 0
     until found || attempts >= 10
@@ -92,7 +94,7 @@ class NginxMetrics < Sensu::Plugin::Metric::CLI::Graphite
     end
 
     # #YELLOW
-    response.body.split(/\r?\n/).each do |line|  # rubocop:disable Style/Next
+    response.body.split(/\r?\n/).each do |line|
       if line.match(/^Active connections:\s+(\d+)/)
         connections = line.match(/^Active connections:\s+(\d+)/).to_a
         output "#{config[:scheme]}.active_connections", connections[1]

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-nginx
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 1.0.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
@@ -30,7 +30,7 @@ cert_chain:
   8sHuVruarogxxKPBzlL2is4EUb6oN/RdpGx2l4254+nyR+abg//Ed27Ym0PkB4lk
   HP0m8WSjZmFr109pE/sVsM5jtOCvogyujQOjNVGN4gz1wwPr
   -----END CERTIFICATE-----
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2015-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -150,14 +150,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: 0.32.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: 0.32.1
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -174,10 +174,9 @@ dependencies:
         version: '0.8'
 description: |-
   This plugin provides native nginx instrumentation
-                                for metrics collection, including: metrics via `stub_status`
+                                for metrics collection, including: metrics via `stub_status`.
 email: "<sensu-users@googlegroups.com>"
 executables:
-- nginx-metrics.rb
 - metrics-nginx.rb
 extensions: []
 extra_rdoc_files: []
@@ -186,7 +185,6 @@ files:
 - LICENSE
 - README.md
 - bin/metrics-nginx.rb
-- bin/nginx-metrics.rb
 - lib/sensu-plugins-nginx.rb
 - lib/sensu-plugins-nginx/version.rb
 homepage: https://github.com/sensu-plugins/sensu-plugins-nginx

data/bin/nginx-metrics.rb

@@ -1,115 +0,0 @@
-#! /usr/bin/env ruby
-#
-#   nginx-metrics
-#
-# DESCRIPTION:
-#   Pull nginx metrics for backends through stub status module
-#
-# OUTPUT:
-#   metric data
-#
-# PLATFORMS:
-#   Linux
-#
-# DEPENDENCIES:
-#   gem: sensu-plugin
-#
-# USAGE:
-#   #YELLOW
-#
-# NOTES:
-#
-# LICENSE:
-#   Copyright 2012 Pete Shima <me@peteshima.com>
-#   Released under the same terms as Sensu (the MIT license); see LICENSE
-#   for details.
-#
-
-require 'sensu-plugin/metric/cli'
-require 'net/https'
-require 'uri'
-require 'socket'
-
-#
-# Nginx Metrics
-#
-class NginxMetrics < Sensu::Plugin::Metric::CLI::Graphite
-  option :url,
-         short: '-u URL',
-         long: '--url URL',
-         description: 'Full URL to nginx status page, example: https://yoursite.com/nginx_status This ignores ALL other options EXCEPT --scheme'
-
-  option :hostname,
-         short: '-h HOSTNAME',
-         long: '--host HOSTNAME',
-         description: 'Nginx hostname'
-
-  option :port,
-         short: '-P PORT',
-         long: '--port PORT',
-         description: 'Nginx  port',
-         default: '80'
-
-  option :path,
-         short: '-q STATUSPATH',
-         long: '--statspath STATUSPATH',
-         description: 'Path to your stub status module',
-         default: 'nginx_status'
-
-  option :scheme,
-         description: 'Metric naming scheme, text to prepend to metric',
-         short: '-s SCHEME',
-         long: '--scheme SCHEME',
-         default: "#{Socket.gethostname}.nginx"
-
-  # Main function
-  #
-  def run # rubocop:disable all
-    found = false
-    attempts = 0
-    until found || attempts >= 10
-      attempts += 1
-      if config[:url]
-        uri = URI.parse(config[:url])
-        http = Net::HTTP.new(uri.host, uri.port)
-        if uri.scheme == 'https'
-          http.use_ssl = true
-          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        end
-        request = Net::HTTP::Get.new(uri.request_uri)
-        response = http.request(request)
-        if response.code == '200'
-          found = true
-        elsif !response.header['location'].nil?
-          config[:url] = response.header['location']
-        end
-      else
-        response = Net::HTTP.start(config[:hostname], config[:port]) do |connection|
-          request = Net::HTTP::Get.new("/#{config[:path]}")
-          connection.request(request)
-        end
-      end
-    end
-
-    # #YELLOW
-    response.body.split(/\r?\n/).each do |line|  # rubocop:disable Style/Next
-      if line.match(/^Active connections:\s+(\d+)/)
-        connections = line.match(/^Active connections:\s+(\d+)/).to_a
-        output "#{config[:scheme]}.active_connections", connections[1]
-      end
-      if line.match(/^\s+(\d+)\s+(\d+)\s+(\d+)/)
-        requests = line.match(/^\s+(\d+)\s+(\d+)\s+(\d+)/).to_a
-        output "#{config[:scheme]}.accepts", requests[1]
-        output "#{config[:scheme]}.handled", requests[2]
-        output "#{config[:scheme]}.requests", requests[3]
-      end
-      if line.match(/^Reading:\s+(\d+).*Writing:\s+(\d+).*Waiting:\s+(\d+)/)
-        queue = line.match(/^Reading:\s+(\d+).*Writing:\s+(\d+).*Waiting:\s+(\d+)/).to_a
-        output "#{config[:scheme]}.reading", queue[1]
-        output "#{config[:scheme]}.writing", queue[2]
-        output "#{config[:scheme]}.waiting", queue[3]
-      end
-    end
-    ok
-  end
-end