aws-ec2 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1dc047afe1a87776c18aab7ff01f79596275aa6e71062ae146c8475fba503fe
-  data.tar.gz: 639750ef5c6dd1182144f19a55dd65c9f3bda044387b9e7e8f4e837dbe86b069
+  metadata.gz: bb267f8cd533d910838799ca725bfb8e792d5c5c09d5214a42dc61f123178507
+  data.tar.gz: ea088020fa9c7fb16933d60bcc598a1cbe2870038c533a1dda9a5ff21c465603
 SHA512:
-  metadata.gz: a933a41f436bdf3d0605c6d971f01f3a9eabef27fdbc6a2a5392c5c8ca894e179805d49e8876c529a9be61740a9952fef8a0c67e49e46d258b46b117a061a93a
-  data.tar.gz: d340a96677a23a90f851879651d9f204b3e2ca58e97e840efb3b1a93f8f8a471d70d04cf140e06101dd53b7dba05cd9b58de6be6b1e5384ba70046c14b9f9791
+  metadata.gz: 4d31388fb4b6d63789f39b0afce19705aa0fe8b8bf2a7d2b670a7b804278649aaabc28bc149dcabef5231d5d8eaeffd0d2300877c28524cf4057ff6f41594ab1
+  data.tar.gz: 157911b5ab7ea840093bcf3b742de32e6497440e17ca66cfea762d52747297c116acdba140ca259adf42f3a231eb01f2d9c91de8ad57910451e5e1d814f95b39

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [1.4.0]
+- Merge pull request #8 from tongueroo/cloudwatch
+- cloudwatch support for amazonlinux2 and ubuntu
+
 ## [1.3.2]
 - add noop mode for clean ami command
 

data/lib/aws_ec2/cli.rb

@@ -13,7 +13,7 @@ module AwsEc2
 
     common_options = Proc.new do
       option :auto_terminate, type: :boolean, default: false, desc: "automatically terminate the instance at the end of user-data"
-      option :cloudwatch, type: :boolean, default: false, desc: "enable cloudwatch logging, only supported for amazonlinux"
+      option :cloudwatch, type: :boolean, default: false, desc: "enable cloudwatch logging, supported for amazonlinux2 and ubuntu"
     end
 
     desc "create NAME", "create ec2 instance"

data/lib/aws_ec2/scripts/cloudwatch.sh

