From ad92c4399d853b383a07a85c1f17853f7659ba70 Mon Sep 17 00:00:00 2001 From: Norimasa Mikami Date: Fri, 20 Oct 2023 04:18:43 -0400 Subject: [PATCH 1/3] Add miracle to check_os.py --- AzureMonitorAgent/ama_tst/modules/install/check_os.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/AzureMonitorAgent/ama_tst/modules/install/check_os.py b/AzureMonitorAgent/ama_tst/modules/install/check_os.py index c4053056f..f7a7805e8 100644 --- a/AzureMonitorAgent/ama_tst/modules/install/check_os.py +++ b/AzureMonitorAgent/ama_tst/modules/install/check_os.py @@ -17,7 +17,8 @@ 'rocky' : ['8'], # Rocky 'alma' : ['8'], # Alma 'opensuse' : ['15'], # openSUSE - 'amzn' : ['2'] # Amazon Linux 2 + 'amzn' : ['2'], # Amazon Linux 2 + 'miracle' : ['8', '9'] # MIRACLE LINUX } supported_dists_aarch64 = {'red hat' : ['8'], # Rhel @@ -107,4 +108,4 @@ def check_os(): return ERR_FINDING_OS # check if OS version is supported - return check_vm_supported(vm_dist, vm_ver) \ No newline at end of file + return check_vm_supported(vm_dist, vm_ver) From 138908bad298744d946a7b18b3c28ffd91ee9626 Mon Sep 17 00:00:00 2001 From: Norimasa Mikami Date: Fri, 20 Oct 2023 04:20:24 -0400 Subject: [PATCH 2/3] Add miracle to agent.py --- AzureMonitorAgent/agent.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/AzureMonitorAgent/agent.py b/AzureMonitorAgent/agent.py index 0852a15a9..cf6219189 100644 --- a/AzureMonitorAgent/agent.py +++ b/AzureMonitorAgent/agent.py @@ -1454,7 +1454,7 @@ def find_package_manager(operation): dist, _ = find_vm_distro(operation) dpkg_set = set(["debian", "ubuntu"]) - rpm_set = set(["oracle", "ol", "redhat", "centos", "red hat", "suse", "sles", "opensuse", "cbl-mariner", "mariner", "rhel", "rocky", "alma", "amzn"]) + rpm_set = set(["oracle", "ol", "redhat", "centos", "red hat", "suse", "sles", "opensuse", "cbl-mariner", "mariner", "rhel", "rocky", "alma", "amzn", "miracle"]) for dpkg_dist in dpkg_set: if dist.startswith(dpkg_dist): PackageManager = "dpkg" @@ -1541,7 +1541,8 @@ def is_vm_supported_for_extension(operation): 'rocky' : ['8', '9'], # Rocky 'alma' : ['8', '9'], # Alma 'opensuse' : ['15'], # openSUSE - 'amzn' : ['2'] # Amazon Linux 2 + 'amzn' : ['2'], # Amazon Linux 2 + 'miracle' : ['8', '9'] # MIRACLE LINUX } supported_dists_aarch64 = {'red hat' : ['8'], # Rhel @@ -1619,7 +1620,7 @@ def get_ssl_cert_info(operation): if distro.startswith(name): return 'SSL_CERT_DIR', '/etc/ssl/certs' - for name in ['centos', 'redhat', 'red hat', 'oracle', 'ol', 'cbl-mariner', 'mariner', 'rhel', 'rocky', 'alma', 'amzn']: + for name in ['centos', 'redhat', 'red hat', 'oracle', 'ol', 'cbl-mariner', 'mariner', 'rhel', 'rocky', 'alma', 'amzn', 'miracle']: if distro.startswith(name): return 'SSL_CERT_FILE', '/etc/pki/tls/certs/ca-bundle.crt' From 9ddd4bd1bdcf0796eddec030362c64b0c6a16df0 Mon Sep 17 00:00:00 2001 From: Norimasa Mikami Date: Mon, 23 Oct 2023 00:45:29 -0400 Subject: [PATCH 3/3] Correct the new line of last --- AzureMonitorAgent/ama_tst/modules/install/check_os.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AzureMonitorAgent/ama_tst/modules/install/check_os.py b/AzureMonitorAgent/ama_tst/modules/install/check_os.py index f7a7805e8..c18613cde 100644 --- a/AzureMonitorAgent/ama_tst/modules/install/check_os.py +++ b/AzureMonitorAgent/ama_tst/modules/install/check_os.py @@ -108,4 +108,4 @@ def check_os(): return ERR_FINDING_OS # check if OS version is supported - return check_vm_supported(vm_dist, vm_ver) + return check_vm_supported(vm_dist, vm_ver) \ No newline at end of file