Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add to support MIRACLE LINUX for Azure Monitor Agent #1826

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions AzureMonitorAgent/agent.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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'

Expand Down
3 changes: 2 additions & 1 deletion AzureMonitorAgent/ama_tst/modules/install/check_os.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down