zabbix-monitor 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a34ac18f7d026ea8f45f2e3abc2a089f1e6a7afd
-  data.tar.gz: e62f0de7718341dba40eb4c1a27da457e9a4f97d
+  metadata.gz: 6e32fafe05e3fe1d032cd7c51329a414e9144c03
+  data.tar.gz: 8eef94c534a717a3c77980329c0cd9acf908aa21
 SHA512:
-  metadata.gz: 4fe4c1309b9a5ba721adcae3aed9f525c18778dfcc850f505ca565922f6f730c5af93ba0962222ca0c556fec84fbb121af77305ab72741d5e0b5acbe849371a9
-  data.tar.gz: de489e6bbb4e9abdebee4f27ae63a80ccaf3c11856fcd72e2e04147a4606d1d82c677e67ab350f5282589a4bee5d44100bf49b0ee67b2210a3e097f66a64dc05
+  metadata.gz: fb1773991213d9e1ca1ab82688790fe15bd6e86b6ab19274401e6c74103cd78bdfb4f6803b7f7ed964ecbd26d5d659b6074508de924f645ae51ef3784c572121
+  data.tar.gz: 47cd17966dde0d5d41fb613f03136558fed6d7fb450b5aba15260c2af1aae8cd7847908286f9f1c2371e2520a8aad6da9f3e0e62a539eb5871d1559fc831cf5e

data/.travis.yml

@@ -1,7 +1,6 @@
 language: ruby
 cache: bundler
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
   - 2.1.0

data/CHANGELOG.md

@@ -1,10 +1,41 @@
 # Zabbix Monitor Changelog
 
-### v0.0.3 (TBA)
+## v0.0.9 (2014-12-22)
+
+- Fixed some logging, docs and specs
+- Require ActiveRecord explicit
+- Added Capistrano tasks to stop and start the daemon to make it work with God.rb, removed after deploy:restart rule
+
+## v0.0.8 (2014-06-18)
+
+- Made Yell log adapter configurable, defaults to :file
+
+## v0.0.7 (2014-06-18)
+
+- Don't log while setting mode because the logger could still be uninitialized
+- Don't create a symlinked log, depond on log rotate instead
+- Added some logging to see if the monitor is running
+
+## v0.0.6 (2014-05-27)
+
+- Moved pid files the the correct location
+
+## v0.0.5 (2014-05-27)
+
+- Fixed permissions issue in v0.0.4
+
+## v0.0.4 (2014-05-27) (yanked)
+
+- Added Capistrano 2 recipe
+
+## v0.0.3 (2014-05-27)
 
 - Added codeclimate coverage
+- Puts results to the STDOUT
+- Removed YAML dependency from reader
+- Use Dante to daemonize the monitoring tasks
 
-### v0.0.2 (2014-04-24)
+## v0.0.2 (2014-04-24)
 
 - Added :file mode
     - Write monitoring data to `tmp/zabbix-stats.yml`
@@ -15,6 +46,6 @@
     - Travis CI
     - Rdoc
 
-### v0.0.1 (2014-04-17)
+## v0.0.1 (2014-04-17)
 
 - Initial release

data/README.md

@@ -31,7 +31,7 @@ Or install it yourself as:
 
 To include the rake tasks in your application, add the following line to your Rakefile (before `App::Application.load_tasks`):
 
-    require 'zabbix/tasks'
+    require 'tasks/zabbix'
 
 ## Usage
 
@@ -69,7 +69,7 @@ Put your monitoring rules in `config.rules`. Each rule contains a Ruby command t
 
 Start running your monitoring jobs with:
 
-    $ rake zabbix:collect_data
+    $ rake zabbix:start
 
 ### File mode
 
