From edae21135648bfefabb67acef6c37c0617bfc816 Mon Sep 17 00:00:00 2001
From: Steve Smith <ssmith@atlassian.com>
Date: Fri, 13 Sep 2019 12:01:47 +1000
Subject: [PATCH] DCD-436: Use full cloudwatch name for clarity.

---
 group_vars/aws_node_local.yml                              | 4 ++--
 roles/aws_common/defaults/main.yml                         | 4 ++--
 roles/aws_common/molecule/cw-disabled/playbook.yml         | 2 +-
 roles/aws_common/molecule/default/playbook.yml             | 4 ++--
 roles/aws_common/molecule/logs-disabled/playbook.yml       | 4 ++--
 roles/aws_common/tasks/amazon.yml                          | 2 +-
 roles/aws_common/tasks/main.yml                            | 2 +-
 roles/aws_common/templates/amazon-cloudwatch-agent.json.j2 | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/group_vars/aws_node_local.yml b/group_vars/aws_node_local.yml
index d6c2c9a..cd6ea3b 100644
--- a/group_vars/aws_node_local.yml
+++ b/group_vars/aws_node_local.yml
@@ -56,8 +56,8 @@ atl_aws_region: "{{ lookup('env', 'ATL_AWS_REGION') }}"
 atl_aws_iam_role: "{{ lookup('env', 'ATL_AWS_IAM_ROLE') }}"
 atl_aws_iam_role_arn: "{{ lookup('env', 'ATL_AWS_IAM_ROLE_ARN') }}"
 
-atl_aws_enable_cw: "{{ lookup('env', 'ATL_AWS_ENABLE_CW')|bool or false }}"
-atl_aws_enable_cw_logs: "{{ lookup('env', 'ATL_AWS_ENABLE_CW_LOGS')|bool or false }}"
+atl_aws_enable_cloudwatch: "{{ lookup('env', 'ATL_AWS_ENABLE_CLOUDWATCH')|bool or false }}"
+atl_aws_enable_cloudwatch_logs: "{{ lookup('env', 'ATL_AWS_ENABLE_CLOUDWATCH_LOGS')|bool or false }}"
 
 atl_db_engine: "{{ lookup('env', 'ATL_DB_ENGINE') }}"
 atl_db_host: "{{ lookup('env', 'ATL_DB_HOST') }}"
diff --git a/roles/aws_common/defaults/main.yml b/roles/aws_common/defaults/main.yml
index 11fca42..3cb3b65 100644
--- a/roles/aws_common/defaults/main.yml
+++ b/roles/aws_common/defaults/main.yml
@@ -4,8 +4,8 @@
 aws_download_region: "{{ ansible_ec2_placement_region | default('us-west-2') }}"
 aws_cloudwatch_agent_rpm: "https://s3.{{ aws_download_region }}.amazonaws.com/amazoncloudwatch-agent-{{ aws_download_region }}/amazon_linux/amd64/latest/amazon-cloudwatch-agent.rpm"
 
-atl_aws_enable_cw: false
-atl_aws_enable_cw_logs: false
+atl_aws_enable_cloudwatch: false
+atl_aws_enable_cloudwatch_logs: false
 
 # Mostly for molecule testing, as skip-tags doesn't work with handlers.
 atl_aws_agent_restart: true
diff --git a/roles/aws_common/molecule/cw-disabled/playbook.yml b/roles/aws_common/molecule/cw-disabled/playbook.yml
index b235a9e..ffe0919 100644
--- a/roles/aws_common/molecule/cw-disabled/playbook.yml
+++ b/roles/aws_common/molecule/cw-disabled/playbook.yml
@@ -11,7 +11,7 @@
     atl_product_edition: "jira-software"
     atl_aws_stack_name: "MY_STACK"
 
-    atl_aws_enable_cw: "{{ 'false'|bool }}"
+    atl_aws_enable_cloudwatch: "{{ 'false'|bool }}"
 
   roles:
     - role: aws_common
diff --git a/roles/aws_common/molecule/default/playbook.yml b/roles/aws_common/molecule/default/playbook.yml
index 4c5ea24..80c540a 100644
--- a/roles/aws_common/molecule/default/playbook.yml
+++ b/roles/aws_common/molecule/default/playbook.yml
@@ -12,8 +12,8 @@
     atl_aws_stack_name: "MY_STACK"
 
     # The `bool` pipe is a sanity check for group file.
-    atl_aws_enable_cw: "{{ 'true'|bool }}"
-    atl_aws_enable_cw_logs: true
+    atl_aws_enable_cloudwatch: "{{ 'true'|bool }}"
+    atl_aws_enable_cloudwatch_logs: true
     atl_aws_agent_restart: false
 
   roles:
diff --git a/roles/aws_common/molecule/logs-disabled/playbook.yml b/roles/aws_common/molecule/logs-disabled/playbook.yml
index 902f70f..9b0f699 100644
--- a/roles/aws_common/molecule/logs-disabled/playbook.yml
+++ b/roles/aws_common/molecule/logs-disabled/playbook.yml
@@ -11,8 +11,8 @@
     atl_product_edition: "jira-software"
     atl_aws_stack_name: "MY_STACK"
 
-    atl_aws_enable_cw: true
-    atl_aws_enable_cw_logs: false
+    atl_aws_enable_cloudwatch: true
+    atl_aws_enable_cloudwatch_logs: false
 
     atl_aws_agent_restart: false
 
diff --git a/roles/aws_common/tasks/amazon.yml b/roles/aws_common/tasks/amazon.yml
index b471439..a6592bf 100644
--- a/roles/aws_common/tasks/amazon.yml
+++ b/roles/aws_common/tasks/amazon.yml
@@ -11,6 +11,6 @@
   yum:
     name:
       - "{{ aws_cloudwatch_agent_rpm }}"
-  when: atl_aws_enable_cw is defined and atl_aws_enable_cw
+  when: atl_aws_enable_cloudwatch is defined and atl_aws_enable_cloudwatch
   notify:
     - Enable CloudWatch Agent
diff --git a/roles/aws_common/tasks/main.yml b/roles/aws_common/tasks/main.yml
index 16219ae..5155e76 100644
--- a/roles/aws_common/tasks/main.yml
+++ b/roles/aws_common/tasks/main.yml
@@ -20,6 +20,6 @@
     owner: root
     group: root
     mode: 0644
-  when: atl_aws_enable_cw is defined and atl_aws_enable_cw
+  when: atl_aws_enable_cloudwatch is defined and atl_aws_enable_cloudwatch
   notify:
     - Restart CloudWatch Agent
diff --git a/roles/aws_common/templates/amazon-cloudwatch-agent.json.j2 b/roles/aws_common/templates/amazon-cloudwatch-agent.json.j2
index d3a63da..17b31ca 100644
--- a/roles/aws_common/templates/amazon-cloudwatch-agent.json.j2
+++ b/roles/aws_common/templates/amazon-cloudwatch-agent.json.j2
@@ -4,7 +4,7 @@
     "run_as_user": "root"
   },
 
-  {% if atl_aws_enable_cw_logs is defined and atl_aws_enable_cw_logs %}
+  {% if atl_aws_enable_cloudwatch_logs is defined and atl_aws_enable_cloudwatch_logs %}
     "logs": {
       "logs_collected": {
         "files": {