From 1e1b3fa095caa48a4b6e566c8a055e33d9bfe5aa Mon Sep 17 00:00:00 2001
From: Yuichi Satake <yuichi.satake@naviplus.co.jp>
Date: Fri, 12 Apr 2024 08:54:28 +0900
Subject: [PATCH 1/4] Modify for Amazon Linux 2023

---
 files/amazonlinux-mackerel-v2-2023.repo |  5 +++
 files/amazonlinux2023.yml               | 55 +++++++++++++++++++++++++
 files/main.yml                          | 37 +++++++++++++++++
 3 files changed, 97 insertions(+)
 create mode 100644 files/amazonlinux-mackerel-v2-2023.repo
 create mode 100644 files/amazonlinux2023.yml
 create mode 100644 files/main.yml

diff --git a/files/amazonlinux-mackerel-v2-2023.repo b/files/amazonlinux-mackerel-v2-2023.repo
new file mode 100644
index 0000000..33c0ddb
--- /dev/null
+++ b/files/amazonlinux-mackerel-v2-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/amazonlinux2023.yml b/files/amazonlinux2023.yml
new file mode 100644
index 0000000..d5da604
--- /dev/null
+++ b/files/amazonlinux2023.yml
@@ -0,0 +1,55 @@
+---
+- name: import mackerel GPG key
+  rpm_key:
+    key: https://mackerel.io/file/cert/GPG-KEY-mackerel
+
+- name: import mackerel GPG key v2
+  rpm_key:
+    key: https://mackerel.io/file/cert/GPG-KEY-mackerel-v2
+
+- name: add repository 'mackerel'
+  copy:
+    src: amazonlinux-mackerel.repo
+    dest: /etc/yum.repos.d/mackerel.repo
+    owner: root
+    group: root
+    mode: 0644
+
+- name: add repository 'mackerel' v2 al2023
+  copy:
+    src: amazonlinux-mackerel-v2-2023.repo
+    dest: /etc/yum.repos.d/mackerel.repo
+    owner: root
+    group: root
+    mode: 0644
+
+- name: install mackerel-agent
+  dnf:
+    name: mackerel-agent
+    state: latest
+  ignore_errors: "{{ ansible_check_mode }}"
+
+- name: install mackerel-agent-plugins
+  dnf:
+    name: mackerel-agent-plugins
+    state: latest
+  when: mackerel_use_plugins
+  ignore_errors: "{{ ansible_check_mode }}"
+  notify:
+    - restart mackerel-agent
+
+- name: install mackerel-check-plugins
+  dnf:
+    name: mackerel-check-plugins
+    state: latest
+  when: mackerel_use_plugins
+  ignore_errors: "{{ ansible_check_mode }}"
+  notify:
+    - restart mackerel-agent
+
+- name: install mkr
+  dnf:
+    name: mkr
+    state: latest
+  when: mackerel_install_mkr
+  ignore_errors: "{{ ansible_check_mode }}"
diff --git a/files/main.yml b/files/main.yml
new file mode 100644
index 0000000..13ca6d7
--- /dev/null
+++ b/files/main.yml
@@ -0,0 +1,37 @@
+---
+- include: debian.yml
+  when: ansible_distribution == "Debian" or ansible_distribution == "Ubuntu"
+
+- include: centos.yml
+  when: ansible_os_family == "RedHat" and ansible_distribution != "Amazon"
+
+- include: amazonlinux.yml
+  when: ansible_distribution == "Amazon" and ansible_distribution_major_version == "2"
+
+- include: amazonlinux2023.yml
+  when: ansible_distribution == "Amazon" and ansible_distribution_major_version == "2023"
+
+- name: check config directory
+  stat:
+    path: "{{ prefix_dir }}/etc/mackerel-agent"
+  register: config_directory
+
+- name: create config directory
+  file:
+    path: "{{ prefix_dir }}/etc/mackerel-agent"
+    state: directory
+    mode: 0755
+  when: config_directory.stat.exists == false
+
+- name: update config
+  template:
+    src: mackerel-agent.conf.j2
+    dest: "{{ prefix_dir }}/etc/mackerel-agent/mackerel-agent.conf"
+  notify: restart mackerel-agent
+
+- name: start mackerel-agent
+  service:
+    name: mackerel-agent
+    state: started
+  when: mackerel_agent_start_on_setup
+  ignore_errors: "{{ ansible_check_mode }}"

From 6b4f7afa6cb4b6c78b4dbdd028e4f173b0d062a3 Mon Sep 17 00:00:00 2001
From: Yuichi Satake <yuichi.satake@naviplus.co.jp>
Date: Mon, 15 Apr 2024 08:27:21 +0900
Subject: [PATCH 2/4] fix bug

---
 ...3.repo => amazonlinux-mackerel-v2023.repo} |  0
 files/main.yml                                | 37 -------------------
 {files => tasks}/amazonlinux2023.yml          | 12 +-----
 tasks/main.yml                                | 11 ++++--
 4 files changed, 9 insertions(+), 51 deletions(-)
 rename files/{amazonlinux-mackerel-v2-2023.repo => amazonlinux-mackerel-v2023.repo} (100%)
 delete mode 100644 files/main.yml
 rename {files => tasks}/amazonlinux2023.yml (79%)