@@ -96,6 +96,23 @@ else
 fi
 ```
 
+## Capistrano
+
+Capistrano tasks are added in lib/tasks/zabbix.rb. Currently, only Capistrano 2 is supported. Add the following lines of code to your deploy.rb:
+
+```ruby
+require 'zabbix/capistrano'
+
+namespace :deploy do
+
+  # if you're running God.rb, it will be restarted automatically
+  after 'deploy:update_code', 'zabbix:stop'
+  # else
+  after 'deploy:update_code', 'zabbix:restart'
+
+end
+```
+
 ## Changelog
 
 A detailed overview can be found in the [CHANGELOG](CHANGELOG.md).

data/lib/zabbix/capistrano.rb

@@ -2,10 +2,18 @@ require 'capistrano'
 
 Capistrano::Configuration.instance.load do
 
-  after 'deploy:update_code', 'zabbix:restart'
-
   namespace :zabbix do
-    desc 'Restarting Zabbix monitoring'
+    desc 'Start Zabbix monitoring'
+    task :start, :roles => :web do
+      run "cd #{release_path}; RAILS_ENV=#{rails_env} bundle exec rake zabbix:start"
+    end
+
+    desc 'Stop Zabbix monitoring'
+    task :stop, :roles => :web do
+      run "cd #{release_path}; RAILS_ENV=#{rails_env} bundle exec rake zabbix:stop"
+    end
+
+    desc 'Restart Zabbix monitoring'
     task :restart, :roles => :web do
       run "cd #{release_path}; RAILS_ENV=#{rails_env} bundle exec rake zabbix:restart"
     end

data/lib/zabbix/monitor.rb

@@ -2,6 +2,7 @@ require 'json'
 require 'yaml'
 require 'fileutils'
 require 'rufus-scheduler'
+require 'active_record'
 
 module Zabbix
 
@@ -13,9 +14,7 @@ module Zabbix
     def schedule
       Rufus::Scheduler.new.tap do |scheduler|
         scheduler.every '1m' do
-          ActiveRecord::Base.connection_pool.with_connection do
-            collect_data
-          end
+          scheduled_collect_data
         end
       end.join
     end
@@ -69,7 +68,7 @@ module Zabbix
       result = `zabbix_sender -c #{config.config_file_path} -s "#{config.host_name}" -k #{key} -o #{value}`
       case $?.to_i
       when 0 # SUCCESS
-        Zabbix.logger.info "[Monitor] successfully sended rule: '#{key}' to zabbix server: '#{config.host_name}'"
+        Zabbix.logger.info "[Monitor] successfully sent rule: '#{key}' with value: '#{value}' to zabbix server: '#{config.host_name}'"
       else
         Zabbix.logger.error "[Monitor] failed sending rule: '#{key}' with value: '#{value}' to zabbix server: '#{config.host_name}'"
       end
@@ -103,5 +102,11 @@ module Zabbix
     def to_stdout key, value
       $stdout.puts "#{key}: #{value}"
     end
+
+    def scheduled_collect_data
+      ActiveRecord::Base.connection_pool.with_connection do
+        collect_data
+      end
+    end
   end
 end

data/spec/monitor_spec.rb

@@ -6,18 +6,37 @@ describe Zabbix::Monitor do
   let(:config)  { Zabbix::Config.new }
 
   before :each do
-    Zabbix.stub(:config) { config }
+    allow(Zabbix).to receive(:config).and_return(config)
   end
 
   describe "#config" do
     it 'returns the Zabbix monitor instance config' do
-      monitor.send(:config).should eq config
+      expect(Zabbix).to receive(:config)
+      monitor.send(:config)
+    end
+  end
+
+  describe '#scheduled_collect_data' do
+    it 'calls the #collect_data with an ActiveRecord connection from the pool' do
+      fake_connection = double
+      allow(fake_connection).to receive(:with_connection).and_yield
+      allow(ActiveRecord::Base).to receive(:connection_pool).and_return fake_connection
+      expect(monitor).to receive(:collect_data).once
+      monitor.send(:scheduled_collect_data)
     end
   end
 
   describe '#schedule' do
+    let(:fake_rufus) { double }
+    let(:fake_collect_data) { double }
+
     it 'schedule the data collector to run every minute' do
