From 0056e959aac16c8034a110de78d323aa69000b96 Mon Sep 17 00:00:00 2001 From: "Christopher M. Neill" Date: Tue, 29 Mar 2016 16:27:30 -0700 Subject: [PATCH 1/6] core_file_dir is a variable now --- ansible/delta-hosts/variables | 1 + ansible/epsilon-hosts/variables | 1 + ansible/gamma-hosts/variables | 1 + ansible/roles/docker/tasks/main.yml | 13 ++++++++++++- ansible/stage-hosts/variables | 1 + 5 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ansible/delta-hosts/variables b/ansible/delta-hosts/variables index 89f5fa39..9bc4105f 100644 --- a/ansible/delta-hosts/variables +++ b/ansible/delta-hosts/variables @@ -79,6 +79,7 @@ vault_aws_region=us-east-1 ansible_ssh_private_key_file=~/.ssh/delta.pem api_hello_runnable_github_token=88ddc423c2312d02a8bbcaad76dd4c374a30e4af bastion_sshd_port=60506 +core_file_dir=/var/log datadog_tags=env:delta datadog_mongodb_user=datadog datadog_mongodb_pwd=sqa3WBgkCgZsFZuex0kBNahZ diff --git a/ansible/epsilon-hosts/variables b/ansible/epsilon-hosts/variables index 81f4002a..37e7f619 100644 --- a/ansible/epsilon-hosts/variables +++ b/ansible/epsilon-hosts/variables @@ -70,6 +70,7 @@ vault_aws_region=us-east-1 [epsilon:vars] ansible_ssh_private_key_file=~/.ssh/epsilon.pem bastion_sshd_port=60519 +core_file_dir=/docker/app_cores datadog_tags=env:epsilon datadog_mongodb_user=datadog datadog_mongodb_pwd=sqa3WBgkCgZsFZuex0kBNahZ diff --git a/ansible/gamma-hosts/variables b/ansible/gamma-hosts/variables index 4fdf19a2..7bf06657 100644 --- a/ansible/gamma-hosts/variables +++ b/ansible/gamma-hosts/variables @@ -73,6 +73,7 @@ vault_aws_region=us-east-1 [gamma:vars] ansible_ssh_private_key_file=~/.ssh/gamma.pem bastion_sshd_port=60709 +core_file_dir=/var/log datadog_tags=env:gamma datadog_mongodb_user=datadog datadog_mongodb_pwd=sqa3WBgkCgZsFZuex0kBNahZ diff --git a/ansible/roles/docker/tasks/main.yml b/ansible/roles/docker/tasks/main.yml index 6fce9e86..517ec9de 100644 --- a/ansible/roles/docker/tasks/main.yml +++ b/ansible/roles/docker/tasks/main.yml @@ -16,6 +16,17 @@ owner=root group=root +- name: create core file dir + become: true + when: docker_config == "runnable" and core_file_dir != /var/log + tags: coreDump + file: + path="{{ core_file_dir }}" + state=directory + user=ubuntu + group=ubuntu + mode=0700 + - name: change core dump path become: true when: docker_config == "runnable" @@ -24,7 +35,7 @@ name=kernel.core_pattern reload=true state=present - value="/var/log/core.%h.%e.%t" + value="{{ core_file_dir }}/core.%h.%e.%t" - name: install aufs with linux-image-extra-{{ ansible_kernel }} become: true diff --git a/ansible/stage-hosts/variables b/ansible/stage-hosts/variables index 71b27c20..ed2f99e2 100644 --- a/ansible/stage-hosts/variables +++ b/ansible/stage-hosts/variables @@ -4,6 +4,7 @@ api_socket_server_hostname=api-staging-codenow.runnableapp.com aws_access_key_id=AKIAJ3RCYU6FCULAJP2Q aws_secret_access_key=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 consul_host_address=consul-server-staging-codenow.runnableapp.com +core_file_dir=/var/log detention_hostname=detention-staging-codenow.runnableapp.com docks_rollbar_key=d1af6567ed0f464fb1d676f38fd31751 domain=runnable-angular-staging-codenow.runnableapp.com From 24eb1eec17ecf582725efd4f5ab69adb327fb305 Mon Sep 17 00:00:00 2001 From: "Christopher M. Neill" Date: Tue, 29 Mar 2016 16:35:50 -0700 Subject: [PATCH 2/6] defaults in all.yml --- ansible/delta-hosts/variables | 1 - ansible/gamma-hosts/variables | 1 - ansible/group_vars/all.yml | 6 ++++++ ansible/stage-hosts/variables | 1 - 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ansible/delta-hosts/variables b/ansible/delta-hosts/variables index 9bc4105f..89f5fa39 100644 --- a/ansible/delta-hosts/variables +++ b/ansible/delta-hosts/variables @@ -79,7 +79,6 @@ vault_aws_region=us-east-1 ansible_ssh_private_key_file=~/.ssh/delta.pem api_hello_runnable_github_token=88ddc423c2312d02a8bbcaad76dd4c374a30e4af bastion_sshd_port=60506 -core_file_dir=/var/log datadog_tags=env:delta datadog_mongodb_user=datadog datadog_mongodb_pwd=sqa3WBgkCgZsFZuex0kBNahZ diff --git a/ansible/gamma-hosts/variables b/ansible/gamma-hosts/variables index 7bf06657..4fdf19a2 100644 --- a/ansible/gamma-hosts/variables +++ b/ansible/gamma-hosts/variables @@ -73,7 +73,6 @@ vault_aws_region=us-east-1 [gamma:vars] ansible_ssh_private_key_file=~/.ssh/gamma.pem bastion_sshd_port=60709 -core_file_dir=/var/log datadog_tags=env:gamma datadog_mongodb_user=datadog datadog_mongodb_pwd=sqa3WBgkCgZsFZuex0kBNahZ diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index fc378653..facb301b 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -28,6 +28,12 @@ loggly_token: f673760d-e0b3-4a93-a15e-2862ea074f91 loggly_password: TebejAcutHeH_Ch0tR9ru4anaT6CRu*3 loggly_username: ops +## +## cores and logs +## + +core_file_dir: /var/log + ## ## shared application configs ## diff --git a/ansible/stage-hosts/variables b/ansible/stage-hosts/variables index ed2f99e2..71b27c20 100644 --- a/ansible/stage-hosts/variables +++ b/ansible/stage-hosts/variables @@ -4,7 +4,6 @@ api_socket_server_hostname=api-staging-codenow.runnableapp.com aws_access_key_id=AKIAJ3RCYU6FCULAJP2Q aws_secret_access_key=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 consul_host_address=consul-server-staging-codenow.runnableapp.com -core_file_dir=/var/log detention_hostname=detention-staging-codenow.runnableapp.com docks_rollbar_key=d1af6567ed0f464fb1d676f38fd31751 domain=runnable-angular-staging-codenow.runnableapp.com From b4ed5f5bc5a1644a22d1ad7510a00cff88e1a406 Mon Sep 17 00:00:00 2001 From: "Christopher M. Neill" Date: Tue, 5 Apr 2016 10:57:38 -0700 Subject: [PATCH 3/6] some tweaks --- ansible/epsilon-hosts/variables | 1 - ansible/group_vars/all.yml | 2 +- ansible/roles/docker/tasks/main.yml | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ansible/epsilon-hosts/variables b/ansible/epsilon-hosts/variables index 37e7f619..81f4002a 100644 --- a/ansible/epsilon-hosts/variables +++ b/ansible/epsilon-hosts/variables @@ -70,7 +70,6 @@ vault_aws_region=us-east-1 [epsilon:vars] ansible_ssh_private_key_file=~/.ssh/epsilon.pem bastion_sshd_port=60519 -core_file_dir=/docker/app_cores datadog_tags=env:epsilon datadog_mongodb_user=datadog datadog_mongodb_pwd=sqa3WBgkCgZsFZuex0kBNahZ diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index facb301b..183f121d 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -32,7 +32,7 @@ loggly_username: ops ## cores and logs ## -core_file_dir: /var/log +core_file_dir: /docker/app_cores ## ## shared application configs diff --git a/ansible/roles/docker/tasks/main.yml b/ansible/roles/docker/tasks/main.yml index 517ec9de..3912778e 100644 --- a/ansible/roles/docker/tasks/main.yml +++ b/ansible/roles/docker/tasks/main.yml @@ -23,9 +23,9 @@ file: path="{{ core_file_dir }}" state=directory - user=ubuntu - group=ubuntu - mode=0700 + user=root + group=root + mode=0755 - name: change core dump path become: true From b7214b416706e26c197077f4266996b6122d9c07 Mon Sep 17 00:00:00 2001 From: "Christopher M. Neill" Date: Tue, 5 Apr 2016 12:06:29 -0700 Subject: [PATCH 4/6] YAML wants quotes --- ansible/roles/docker/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/docker/tasks/main.yml b/ansible/roles/docker/tasks/main.yml index 3912778e..cacd232e 100644 --- a/ansible/roles/docker/tasks/main.yml +++ b/ansible/roles/docker/tasks/main.yml @@ -18,7 +18,7 @@ - name: create core file dir become: true - when: docker_config == "runnable" and core_file_dir != /var/log + when: docker_config == "runnable" and core_file_dir != "/var/log" tags: coreDump file: path="{{ core_file_dir }}" From f5f6062fc4b0f9500dc3daa69b1c7e8e2243d6ac Mon Sep 17 00:00:00 2001 From: "Christopher M. Neill" Date: Fri, 8 Apr 2016 14:16:59 -0700 Subject: [PATCH 5/6] Update all.yml --- ansible/group_vars/all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 183f121d..facb301b 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -32,7 +32,7 @@ loggly_username: ops ## cores and logs ## -core_file_dir: /docker/app_cores +core_file_dir: /var/log ## ## shared application configs From 6ca69f68e4f5e77b49d9ef7278111844c77805e1 Mon Sep 17 00:00:00 2001 From: "Christopher M. Neill" Date: Tue, 12 Apr 2016 13:07:12 -0700 Subject: [PATCH 6/6] /var/log/core --- ansible/group_vars/all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index facb301b..3599c053 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -32,7 +32,7 @@ loggly_username: ops ## cores and logs ## -core_file_dir: /var/log +core_file_dir: /var/log/core ## ## shared application configs