diff --git a/files/amazonlinux-mackerel-v2-2023.repo b/files/amazonlinux-mackerel-v2023.repo
similarity index 100%
rename from files/amazonlinux-mackerel-v2-2023.repo
rename to files/amazonlinux-mackerel-v2023.repo
diff --git a/files/main.yml b/files/main.yml
deleted file mode 100644
index 13ca6d7..0000000
--- a/files/main.yml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-- include: debian.yml
-  when: ansible_distribution == "Debian" or ansible_distribution == "Ubuntu"
-
-- include: centos.yml
-  when: ansible_os_family == "RedHat" and ansible_distribution != "Amazon"
-
-- include: amazonlinux.yml
-  when: ansible_distribution == "Amazon" and ansible_distribution_major_version == "2"
-
-- include: amazonlinux2023.yml
-  when: ansible_distribution == "Amazon" and ansible_distribution_major_version == "2023"
-
-- name: check config directory
-  stat:
-    path: "{{ prefix_dir }}/etc/mackerel-agent"
-  register: config_directory
-
-- name: create config directory
-  file:
-    path: "{{ prefix_dir }}/etc/mackerel-agent"
-    state: directory
-    mode: 0755
-  when: config_directory.stat.exists == false
-
-- name: update config
-  template:
-    src: mackerel-agent.conf.j2
-    dest: "{{ prefix_dir }}/etc/mackerel-agent/mackerel-agent.conf"
-  notify: restart mackerel-agent
-
-- name: start mackerel-agent
-  service:
-    name: mackerel-agent
-    state: started
-  when: mackerel_agent_start_on_setup
-  ignore_errors: "{{ ansible_check_mode }}"
diff --git a/files/amazonlinux2023.yml b/tasks/amazonlinux2023.yml
similarity index 79%
rename from files/amazonlinux2023.yml
rename to tasks/amazonlinux2023.yml
index d5da604..eb4ef75 100644
--- a/files/amazonlinux2023.yml
+++ b/tasks/amazonlinux2023.yml
@@ -7,17 +7,9 @@
   rpm_key:
     key: https://mackerel.io/file/cert/GPG-KEY-mackerel-v2
 
-- name: add repository 'mackerel'
+- name: add repository 'mackerel' v2023
   copy:
-    src: amazonlinux-mackerel.repo
-    dest: /etc/yum.repos.d/mackerel.repo
-    owner: root
-    group: root
-    mode: 0644
-
-- name: add repository 'mackerel' v2 al2023
-  copy:
-    src: amazonlinux-mackerel-v2-2023.repo
+    src: amazonlinux-mackerel-v2023.repo
     dest: /etc/yum.repos.d/mackerel.repo
     owner: root
     group: root
diff --git a/tasks/main.yml b/tasks/main.yml
index 8d81356..13ca6d7 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,12 +1,15 @@
 ---
-- include_tasks: debian.yml
+- include: debian.yml
   when: ansible_distribution == "Debian" or ansible_distribution == "Ubuntu"
 
-- include_tasks: centos.yml
+- include: centos.yml
   when: ansible_os_family == "RedHat" and ansible_distribution != "Amazon"
 
-- include_tasks: amazonlinux.yml
-  when: ansible_distribution == "Amazon"
+- include: amazonlinux.yml
+  when: ansible_distribution == "Amazon" and ansible_distribution_major_version == "2"
+
+- include: amazonlinux2023.yml
+  when: ansible_distribution == "Amazon" and ansible_distribution_major_version == "2023"
 
 - name: check config directory
   stat:

From 646cda9ddbf262df6e0029865b3f3cb214e2b520 Mon Sep 17 00:00:00 2001
From: Yuichi Satake <yuichi.satake@naviplus.co.jp>
Date: Mon, 15 Apr 2024 08:31:29 +0900
Subject: [PATCH 3/4] modify include tasks

---
 tasks/main.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index 13ca6d7..7217697 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,14 +1,14 @@
 ---
-- include: debian.yml
+- include_tasks: debian.yml
   when: ansible_distribution == "Debian" or ansible_distribution == "Ubuntu"
 
-- include: centos.yml
+- include_tasks: centos.yml
   when: ansible_os_family == "RedHat" and ansible_distribution != "Amazon"
 
-- include: amazonlinux.yml
+- include_tasks: amazonlinux.yml
   when: ansible_distribution == "Amazon" and ansible_distribution_major_version == "2"
 
-- include: amazonlinux2023.yml
+- include_tasks: amazonlinux2023.yml
   when: ansible_distribution == "Amazon" and ansible_distribution_major_version == "2023"
 
 - name: check config directory

From 82c6482773df76d27c7a0da102eb7259d95ad25a Mon Sep 17 00:00:00 2001
From: Yuichi Satake <yuichi.satake@naviplus.co.jp>
Date: Fri, 19 Apr 2024 07:56:45 +0900
Subject: [PATCH 4/4] mofifiy repo name

---
 files/amazonlinux-mackerel-v2023.repo | 5 -----
 tasks/amazonlinux2023.yml             | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 files/amazonlinux-mackerel-v2023.repo

diff --git a/files/amazonlinux-mackerel-v2023.repo b/files/amazonlinux-mackerel-v2023.repo
deleted file mode 100644
index 33c0ddb..0000000
--- a/files/amazonlinux-mackerel-v2023.repo
+++ /dev/null
@@ -1,5 +0,0 @@
-[mackerel]
-name=mackerel-agent
-baseurl=http://yum.mackerel.io/amznlinux/v2/2023/$basearch
-gpgcheck=1
-enabled=1
diff --git a/tasks/amazonlinux2023.yml b/tasks/amazonlinux2023.yml
index eb4ef75..da01e90 100644
--- a/tasks/amazonlinux2023.yml
+++ b/tasks/amazonlinux2023.yml
@@ -9,7 +9,7 @@
 
 - name: add repository 'mackerel' v2023
   copy:
-    src: amazonlinux-mackerel-v2023.repo
+    src: amazonlinux-mackerel-2023.repo
     dest: /etc/yum.repos.d/mackerel.repo
     owner: root
     group: root