scout 5.6.9 → 5.6.10

Sign up to get free protection for your applications and to get access to all the features.
data/.gitignore CHANGED
@@ -5,5 +5,6 @@ pkg/*
5
5
  .idea
6
6
  working_dir/
7
7
  .rvmrc
8
+ .ruby-version
8
9
  Gemfile.lock
9
- .bundle
10
+ .bundle
@@ -1,3 +1,7 @@
1
+ # 5.6.10
2
+
3
+ * Fix for plugin.properties that contain '=' in the property value
4
+
1
5
  # 5.6.9
2
6
 
3
7
  * Install command generates a script for cron to run when using RVM or Bundler
@@ -602,7 +602,7 @@ module Scout
602
602
  line.strip!
603
603
  next if line[0] == '#'
604
604
  next unless line.include? "="
605
- k,v =line.split('=')
605
+ k,v =line.split('=',2)
606
606
  temp_configs[k]=v
607
607
  end
608
608
  debug("#{temp_configs.size} plugin config(s) loaded.")
@@ -1,3 +1,3 @@
1
1
  module Scout
2
- VERSION = "5.6.9"
2
+ VERSION = "5.6.10"
3
3
  end
@@ -4,9 +4,9 @@
4
4
  # Scout internal note: See documentation in scout_sinatra for running tests.
5
5
  #
6
6
  $VERBOSE=nil
7
-
8
-
9
7
  require 'rubygems'
8
+
9
+ gem "activerecord", "=2.2.2" # quick fix for now for the agent tests to continue to run when the rails 2.3 gem is present
10
10
  require "active_record"
11
11
  require "json" # the data format
12
12
  require "erb" # only for loading rails DB config for now
@@ -331,26 +331,29 @@ EOS
331
331
  default: 0
332
332
  EOS
333
333
  def build_report
334
- report :foo_value=>option(:foo)
334
+ report :foo_value=>option(:foo), :url_value=>option(:url)
335
335
  end
336
336
  end
337
337
  EOC
338
338
 
339
339
  run_scout_test(code, 'foo=13') do |res|
340
- assert_match ':fields=>{:foo_value=>"13"', res
340
+ assert_match ':foo_value=>"13"', res
341
341
  end
342
342
 
343
343
  properties=<<-EOS
344
344
  # this is a properties file
345
345
  myfoo=99
346
346
  mybar=100
347
+ myurl=http://foo.com?foo=bar
347
348
  EOS
348
349
 
349
350
  properties_path=File.join(AGENT_DIR,"plugins.properties")
350
351
  File.open(properties_path,"w") {|f| f.write properties}
351
352
 
352
- run_scout_test(code, 'foo=lookup:myfoo') do |res|
353
- assert_match ':fields=>{:foo_value=>"99"', res
353
+ run_scout_test(code, 'foo=lookup:myfoo url=lookup:myurl') do |res|
354
+ puts res
355
+ assert_match ':foo_value=>"99"', res
356
+ assert_match ':url_value=>"http://foo.com?foo=bar"', res
354
357
  end
355
358
 
356
359
  #cleanup
metadata CHANGED
@@ -1,44 +1,50 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: scout
3
- version: !ruby/object:Gem::Version
4
- version: 5.6.9
3
+ version: !ruby/object:Gem::Version
4
+ hash: 59
5
5
  prerelease:
6
+ segments:
7
+ - 5
8
+ - 6
9
+ - 10
10
+ version: 5.6.10
6
11
  platform: ruby
7
- authors:
12
+ authors:
8
13
  - Andre Lewis
9
14
  - Derek Haynes
10
15
  - James Edward Gray II
11
16
  autorequire:
12
17
  bindir: bin
13
18
  cert_chain: []
14
- date: 2013-05-29 00:00:00.000000000 Z
15
- dependencies:
16
- - !ruby/object:Gem::Dependency
19
+
20
+ date: 2013-07-31 00:00:00 -07:00
21
+ default_executable:
22
+ dependencies:
23
+ - !ruby/object:Gem::Dependency
17
24
  name: elif
18
- requirement: !ruby/object:Gem::Requirement
19
- none: false
20
- requirements:
21
- - - ! '>='
22
- - !ruby/object:Gem::Version
23
- version: '0'
24
- type: :runtime
25
25
  prerelease: false
26
- version_requirements: !ruby/object:Gem::Requirement
26
+ requirement: &id001 !ruby/object:Gem::Requirement
27
27
  none: false
28
- requirements:
29
- - - ! '>='
30
- - !ruby/object:Gem::Version
31
- version: '0'
32
- description: ! 'The scout gem reports metrics to scoutapp.com, an easy-to-use hosted
33
- server monitoring service.
28
+ requirements:
29
+ - - ">="
30
+ - !ruby/object:Gem::Version
31
+ hash: 3
32
+ segments:
33
+ - 0
34
+ version: "0"
35
+ type: :runtime
36
+ version_requirements: *id001
37
+ description: |
38
+ The scout gem reports metrics to scoutapp.com, an easy-to-use hosted server monitoring service.
34
39
 
35
- '
36
40
  email: support@scoutapp.com
37
- executables:
41
+ executables:
38
42
  - scout
39
43
  extensions: []
44
+
40
45
  extra_rdoc_files: []
41
- files:
46
+
47
+ files:
42
48
  - .gitignore
43
49
  - CHANGELOG.markdown
44
50
  - Gemfile
@@ -215,32 +221,40 @@ files:
215
221
  - vendor/signature/spec/signature_spec.rb
216
222
  - vendor/signature/spec/spec_helper.rb
217
223
  - vendor/util/lib/core_extensions.rb
224
+ has_rdoc: true
218
225
  homepage: http://scoutapp.com
219
226
  licenses: []
227
+
220
228
  post_install_message:
221
229
  rdoc_options: []
222
- require_paths:
230
+
231
+ require_paths:
223
232
  - lib
224
- required_ruby_version: !ruby/object:Gem::Requirement
233
+ required_ruby_version: !ruby/object:Gem::Requirement
225
234
  none: false
226
- requirements:
227
- - - ! '>='
228
- - !ruby/object:Gem::Version
229
- version: '0'
230
- required_rubygems_version: !ruby/object:Gem::Requirement
235
+ requirements:
236
+ - - ">="
237
+ - !ruby/object:Gem::Version
238
+ hash: 3
239
+ segments:
240
+ - 0
241
+ version: "0"
242
+ required_rubygems_version: !ruby/object:Gem::Requirement
231
243
  none: false
232
- requirements:
233
- - - ! '>='
234
- - !ruby/object:Gem::Version
235
- version: '0'
244
+ requirements:
245
+ - - ">="
246
+ - !ruby/object:Gem::Version
247
+ hash: 3
248
+ segments:
249
+ - 0
250
+ version: "0"
236
251
  requirements: []
252
+
237
253
  rubyforge_project: scout
238
- rubygems_version: 1.8.24
254
+ rubygems_version: 1.4.2
239
255
  signing_key:
240
256
  specification_version: 3
241
- summary: Scout is an easy-to-use hosted server monitoring service. The scout Ruby
242
- gem reports metrics to our service. The agent runs plugins, configured via the Scout
243
- web interface, to monitor a server.
244
- test_files:
257
+ summary: Scout is an easy-to-use hosted server monitoring service. The scout Ruby gem reports metrics to our service. The agent runs plugins, configured via the Scout web interface, to monitor a server.
258
+ test_files:
245
259
  - test/plugins/disk_usage.rb
246
260
  - test/scout_test.rb