@@ -10,13 +10,15 @@ if [ $# -eq 0 ]; then
 fi
 LOG_GROUP_NAME=$1
 
+# shellcheck disable=SC1091
 source "/opt/aws-ec2/shared/functions.sh"
-os=$(os_name)
-if [ "$os" != "amazonlinux2" ]; then
-  echo "Sorry, enable cloudwatch logging with the aws-ec2 tool is only supported for amazonlinux2 currently"
+OS=$(os_name)
+if [ "$OS" != "amazonlinux2" ] || [ "$OS" != "ubuntu" ] ; then
+  echo "Sorry, enable cloudwatch logging with the aws-ec2 tool is only supported for amazonlinux2 and ubuntu"
   exit
 fi
 
+export OS # used by the scripts to delegate to the right OS script
 /opt/aws-ec2/cloudwatch/install.sh
 /opt/aws-ec2/cloudwatch/configure.sh "$LOG_GROUP_NAME"
 /opt/aws-ec2/cloudwatch/service.sh

data/lib/aws_ec2/scripts/cloudwatch/install.sh

@@ -1,4 +1,3 @@
 #!/bin/bash -eux
 
-# Install awslogs and the jq JSON parser
-yum install -y awslogs jq
+/opt/aws-ec2/cloudwatch/install/"$OS".sh

data/lib/aws_ec2/scripts/cloudwatch/install/amazonlinux2.sh

@@ -0,0 +1,4 @@
+#!/bin/bash -eux
+
+# Install awslogs and the jq JSON parser
+yum install -y awslogs jq

data/lib/aws_ec2/scripts/cloudwatch/install/ubuntu.sh

@@ -0,0 +1,29 @@
+#!/bin/bash -eux
+
+# https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/QuickStartEC2Instance.html
+
+REGION=$(curl -s 169.254.169.254/latest/meta-data/placement/availability-zone | sed s'/.$//')
+
+type python || apt-get install -y python-pip
+
+# Install awslogs and the jq JSON parser
+curl -s https://s3.amazonaws.com/aws-cloudwatch/downloads/latest/awslogs-agent-setup.py -O
+
+# in order to install awslogs non-interactively we need a filler configfile
+mkdir -p /etc/awslogs
+cat > /etc/awslogs/awslogs.conf <<- EOL
+[general]
+state_file = /var/awslogs/state/agent-state
+## filler config file, will get replaced by configure.sh script
+EOL
+
+# yum install -y awslogs jq also creates this file. We're creating it so that
+# configure.sh is consistent.
+cat > /etc/awslogs/awscli.conf <<- EOL
+[plugins]
+cwlogs = cwlogs
+[default]
+region = us-west-2
+EOL
+
+python ./awslogs-agent-setup.py --region "$REGION" --non-interactive --configfile=/etc/awslogs/awslogs.conf

data/lib/aws_ec2/scripts/cloudwatch/service.sh

@@ -1,19 +1,3 @@
-cat > /etc/init/awslogs.conf <<- EOL
-#upstart-job
-description "Configure and start CloudWatch Logs agent EC2 instance"
-author "Tung Nguyen"
-start on startup
+#!/bin/bash -eux
 
-script
-  exec 2>>/var/log/cloudwatch-logs-start.log
-  set -x
-
-  service awslogs start
-  chkconfig awslogs on
-end script
-EOL
-
-initctl list
-initctl reload-configuration
-initctl start awslogs
-initctl list
+/opt/aws-ec2/cloudwatch/service/"$OS".sh

data/lib/aws_ec2/scripts/cloudwatch/service/amazonlinux2.sh

@@ -0,0 +1,8 @@
+#!/bin/bash -exu
+
+# yum install already has configured
+#   /usr/lib/systemd/system/awslogsd.service
+# Restart because we adjust the config with configure.sh
+systemctl daemon-reload
+systemctl restart awslogsd # with the yum awslogs package the systemd is called awslogsd
+# systemctl status awslogsd

data/lib/aws_ec2/scripts/cloudwatch/service/ubuntu.sh

@@ -0,0 +1,10 @@
+#/bin/bash -exu
+
+# Interestingly, the awslogs-agent-setup.py command in the install.sh script
+# already sets up systemd.
+# With the yum awslogs-agent-setup.py setup, the systemd is called awslogs
+
+# We just have to reload and restart it since we reconfigured it
+systemctl daemon-reload
+systemctl restart awslogs
+# systemctl status awslogs

data/lib/aws_ec2/scripts/shared/functions.sh

@@ -16,29 +16,63 @@ CONFIGURE_AWS_CLI
   fi
 }
 