-      pending 'add scheduler test magic here'
+      allow(fake_collect_data).to receive(:join)
+      allow(fake_rufus).to receive(:every).and_yield
+
+      expect_any_instance_of(Rufus::Scheduler).to receive(:tap).and_yield fake_rufus
+      expect(monitor).to receive(:scheduled_collect_data).once.and_return fake_collect_data
+      monitor.schedule
     end
   end
 
@@ -26,9 +45,9 @@ describe Zabbix::Monitor do
     # 'raise exception invalid rule, invalid command, no command'
     describe "one rule" do
       before :each do
-        config.stub(:rules) {[
+        allow(config).to receive(:rules).and_return([
           { :command => 'cmd', :zabbix_key => 'some.key' }
-        ]}
+        ])
       end
       it 'executes the command once and passes it to process' do
         expect(monitor).to receive(:eval).once.and_return("result")
@@ -45,10 +64,11 @@ describe Zabbix::Monitor do
     end
     describe "two rules" do
       before :each do
-        config.stub(:rules) {[
+        rules = [
           { :command => 'cmd', :zabbix_key => 'some.key' },
           { :command => 'cmd', :zabbix_key => 'another.key' }
-        ]}
+        ]
+        allow(config).to receive(:rules).and_return rules
       end
       it 'executes the command once and passes it to process' do
         expect(monitor).to receive(:eval).twice.and_return("result")
@@ -87,16 +107,16 @@ describe Zabbix::Monitor do
     end
     it 'executes the zabbix_sender command with the correct arguments' do
       expect(monitor).to receive(:'`').once.with('zabbix_sender -c /zabbix.conf -s "servername" -k key -o value')
-      monitor.stub(:puts) {}
+      allow(monitor).to receive(:puts)
       monitor.send(:to_zabbix, 'key', 'value')
     end
     it 'outputs GREAT if the command is executed without errors' do
-      monitor.stub(:'`') { `(exit 0)` }
-      expect(logger).to receive(:info).with(/successfully sended rule: 'key' to zabbix server: 'servername'/)
+      allow(monitor).to receive(:'`').and_return(`(exit 0)`)
+      expect(logger).to receive(:info).with(/successfully sent rule: 'key' with value: 'value' to zabbix server: 'servername'/)
       monitor.send(:to_zabbix, 'key', 'value')
     end
     it 'outputs BUMMER if the command is executed with an error' do
-      monitor.stub(:'`') { `(exit 1)` }
+      allow(monitor).to receive(:'`').and_return(`(exit 1)`)
       expect(logger).to receive(:error).with(/failed sending rule: 'key' with value: 'value' to zabbix server: 'servername'/)
       monitor.send(:to_zabbix, 'key', 'value')
     end
@@ -104,8 +124,8 @@ describe Zabbix::Monitor do
 
   describe "#to_file" do
     before :each do
-      File.stub(:exists?) { false }
-      File.stub(:open).with('tmp/zabbix-stats.yml', 'w')
+      allow(File).to receive(:exists?).and_return false
+      allow(File).to receive(:open).with('tmp/zabbix-stats.yml', 'w')
     end
     it 'creates the tmp folder if it does not exist' do
       expect(Dir).to receive(:mkdir).once.with('tmp')
@@ -118,11 +138,11 @@ describe Zabbix::Monitor do
       monitor.send(:to_file, 'key', 'value')
     end
     before :each do
-      Dir.stub(:exists?) { true }
+      allow(Dir).to receive(:exists?).and_return true
     end
     describe 'writeing and reading' do
       it 'writes the result to "tmp/zabbix-stats.yml"' do
-        File.stub(:exists?) { false }
+        allow(File).to receive(:exists?).and_return false
         file = double('file')
         yml = {'statistics' => {'created_at' => Time.now.to_i, 'key' => 'value'}}
 
@@ -131,7 +151,7 @@ describe Zabbix::Monitor do
         monitor.send(:to_file, 'key', 'value')
       end
       it 'adds the key and value to the output file if it already exists' do
-        File.stub(:exists?) { true }
+        allow(File).to receive(:exists?).and_return true
         file = double('file')
         yml = {'statistics' => {'created_at' => Time.now.to_i, 'old_key' => 'old_value'}}
 

