vaimo-messages-handler 2.0.4 → 2.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +1 -1
  3. data/bin/send-message.rb +22 -22
  4. data/lib/vaimo-messages-handler.rb +10 -1
  5. data/lib/vaimo-messages-handler/version.rb +3 -3
  6. metadata +26 -22
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: dfca17907e9d70c1816b3bbd5779c0addfd7154f
4
- data.tar.gz: d4b87ef900394088a5998251cfbd85cb9cc2ebcf
3
+ metadata.gz: ba906f05ef44d119a786b34fa9fc6bd9aa3d91d9
4
+ data.tar.gz: 9c7aed312061bf153eb984365e56af2394f62619
5
5
  SHA512:
6
- metadata.gz: 507bd5bb5a5e605bb87a895a2182633b2446c73c1a10daa8839867b7a1074b3591e5c5ad4d4a9a6ababaca616a318963eecfa2fba6f205f9be7b85b33d7ace7c
7
- data.tar.gz: d2c295bb8a16041e8eb5de89ba4e95ce25f269f9767fe38904ff45c828ae9835c34c0ca47b808d18a5e4dc04e7ac8921a91dfd241d61164e7dc6b47d52173d86
6
+ metadata.gz: c98173cc2ee23512394c3914cccbd9e7145fce0ddf8f1596524008e7e30cbdd652e74942a8b347485581851c1546b66edbc84752784d88bf33940c72bcd8b3a5
7
+ data.tar.gz: b71c47a70eef479f2bf3c4bf8ba3b959f9772626534f29fd5742480ec3148de3d73e14a4280b940760b38f0cac7bd316da8fe22bcf46ddef407c95e060d7030b
data/README.md CHANGED
@@ -13,7 +13,7 @@ Create a json config file with your web_hook, auth_token, recipient and from.
13
13
 
