Add option to specify type of interface in agent class (#697)

* Add option to specify type of interface in agent class

* Fix arrow alignment in agent.pp and resources/agent.pp

* Remove comma from last parameter of a function

* Supress 'corrective changed' messages

* Enforce correct values for zbx_interface_type

* Add comment

* Fix travis check

Author: zv0n

lib/puppet/provider/zabbix_host/ruby.rb

@@ -16,8 +16,12 @@ def self.instances
     )
 
     api_hosts.map do |h|
-      interface = h['interfaces'].select { |i| i['type'].to_i == 1 && i['main'].to_i == 1 }.first
+      # only select the default interface for given host
+      # there is only 1 interface that can be default
+      interface = h['interfaces'].select { |i| i['main'].to_i == 1 }.first
       use_ip = !interface['useip'].to_i.zero?
+      proxy_select = proxies.select { |_name, id| id == h['proxy_hostid'] }.keys.first
+      proxy_select = '' if proxy_select.nil?
       new(
         ensure: :present,
         id: h['hostid'].to_i,
@@ -30,7 +34,8 @@ def self.instances
         group_create: nil,
         templates: h['parentTemplates'].map { |x| x['host'] },
         macros: h['macros'].map { |macro| { macro['macro'] => macro['value'] } },
-        proxy: proxies.select { |_name, id| id == h['proxy_hostid'] }.keys.first
+        proxy: proxy_select,
+        interfacetype: interface['type'].to_i
       )
     end
   end
@@ -58,7 +63,7 @@ def create
       proxy_hostid: proxy_hostid,
       interfaces: [
         {
-          type: 1,
+          type: @resource[:interfacetype].nil? ? 1 : @resource[:interfacetype],
           main: 1,
           ip: @resource[:ipaddress],
           dns: @resource[:hostname],
@@ -142,6 +147,16 @@ def port=(int)
     )
   end
 
+  def interfacetype=(int)
+    zbx.query(
+      method: 'hostinterface.update',
+      params: {
+        interfaceid: @property_hash[:interfaceid],
+        type: int
+      }
+    )
+  end
+
   def groups=(hostgroups)
     gids = get_groupids(hostgroups, @resource[:group_create])
     groups = transform_to_array_hash('groupid', gids)

lib/puppet/type/zabbix_host.rb

@@ -48,6 +48,10 @@ def munge_boolean(value)
     desc 'The IP address of the machine running zabbix agent.'
   end
 
+  newproperty(:interfacetype, int: 1) do
+    desc 'Interface type. 1 for zabbix agent.'
+  end
+
   newproperty(:use_ip, boolean: true) do
     desc 'Using ipadress instead of dns to connect.'
 

manifests/agent.pp

@@ -61,6 +61,9 @@
 # [*zbx_macros*]
 #   List of macros which will be added when host is configured.
 #
+# [*zbx_interface_type*]
+#   Integer specifying type of interface to be created
+#
 # [*agent_configfile_path*]
 #   Agent config file path defaults to /etc/zabbix/zabbix_agentd.conf
 #
@@ -253,6 +256,7 @@
   $zbx_group_create                               = $zabbix::params::agent_zbx_group_create,
   $zbx_templates                                  = $zabbix::params::agent_zbx_templates,
   Array[Hash] $zbx_macros                         = [],
+  Integer[1,4] $zbx_interface_type                = 1,
   $agent_configfile_path                          = $zabbix::params::agent_configfile_path,
   $pidfile                                        = $zabbix::params::agent_pidfile,
   $servicename                                    = $zabbix::params::agent_servicename,
@@ -374,15 +378,16 @@
     $_hostname = pick($hostname, $facts['networking']['fqdn'])
 
     class { 'zabbix::resources::agent':
-      hostname     => $_hostname,
-      ipaddress    => $listen_ip,
-      use_ip       => $agent_use_ip,
-      port         => $listenport,
-      groups       => [$groups].flatten(),
-      group_create => $zbx_group_create,
-      templates    => $zbx_templates,
-      macros       => $zbx_macros,
-      proxy        => $use_proxy,
+      hostname      => $_hostname,
+      ipaddress     => $listen_ip,
+      use_ip        => $agent_use_ip,
+      port          => $listenport,
+      groups        => [$groups].flatten(),
+      group_create  => $zbx_group_create,
+      templates     => $zbx_templates,
+      macros        => $zbx_macros,
+      interfacetype => $zbx_interface_type,
+      proxy         => $use_proxy,
     }
   }
 

manifests/resources/agent.pp

@@ -24,6 +24,7 @@
   $templates               = undef,
   $macros                  = undef,
   $proxy                   = undef,
+  $interfacetype           = 1,
 ) {
   if $group and $groups {
     fail("Got group and groups. This isn't support! Please use groups only.")
@@ -37,13 +38,14 @@
   }
 
   @@zabbix_host { $hostname:
-    ipaddress    => $ipaddress,
-    use_ip       => $use_ip,
-    port         => $port,
-    groups       => $groups,
-    group_create => $group_create,
-    templates    => $templates,
-    macros       => $macros,
-    proxy        => $proxy,
+    ipaddress     => $ipaddress,
+    use_ip        => $use_ip,
+    port          => $port,
+    groups        => $groups,
+    group_create  => $group_create,
+    templates     => $templates,
+    macros        => $macros,
+    proxy         => $proxy,
+    interfacetype => $interfacetype,
   }
 }