Add agent systemd support

.kitchen.yml

@@ -10,6 +10,7 @@ platforms:
 - name: ubuntu-12.04
 - name: centos-6.4
 - name: centos-5.9
+- name: centos-7.0
 
 provisioner:
     name: chef_zero

README.md

@@ -116,11 +116,6 @@ You can control the agent install with the following attributes:
 
 Downloads and installs the Zabbix agent from a pre built package
 
-If you are on a machine in the RHEL family of platforms, then you must have your
-package manager setup to allow installation of:
-
-    package "redhat-lsb"
-
 You can control the agent version with:
 
     node['zabbix']['agent']['version']

attributes/agent.rb

@@ -23,7 +23,6 @@
 
 case node['platform_family']
 when 'rhel', 'debian'
-  default['zabbix']['agent']['init_style']      = 'sysvinit'
   default['zabbix']['agent']['install_method']  = 'prebuild'
   default['zabbix']['agent']['pid_file']        = ::File.join(node['zabbix']['run_dir'], 'zabbix_agentd.pid')
 
@@ -32,7 +31,6 @@
 
   default['zabbix']['agent']['shell']           = node['zabbix']['shell']
 when 'windows'
-  default['zabbix']['agent']['init_style']      = 'windows'
   default['zabbix']['agent']['install_method']  = 'chocolatey'
 end
 

recipes/_agent_common_service.rb

@@ -1,6 +1,28 @@
 # Manage Agent service
-case node['zabbix']['agent']['init_style']
-when 'sysvinit'
+if platform_family?('windows')
+  service 'zabbix_agentd' do
+    service_name 'Zabbix Agent'
+    provider Chef::Provider::Service::Windows
+    supports :restart => true
+    action :nothing
+  end
+elsif node['init_package'] == 'systemd'
+  template '/lib/systemd/system/zabbix-agent.service' do
+    source 'zabbix-agent.service.erb'
+    owner 'root'
+    group 'root'
+    mode '0644'
+  end
+
+  # RHEL package names it "zabbix-agent"
+  service 'zabbix_agentd' do
+    service_name 'zabbix-agent'
+    supports :status => true, :start => true, :stop => true, :restart => true
+    action :nothing
+  end
+else
+  package 'redhat-lsb' if platform_family?('rhel')
+
   template '/etc/init.d/zabbix_agentd' do
     source value_for_platform_family(['rhel'] => 'zabbix_agentd.init-rh.erb', 'default' => 'zabbix_agentd.init.erb')
     owner 'root'
@@ -13,11 +35,4 @@
     supports :status => true, :start => true, :stop => true, :restart => true
     action :nothing
   end
-when 'windows'
-  service 'zabbix_agentd' do
-    service_name 'Zabbix Agent'
-    provider Chef::Provider::Service::Windows
-    supports :restart => true
-    action :nothing
-  end
 end

recipes/agent_prebuild.rb

@@ -9,9 +9,6 @@
 
 include_recipe 'zabbix::agent_common'
 
-# Install prerequisite RPM
-package 'redhat-lsb' if node['platform_family'] == 'rhel'
-
 ark 'zabbix_agent' do
   name 'zabbix'
   url node['zabbix']['agent']['prebuild']['url']

recipes/agent_source.rb

@@ -19,7 +19,7 @@
   end
 
 when 'redhat', 'centos', 'scientific', 'amazon'
-  %w(fping curl-devel iksemel-devel iksemel-utils net-snmp-libs net-snmp-devel openssl-devel redhat-lsb).each do |pck|
+  %w(fping curl-devel iksemel-devel iksemel-utils net-snmp-libs net-snmp-devel openssl-devel).each do |pck|
     package pck do
       action :install
     end

recipes/common.rb

@@ -52,6 +52,16 @@
   end
 end
 
+if node['init_package'] == 'systemd'
+  template "/usr/lib/tmpfiles.d/zabbix.conf" do
+    source 'tmpfiles.conf.erb'
+    owner 'root'
+    group 'root'
+    mode '644'
+    action :create
+  end
+end
+
 unless node['zabbix']['agent']['source_url']
   node.default['zabbix']['agent']['source_url'] = Chef::Zabbix.default_download_url(node['zabbix']['agent']['branch'], node['zabbix']['agent']['version'])
 end

templates/default/tmpfiles.conf.erb

@@ -0,0 +1 @@
+d <%= node['zabbix']['run_dir'] %> 755 <%= node['zabbix']['login'] %> <%= node['zabbix']['group'] %>

templates/default/zabbix-agent.service.erb

@@ -0,0 +1,13 @@
+[Unit]
+Description=Zabbix Monitor Agent
+After=syslog.target network.target
+
+[Service]
+Type=forking
+ExecStart=<%= node['zabbix']['install_dir'] %>/sbin/zabbix_agentd -c <%= node['zabbix']['agent']['config_file'] %>
+User=<%= node['zabbix']['agent']['user'] %>
+Group=<%= node['zabbix']['agent']['group'] %>
+PIDFile=<%= node['zabbix']['agent']['pid_file'] %>
+
+[Install]
+WantedBy=multi-user.target