14
14
  ```json
15
15
  {
16
- "vaimo-messages": {
16
+ "messages": {
17
17
  "web_hook": "http://to.web.hook.urli/send",
18
18
  "auth_token": "XXXXXXXXXXXXXXXXXXXXXXXXX",
19
19
  "recipient": "group",
data/bin/send-message.rb CHANGED
@@ -16,8 +16,8 @@
16
16
  #
17
17
  # USAGE:
18
18
  #
19
- # Configure your vaimo-messages web_hook, auth_token, recipient and from here:
20
- # vaimo-messages.json
19
+ # Configure your messages web_hook, auth_token, recipient and from here:
20
+ # messages.json
21
21
  #
22
22
  # NOTES:
23
23
  #
@@ -25,7 +25,6 @@
25
25
  # Copyright (c) Vaimo Group. All rights reserved.
26
26
  # See LICENSE_VAIMO.txt for license details.
27
27
  #
28
-
29
28
  require 'json'
30
29
  require 'net/http'
31
30
  require 'net/https'
@@ -56,12 +55,12 @@ def sensu_deep_merge(hash_one, hash_two)
56
55
  merged = hash_one.dup
57
56
  hash_two.each do |key, value|
58
57
  merged[key] = if hash_one[key].is_a?(Hash) && value.is_a?(Hash)
59
- sensu_deep_merge(hash_one[key], value)
60
- elsif hash_one[key].is_a?(Array) && value.is_a?(Array)
61
- hash_one[key].concat(value).uniq
62
- else
63
- value
64
- end
58
+ sensu_deep_merge(hash_one[key], value)
59
+ elsif hash_one[key].is_a?(Array) && value.is_a?(Array)
60
+ hash_one[key].concat(value).uniq
61
+ else
62
+ value
63
+ end
65
64
  end
66
65
  merged
67
66
  end
@@ -72,13 +71,14 @@ end
72
71
 
73
72
  def messages_post_args(args, settings)
74
73
  {
75
- auth_token: settings['auth_token'],
76
- receiver: settings['recipient'],
77
- from: settings['from'],
78
- server: messages_key_value(args, :server, nil),
79
- level: messages_key_value(args, :level, nil),
80
- message: messages_key_value(args, :message, nil),
81
- component: messages_key_value(args, :component, nil)
74
+ auth_token: settings['auth_token'],
75
+ receiver: settings['recipient'],
76
+ from: settings['from'],
77
+ server: messages_key_value(args, :server, nil),
78
+ level: messages_key_value(args, :level, nil),
79
+ message: messages_key_value(args, :message, nil),
80
+ component: messages_key_value(args, :component, nil),
81
+ output: messages_key_value(args, :output, nil),
82
82
  }
83
83
  end
84
84
 
@@ -129,15 +129,16 @@ log.level = Logger::INFO
129
129
 
130
130
  begin
131
131
  raw_data = STDIN.read
132
- event = JSON.parse(raw_data)
132
+ event = JSON.parse(raw_data)
133
133
 
134
134
  sensu_settings
135
135
  messages_settings = sensu_setting('messages')
136
136
 
137
137
  args = {
138
- server: event['client']['name'],
139
- component: event['check']['name'],
140
- level: messages_level(event['check']['status'])
138
+ server: event['client']['name'],
139
+ component: event['check']['name'],
140
+ level: messages_level(event['check']['status']),
141
+ output: event['check']['output']
141
142
  }
142
143
 
143
144
  post_args = messages_post_args(args, messages_settings)
@@ -146,5 +147,4 @@ begin
146
147
  rescue => e
147
148
  log.error "Messages Error: #{e}"
148
149
  log.error "Messages Trace: #{e.backtrace}"
149
- end
150
-
150
+ end
data/lib/vaimo-messages-handler.rb CHANGED
@@ -1,6 +1,15 @@
1
1
  require 'vaimo-messages-handler/version'
2
+ require 'net/http'
3
+ require 'uri'
4
+ require 'json'
2
5
 
3
6
  # Messages for Vaimo System
4
- module VaimoMessagesHandler
7
+ module VaimoMessages
8
+ # Client for Sending data to WebHook
9
+ class Client
10
+ end
5
11
 
12
+ # Error Handler
13
+ class ErrorHandler < StandardError
14
+ end
6
15
  end
data/lib/vaimo-messages-handler/version.rb CHANGED
@@ -1,8 +1,8 @@
1
- module VaimoMessagesHandler
1
+ module VaimoMessages
2
2
  module Version
3
3
  MAJOR = 2
4
- MINOR = 0
5
- PATCH = 4
4
+ MINOR = 1
5
+ PATCH = 0
6
6
 
7
7
  VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
8
8
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vaimo-messages-handler
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.4
4
+ version: 2.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Margus Heinmaa
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-09-05 00:00:00.000000000 Z
11
+ date: 2018-09-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: sensu-plugin
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 2.6.1
19
+ version: '1.2'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 2.6.1
26
+ version: '1.2'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: bundler
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -44,112 +44,112 @@ dependencies:
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 1.0.8
47
+ version: '0.4'
48
48
  type: :development
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: 1.0.8
54
+ version: '0.4'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: github-markup
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 2.0.1
61
+ version: '1.3'
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: 2.0.1
68
+ version: '1.3'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: pry
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: 0.11.3
75
+ version: '0.10'
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - "~>"
81
81
  - !ruby/object:Gem::Version
82
- version: 0.11.3
82
+ version: '0.10'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: rake
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
87
  - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: 12.3.1
89
+ version: '10.0'
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
94
  - - "~>"
95
95
  - !ruby/object:Gem::Version
96
- version: 12.3.1
96
+ version: '10.0'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: redcarpet
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
101
  - - "~>"
102
102
  - !ruby/object:Gem::Version
103
- version: 3.4.0
103
+ version: '3.2'
104
104
  type: :development
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
108
  - - "~>"
109
109
  - !ruby/object:Gem::Version
110
- version: 3.4.0
110
+ version: '3.2'
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: rspec
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
115
  - - "~>"
116
116
  - !ruby/object:Gem::Version
117
- version: 3.8.0
117
+ version: '3.1'
118
118
  type: :development
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
122
  - - "~>"
123
123
  - !ruby/object:Gem::Version
124
- version: 3.8.0
124
+ version: '3.1'
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: rubocop
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
129
  - - "~>"
130
130
  - !ruby/object:Gem::Version
131
- version: 0.58.2
131
+ version: 0.59.1
132
132
  type: :development
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
136
  - - "~>"
137
137
  - !ruby/object:Gem::Version
138
- version: 0.58.2
138
+ version: 0.59.1
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: yard
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
143
  - - "~>"
144
144
  - !ruby/object:Gem::Version
145
- version: 0.9.16
145
+ version: '0.8'
146
146
  type: :development
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
150
  - - "~>"
151
151
  - !ruby/object:Gem::Version
152
- version: 0.9.16
152
+ version: '0.8'
153
153
  description: Sensu Handler Messages
154
154
  email: "<margus.heinmaa@vaimo.com>"
155
155
  executables:
@@ -166,7 +166,11 @@ files:
166
166
  homepage: https://bitbucket.org/vaimo/vaimo-messages-handler
167
167
  licenses:
168
168
  - Private
169
- metadata: {}
169
+ metadata:
170
+ development_status: active
171
+ production_status: unstable - testing recommended
172
+ release_draft: 'false'
173
+ release_prerelease: 'false'
170
174
  post_install_message:
171
175
  rdoc_options: []
172
176
  require_paths:
@@ -175,7 +179,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
175
179
  requirements:
176
180
  - - ">="
177
181
  - !ruby/object:Gem::Version
178
- version: 2.2.0
182
+ version: 2.1.0
179
183
  required_rubygems_version: !ruby/object:Gem::Requirement
180
184
  requirements:
181
185
  - - ">="