zabbix-monitor 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d62efd8efb5101a7ee8573dc7703ff1808a99052
-  data.tar.gz: 654a0b6511265333477a3184cb6444f7b9b7d506
+  metadata.gz: 12d1f8315102ff4b17ac77c9353c7f36118fa66c
+  data.tar.gz: fb155b2c351ef2637a8acc6e8bb2434c1cf0819a
 SHA512:
-  metadata.gz: a31b40d780051fc453afd55b0c2e4831e906b4f3739b27b2e4dc7a1e3f900417c9c33f44c0966b44ac5507410372fb0eac57cd401c127ea4fbd0662eef29cf14
-  data.tar.gz: 9bc5e2267cf60e84b7c4c3d26e4b6f817425be76952a4e6a99466f0603040c541bbe768a85e3b8e2f4068ac7c83af0f3389141b6bbd0d0e438d8759ca2711cb8
+  metadata.gz: 5b113b81926b4c51174a10223b849a5b823636c7ccfadb8a5b33bb97d7569a590eccc67c44fa3bf4f617a0465beab5447f6bab1ab0617e409b4a0a7ae506ab24
+  data.tar.gz: 766a16529f22c2d8097bd44cc82da091f8f45bb47889fea4974d24b49d995f296db54f1f19f74f1112929b8c71d765e855ce3e82ff12b7e8a7ce46b54c465e62

data/.travis.yml

@@ -12,4 +12,9 @@ matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
+
+addons:
+  code_climate:
+    repo_token: af39e5d1bbdd46699d027fd4eee89ed4cfa9d560eeafccf1293423651d0d6b0c
+
 script: "bundle exec rake spec"

data/CHANGELOG.md

@@ -1,11 +1,20 @@
 # Zabbix Monitor Changelog
 
-### TBA
-- 100% code coverage
-- 100% documented
+### v0.0.3 (TBA)
+
+- Added codeclimate coverage
+
+### v0.0.2 (2014-04-24)
+
+- Added :file mode
+    - Write monitoring data to `tmp/zabbix-stats.yml`
+    - Read values with `$ zabbix_reader test`
+- Added specs
+- Added documentation
 - Added services:
-  - Travis CI
-  - Rdoc
+    - Travis CI
+    - Rdoc
 
 ### v0.0.1 (2014-04-17)
+
 - Initial release

data/README.md

