From b3e8952ef7cc9203bace9f649690e2a404a82693 Mon Sep 17 00:00:00 2001
From: voorepreethi <pvoore@newrelic.com>
Date: Fri, 6 Sep 2024 15:16:50 +0530
Subject: [PATCH] feat(logs): Provision for amazon linux 2023 aarch64 arch
 (#1108)

* provision for amazon linux 2023 aarch64 arch

* Update amazonlinux-2023.json

* PR changes for al2023 amr64

* Changing ami size for al2023 arm64

* platform version changed for al2023 for super agent

* changed ami size for al2023 arm64

---------

Co-authored-by: voorepreethi <pvoore.newrelic.com>
Co-authored-by: Rajeev Kumar <rkallempudi@newrelic.com>
---
 .../infrastructure/logs/linux-logs.yml        |  5 +++
 .../super-agent/logs/linux-logs.yml           |  7 +++-
 .../logging/amazonlinux2023-arm64-logs.json   | 37 ++++++++++++++++++
 ...zonlinux2023-aarch64-super-agent-logs.json | 39 +++++++++++++++++++
 ...amazonlinux2023-x86-super-agent-logs.json} |  0
 5 files changed, 87 insertions(+), 1 deletion(-)
 create mode 100644 test/definitions/logging/amazonlinux2023-arm64-logs.json
 create mode 100644 test/definitions/super-agent/logs/amazonlinux2023-aarch64-super-agent-logs.json
 rename test/definitions/super-agent/logs/{amazonlinux2023-super-agent-logs.json => amazonlinux2023-x86-super-agent-logs.json} (100%)

diff --git a/recipes/newrelic/infrastructure/logs/linux-logs.yml b/recipes/newrelic/infrastructure/logs/linux-logs.yml
index bba97fdf..6cd45a66 100644
--- a/recipes/newrelic/infrastructure/logs/linux-logs.yml
+++ b/recipes/newrelic/infrastructure/logs/linux-logs.yml
@@ -81,6 +81,11 @@ installTargets:
     platformFamily: rhel
     platformVersion: "((7|8)\\.?.*)"
     kernelArch: aarch64
+  - type: host
+    os: linux
+    platform: amazon
+    platformVersion: "(2023\\.*)"
+    kernelArch: aarch64    
 
 keywords:
   - Logs
diff --git a/recipes/newrelic/infrastructure/super-agent/logs/linux-logs.yml b/recipes/newrelic/infrastructure/super-agent/logs/linux-logs.yml
index 683d8cad..2ecfc142 100644
--- a/recipes/newrelic/infrastructure/super-agent/logs/linux-logs.yml
+++ b/recipes/newrelic/infrastructure/super-agent/logs/linux-logs.yml
@@ -20,7 +20,7 @@ installTargets:
   - type: host
     os: linux
     platform: amazon
-    platformVersion: "2023"
+    platformVersion: "(2023\\.*)"
     kernelArch: x86_64
   - type: host
     os: linux
@@ -68,6 +68,11 @@ installTargets:
     platformFamily: rhel
     platformVersion: "((7|8)\\.?.*)"
     kernelArch: aarch64
+  - type: host
+    os: linux
+    platform: amazon
+    platformVersion: "(2023\\.*)"
+    kernelArch: aarch64        
   # Fluent Bit supported is not available for Suse aarch64  
   # - type: host
   #   os: linux
diff --git a/test/definitions/logging/amazonlinux2023-arm64-logs.json b/test/definitions/logging/amazonlinux2023-arm64-logs.json
new file mode 100644
index 00000000..998097e2
--- /dev/null
+++ b/test/definitions/logging/amazonlinux2023-arm64-logs.json
@@ -0,0 +1,37 @@
+{
+    "global_tags": {
+      "owning_team": "virtuoso",
+      "Environment": "development",
+      "Department": "product",
+      "Product": "virtuoso"
+    },
+  
+    "resources": [
+      {
+        "id": "host1",
+        "provider": "aws",
+        "type": "ec2",
+        "size": "t4g.nano",
+        "ami_name": "al2023-ami-2023.*-arm64",
+        "user_name": "ec2-user"
+      }
+    ],
+  
+    "instrumentations": {
+      "resources": [
+        {
+          "id": "nr_logs_amazonlinux2023",
+          "resource_ids": ["host1"],
+          "provider": "newrelic",
+          "source_repository": "https://github.com/newrelic/open-install-library",
+          "deploy_script_path": "test/deploy/linux/newrelic-cli/install/roles",
+          "params": {
+            "newrelic_cli_option": "-n logs-integration",
+            "validate_output": "Logs Integration\\s+\\(installed\\)",
+            "local_recipes": true
+          }
+        }
+      ]
+    }
+  }
+  
\ No newline at end of file
diff --git a/test/definitions/super-agent/logs/amazonlinux2023-aarch64-super-agent-logs.json b/test/definitions/super-agent/logs/amazonlinux2023-aarch64-super-agent-logs.json
new file mode 100644
index 00000000..a98094f3
--- /dev/null
+++ b/test/definitions/super-agent/logs/amazonlinux2023-aarch64-super-agent-logs.json
@@ -0,0 +1,39 @@
+{
+    "global_tags": {
+      "owning_team": "virtuoso",
+      "Environment": "development",
+      "Department": "product",
+      "Product": "virtuoso"
+    },
+  
+    "resources": [
+      {
+        "id": "host1",
+        "provider": "aws",
+        "type": "ec2",
+        "size": "t4g.nano",
+        "ami_name": "al2023-ami-2023.*-arm64",
+        "user_name": "ec2-user"
+      }
+    ],
+  
+    "instrumentations": {
+      "resources": [
+        {
+          "id": "nr_super_agent_logs",
+          "resource_ids": ["host1"],
+          "provider": "newrelic",
+          "source_repository": "https://github.com/newrelic/open-install-library",
+          "deploy_script_path": "test/deploy/linux/newrelic-cli/install/roles",
+          "params": {
+            "env_var": "NEW_RELIC_CLI_SKIP_CORE=1",
+            "newrelic_cli_option": "-n super-agent,logs-integration-super-agent",
+            "validate_output": "Logs Integration\\s+\\(installed\\)",
+            "local_recipes": true,
+            "use_organization_id": true
+          }
+        }
+      ]
+    }
+  }
+  
\ No newline at end of file
diff --git a/test/definitions/super-agent/logs/amazonlinux2023-super-agent-logs.json b/test/definitions/super-agent/logs/amazonlinux2023-x86-super-agent-logs.json
similarity index 100%
rename from test/definitions/super-agent/logs/amazonlinux2023-super-agent-logs.json
rename to test/definitions/super-agent/logs/amazonlinux2023-x86-super-agent-logs.json