panoptimon 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb30066421e308022d06fc05ff455ce9a399bf8d
-  data.tar.gz: e1cf21306197c7b0e1eed6493b58b93e1b5ddcf9
+  metadata.gz: 52529feb511cde3ec602078341a19d2d09060562
+  data.tar.gz: a672846b2ddea694e1f1b23fc9aa632629dfc131
 SHA512:
-  metadata.gz: 139b276a174075928ecd7a495e7ffac36dd554dabf9b1198ca00fb3d5a7c7acd20aca3f03d57b316360e29f5117b7efcb2aa34ae81659b9e825425f10a4c35fc
-  data.tar.gz: 583b0a56837a75a046f2950c6187498d4411e6de376e5dc9004fca93b57387179c7cd90a69d8fcf51285456ffd40526592ff83e8f5141066f0b1dba64fa4732c
+  metadata.gz: 3cb1390a85c8037597ff699d5c1df7b38ff750b0356ad7c1a097f2ef86395dd1ba21470d83e63b139bcbcd202fb3fb87dedb6ed36019632fe101ab58b5b3ff1d
+  data.tar.gz: fee7c6f5b141321e96f58cf96087e69dc65d084a899a330c93afe82292b409556b788b034fefd51b4f40f772379f2100d2f16ccf36c7afbd2d1271044e30a879

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.2.0
+
+Removed the mysql_status collector from core to reduce gem dependencies.
+It can now be found at https://github.com/synthesist/panoptimon-collector-mysql_status
+
 # 0.1.0
 
 Added functionality to search for executables in the PATH environment variable directories.

data/lib/panoptimon/version.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2012 Sourcefire, Inc.
 
 module Panoptimon
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/panoptimon.gemspec

@@ -29,5 +29,4 @@ Gem::Specification.new do |gem|
 
   # Collector gem dependencies
   gem.add_dependency 'sys-filesystem'
-  gem.add_dependency 'mysql'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: panoptimon
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Eric Wilhelm
@@ -94,20 +94,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mysql
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: The All-Seeing System Monitor Daemon
 email: sysops@sourcefire.com
 executables:
@@ -170,8 +156,6 @@ files:
 - collectors/memcached/test-notes.txt
 - collectors/memory/memory
 - collectors/memory/memory.json
-- collectors/mysql_status/mysql_status
-- collectors/mysql_status/mysql_status.json
 - collectors/network/network
 - collectors/network/network.json
 - collectors/nginx/README.md

data/collectors/mysql_status/mysql_status

@@ -1,52 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'mysql';
-require 'json';
-
-class String; def as_number # from perlfaq4
-  self =~ %r{\A[+-]?(?=\.?\d)\d*\.?\d*(?:[Ee][+-]?\d+)?\z} \
-  ? (self =~ %r{[\.Ee]} ? self.to_f : self.to_i)
-  : nil
-end; end
-
-class Mysql_status
-
-def self.get_status (db)
-  rs = db.query("SHOW STATUS")
-  h = {}
-  while( r = rs.fetch_row )
-    h[r[0].downcase] = r[1]
-  end
-  return h
-end
-
-def self.get_slave_status (db)
-  rs = db.query('SHOW SLAVE STATUS')
-  h = rs.fetch_hash or return {}
-  raise "too many results" if rs.num_rows > 1
-  return Hash[* h.keys.map {|k| [k.downcase, h[k]]}.flatten]
-end
-
-def self.run (config)
-  db = Mysql.new(*
-    %w{hostname username password database port socket}.
-    map {|k| config[k]})
-
-  m = get_status(db)
-  m.merge(get_slave_status(db))
-  info = {}
-  m.keys.each {|k|
-    n = m[k].as_number
-    if n
-      m[k] = n 
-    else
-      info[k] = m.delete(k)
-    end
-  }
-  m[:_info] = info if info.length > 0
-  puts JSON::generate(m)
-end
-
-end
-
-Mysql_status.run(JSON::parse(ARGV[0])) if __FILE__ == $0

data/collectors/mysql_status/mysql_status.json

@@ -1,4 +0,0 @@
-{
-  "description" : "mysql status and slave status collector.  Config must provide some valid combination of hostname,username,password,database,port,socket to connect.",
-  "socket" : "/tmp/mysql.socket"
-}