ciinabox-ecs 0.2.14.alpha.1565134498 → 0.2.14
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/config/default_params.yml +0 -2
- data/templates/ecs-cluster.rb +1 -16
- metadata +5 -6
- data/config/files/amazon-cloudwatch-agent.json +0 -55
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 04febb0149037a1e97b7915b6ff48a9b938e7957f83a002a9619a4070ab6884b
|
4
|
+
data.tar.gz: ebac557858a0a4cb4af4d35671ba9e0d338a82012a7f1152ce32758dc032eab6
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a9d48c5c4245060688d5b9ed3a735bf192f482a2fa8372393f2484e29a6d830dd08741b109f17b5eb66681f4664a7f26ff1468c621f0d5586b3ba2d1fd38c222
|
7
|
+
data.tar.gz: 1ab590f337848330cb17e520a6983d74b1faad2309d25b441003e9c4d867058d44624ceb27a88c81f82d468ea0c17b9eb218c5a01671a1e76435e5184e02c22c
|
data/config/default_params.yml
CHANGED
@@ -174,8 +174,6 @@ data_volume_retain_daily_backups: 7
|
|
174
174
|
data_volume_retain_weekly_backups: 4
|
175
175
|
data_volume_reatin_monthly_backups: 12
|
176
176
|
|
177
|
-
# Install the CloudWatch agent and configure it to push metrics (disk, memory)
|
178
|
-
enable_cloudwatch_agent: false
|
179
177
|
|
180
178
|
ecs_iam_role_permissions_default:
|
181
179
|
- name: assume-role
|
data/templates/ecs-cluster.rb
CHANGED
@@ -140,19 +140,6 @@ CloudFormation {
|
|
140
140
|
"echo \"#{proxy_config}\" >> /opt/proxy/proxy_config.conf\n"
|
141
141
|
end
|
142
142
|
|
143
|
-
enable_cloudwatch_agent_userdata = []
|
144
|
-
if defined? enable_cloudwatch_agent and enable_cloudwatch_agent
|
145
|
-
enable_cloudwatch_agent_userdata = [
|
146
|
-
"mkdir -p /opt/aws/amazon-cloudwatch-agent/etc/\n",
|
147
|
-
"echo '#{File.open('config/files/amazon-cloudwatch-agent.json').read()}' > /opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.json\n",
|
148
|
-
"wget https://s3.amazonaws.com/amazoncloudwatch-agent/amazon_linux/amd64/latest/amazon-cloudwatch-agent.rpm\n",
|
149
|
-
"echo 'Installing CloudWatch agent...'\n",
|
150
|
-
"rpm -U amazon-cloudwatch-agent.rpm\n",
|
151
|
-
"/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"]
|
152
|
-
end
|
153
|
-
|
154
|
-
|
155
|
-
|
156
143
|
ecs_allow_sg_ingress = [
|
157
144
|
{ IpProtocol: 'tcp', FromPort: '32768', ToPort: '65535', CidrIp: FnJoin( "", [ FnFindInMap('EnvironmentType','ciinabox','NetworkPrefix'),".", FnFindInMap('EnvironmentType','ciinabox','StackOctet'), ".0.0/",FnFindInMap('EnvironmentType','ciinabox','StackMask') ] ) },
|
158
145
|
]
|
@@ -187,7 +174,6 @@ CloudFormation {
|
|
187
174
|
"echo ECS_ENABLE_TASK_CPU_MEM_LIMIT=false >> /etc/ecs/ecs.config\n",
|
188
175
|
"INSTANCE_ID=$(echo `/opt/aws/bin/ec2-metadata -i | cut -f2 -d:`)\n",
|
189
176
|
"PRIVATE_IP=`/opt/aws/bin/ec2-metadata -o | cut -f2 -d: | cut -f2 -d-`\n",
|
190
|
-
"hostname ciinabox-ecs-xx\n",
|
191
177
|
"#{proxy_config_userdata}",
|
192
178
|
"yum install -y python-pip\n",
|
193
179
|
"python-pip install --upgrade awscli\n",
|
@@ -199,15 +185,14 @@ CloudFormation {
|
|
199
185
|
"mkdir -p /data\n",
|
200
186
|
"mount /data && echo \"ECS Data volume already formatted\" || mkfs -t ext4 /dev/xvdf\n",
|
201
187
|
"mount -a && echo 'mounting ECS Data volume' || echo 'failed to mount ECS Data volume'\n",
|
188
|
+
"#{user_data_init_devices}",
|
202
189
|
"export BOOTSTRAP=/data/bootstrap \n",
|
203
190
|
"if [ ! -e \"$BOOTSTRAP\" ]; then echo \"boostrapping\"; chmod -R 777 /data; mkdir -p /data/jenkins; chown -R 1000:1000 /data/jenkins; touch $BOOTSTRAP; fi \n",
|
204
191
|
"ifconfig eth0 mtu 1500\n",
|
205
192
|
"curl https://amazon-ssm-", Ref("AWS::Region"), ".s3.amazonaws.com/latest/linux_amd64/amazon-ssm-agent.rpm -o /tmp/amazon-ssm-agent.rpm\n",
|
206
193
|
"yum install -y /tmp/amazon-ssm-agent.rpm\n",
|
207
|
-
*enable_cloudwatch_agent_userdata,
|
208
194
|
"stop ecs\n",
|
209
195
|
"service docker stop\n",
|
210
|
-
"#{user_data_init_devices}",
|
211
196
|
"service docker start\n",
|
212
197
|
"start ecs\n",
|
213
198
|
"echo 'done!!!!'\n"
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ciinabox-ecs
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.2.14
|
4
|
+
version: 0.2.14
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Base2Services
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2018-12-19 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rake
|
@@ -127,7 +127,6 @@ files:
|
|
127
127
|
- config/default_params.yml
|
128
128
|
- config/default_params.yml.example
|
129
129
|
- config/default_services.yml
|
130
|
-
- config/files/amazon-cloudwatch-agent.json
|
131
130
|
- ext/common_helper.rb
|
132
131
|
- ext/config/managed_policies.yml
|
133
132
|
- ext/helper.rb
|
@@ -164,11 +163,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
164
163
|
version: '0'
|
165
164
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
166
165
|
requirements:
|
167
|
-
- - "
|
166
|
+
- - ">="
|
168
167
|
- !ruby/object:Gem::Version
|
169
|
-
version:
|
168
|
+
version: '0'
|
170
169
|
requirements: []
|
171
|
-
rubygems_version: 3.0.
|
170
|
+
rubygems_version: 3.0.0
|
172
171
|
signing_key:
|
173
172
|
specification_version: 4
|
174
173
|
summary: Manage ciinabox on Aws Ecs
|
@@ -1,55 +0,0 @@
|
|
1
|
-
{
|
2
|
-
"agent": {
|
3
|
-
"metrics_collection_interval": 60,
|
4
|
-
"logfile": "/opt/aws/amazon-cloudwatch-agent/logs/amazon-cloudwatch-agent.log",
|
5
|
-
"debug": false
|
6
|
-
},
|
7
|
-
"metrics": {
|
8
|
-
"metrics_collected": {
|
9
|
-
"disk": {
|
10
|
-
"resources": [
|
11
|
-
"/",
|
12
|
-
"/data",
|
13
|
-
"/var/lib/docker"
|
14
|
-
],
|
15
|
-
"measurement": [
|
16
|
-
{
|
17
|
-
"name": "used_percent",
|
18
|
-
"rename": "DiskSpaceUsedPercent"
|
19
|
-
},
|
20
|
-
{
|
21
|
-
"name": "inodes_used",
|
22
|
-
"rename": "INodesUsedCount"
|
23
|
-
},
|
24
|
-
{
|
25
|
-
"name": "inodes_total",
|
26
|
-
"rename": "INodesTotalCount"
|
27
|
-
}
|
28
|
-
]
|
29
|
-
},
|
30
|
-
"mem": {
|
31
|
-
"measurement": [
|
32
|
-
{
|
33
|
-
"name": "used_percent",
|
34
|
-
"rename": "MemoryUsedPercent"
|
35
|
-
}
|
36
|
-
]
|
37
|
-
}
|
38
|
-
}
|
39
|
-
},
|
40
|
-
"logs": {
|
41
|
-
"logs_collected": {
|
42
|
-
"files": {
|
43
|
-
"collect_list": [
|
44
|
-
{
|
45
|
-
"file_path": "/var/log/cloud-init-output.log",
|
46
|
-
"log_group_name": "/aws/cloudwatch-agent/ciinabox-ecs-xx",
|
47
|
-
"log_stream_name": "cloud-init-output.log-{instance_id}",
|
48
|
-
"timezone": "UTC"
|
49
|
-
}
|
50
|
-
]
|
51
|
-
}
|
52
|
-
}
|
53
|
-
}
|
54
|
-
}
|
55
|
-
|