vaimo-messages-handler 1.0.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 943072b1a328bf2fb6c784aa8bf3e18fd11dd573
-  data.tar.gz: 80374526e30581bb5d7bdbce22e1709fb7173c75
+  metadata.gz: 4f9718717b4b77c04dbf01d20dfcd1e0c3d1f580
+  data.tar.gz: 6360ab2197887a7a4cbeabcdf14329f3345d2542
 SHA512:
-  metadata.gz: 73e3f616aabbe948c607582ffe4a3bccb0b6c5eab4ee5259c8854bec0d23c7f6f2f96c63e9a1fb2a526d7939fe2e00d6b3b2efa62b52b49df27b53d94dd92549
-  data.tar.gz: 50b7fd10bef5877c4e74d4fef2fbf1c3f24475fa141e998c79713170bb4d9f7ef8ce0330a0a6134deda6e079733fbe396f1a5afe2b6ba673d56fd2305c83e4db
+  metadata.gz: 824942302d4dc927decdbc468410d92f93c7706c4c33c03b6a27619c56284aebf42aeb354b7cfd8527f9537d642d427bdedf4ce771b74a0f9610c4f4b3ce6bcc
+  data.tar.gz: bc3c7b1bbb2ee1f387fb0652c2c3ca8472c1940773c2d7fea873d53a3d0fef0e8000a249cf4b940f6bf46d1ada9039b424ad86128c6d2d77dc97059e8a13d4c6

data/bin/send-message.rb

@@ -26,102 +26,124 @@
 #   See LICENSE_VAIMO.txt for license details.
 #
 
-require 'date'
-require 'sensu-handler'
+require 'json'
 require 'net/http'
+require 'net/https'
 require 'uri'
-require 'json'
+require 'logger'
 
-# VaimoMessages
-class VaimoMessages < Sensu::Handler
-  option :json_config_name,
-         description: 'Name of the JSON Configuration block (default: messages)',
-         short:       '-j JsonConfig',
-         long:        '--json_config JsonConfig',
-         required:    false,
-         default:     'messages'
-
-  def config_settings
-    settings[config[:json_config_name]]
-  end
+def sensu_config_files
+  ['/etc/sensu/config.json'] + Dir['/etc/sensu/conf.d/**/*.json']
+end
 
-  def client_name
-    @event['client']['name']
-  end
+def sensu_load_config(filename)
+  JSON.parse(File.open(filename, 'r').read)
+rescue
+  {}
+end
 
-  def check_name
-    @event['check']['name']
+def sensu_settings
+  @sensu_settings ||= sensu_config_files.map { |f| sensu_load_config(f) }.reduce do |a, b|
+    sensu_deep_merge(a, b)
   end
+end
 
-  def level
-    @event['action'].eql?('resolve') ? 'normal' : 'error'
-  end
+def sensu_setting(key)
+  @sensu_settings[key]
+end
 
-  def web_hook
-    config_settings['web_hook'] || nil
+def sensu_deep_merge(hash_one, hash_two)
+  merged = hash_one.dup
+  hash_two.each do |key, value|
+    merged[key] = if hash_one[key].is_a?(Hash) && value.is_a?(Hash)
+                    deep_merge(hash_one[key], value)
+                  elsif hash_one[key].is_a?(Array) && value.is_a?(Array)
+                    hash_one[key].concat(value).uniq
+                  else
+                    value
+                  end
   end
+  merged
+end
 
-  def auth_token
-    config_settings['auth_token'] || nil
-  end
+def messages_key_value(args, key, default)
+  args[key] || default
+end
 
-  def recipient
-    config_settings['recipient'] || nil
-  end
+def messages_post_args(args, settings)
+  {
+    auth_token: settings['auth_token'],
+    receiver:   settings['recipient'],
+    from:       settings['from'],
+    server:     messages_key_value(args, :server, nil),
+    level:      messages_key_value(args, :level, nil),
+    message:    messages_key_value(args, :message, nil),
+    component:  messages_key_value(args, :component, nil)
+  }
+end
+
+def messages_parse_response(response)
+  data = JSON.parse(response)
 
-  def from
-    config_settings['from'] || 'SensuAlert'
+  hash = {}
+  data.each do |key, value|
+    hash[key] = value
   end
 
-  def post_args
-    {
-      auth_token: auth_token,
-      receiver:   recipient,
-      from:       from,
-      server:     client_name,
-      level:      level,
-      message:    nil,
-      component:  check_name
-    }
+  raise "Messages WebHook: #{hash['message']}" if hash['error']
+
+  hash
+end
+
+def messages_level(status)
+  case status
+    when 0
+      'normal'
+    when 1
+      'warning'
+    when 2
+      'error'
   end
+end
 
-  def parse_response(response)
-    data = JSON.parse(response)
+def messages_send(post_args, settings)
+  header = { 'Content-Type': 'text/json' }
 
-    hash = {}
-    data.each do |key, value|
-      hash[key] = value
-    end
+  return unless settings['webhook_url']
 
