sensu-plugins-nginx 0.0.1 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a360d0bd2c831bb98e4603806125c05c3000f58b
-  data.tar.gz: b974328c59089f53b7dfb540574c4dfad092225f
+  metadata.gz: e778dbeff021b21812d03b6a3f4cc0b612bc6708
+  data.tar.gz: 79ffe39c6dfb796ac2242edd2346e04578786eee
 SHA512:
-  metadata.gz: f3104129a3815cd7fd33bb452ee1be8cc6d4831bea37d21c82107ac1dd5faf3694c033051858fe30a39d089d0b471b00178b9c5f281c755b86ba88b700ce7ebe
-  data.tar.gz: f27402b300ba352eb307660d4e2de539a3c50d46bc6cfe7d88ff0d8df0c3f06eecb7797fdf358e3e786c7a91bfa134820d632de0213bf07b0a2699f2515bff43
+  metadata.gz: b9022ff5167a1311f7863de9c78157472e0e876a81e7554159d050b0d3fde0af8c3e65b6750f3614deaceee5a2d146b25c415d5a901d6285f31978595634ab7b
+  data.tar.gz: 73d0aba1c0e65ae5a26f1cf2898ce33f57fe09c46731fba709739970c574daa9b0f51bec1d57e034f559711d9e328b8cb363b5a6e8e24e700f9db6c140152fbf

data/CHANGELOG.md

@@ -1,19 +1,38 @@
-#### 0.1.0-alpha.1
+#Change Log
+This project adheres to [Semantic Versioning](http://semver.org/).
 
-* baseline release identical to **sensu-community-plugins** repo
-* basic yard coverage
-* pinned dependencies
-* built against 1.9.3, 2.0, 2.1
-* cryptographically signed
+This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
-#### 0.0.1-alpha.2
+## Unreleased
+-nothing
 
-* bump Vagrant to Chef 6.6
-* update LICENSE and gemspec authors
-* update README
-* add required Ruby version *>= 1.9.3*
-* add test/spec_help.rb
 
-#### 0.0.1
+## [0.0.5] - 2015-07-15
+- bump version due to wrong file name, no code changes
 
-* edit readme
+
+## [0.0.4] - 2015-07-14 **YANKED**
+### Changed
+- updated sensu-plugin gem to 1.2.0
+
+## [0.0.3] - 2015-06-10 **YANKED**
+
+### Changed
+- changed the name of nginx-metrics.rb to metrics-nginx.rb to conform to std naming
+- nginx-metrics.rb is now depericiated and will be removed in a future release
+- clean Rakefile
+- put gem deps in alpha order in gemspec
+- update doc links in README and CONTRIBUTING
+
+### Fixed
+- add binstubs for ruby files only
+
+## [0.0.2] - 2015-06-03 **YANKED**
+### Fixed
+- added binstubs
+
+### Changed
+- removed cruft from /lib
+
+## [0.0.1] - 2015-02-11 **YANKED**
+- initial stable release

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2015 devops@yieldbot.com
+Copyright (c) 2015 Sensu-Plugins
 
 MIT License
 

data/README.md

@@ -1,10 +1,11 @@
 ## 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)
 
 ## Functionality
 
@@ -20,39 +21,6 @@ Get the nginx metrics from the status page url for use with Graphite
 
 ## Installation
 
-Add the public key (if you haven’t already) as a trusted certificate
-
-```
-gem cert --add <(curl -Ls https://raw.githubusercontent.com/sensu-plugins/sensu-plugins.github.io/master/certs/sensu-plugins.pem)
-gem install sensu-plugins-nginx -P MediumSecurity
-```
-
-You can also download the key from /certs/ within each repository.
-
-#### Rubygems
-
-`gem install sensu-plugins-nginx`
-
-#### Bundler
-
-Add *sensu-plugins-nginx* to your Gemfile and run `bundle install` or `bundle update`
-
-#### Chef
-
-Using the Sensu **sensu_gem** LWRP
-```
-sensu_gem 'sensu-plugins-nginx' do
-  options('--prerelease')
-  version '0.0.1.alpha.1'
-end
-```
-
-Using the Chef **gem_package** resource
-```
-gem_package 'sensu-plugins-nginx' do
-  options('--prerelease')
-  version '0.0.1.alpha.1'
-end
-```
+[Installation and Setup](http://sensu-plugins.io/docs/installation_instructions.html)
 
 ## Notes

data/bin/metrics-nginx.rb

@@ -0,0 +1,115 @@
+#! /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

data/bin/nginx-metrics.rb

@@ -64,7 +64,7 @@ class NginxMetrics < Sensu::Plugin::Metric::CLI::Graphite
 
   # Main function
   #
-  def run
+  def run # rubocop:disable all
     found = false
     attempts = 0
     until found || attempts >= 10
@@ -99,9 +99,9 @@ class NginxMetrics < Sensu::Plugin::Metric::CLI::Graphite
       end
       if line.match(/^\s+(\d+)\s+(\d+)\s+(\d+)/)
         requests = line.match(/^\s+(\d+)\s+(\d+)\s+(\d+)/).to_a
-        output "#{config[:scheme]}.accepted", requests[1]
+        output "#{config[:scheme]}.accepts", requests[1]
         output "#{config[:scheme]}.handled", requests[2]
-        output "#{config[:scheme]}.handles", requests[3]
+        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

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

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

data/lib/sensu-plugins-nginx.rb

@@ -1,7 +1 @@
-#
-# Set gem version
-#
-module SensuPluginsNginx
-  # Gem version
-  VERSION = '0.0.1'
-end
+require 'sensu-plugins-nginx/version'

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-nginx
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.5
 platform: ruby
 authors:
-- Yieldbot, Inc. and contributors
+- Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain:
@@ -30,7 +30,7 @@ cert_chain:
   8sHuVruarogxxKPBzlL2is4EUb6oN/RdpGx2l4254+nyR+abg//Ed27Ym0PkB4lk
   HP0m8WSjZmFr109pE/sVsM5jtOCvogyujQOjNVGN4gz1wwPr
   -----END CERTIFICATE-----
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -38,161 +38,183 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: github-markup
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: github-markup
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '0.30'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '0.30'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: Sensu nginx checks
-email: <sensu-users@googlegroups.com>
+        version: '0.8'
+description: Sensu plugins for the NGINX server
+email: "<sensu-users@googlegroups.com>"
 executables:
 - nginx-metrics.rb
+- metrics-nginx.rb
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/nginx-metrics.rb
-- lib/sensu-plugins-nginx.rb
+- CHANGELOG.md
 - LICENSE
 - README.md
-- CHANGELOG.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
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  maintainer: "@mattyjones"
+  development_status: active
+  production_status: unstable - testing recommended
+  release_draft: 'false'
+  release_prerelease: 'false'
+post_install_message: You can use the embedded Ruby by setting EMBEDDED_RUBY=true
+  in /etc/default/sensu
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
-summary: Sensu nginx checks
+summary: Sensu plugins for the NGINX server
 test_files: []
-has_rdoc: