alertdesigner 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzMzYTRjZWUxMmFlMWFkMzc0NDBjY2NlYWI2NDU2M2EzNDIxYWRjYQ==
+    YTBmZDQ1NTg2NGQ3MDgzY2JjMWNkMjFiNTA2YjBhZWVlMmJjY2IyYQ==
   data.tar.gz: !binary |-
-    Yzk1ODUwYmI3YjFlOTYxYTFmMTIxODE4MTllMzI0MTk2M2U0ZWQ2Yg==
+    MTFiZmZmMGU1MTlmYTkyZTM3NWI4YjM4NjgxYzdmOTZjYzQ0YzFiOQ==
 SHA512:
   metadata.gz: !binary |-
-    NGJiYjYwNDYxZmVkZDNlYzYzNWJhMTRmMjQ4YzFhYjczODJiMmY0YzcwMGUx
-    NjBjODg0OTUwM2VhNTNhOTJmNjY2Mzg2NzcxM2QzMmRiODM3NTg0M2Y5NjBj
-    OGM1M2QxMzdlNGM5Zjg2N2ZiMjEyZTAyMDkxMzY0ZDAzMmQ0NjQ=
+    Mzg4NjQ1NGUwNGEwZTA5Y2Q3ZmE4MTE4Y2YzNTA0NGFkMjA5YzUzM2RmM2I3
+    YzJhMGM1NGRmNzlkZDY0NTBkYjYwNDdjMGFmOTc2YWQ5MWI4NWY4N2UzNzI3
+    YTFlZmMwMTZkNmE3YjM4YmIxOWEyMTg0MGZmNTc4MTQ3Zjg1ZDU=
   data.tar.gz: !binary |-
