2.1.6 - Read Changelog

Author: LevonBecker

CHANGELOG.md

@@ -1,5 +1,12 @@
 ## CHANGE LOG
 
+## 2.1.6 - 04/15/2017 - Levon Becker
+* Fixed CloudWatch Logs Config order so default with us-east-1 no longer left
+* Added CloudWatch Logs /var/log/chef-client.log stream
+* Added Client.rb updated to log chef run to /var/log/chef-client.log
+* CFN: Renamed AMI map last key from EBS to amazon
+* CFN: Removed role since just calling the recipe for run list and change chef run to call the recipe instead.
+
 ## 2.1.5 - 04/13/2017 - Levon Becker
 * Upgraded and test with chefdk 1.3.40 / chef-client 12.19.36
 

Dockerfile

@@ -9,7 +9,7 @@ ARG chef_role=base
 ARG chef_environment=bonusbits_base
 ARG chef_config_path=/opt/chef-repo
 
-LABEL version="2.1.5" \
+LABEL version="2.1.6" \
       description="Amazon Linux Image built from bonusbits_base cookbook." \
       github="https://github.com/bonusbits/bonusbits_base" \
       website="https://www.bonusbits.com"

cloudformation/bonusbits-base.yml

@@ -152,7 +152,7 @@ Outputs:
   # Generated
   AMI:
     Description: AMI Used.
-    Value: !FindInMap [ RegionMap, !Ref "AWS::Region", EBS ]
+    Value: !FindInMap [ RegionMap, !Ref "AWS::Region", amazon ]
   IAMRole:
     Description: IAM Instance Profile Role Created.
     Value: !Ref IamRole
@@ -162,52 +162,52 @@ Mappings:
       # Amazon Linux AMI 2017.03 was released on 2017-04-04
       # N. Virginia
       us-east-1:
-        EBS: ami-22ce4934
+        amazon: ami-22ce4934
       # Ohio
       us-east-2:
-        EBS: ami-7bfcd81e
+        amazon: ami-7bfcd81e
       # Oregon
       us-west-2:
-        EBS: ami-8ca83fec
+        amazon: ami-8ca83fec
       # N. California
       us-west-1:
-        EBS: ami-9e247efe
+        amazon: ami-9e247efe
       # Canada
       ca-central-1:
-        EBS: ami-8601bce2
+        amazon: ami-8601bce2
       # Ireland
       eu-west-1:
-        EBS: ami-e5083683
+        amazon: ami-e5083683
       # London
       eu-west-2:
-        EBS: ami-11130775
+        amazon: ami-11130775
       # Frankfurt
       eu-central-1:
-        EBS: ami-5b06d634
+        amazon: ami-5b06d634
       # Singapore
       ap-southeast-1:
-        EBS: ami-a2bc03c1
+        amazon: ami-a2bc03c1
       # Seoul
       ap-northeast-1:
-        EBS: ami-8369baed
+        amazon: ami-8369baed
       # Tokyo
       ap-northeast-2:
-        EBS: ami-859bbfe2
+        amazon: ami-859bbfe2
       # Sydney
       ap-southeast-2:
-        EBS: ami-8bf2fde8
+        amazon: ami-8bf2fde8
       # Mumbai
       ap-south-1:
-        EBS: ami-815625ee
+        amazon: ami-815625ee
       # Sao Paulo
       sa-east-1:
-        EBS: ami-a97013c5
+        amazon: ami-a97013c5
       # Beijing
       cn-north-1:
-        EBS: ami-b3d80ede
+        amazon: ami-b3d80ede
       # GovCloud
       us-gov-west-1:
-        EBS: ami-700a8f11
+        amazon: ami-700a8f11
 
 Conditions:
   # Condition for if SSH access not wanted for maybe a prd env
@@ -327,7 +327,7 @@ Resources:
       - IamInstanceProfile
     Properties:
       AssociatePublicIpAddress: false
-      ImageId: !FindInMap [ RegionMap, !Ref "AWS::Region", EBS ]
+      ImageId: !FindInMap [ RegionMap, !Ref "AWS::Region", amazon ]
       SecurityGroups: !Ref SecurityGroups
       InstanceType: !Ref InstanceType
       IamInstanceProfile: !Ref IamInstanceProfile
@@ -399,11 +399,11 @@ Resources:
               cwd: /opt/chef-repo
               command: !Sub "cp -R cookbooks/${CookbookName}/test/data_bags/${CookbookName} data_bags/"
             05_download_dependent_cookbook:
-              cwd: !Sub /opt/chef-repo/cookbooks/${CookbookName}
+              cwd: !Sub "/opt/chef-repo/cookbooks/${CookbookName}"
               command: !Sub "/opt/chefdk/embedded/bin/berks install"
             06_vendor_dependent_cookbook:
-              cwd: !Sub /opt/chef-repo/cookbooks/${CookbookName}
-              command: !Sub "/opt/chefdk/embedded/bin/berks vendor /opt/chef-repo/cookbooks/"
+              cwd: !Sub "/opt/chef-repo/cookbooks/${CookbookName}"
+              command: !Sub "export HOME=/root && /opt/chefdk/embedded/bin/berks vendor /opt/chef-repo/cookbooks/"
           files:
             "/opt/chef-repo/encrypted_data_bag_secret":
               content: !Sub ${DataBagSecret}
