zbxapi 0.3.0 → 0.3.1
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.
- data/api_classes/dsl_host.rb +1 -1
- data/zbxapi.rb +7 -0
- metadata +2 -2
data/api_classes/dsl_host.rb
CHANGED
|
@@ -36,7 +36,7 @@ class Host < ZabbixAPI_Base
|
|
|
36
36
|
"editable","filter","search","startSearch","excludeSearch",
|
|
37
37
|
"searchWildcardsEnabled","output","select_groups","selectParentTemplates",
|
|
38
38
|
"select_items","select_triggers","select_graphs","select_applications",
|
|
39
|
-
"select_macros","select_profile","countOutput","groupOutput",
|
|
39
|
+
"selectInterfaces","select_macros","select_profile","countOutput","groupOutput",
|
|
40
40
|
"preservekeys","sortfield","sortorder","limit","extendoutput"]
|
|
41
41
|
add_valid_params "2.0", ["nodeids","groupids","hostids","templateids", "itemids",
|
|
42
42
|
"triggerids","graphids","proxyids","maintenanceids", "dhostids",
|
data/zbxapi.rb
CHANGED
|
@@ -122,6 +122,12 @@ class ZabbixAPI
|
|
|
122
122
|
@verify_ssl = true
|
|
123
123
|
end
|
|
124
124
|
|
|
125
|
+
if options.has_key?:http_timeout
|
|
126
|
+
@http_timeout=options[:http_timeout]
|
|
127
|
+
else
|
|
128
|
+
@http_timeout=true
|
|
129
|
+
end
|
|
130
|
+
|
|
125
131
|
#Generate the list of sub objects dynamically, from all objects
|
|
126
132
|
#derived from ZabbixAPI_Base
|
|
127
133
|
objects=TRUE
|
|
@@ -406,6 +412,7 @@ class ZabbixAPI
|
|
|
406
412
|
def setup_connection
|
|
407
413
|
@http=Net::HTTP.new(@url.host, @url.port)
|
|
408
414
|
http.use_ssl=true if @url.class==URI::HTTPS
|
|
415
|
+
http.timeout=@http_timeout
|
|
409
416
|
end
|
|
410
417
|
end
|
|
411
418
|
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: zbxapi
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.3.
|
|
4
|
+
version: 0.3.1
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2013-09-
|
|
12
|
+
date: 2013-09-13 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: json
|