ciinabox-ecs 0.2.14.alpha.1565134498 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e880b7dba8c1467738c20447f2c674653a5c07fba682096bb1b4a88c0ad0fc20
-  data.tar.gz: 0ef6400c28bf7ac39c28097397b43258c6b17dc27142e2a69a285119f94dff5e
+  metadata.gz: 04febb0149037a1e97b7915b6ff48a9b938e7957f83a002a9619a4070ab6884b
+  data.tar.gz: ebac557858a0a4cb4af4d35671ba9e0d338a82012a7f1152ce32758dc032eab6
 SHA512:
-  metadata.gz: 324fedec1ea455468cdf7129b9863911790ebc73fb3d7abc1bccd99032158326da723dd23233bb6dbf2939c3df04db8b1877664217cdba89dbf5dd8da01ac661
-  data.tar.gz: e611e774cce5d858f740917666e1f6694811e49effd4f9659f3b6c77f60ed911ec230475bf8ed4d61aa716541c60aaaffbf45afc590c21eccc3382fbf4352dc8
+  metadata.gz: a9d48c5c4245060688d5b9ed3a735bf192f482a2fa8372393f2484e29a6d830dd08741b109f17b5eb66681f4664a7f26ff1468c621f0d5586b3ba2d1fd38c222
+  data.tar.gz: 1ab590f337848330cb17e520a6983d74b1faad2309d25b441003e9c4d867058d44624ceb27a88c81f82d468ea0c17b9eb218c5a01671a1e76435e5184e02c22c

data/config/default_params.yml

@@ -174,8 +174,6 @@ 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/templates/ecs-cluster.rb

@@ -140,19 +140,6 @@ 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/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') ] ) },
   ]
@@ -187,7 +174,6 @@ CloudFormation {
         "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",
@@ -199,15 +185,14 @@ CloudFormation {
         "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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ciinabox-ecs
 version: !ruby/object:Gem::Version
-  version: 0.2.14.alpha.1565134498
+  version: 0.2.14
 platform: ruby
 authors:
 - Base2Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-06 00:00:00.000000000 Z
+date: 2018-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -127,7 +127,6 @@ 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
@@ -164,11 +163,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.0
 signing_key: 
 specification_version: 4
 summary: Manage ciinabox on Aws Ecs

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

@@ -1,55 +0,0 @@
-{
-  "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"
-          }
-        ]
-      }
-    }
-  }
-}
-