Merge pull request #579 from syseleven/feature/api_configfile

Move api configuration to a config file

Author: alexjfisher

lib/puppet/provider/zabbix.rb

@@ -1,21 +1,51 @@
 # zabbix provider type for puppet
 class Puppet::Provider::Zabbix < Puppet::Provider
+  # This method is vendored from the AWS SDK, rather than including an
+  # extra library just to parse an ini file
+  # Copied from https://github.com/puppetlabs/puppetlabs-aws/blob/2d34b1602bdd564b3f882f683dc000878f539343/lib/puppet_x/puppetlabs/aws.rb#L120
+  def ini_parse(file)
+    current_section = {}
+    map = {}
+    file.rewind
+    file.each_line do |line|
+      line = line.split(%r{^|\s;}).first # remove comments
+      section = line.match(%r{^\s*\[([^\[\]]+)\]\s*$}) unless line.nil?
+      if section
+        current_section = section[1]
+      elsif current_section
+        item = line.match(%r{^\s*(.+?)\s*=\s*(.+?)\s*$}) unless line.nil?
+        if item
+          map[current_section] = map[current_section] || {}
+          map[current_section][item[1]] = item[2]
+        end
+      end
+    end
+    map
+  end
+
+  def api_config
+    @api_config ||= ini_parse(File.new('/etc/zabbix/api.conf'))
+  end
+
+  def zbx
+    @zbx ||= create_connection
+  end
+
   # Create the api connection
-  def self.create_connection(zabbix_url, zabbix_user, zabbix_pass, apache_use_ssl)
-    protocol = apache_use_ssl ? 'https' : 'http'
+  def create_connection
+    protocol = api_config['default']['apache_use_ssl'] == 'true' ? 'https' : 'http'
     zbx = ZabbixApi.connect(
-      url: "#{protocol}://#{zabbix_url}/api_jsonrpc.php",
-      user: zabbix_user,
-      password: zabbix_pass,
-      http_user: zabbix_user,
-      http_password: zabbix_pass
+      url: "#{protocol}://#{api_config['default']['zabbix_url']}/api_jsonrpc.php",
+      user: api_config['default']['zabbix_user'],
+      password: api_config['default']['zabbix_pass'],
+      http_user: api_config['default']['zabbix_user'],
+      http_password: api_config['default']['zabbix_pass']
     )
     zbx
   end
 
   # Check if host exists. When error raised, return false.
