Merge branch 'master' into arisettisanjana-patch-1

Author: arisettisanjana

AzureMonitorAgent/agent.py

@@ -2,7 +2,7 @@
 
 COMMAND="./modules/main.py"
 PYTHON=""
-TST_VERSION="1.4"  # update when changes are made to TST
+TST_VERSION="1.6"  # update when changes are made to TST
 ARG="$@"
 
 display_help() {

AzureMonitorAgent/ama_tst/ama_troubleshooter.sh

@@ -1,4 +1,5 @@
 import subprocess
+import traceback
 
 from error_codes import *
 from errors      import error_info
@@ -14,6 +15,25 @@
 ME_REGION_URL = "{0}.monitoring.azure.com"
 
 
+def _log_ssl_error(context, exception, show_traceback=True):
+    """Helper function to log SSL errors cleanly"""
+    print("{0}:".format(context))
+    print("  Type: {0}".format(type(exception).__name__))
+    print("  Message: {0}".format(str(exception)))
+    
+    # For CalledProcessError, show command details
+    if isinstance(exception, subprocess.CalledProcessError):
+        print("  Command: {0}".format(getattr(exception, 'cmd', 'Unknown')))
+        print("  Return code: {0}".format(getattr(exception, 'returncode', 'Unknown')))
+        if hasattr(exception, 'output') and exception.output:
+            print("  Output: {0}".format(exception.output.strip()))
+    
+    # Show traceback if requested
+    if show_traceback:
+        print("  Traceback:")
+        print(traceback.format_exc())
+
+
 def check_endpt_ssl(ssl_cmd, endpoint):
     """
     openssl connect to specific endpoint
@@ -32,9 +52,31 @@ def check_endpt_ssl(ssl_cmd, endpoint):
                 verified = True
                 continue
 
+        # If connection established but no explicit verification status in brief mode,
+        # try a verification check to determine if SSL cert is valid
+        if connected and not verified:
+            try:
+                # Use verify_return_error flag to test certificate verification
+                verify_cmd = ssl_cmd.replace('-brief', '-verify_return_error -brief')
+                verify_output = subprocess.check_output(verify_cmd.format(endpoint), shell=True,\
+                               stderr=subprocess.STDOUT, universal_newlines=True)
+                # If verify command succeeds (no exception), verification is OK
+                if "CONNECTION ESTABLISHED" in verify_output:
+                    verified = True
+            except subprocess.CalledProcessError as e:
+                # Verification failed - certificate issues
+                _log_ssl_error("SSL verification failed", e, show_traceback=False)
+                verified = False
+            except Exception as e:
+                # Other error - assume verified if basic connection worked
+                # This handles cases where verify_return_error isn't supported
+                _log_ssl_error("SSL verification exception", e, show_traceback=True)
+                verified = False
+
         return (connected, verified, ssl_output)
     except Exception as e:
-        return (False, False, e)
+        _log_ssl_error("SSL connection failed", e, show_traceback=True)
+        return (False, False, str(e))
 
 
 def check_internet_connect():

AzureMonitorAgent/ama_tst/ama_tst.tgz

@@ -29,7 +29,7 @@ def check_parameters():
     return NO_ERROR
 
 def check_workspace():
-    wkspc_id, wkspc_region, e = find_dcr_workspace()
+    wkspc_id, wkspc_region, agent_settings, e = find_dcr_workspace()
     if e != None:
         error_info.append((e,))
         return ERR_NO_DCR 

AzureMonitorAgent/ama_tst/modules/connect/check_endpts.py

@@ -11,7 +11,11 @@ def check_customlog_input():
     if (cl_input == None or len(cl_input) == 0):
         error_info.append(("No custom logs file path",))
         return ERR_CL_INPUT
+    # cl_input is a list, not a dictionary - iterate over the paths directly
     for path in cl_input:
+        # Skip malformed entries that don't look like valid file paths
+        if not path or not path.startswith('/'):
+            continue
         try: 
             check_path = run_cmd_output('ls {0}'.format(path)).strip()
             if check_path.endswith('No such file or directory'):
@@ -42,11 +46,20 @@ def check_customlog_conf():
                     cl_log_file = cl_line.strip().split('log_file')[1]
                     general_info['CL_LOG'] =  cl_log_file
 
-                if (cl_line.strip().startswith('Path')):
-                    cl_input_path = cl_line.strip().split('Path')[1].strip()
-                    general_info['CL_INPUT'].append(cl_input_path)
+                # Only match exact "Path" lines (not "Path_Key" or other variants)
+                if (cl_line.strip().startswith('Path ') or cl_line.strip().startswith('Path\t')):
+                    # Extract the path value after the whitespace
+                    parts = cl_line.strip().split(None, 1)  # Split on any whitespace, max 1 split
+                    if len(parts) > 1:
+                        cl_input_path = parts[1].strip()
+                        # Only add valid file paths (should start with /)
+                        if cl_input_path.startswith('/'):
+                            general_info['CL_INPUT'].append(cl_input_path)
+
     except Exception as e:
         error_info.append((e,))
         return ERR_CL_CONF
-    
+
+    print('cl_input value: {0}'.format(general_info['CL_INPUT']))
+
     return NO_ERROR

AzureMonitorAgent/ama_tst/modules/connect/connect.py

@@ -19,6 +19,13 @@
 except NameError:
     FileNotFoundError = IOError
 
+# backwards compatible JSONDecodeError for Python 2 vs 3
+try:
+    json.JSONDecodeError
+except AttributeError:
+    # Python 2 doesn't have json.JSONDecodeError, use ValueError instead
+    json.JSONDecodeError = ValueError
+
 # backwards compatible devnull variable for Python 3.3 vs earlier
 try:
     DEVNULL = subprocess.DEVNULL
@@ -220,19 +227,45 @@ def run_cmd_output(cmd):
 
 
 def find_dcr_workspace():
+    """
+    Parse DCR configuration files to find workspace IDs and regions.
+    """
     global general_info
 
     if 'DCR_WORKSPACE_ID' in general_info and 'DCR_REGION' in general_info:
         return (general_info['DCR_WORKSPACE_ID'], general_info['DCR_REGION'], None)
     dcr_workspace = set()
     dcr_region = set()
     me_region = set()
+    agent_settings = {}
     general_info['URL_SUFFIX'] = '.com'
     try:
         for file in os.listdir(CONFIG_DIR):
             file_path = CONFIG_DIR + "/" + file
             with open(file_path) as f:
                 result = json.load(f)
+                
+                # Check if this is an AgentSettings DCR - parse its settings
+                if 'kind' in result and result['kind'] == 'AgentSettings' and 'channels' not in result:
+                    if 'settings' in result:
+                        settings_str = result['settings']
+                        try:
+                            # The settings field is a JSON string, so parse it
+                            if isinstance(settings_str, str):
+                                settings_list = json.loads(settings_str)
+                            else:
+                                settings_list = settings_str
+                            
+                            # Process each setting
+                            for setting in settings_list:
+                                name = setting['name']
+                                value = setting['value']
+                                if name:
+                                    agent_settings[name] = value
+                        except (json.JSONDecodeError, TypeError) as e:
+                            # If parsing fails, skip this AgentSettings DCR
+                            print("Error parsing settings key in AgentSettings DCR")
+                    continue
                 channels = result['channels']
                 for channel in channels:
                     if channel['protocol'] == 'ods':
@@ -255,14 +288,17 @@ def find_dcr_workspace():
                         region = endpoint_url.split('https://')[1].split('.monitoring')[0]
                         me_region.add(region)
     except Exception as e:
-        return (None, None, e)
+        return (None, None, None, e)
 
     general_info['DCR_WORKSPACE_ID'] = dcr_workspace
     general_info['DCR_REGION'] = dcr_region
     general_info['ME_REGION'] = me_region
-    return (dcr_workspace, dcr_region, None)
+    return (dcr_workspace, dcr_region, agent_settings, None)
 
 def find_dce():
+    """
+    Parse DCR configuration files to find Data Collection Endpoints (DCE).
+    """
     global general_info
 
     dce = set()
@@ -271,6 +307,9 @@ def find_dce():
             file_path = CONFIG_DIR + "/" + file
             with open(file_path) as f:
                 result = json.load(f)
+                # Check if this is an AgentSettings DCR, if so skip it
+                if 'kind' in result and result['kind'] == 'AgentSettings' and 'channels' not in result:
+                    continue
                 channels = result['channels']
                 for channel in channels:
                     if channel['protocol'] == 'gig':

AzureMonitorAgent/ama_tst/modules/custom_logs/check_clconf.py

@@ -199,7 +199,7 @@ def check_ama(interactive):
     if newer_ama_version is None:
         if e is None:
             # No error and no newer version found - current version is up to date
-            print("✓ AMA version is up to date (latest version)")
+            print("AMA version is up to date (latest version)")
             return NO_ERROR
         else:
             # There was an error fetching the latest version

AzureMonitorAgent/ama_tst/modules/helpers.py

@@ -1,8 +1,9 @@
+from __future__ import absolute_import
 import platform
 from error_codes import *
 from errors      import error_info
 from helpers     import find_vm_bits, find_vm_distro
-import install.supported_distros as supported_distros
+from . import supported_distros
 
 
 def format_alternate_versions(supported_dist, versions):

AzureMonitorAgent/ama_tst/modules/install/check_ama.py

@@ -1,7 +1,5 @@
-supported_dists_x86_64 = {'redhat' : ['7', '8', '9'], # Rhel
-                       'rhel' : ['7', '8', '9'], # Rhel
+supported_dists_x86_64 = {'redhat' : ['7', '8', '9', '10'], # Rhel
                        'centos' : ['7', '8'], # CentOS
-                       'red hat' : ['7', '8', '9'], # Oracle, RHEL
                        'oracle' : ['7', '8', '9'], # Oracle
                        'ol' : ['7', '8', '9'], # Oracle Linux
                        'debian' : ['9', '10', '11', '12'], # Debian
@@ -15,8 +13,7 @@
                        'amzn' : ['2', '2023'] # Amazon Linux 2
 }
 
-supported_dists_aarch64 = {'red hat' : ['8'], # Rhel
-                    'redhat' : ['8'], # Rhel
+supported_dists_aarch64 = {'redhat' : ['8', '9', '10'], # Rhel
                     'ubuntu' : ['18.04', '20.04', '22.04', '24.04'], # Ubuntu
                     'alma' : ['8'], # Alma
                     'centos' : ['7'], # CentOS