restfully-addons 1.2.1 → 1.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. data/lib/restfully/addons/bonfire/zabbix.rb +11 -8
  2. data/lib/restfully/addons/version.rb +1 -1
  3. metadata +17 -17
data/lib/restfully/addons/bonfire/zabbix.rb CHANGED
@@ -85,23 +85,26 @@ module Restfully
85
85
  "output" => "extend"
86
86
  }).map{|i| i['itemid']}
87
87
 
88
- history = case options[:type]
88
+ options[:type] = case options[:type]
89
+ when Fixnum
90
+ options[:type]
89
91
  when :numeric
90
92
  0
91
93
  else
92
- 1 # STRING
94
+ nil
93
95
  end
94
96
 
95
97
  # Most recent last
96
98
  now = Time.now.to_i
97
- results = request("history.get", {
99
+ payload = {
98
100
  "itemids" => items[0..1],
99
101
  # FIX once we can correctly specify metric type
100
- "history" => history,
101
102
  "output" => "extend",
102
- "time_from" => now-3600,
103
- "time_till" => now
104
- })
103
+ "time_from" => options[:from] || now-3600,
104
+ "time_till" => options[:till] || now
105
+ }
106
+ payload["history"] = options[:type] unless options[:type].nil?
107
+ results = request("history.get", payload)
105
108
 
106
109
  Metric.new(name, results, options)
107
110
  end
@@ -116,7 +119,7 @@ module Restfully
116
119
  def values
117
120
  @results.map{|r|
118
121
  case @opts[:type]
119
- when :numeric
122
+ when :numeric, 0, 3
120
123
  r['value'].to_f
121
124
  else
122
125
  r['value']
data/lib/restfully/addons/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Restfully
2
2
  module Addons
3
- VERSION = "1.2.1"
3
+ VERSION = "1.3.0"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: restfully-addons
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.1
4
+ version: 1.3.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2011-12-08 00:00:00.000000000Z
12
+ date: 2012-03-16 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: restfully
16
- requirement: &2156257520 !ruby/object:Gem::Requirement
16
+ requirement: &2156274160 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *2156257520
24
+ version_requirements: *2156274160
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: net-ssh-gateway
27
- requirement: &2156256940 !ruby/object:Gem::Requirement
27
+ requirement: &2156273400 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *2156256940
35
+ version_requirements: *2156273400
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: net-scp
38
- requirement: &2156256520 !ruby/object:Gem::Requirement
38
+ requirement: &2156272600 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *2156256520
46
+ version_requirements: *2156272600
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: net-sftp
49
- requirement: &2156255960 !ruby/object:Gem::Requirement
49
+ requirement: &2156271800 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *2156255960
57
+ version_requirements: *2156271800
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: net-ssh-multi
60
- requirement: &2156255420 !ruby/object:Gem::Requirement
60
+ requirement: &2156270920 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *2156255420
68
+ version_requirements: *2156270920
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: libxml-ruby
71
- requirement: &2156254100 !ruby/object:Gem::Requirement
71
+ requirement: &2156270220 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *2156254100
79
+ version_requirements: *2156270220
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: rake
82
- requirement: &2156252340 !ruby/object:Gem::Requirement
82
+ requirement: &2156269180 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ~>
@@ -87,7 +87,7 @@ dependencies:
87
87
  version: '0.8'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *2156252340
90
+ version_requirements: *2156269180
91
91
  description: Addons for Restfully
92
92
  email:
93
93
  - cyril.rohr@inria.fr
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
129
129
  version: '1.3'
130
130
  requirements: []
131
131
  rubyforge_project:
132
- rubygems_version: 1.8.11
132
+ rubygems_version: 1.8.13
133
133
  signing_key:
134
134
  specification_version: 3
135
135
  summary: Addons for Restfully