itamae-plugin-recipe-zabbix 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1a7c0d55d631fd50fcda699b4f50387a0c4d325
-  data.tar.gz: f591585e2ec20815bcabf76a49b4d22320e0e34c
+  metadata.gz: c9ed3f1ca97ba53d81c2c8b533d3a6fd288a6720
+  data.tar.gz: 83fecbb0cd48d22a8a2d926fac27b2cc7652b7f1
 SHA512:
-  metadata.gz: 2e88203ebe8af86ee67a222e5731be4f29574babb41475d1e622995286f9c22068dc3d6a813be60ea48bd1de43f7d33976b2c942a33992925ecc6da72090c656
-  data.tar.gz: 7e126f625b6b2ab89e4133cd19373cd1de4e23598a3a798515364f38bc91a294e4be3941cbbaa7a611a252ab26dfafd70c30c898f7a22fe8e568c31f684f3504
+  metadata.gz: 1f033ac472b393e9bceefd8c751821f8fc56033256609fb49f101b12e803829222ca0332f4b07083b07cba5ebe53308749996da92648a51811f41db64f392efe
+  data.tar.gz: 8597d025f02f4121d1825a2d05726426dcccf5b96dd609123aac163ff88027548a4720ec59ac371b61553cae5879f56bc4f31f092d0102faf6f838781593fe42

data/README.md

@@ -41,6 +41,7 @@ zabbix:
 
 ```ruby
 include_recipe "zabbix"
+include_recipe "zabbix::agent"
 
 zabbix_userparameters "all" do
   path File.expand_path(File.dirname(__FILE__)) + "/zabbix/templates/etc/zabbix/zabbix_agentd.d/"

data/lib/itamae/plugin/recipe/zabbix.rb

@@ -12,6 +12,18 @@ platform_version = node[:zabbix][:platform_version] if node[:zabbix][:platform_v
 cpu = "x86_64" # or i386
 cpu = node[:zabbix][:platform_cpu] if node[:zabbix][:platform_cpu]
 
-package "http://repo.zabbix.com/zabbix/#{zabbix_version}/#{platform}/#{platform_version}/#{cpu}/zabbix-release-#{zabbix_version}-1.el#{platform_version}.noarch.rpm" do
-  not_if "rpm -q zabbix-release"
+case node[:platform]
+  when "ubuntu"
+    codename = 'trusty'
+    codename = node[:zabbix][:codename] if node[:zabbix][:codename]
+    execute "add zabbix agent pkg" do
+      user "root"
+      command "wget http://repo.zabbix.com/zabbix/#{zabbix_version}/ubuntu/pool/main/z/zabbix-release/zabbix-release_#{zabbix_version}-1+#{codename}_all.deb"
+      command "dpkg -i zabbix-release_#{zabbix_version}-1+#{codename}_all.deb"
+      command "apt-get update"
+    end
+  else
+    package "http://repo.zabbix.com/zabbix/#{zabbix_version}/#{platform}/#{platform_version}/#{cpu}/zabbix-release-#{zabbix_version}-1.el#{platform_version}.noarch.rpm" do
+      not_if "rpm -q zabbix-release"
+    end
 end

data/lib/itamae/plugin/recipe/zabbix/templates/etc/zabbix/zabbix_agentd.conf.erb

@@ -1,5 +1,9 @@
 PidFile=/var/run/zabbix/zabbix_agentd.pid
+<% if node[:platform] == 'ubuntu' %>
+LogFile=/var/log/zabbix-agent/zabbix_agentd.log
+<% else %>
 LogFile=/var/log/zabbix/zabbix_agentd.log
+<% end %>
 LogFileSize=0
 EnableRemoteCommands=1
 
@@ -15,4 +19,8 @@ HostMetadata=<%= node[:zabbix][:host_metadata] %>
 <% end %>
 
 AllowRoot=1
+<% if node[:platform] == 'ubuntu' %>
+Include=/etc/zabbix/zabbix_agentd.conf.d/
+<% else %>
 Include=/etc/zabbix/zabbix_agentd.d/
+<% end %>

data/lib/itamae/plugin/recipe/zabbix/version.rb

@@ -2,7 +2,7 @@ module Itamae
   module Plugin
     module Recipe
       module Zabbix
-        VERSION = "0.1.1"
+        VERSION = "0.1.2"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae-plugin-recipe-zabbix
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - zaru
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-06 00:00:00.000000000 Z
+date: 2016-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler