ciinabox-ecs 0.2.14 → 0.2.17.alpha.1612322070

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04febb0149037a1e97b7915b6ff48a9b938e7957f83a002a9619a4070ab6884b
-  data.tar.gz: ebac557858a0a4cb4af4d35671ba9e0d338a82012a7f1152ce32758dc032eab6
+  metadata.gz: 950c9d5e0c1f37277b1c365f72315fb1d0807b8cbde7db116517569f850cc196
+  data.tar.gz: 6ca4a35410b7e9a553b9bddedaaf6805b681403023b7ac106e7bca68a43f2f2b
 SHA512:
-  metadata.gz: a9d48c5c4245060688d5b9ed3a735bf192f482a2fa8372393f2484e29a6d830dd08741b109f17b5eb66681f4664a7f26ff1468c621f0d5586b3ba2d1fd38c222
-  data.tar.gz: 1ab590f337848330cb17e520a6983d74b1faad2309d25b441003e9c4d867058d44624ceb27a88c81f82d468ea0c17b9eb218c5a01671a1e76435e5184e02c22c
+  metadata.gz: d35fa68e01405d1f5ca917a8a6f7b13138a924305c1e2aa6d3b71215d6bd66bb39deb3d68660644b0fbda3a3f8f271d738a87c997476c5d906b4a2424188e783
+  data.tar.gz: 55da6021f706b50bd0c68ef6a6aa506eddfab2b5826a83ef1e08a84b0aea3ee9c4532303643f2bda52f709555c9a38d2b04ba65b877ddb0407c5f0c87f234889

data/Rakefile

@@ -40,6 +40,8 @@ namespace :ciinabox do
     config = default_params
   end
 
+  config.merge!('current_dir'=>current_dir)
+
   Dir["#{ciinaboxes_dir}/#{ciinabox_name}/config/*.yml"].each {|config_file|
     if not config_file.include?('params.yml')
       config = config.merge(YAML.load(File.read(config_file)))

data/config/ciinabox_params.yml.erb

@@ -57,6 +57,9 @@ ciinabox_iam_role_name: <%= ciinabox_iam_role_name %>
 #set the size of the ecs data volume -- NOTE: would take a new volume - i.e. change volume name
 #ecs_data_volume_size: 250
 
+#set the spot price for the ECS instance -- NOTE: The default value below is the on-demand price for a t2.large
+#ecs_instance_spot_price: 0.1168
+
 #optional ciinabox name if you need more than one or you want a different name
 #stack_name: ciinabox-tools
 

data/config/default_params.yml

@@ -174,6 +174,8 @@ data_volume_retain_daily_backups: 7
 data_volume_retain_weekly_backups: 4
 data_volume_reatin_monthly_backups: 12
 
+# Install the CloudWatch agent and configure it to push metrics (disk, memory)
+enable_cloudwatch_agent: false
 
 ecs_iam_role_permissions_default:
   - name: assume-role

data/config/files/amazon-cloudwatch-agent.json

@@ -0,0 +1,55 @@
+{
+  "agent": {
+    "metrics_collection_interval": 60,
+    "logfile": "/opt/aws/amazon-cloudwatch-agent/logs/amazon-cloudwatch-agent.log",
+    "debug": false
+  },
+  "metrics": {
+    "metrics_collected": {
+      "disk": {
+        "resources": [
+          "/",
+          "/data",
+          "/var/lib/docker"
+        ],
+        "measurement": [
+          {
+            "name": "used_percent",
+            "rename": "DiskSpaceUsedPercent"
+          },
+          {
+            "name": "inodes_used",
+            "rename": "INodesUsedCount"
+          },
+          {
+            "name": "inodes_total",
+            "rename": "INodesTotalCount"
+          }
+        ]
+      },
+      "mem": {
+        "measurement": [
+          {
+            "name": "used_percent",
+            "rename": "MemoryUsedPercent"
+          }
+        ]
+      }
+    }
+  },
+  "logs": {
+    "logs_collected": {
+      "files": {
+        "collect_list": [
+          {
+            "file_path": "/var/log/cloud-init-output.log",
+            "log_group_name": "/aws/cloudwatch-agent/ciinabox-ecs-xx",
+            "log_stream_name": "cloud-init-output.log-{instance_id}",
+            "timezone": "UTC"
+          }
+        ]
+      }
+    }
+  }
+}
+

data/lambdas/acm_issuer_validator/lib/install.sh

@@ -5,7 +5,7 @@ cd $DIR/..
 rm -rf lib
 
 function pipinstall () {
-   if [ $(which pip) == '' ]; then
+   if [[ $(which pip) == '' ]]; then
         echo "ERROR! No pip installed. Try installing either python3 pip or docker"
         exit -1
    fi
@@ -13,7 +13,7 @@ function pipinstall () {
    pip install aws-acm-cert-validator==0.1.11 -t lib
 }
 
-if [ $(which docker) == '' ]; then
+if [[ $(which docker) == '' ]]; then
     pipinstall
 else
     docker run --rm -v $DIR/..:/dst -w /dst -u $UID python:3.6-alpine pip install aws-acm-cert-validator==0.1.11 -t lib

data/templates/ecs-cluster.rb

@@ -140,6 +140,19 @@ CloudFormation {
                             "echo \"#{proxy_config}\" >> /opt/proxy/proxy_config.conf\n"
   end
 
+  enable_cloudwatch_agent_userdata = []
+  if defined? enable_cloudwatch_agent and enable_cloudwatch_agent
+    enable_cloudwatch_agent_userdata = [
+      "mkdir -p /opt/aws/amazon-cloudwatch-agent/etc/\n",
+      "echo '#{File.open("#{config['current_dir']}/config/files/amazon-cloudwatch-agent.json").read()}' > /opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.json\n",
+      "wget https://s3.amazonaws.com/amazoncloudwatch-agent/amazon_linux/amd64/latest/amazon-cloudwatch-agent.rpm\n",
+      "echo 'Installing CloudWatch agent...'\n",
+      "rpm -U amazon-cloudwatch-agent.rpm\n",
+      "/opt/aws/amazon-cloudwatch-agent/bin/amazon-cloudwatch-agent-ctl -a fetch-config -m ec2 -c file:/opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.json -s\n"]
+  end
+
+
+
   ecs_allow_sg_ingress = [
     { IpProtocol: 'tcp', FromPort: '32768', ToPort: '65535', CidrIp: FnJoin( "", [ FnFindInMap('EnvironmentType','ciinabox','NetworkPrefix'),".", FnFindInMap('EnvironmentType','ciinabox','StackOctet'), ".0.0/",FnFindInMap('EnvironmentType','ciinabox','StackMask') ] ) },
   ]
@@ -168,31 +181,35 @@ CloudFormation {
     if not ecs_block_device_mapping.empty?
       Property("BlockDeviceMappings", ecs_block_device_mapping)
     end
+    if defined? ecs_instance_spot_price
+      SpotPrice ecs_instance_spot_price
+    end
     UserData FnBase64(FnJoin("", [
         "#!/bin/bash\n",
         "echo ECS_CLUSTER=", Ref('ECSCluster'), " >> /etc/ecs/ecs.config\n",
         "echo ECS_ENABLE_TASK_CPU_MEM_LIMIT=false >> /etc/ecs/ecs.config\n",
         "INSTANCE_ID=$(echo `/opt/aws/bin/ec2-metadata -i | cut -f2 -d:`)\n",
         "PRIVATE_IP=`/opt/aws/bin/ec2-metadata -o | cut -f2 -d: | cut -f2 -d-`\n",
+        "hostname ciinabox-ecs-xx\n",
         "#{proxy_config_userdata}",
         "yum install -y python-pip\n",
-        "python-pip install --upgrade awscli\n",
-        "/usr/local/bin/aws --region ", Ref("AWS::Region"), " ec2 attach-volume --volume-id ", Ref(volume_name), " --instance-id ${INSTANCE_ID} --device /dev/sdf\n",
+        "aws --region ", Ref("AWS::Region"), " ec2 attach-volume --volume-id ", Ref(volume_name), " --instance-id ${INSTANCE_ID} --device /dev/sdf\n",
         "echo 'waiting for ECS Data volume to attach' && sleep 20\n",
-        "/usr/local/bin/aws --region ", Ref("AWS::Region"), " ec2 attach-network-interface --network-interface-id ",  Ref('ECSENI'), " --instance-id ${INSTANCE_ID} --device-index 1\n",
+        "aws --region ", Ref("AWS::Region"), " ec2 attach-network-interface --network-interface-id ",  Ref('ECSENI'), " --instance-id ${INSTANCE_ID} --device-index 1\n",
         "echo 'waiting for ECS ENI to attach' && sleep 20\n",
         "echo '/dev/xvdf   /data        ext4    defaults,nofail 0   2' >> /etc/fstab\n",
         "mkdir -p /data\n",
         "mount /data && echo \"ECS Data volume already formatted\" || mkfs -t ext4 /dev/xvdf\n",
         "mount -a && echo 'mounting ECS Data volume' || echo 'failed to mount ECS Data volume'\n",
-        "#{user_data_init_devices}",
         "export BOOTSTRAP=/data/bootstrap \n",
         "if [ ! -e \"$BOOTSTRAP\" ]; then echo \"boostrapping\"; chmod -R 777 /data; mkdir -p /data/jenkins; chown -R 1000:1000 /data/jenkins;  touch $BOOTSTRAP; fi \n",
         "ifconfig eth0 mtu 1500\n",
         "curl https://amazon-ssm-", Ref("AWS::Region"), ".s3.amazonaws.com/latest/linux_amd64/amazon-ssm-agent.rpm -o /tmp/amazon-ssm-agent.rpm\n",
         "yum install -y /tmp/amazon-ssm-agent.rpm\n",
+        *enable_cloudwatch_agent_userdata,
         "stop ecs\n",
         "service docker stop\n",
+        "#{user_data_init_devices}",
         "service docker start\n",
         "start ecs\n",
         "echo 'done!!!!'\n"

data/templates/services/jenkins.rb

@@ -18,7 +18,7 @@ if not defined? ciinabox_repo
   ciinabox_repo=''
 end
 
-image = "#{ciinabox_repo}base2/ciinabox-jenkins:lts"
+image = "#{ciinabox_repo}ghcr.io/base2services/ciinabox-jenkins:lts"
 
 jenkins_java_opts = ''
 memory = 2048
@@ -110,7 +110,7 @@ if defined? include_diind_slave and include_diind_slave
   dind_definition = {
       Name: 'jenkins-docker-dind-slave',
       Memory: slave_memory,
-      Image: "#{ciinabox_repo}base2/ciinabox-docker-slave:#{docker_slave_version}",
+      Image: "#{ciinabox_repo}ghcr.io/base2services/ciinabox-docker-slave:#{docker_slave_version}",
       Environment: [{Name: 'RUN_DOCKER_IN_DOCKER', Value: 1}],
       Essential: false,
       Privileged: true
@@ -141,7 +141,7 @@ if defined? include_dood_slave and include_dood_slave
   dood_definition =  {
       Name: 'jenkins-docker-dood-slave',
       Memory: slave_memory,
-      Image: "#{ciinabox_repo}base2/ciinabox-docker-slave:#{docker_slave_version}",
+      Image: "#{ciinabox_repo}ghcr.io/base2services/ciinabox-docker-slave:#{docker_slave_version}",
       Environment: [{Name: 'RUN_DOCKER_IN_DOCKER', Value: 0}],
       MountPoints: [
           {

data/templates/services/nexus.rb

@@ -5,7 +5,7 @@ if !defined? timezone
   timezone = 'GMT'
 end
 
-image = 'base2/ciinabox-nexus'
+image = 'ghcr.io/base2services/ciinabox-nexus'
 container_path = '/sonatype-work'
 java_opts = ''
 memory = 1024

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ciinabox-ecs
 version: !ruby/object:Gem::Version
-  version: 0.2.14
+  version: 0.2.17.alpha.1612322070
 platform: ruby
 authors:
 - Base2Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2021-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -56,16 +56,16 @@ dependencies:
   name: cfndsl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: 0.17.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: 0.17.1
 - !ruby/object:Gem::Dependency
   name: cfn_manage
   requirement: !ruby/object:Gem::Requirement
@@ -127,6 +127,7 @@ files:
 - config/default_params.yml
 - config/default_params.yml.example
 - config/default_services.yml
+- config/files/amazon-cloudwatch-agent.json
 - ext/common_helper.rb
 - ext/config/managed_policies.yml
 - ext/helper.rb
@@ -163,11 +164,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.0
+rubygems_version: 3.2.8
 signing_key: 
 specification_version: 4
 summary: Manage ciinabox on Aws Ecs