-  def self.check_host(host, zabbix_url, zabbix_user, zabbix_pass, apache_use_ssl)
-    zbx = create_connection(zabbix_url, zabbix_user, zabbix_pass, apache_use_ssl)
+  def check_host(host)
     zbx.query(
       method: 'host.get',
       params: {
@@ -31,29 +61,27 @@ def self.check_host(host, zabbix_url, zabbix_user, zabbix_pass, apache_use_ssl)
   end
 
   # Check if proxy exists. When error raised, return false.
-  def self.check_proxy(host, zabbix_url, zabbix_user, zabbix_pass, apache_use_ssl)
-    zbx = create_connection(zabbix_url, zabbix_user, zabbix_pass, apache_use_ssl)
+  def check_proxy(host)
     zbx.proxies.get_id(host: host)
   rescue Puppet::ExecutionFailure
     false
   end
 
   # Get the template id from the name.
-  def self.get_template_id(zbx, template)
+  def get_template_id(zbx, template)
     return template if a_number?(template)
     zbx.templates.get_id(host: template)
   end
 
   # Check if given template name exists in current host.
-  def self.check_template_in_host(host, template, zabbix_url, zabbix_user, zabbix_pass, apache_use_ssl)
-    zbx = create_connection(zabbix_url, zabbix_user, zabbix_pass, apache_use_ssl)
+  def check_template_in_host(host)
     template_id = get_template_id(zbx, template)
     template_array = zbx.templates.get_ids_by_host(hostids: [zbx.hosts.get_id(host: host)])
     template_array.include?(template_id.to_s)
   end
 
   # Is it a number?
-  def self.a_number?(s)
+  def a_number?(s)
     s.to_s.match(%r{\A[+-]?\d+?(\.\d+)?\Z}).nil? ? false : true
   end
 end

lib/puppet/provider/zabbix_application/ruby.rb

@@ -2,40 +2,28 @@
 Puppet::Type.type(:zabbix_application).provide(:ruby, parent: Puppet::Provider::Zabbix) do
   confine feature: :zabbixapi
 
-  def connect
-    @zbx ||= self.class.create_connection(@resource[:zabbix_url], @resource[:zabbix_user], @resource[:zabbix_pass], @resource[:apache_use_ssl])
-    @zbx
-  end
-
   def template_id
-    zbx = connect
     @template_id ||= zbx.templates.get_id(host: @resource[:template])
   end
 
   def create
-    zbx = connect
     zbx.applications.create(
       name: @resource[:name],
       hostid: template_id
     )
   end
 
   def application_id
-    zbx = connect
     @application_id ||= zbx.applications.get_id(name: @resource[:name])
   end
 
   def exists?
-    zbx = connect
     zbx.applications.get_id(name: @resource[:name])
   end
 
   def destroy
-    zbx = connect
-    begin
-      zbx.applications.delete(application_id)
-    rescue => error
-      raise(Puppet::Error, "Zabbix Application Delete Failed\n#{error.message}")
-    end
+    zbx.applications.delete(application_id)
+  rescue => error
+    raise(Puppet::Error, "Zabbix Application Delete Failed\n#{error.message}")
   end
 end

lib/puppet/provider/zabbix_host/ruby.rb

@@ -12,23 +12,16 @@ def create
     hostgroup_create = @resource[:group_create]
     templates = @resource[:templates]
     proxy = @resource[:proxy]
-    zabbix_url = @resource[:zabbix_url]
-    zabbix_user = @resource[:zabbix_user]
-    zabbix_pass = @resource[:zabbix_pass]
-    apache_use_ssl = @resource[:apache_use_ssl]
-
-    # Connect to zabbix api
-    zbx = self.class.create_connection(zabbix_url, zabbix_user, zabbix_pass, apache_use_ssl)
 
     # Get the template ids.
     template_array = []
     if templates.is_a?(Array)
       templates.each do |template|
-        template_id = self.class.get_template_id(zbx, template)
+        template_id = get_template_id(zbx, template)
         template_array.push template_id
       end
     else
-      template_array.push self.class.get_template_id(zbx, templates)
+      template_array.push get_template_id(zbx, templates)
     end
 
     # Check if we need to connect via ip or fqdn
@@ -76,21 +69,17 @@ def create
 
   def exists?
     host = @resource[:hostname]
-    zabbix_url = @resource[:zabbix_url]
-    zabbix_user = @resource[:zabbix_user]
-    zabbix_pass = @resource[:zabbix_pass]
-    apache_use_ssl = @resource[:apache_use_ssl]
     templates = @resource[:templates]
 
     templates = [templates] unless templates.is_a?(Array)
 
-    host = self.class.check_host(host, zabbix_url, zabbix_user, zabbix_pass, apache_use_ssl)
+    host = check_host(host)
     if host.any?
       template_ids   = host[0]['parentTemplates'].map { |x| x['templateid'] }
       template_names = host[0]['parentTemplates'].map { |x| x['host'] }
       res = []
       templates.each do |template|
-        if self.class.a_number?(template)
+        if a_number?(template)
           res.push(template_ids.include?(template))
         else
           res.push(template_names.include?(template))
@@ -104,12 +93,6 @@ def exists?
 
   def destroy
     host = @resource[:hostname]
-    zabbix_url = @resource[:zabbix_url]
-    zabbix_user = @resource[:zabbix_user]
-    zabbix_pass = @resource[:zabbix_pass]
-    apache_use_ssl = @resource[:apache_use_ssl]
-
-    zbx = self.class.create_connection(zabbix_url, zabbix_user, zabbix_pass, apache_use_ssl)
     zbx.hosts.delete(zbx.hosts.get_id(host: host))
   end
 end

lib/puppet/provider/zabbix_hostgroup/ruby.rb

@@ -2,25 +2,17 @@
 Puppet::Type.type(:zabbix_hostgroup).provide(:ruby, parent: Puppet::Provider::Zabbix) do
   confine feature: :zabbixapi
 
-  def connect
-    @zbx ||= self.class.create_connection(@resource[:zabbix_url], @resource[:zabbix_user], @resource[:zabbix_pass], @resource[:apache_use_ssl])
-    @zbx
-  end
-
   def create
     # Connect to zabbix api
-    zbx = connect
     hgid = zbx.hostgroups.create(name: @resource[:name])
     hgid
   end
 
   def exists?
-    zbx = connect
     zbx.hostgroups.get_id(name: @resource[:name])
   end
 
   def destroy
-    zbx = connect
     zbx.hostgroups.delete(zbx.hostgroups.get_id(name: @resource[:name]))
   end
 end

lib/puppet/provider/zabbix_proxy/ruby.rb

@@ -13,18 +13,12 @@ def create
     use_ip = @resource[:use_ip]
     port = @resource[:port]
     templates = @resource[:templates]
-    zabbix_url = @resource[:zabbix_url]
-    zabbix_user = @resource[:zabbix_user]
-    zabbix_pass = @resource[:zabbix_pass]
-    apache_use_ssl = @resource[:apache_use_ssl]
-
-    zbx = self.class.create_connection(zabbix_url, zabbix_user, zabbix_pass, apache_use_ssl)
 
     # Get the template ids.
     template_array = []
     if templates.is_a?(Array) == true
       templates.each do |template|
-        template_id = self.class.get_template_id(zbx, template)
+        template_id = get_template_id(zbx, template)
         template_array.push template_id
       end
     else
@@ -47,12 +41,6 @@ def create
   end
 
   def exists?
-    host = @resource[:hostname]
-    zabbix_url = @resource[:zabbix_url]
-    zabbix_user = @resource[:zabbix_user]
-    zabbix_pass = @resource[:zabbix_pass]
-    apache_use_ssl = @resource[:apache_use_ssl]
-
-    self.class.check_proxy(host, zabbix_url, zabbix_user, zabbix_pass, apache_use_ssl)
+    check_proxy(@resource[:hostname])
   end
 end

lib/puppet/provider/zabbix_template/ruby.rb

@@ -2,15 +2,7 @@
 Puppet::Type.type(:zabbix_template).provide(:ruby, parent: Puppet::Provider::Zabbix) do
   confine feature: :zabbixapi
 
-  def connect
-    @zbx ||= self.class.create_connection(@resource[:zabbix_url], @resource[:zabbix_user], @resource[:zabbix_pass], @resource[:apache_use_ssl])
-    @zbx
-  end
-
   def create
-    # Connect to zabbix api
-    zbx = connect
-
     zbx.configurations.import(
       format: 'xml',
       rules: {
@@ -65,18 +57,15 @@ def create
   end
 
   def destroy
-    zbx = connect
     id = zbx.templates.get_id(host: @resource[:template_name])
     zbx.templates.delete(id)
   end
 
   def exists?
-    zbx = connect
     zbx.templates.get_id(host: @resource[:template_name])
   end
 
   def xml
-    zbx = connect
     zbx.configurations.export(
       format: 'xml',
       options: {

lib/puppet/provider/zabbix_template_host/ruby.rb

@@ -6,7 +6,6 @@ def template_name
   end
 
   def template_id
-    zbx = connect
     @template_id ||= zbx.templates.get_id(host: template_name)
   end
 
@@ -15,30 +14,21 @@ def hostname
   end
 
   def hostid
-    zbx = connect
     @hostid ||= zbx.hosts.get_id(host: hostname)
   end
 
-  def connect
-    @zbx ||= self.class.create_connection(@resource[:zabbix_url], @resource[:zabbix_user], @resource[:zabbix_pass], @resource[:apache_use_ssl])
-    @zbx
-  end
-
   def create
-    zbx = connect
     zbx.templates.mass_add(
       hosts_id: [hostid],
       templates_id: [template_id]
     )
   end
 
   def exists?
-    zbx = connect
     zbx.templates.get_ids_by_host(hostids: [hostid]).include?(template_id.to_s)
   end
 
   def destroy
-    zbx = connect
     zbx.templates.mass_remove(
       hosts_id: [hostid],
       templates_id: [template_id]

lib/puppet/provider/zabbix_userparameters/ruby.rb

@@ -5,16 +5,9 @@
   def create
     host = @resource[:hostname]
     template = @resource[:template]
-    zabbix_url = @resource[:zabbix_url]
-    zabbix_user = @resource[:zabbix_user]
-    zabbix_pass = @resource[:zabbix_pass]
-    apache_use_ssl = @resource[:apache_use_ssl]
-
-    # Create the connection
-    zbx = self.class.create_connection(zabbix_url, zabbix_user, zabbix_pass, apache_use_ssl)
 
     # Find the template_id we are looking for and add it to the host
-    template_id = self.class.get_template_id(zbx, template)
+    template_id = get_template_id(zbx, template)
     zbx.templates.mass_add(
       hosts_id: [zbx.hosts.get_id(host: host)],
       templates_id: [template_id]
@@ -24,12 +17,7 @@ def create
   def exists?
     host = @resource[:hostname]
     template = @resource[:template]
-    zabbix_url = @resource[:zabbix_url]
-    zabbix_user = @resource[:zabbix_user]
-    zabbix_pass = @resource[:zabbix_pass]
-    apache_use_ssl = @resource[:apache_use_ssl]
-
-    self.class.check_template_in_host(host, template, zabbix_url, zabbix_user, zabbix_pass, apache_use_ssl)
+    check_template_in_host(host, template)
   end
 
   def destroy

lib/puppet/type/zabbix_application.rb

@@ -1,16 +1,6 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..'))
-require 'puppet/util/zabbix'
-
 Puppet::Type.newtype(:zabbix_application) do
   @doc = %q(Manage zabbix applications
 
-    Example.
-      Zabbix_application {
-        zabbix_url => 'zabbix_server1',
-        zabbix_user => 'admin',
-        zabbix_pass => 'zabbix',
-      }
-
       zabbix_application{"app1":
         ensure   => present,
         template => 'template1',
@@ -33,5 +23,5 @@
     desc 'template to which the application is linked'
   end
 
-  Puppet::Util::Zabbix.add_zabbix_type_methods(self)
+  autorequire(:file) { '/etc/zabbix/api.conf' }
 end