sensu-plugins-ubiquiti 0.0.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a324381378e54512fc11ca6227f8c0bb2090b8fc
-  data.tar.gz: 92899680eabfd54dd7f5f2f0ff8befb7af933877
+  metadata.gz: 055416821c4ca116d381c700af7491647c443524
+  data.tar.gz: 2112252bfdc21a0b006c4d68369cf47925322202
 SHA512:
-  metadata.gz: 6c3c0cef0303cade1a0507ee53d0038360b8c0fd94e03203f4300c1680870567ee81cf5b63edeb9103decadbb388adf29e92375c638205a65a99f85bd5a8e8ec
-  data.tar.gz: b9dc05d0dd51804d406faf16ba5d68e64dc89ffc74d3fd77e28e35d5cc81de45f385869e6e7e053f80ed5070dbccbfbbc1e3218ddf156bc022482b736f68980b
+  metadata.gz: 32889c62501ac21086e2c60b37475f1b67f5469352a04444825c379f6ec011d05dc69b8f0b3ef6c9b34d3ab952a6ea61db0cf62136c0857d653d9035d95e75af
+  data.tar.gz: 7081a3acf99e062d8c6c649b05b21b7bbb434f1b05f81edb6ae9140a2f7fb8d9ab4a7ad70908f7315ae12278e7e8ecdaebd633da539195a9b2f9ec57d8b2bf2c

data/CHANGELOG.md

@@ -3,8 +3,26 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
-## Unreleased
+## [Unreleased]
+
+## [1.0.0] - 2016-10-21
+
+Note: this release changes the check parameters due to removing the shell out to `unifi-get-stats.py`.
+
+### Changed
+- Use `unifi-api` gem instead of shelling out to unifi-get-stats.py script
+- Update to Rubocop 0.40 and cleanup
 
-0.0.1 - 08-24-2015
+### Added
+- Add Ruby 2.3.0 support
+
+### Removed
+- Remove Ruby 1.9.3 support
+- Remove unused unifi-get-stats.py script
+
+## [0.0.1] - 2015-08-24
 ### Added
 - initial release of this sensu plugin repo
+
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-ubiquiti/compare/1.0.0...HEAD
+[1.0.0]: https://github.com/sensu-plugins/sensu-plugins-ubiquiti/compare/0.0.1...1.0.0

data/README.md

@@ -1,10 +1,10 @@
 ## Sensu-Plugins-ubiquiti