@@ -419,6 +419,9 @@ Resources:
                 role_path '/opt/chef-repo/roles'
                 chef_server_url 'http://127.0.0.1:8889'
                 encrypted_data_bag_secret '/opt/chef-repo/data_bags/encrypted_data_bag_secret'
+                log_level :info
+                log_location '/var/log/chef-client.log'
+                verify_api_cert false
             "/opt/chef-repo/environments/aws.json":
               content: !Sub |
                {
@@ -437,26 +440,10 @@ Resources:
                        }
                    }
                }
-            "/opt/chef-repo/roles/ec2.json":
-              content: !Sub |
-                {
-                  "name": "ec2",
-                  "description": "Role",
-                  "json_class": "Chef::Role",
-                  "default_attributes": {},
-                  "override_attributes": {
-                  },
-                  "chef_type": "role",
-                  "run_list": [
-                    "recipe[${CookbookName}]"
-                  ],
-                  "env_run_lists": {
-                  }
-                }
         run_chef_client:
           commands:
             01_run_chef:
-              command: "/opt/chefdk/bin/chef-client -z -o 'role[ec2]' --environment 'aws' --config /opt/chef-repo/client.rb --log_level info --force-formatter --chef-zero-port 8889"
+              command: !Sub "/opt/chefdk/bin/chef-client -z -o 'recipe[${CookbookName}]' --environment 'aws' --config /opt/chef-repo/client.rb --log_level info --force-formatter --chef-zero-port 8889"
         warm_ebs:
           commands:
             01_warm_ebs:

metadata.rb

@@ -4,7 +4,7 @@
 license 'MIT'
 description 'Foundation Wrapper Cookbook for all Nodes'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version '2.1.5'
+version '2.1.6'
 chef_version '~> 12.5' if respond_to?(:chef_version)
 source_url 'https://github.com/bonusbits/bonusbits_base'
 issues_url 'https://github.com/bonusbits/bonusbits_base/issues'

recipes/cloudwatch_logs.rb

@@ -1,36 +1,19 @@
 case node['os']
 when 'linux'
-  directory '/etc/awslogs' do
-    owner 'root'
-    group 'root'
-    mode '0755'
-  end
-
-  # Deploy AWS CLI Config
-  template '/etc/awslogs/awscli.conf' do
-    source 'cloudwatch_logs/awscli.conf.erb'
-    owner 'root'
-    group 'root'
-    mode '0644'
-  end
-
-  # Deploy AWS CloudWatch Logs Proxy Config
-  template '/etc/awslogs/proxy.conf' do
-    source 'cloudwatch_logs/proxy.conf.erb'
-    owner 'root'
-    group 'root'
-    mode '0644'
-    notifies :restart, 'service[awslogs]', :delayed
-    only_if { node['bonusbits_base']['proxy']['configure'] }
-  end
-
   case node['platform']
   when 'amazon'
     # Install CloudWatch Logs Agent
     package 'awslogs'
   when 'centos', 'redhat', 'ubuntu' # ~FC024
     package 'python'
 
+    # TODO: Needed?
+    directory '/etc/awslogs' do
+      owner 'root'
+      group 'root'
+      mode '0755'
+    end
+
     local_download_temp = node['bonusbits_base']['local_file_cache']
     # Install CloudWatch Logs Agent
     ruby_block 'Install CloudWatch Logs Agent' do
@@ -85,6 +68,24 @@
     return
   end
 
+  # Deploy AWS CLI Config
+  template '/etc/awslogs/awscli.conf' do
+    source 'cloudwatch_logs/awscli.conf.erb'
+    owner 'root'
+    group 'root'
+    mode '0644'
+  end
+
+  # Deploy AWS CloudWatch Logs Proxy Config
+  template '/etc/awslogs/proxy.conf' do
+    source 'cloudwatch_logs/proxy.conf.erb'
+    owner 'root'
+    group 'root'
+    mode '0644'
+    notifies :restart, 'service[awslogs]', :delayed
+    only_if { node['bonusbits_base']['proxy']['configure'] }
+  end
+
   # Deploy AWS CloudWatch Logs Config
   template '/etc/awslogs/awslogs.conf' do
     source 'cloudwatch_logs/awslogs.conf.erb'

templates/default/cloudwatch_logs/awslogs.conf.erb

@@ -29,4 +29,16 @@ file = /var/log/cfn-init-cmd.log
 log_group_name = <%= node['bonusbits_base']['cloudwatch_logs']['logs_group_name'] %>
 log_stream_name = <%= "#{node['ec2']['instance_id']}-yum" %>
 datetime_format = %b %d %H:%M:%S
-file = /var/log/yum.log
+file = /var/log/yum.log
+
+[cron]
+log_group_name = <%= node['bonusbits_base']['cloudwatch_logs']['logs_group_name'] %>
+log_stream_name = <%= "#{node['ec2']['instance_id']}-cron" %>
+datetime_format = %b %d %H:%M:%S
+file = /var/log/cron
+
+[chef-client]
+log_group_name = <%= node['bonusbits_base']['cloudwatch_logs']['logs_group_name'] %>
+log_stream_name = <%= "#{node['ec2']['instance_id']}-chef-client" %>
+datetime_format = [%Y-%m-%dT%H:%M:%S-%z]
+file = /var/log/chef-client.log