-    ZDg5ZmUyMDViMmE5MjE0MDA2YmM0NTAyOGJhY2RiYTA0MTVlMDRkNmJhOTVi
-    YTIwNjQ5ZGU2Zjg1ZWYyOTMxNDc3M2JjNzIzYzk3ZmY2N2RkNjI3MGNmMzI4
-    N2ZiMzQ4ZWNhNTg3ZDVhY2NkYWJhYzQ4ZjFmYjMwNDg2NjZkOTE=
+    MjJkOWQ4NmIzMGM3MTU0YTZkMDY5NGYxMTY3ZGY3YjE4NDMyMTE0OGUyMTA1
+    NjM4YzRkOTlkMzUwM2EzMWU1OGFhZDkwZGQ5N2ViYjRlZWZlYTAzNDM5MTYw
+    OGQ5ZDI3ZTlkZWMyZTEwNzZmOWNkZTJhMjM1Y2ExZGI2N2JjMjg=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    alertdesigner (0.0.2)
+    alertdesigner (0.0.3)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -3,6 +3,7 @@
 [![Build Status](https://travis-ci.org/mrtazz/AlertDesigner.svg?branch=master)](https://travis-ci.org/mrtazz/AlertDesigner)
 [![Coverage Status](https://coveralls.io/repos/mrtazz/AlertDesigner/badge.svg?branch=master&service=github)](https://coveralls.io/github/mrtazz/AlertDesigner?branch=master)
 [![Code Climate](https://codeclimate.com/github/mrtazz/AlertDesigner/badges/gpa.svg)](https://codeclimate.com/github/mrtazz/AlertDesigner)
+[![gem version](https://img.shields.io/gem/v/alertdesigner.svg)](https://rubygems.org/gems/alertdesigner)
 [![MIT license](https://img.shields.io/badge/license-MIT-blue.svg)](http://opensource.org/licenses/MIT)
 
 ## Overview
@@ -20,6 +21,16 @@ AlertDesigner.define do
     check_template "generic-service"
   end
 
+  {
+    "check_nrpe"       => "$USER1$/check_nrpe2 -H $HOSTADDRESS$ -c $ARG1$ -t 30",
+    "check_local_disk" => "$USER1$/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$",
+  }.each do |name, check_cmd|
+
+    command name do
+      command check_cmd
+    end
+  end
+
   # a simple disk space check
   check "/ Partition Disk Space" do
     hostgroups ["freebsd-base"]
@@ -52,6 +63,19 @@ end
 puts AlertDesigner.format
 ```
 
+## Installation
+Install from rubygems:
+
+```bash
+gem install alertdesigner
+```
+
+Or in your Gemfile:
+
+```ruby
+gem 'alertdesigner'
+```
+
 ## FAQ
 ### Couldn't most of this be done with a clever config hierarchy?
 Probably.

data/lib/alertdesigner.rb

@@ -1,10 +1,12 @@
 require "alertdesigner/formatters"
 require "alertdesigner/check"
+require "alertdesigner/command"
 
 # Top level AlertDesigner module with static methods for the DSL
 module AlertDesigner
   @checks = []
   @formatters = []
+  @commands = []
 
   def self.checks
     @checks
@@ -14,19 +16,35 @@ module AlertDesigner
     @formatters
   end
 
+  def self.commands
+    @commands
+  end
+
   def self.define(&block)
     instance_eval(&block)
   end
 
+  def self.reset
+    @checks = []
+    @formatters = []
+    @commands = []
+  end
+
   def self.check(description, &block)
     check = Check.new(description)
     check.instance_eval(&block)
     @checks << check
   end
 
+  def self.command(name, &block)
+    command = Command.new(name)
+    command.instance_eval(&block)
+    @commands << command
+  end
+
   def self.formatter(formatter_class, &block)
     formatter = formatter_class.new
-    formatter.instance_eval(&block)
+    formatter.instance_eval(&block) if block_given?
     @formatters << formatter
   end
 
@@ -34,6 +52,7 @@ module AlertDesigner
     ret = ""
     @formatters.each do |formatter|
       ret << formatter.format(:checks, @checks)
+      ret << formatter.format(:commands, @commands)
     end
     ret
   end

data/lib/alertdesigner/command.rb

@@ -0,0 +1,16 @@
+module AlertDesigner
+  # Class to represent a command
+  class Command < BasicObject
+    attr_reader :command, :name
+
+    def initialize(name)
+      @name = name
+      @command = ""
+    end
+
+    def command(command = nil)
+      return @command if command.nil?
+      @command = command
+    end
+  end
+end

data/lib/alertdesigner/formatters/nagios.rb

@@ -31,6 +31,15 @@ define <%= type %>{
           fmt_check.properties["check_command"] = check.command
           fmt_check
         end
+
+        def self.get_command(name, cmd)
+          fmt_command = NagiosDefinition.new
+          fmt_command.type = "command"
+          fmt_command.properties = {}
+          fmt_command.properties["command_name"] = name
+          fmt_command.properties["command_line"] = cmd
+          fmt_command
+        end
       end
 
       def check_template(template)
@@ -39,10 +48,24 @@ define <%= type %>{
 
       def format(type, value)
         return format_checks(value) if type == :checks
+        return format_commands(value) if type == :commands
       end
 
       private
 
+      def format_commands(commands)
+        ret = ""
+
+        commands ||= []
+
+        commands.each do |cmd|
+          command = NagiosDefinition.get_command(cmd.name, cmd.command)
+          ret << command.render
+        end
+
+        ret
+      end
+
       def format_checks(checks)
         ret = ""
         checks.each do |check|

data/test/integration/test_formatters_nagios.rb

@@ -10,9 +10,10 @@ class FormatterNagiosTest < Test::Unit::TestCase
   end
 
   def teardown
+    AlertDesigner.reset
   end
 
-  def test_nagios_formatter_integration
+  def test_nagios_formatter_services
 
     AlertDesigner.define do
 
@@ -95,6 +96,44 @@ define service{
     contact_groups    api-team
 }
 
+EOS
+
+    assert_equal(expected, ret)
+  end
+
+  def test_nagios_formatter_commands
+
+    AlertDesigner.define do
+
+      # let's use the Nagios formatter
+      formatter AlertDesigner::Formatters::Nagios
+
+      # define some basic commands
+      {
+        "check_nrpe"       => "$USER1$/check_nrpe2 -H $HOSTADDRESS$ -c $ARG1$ -t 30",
+        "check_local_disk" => "$USER1$/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$",
+      }.each do |name, check_cmd|
+
+        command name do
+          command check_cmd
+        end
+
+      end
+    end
+
+    ret = AlertDesigner.format
+
+    expected = <<-EOS
+define command{
+    command_name    check_nrpe
+    command_line    $USER1$/check_nrpe2 -H $HOSTADDRESS$ -c $ARG1$ -t 30
+}
+
+define command{
+    command_name    check_local_disk
+    command_line    $USER1$/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$
+}
+
 EOS
 
     assert_equal(expected, ret)

data/test/unit/test_command.rb

@@ -0,0 +1,20 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+require 'test/unit'
+require 'alertdesigner/command'
+
+class CommandTest < Test::Unit::TestCase
+
+  def setup
+    @c = AlertDesigner::Command.new "check-host-alive"
+  end
+
+  def teardown
+  end
+
+  def test_basic_instantiation
+    @c.command "$USER1$/check_ping -H $HOSTADDRESS$ -w 3000.0,80% -c 5000.0,100% -p 5"
+    assert_equal("check-host-alive", @c.name)
+    assert_equal("$USER1$/check_ping -H $HOSTADDRESS$ -w 3000.0,80% -c 5000.0,100% -p 5", @c.command)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alertdesigner
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Daniel Schauenberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-19 00:00:00.000000000 Z
+date: 2016-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -85,11 +85,13 @@ files:
 - alertdesigner.gemspec
 - lib/alertdesigner.rb
 - lib/alertdesigner/check.rb
+- lib/alertdesigner/command.rb
 - lib/alertdesigner/formatters.rb
 - lib/alertdesigner/formatters/nagios.rb
 - test/integration/test_formatters_nagios.rb
 - test/test_helper.rb
 - test/unit/test_check.rb
+- test/unit/test_command.rb
 - test/unit/test_formatter_nagios.rb
 - test/unit/test_formatters.rb
 homepage: https://github.com/mrtazz/AlertDesigner
@@ -119,5 +121,6 @@ test_files:
 - test/integration/test_formatters_nagios.rb
 - test/test_helper.rb
 - test/unit/test_check.rb
+- test/unit/test_command.rb
 - test/unit/test_formatter_nagios.rb
 - test/unit/test_formatters.rb