From 19f2a3831753083c0877574c8523924e179fcf09 Mon Sep 17 00:00:00 2001
From: rmatsuoka <76464810+rmatsuoka@users.noreply.github.com>
Date: Tue, 12 Dec 2023 20:56:31 +0900
Subject: [PATCH] remove amznlinux v1 and support for 2023

---
 files/amazonlinux-mackerel-2023.repo |  5 +++++
 files/amazonlinux-mackerel.repo      |  5 -----
 tasks/amazonlinux.yml                | 24 +++++++++---------------
 3 files changed, 14 insertions(+), 20 deletions(-)
 create mode 100644 files/amazonlinux-mackerel-2023.repo
 delete mode 100644 files/amazonlinux-mackerel.repo

diff --git a/files/amazonlinux-mackerel-2023.repo b/files/amazonlinux-mackerel-2023.repo
new file mode 100644
index 0000000..33c0ddb
--- /dev/null
+++ b/files/amazonlinux-mackerel-2023.repo
@@ -0,0 +1,5 @@
+[mackerel]
+name=mackerel-agent
+baseurl=http://yum.mackerel.io/amznlinux/v2/2023/$basearch
+gpgcheck=1
+enabled=1
diff --git a/files/amazonlinux-mackerel.repo b/files/amazonlinux-mackerel.repo
deleted file mode 100644
index b42d18c..0000000
--- a/files/amazonlinux-mackerel.repo
+++ /dev/null
@@ -1,5 +0,0 @@
-[mackerel]
-name=mackerel-agent
-baseurl=http://yum.mackerel.io/amznlinux/$releasever/$basearch
-gpgcheck=1
-enabled=1
diff --git a/tasks/amazonlinux.yml b/tasks/amazonlinux.yml
index 1b518ed..fe1caea 100644
--- a/tasks/amazonlinux.yml
+++ b/tasks/amazonlinux.yml
@@ -1,38 +1,32 @@
 ---
-- name: check amazon linux 2
-  shell: LANG=C yum info installed system-release | awk '/^Release/ { print $3 }' | grep -q 'amzn2'
+- name: check amazon linux 2023
+  shell: LANG=C yum info installed system-release | awk '/^Release/ { print $3 }' | grep -q 'amzn2023'
   ignore_errors: True
-  register: check_al2
+  register: check_al2023
   check_mode: no
   changed_when: no
 
-- name: import mackerel GPG key
-  rpm_key:
-    key: https://mackerel.io/file/cert/GPG-KEY-mackerel
-  when: check_al2.rc != 0
-
 - name: import mackerel GPG key v2
   rpm_key:
     key: https://mackerel.io/file/cert/GPG-KEY-mackerel-v2
-  when: check_al2.rc == 0
 
-- name: add repository 'mackerel'
+- name: add repository 'mackerel' v2
   copy:
-    src: amazonlinux-mackerel.repo
+    src: amazonlinux-mackerel-v2.repo
     dest: /etc/yum.repos.d/mackerel.repo
     owner: root
     group: root
     mode: 0644
-  when: check_al2.rc != 0
+  when: check_al2023.rc != 0
 
-- name: add repository 'mackerel' v2
+- name: add repository 'mackerel' v2023
   copy:
-    src: amazonlinux-mackerel-v2.repo
+    src: amazonlinux-mackerel-2023.repo
     dest: /etc/yum.repos.d/mackerel.repo
     owner: root
     group: root
     mode: 0644
-  when: check_al2.rc == 0
+  when: check_al2023.rc == 0
 
 - name: install mackerel-agent
   yum: