livestatus 0.2.1 → 0.3.0

data/lib/livestatus.rb

@@ -5,24 +5,6 @@ require "livestatus/connection"
 require "livestatus/models"
 
 module Livestatus
-  mattr_accessor :config
-  self.config = {
-    :uri => "unix:///var/nagios/rw/live",
-  }
-
-  def self.connection
-    @@connection ||= connection!
-  end
-
-  def self.connection!
-    Livestatus::Connection.new(config)
-  end
-
-  def self.get(table_name, options = {})
-    connection.get(table_name, options)
-  end
-
-  def self.command(cmd, time = nil)
-    connection.command(cmd, time)
-  end
+  mattr_accessor :connection
+  self.connection = nil
 end

data/lib/livestatus/api.rb

@@ -9,6 +9,7 @@ module Livestatus
       Hash[env.select do |k, v|
         k =~ /^HTTP_X_LIVESTATUS_/
       end.map do |k, v|
+        v = Yajl::Parser.parse(v) if v =~ /^\[/
         [k[18..-1].downcase.to_sym, v]
       end]
     end
@@ -17,7 +18,7 @@ module Livestatus
       headers = parse_headers(request.env)
 
       halt 400, 'no query specified' unless headers.include?(:query)
-      method, query = headers.delete(:query).split
+      method, query = headers.delete(:query).split(' ', 2)
 
       halt 400, 'invalid method' unless ['GET', 'COMMAND'].include?(method)
       method = method.downcase.to_sym
@@ -26,11 +27,14 @@ module Livestatus
 
       case method
       when :get
-        Yajl::Encoder.encode(c.get(query, headers))
+        res = c.get(Livestatus.models[query], headers).map(&:data)
       when :command
-        c.command(query)
-        Yajl::Encoder.encode(c.command(query))
+        query =~ /\[([0-9]+)\] (.*)/
+        time, command = $1.to_i, $2
+        res = c.command(command, time)
       end
+
+      Yajl::Encoder.encode(res)
     end
   end
 end

data/lib/livestatus/connection.rb

@@ -18,9 +18,9 @@ module Livestatus
     def handler!
       case @config[:uri]
       when /^https?:\/\//
-        PatronHandler.new(@config)
+        PatronHandler.new(self, @config)
       when /^unix:\/\//
-        UnixHandler.new(@config)
+        UnixHandler.new(self, @config)
       else
         raise AttributeError, "unknown uri type: #{@config[:uri]}"
       end

data/lib/livestatus/handler.rb

@@ -1,18 +1,5 @@
 module Livestatus
-
   class HandlerException < StandardError; end
-
-  class BaseHandler
-    def get(table_name, options = {})
-      query(:get, table_name.to_s, options)
-    end
-
-    def command(cmd, time = nil)
-      time = Time.now.to_i unless time
-      query(:command, "[#{time}] #{cmd}")
-    end
-  end
-
 end
 
 Dir["#{File.dirname(__FILE__)}/handler/*.rb"].each do |path|

data/lib/livestatus/handler/patron.rb

@@ -4,10 +4,11 @@ require 'yajl'
 
 module Livestatus
 
-  class PatronHandler < BaseHandler
+  class PatronHandler
     attr_accessor :session
 
-    def initialize(config)
+    def initialize(connection, config)
+      @connection = connection
       @session = Patron::Session.new
       @session.timeout = 10
       @session.headers["User-Agent"] = "livestatus/#{VERSION} ruby/#{RUBY_VERSION}"
@@ -18,10 +19,23 @@ module Livestatus
       @uri = config[:uri]
     end
 
+    def get(model, options = {})
+      query(:get, model.table_name, options).map do |data|
+        model.new(data, @connection)
+      end
+    end
+
+    def command(cmd, time = nil)
+      time = Time.now.to_i unless time
+      query(:command, "[#{time}] #{cmd}")
+      nil
+    end
+
     def query(method, query, headers = {})
       headers = Hash[headers.merge({
         :query => "#{method.to_s.upcase} #{query}"
       }).map do |k, v|
+        v = Yajl::Encoder.encode(v) if v.is_a?(Array)
         ["X-Livestatus-#{k.to_s.dasherize}", v]
       end]
 

data/lib/livestatus/handler/unix.rb

@@ -4,51 +4,59 @@ require 'yajl'
 
 module Livestatus
 
-  class UnixHandler < BaseHandler
-    def initialize(config)
+  class UnixHandler
+    def initialize(connection, config)
+      @connection = connection
       @socket = UNIXSocket.open(config[:uri].sub(/^unix:\/\//, ''))
     end
 
-    def get(table_name, options = {})
-      data = super
-
-      if options.include?(:columns)
-        columns = options[:columns].split(" ")
-      else
-        columns = data.delete_at(0)
-      end
-
-      column_zip(columns, data)
-    end
-
-    def query(method, query, headers = {})
-      headers.merge!({
+    def get(model, options = {})
+      options.merge!({
         :response_header => "fixed16",
         :output_format => "json",
         :keep_alive => "on",
       })
 
-      headers = headers.map { |k,v| "#{k.to_s.camelize}: #{v}" }.join("\n")
+      headers = options.map do |k,v|
+        if v.is_a?(Array)
+          v.map do |e|
+            "#{k.to_s.camelize}: #{e}"
+          end
+        else
+          "#{k.to_s.camelize}: #{v}"
+        end
+      end.flatten.join("\n")
+
       headers += "\n" unless headers.empty?
 
-      case method
-      when :get
-        @socket.write("#{method.to_s.upcase} #{query}\n#{headers}\n")
+      @socket.write("GET #{model.table_name}\n#{headers}\n")
 
-        res = @socket.read(16)
-        status, length = res[0..2].to_i, res[4..14].chomp.to_i
+      res = @socket.read(16)
+      status, length = res[0..2].to_i, res[4..14].chomp.to_i
 
-        unless status == 200
-          raise HandlerException, "livestatus query failed with status #{status}"
-        end
+      unless status == 200
+        raise HandlerException, "livestatus query failed with status #{status}"
+      end
+
+      data = Yajl::Parser.new.parse(@socket.read(length))
 
-        Yajl::Parser.new.parse(@socket.read(length))
-      when :command
-        @socket.write("#{method.to_s.upcase} #{query}\n\n")
-        nil
+      if options.include?(:columns)
+        columns = options[:columns].split(" ")
+      else
+        columns = data.delete_at(0)
+      end
+
+      column_zip(columns, data).map do |d|
+        model.new(d, @connection)
       end
     end
 
+    def command(cmd, time = nil)
+      time = Time.now.to_i unless time
+      @socket.write("COMMAND [#{time}] #{cmd}\n\n")
+      nil
+    end
+
     private
 
     def column_zip(columns, data)

data/lib/livestatus/models.rb

@@ -2,13 +2,14 @@ require "active_support/core_ext"
 
 module Livestatus
   mattr_accessor :models
-  self.models = []
+  self.models = {}
 
   class Base
     attr_reader :data
 
-    def initialize(data)
+    def initialize(data, connection = nil)
       @data = data.symbolize_keys!
+      @connection = connection
     end
 
     def method_missing(name, *args)
@@ -16,12 +17,6 @@ module Livestatus
     end
 
     class << self
-      def find(options = {})
-        Livestatus.get(table_name, options).map do |data|
-          new(data)
-        end
-      end
-
       def table_name
         to_s.demodulize.tableize.downcase.pluralize
       end
@@ -93,5 +88,6 @@ Dir["#{File.dirname(__FILE__)}/models/*.rb"].map do |path|
   File.basename(path, '.rb')
 end.each do |name|
   require "livestatus/models/#{name}"
-  Livestatus.models << "Livestatus::#{name.pluralize.classify}".constantize
+  model = "Livestatus::#{name.pluralize.classify}".constantize
+  Livestatus.models[model.table_name] = model
 end

data/lib/livestatus/models/host.rb

@@ -14,6 +14,19 @@ class Livestatus::Host < Livestatus::Base
     :last_notification, :last_state_change, :last_time_down,
     :last_time_unreachable, :last_time_up, :next_check, :next_notification
 
+  def services
+    if @connection
+      @data[:services].map do |service|
+        @connection.get(Livestatus::Service, :filter => [
+          "host_name = #{name}",
+          "display_name = #{service}"
+        ]).first
+      end
+    else
+      @data[:services]
+    end
+  end
+
   def _id
     display_name
   end

data/lib/livestatus/version.rb

@@ -1,3 +1,3 @@
 module Livestatus
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: livestatus
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - "Benedikt B\xC3\xB6hm"