From 70fb0fbd32c9e96425cd2228c173206bc1c6989c Mon Sep 17 00:00:00 2001
From: Lee Goolsbee <lgoolsbee@atlassian.com>
Date: Thu, 15 Dec 2022 15:19:33 -0600
Subject: [PATCH] install amazon-cloudwatch-agent from package sources instead
 of direct RPM on AL2022; add workaround for missing group

---
 roles/aws_common/tasks/amazon-2022.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/roles/aws_common/tasks/amazon-2022.yml b/roles/aws_common/tasks/amazon-2022.yml
index d2e88cc..21d868a 100644
--- a/roles/aws_common/tasks/amazon-2022.yml
+++ b/roles/aws_common/tasks/amazon-2022.yml
@@ -9,10 +9,17 @@
       - git
       - ec2-utils
 
+# https://github.com/amazonlinux/amazon-linux-2022/issues/164
+- name: Ensure group "aoc" exists
+  ansible.builtin.group:
+    name: aoc
+    state: present
+  when: atl_aws_enable_cloudwatch is defined and atl_aws_enable_cloudwatch | bool
+
 - name: Install CloudWatch Agent
   ansible.builtin.dnf:
     name:
-      - "{{ aws_cloudwatch_agent_rpm }}"
+      - amazon-cloudwatch-agent
   when: atl_aws_enable_cloudwatch is defined and atl_aws_enable_cloudwatch | bool
   notify:
     - Enable CloudWatch Agent