1.0.5 - Read Changlog

bonusbits · Mar 16, 2017 · 46a37fd · 46a37fd
1 parent 75ef738
commit 46a37fd
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 ##CHANGE LOG
 ---
 
+##1.0.5 - 03/16/2017 - Levon Becker
+* Added cfn-init.log and cfn-init-cmd.log to Cloudwatch Logs Stream
+
 ##1.0.4 - 03/16/2017 - Levon Becker -  [Issue 2](https://github.com/bonusbits/bonusbits_mediawiki_nginx/issues/2)
 * Cleaned up default recipe, data bag and environment files that still had backup settings
 * Removed backup parameters from cloudformation template.

diff --git a/metadata.rb b/metadata.rb
@@ -4,7 +4,7 @@
 license 'MIT'
 description 'Deploy Mediawiki on Amazon Linux running Nginx and Php-fpm'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version '1.0.4'
+version '1.0.5'
 issues_url 'https://github.com/bonusbits/bonusbits_mediawiki_nginx/issues'
 source_url 'https://github.com/bonusbits/bonusbits_mediawiki_nginx'
 

diff --git a/recipes/default.rb b/recipes/default.rb
@@ -1,3 +1,6 @@
+# Setup CloudWatch Logs
+include_recipe 'bonusbits_mediawiki_nginx::cloudwatch_logs' if node['bonusbits_mediawiki_nginx']['cloudwatch_logs']['configure']
+
 # Fetch Data Bag
 data_bag = node['bonusbits_mediawiki_nginx']['data_bag']
 data_bag_item = node['bonusbits_mediawiki_nginx']['data_bag_item']
@@ -35,9 +38,6 @@
 # Install and Configure Nginx
 include_recipe 'bonusbits_mediawiki_nginx::mediawiki'
 
-# Setup CloudWatch Logs
-include_recipe 'bonusbits_mediawiki_nginx::cloudwatch_logs' if node['bonusbits_mediawiki_nginx']['cloudwatch_logs']['configure']
-
 # Setup Sendmail
 # include_recipe 'bonusbits_mediawiki_nginx::sendmail' if node['bonusbits_mediawiki_nginx']['sendmail']['configure']
 

diff --git a/templates/default/cloudwatch_logs/awslogs.conf.erb b/templates/default/cloudwatch_logs/awslogs.conf.erb
@@ -13,6 +13,18 @@ log_group_name = <%= node['bonusbits_mediawiki_nginx']['aws']['logs_group_name']
 log_stream_name = <%= node['ec2']['instance_id'] %>-cloud-init-output
 file = /var/log/cloud-init-output.log
 
+[cfn-init]
+log_group_name = <%= node['bonusbits_mediawiki_nginx']['aws']['logs_group_name'] %>
+log_stream_name = <%= node['ec2']['instance_id'] %>-cfn-init
+datetime_format = %Y-%m-%d %H:%M:%S,%f
+file = /var/log/cfn-init.log
+
+[cfn-init-cmd]
+log_group_name = <%= node['bonusbits_mediawiki_nginx']['aws']['logs_group_name'] %>
+log_stream_name = <%= node['ec2']['instance_id'] %>-cfn-init-cmd
+datetime_format = %Y-%m-%d %H:%M:%S,%f
+file = /var/log/cfn-init-cmd.log
+
 [yum]
 log_group_name = <%= node['bonusbits_mediawiki_nginx']['aws']['logs_group_name'] %>
 log_stream_name = <%= node['ec2']['instance_id'] %>-yum