Specify zabbix version

.kitchen.yml

@@ -3,13 +3,19 @@ driver:
   name: vagrant
 
 provisioner:
-  name: chef_solo
+  name: chef_zero
 
 platforms:
-  - name: ubuntu-12.04
-  - name: centos-6.4
+  - name: ubuntu-14.04
+  - name: centos-7.1
 
 suites:
   - name: default
     run_list:
+      - zabbix_ng::default
+    attributes:
+
+  - name: server
+    run_list:
+      - zabbix_ng::server
     attributes:

Berksfile

@@ -0,0 +1,9 @@
+source 'https://supermarket.chef.io'
+
+metadata
+
+group :integration do
+  cookbook 'apt'
+  cookbook 'sudo'
+  cookbook 'selinux'
+end

CHANGELOG.md

@@ -1,3 +1,13 @@
+# 0.1.3
+
+- Configure Kitchen CI
+
+# 0.1.2
+
+- Add yum repository
+- Fix converge on 'rhel' platform
+
+
 # 0.1.1
 
 - Restart zabbix agent after config file was deployed

attributes/default.rb

@@ -19,3 +19,25 @@
 #
 
 default['zabbix_ng']['zabbix_server'] = '127.0.0.1'
+default['zabbix_ng']['version'] = value_for_platform(
+  ['rhel','centos']   => {
+    "~> 7" => '3.0.0-1.el7',
+  },
+  'ubuntu'  => {
+    '~> 14' => '1:3.0.0-1+trusty'
+  },
+  'default' => {'default' => '3.0.0'}
+)
+
+default['zabbix_ng']['repository']['key'] = 'http://repo.zabbix.com/zabbix-official-repo.key'
+
+uri_version = node['zabbix_ng']['version'].to_s.gsub(/^[0-9]*:/,'').split('.')[0..1].join('.')
+default['zabbix_ng']['repository']['uri'] = value_for_platform(
+  ['redhat', 'centos', 'fedora'] => {
+    "~> 6" => "http://repo.zabbix.com/zabbix/#{uri_version}/rhel/6/x86_64",
+    "~> 7" => "http://repo.zabbix.com/zabbix/#{uri_version}/rhel/7/x86_64" },
+  'debian' => { 'default' => "http://repo.zabbix.com/zabbix/#{uri_version}/debian"},
+  'ubuntu' => { 'default' => "http://repo.zabbix.com/zabbix/#{uri_version}/ubuntu"},
+)
+
+

metadata.rb

@@ -4,6 +4,9 @@
 license          'GNU Public License 3.0'
 description      'Installs/Configures zabbix_ng'
 long_description 'Installs/Configures zabbix_ng'
-version          '0.1.1'
+version          '0.1.2'
 depends          'apt'
 depends          'sudo'
+
+depends          'yum'
+depends          'yum-epel'

recipes/agent.rb

@@ -20,7 +20,9 @@
 
 include_recipe 'zabbix_ng::repository'
 
-package 'zabbix-agent'
+package 'zabbix-agent' do
+  version node['zabbix_ng']['version']
+end
 
 template '/etc/zabbix/zabbix_agentd.conf' do
   mode      00644
@@ -35,6 +37,11 @@
   # aptitude is required to get available update count
   package 'aptitude'
 
+  directory '/etc/zabbix/zabbix_agentd.d' do
+    mode      00644
+    recursive true
+  end
+
   template '/etc/zabbix/zabbix_agentd.d/apt.conf' do
     owner    'root'
     group    'root'
@@ -43,8 +50,7 @@
     source   'agent/apt.conf.erb'
   end
 
-when 'rhel', 'fedora'
-  # TODO: yum repository is currently not supported anyway
+when 'rhel'
   template '/etc/zabbix/zabbix_agentd.d/yum.conf' do
     owner    'root'
     group    'root'
@@ -57,9 +63,9 @@
 service 'zabbix-agent' do
   case node['platform_family']
   when 'debian'
-    subscribes :restart, 'template[/etc/zabbix/zabbix_agentd.d/yum.conf]'
-  when 'rhel', 'fedora'
     subscribes :restart, 'template[/etc/zabbix/zabbix_agentd.d/apt.conf]'
+  when 'rhel'
+    subscribes :restart, 'template[/etc/zabbix/zabbix_agentd.d/yum.conf]'
   end
 
   subscribes :restart, 'template[/etc/zabbix/zabbix_agentd.conf'

recipes/repository.rb

@@ -19,9 +19,29 @@
 #
 
 # Official Zabbix repository
-apt_repository 'zabbix' do
-  uri 'http://repo.zabbix.com/zabbix/2.4/ubuntu'
-  distribution node['lsb']['codename']
-  components %w(main)
-  key 'http://repo.zabbix.com/zabbix-official-repo.key'
+case node['platform']
+when 'debian'
+  apt_repository 'zabbix' do
+    uri node['zabbix_ng']['repository']['uri']
+    distribution node['lsb']['codename']
+    components %w(main)
+    key node['zabbix_ng']['repository']['key']
+  end
+when 'ubuntu'
+  apt_repository 'zabbix' do
+    uri node['zabbix_ng']['repository']['uri']
+    distribution node['lsb']['codename']
+    components %w(main)
+    key node['zabbix_ng']['repository']['key']
+  end
+when 'redhat', 'centos', 'fedora'
+  yum_repository 'zabbix' do
+    description "Official zabbix repository"
+    baseurl node['zabbix_ng']['repository']['uri']
+    gpgkey node['zabbix_ng']['repository']['key']
+  end
+  include_recipe 'yum-epel'
 end
+
+
+

recipes/server.rb

@@ -20,8 +20,20 @@
 
 include_recipe 'zabbix_ng::repository'
 
+package 'zabbix-server-pgsql' do
+  version node['zabbix_ng']['version']
+end
 package 'zabbix-server-pgsql'
-package 'zabbix-frontend-php'
+case node['platform_family']
+when 'debian'
+  package 'zabbix-frontend-php' do
+    version node['zabbix_ng']['version']
+  end
+when 'rhel'
+  package 'zabbix-web-pgsql' do
+    version node['zabbix_ng']['version']
+  end
+end
 
 service 'zabbix-server' do
   action :enable