Merge branch 'enhancement-erenfro-issue10-chef-vault-everything' of Linux-Help/zabbix into develop

metadata.rb

@@ -4,7 +4,7 @@ maintainer_email 'psi-jack@linux-help.org'
 license          'Apache 2.0'
 description      'Installs Zabbix Server & Client agents for EL linux distributions'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '1.5.1'
+version          '1.5.2'
 source_url 'https://git.linux-help.org/Linux-Help/zabbix' if respond_to?(:source_url)
 issues_url 'https://git.linux-help.org/Linux-Help/zabbix/issues' if respond_to?(:issues_url)
 

recipes/agent.rb

@@ -58,25 +58,6 @@ remote_directory "/etc/zabbix/trap.d" do
   action :create
 end
 
-if node['recipes'].include?('mongodb') or node['tags'].include?('mongodb')
-  template "/etc/zabbix/trap.d/mongo26.config" do
-    owner "root"
-    group "root"
-    mode "0700"
-    source "mongo26.config.erb"
-    sensitive true
-    credentials = Chef::EncryptedDataBagItem.load("odhp_credentials", "credentials")
-    variables({
-        :users => credentials['mongo']['users'][node.chef_environment]
-    })
-  end
-else
-  file "/etc/zabbix/trap.d/mongo26.config" do
-    action :delete
-  end
-end
-
-
 # Link live agents to node
 node['zabbix']['trap_scripts']['live']['add'].each do |script|
   link "/etc/zabbix/trap.d/live/#{script}" do

recipes/proxy.rb

@@ -27,9 +27,7 @@ end
 template "/etc/zabbix/zabbix_proxy.conf" do
   credentials = chef_vault_item("secrets", "zabbix")
   variables({
-    :DBUsername => credentials['username'],
+    :credentials => credentials
-    :DBPassword => credentials['password'],
-    :DBDatabase => credentials['database']
   })
   source %W{
     zabbix/#{node['zabbix']['version']}/#{node['platform']}-#{node['platform_version'].to_i}/zabbix_proxy.conf.erb

recipes/server.rb

@@ -51,9 +51,7 @@ end
 template "/etc/zabbix/zabbix_server.conf" do
   credentials = chef_vault_item("secrets", "zabbix")
   variables({
-    :DBUsername => credentials['username'],
+    :credentials => credentials
-    :DBPassword => credentials['password'],
-    :DBDatabase => credentials['database']
   })
   source %W{
     zabbix/#{node['zabbix']['version']}/#{node['platform']}-#{node['platform_version'].to_i}/zabbix_server.conf.erb
@@ -91,9 +89,7 @@ end
 template "/etc/zabbix/web/zabbix.conf.php" do
   credentials = chef_vault_item("secrets", "zabbix")
   variables({
-    :DBUsername => credentials['username'],
+    :credentials => credentials
-    :DBPassword => credentials['password'],
-    :DBDatabase => credentials['database']
   })
   source %W{
     zabbix/#{node['zabbix']['version']}/#{node['platform']}-#{node['platform_version'].to_i}/zabbix.conf.php.erb

recipes/trap_scripts.rb

@@ -7,6 +7,8 @@
 # 	Eric Renfro <psi-jack@linux-help.org>
 #
 
+include_recipe 'chef-vault'
+
 node.override['zabbix']['trap_scripts']['live']['add'] = []
 node.override['zabbix']['trap_scripts']['live']['del'] = []
 node.override['zabbix']['trap_scripts']['daily']['add'] = []
@@ -39,10 +41,25 @@ end
 # MongoDB
 #
 if node['recipes'].include?('mongodb') or node.tags.include?('mongodb')
-    node.override['zabbix']['trap_scripts']['live']['add'] += ['mongo26.sh', 'ssl_check_mongo.sh']
+  node.override['zabbix']['trap_scripts']['live']['add'] += ['mongo26.sh', 'ssl_check_mongo.sh']
-    node.override['zabbix']['agent_meta'] += ['MongoDB']
+  node.override['zabbix']['agent_meta'] += ['MongoDB']
+
+  template "/etc/zabbix/trap.d/mongo26.config" do
+    owner "root"
+    group "root"
+    mode "0700"
+    source "mongo26.config.erb"
+    sensitive true
+    credentials = chef_vault_item("secrets", "mongodb")
+    variables({
+        :credentials => credentials
+    })
+  end
 else
-    node.override['zabbix']['trap_scripts']['live']['del'] += ['mongo26.sh', 'ssl_check_mongo.sh']
+  node.override['zabbix']['trap_scripts']['live']['del'] += ['mongo26.sh', 'ssl_check_mongo.sh']
+  file "/etc/zabbix/trap.d/mongo26.config" do
+    action :delete
+  end
 end
 
 ###########################################################

templates/default/mongo26.config.erb

@@ -1,3 +1,2 @@
-mongoUser="<%= @users['mmsagent']['username'] %>"
+mongoUser="<%= @credentials['username'] %>"
-mongoPass="<%= @users['mmsagent']['password'] %>"
+mongoPass="<%= @credentials['password'] %>"
-

templates/zabbix/3.0/zabbix.conf.php.erb

@@ -7,9 +7,9 @@ global $DB;
 $DB['TYPE']     = 'POSTGRESQL';
 $DB['SERVER']   = 'localhost';
 $DB['PORT']     = '0';
-$DB['DATABASE'] = '<%= @DBDatabase %>';
+$DB['DATABASE'] = '<%= @credentials['database'] %>';
-$DB['USER']     = '<%= @DBUsername %>';
+$DB['USER']     = '<%= @credentials['username'] %>';
-$DB['PASSWORD'] = '<%= @DBPassword %>';
+$DB['PASSWORD'] = '<%= @credentials['password'] %>';
 
 // Schema name. Used for IBM DB2 and PostgreSQL.
 $DB['SCHEMA'] = '';

templates/zabbix/3.0/zabbix_server.conf.erb

@@ -81,7 +81,7 @@ PidFile=/var/run/zabbix/zabbix_server.pid
 # Default:
 # DBName=
 
-DBName=<%= @DBDatabase %>
+DBName=<%= @credentials['database'] %>
 
 ### Option: DBSchema
 #	Schema name. Used for IBM DB2 and PostgreSQL.
@@ -97,7 +97,7 @@ DBName=<%= @DBDatabase %>
 # Default:
 # DBUser=
 
-DBUser=<%= @DBUsername %>
+DBUser=<%= @credentials['username'] %>
 
 ### Option: DBPassword
 #	Database password. Ignored for SQLite.
@@ -105,7 +105,7 @@ DBUser=<%= @DBUsername %>
 #
 # Mandatory: no
 # Default:
-DBPassword=<%= @DBPassword %>
+DBPassword=<%= @credentials['password'] %>
 
 ### Option: DBSocket
 #	Path to MySQL socket.