zabbixapi 0.1.6.1 → 0.1.6.2

data/README.rdoc

@@ -20,7 +20,7 @@ You can:
       "dns"    => 'my.example.com',
       "host"   => 'my.example.com',
       "useip"  => 1,
-      "groups" => ['some_group']
+      "groups" => [get_group_id('some_group')]
     }
     if zbx.create_host(host_options)
       puts zbx.get_host_id('my.example.com')

data/lib/zabbixapi/group.rb

@@ -15,7 +15,7 @@ module Zabbix
     end
 
     def group_exist?(pattern)
-      group_id = get_groups_id(pattern)
+      group_id = get_group_id(pattern)
       group_id ? true : false
     end
 

data/lib/zabbixapi/host.rb

@@ -30,7 +30,7 @@ module Zabbix
           'ipmi_username' => '',
           'ipmi_password' => ''
       }
-      host_options['groups'].nil? || host_options['groups'].map! { |group_id| {'groupid' => get_group_id(group_id)} }
+      host_options['groups'].nil? || host_options['groups'].map! { |group_id| {'groupid' => group_id} }
       host = merge_opt(host_default, host_options)
       message = {
           'method' => 'host.create',

data/lib/zabbixapi/mediatype.rb

@@ -0,0 +1,52 @@
+module Zabbix
+  class ZabbixApi
+
+    def get_mediatype_id(mediatype)
+      message = {
+        'method' => 'mediatype.get',
+        'params' => {
+        'search' => {
+          'description' => mediatype
+          },
+        'output' => 'extend',
+        }
+      }
+      response = send_request(message)
+      response.empty? ?  nil : response[0]['mediatypeid'].to_i
+    end
+
+    def add_mediatype(mediatype_options)
+      mediatype_default = {
+        'type' => '0',
+        'description' => '',
+        'smtp_server' => '',
+        'smtp_helo'   => '',
+        'smtp_email'  => '',
+        'exec_path'   => '',
+        'gsm_modem'   => '',
+        'username'    => '',
+        'passwd'      => ''
+      }
+      mediatype = merge_opt(mediatype_default, mediatype_options)
+      message = {
+        'method' => 'mediatype.create',
+        'params' => mediatype
+      }
+      response = send_request(message)
+      response.empty? ? nil : response['mediatypeids'][0].to_i
+    end
+
+    def delete_mediatype(mediatype)
+      mediatype_id = get_mediatype_id(mediatype)
+      message = {
+          'method' => 'mediatype.delete',
+          'params' => 
+              [mediatype_id]
+      }
+      response = send_request(message)
+      response ? true : false
+    end
+
+  end
+end
+

data/lib/zabbixapi.rb

@@ -8,3 +8,4 @@ require 'zabbixapi/screen'
 require 'zabbixapi/template'
 require 'zabbixapi/trigger'
 require 'zabbixapi/usermacro'
+require 'zabbixapi/mediatype'

data/spec/item.rb

@@ -1,9 +1,6 @@
 require 'zabbixapi'
 require 'json'
 
-#require 'webmock/rspec'
-#include WebMock::API
-
 # settings
 api_url = 'http://zabbix.local/api_jsonrpc.php'
 api_login = 'Admin'
@@ -44,7 +41,7 @@ end
 # 04. Delete group
 describe Zabbix::ZabbixApi, "delete_group" do
   it "Delete some group" do
-    result = zbx.delete_group('some_group')
+    result = zbx.delete_group(zbx.get_group_id'some_group')
   end
 end
 
@@ -54,3 +51,24 @@ describe Zabbix::ZabbixApi, "delete_host" do
     result = zbx.delete_host('my.example.com')
   end
 end
+
+# 06. Mediatype create
+mediatype_options = { 
+  'type' => '0',
+  'description' => 'example_mediatype',
+  'smtp_server' => 'test.company.com',
+  'smtp_helo'   => 'test.company.com',
+  'smtp_email'  => 'test@test.company.com',
+}
+describe Zabbix::ZabbixApi, "create_mediatype" do
+  it "Create mediatype" do
+    result = zbx.add_mediatype(mediatype_options)
+  end
+end
+
+# 07. Mediatype delete
+describe Zabbix::ZabbixApi, "create_mediatype" do
+  it "Delete mediatype" do
+    result = zbx.delete_mediatype('example_mediatype')
+  end
+end

data/zabbixapi.gemspec

@@ -4,7 +4,7 @@ require 'rake'
 
 Gem::Specification.new do |spec|
 
-  spec.version = '0.1.6.1'
+  spec.version = '0.1.6.2'
   spec.name = 'zabbixapi'
   spec.summary = 'Ruby module for work with zabbix api.'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 0.1.6.1
+  version: 0.1.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-07 00:00:00.000000000 Z
+date: 2012-10-08 00:00:00.000000000 Z
 dependencies: []
 description: Ruby module for work with zabbix api v1.8.
 email: vadv.mkn@gmail.com
@@ -25,6 +25,7 @@ files:
 - lib/zabbixapi/group.rb
 - lib/zabbixapi/host.rb
 - lib/zabbixapi/item.rb
+- lib/zabbixapi/mediatype.rb
 - lib/zabbixapi/screen.rb
 - lib/zabbixapi/template.rb
 - lib/zabbixapi/trigger.rb
@@ -64,4 +65,3 @@ signing_key:
 specification_version: 3
 summary: Ruby module for work with zabbix api.
 test_files: []
-has_rdoc: true