-[ ![Build Status](https://travis-ci.org/sensu-plugins/sensu-plugins-ubiquiti.svg?branch=master)](https://travis-ci.org/sensu-plugins/sensu-plugins-ubiquiti)
+[![Build Status](https://travis-ci.org/sensu-plugins/sensu-plugins-ubiquiti.svg?branch=master)](https://travis-ci.org/sensu-plugins/sensu-plugins-ubiquiti)
 [![Gem Version](https://badge.fury.io/rb/sensu-plugins-ubiquiti.svg)](http://badge.fury.io/rb/sensu-plugins-ubiquiti)
 [![Code Climate](https://codeclimate.com/github/sensu-plugins/sensu-plugins-ubiquiti/badges/gpa.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-ubiquiti)
 [![Test Coverage](https://codeclimate.com/github/sensu-plugins/sensu-plugins-ubiquiti/badges/coverage.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-ubiquiti)
 [![Dependency Status](https://gemnasium.com/sensu-plugins/sensu-plugins-ubiquiti.svg)](https://gemnasium.com/sensu-plugins/sensu-plugins-ubiquiti)
-[ ![Codeship Status](https://codeship.com/projects/3031d890-2e9c-0133-9eef-3a2a4d3529b0/status?branch=master)](https://codeship.com/projects/99157)
+
 ## Functionality
 
 **metrics-unifi.rb**
@@ -13,7 +13,6 @@ Polls metrics from Ubiquiti Networks Unifi wireless controllers
 
 ## Files
  * bin/metrics-unifi.rb
- * bin/unifi-get-stats.py
 
 ## Installation
 

data/bin/metrics-unifi.rb

@@ -15,7 +15,7 @@
 #   gem: sensu-plugin
 #
 # USAGE:
-#   metrics-unifi.rb -c unifi.int.mycompany.co -i /dir/containing/unifi-get-stats/binary/ -u admin -p unifipassword
+#   metrics-unifi.rb -c unifi.int.mycompany.co -u admin -p unifipassword
 #
 # NOTES:
 #
@@ -27,9 +27,8 @@
 #
 
 require 'sensu-plugin/metric/cli'
-require 'open3'
 require 'socket'
-require 'json'
+require 'unifi/api'
 
 # Collect unifi metrics
 class UnifiMetrics < Sensu::Plugin::Metric::CLI::Graphite
@@ -57,21 +56,35 @@ class UnifiMetrics < Sensu::Plugin::Metric::CLI::Graphite
          long: '--password PASSWORD',
          required: true
 
-  option :path,
-         description: 'Path to unifi-get-stats.py',
-         short: '-i PATH',
-         default: '/usr/local/bin'
+  option :port,
+         description: 'Port',
+         short: '-P PORT',
+         long: '--port PORT',
+         default: 8443
+
+  option :unifi_version,
+         description: 'Unifi API version',
+         short: '-V VERSION',
+         long: '--unifi-version VERSION',
+         default: 'v4'
 
   def unifi_stats
-    unknown "Could not find #{config[:path]}/unifi-get-stats.py" unless File.exist?("#{config[:path]}/unifi-get-stats.py")
-    stdout, result = Open3.capture2("#{config[:path]}/unifi-get-stats.py -c #{config[:controller]} -u #{config[:username]} -p #{config[:password]}")
-    unknown 'Unable to get Unifi AP stats' unless result.success?
-    stdout
+    unifi = Unifi::Api::Controller.new(config[:controller], config[:username], config[:password], config[:port], config[:unifi_version])
+    aps = unifi.get_aps
+
+    metrics = Hash.new(0)
+
+    aps.each do |ap|
+      metrics['total'] += ap['num_sta']
+      metrics['guests'] += ap['guest-num_sta']
+      metrics['users'] += ap['user-num_sta']
+    end
+
+    metrics
   end
 
   def run
-    stats = JSON.parse(unifi_stats)
-    stats.each do |metric, value|
+    unifi_stats.each do |metric, value|
       output "#{config[:scheme]}.#{metric}", value
     end
     ok

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

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

metadata

@@ -1,51 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-ubiquiti
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDgDCCAmigAwIBAgIBATANBgkqhkiG9w0BAQUFADBDMRIwEAYDVQQDDAltYXR0
-  am9uZXMxGDAWBgoJkiaJk/IsZAEZFgh5aWVsZGJvdDETMBEGCgmSJomT8ixkARkW
-  A2NvbTAeFw0xNTAxMjgyMTAyNTFaFw0xNjAxMjgyMTAyNTFaMEMxEjAQBgNVBAMM
-  CW1hdHRqb25lczEYMBYGCgmSJomT8ixkARkWCHlpZWxkYm90MRMwEQYKCZImiZPy
-  LGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyTSzVYnO
-  CLgyrIyT1mBQakArQyW8xhi6MlDqyzXHJGeERT790U6EgoBVeS4XoK0ptFZNR8Tf
-  zko0w+Nv47TarSCgkPOaxY+mxWnAVR10dOmfeLr7huiMyps+YD56/EF2FqQ3jf/+
-  qohENfKD91qy1ieEy+Fn7Pf74ltbNKUdkb9a9eFXQ0DQ4ip5vik7DzjQkUTj4lca
-  k6ArwnmHX4YDhZoYtrQJ8jVktN0/+NtA40M5qkCYHNe5tUW25b/tKVYuioxG6b2Z
-  oIzaZxRLxf6HVAWpCVRT/F5+/yjigkX4u++eYacfLGleXQzoK7BL65vHGMJygWEE
-  0TKGqFOrl/L0AQIDAQABo38wfTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNV
-  HQ4EFgQUEf6a8Td7MrSZc8ImbLFZAENPbz0wIQYDVR0RBBowGIEWbWF0dGpvbmVz
-  QHlpZWxkYm90LmNvbTAhBgNVHRIEGjAYgRZtYXR0am9uZXNAeWllbGRib3QuY29t
-  MA0GCSqGSIb3DQEBBQUAA4IBAQBbzXAYA3BVGw8DZ0YYoY1VHPNEcH5qPIApmHO8
-  rvSmuUT0yMEi7u00H/5uHRFf4LleGT/+sTdyXKsNPGT9kdRuQEgwi+vf7Zfvd8aX
-  UF/+4VkEYf/8rV8Ere6u2QaWPgApdMV6JjKr1fAwCTd8AuGXNaWItiPPMseSQzLJ
-  JKP4hVvbc1d+oS925B1lcBiqn2aYvElbyNAVmQPywNNqkWmvtlqj9ZVJfV5HQLdu
-  8sHuVruarogxxKPBzlL2is4EUb6oN/RdpGx2l4254+nyR+abg//Ed27Ym0PkB4lk
-  HP0m8WSjZmFr109pE/sVsM5jtOCvogyujQOjNVGN4gz1wwPr
-  -----END CERTIFICATE-----
-date: 2015-08-27 00:00:00.000000000 Z
+cert_chain: []
+date: 2016-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: unifi-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -148,16 +140,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.40.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.40.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -173,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.8'
 description: Sensu plugins for Ubiquiti network equipment
-email: "<sensu-users@googlegroubiquiti.com>"
+email: "<sensu-users@googlegroups.com>"
 executables:
 - metrics-unifi.rb
 extensions: []
@@ -183,14 +175,13 @@ files:
 - LICENSE
 - README.md
 - bin/metrics-unifi.rb
-- bin/unifi-get-stats.py
 - lib/sensu-plugins-ubiquiti.rb
 - lib/sensu-plugins-ubiquiti/version.rb
 homepage: https://github.com/sensu-plugins/sensu-plugins-ubiquiti
 licenses:
 - MIT
 metadata:
-  maintainer: "@tas50"
+  maintainer: sensu-plugin
   development_status: active
   production_status: unstable - testing recommended
   release_draft: 'false'
@@ -204,7 +195,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -212,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for Ubiquiti network equipment

data/bin/unifi-get-stats.py

@@ -1,35 +0,0 @@
-#!/usr/bin/env python
-#
-# Get stats from a Unifi AP controller using the API
-#
-# Requires the unifi python module
-#
-
-import argparse
-import json
-
-from unifi.controller import Controller
-
-parser = argparse.ArgumentParser()
-parser.add_argument('-c', '--controller', default='unifi', help='the controller address (default "unifi")')
-parser.add_argument('-u', '--username', default='admin', help='the controller username (default("admin")')
-parser.add_argument('-p', '--password', default='', help='the controller password')
-parser.add_argument('-b', '--port', default='8443', help='the controller port (default "8443")')
-parser.add_argument('-v', '--version', default='v2', help='the controller base version (default "v2")')
-parser.add_argument('-s', '--siteid', default='default', help='the site ID, UniFi >=3.x only (default "default")')
-args = parser.parse_args()
-
-c = Controller(args.controller, args.username, args.password, args.port, args.version, args.siteid)
-
-aps = c.get_aps()
-
-total = guests = users = 0
-
-for ap in aps:
-    total += ap['num_sta']
-    guests += ap['guest-num_sta']
-    users += ap['user-num_sta']
-
-stats = {'total': total, 'guests': guests, 'users': users}
-
-print json.dumps(stats)

metadata.gz.sig

@@ -1 +0,0 @@
-jd�m�so�ҥK�t"F�1�� 7n#��<�7y�ֿ�HtG����2W4�n �. J�m7Ě��3>�P�+�������T��ϛ(?`�xp�Ũ����6G+�Ū��M0��%�뭢f�a�T���"��퟇!���tCQ���'Y���EL�T}�ˑۮ赙!*ɞ�uTO+��pDi�E�H��C��"-�w�����)-\9���(6��F�����~P�`�`�٩ޅ:]"�Y���d@Y�,_/�U|���C