-# Example OS values at this point:
-#   Ubuntu
-#   Amazon Linux AMI
+# Normalize os name so we can delegate out to os specific scripts.
+#
+# Amazon Linux 2
+#   $ cat /etc/os-release
+#   NAME="Amazon Linux"
+#   VERSION="2 (2017.12)"
+#   ID="amzn"
+#   ID_LIKE="centos rhel fedora"
+#   VERSION_ID="2"
+#   PRETTY_NAME="Amazon Linux 2 (2017.12) LTS Release Candidate"
+#   ANSI_COLOR="0;33"
+#   CPE_NAME="cpe:2.3:o:amazon:amazon_linux:2"
+#   HOME_URL="https://amazonlinux.com/"
+#
+# Ubuntu
+#   ubuntu@ip-172-31-6-8:~$ cat /etc/os-release
+#   NAME="Ubuntu"
+#   VERSION="16.04.3 LTS (Xenial Xerus)"
+#   ID=ubuntu
+#   ID_LIKE=debian
+#   PRETTY_NAME="Ubuntu 16.04.3 LTS"
+#   VERSION_ID="16.04"
+#   HOME_URL="http://www.ubuntu.com/"
+#   SUPPORT_URL="http://help.ubuntu.com/"
+#   BUG_REPORT_URL="http://bugs.launchpad.net/ubuntu/"
+#   VERSION_CODENAME=xenial
+#   UBUNTU_CODENAME=xenial
+#
+# Note: Amazon Linux and Amazon Linux 2 have the same name
+#
 function os_name() {
-  # https://askubuntu.com/questions/459402/how-to-know-if-the-running-platform-is-ubuntu-or-centos-with-help-of-a-bash-scri
-  # Method 1 works for amazonlinux2 and ubuntu
-  # Method 3 the complex script, did not work for amazonlinux2
   local OS
-  OS=$(gawk -F= '/^NAME/{print $2}' /etc/os-release) # text surrounded by double quotes
-  # strip surrounding quotes: https://stackoverflow.com/questions/9733338/shell-script-remove-first-and-last-quote-from-a-variable
-  OS="${OS%\"}"
-  OS="${OS#\"}"
-  # Example OS values at this point:
-  #   Ubuntu
-  #   Amazon Linux AMI
+  local VERSION
 
-  # normalize values
-  case "$OS" in
-    Ubuntu)
-      echo "ubuntu"
-      ;;
-    *)
-      echo "amazonlinux2" # default
-      ;;
-  esac
+  if [[ "$OSTYPE" == "darwin"* ]]; then
+    OS="macosx" # gawk not available on macosx usually
+  else
+    # https://askubuntu.com/questions/459402/how-to-know-if-the-running-platform-is-ubuntu-or-centos-with-help-of-a-bash-scri
+    # Method 1 works for amazonlinux and ubuntu
+    # Method 3 the complex script, did not work for amazonlinux
+    OS=$(gawk -F= '/^NAME/{print $2}' /etc/os-release)
+  fi
+
+  OS="${OS// /}" # remove spaces
+  OS=$(echo "$OS" | tr '[:upper:]' '[:lower:]')
+  # https://stackoverflow.com/questions/9733338/shell-script-remove-first-and-last-quote-from-a-variable
+  OS="${OS#\"}" # remove leading "
+  OS="${OS%\"}" # remove trailing "
+
+  if [ "$OS" == "amazonlinux" ]; then
+    VERSION=$(gawk -F= '/^VERSION/{print $2}' /etc/os-release)
+    VERSION="${VERSION#\"}" # remove leading "
+    if [[ "$VERSION" =~ ^2 ]] ; then
+      OS="${OS}2"
+    fi
+  fi
+
+  echo "$OS"
 }
+OS=$(normalize_os)

data/lib/aws_ec2/version.rb

@@ -1,3 +1,3 @@
 module AwsEc2
-  VERSION = "1.3.2"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-ec2
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-25 00:00:00.000000000 Z
+date: 2018-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -296,7 +296,11 @@ files:
 - lib/aws_ec2/scripts/cloudwatch.sh
 - lib/aws_ec2/scripts/cloudwatch/configure.sh
 - lib/aws_ec2/scripts/cloudwatch/install.sh
+- lib/aws_ec2/scripts/cloudwatch/install/amazonlinux2.sh
+- lib/aws_ec2/scripts/cloudwatch/install/ubuntu.sh
 - lib/aws_ec2/scripts/cloudwatch/service.sh
+- lib/aws_ec2/scripts/cloudwatch/service/amazonlinux2.sh
+- lib/aws_ec2/scripts/cloudwatch/service/ubuntu.sh
 - lib/aws_ec2/scripts/shared/functions.sh
 - lib/aws_ec2/setting.rb
 - lib/aws_ec2/template.rb