-    raise ErrorHandler "Messages WebHook: #{hash['message']}" if hash['error']
+  uri = URI.parse(settings['webhook_url'])
 
-    hash
-  end
+  http         = Net::HTTP.new(uri.host, uri.port)
+  http.use_ssl = true
 
-  def send_message
-    header = ['Content-Type' => 'text/json']
+  request      = Net::HTTP::Post.new(uri.request_uri, header)
+  request.body = post_args.to_json
 
-    uri = URI.parse(web_hook)
+  response = http.request(request)
 
-    http         = Net::HTTP.new(uri.host, uri.port)
-    http.use_ssl = true
+  messages_parse_response(response.body)
+end
 
-    request      = Net::HTTP::Post.new(uri.request_uri, header)
-    request.body = post_args.to_json
+log       = Logger.new('/tmp/sensu-messages-handler.log')
+log.level = Logger::INFO
 
-    response = http.request(request)
+begin
+  event = JSON.parse(STDIN.read)
 
-    parse_response(response.body)
-  end
+  sensu_settings
+  messages_settings = sensu_setting('messages')
 
-  def handle
-    raise 'No web_hook configured' if web_hook.nil?
-    raise 'No auth_token configured' if auth_token.nil?
-    raise 'No recipient configured' if recipient.nil?
+  args = {
+    server:    event[0]['client']['name'],
+    component: event[0]['check']['name'],
+    level:     messages_level(event[0]['check']['status'])
+  }
 
-    send_message
-  end
+  post_args = messages_post_args(args, messages_settings)
 
-  class ErrorHandler < StandardError
-  end
+  messages_send(post_args, messages_settings)
+rescue => e
+  log.error "Messages Error: #{e}"
+  raise e
 end
+

data/lib/vaimo-messages-handler.rb

@@ -1,15 +1,6 @@
 require 'vaimo-messages-handler/version'
-require 'net/http'
-require 'uri'
-require 'json'
 
 # Messages for Vaimo System
 module VaimoMessagesHandler
-  # Client for Sending data to WebHook
-  class Client
-  end
 
-  # Error Handler
-  class ErrorHandler < StandardError
-  end
 end

data/lib/vaimo-messages-handler/version.rb

@@ -1,8 +1,8 @@
 module VaimoMessagesHandler
   module Version
-    MAJOR = 1
+    MAJOR = 2
     MINOR = 0
-    PATCH = 2
+    PATCH = 0
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vaimo-messages-handler
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Margus Heinmaa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-04 00:00:00.000000000 Z
+date: 2018-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -153,7 +153,6 @@ dependencies:
 description: Sensu Handler Messages
 email: "<margus.heinmaa@vaimo.com>"
 executables:
-- copy-send-message.rb
 - send-message.rb
 extensions: []
 extra_rdoc_files: []
@@ -161,7 +160,6 @@ files:
 - CHANGELOG.md
 - LICENSE_VAIMO.txt
 - README.md
-- bin/copy-send-message.rb
 - bin/send-message.rb
 - lib/vaimo-messages-handler.rb
 - lib/vaimo-messages-handler/version.rb
@@ -177,7 +175,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/bin/copy-send-message.rb

@@ -1,81 +0,0 @@
-#! /usr/bin/env ruby
-#
-#   send-message.rb
-#
-# DESCRIPTION:
-#   Sensu Messages Handler For Custom Messages gateway
-#
-# OUTPUT:
-#   None unless there is an error
-#
-# PLATFORMS:
-#   Linux
-#
-# DEPENDENCIES:
-#   gem: sensu-handler
-#
-# USAGE:
-#
-#   Configure your vaimo-messages web_hook, auth_token, recipient and from here:
-#     vaimo-messages.json
-#
-# NOTES:
-#
-# LICENSE:
-#   Copyright (c) Vaimo Group. All rights reserved.
-#   See LICENSE_VAIMO.txt for license details.
-#
-
-require 'date'
-require 'sensu-handler'
-require 'timeout'
-
-# VaimoMessages Handler
-class VaimoMessagesHandler < Sensu::Handler
-  def send_message
-    client = VaimoMessages::Client.new(
-      web_hook:   web_hook,
-      auth_token: auth_token,
-      receiver:   recipient,
-      from:       from
-    )
-
-    client.send_message(server: server, level: 'error', component: component)
-  end
-
-  def web_hook
-    settings['vaimo-messages']['web_hook']
-  end
-
-  def auth_token
-    settings['vaimo-messages']['auth_token']
-  end
-
-  def recipient
-    settings['vaimo-messages']['recipient']
-  end
-
-  def from
-    if settings['vaimo-messages']['from'].is_a?(String)
-      return settings['vaimo-messages']['from']
-    end
-
-    Null
-  end
-
-  def server
-    @event['client']['name']
-  end
-
-  def component
-    @event['check']['name']
-  end
-
-  def handle
-    Timeout.timeout 10 do
-      send_message
-    end
-  rescue Timeout::Error
-    puts 'timed out while attempting to send message'
-  end
-end