@@ -2,10 +2,12 @@
 [![Gem Version](https://badge.fury.io/rb/zabbix-monitor.png)][gemversion]
 [![Build Status](https://secure.travis-ci.org/sping/zabbix-monitor.png?branch=master)][travis]
 [![Code Climate](https://codeclimate.com/github/sping/zabbix-monitor.png)][codeclimate]
+[![Coverage](https://codeclimate.com/github/sping/zabbix-monitor/coverage.png)][coverage]
 
 [gemversion]: http://badge.fury.io/rb/zabbix-monitor
 [travis]: http://travis-ci.org/sping/zabbix-monitor
 [codeclimate]: https://codeclimate.com/github/sping/zabbix-monitor
+[coverage]: https://codeclimate.com/github/sping/zabbix-monitor
 
 Zabbix monitoring for Ruby apps. Works with pushing and polling: push data to the agent server with zabbix_sender or collect data with the Zabbix agent.
 
@@ -38,6 +40,8 @@ To include the rake tasks in your application, add the following line to your Ra
 Place your Zabbix Monitoring configuration in an initializer:
 
 ```ruby
+require 'zabbix'
+
 Zabbix.configure do |config|
   config.config_file_path = '/etc/zabbix/zabbix_agentd.conf'
   # optional, defaults to ./log/#{RACK_ENV}.log
@@ -58,7 +62,7 @@ Put the host name as configured in your Zabbix server config in `config.host_nam
 Set the `config.mode` to one of the following options:
 
 - `:push` uses the Zabbix agent to push the data to the Zabbix server
-- `:file` writes the data to tmp/zabbix/monitor
+- `:file` writes the data to tmp/zabbix-stats.yml
 - `:stdout` writes the data to the stdout
 
 Put your monitoring rules in `config.rules`. Each rule contains a Ruby command to be executed by the Zabbix Monitor and the key as configured on the Zabbix Server.
@@ -67,6 +71,30 @@ Start running your monitoring jobs with:
 
     $ rake zabbix:collect_data
 
+### File mode
+
+In `:file` mode, monitoring var can be read from the monitoring file using `zabbix_reader` command.
+Create a script that's been executed by the Zabbix daemon:
+
+```bash
+#! /bin/bash
+cd /path/to/app/
+echo $( RAILS_ENV=production bundle exec zabbix_reader $1 )
+```
+
+To speed up the reading of variables, you can also use awk to look for variables. Create the following script instead:
+
+```bash
+#! /bin/bash
+cd /path/to/app/
+
+if [ -f tmp/zabbix-stats.yml ]
+then
+  echo $( awk -F: -v var=$1 '$0 ~ var {$1=""; print $0; exit}' tmp/zabbix-stats.yml )
+else
+  echo Zabbix monitor file not found
+fi
+```
 
 ## Changelog
 

data/TODO.md

@@ -1,5 +1,5 @@
-# Todo
+# Zabbix Monitor Todo
 
-- Create :file mode
-- Make ActiveRecord independent
-- Make schedule frequency configurable
+- Make Rufus Schedulere ActiveRecord independent
+- Make schedule frequency configurable
+- Capistrano integration / recipes

data/lib/tasks/zabbix.rb

@@ -1,15 +1,24 @@
 require 'zabbix'
+require 'dante'
 
 namespace :zabbix do
   desc 'Collect data for Zabbix'
-  task :collect_once => :environment do
+  task :run_once => :environment do
     Zabbix.logger.info "[Rake] executing #collect_once"
     Zabbix::Monitor.new.collect_data
   end
 
   desc 'Collect data for Zabbix every minute'
-  task :collect_data => :environment do
-    Zabbix.logger.info "[Rake] executing #collect_data, setting up Rufus"
-    Zabbix::Monitor.new.schedule
+  task :start => :environment do
+    Zabbix.logger.info "[Rake] executing #start, setting up Rufus"
+    Dante::Runner.new('zabbix-monitor').execute(:daemonize => true, :pid_path => 'tmp/zabbix-monitor.pid', :log_path => 'log/zabbix-monitor.log') do
+      Zabbix::Monitor.new.schedule
+    end
+  end
+
+  desc 'Stop collecting data for Zabbix'
+  task :stop => :environment do
+    Zabbix.logger.info "[Rake] executing #stop, stopping daemon"
+    Dante::Runner.new('zabbix-monitor').execute(:kill => true, :pid_path => 'tmp/zabbix-monitor.pid')
   end
 end

data/lib/zabbix/monitor.rb

@@ -100,7 +100,7 @@ module Zabbix
     #
     # @return [void]
     def to_stdout key, value
-      puts "#{key}: #{value}"
+      $stdout.puts "#{key}: #{value}"
     end
   end
 end

data/spec/monitor_spec.rb

@@ -147,7 +147,7 @@ describe Zabbix::Monitor do
 
   describe "#to_stdout" do
     it 'receives the key and value as a puts command' do
-      expect(monitor).to receive(:puts).with('key: the value')
+      expect(STDOUT).to receive(:puts).with('key: the value')
       monitor.send(:to_stdout, 'key', 'the value')
     end
   end

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 require 'pry'
 require 'simplecov'
+require "codeclimate-test-reporter"
 
+CodeClimate::TestReporter.start
 SimpleCov.start do
   add_filter '/spec/'
 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.2'
+  spec.version       = '0.0.3'
   spec.authors       = ['Robert Jan de Gelder', 'Manuel van Rijn']
   spec.email         = ['r.degelder@sping.nl', 'm.vanrijn@sping.nl']
   spec.description   = 'Zabbix application monitoring'
@@ -19,6 +19,7 @@ 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_development_dependency 'rake'
   spec.add_development_dependency 'bundler', '~> 1.3'
@@ -27,4 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry-nav'
   spec.add_development_dependency 'yard'
   spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'codeclimate-test-reporter'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbix-monitor
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Robert Jan de Gelder
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
@@ -39,6 +39,20 @@ dependencies:
     - - ~>
       - !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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -137,6 +151,20 @@ dependencies:
     - - '>='
       - !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
 email:
 - r.degelder@sping.nl