data/spec/reader_spec.rb

@@ -22,8 +22,8 @@ describe Zabbix::Reader do
 
   describe 'get_value' do
     before :each do
-      File.stub(:exists?) { true }
-      YAML.stub(:load_file) { {'statistics' => {'test' => 'OK'}} }
+      expect(File).to receive(:exists?).and_return true
+      expect(YAML).to receive(:load_file).and_return({'statistics' => {'test' => 'OK'}})
     end
     let(:reader) { Zabbix::Reader.new }
 

data/spec/zabbix_spec.rb

@@ -10,7 +10,7 @@ describe Zabbix do
     describe "basic config vars and behaviour" do
 
       it 'creates a new config for the Zabbix monitor instance' do
-        Zabbix.config.should be_kind_of(Zabbix::Config)
+        expect(Zabbix.config).to be_kind_of(Zabbix::Config)
       end
       it 'set the correct config values' do
         Zabbix.configure do |config|
@@ -19,18 +19,18 @@ describe Zabbix do
           config.mode = :push
         end
 
-        Zabbix.config.config_file_path.should eq '/etc/zabbix/zabbix_agentd.conf'
-        Zabbix.config.log_file_path.should be_nil
-        Zabbix.config.host_name.should eq 'servername'
-        Zabbix.config.mode.should eq :push
+        expect(Zabbix.config.config_file_path).to eq '/etc/zabbix/zabbix_agentd.conf'
+        expect(Zabbix.config.log_file_path).to be_nil
+        expect(Zabbix.config.host_name).to eq 'servername'
+        expect(Zabbix.config.mode).to eq :push
         pending 'should rules be initialized as an empty array?'
-        Zabbix.config.rules.count.should eq 0
+        expect(Zabbix.config.rules.count).to eq 0
       end
       it 'returns the correct log_file_path if specified' do
         Zabbix.configure do |config|
           config.log_file_path = '/var/log/monitor.log'
         end
-        Zabbix.config.log_file_path.should eq '/var/log/monitor.log'
+        expect(Zabbix.config.log_file_path).to eq '/var/log/monitor.log'
       end
     end
 
@@ -40,7 +40,7 @@ describe Zabbix do
         Zabbix.configure do |config|
           config.rules = [rule]
         end
-        Zabbix.config.rules.should eq [rule]
+        expect(Zabbix.config.rules).to eq [rule]
       end
       it 'has two rules' do
         ruleA = { :command => 'a', :zabbix_key => 'a' }
@@ -48,11 +48,9 @@ describe Zabbix do
         Zabbix.configure do |config|
           config.rules = [ruleA, ruleB]
         end
-        Zabbix.config.rules.should eq [ruleA, ruleB]
-      end
-      it 'validates if the format of a rule from config is valid' do
-        pending 'todo'
+        expect(Zabbix.config.rules).to eq [ruleA, ruleB]
       end
+      it 'validates if the format of a rule from config is valid'
     end
   end
 end

data/zabbix-monitor.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'zabbix-monitor'
-  spec.version       = '0.0.8'
+  spec.version       = '0.0.9'
   spec.authors       = ['Robert Jan de Gelder', 'Manuel van Rijn']
   spec.email         = ['r.degelder@sping.nl', 'm.vanrijn@sping.nl']
   spec.description   = 'Zabbix application monitoring'
@@ -20,10 +20,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rufus-scheduler', '~> 3.0'
   spec.add_dependency 'yell', '~> 2.0'
   spec.add_dependency 'dante', '~> 0.2.0'
+  spec.add_dependency 'activerecord', '>= 4.0'
 
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rspec', '~> 2.14'
+  spec.add_development_dependency 'rspec', '~> 3.1'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'pry-nav'
   spec.add_development_dependency 'yard'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbix-monitor
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Robert Jan de Gelder
@@ -9,160 +9,174 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: yell
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: dante
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Zabbix application monitoring
@@ -174,9 +188,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".travis.yml"
+- ".yardopts"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -207,17 +221,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Let the Zabbix agent read your application monitoring