From b11e497c2705f36d925f4b2218f776e3c815e0e4 Mon Sep 17 00:00:00 2001
From: Devansh Jain <86314060+devanshjainms@users.noreply.github.com>
Date: Mon, 13 Oct 2025 21:29:15 -0700
Subject: [PATCH 01/12] Add SAP Configuration Checks to STAF

---
 .ansible-lint                                 |    1 +
 docs/HIGH_AVAILABILITY.md                     |    2 +-
 requirements.in                               |    1 +
 requirements.txt                              |   85 +-
 scripts/sap_automation_qa.sh                  |   24 +-
 src/module_utils/collector.py                 |  478 ++++++
 src/module_utils/commands.py                  |    5 +
 src/module_utils/enums.py                     |  166 +-
 src/module_utils/filesystem_collector.py      |  948 ++++++++++
 src/module_utils/sap_automation_qa.py         |   45 +-
 src/modules/configuration_check_module.py     |  972 +++++++++++
 src/modules/get_azure_lb.py                   |   12 +-
 src/modules/render_html_report.py             |   25 +-
 src/playbook_00_configuration_checks.yml      |  380 ++++
 src/playbook_00_ha_db_functional_tests.yml    |    4 +-
 src/playbook_00_ha_scs_functional_tests.yml   |    4 +-
 src/playbook_01_ha_offline_tests.yml          |    6 +-
 src/roles/configuration_checks/CHECK.MD       |  123 ++
 .../configuration_checks/tasks/disks.yml      |  169 ++
 .../configuration_checks/tasks/files/app.yml  |  264 +++
 .../configuration_checks/tasks/files/ascs.yml |  110 ++
 .../configuration_checks/tasks/files/hana.yml | 1287 ++++++++++++++
 .../tasks/files/high_availability.yml         |  125 ++
 .../tasks/files/package.yml                   |  438 +++++
 .../configuration_checks/tasks/files/sap.yml  |  534 ++++++
 .../tasks/files/virtual_machine.yml           |  905 ++++++++++
 .../configuration_checks/tasks/ha_modules.yml |   84 +
 src/roles/configuration_checks/tasks/main.yml |  236 +++
 .../configuration_checks/vars/vm-support.yml  |  592 +++++++
 src/roles/misc/tasks/offline-validation.yml   |    4 +-
 src/roles/misc/tasks/render-html-report.yml   |    6 +-
 src/templates/config_checks_report.html       | 1523 +++++++++++++++++
 src/vars/input-api.yaml                       |   15 +
 vars.yaml                                     |    5 +-
 34 files changed, 9519 insertions(+), 59 deletions(-)
 create mode 100644 src/module_utils/collector.py
 create mode 100644 src/module_utils/filesystem_collector.py
 create mode 100644 src/modules/configuration_check_module.py
 create mode 100644 src/playbook_00_configuration_checks.yml
 create mode 100644 src/roles/configuration_checks/CHECK.MD
 create mode 100644 src/roles/configuration_checks/tasks/disks.yml
 create mode 100644 src/roles/configuration_checks/tasks/files/app.yml
 create mode 100644 src/roles/configuration_checks/tasks/files/ascs.yml
 create mode 100644 src/roles/configuration_checks/tasks/files/hana.yml
 create mode 100644 src/roles/configuration_checks/tasks/files/high_availability.yml
 create mode 100644 src/roles/configuration_checks/tasks/files/package.yml
 create mode 100644 src/roles/configuration_checks/tasks/files/sap.yml
 create mode 100644 src/roles/configuration_checks/tasks/files/virtual_machine.yml
 create mode 100644 src/roles/configuration_checks/tasks/ha_modules.yml
 create mode 100644 src/roles/configuration_checks/tasks/main.yml
 create mode 100644 src/roles/configuration_checks/vars/vm-support.yml
 create mode 100644 src/templates/config_checks_report.html

diff --git a/.ansible-lint b/.ansible-lint
index 0aedb832..ec1f5b35 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -4,6 +4,7 @@ exclude_paths:
   - .github
   - src/roles/ha_db_hana/tasks/files/
   - src/roles/ha_scs/tasks/files/
+  - src/roles/configuration_checks/tasks/files/
 
 skip_list:
   - no-handler
diff --git a/docs/HIGH_AVAILABILITY.md b/docs/HIGH_AVAILABILITY.md
index 924f6c43..64cbedfd 100644
--- a/docs/HIGH_AVAILABILITY.md
+++ b/docs/HIGH_AVAILABILITY.md
@@ -62,7 +62,7 @@ TEST_TYPE: "SAPFunctionalTests"
 # The type of SAP functional test to be executed. Supported values are:
 # - DatabaseHighAvailability
 # - CentralServicesHighAvailability
-sap_functional_test_type: "DatabaseHighAvailability"  # or "CentralServicesHighAvailability"
+SAP_FUNCTIONAL_TEST_TYPE: "DatabaseHighAvailability"  # or "CentralServicesHighAvailability"
 
 # The name of the SAP system configuration for which you want to execute the test cases.
 # It would be the name of the folder under 'WORKSPACE/SYSTEM/' where it could find hosts.yaml, sap-parameters.yaml files of the SAP system configuration
diff --git a/requirements.in b/requirements.in
index f065a270..5e4d32a0 100644
--- a/requirements.in
+++ b/requirements.in
@@ -7,6 +7,7 @@ ansible-runner
 azure-identity
 azure-kusto-data
 azure-kusto-ingest
+azure-mgmt-compute
 azure-mgmt-network
 azure-storage-blob
 azure-storage-queue
diff --git a/requirements.txt b/requirements.txt
index db4736b5..0c867d1e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,33 +4,34 @@
 #
 #    pip-compile requirements.in
 #
-ansible-compat==25.8.1
+ansible-compat==25.8.2
     # via ansible-lint
 ansible-core==2.17.14
     # via
     #   -r requirements.in
     #   ansible-compat
     #   ansible-lint
-ansible-lint==25.8.2
+ansible-lint==25.9.2
     # via -r requirements.in
 ansible-runner==2.4.1
     # via -r requirements.in
-astroid==3.3.11
+astroid==4.0.1
     # via pylint
-attrs==25.3.0
+attrs==25.4.0
     # via
     #   jsonschema
     #   referencing
 azure-common==1.1.28
     # via azure-mgmt-network
-azure-core==1.35.0
+azure-core==1.35.1
     # via
     #   azure-identity
     #   azure-kusto-data
     #   azure-mgmt-core
     #   azure-storage-blob
     #   azure-storage-queue
-azure-identity==1.24.0
+    #   msrest
+azure-identity==1.25.1
     # via
     #   -r requirements.in
     #   azure-kusto-data
@@ -40,8 +41,12 @@ azure-kusto-data==5.0.5
     #   azure-kusto-ingest
 azure-kusto-ingest==5.0.5
     # via -r requirements.in
+azure-mgmt-compute==37.0.1
+    # via -r requirements.in
 azure-mgmt-core==1.6.0
-    # via azure-mgmt-network
+    # via
+    #   azure-mgmt-compute
+    #   azure-mgmt-network
 azure-mgmt-network==29.0.0
     # via -r requirements.in
 azure-storage-blob==12.23.0
@@ -52,29 +57,34 @@ azure-storage-queue==12.12.0
     # via
     #   -r requirements.in
     #   azure-kusto-ingest
-black==25.1.0
+black==25.9.0
     # via
     #   -r requirements.in
     #   ansible-lint
 bracex==2.6
     # via wcmatch
-certifi==2025.8.3
-    # via requests
+certifi==2025.10.5
+    # via
+    #   msrest
+    #   requests
 cffi==2.0.0
-    # via cryptography
+    # via
+    #   ansible-lint
+    #   cryptography
 charset-normalizer==3.4.3
     # via requests
-click==8.2.1
+click==8.3.0
     # via
     #   -r requirements.in
     #   black
-coverage[toml]==7.10.6
+coverage[toml]==7.10.7
     # via
     #   -r requirements.in
     #   pytest-cov
-cryptography==45.0.7
+cryptography==46.0.2
     # via
     #   ansible-core
+    #   ansible-lint
     #   azure-identity
     #   azure-storage-blob
     #   azure-storage-queue
@@ -82,13 +92,15 @@ cryptography==45.0.7
     #   pyjwt
 dill==0.4.0
     # via pylint
+distro==1.9.0
+    # via ansible-lint
 exceptiongroup==1.3.0
     # via pytest
-filelock==3.19.1
+filelock==3.20.0
     # via ansible-lint
-idna==3.10
+idna==3.11
     # via requests
-ijson==3.4.0
+ijson==3.4.0.post0
     # via azure-kusto-data
 importlib-metadata==8.7.0
     # via ansible-lint
@@ -99,7 +111,8 @@ isodate==0.7.2
     #   azure-mgmt-network
     #   azure-storage-blob
     #   azure-storage-queue
-isort==6.0.1
+    #   msrest
+isort==7.0.0
     # via pylint
 jinja2==3.1.6
     # via
@@ -117,25 +130,29 @@ lockfile==0.12.2
     # via python-daemon
 markdown-it-py==4.0.0
     # via rich
-markupsafe==3.0.2
+markupsafe==3.0.3
     # via jinja2
 mccabe==0.7.0
     # via pylint
 mdurl==0.1.2
     # via markdown-it-py
-msal==1.33.0
+msal==1.34.0
     # via
     #   azure-identity
     #   azure-kusto-data
     #   msal-extensions
 msal-extensions==1.3.1
     # via azure-identity
+msrest==0.7.1
+    # via azure-mgmt-compute
 mypy-extensions==1.1.0
     # via black
 numpy==2.2.6
     # via
     #   -r requirements.in
     #   pandas
+oauthlib==3.3.1
+    # via requests-oauthlib
 packaging==25.0
     # via
     #   ansible-compat
@@ -153,7 +170,7 @@ pathspec==0.12.1
     #   yamllint
 pexpect==4.9.0
     # via ansible-runner
-platformdirs==4.4.0
+platformdirs==4.5.0
     # via
     #   black
     #   pylint
@@ -173,7 +190,7 @@ pyjwt[crypto]==2.10.1
     # via
     #   msal
     #   pyjwt
-pylint==3.3.8
+pylint==4.0.0
     # via -r requirements.in
 pytest==8.4.2
     # via
@@ -182,7 +199,7 @@ pytest==8.4.2
     #   pytest-mock
 pytest-cov==7.0.0
     # via -r requirements.in
-pytest-mock==3.15.0
+pytest-mock==3.15.1
     # via -r requirements.in
 python-daemon==3.1.2
     # via ansible-runner
@@ -190,9 +207,11 @@ python-dateutil==2.9.0.post0
     # via
     #   azure-kusto-data
     #   pandas
+pytokens==0.1.10
+    # via black
 pytz==2025.2
     # via pandas
-pyyaml==6.0.2
+pyyaml==6.0.3
     # via
     #   -r requirements.in
     #   ansible-compat
@@ -200,7 +219,7 @@ pyyaml==6.0.2
     #   ansible-lint
     #   ansible-runner
     #   yamllint
-referencing==0.36.2
+referencing==0.37.0
     # via
     #   ansible-lint
     #   jsonschema
@@ -211,9 +230,13 @@ requests==2.32.5
     #   azure-core
     #   azure-kusto-data
     #   msal
+    #   msrest
+    #   requests-oauthlib
+requests-oauthlib==2.0.0
+    # via msrest
 resolvelib==1.0.1
     # via ansible-core
-rich==14.1.0
+rich==14.2.0
     # via -r requirements.in
 rpds-py==0.27.1
     # via
@@ -221,8 +244,10 @@ rpds-py==0.27.1
     #   referencing
 ruamel-yaml==0.18.15
     # via ansible-lint
-ruamel-yaml-clib==0.2.12
-    # via ruamel-yaml
+ruamel-yaml-clib==0.2.14
+    # via
+    #   ansible-lint
+    #   ruamel-yaml
 six==1.17.0
     # via
     #   azure-core
@@ -233,7 +258,7 @@ subprocess-tee==0.4.2
     #   ansible-lint
 tenacity==9.1.2
     # via azure-kusto-ingest
-tomli==2.2.1
+tomli==2.3.0
     # via
     #   black
     #   coverage
@@ -246,10 +271,12 @@ typing-extensions==4.15.0
     #   astroid
     #   azure-core
     #   azure-identity
+    #   azure-mgmt-compute
     #   azure-mgmt-network
     #   azure-storage-blob
     #   azure-storage-queue
     #   black
+    #   cryptography
     #   exceptiongroup
     #   referencing
 tzdata==2025.2
diff --git a/scripts/sap_automation_qa.sh b/scripts/sap_automation_qa.sh
index 6d0a0bd8..034d5636 100755
--- a/scripts/sap_automation_qa.sh
+++ b/scripts/sap_automation_qa.sh
@@ -92,12 +92,18 @@ Options:
   -h, --help                Show this help message
 
 Examples:
+  # High Availability Tests
   $0 --test_groups=HA_DB_HANA --test_cases=[ha-config,primary-node-crash]
   $0 --test_groups=HA_SCS
   $0 --test_groups=HA_DB_HANA --test_cases=[ha-config,primary-node-crash] -vv
   $0 --test_groups=HA_DB_HANA --test_cases=[ha-config,primary-node-crash] --extra-vars='{"key":"value"}'
   $0 --test_groups=HA_DB_HANA --test_cases=[ha-config] --offline
 
+  # Configuration Checks (requires SAP_FUNCTIONAL_TEST_TYPE: ConfigurationChecks in vars.yaml)
+  $0 --extra-vars='{"configuration_test_type":"all"}'
+  $0 --extra-vars='{"configuration_test_type":"high_availability"}'
+  $0 --extra-vars='{"configuration_test_type":"Database"}' -vv
+
 Available Test Cases for groups:
 	$0 --test_groups=HA_DB_HANA
 				ha-config => High Availability configuration
@@ -126,6 +132,13 @@ Available Test Cases for groups:
 				manual-restart => Manual Restart
 				ha-failover-to-node => HA Failover to Secondary Node
 
+Configuration Checks (set SAP_FUNCTIONAL_TEST_TYPE: ConfigurationChecks in vars.yaml):
+	configuration_test_type options (use with --extra-vars):
+				all => Run all configuration checks
+				Database => Database (HANA) configuration checks only
+				CentralServiceInstances => ASCS/ERS configuration checks only
+				ApplicationInstances => Application server configuration checks only
+
 Configuration is read from vars.yaml file.
 EOF
 }
@@ -141,7 +154,7 @@ VARS_FILE="${cmd_dir}/../vars.yaml"
 # :return: None. Exits with a non-zero status if validation fails.
 validate_params() {
     local missing_params=()
-    local params=("TEST_TYPE" "SYSTEM_CONFIG_NAME" "sap_functional_test_type" "AUTHENTICATION_TYPE")
+    local params=("TEST_TYPE" "SYSTEM_CONFIG_NAME" "SAP_FUNCTIONAL_TEST_TYPE" "AUTHENTICATION_TYPE")
 
     # Check if vars.yaml exists
     if [ ! -f "$VARS_FILE" ]; then
@@ -181,7 +194,7 @@ extract_error_message() {
     echo "$extracted_message"
 }
 
-# Determine the playbook name based on the sap_functional_test_type.
+# Determine the playbook name based on the SAP_FUNCTIONAL_TEST_TYPE.
 # :param test_type: The type of SAP functional test.
 # :param offline_mode: Whether to use offline mode (optional).
 # :return: The name of the playbook.
@@ -204,8 +217,11 @@ get_playbook_name() {
                 echo "playbook_00_ha_scs_functional_tests"
             fi
             ;;
+        "ConfigurationChecks")
+            echo "playbook_00_configuration_checks"
+            ;;
         *)
-            log "ERROR" "Unknown sap_functional_test_type: $test_type"
+            log "ERROR" "Unknown SAP_FUNCTIONAL_TEST_TYPE: $test_type"
             exit 1
             ;;
     esac
@@ -511,7 +527,7 @@ main() {
         log "INFO" "Found $cib_files CIB file(s) for offline analysis"
     fi
 
-    playbook_name=$(get_playbook_name "$sap_functional_test_type" "$OFFLINE_MODE")
+    playbook_name=$(get_playbook_name "$SAP_FUNCTIONAL_TEST_TYPE" "$OFFLINE_MODE")
     log "INFO" "Using playbook: $playbook_name."
 
     run_ansible_playbook "$playbook_name" "$SYSTEM_HOSTS" "$SYSTEM_PARAMS" "$AUTHENTICATION_TYPE" "$SYSTEM_CONFIG_FOLDER"
diff --git a/src/module_utils/collector.py b/src/module_utils/collector.py
new file mode 100644
index 00000000..6f707027
--- /dev/null
+++ b/src/module_utils/collector.py
@@ -0,0 +1,478 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+"""
+Collectors for data collection in SAP Automation QA
+"""
+import json
+from abc import ABC, abstractmethod
+import logging
+import re
+import shlex
+import ipaddress
+from typing import Any
+
+try:
+    from ansible.module_utils.sap_automation_qa import SapAutomationQA
+    from ansible.module_utils.commands import DANGEROUS_COMMANDS
+except ImportError:
+    from src.module_utils.sap_automation_qa import SapAutomationQA
+    from src.module_utils.commands import DANGEROUS_COMMANDS
+
+
+class Collector(ABC):
+    """
+    Base class for data collection
+    """
+
+    def __init__(self, parent: SapAutomationQA):
+        """
+        Initialize with parent module for logging
+
+        :param parent: Parent module with logging capability
+        :type parent: SapAutomationQA
+        """
+        self.parent = parent
+
+    @abstractmethod
+    def collect(self, check, context) -> Any:
+        """
+        Collect data for validation
+
+        :param check: Check object
+        :type check: Check
+        :param context: Context object
+        :type context: Context
+        """
+        raise NotImplementedError("Subclasses must implement this method.")
+
+    def sanitize_command(self, command: str) -> str:
+        """
+        Sanitize command to prevent injection attacks
+
+        :param command: Raw command string
+        :type command: str
+        :return: Sanitized command or None if dangerous
+        :rtype: str
+        :raises ValueError: If command contains dangerous patterns
+        """
+
+        for pattern in DANGEROUS_COMMANDS:
+            if re.search(pattern, command, re.IGNORECASE):
+                self.parent.log(logging.ERROR, f"Dangerous command pattern detected: {pattern}")
+                raise ValueError(f"Command contains potentially dangerous pattern: {pattern}")
+        if len(command) > 3000:
+            self.parent.log(logging.ERROR, f"Command too long: {len(command)} chars")
+            raise ValueError("Command exceeds maximum length of 1000 characters")
+
+        return command
+
+    def substitute_context_vars(self, command: str, context: dict) -> str:
+        """
+        Substitute context variables in the command string.
+
+        :param command: Command string with placeholders
+        :type command: str
+        :param context: Context variables to substitute
+        :type context: dict
+        :return: Command string with substituted values
+        :rtype: str
+        """
+        self.parent.log(logging.INFO, f"Substituting context variables in command {command}")
+        for key, value in context.items():
+            placeholder = "{{ CONTEXT." + key + " }}"
+            if placeholder in command:
+                self.parent.log(
+                    logging.INFO,
+                    f"Substituting {placeholder} with {value} in command: {command}",
+                )
+                command = command.replace(placeholder, str(value))
+        return command
+
+
+class CommandCollector(Collector):
+    """Collects data by executing shell commands"""
+
+    def collect(self, check, context) -> str:
+        """
+        Execute a command and return the output.
+
+        :param check: _Description of the check to be performed_
+        :type check: Check
+        :param context: Context variables to substitute in the command
+        :type context: Dict[str, Any]
+        :return: The output of the command
+        :rtype: str
+        """
+        try:
+            command = check.collector_args.get("command", "")
+            user = check.collector_args.get("user", "")
+            if not command:
+                return "ERROR: No command specified"
+            try:
+                command = self.sanitize_command(command)
+            except ValueError as e:
+                self.parent.log(logging.ERROR, f"Command sanitization failed: {e}")
+                return f"ERROR: Command sanitization failed: {e}"
+            command = self.substitute_context_vars(command, context)
+            try:
+                command = self.sanitize_command(command)
+            except ValueError as e:
+                self.parent.log(
+                    logging.ERROR, f"Command sanitization failed after substitution: {e}"
+                )
+                return f"ERROR: Command sanitization failed after substitution: {e}"
+
+            check.command = command
+            if user and user != "root":
+                if not re.match(r"^[a-zA-Z0-9_-]+$", user):
+                    self.parent.log(logging.ERROR, f"Invalid user parameter: {user}")
+                    return f"ERROR: Invalid user parameter: {user}"
+                command = f"sudo -u {shlex.quote(user)} {command}"
+
+            return self.parent.execute_command_subprocess(
+                command, shell_command=check.collector_args.get("shell", True)
+            ).strip()
+        except Exception as ex:
+            self.parent.handle_error(ex)
+            return f"ERROR: Command execution failed: {str(ex)}"
+
+
+class AzureDataParser(Collector):
+    """
+    Parses data from Azure resources
+    """
+
+    def __init__(self, parent: SapAutomationQA):
+        super().__init__(parent)
+
+    def parse_azure_disks_vars(self, check, context) -> str:
+        """
+        Parse Azure disks variables from the given data.
+
+        :param check: Check object with collector arguments
+        :type check: Check
+        :param context: Context object containing all required data
+        :type context: Dict[str, Any]
+        :return: Parsed Azure disks variables
+        :rtype: str
+        """
+        return context.get("azure_disks_info", "N/A")
+
+    def parse_anf_vars(self, check, context) -> str:
+        """
+        Parse required property for Azure NetApp Files (ANF) from from filesystem data.
+
+        :param check: Check object with collector arguments
+        :type check: Check
+        :param context: Context object containing all required data
+        :type context: Dict[str, Any]
+        :return: Parsed ANF properties variables
+        :rtype: str
+        """
+        filesystem_data = context.get("filesystems", [])
+        anf_storage_data = context.get("anf_storage_metadata", [])
+        mount_point = check.collector_args.get("mount_point", "")
+        property_name = check.collector_args.get("property", "")
+        value = "N/A"
+
+        try:
+            parsed_anf_volumes = []
+            if isinstance(anf_storage_data, str):
+                try:
+                    parsed_anf_volumes = json.loads(anf_storage_data)
+                except json.JSONDecodeError:
+                    self.parent.log(
+                        logging.WARNING,
+                        f"Failed to parse ANF storage metadata JSON: {anf_storage_data[:100]}",
+                    )
+            elif isinstance(anf_storage_data, list):
+                parsed_anf_volumes = anf_storage_data
+            else:
+                self.parent.log(
+                    logging.WARNING, f"Unexpected ANF storage data type: {type(anf_storage_data)}"
+                )
+                return value
+
+            fs_entry = None
+            for fs in filesystem_data:
+                if fs.get("target") == mount_point:
+                    fs_entry = fs
+                    break
+
+            if not fs_entry:
+                self.parent.log(
+                    logging.WARNING, f"Mount point {mount_point} not found in filesystem data"
+                )
+                return value
+
+            if fs_entry.get("nfs_type") != "ANF":
+                self.parent.log(
+                    logging.WARNING,
+                    f"Mount point {mount_point} is not an ANF volume (type: {fs_entry.get('nfs_type')})",
+                )
+                return value
+            source = fs_entry.get("source", "")
+            if ":" not in source:
+                self.parent.log(
+                    logging.WARNING, f"Invalid NFS source format for {mount_point}: {source}"
+                )
+                return value
+
+            nfs_ip = source.split(":")[0]
+            for anf_volume in parsed_anf_volumes:
+                if anf_volume.get("ip") == nfs_ip:
+                    if property_name in anf_volume:
+                        value = str(anf_volume.get(property_name, "N/A"))
+                        self.parent.log(
+                            logging.INFO,
+                            f"Found {property_name}={value} for ANF volume at {mount_point} (IP: {nfs_ip})",
+                        )
+                    else:
+                        self.parent.log(
+                            logging.WARNING,
+                            f"Property '{property_name}' not found in ANF volume for {mount_point}",
+                        )
+                    break
+            else:
+                self.parent.log(
+                    logging.WARNING,
+                    f"No ANF volume found with IP {nfs_ip} for mount point {mount_point}",
+                )
+
+        except Exception as ex:
+            self.parent.handle_error(ex)
+            value = f"ERROR: ANF property parsing failed: {str(ex)}"
+
+        return value
+
+    def parse_anf_volumes_vars(self, check, context) -> str:
+        """
+        Parse Azure NetApp Files (ANF) volumes variables from the given data.
+
+        :param check: Check object with collector arguments
+        :type check: Check
+        :param context: Context object containing all required data
+        :type context: Dict[str, Any]
+        :return: Parsed ANF volumes variables
+        :rtype: str
+        """
+        return context.get("anf_volumes_info", "N/A")
+
+    def parse_lvm_groups_vars(self, check, context) -> str:
+        """
+        Parse LVM group info from the given data.
+
+        :param check: Check object with collector arguments
+        :type check: Check
+        :param context: Context object containing all required data
+        :type context: Dict[str, Any]
+        :return: Parsed LVM group variables
+        :rtype: str
+        """
+        return context.get("lvm_groups_info", "N/A")
+
+    def parse_lvm_volumes_vars(self, check, context) -> str:
+        """
+        Parse LVM volume info from the given data.
+        :param check: Check object with collector arguments
+        :type check: Check
+        :param context: Context object containing all required data
+        :type context: Dict[str, Any]
+        :return: Parsed LVM volume variables
+        :rtype: str
+        """
+        return context.get("lvm_volumes_info", "N/A")
+
+    def parse_filesystem_vars(self, check, context) -> str:
+        """
+        Parse filesystem variables from the given data.
+
+        :param check: Check object with collector arguments
+        :type check: Check
+        :param context: Context object containing all required data
+        :type context: Dict[str, Any]
+        :return: Parsed filesystem variables
+        :rtype: str
+        """
+        return context.get("formatted_filesystem_info", "N/A")
+
+    def parse_disks_vars(self, check, context) -> str:
+        """
+        Parse the required property for given mount point from filesystem data and disks metadata.
+
+        For LVM striped volumes, this aggregates metrics across all underlying disks.
+        For single disks, returns the metric for that disk.
+
+        :param check: Check object with collector arguments
+        :type check: Check
+        :param context: Context object containing all required data
+        :type context: Dict[str, Any]
+        :return: Aggregated property value or "N/A" if not found
+        :rtype: str
+        """
+        filesystem_data = context.get("filesystems", [])
+        disks_metadata = context.get("azure_disks_metadata", {})
+        mount_point = check.collector_args.get("mount_point", "")
+        property = check.collector_args.get("property", "")
+        value = "N/A"
+        try:
+            parsed_disks = []
+            for disk in disks_metadata:
+                if isinstance(disk, str):
+                    try:
+                        parsed_disks.append(json.loads(disk))
+                    except json.JSONDecodeError:
+                        self.parent.log(
+                            logging.WARNING,
+                            f"Failed to parse disk metadata JSON string: {disk[:100]}",
+                        )
+                        continue
+                elif isinstance(disk, dict):
+                    parsed_disks.append(disk)
+                else:
+                    self.parent.log(logging.WARNING, f"Unexpected disk metadata type: {type(disk)}")
+
+            fs_entry = None
+            for fs in filesystem_data:
+                if fs.get("target") == mount_point:
+                    fs_entry = fs
+                    break
+
+            if not fs_entry:
+                self.parent.log(
+                    logging.WARNING, f"Mount point {mount_point} not found in filesystem data"
+                )
+                return value
+            if property in fs_entry and fs_entry.get(property) is not None:
+                value = str(fs_entry[property])
+                self.parent.log(
+                    logging.INFO,
+                    f"Found {property}='{value}' for {mount_point} from filesystem data",
+                )
+                return value
+            if not parsed_disks:
+                self.parent.log(logging.WARNING, "No valid disk metadata found")
+                return value
+
+            if "azure_disk_names" in fs_entry and fs_entry["azure_disk_names"]:
+                total_value, matched_disks = 0, 0
+
+                for disk_name in fs_entry["azure_disk_names"]:
+                    disk = next((d for d in parsed_disks if d.get("name") == disk_name), None)
+                    if disk and property in disk:
+                        disk_value = disk.get(property, 0)
+                        try:
+                            total_value += float(disk_value) if disk_value else 0
+                            matched_disks += 1
+                        except (ValueError, TypeError):
+                            self.parent.log(
+                                logging.WARNING,
+                                f"Could not convert {property}={disk_value} to number for disk {disk_name}",
+                            )
+
+                if matched_disks > 0:
+                    value = str(int(total_value))
+                    self.parent.log(
+                        logging.INFO,
+                        f"Aggregated {property} for {mount_point}: {value} (from {matched_disks} disks)",
+                    )
+                else:
+                    self.parent.log(
+                        logging.WARNING,
+                        f"No matching disks found for {mount_point} with property {property}",
+                    )
+            else:
+                disk_name = fs_entry.get("source")
+                disk = next((d for d in parsed_disks if d.get("name") == disk_name), None)
+                if not disk:
+                    device_name = disk_name.split("/")[-1] if "/" in disk_name else disk_name
+                    disk = next((d for d in parsed_disks if device_name in d.get("name", "")), None)
+                if disk and property in disk:
+                    value = str(disk.get(property, "N/A"))
+                    self.parent.log(
+                        logging.INFO,
+                        f"Found {property}={value} for {mount_point} from disk {disk.get('name')}",
+                    )
+                else:
+                    self.parent.log(
+                        logging.WARNING,
+                        f"Property '{property}' not found for mount point '{mount_point}' (source: {disk_name})",
+                    )
+
+        except Exception as ex:
+            self.parent.handle_error(ex)
+            value = f"ERROR: Parsing failed: {str(ex)}"
+
+        return value
+
+    def collect(self, check, context) -> Any:
+        """
+        Collect and parse Azure resource data
+
+        This method delegates to azure_resource_collector module to get raw data,
+        then parses it according to the check requirements.
+        """
+        try:
+            command = check.collector_args.get("command", "")
+            if command:
+                return CommandCollector(self.parent).collect(check, context)
+
+            resource_type = check.collector_args.get("resource_type", "")
+            method_name = f"parse_{resource_type}_vars"
+            parameters = {
+                "context": context,
+                "check": check,
+            }
+            return (
+                getattr(self, method_name)(**parameters)
+                if hasattr(self, method_name)
+                else "ERROR: Unsupported resource type"
+            )
+
+        except Exception as ex:
+            self.parent.handle_error(ex)
+            return f"ERROR: Azure data collection failed: {str(ex)}"
+
+
+class ModuleCollector(Collector):
+    """
+    Collects data from Ansible module results stored in context
+    """
+
+    def collect(self, check, context) -> Any:
+        """
+        Retrieve module result data from context.
+
+        The module should have been executed by the playbook before calling
+        the configuration check, and its result stored in the context.
+
+        :param check: Check object with module information
+        :type check: Check
+        :param context: Context variables containing module results
+        :type context: Dict[str, Any]
+        :return: The data from the module result
+        :rtype: Any
+        """
+        try:
+            module_name = check.collector_args.get("module_name", "")
+            context_key = check.collector_args.get("context_key", "")
+
+            if not module_name:
+                return "ERROR: No module_name specified"
+
+            if not context_key:
+                module_context_map = {
+                    "get_pcmk_properties_db": "ha_db_config",
+                    "get_pcmk_properties_scs": "ha_scs_config",
+                    "get_azure_lb": "ha_loadbalancer_config",
+                }
+                context_key = module_context_map.get(module_name, module_name)
+
+            return context.get(
+                context_key, f"ERROR: Module result '{context_key}' not found in context"
+            )
+
+        except Exception as ex:
+            self.parent.handle_error(ex)
+            return f"ERROR: Module data retrieval failed: {str(ex)}"
diff --git a/src/module_utils/commands.py b/src/module_utils/commands.py
index 93ee3cc2..ad734a78 100644
--- a/src/module_utils/commands.py
+++ b/src/module_utils/commands.py
@@ -66,3 +66,8 @@
 }
 
 CIB_ADMIN = lambda scope: ["cibadmin", "--query", "--scope", scope]
+
+DANGEROUS_COMMANDS = [
+    r"sudo\s+rm",
+    r"rm\s+-rf",
+]
diff --git a/src/module_utils/enums.py b/src/module_utils/enums.py
index 37da3ccd..de331c6a 100644
--- a/src/module_utils/enums.py
+++ b/src/module_utils/enums.py
@@ -3,7 +3,9 @@
 """
 
 from enum import Enum
-from typing import Dict, Any, List
+from typing import Dict, Any, List, Optional
+from dataclasses import dataclass, field
+from datetime import datetime
 
 
 class TelemetryDataDestination(Enum):
@@ -25,6 +27,19 @@ class TestStatus(Enum):
     WARNING = "WARNING"
     INFO = "INFO"
     NOT_STARTED = "NOT_STARTED"
+    SKIPPED = "SKIPPED"
+
+
+class TestSeverity(Enum):
+    """
+    Enum for the severity of the test/config case/step.
+    """
+
+    CRITICAL = "CRITICAL"
+    HIGH = "HIGH"
+    WARNING = "WARNING"
+    LOW = "LOW"
+    INFO = "INFO"
 
 
 class OperatingSystemFamily(Enum):
@@ -137,3 +152,152 @@ def to_dict(self) -> Dict[str, Any]:
             "logs": self.logs.copy(),
             "changed": self.changed,
         }
+
+
+@dataclass
+class ApplicabilityRule:
+    """
+    Represents a rule to determine if a check is applicable based on context properties
+
+    :param property: The property to check against
+    :type property: str
+    :param value: The expected value of the property
+    :type value: Any
+    """
+
+    property: str
+    value: Any
+
+    def is_applicable(self, context_value: Any) -> bool:
+        """
+        Check if the rule applies to the given context value
+
+        :param context_value: Value from the context to check against
+        :type context_value: Any
+        :return: True if applicable, False otherwise
+        :rtype: bool
+        """
+        if isinstance(context_value, str):
+            context_value = context_value.strip()
+            if self.property == "os_version" and self.value == "all":
+                return True
+
+            if context_value.lower() == "true":
+                context_value = True
+            elif context_value.lower() == "false":
+                context_value = False
+
+        if isinstance(self.value, list):
+            if isinstance(context_value, list):
+                return bool(set(self.value).intersection(set(context_value)))
+            if self.property == "storage_type":
+                return any(val in context_value for val in self.value) or any(
+                    context_value in val for val in self.value
+                )
+            return context_value in self.value
+
+        if isinstance(self.value, bool):
+            return context_value == self.value
+
+        return context_value == self.value
+
+
+@dataclass
+class Check:
+    """
+    Represents a configuration check
+
+    :param id: Unique identifier for the check
+    :type id: str
+    :param name: Name of the check
+    :type name: str
+    :param description: Description of the check
+    :type description: str
+    :param category: Category of the check
+    :type category: str
+    :param workload: Workload type (e.g., SAP, Non-SAP)
+    :type workload: str
+    :param TestSeverity: TestSeverity level of the check
+    :type TestSeverity: TestSeverity
+    :param collector_type: Type of collector to use (e.g., command, azure)
+    :type collector_type: str
+    :param collector_args: Arguments for the collector
+    :type collector_args: Dict[str, Any]
+    :param validator_type: Type of validator to use (e.g., string, range)
+    :type validator_type: str
+    :param validator_args: Arguments for the validator
+    :type validator_args: Dict[str, Any]
+    :param tags: Tags associated with the check
+    :type tags: List[str]
+    :param applicability: List of applicability rules
+    :type applicability: List[ApplicabilityRule]
+    :param references: References for the check
+    :type references: Dict[str, str]
+    :param report: Report type (e.g., check, section)
+    :type report: Optional[str]
+    """
+
+    id: str
+    name: str
+    description: str
+    category: str
+    workload: str
+    severity: TestSeverity = TestSeverity.WARNING
+    collector_type: str = "command"
+    collector_args: Dict[str, Any] = field(default_factory=dict)
+    validator_type: str = "string"
+    validator_args: Dict[str, Any] = field(default_factory=dict)
+    tags: List[str] = field(default_factory=list)
+    applicability: List[ApplicabilityRule] = field(default_factory=list)
+    references: Dict[str, str] = field(default_factory=dict)
+    report: Optional[str] = "check"
+
+    def is_applicable(self, context: Dict[str, Any]) -> bool:
+        """
+        Check if the check is applicable based on the context
+
+        :param context: Context dictionary containing properties
+        :type context: Dict[str, Any]
+        :return: True if applicable, False otherwise
+        :rtype: bool
+        """
+
+        for rule in self.applicability:
+            context_value = context[rule.property]
+            if not rule.is_applicable(context_value):
+                return False
+
+        return True
+
+
+@dataclass
+class CheckResult:
+    """
+    Represents the result of a check execution
+
+    :param check: The check that was executed
+    :type check: Check
+    :param status: Status of the check execution
+    :type status: TestStatus
+    :param hostname: Hostname of the system where the check was executed
+    :type hostname: str
+    :param expected_value: Expected value from the check
+    :type expected_value: Any
+    :param actual_value: Actual value collected during the check
+    :type actual_value: Any
+    :param execution_time: Time taken to execute the check
+    :type execution_time: float
+    :param timestamp: Timestamp of the check execution
+    :type timestamp: datetime
+    :param details: Additional details about the check execution
+    :type details: Optional[str]
+    """
+
+    check: Check
+    status: TestStatus
+    hostname: str
+    expected_value: Any
+    actual_value: Any
+    execution_time: float
+    timestamp: datetime = field(default_factory=datetime.now)
+    details: Optional[str] = None
diff --git a/src/module_utils/filesystem_collector.py b/src/module_utils/filesystem_collector.py
new file mode 100644
index 00000000..99d9a84f
--- /dev/null
+++ b/src/module_utils/filesystem_collector.py
@@ -0,0 +1,948 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+"""
+Collectors for data collection in SAP Automation QA
+"""
+import json
+from abc import ABC, abstractmethod
+import logging
+import re
+import shlex
+import ipaddress
+from typing import Any
+
+try:
+    from ansible.module_utils.sap_automation_qa import SapAutomationQA
+    from ansible.module_utils.collector import Collector
+except ImportError:
+    from src.module_utils.sap_automation_qa import SapAutomationQA
+    from src.module_utils.collector import Collector
+
+
+class FileSystemCollector(Collector):
+    """
+    Collects filesystem information
+    """
+
+    def __init__(self, parent: SapAutomationQA):
+        super().__init__(parent)
+
+    def _parse_filesystem_data(
+        self,
+        findmnt_output,
+        df_output,
+        lvm_volume,
+        lvm_group,
+        azure_disk_data,
+        anf_storage_data,
+        afs_storage_data,
+        vg_to_disk_names=None,
+    ):
+        """
+        Parse filesystem data.
+
+        :param vg_to_disk_names: Pre-computed mapping of VG names to Azure disk names
+        :type vg_to_disk_names: Dict[str, List[str]]
+        """
+        if vg_to_disk_names is None:
+            vg_to_disk_names = {}
+        filesystems = []
+        findmnt_data = {}
+        df_data = {}
+        df_lines = [line.strip() for line in df_output.split("\n") if line.strip()]
+        for line in df_lines[1:]:
+            parts = line.split()
+            if len(parts) >= 6:
+                mountpoint = parts[5]
+                df_data[mountpoint] = {
+                    "filesystem": parts[0],
+                    "size": parts[1],
+                    "used": parts[2],
+                    "free": parts[3],
+                    "used_percent": parts[4],
+                }
+        for line in [line.strip() for line in findmnt_output.split("\n") if line.strip()]:
+            parts = line.split(maxsplit=3)
+            if len(parts) >= 4:
+                target = parts[0]
+                findmnt_data[target] = {"source": parts[1], "fstype": parts[2], "options": parts[3]}
+        for mountpoint, df_info in df_data.items():
+            findmnt_info = findmnt_data.get(mountpoint, {})
+            vg_name, stripe_size = "", ""
+            filesystem_path = df_info["filesystem"]
+            for lv_name, lv_prop in lvm_volume.items():
+                if lv_prop.get("dm_path") == filesystem_path:
+                    vg_name = lv_prop.get("vg_name", "")
+                    stripe_size = lv_prop.get("stripe_size", "")
+                    break
+
+            filesystem_entry = {
+                "target": mountpoint,
+                "source": filesystem_path,
+                "fstype": findmnt_info.get("fstype", ""),
+                "options": findmnt_info.get("options", ""),
+                "size": df_info["size"],
+                "free": df_info["free"],
+                "used": df_info["used"],
+                "used_percent": df_info["used_percent"],
+                "vg": vg_name,
+                "stripe_size": stripe_size,
+                "max_mbps": 0,
+                "max_iops": 0,
+            }
+
+            if filesystem_entry["fstype"] in ["nfs", "nfs4"]:
+                nfs_source = filesystem_entry["source"]
+                if ":" in nfs_source:
+                    nfs_address = nfs_source.split(":")[0]
+
+                    matched = False
+                    for anf_volume in anf_storage_data:
+                        anf_ip = anf_volume.get("ip", "")
+                        if anf_ip and anf_ip == nfs_address:
+                            filesystem_entry["max_mbps"] = anf_volume.get("throughputMibps", 0)
+                            filesystem_entry["max_iops"] = "-"
+                            filesystem_entry["nfs_type"] = "ANF"
+                            filesystem_entry["service_level"] = anf_volume.get("serviceLevel", "")
+                            matched = True
+                            break
+
+                    if not matched:
+                        for nfs_share in afs_storage_data:
+                            share_address = nfs_share.get("NFSAddress", "")
+                            if ":" in share_address and share_address.split(":")[0] == nfs_address:
+                                filesystem_entry["max_mbps"] = nfs_share.get("ThroughputMibps", 0)
+                                filesystem_entry["max_iops"] = nfs_share.get("IOPS", 0)
+                                filesystem_entry["nfs_type"] = "AFS"
+                                break
+            else:
+                if filesystem_path.startswith("/dev/sd") or filesystem_path.startswith("/dev/nvme"):
+                    disk_name = (
+                        filesystem_path.split("/")[-1]
+                        if "/" in filesystem_path
+                        else filesystem_path
+                    )
+
+                    for disk_data in azure_disk_data:
+                        if disk_data.get("name", "").endswith(disk_name):
+                            filesystem_entry["max_mbps"] = disk_data.get("mbps", 0)
+                            filesystem_entry["max_iops"] = disk_data.get("iops", 0)
+                            break
+                elif filesystem_path.startswith("/dev/mapper/") and vg_name:
+                    disk_names = vg_to_disk_names.get(vg_name, [])
+
+                    if disk_names:
+                        filesystem_entry["azure_disk_names"] = disk_names
+                        self.parent.log(
+                            logging.INFO,
+                            f"Mapped VG {vg_name} to {len(disk_names)} Azure disks: {disk_names}",
+                        )
+                    else:
+                        self.parent.log(
+                            logging.WARNING,
+                            f"No disk mapping found for VG {vg_name}. Ensure device-to-lun mapping is available.",
+                        )
+
+            filesystems.append(filesystem_entry)
+
+        return filesystems
+
+    def _map_vg_to_disk_names(self, lvm_fullreport, imds_metadata, device_lun_map):
+        """
+        Map LVM volume groups to Azure disk names using direct device→lun→diskname correlation.
+
+        Chain: PV device (/dev/sdc) → LUN (0) → disk name (via IMDS) → Azure disk
+
+        :param lvm_fullreport: LVM fullreport JSON with PV information
+        :param imds_metadata: IMDS metadata with lun-to-diskname mappings
+        :param device_lun_map: Mapping of device names to LUN numbers (e.g., {"sdc": "0"})
+        :return: Dict mapping VG names to lists of Azure disk names
+        :rtype: Dict[str, List[str]]
+        """
+        vg_to_disk_names = {}
+
+        try:
+            lun_to_diskname = {}
+            for disk_info in imds_metadata:
+                lun = disk_info.get("lun")
+                name = disk_info.get("name")
+                if lun is not None and name:
+                    lun_to_diskname[str(lun)] = name
+
+            reports = lvm_fullreport.get("report", [])
+            self.parent.log(
+                logging.INFO,
+                f"Found {len(reports)} LVM reports",
+            )
+
+            for report in reports:
+                pvs = report.get("pv", [])
+                vgs = report.get("vg", [])
+
+                vg_names = [vg.get("vg_name") for vg in vgs if vg.get("vg_name")]
+                if not vg_names:
+                    self.parent.log(
+                        logging.WARNING,
+                        f"Report has PVs but no VG names found, skipping",
+                    )
+                    continue
+                vg_name = vg_names[0]
+
+                for pv in pvs:
+                    pv_name = pv.get("pv_name")
+
+                    if not pv_name:
+                        self.parent.log(
+                            logging.INFO,
+                            f"Skipping PV with missing pv_name",
+                        )
+                        continue
+                    device_name = pv_name.split("/")[-1] if "/" in pv_name else pv_name
+                    lun = device_lun_map.get(device_name)
+                    if lun is None:
+                        self.parent.log(
+                            logging.WARNING,
+                            f"No LUN mapping found for device {device_name} (PV: {pv_name})",
+                        )
+                        continue
+                    disk_name = lun_to_diskname.get(str(lun))
+                    if not disk_name:
+                        self.parent.log(
+                            logging.WARNING,
+                            f"No IMDS entry for LUN {lun} (device: {device_name})",
+                        )
+                        continue
+                    if vg_name not in vg_to_disk_names:
+                        vg_to_disk_names[vg_name] = []
+                    vg_to_disk_names[vg_name].append(disk_name)
+
+        except Exception as ex:
+            self.parent.log(
+                logging.ERROR,
+                f"Failed to map VG to disk names: {ex}",
+            )
+
+        return vg_to_disk_names
+
+    def collect_lvm_volumes(self, lvm_fullreport):
+        """
+        Collect LVM volume information.
+
+        :param lvm_fullreport: Pre-fetched LVM fullreport JSON string
+        :return: Tuple of logical volumes and volume groups
+        :rtype: Tuple[Dict[str, Any], Dict[str, Any]]
+        """
+        log_volume_result = {}
+        lvm_group_result = {}
+        try:
+            lvm_volumes = lvm_fullreport
+            for lvm_volume in lvm_volumes.get("report", []):
+                vol_groups = lvm_volume.get("vg", [])
+                for vol_group in vol_groups:
+                    vg_name = vol_group.get("vg_name")
+                    pv_count = vol_group.get("pv_count", 0)
+                    try:
+                        pv_count = int(pv_count) if pv_count else 0
+                    except (ValueError, TypeError):
+                        pv_count = 0
+
+                    lvm_group_result[vg_name] = {
+                        "name": vg_name,
+                        "disks": pv_count,
+                        "logical_volumes": vol_group.get("lv_count", 0),
+                        "total_size": vol_group.get("vg_size"),
+                        "total_iops": 0,
+                        "total_mbps": 0,
+                    }
+
+                logical_volumes = lvm_volume.get("lv", [])
+                segments = lvm_volume.get("seg", [])
+
+                for lv in logical_volumes:
+                    lv_name = lv.get("lv_name")
+                    vg_name = ""
+                    if lv.get("lv_full_name") and "/" in lv.get("lv_full_name", ""):
+                        vg_name = lv.get("lv_full_name", "").split("/")[0]
+                    elif lv.get("vg_name"):
+                        vg_name = lv.get("vg_name")
+
+                    stripe_size, stripes = "", ""
+                    lv_uuid = lv.get("lv_uuid")
+                    for segment in segments:
+                        if segment.get("lv_uuid") == lv_uuid:
+                            stripes = segment.get("stripes", "")
+                            stripe_size = segment.get("stripe_size", "")
+                            break
+
+                    if vg_name and vg_name != "rootvg":
+                        log_volume_result[lv_name] = {
+                            "name": lv_name,
+                            "vg_name": vg_name,
+                            "path": lv.get("lv_path"),
+                            "dm_path": lv.get("lv_dm_path"),
+                            "layout": lv.get("lv_layout"),
+                            "size": lv.get("lv_size"),
+                            "stripe_size": stripe_size,
+                            "stripes": stripes,
+                        }
+
+        except Exception as ex:
+            return f"ERROR: LVM volume collection failed: {str(ex)}"
+        return log_volume_result, lvm_group_result
+
+    def _parse_metadata(self, raw_data, data_type="metadata"):
+        """
+        Parse metadata that can be in various formats: dict, list, or JSON strings.
+
+        :param raw_data: Raw metadata from context
+        :param data_type: Type of data for logging purposes
+        :return: List of dictionaries
+        """
+        parsed_data = []
+
+        if not raw_data:
+            self.parent.log(
+                logging.INFO,
+                f"No {data_type} data provided (empty or None)",
+            )
+            return parsed_data
+
+        self.parent.log(
+            logging.INFO,
+            f"Parsing {data_type}: type={type(raw_data)}, "
+            f"length={len(raw_data) if hasattr(raw_data, '__len__') else 'N/A'}",
+        )
+
+        if isinstance(raw_data, list):
+            for item in raw_data:
+                if isinstance(item, dict):
+                    parsed_data.append(item)
+                elif isinstance(item, str):
+                    item_stripped = item.strip()
+                    if not item_stripped:
+                        continue
+                    try:
+                        parsed_item = json.loads(item_stripped)
+                        if isinstance(parsed_item, dict):
+                            parsed_data.append(parsed_item)
+                        elif isinstance(parsed_item, list):
+                            parsed_data.extend(parsed_item)
+                    except json.JSONDecodeError:
+                        self.parent.log(
+                            logging.WARNING,
+                            f"Failed to parse {data_type} item as JSON: {item_stripped[:100]}",
+                        )
+        elif isinstance(raw_data, dict):
+            parsed_data = [raw_data]
+        elif isinstance(raw_data, str):
+            try:
+                parsed_data = json.loads(raw_data)
+                if not isinstance(parsed_data, list):
+                    parsed_data = [parsed_data]
+            except json.JSONDecodeError:
+                for line in raw_data.splitlines():
+                    if line.strip():
+                        try:
+                            parsed_data.append(json.loads(line.strip()))
+                        except json.JSONDecodeError:
+                            self.parent.log(
+                                logging.WARNING,
+                                f"Failed to parse {data_type} line: {line.strip()[:100]}",
+                            )
+
+        validated_data = []
+        for item in parsed_data:
+            if isinstance(item, dict):
+                validated_data.append(item)
+            else:
+                self.parent.log(
+                    logging.WARNING,
+                    f"Skipping non-dict item in {data_type}: {type(item)} - {str(item)[:100]}",
+                )
+
+        self.parent.log(
+            logging.INFO,
+            f"Successfully parsed {len(validated_data)} {data_type} items, "
+            f"skipped {len(parsed_data) - len(validated_data)} non-dict items",
+        )
+
+        return validated_data
+
+    def gather_all_filesystem_info(
+        self, context, filesystems, lvm_volumes, vg_to_disk_names
+    ) -> list:
+        """
+        Gather all filesystem information and correlate as a single dictionary.
+
+        Returns a dictionary keyed by mount point/target with comprehensive filesystem metadata.
+        Fully populate all fields by correlating LVM data, Azure disk data, and VG-to-disk mappings.
+        For LVM volumes, aggregates IOPS/MBPS from all underlying Azure disks in the volume group.
+
+        Each entry contains: Target, Source, FSType, VG, Options, Size, Free, Used,
+        UsedPercent, MaxMBPS, MaxIOPS, StripeSize
+
+        :param context: Context object containing all required filesystem data
+        :type context: Dict[str, Any]
+        :param filesystems: List of filesystem dictionaries from _parse_filesystem_data
+        :type filesystems: List[Dict[str, Any]]
+        :param lvm_volumes: LVM volume information from collect_lvm_volumes
+        :type lvm_volumes: Dict[str, Any]
+        :param vg_to_disk_names: Pre-computed mapping of VG names to Azure disk names
+        :type vg_to_disk_names: Dict[str, List[str]]
+        :return: List keyed by target/mount point with all filesystem information
+        :rtype: list
+        """
+        try:
+            lvm_fullreport = context.get("lvm_fullreport", "")
+            if not lvm_fullreport or not lvm_fullreport.get("report"):
+                self.parent.log(
+                    logging.WARNING,
+                    "lvm_fullreport is empty or invalid. LVM data correlation will be incomplete.",
+                )
+
+            azure_disk_data = self._parse_metadata(
+                context.get("azure_disks_metadata", []), "Azure disk"
+            )
+            afs_storage_data = self._parse_metadata(
+                context.get("afs_storage_metadata", ""), "AFS storage"
+            )
+            anf_storage_data = self._parse_metadata(
+                context.get("anf_storage_metadata", ""), "ANF storage"
+            )
+            diskname_to_diskdata = {}
+            for disk_data in azure_disk_data:
+                disk_name = disk_data.get("name", "")
+                if disk_name:
+                    diskname_to_diskdata[disk_name] = disk_data
+
+            correlated_info = []
+
+            for fs in filesystems:
+                target = fs.get("target", "")
+                if not target:
+                    self.parent.log(
+                        logging.WARNING, f"Skipping filesystem entry with no target: {fs}"
+                    )
+                    continue
+
+                source = fs.get("source", "")
+                vg_name = fs.get("vg", "")
+                fstype = fs.get("fstype", "")
+                stripe_size = fs.get("stripe_size", "")
+                stripes = ""
+                lv_size = ""
+
+                if not stripe_size and vg_name and source:
+                    for lv_name, lv_info in lvm_volumes.items():
+                        if lv_info.get("dm_path") == source:
+                            stripe_size = lv_info.get("stripe_size", "")
+                            stripes = lv_info.get("stripes", "")
+                            lv_size = lv_info.get("size", "")
+                            self.parent.log(
+                                logging.INFO,
+                                f"Found LVM details for {target}: "
+                                + f"stripe_size={stripe_size}, stripes={stripes}",
+                            )
+                            break
+
+                max_mbps = fs.get("max_mbps", 0)
+                max_iops = fs.get("max_iops", 0)
+                azure_disk_names = []
+                disk_count = 0
+                if fstype in ["nfs", "nfs4"]:
+                    if ":" in source:
+                        nfs_address = source.split(":")[0]
+                        matched = False
+                        for anf_volume in anf_storage_data:
+                            anf_ip = anf_volume.get("ip", "")
+                            if anf_ip and anf_ip == nfs_address:
+                                max_mbps = anf_volume.get("throughputMibps", 0)
+                                max_iops = "-"
+                                self.parent.log(
+                                    logging.INFO,
+                                    f"Correlated NFS {target} with "
+                                    + f"ANF: MBPS={max_mbps}, ServiceLevel={anf_volume.get('serviceLevel', '')}",
+                                )
+                                matched = True
+                                break
+                        if not matched:
+                            for nfs_share in afs_storage_data:
+                                share_address = nfs_share.get("NFSAddress", "")
+                                if (
+                                    ":" in share_address
+                                    and share_address.split(":")[0] == nfs_address
+                                ):
+                                    max_mbps = nfs_share.get("ThroughputMibps", 0)
+                                    max_iops = nfs_share.get("IOPS", 0)
+                                    self.parent.log(
+                                        logging.INFO,
+                                        f"Correlated NFS {target} with "
+                                        + f"AFS: MBPS={max_mbps}, IOPS={max_iops}",
+                                    )
+                                    break
+
+                elif source.startswith("/dev/mapper/") and vg_name:
+                    disk_names = vg_to_disk_names.get(vg_name, [])
+
+                    if disk_names:
+                        azure_disk_names = disk_names
+                        disk_count = len(disk_names)
+                        total_mbps = 0
+                        total_iops = 0
+
+                        for disk_name in disk_names:
+                            disk_data = diskname_to_diskdata.get(disk_name)
+                            if disk_data:
+                                total_mbps += disk_data.get("mbps", 0)
+                                total_iops += disk_data.get("iops", 0)
+                            else:
+                                self.parent.log(
+                                    logging.WARNING,
+                                    f"No disk data found for {disk_name} in VG {vg_name}",
+                                )
+
+                        max_mbps = total_mbps
+                        max_iops = total_iops
+
+                        self.parent.log(
+                            logging.INFO,
+                            f"Aggregated performance for {target} (VG {vg_name}): "
+                            f"{disk_count} disks, MBPS={max_mbps}, IOPS={max_iops}",
+                        )
+                    else:
+                        self.parent.log(
+                            logging.WARNING, f"No disk mapping found for VG {vg_name} at {target}"
+                        )
+
+                elif source.startswith("/dev/sd") or source.startswith("/dev/nvme"):
+                    disk_name = source.split("/")[-1] if "/" in source else source
+
+                    for disk_data in azure_disk_data:
+                        if disk_data.get("name", "").endswith(disk_name):
+                            max_mbps = disk_data.get("mbps", 0)
+                            max_iops = disk_data.get("iops", 0)
+                            azure_disk_names = [disk_data.get("name", "")]
+                            disk_count = 1
+                            self.parent.log(
+                                logging.INFO,
+                                f"Correlated direct disk {target}: MBPS={max_mbps}, IOPS={max_iops}",
+                            )
+                            break
+                correlated_info.append(
+                    {
+                        "target": target,
+                        "source": source,
+                        "fstype": fstype,
+                        "vg": vg_name,
+                        "options": fs.get("options", ""),
+                        "size": fs.get("size", ""),
+                        "free": fs.get("free", ""),
+                        "used": fs.get("used", ""),
+                        "used_percent": fs.get("used_percent", ""),
+                        "max_mbps": max_mbps,
+                        "max_iops": max_iops,
+                        "stripe_size": stripe_size,
+                        "stripes": stripes,
+                        "azure_disk_names": azure_disk_names,
+                        "disk_count": disk_count,
+                    }
+                )
+
+            self.parent.log(
+                logging.INFO,
+                f"Successfully correlated FS info for {len(correlated_info)} mount points with "
+                f"{len(azure_disk_data)} Azure disks and {len(vg_to_disk_names)} VG mappings",
+            )
+
+            return correlated_info
+
+        except Exception as ex:
+            self.parent.log(
+                logging.ERROR, f"Failed to gather correlated filesystem information: {ex}"
+            )
+            self.parent.handle_error(ex)
+            return []
+
+    def gather_azure_disks_info(self, context, lvm_fullreport, device_lun_map):
+        """
+        Gather correlated Azure disk information with LUN, device mapping, and performance metrics.
+
+        :param context: Context containing Azure metadata
+        :param lvm_fullreport: LVM fullreport JSON
+        :param device_lun_map: Mapping of device names to LUN numbers
+        :return: List of Azure disk information dictionaries
+        :rtype: List[Dict[str, Any]]
+        """
+        azure_disks_info = []
+
+        try:
+            imds_metadata = self._parse_metadata(
+                context.get("imds_disks_metadata", []), "IMDS disk"
+            )
+            azure_disk_data = self._parse_metadata(
+                context.get("azure_disks_metadata", []), "Azure disk"
+            )
+
+            diskname_to_details = {}
+            for disk_data in azure_disk_data:
+                disk_name = disk_data.get("name", "")
+                if disk_name:
+                    diskname_to_details[disk_name] = disk_data
+            lun_to_imds = {}
+            for disk_info in imds_metadata:
+                lun = disk_info.get("lun")
+                if lun is not None:
+                    lun_to_imds[str(lun)] = disk_info
+            device_to_vg = {}
+            if lvm_fullreport and lvm_fullreport.get("report"):
+                for report in lvm_fullreport.get("report", []):
+                    pvs = report.get("pv", [])
+                    vgs = report.get("vg", [])
+                    vg_name = vgs[0].get("vg_name") if vgs else ""
+
+                    for pv in pvs:
+                        pv_name = pv.get("pv_name", "")
+                        if pv_name:
+                            device_name = pv_name.split("/")[-1] if "/" in pv_name else pv_name
+                            device_to_vg[device_name] = vg_name
+            for device_name, lun in device_lun_map.items():
+                imds_data = lun_to_imds.get(str(lun), {})
+                disk_name = imds_data.get("name", "")
+                disk_details = diskname_to_details.get(disk_name, {})
+                vg_name = device_to_vg.get(device_name, "")
+
+                azure_disks_info.append(
+                    {
+                        "LUNID": lun,
+                        "Name": disk_name,
+                        "DeviceName": f"/dev/{device_name}",
+                        "VolumeGroup": vg_name,
+                        "Size": disk_details.get("size", imds_data.get("diskSizeGB", "")),
+                        "DiskType": disk_details.get(
+                            "sku", imds_data.get("storageProfile", {}).get("sku", "")
+                        ),
+                        "IOPS": disk_details.get("iops", ""),
+                        "MBPS": disk_details.get("mbps", ""),
+                        "PerformanceTier": disk_details.get("tier", ""),
+                        "StorageType": disk_details.get("encryption", ""),
+                        "Caching": imds_data.get("caching", ""),
+                        "WriteAccelerator": imds_data.get("writeAcceleratorEnabled", False),
+                    }
+                )
+
+            self.parent.log(
+                logging.INFO,
+                f"Successfully correlated Azure disk info for {len(azure_disks_info)} disks",
+            )
+
+        except Exception as ex:
+            self.parent.log(logging.ERROR, f"Failed to gather Azure disk information: {ex}")
+
+        return azure_disks_info
+
+    def gather_lvm_groups_info(self, lvm_groups, vg_to_disk_names, azure_disk_data):
+        """
+        Gather correlated LVM volume group information with aggregated performance metrics.
+
+        :param lvm_groups: LVM groups from collect_lvm_volumes
+        :param vg_to_disk_names: Mapping of VG names to Azure disk names
+        :param azure_disk_data: Parsed Azure disk metadata
+        :return: List of LVM group information dictionaries
+        :rtype: List[Dict[str, Any]]
+        """
+        lvm_groups_info = []
+
+        try:
+            diskname_to_perf = {}
+            for disk_data in azure_disk_data:
+                disk_name = disk_data.get("name", "")
+                if disk_name:
+                    diskname_to_perf[disk_name] = {
+                        "iops": disk_data.get("iops", 0),
+                        "mbps": disk_data.get("mbps", 0),
+                    }
+            for vg_name, vg_data in lvm_groups.items():
+                disk_names = vg_to_disk_names.get(vg_name, [])
+                total_iops = 0
+                total_mbps = 0
+                for disk_name in disk_names:
+                    perf_data = diskname_to_perf.get(disk_name, {})
+                    total_iops += perf_data.get("iops", 0)
+                    total_mbps += perf_data.get("mbps", 0)
+
+                lvm_groups_info.append(
+                    {
+                        "Name": vg_name,
+                        "Disks": vg_data.get("disks", 0),
+                        "LogicalVolumes": vg_data.get("logical_volumes", 0),
+                        "TotalSize": vg_data.get("total_size", ""),
+                        "TotalIOPS": total_iops,
+                        "TotalMBPS": total_mbps,
+                    }
+                )
+
+            self.parent.log(
+                logging.INFO,
+                f"Successfully correlated LVM group info for {len(lvm_groups_info)} volume groups",
+            )
+
+        except Exception as ex:
+            self.parent.log(logging.ERROR, f"Failed to gather LVM group information: {ex}")
+
+        return lvm_groups_info
+
+    def gather_lvm_volumes_info(self, lvm_volumes):
+        """
+        Gather correlated LVM logical volume information.
+
+        :param lvm_volumes: LVM volumes from collect_lvm_volumes
+        :return: List of LVM volume information dictionaries
+        :rtype: List[Dict[str, Any]]
+        """
+        lvm_volumes_info = []
+
+        try:
+            for lv_name, lv_data in lvm_volumes.items():
+                lvm_volumes_info.append(
+                    {
+                        "Name": lv_name,
+                        "VGName": lv_data.get("vg_name", ""),
+                        "LVPath": lv_data.get("path", ""),
+                        "DMPath": lv_data.get("dm_path", ""),
+                        "Layout": lv_data.get("layout", ""),
+                        "Size": lv_data.get("size", ""),
+                        "StripeSize": lv_data.get("stripe_size", ""),
+                        "Stripes": lv_data.get("stripes", ""),
+                    }
+                )
+
+            self.parent.log(
+                logging.INFO,
+                f"Successfully correlated LVM volume info for {len(lvm_volumes_info)} logical volumes",
+            )
+
+        except Exception as ex:
+            self.parent.log(logging.ERROR, f"Failed to gather LVM volume information: {ex}")
+
+        return lvm_volumes_info
+
+    def gather_anf_volumes_info(self, filesystems, anf_storage_data):
+        """
+        Gather ANF volume information for volumes that are actually mounted on the system.
+        Extracts pool name and volume name from the ANF resource ID.
+
+        :param filesystems: List of filesystem dictionaries from _parse_filesystem_data
+        :param anf_storage_data: Parsed ANF storage metadata
+        :return: List of ANF volume information dictionaries
+        :rtype: List[Dict[str, Any]]
+        """
+        anf_volumes_info = []
+
+        try:
+            mounted_anf_ips = set()
+            for fs in filesystems:
+                if fs.get("fstype") in ["nfs", "nfs4"] and fs.get("nfs_type") == "ANF":
+                    source = fs.get("source", "")
+                    if ":" in source:
+                        nfs_address = source.split(":")[0]
+                        mounted_anf_ips.add(nfs_address)
+
+            self.parent.log(
+                logging.INFO,
+                f"Found {len(mounted_anf_ips)} mounted ANF IPs: {mounted_anf_ips}. "
+                f"Total ANF volumes in metadata: {len(anf_storage_data)}",
+            )
+
+            for anf_volume in anf_storage_data:
+                anf_ip = anf_volume.get("ip", "")
+
+                if anf_ip and anf_ip in mounted_anf_ips:
+                    resource_id = anf_volume.get("id", "")
+                    pool_name = ""
+                    vol_name = ""
+
+                    if resource_id:
+                        parts = resource_id.split("/")
+                        try:
+                            if "capacityPools" in parts:
+                                pool_idx = parts.index("capacityPools")
+                                if pool_idx + 1 < len(parts):
+                                    pool_name = parts[pool_idx + 1]
+                            if "volumes" in parts:
+                                vol_idx = parts.index("volumes")
+                                if vol_idx + 1 < len(parts):
+                                    vol_name = parts[vol_idx + 1]
+                        except (ValueError, IndexError):
+                            self.parent.log(
+                                logging.WARNING,
+                                f"Failed to parse ANF resource ID: {resource_id}",
+                            )
+
+                    if not vol_name:
+                        name_field = anf_volume.get("name", "")
+                        if "/" in name_field:
+                            name_parts = name_field.split("/")
+                            if len(name_parts) >= 2:
+                                pool_name = name_parts[-2] if not pool_name else pool_name
+                                vol_name = name_parts[-1]
+
+                    protocol_types = anf_volume.get("protocolTypes", [])
+                    if isinstance(protocol_types, list):
+                        protocol_str = ", ".join(protocol_types)
+                    else:
+                        protocol_str = str(protocol_types)
+
+                    anf_volumes_info.append(
+                        {
+                            "VolumeName": vol_name,
+                            "PoolName": pool_name,
+                            "ServiceLevel": anf_volume.get("serviceLevel", ""),
+                            "ThroughputMibps": anf_volume.get("throughputMibps", 0),
+                            "ProtocolTypes": protocol_str,
+                            "NFSAddress": anf_ip,
+                        }
+                    )
+                else:
+                    if anf_ip:
+                        self.parent.log(
+                            logging.DEBUG,
+                            f"Skipping ANF volume {anf_volume.get('name')} with IP {anf_ip} - not mounted on this system",
+                        )
+                    else:
+                        self.parent.log(
+                            logging.DEBUG,
+                            f"Skipping ANF volume {anf_volume.get('name')} - no IP address found",
+                        )
+
+            self.parent.log(
+                logging.INFO,
+                f"Successfully gathered ANF volume info for {len(anf_volumes_info)} mounted volumes "
+                f"(filtered from {len(anf_storage_data)} total ANF volumes)",
+            )
+
+        except Exception as ex:
+            self.parent.log(logging.ERROR, f"Failed to gather ANF volume information: {ex}")
+
+        return anf_volumes_info
+
+    def collect(self, check, context) -> Any:
+        """
+        Collect filesystem information
+
+        :param check: Check object
+        :type check: Check
+        :param context: Context object
+        :type context: Dict[str, Any]
+        :return: Filesystem information
+        :rtype: Dict[str, Any]
+        """
+        try:
+            lvm_fullreport = context.get("lvm_fullreport", "")
+            if not lvm_fullreport or lvm_fullreport == {} or not lvm_fullreport.get("report"):
+                self.parent.log(
+                    logging.ERROR,
+                    f"lvm_fullreport is empty or invalid: {lvm_fullreport}. "
+                    f"LVM data collection may have failed. VG-to-disk mapping will not work.",
+                )
+
+            lvm_volumes, lvm_groups = self.collect_lvm_volumes(lvm_fullreport)
+
+            findmnt_output = context.get("mount_info", "")
+            df_output = context.get("df_info", "")
+
+            raw_anf_data = context.get("anf_storage_metadata", "")
+            self.parent.log(
+                logging.INFO,
+                f"Raw ANF data type: {type(raw_anf_data)}, "
+                f"Length: {len(raw_anf_data) if hasattr(raw_anf_data, '__len__') else 'N/A'}, "
+                f"First 500 chars: {str(raw_anf_data)[:500]}",
+            )
+
+            azure_disk_data = self._parse_metadata(
+                context.get("azure_disks_metadata", []), "Azure disk"
+            )
+            afs_storage_data = self._parse_metadata(
+                context.get("afs_storage_metadata", ""), "AFS storage"
+            )
+            anf_storage_data = self._parse_metadata(raw_anf_data, "ANF storage")
+            imds_metadata = self._parse_metadata(
+                context.get("imds_disks_metadata", []), "IMDS disk"
+            )
+
+            device_lun_map = context.get("device_lun_map", {})
+            vg_to_disk_names = {}
+            if device_lun_map and imds_metadata:
+                vg_to_disk_names = self._map_vg_to_disk_names(
+                    lvm_fullreport, imds_metadata, device_lun_map
+                )
+            elif imds_metadata:
+                self.parent.log(
+                    logging.WARNING,
+                    "device_lun_map not found in context. LVM disk mapping may be incomplete.",
+                )
+
+            self.parent.log(
+                logging.INFO,
+                f"findmnt_output: {findmnt_output}\n"
+                f"df_output: {df_output}\n"
+                f"Azure disk data type: {type(azure_disk_data)}, Count: {len(azure_disk_data)}\n"
+                f"IMDS metadata type: {type(imds_metadata)}, Count: {len(imds_metadata)}\n"
+                f"ANF storage data type: {type(anf_storage_data)}, Count: {len(anf_storage_data)}\n"
+                f"AFS storage data type: {type(afs_storage_data)}, Count: {len(afs_storage_data)}\n"
+                f"VG→disk_names mapping: {vg_to_disk_names}",
+            )
+
+            filesystems = self._parse_filesystem_data(
+                findmnt_output,
+                df_output,
+                lvm_volumes,
+                lvm_groups,
+                azure_disk_data=azure_disk_data,
+                anf_storage_data=anf_storage_data,
+                afs_storage_data=afs_storage_data,
+                vg_to_disk_names=vg_to_disk_names,
+            )
+
+            formatted_filesystem_info = self.gather_all_filesystem_info(
+                context=context,
+                filesystems=filesystems,
+                lvm_volumes=lvm_volumes,
+                vg_to_disk_names=vg_to_disk_names,
+            )
+
+            azure_disks_info = self.gather_azure_disks_info(
+                context=context,
+                lvm_fullreport=lvm_fullreport,
+                device_lun_map=device_lun_map,
+            )
+
+            lvm_groups_info = self.gather_lvm_groups_info(
+                lvm_groups=lvm_groups,
+                vg_to_disk_names=vg_to_disk_names,
+                azure_disk_data=azure_disk_data,
+            )
+
+            lvm_volumes_info = self.gather_lvm_volumes_info(
+                lvm_volumes=lvm_volumes,
+            )
+
+            anf_volumes_info = self.gather_anf_volumes_info(
+                filesystems=filesystems,
+                anf_storage_data=anf_storage_data,
+            )
+
+            return {
+                "filesystems": filesystems,
+                "lvm_volumes": lvm_volumes,
+                "lvm_groups": lvm_groups,
+                "formatted_filesystem_info": formatted_filesystem_info,
+                "azure_disks_info": azure_disks_info,
+                "lvm_groups_info": lvm_groups_info,
+                "lvm_volumes_info": lvm_volumes_info,
+                "anf_volumes_info": anf_volumes_info,
+            }
+
+        except Exception as ex:
+            self.parent.handle_error(ex)
+            return {"ERROR: Filesystem data collection failed": str(ex)}
diff --git a/src/module_utils/sap_automation_qa.py b/src/module_utils/sap_automation_qa.py
index bd94b369..3d06afad 100644
--- a/src/module_utils/sap_automation_qa.py
+++ b/src/module_utils/sap_automation_qa.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
 """
 This module is used to setup the context for the test cases
 and setup base variables for the test case running in the sap-automation-qa
@@ -7,8 +10,10 @@
 import sys
 import logging
 import subprocess
-from typing import Dict, Any
+import traceback
+from typing import Optional, Dict, Any
 import xml.etree.ElementTree as ET
+import yaml
 
 try:
     from ansible.module_utils.enums import Result, TestStatus
@@ -63,7 +68,7 @@ def handle_error(self, exception: Exception, stderr: str = ""):
         :param stderr: Standard error output from the command
         :type stderr: str
         """
-        error_message = f"Error executing command: {exception}."
+        error_message = f"Error: {exception}."
         if stderr:
             error_message += f" More errors: {stderr}"
         error_message.replace("'", "")
@@ -71,6 +76,7 @@ def handle_error(self, exception: Exception, stderr: str = ""):
         self.result["status"] = TestStatus.ERROR.value
         self.result["message"] = error_message
         self.result["logs"].append(error_message)
+        self.result["logs"].append(f"Traceback:\n{traceback.format_exc()}")
 
     def execute_command_subprocess(self, command: Any, shell_command: bool = False) -> str:
         """
@@ -91,7 +97,7 @@ def execute_command_subprocess(self, command: Any, shell_command: bool = False)
         try:
             command_output = subprocess.run(
                 command,
-                timeout=30,
+                timeout=100,
                 check=True,
                 stdout=subprocess.PIPE,
                 stderr=subprocess.PIPE,
@@ -99,14 +105,26 @@ def execute_command_subprocess(self, command: Any, shell_command: bool = False)
             )
             stdout = command_output.stdout.decode("utf-8")
             stderr = command_output.stderr.decode("utf-8")
-            return stdout if not stderr else stderr
+
+            if stdout and stderr:
+                return f"{stdout}\nERROR: {stderr}"
+            elif stderr:
+                return stderr
+            else:
+                return stdout
         except subprocess.TimeoutExpired as ex:
             self.handle_error(ex, "Command timed out")
+            return f"ERROR: Command timed out after 100 seconds"
         except subprocess.CalledProcessError as ex:
-            self.handle_error(ex, ex.stderr.decode("utf-8").strip())
+            stderr_msg = ex.stderr.decode("utf-8").strip() if ex.stderr else ""
+            error_msg = f"ERROR: Command failed with exit code {ex.returncode}"
+            if stderr_msg:
+                error_msg += f": {stderr_msg}"
+            self.handle_error(ex, stderr_msg)
+            return error_msg
         except Exception as ex:
             self.handle_error(ex, "")
-        return ""
+            return f"ERROR: Unexpected error during command execution: {str(ex)}"
 
     def parse_xml_output(self, xml_output: str) -> ET.Element:
         """
@@ -129,3 +147,18 @@ def get_result(self) -> Dict[str, Any]:
         :rtype: Dict[str, Any]
         """
         return self.result
+
+    def parse_yaml_from_content(self, yaml_content: str) -> Optional[Dict[str, Any]]:
+        """
+        Parses a YAML file and returns its content as a dictionary.
+
+        :param yaml_content: Content of the YAML file
+        :type yaml_content: str
+        :return: Content of the YAML file as a dictionary
+        :rtype: Optional[Dict[str, Any]]
+        """
+        try:
+            return yaml.load(yaml_content, Loader=getattr(yaml, "CSafeLoader", yaml.SafeLoader))
+        except yaml.YAMLError as ex:
+            self.log(logging.ERROR, f"Error parsing YAML content: {ex}")
+            return None
diff --git a/src/modules/configuration_check_module.py b/src/modules/configuration_check_module.py
new file mode 100644
index 00000000..d3eda21f
--- /dev/null
+++ b/src/modules/configuration_check_module.py
@@ -0,0 +1,972 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+"""
+Ansible Python module to check the configuration of the workload system running on Azure
+"""
+
+import logging
+import time
+import json
+from typing import Optional, Dict, Any, List, Type
+from datetime import datetime
+from concurrent.futures import ThreadPoolExecutor
+from ansible.module_utils.basic import AnsibleModule
+
+try:
+    from ansible.module_utils.sap_automation_qa import SapAutomationQA
+    from ansible.module_utils.enums import (
+        TestStatus,
+        TestSeverity,
+        Check,
+        CheckResult,
+        ApplicabilityRule,
+    )
+    from ansible.module_utils.collector import (
+        Collector,
+        CommandCollector,
+        AzureDataParser,
+        ModuleCollector,
+    )
+    from ansible.module_utils.filesystem_collector import FileSystemCollector
+except ImportError:
+    from src.module_utils.sap_automation_qa import SapAutomationQA
+    from src.module_utils.enums import (
+        TestStatus,
+        TestSeverity,
+        Check,
+        CheckResult,
+        ApplicabilityRule,
+    )
+    from src.module_utils.collector import (
+        Collector,
+        CommandCollector,
+        AzureDataParser,
+        ModuleCollector,
+    )
+    from src.module_utils.filesystem_collector import FileSystemCollector
+
+
+class ConfigurationCheckModule(SapAutomationQA):
+    """
+    Class to handle configuration checks using the ConfigurationCheck class.
+    """
+
+    def __init__(self, module):
+        self.module = module
+        self.module_params = module.params
+        super().__init__()
+        self.checks: List[Check] = []
+        self.result.update(
+            {
+                "check_results": [],
+            }
+        )
+        self.hostname: Optional[str] = None
+        self.start_time: Optional[datetime] = None
+        self.end_time: Optional[datetime] = None
+        self.context: Dict[str, Any] = {}
+        self._collector_registry = self._init_collector_registry()
+        self._validator_registry = self._init_validator_registry()
+        self.failure_count = 0
+        self.max_failures = 5
+        self.last_failure_time = None
+
+    def _init_collector_registry(self) -> Dict[str, Type[Collector]]:
+        """
+        Initialize collector registry with built-in collectors
+        """
+        return {
+            "command": CommandCollector,
+            "azure": AzureDataParser,
+            "module": ModuleCollector,
+        }
+
+    def _init_validator_registry(self) -> Dict[str, Any]:
+        """
+        Initialize validator registry with built-in validators
+        """
+        return {
+            "string": self.validate_string,
+            "range": self.validate_numeric_range,
+            "list": self.validate_list,
+            "check_support": self.validate_vm_support,
+            "properties": self.validate_properties,
+        }
+
+    def execute_check_with_retry(self, check: Check, max_retries: int = 3) -> CheckResult:
+        """
+        Execute check with retry logic for enhanced robustness
+
+        :param check: Check to execute
+        :type check: Check
+        :param max_retries: Maximum number of retry attempts
+        :type max_retries: int
+        :return: Result of the check execution
+        :rtype: CheckResult
+        """
+        last_error = None
+
+        for attempt in range(max_retries):
+            try:
+                self.log(
+                    logging.DEBUG,
+                    f"Executing check {check.id}, attempt {attempt + 1}/{max_retries}",
+                )
+                return self.execute_check(check)
+            except Exception as e:
+                last_error = e
+                self.log(
+                    logging.WARNING, f"Check {check.id} failed on attempt {attempt + 1}: {str(e)}"
+                )
+
+                if attempt < max_retries - 1:
+                    wait_time = 2**attempt
+                    self.log(logging.INFO, f"Retrying check {check.id} in {wait_time} seconds...")
+                    time.sleep(wait_time)
+                else:
+                    self.log(logging.ERROR, f"Check {check.id} failed after {max_retries} attempts")
+
+        return CheckResult(
+            check=check,
+            status=TestStatus.ERROR,
+            hostname=self.hostname or "unknown",
+            expected_value=None,
+            actual_value=None,
+            execution_time=0,
+            timestamp=datetime.now(),
+            details=f"Check failed after {max_retries} attempts. Last error: {str(last_error)}",
+        )
+
+    def build_execution_order(self, checks: List[Check]) -> List[List[Check]]:
+        """
+        Group checks into execution batches based on dependencies using simple topological sort
+
+        :param checks: List of checks to order
+        :type checks: List[Check]
+        :return: List of batches that can run in parallel
+        :rtype: List[List[Check]]
+        """
+        check_map = {check.id: check for check in checks}
+        batches = []
+        remaining_checks = set(check.id for check in checks)
+
+        while remaining_checks:
+            ready_checks = []
+            for check_id in remaining_checks:
+                check = check_map[check_id]
+                dependencies = getattr(check, "dependencies", [])
+                if not dependencies or not any(dep in remaining_checks for dep in dependencies):
+                    ready_checks.append(check)
+
+            if not ready_checks:
+                self.log(
+                    logging.WARNING,
+                    "Potential circular dependency detected, adding remaining checks to batch",
+                )
+                ready_checks = [check_map[check_id] for check_id in remaining_checks]
+
+            batches.append(ready_checks)
+            remaining_checks -= {check.id for check in ready_checks}
+
+        return batches
+
+    def execute_checks_parallel(
+        self,
+        filter_tags: Optional[List[str]] = None,
+        filter_categories: Optional[List[str]] = None,
+        max_workers: int = 3,
+        enable_retry: bool = True,
+    ) -> list:
+        """
+        Execute checks in parallel batches respecting dependencies
+
+        :param filter_tags: Optional list of tags to filter checks by
+        :type filter_tags: Optional[List[str]]
+        :param filter_categories: Optional list of categories to filter checks by
+        :type filter_categories: Optional[List[str]]
+        :param max_workers: Maximum number of parallel workers
+        :type max_workers: int
+        :param enable_retry: Whether to enable retry mechanism
+        :type enable_retry: bool
+        :return: List of check results
+        :rtype: List[CheckResult]
+        """
+        checks_to_run = self.checks
+
+        if filter_tags:
+            checks_to_run = [
+                check for check in checks_to_run if any(tag in check.tags for tag in filter_tags)
+            ]
+
+        if filter_categories:
+            checks_to_run = [
+                check for check in checks_to_run if check.category in filter_categories
+            ]
+
+        if not checks_to_run:
+            self.log(logging.WARNING, "No checks to execute after applying filters")
+            return []
+
+        self.start_time = datetime.now()
+        self.log(
+            logging.INFO,
+            f"Starting parallel execution of {len(checks_to_run)} checks with {max_workers} workers",
+        )
+        execution_batches = self.build_execution_order(checks_to_run)
+        self.log(logging.INFO, f"Organized checks into {len(execution_batches)} execution batches")
+        for i, batch in enumerate(execution_batches):
+            self.log(
+                logging.INFO, f"Batch {i+1}: {len(batch)} checks - {[check.id for check in batch]}"
+            )
+
+        results = []
+        for batch_idx, batch in enumerate(execution_batches):
+            self.log(
+                logging.INFO,
+                f"Executing batch {batch_idx + 1}/{len(execution_batches)} with {len(batch)} checks",
+            )
+
+            actual_workers = min(max_workers, len(batch))
+            self.log(logging.INFO, f"Using {actual_workers} workers for batch {batch_idx + 1}")
+
+            with ThreadPoolExecutor(max_workers=actual_workers) as executor:
+                if enable_retry:
+                    futures = [
+                        executor.submit(self.execute_check_with_retry, check) for check in batch
+                    ]
+                else:
+                    futures = [executor.submit(self.execute_check, check) for check in batch]
+
+                batch_results = [future.result() for future in futures]
+                results.extend(batch_results)
+                self.result["check_results"].extend(batch_results)
+
+        self.end_time = datetime.now()
+        duration = (self.end_time - self.start_time).total_seconds()
+
+        self.log(logging.INFO, f"Parallel execution completed in {duration:.2f} seconds")
+
+        summary = self.get_results_summary()
+
+        self.result.update(
+            {
+                "status": (
+                    TestStatus.SUCCESS.value if summary["failed"] == 0 else TestStatus.ERROR.value
+                ),
+                "message": f"Parallel execution completed with {summary['failed']} failures",
+                "summary": summary,
+                "execution_summary": {
+                    "total_checks": len(results),
+                    "execution_time": duration,
+                    "parallel_batches": len(execution_batches),
+                    "max_workers": max_workers,
+                },
+            }
+        )
+
+        return results
+
+    def is_check_applicable(self, check: Check) -> bool:
+        """
+        Check if a check is applicable based on its applicability rules and the current context
+
+        :param check: The check to evaluate
+        :type check: Check
+        :return: True if applicable, False otherwise
+        :rtype: bool
+        """
+        self.log(
+            logging.DEBUG,
+            f"Checking applicability for check {check.applicability} with context: {self.context}",
+        )
+        for rule in check.applicability:
+            context_value = self.context.get(rule.property)
+            if not rule.is_applicable(context_value):
+                self.log(
+                    logging.DEBUG,
+                    f"Check {check.id} not applicable: Rule for '{rule.property}' with value "
+                    + f"'{rule.value}' doesn't match context value '{context_value}'",
+                )
+                return False
+
+        return True
+
+    def set_context(self, context: Dict[str, Any]) -> None:
+        """
+        Set execution context for checks
+
+        :param context: Dictionary containing context variables like OS, version, etc.
+        :type context: Dict[str, Any]
+        """
+        self.context = context
+        self.hostname = context.get("hostname")
+
+    def load_checks(self, raw_file_content: str) -> None:
+        """
+        Load checks from a YAML file.
+        Validates the structure and initializes Check objects based on applicability rules.
+
+        :param raw_file_content: Check file content as a string or dictionary
+        :type raw_file_content: str or dict
+        """
+        check_file_content = None
+
+        if isinstance(raw_file_content, str):
+            check_file_content = self.parse_yaml_from_content(raw_file_content)
+
+        if not check_file_content:
+            self.log(logging.ERROR, "YAML parsing failed: No content found.")
+            return
+
+        if "checks" in check_file_content:
+            checks = check_file_content.get("checks", [])
+        else:
+            checks = check_file_content
+        if not checks:
+            self.log(logging.ERROR, "No checks found in the file.")
+            return
+        for check in checks:
+            if not isinstance(check, dict):
+                self.log(logging.ERROR, f"Invalid check format. {check}")
+                continue
+
+            applicability_rules = []
+            if "applicability" in check and isinstance(check["applicability"], dict):
+                for property_name, property_value in check["applicability"].items():
+                    applicability_rules.append(
+                        ApplicabilityRule(property=property_name, value=property_value)
+                    )
+
+            self.checks.append(
+                Check(
+                    id=check.get("id", "unknown"),
+                    name=check.get("name", "Unnamed Check"),
+                    description=check.get("description", ""),
+                    category=check.get("category", "General"),
+                    workload=check.get("workload", "SAP"),
+                    severity=TestSeverity(check.get("severity", "WARNING")),
+                    collector_type=check.get("collector_type", "command"),
+                    collector_args=check.get("collector_args", {}),
+                    validator_type=check.get("validator_type", "string"),
+                    validator_args=check.get("validator_args", {}),
+                    tags=check.get("tags", []),
+                    applicability=applicability_rules,
+                    references=check.get("references", {}),
+                    report=check.get("report", "check"),
+                )
+            )
+        self.log(
+            logging.INFO,
+            f"Loaded {len(self.checks)} checks from the configuration file.",
+        )
+
+    def _create_validation_result(self, severity: TestSeverity, is_success: bool) -> TestStatus:
+        """
+        Create a validation result based on TestSeverity and success status
+
+        :param severity: TestSeverity of the check
+        :type severity: TestSeverity
+        :param is_success: Whether the check was successful
+        :type is_success: bool
+        """
+        if is_success:
+            return TestStatus.SUCCESS.value
+
+        TestSeverity_map = {
+            severity.INFO: TestStatus.INFO.value,
+            severity.LOW: TestStatus.WARNING.value,
+            severity.WARNING: TestStatus.WARNING.value,
+            severity.CRITICAL: TestStatus.ERROR.value,
+        }
+        return TestSeverity_map.get(severity, TestStatus.ERROR.value)
+
+    def validate_properties(self, check: Check, collected_data: str) -> Dict[str, Any]:
+        """
+        Validate collected properties against expected properties
+
+        :param check: Check definition
+        :type check: Check
+        :param collected_data: Collected properties as JSON string
+        :type collected_data: str
+        :return: Validation result
+        :rtype: Dict[str, Any]
+        """
+        expected_properties = check.validator_args.get("properties", [])
+        if not isinstance(expected_properties, list):
+            expected_properties = []
+
+        try:
+            collected_properties = json.loads(collected_data) if collected_data else {}
+        except (json.JSONDecodeError, TypeError):
+            return {
+                "status": TestStatus.ERROR.value,
+            }
+        if isinstance(collected_properties, dict) and "error" in collected_properties:
+            return {
+                "status": TestStatus.ERROR.value,
+            }
+        is_valid = True
+        for prop in expected_properties:
+            if not isinstance(prop, dict):
+                continue
+            if prop.get("property", "") not in collected_properties or str(
+                collected_properties[prop.get("property", "")]
+            ) != str(prop.get("value", "")):
+                is_valid = False
+                break
+        return {
+            "status": self._create_validation_result(check.severity, is_valid),
+        }
+
+    def validate_string(self, check: Check, collected_data: str) -> Dict[str, Any]:
+        """
+        Validate string data against expected values
+
+        :param check: The check definition
+        :type check: Check
+        :param collected_data: Collected string data
+        :type collected_data: str
+        :return: Validation result
+        :rtype: Dict[str, Any]
+        """
+        expected = check.validator_args.get("expected") or check.validator_args.get(
+            "expected_output", ""
+        )
+        collected = str(collected_data).strip() if collected_data is not None else ""
+
+        if check.validator_args.get("strip_whitespace", True):
+            expected = str(expected).strip()
+
+        if check.validator_args.get("case_insensitive", False):
+            expected = expected.lower()
+            collected = collected.lower()
+
+        return {
+            "status": self._create_validation_result(check.severity, collected == expected),
+        }
+
+    def validate_numeric_range(self, check: Check, collected_data: str) -> Dict[str, Any]:
+        """
+        Validate numeric data against expected range
+
+        :param check: The check definition
+        :type check: Check
+        :param collected_data: Collected numeric data as string
+        :type collected_data: str
+        :return: Validation result
+        :rtype: Dict[str, Any]
+        """
+        try:
+            value = float(str(collected_data).strip())
+            min_val = float(check.validator_args.get("min", "-inf"))
+            max_val = float(check.validator_args.get("max", "inf"))
+
+            return {
+                "status": self._create_validation_result(
+                    check.severity, min_val <= value <= max_val
+                ),
+            }
+        except ValueError:
+            return {
+                "status": TestStatus.ERROR.value,
+            }
+
+    def validate_list(self, check: Check, collected_data: str) -> Dict[str, Any]:
+        """
+        Validate collected data against expected list (contains)
+
+        :param check: Check
+        :type check: Check
+        :param collected_data: Data collected from system
+        :type collected_data: str
+        :return: Validation result dictionary
+        :rtype: Dict[str, Any]
+        """
+        expected_list = check.validator_args.get("valid_list", [])
+        if not isinstance(expected_list, list):
+            expected_list = []
+        collected_list = str(collected_data).strip().split(",") if collected_data else []
+        collected_list = [item.strip() for item in collected_list]
+        return {
+            "status": self._create_validation_result(
+                check.severity, any(item in expected_list for item in collected_list)
+            ),
+        }
+
+    def validate_vm_support(self, check: Check, collected_data: str) -> Dict[str, Any]:
+        """
+        Validates if a VM SKU is supported for the given role and database type
+
+        :param check: Check definition
+        :type check: Check
+        :param collected_data: VM SKU from metadata service
+        :type collected_data: str
+        :return: Validation result
+        :rtype: Dict[str, Any]
+        """
+        try:
+            value = collected_data.strip()
+            role = self.context.get("role", "")
+            database_type = self.context.get("database_type", "")
+            validation_rules = check.validator_args.get("validation_rules", {})
+            supported_configurations = self.context.get("supported_configurations", {}).get(
+                validation_rules, {}
+            )
+
+            if not value or not supported_configurations or not role:
+                return {
+                    "status": TestStatus.ERROR.value,
+                }
+
+            if "VMs" in validation_rules:
+                if database_type not in supported_configurations.get(value, {}).get(role, {}).get(
+                    "SupportedDB", []
+                ):
+                    return {
+                        "status": TestStatus.ERROR.value,
+                    }
+
+            elif "OSDB" in validation_rules:
+                if role not in supported_configurations.get(
+                    database_type, {}
+                ) or value.upper() not in supported_configurations.get(database_type, {}).get(
+                    role, []
+                ):
+                    return {
+                        "status": TestStatus.ERROR.value,
+                    }
+
+            return {
+                "status": TestStatus.SUCCESS.value,
+            }
+
+        except Exception:
+            return {
+                "status": TestStatus.ERROR.value,
+            }
+
+    def validate_result(self, check: Check, collected_data: Any) -> Dict[str, Any]:
+        """
+        Validate collected data based on the validator type
+
+        :param check: Check definition
+        :type check: Check
+        :param collected_data: Data collected from system
+        :type collected_data: Any
+        :return: Validation result dictionary
+        :rtype: Dict[str, Any]
+        """
+        validator = self._validator_registry.get(check.validator_type)
+        if validator:
+            return validator(check, collected_data)
+        else:
+            available = list(self._validator_registry.keys())
+            return {
+                "status": TestStatus.ERROR.value,
+                "details": f"Validator '{check.validator_type}' not found. Available: {available}",
+            }
+
+    def execute_check(self, check: Check) -> CheckResult:
+        """
+        Execute a single check against the current context
+
+        :param check: Check to execute
+        :type check: Check
+        :return: Result of the check execution
+        :rtype: CheckResult
+        """
+
+        def create_result(
+            status: TestStatus,
+            actual_value=None,
+            execution_time=0,
+            details=None,
+        ) -> CheckResult:
+            """
+            Create a CheckResult object
+
+            :param status: Status of the check execution
+            :type status: TestStatus
+            :param actual_value: Actual value collected during the check, defaults to None
+            :type actual_value: str, optional
+            :param execution_time: Time taken to execute the check, defaults to 0
+            :type execution_time: int, optional
+            :param details: Additional details about the check execution, defaults to None
+            :type details: str, optional
+            :return: CheckResult object
+            :rtype: CheckResult
+            """
+            expected_value = ""
+            if check.validator_type == "range":
+                min_val = check.validator_args.get("min", "N/A")
+                max_val = check.validator_args.get("max", "N/A")
+                expected_value = f"Min: {min_val}, Max: {max_val}"
+            elif check.validator_type == "list":
+                valid_list = check.validator_args.get("valid_list", [])
+                if isinstance(valid_list, list) and valid_list:
+                    expected_value = ", ".join(str(v) for v in valid_list)
+            elif check.validator_type == "properties":
+                props = check.validator_args.get("properties", [])
+                if isinstance(props, list) and props:
+                    expected_value = ", ".join(
+                        [
+                            f"{prop.get('name', prop.get('property', ''))}:{prop.get('value', '')}"
+                            for prop in props
+                            if isinstance(prop, dict)
+                        ]
+                    )
+            else:
+                expected_value = check.validator_args.get(
+                    "expected", check.validator_args.get("expected_output", "")
+                )
+
+            return CheckResult(
+                check=check,
+                status=status,
+                hostname=self.hostname or "unknown",
+                expected_value=expected_value,
+                actual_value=actual_value,
+                execution_time=execution_time,
+                timestamp=datetime.now(),
+                details=details,
+            )
+
+        if not self.is_check_applicable(check):
+            return create_result(TestStatus.SKIPPED.value, details="Check not applicable")
+
+        collector_class = self._collector_registry.get(check.collector_type)
+        if not collector_class:
+            available = list(self._collector_registry.keys())
+            return create_result(
+                status=TestStatus.ERROR.value,
+                details=f"Collector '{check.collector_type}' not found. Available: {available}",
+            )
+
+        collector = collector_class(parent=self)
+        start_time = time.time()
+        try:
+            collected_data = collector.collect(check, self.context)
+            execution_time = time.time() - start_time
+            if check.severity == TestSeverity.INFO:
+                return create_result(TestStatus.INFO.value, actual_value=collected_data)
+            validation_result = self.validate_result(check, collected_data)
+            return create_result(
+                status=validation_result["status"],
+                actual_value=collected_data,
+                execution_time=int(execution_time),
+            )
+
+        except Exception as e:
+            execution_time = time.time() - start_time
+            self.log(logging.ERROR, f"Error executing check {check.id}: {str(e)}")
+            return create_result(
+                status=TestStatus.ERROR.value,
+                actual_value=None,
+                execution_time=int(execution_time),
+                details=f"Error: {str(e)}",
+            )
+
+    def execute_checks(
+        self,
+        filter_tags: Optional[List[str]] = None,
+        filter_categories: Optional[List[str]] = None,
+        parallel: bool = False,
+        max_workers: int = 3,
+        enable_retry: bool = False,
+    ) -> list:
+        """
+        Execute all loaded checks, optionally filtered by tags or categories
+
+        :param filter_tags: Optional list of tags to filter checks by
+        :type filter_tags: Optional[List[str]]
+        :param filter_categories: Optional list of categories to filter checks by
+        :type filter_categories: Optional[List[str]]
+        :param parallel: Whether to execute checks in parallel
+        :type parallel: bool
+        :param max_workers: Maximum number of parallel workers (ignored if parallel=False)
+        :type max_workers: int
+        :param enable_retry: Whether to enable retry mechanism for failed checks
+        :type enable_retry: bool
+        :return: List of check results
+        :rtype: List[CheckResult]
+        """
+        if parallel:
+            return self.execute_checks_parallel(
+                filter_tags=filter_tags,
+                filter_categories=filter_categories,
+                max_workers=max_workers,
+                enable_retry=enable_retry,
+            )
+        checks_to_run = self.checks
+
+        if filter_tags:
+            tag_set = set(filter_tags)
+            checks_to_run = [c for c in checks_to_run if any(tag in tag_set for tag in c.tags)]
+
+        if filter_categories:
+            category_set = set(filter_categories)
+            checks_to_run = [c for c in checks_to_run if c.category in category_set]
+
+        if not checks_to_run:
+            self.log(
+                logging.WARNING,
+                f"No checks match the specified filters: tags={filter_tags}, "
+                + f"categories={filter_categories}",
+            )
+            return list()
+
+        self.start_time = datetime.now()
+        self.log(logging.INFO, f"Starting execution of {len(checks_to_run)} checks")
+
+        results = list()
+        for check in checks_to_run:
+            if enable_retry:
+                result = self.execute_check_with_retry(check)
+            else:
+                result = self.execute_check(check)
+            results.append(result)
+            self.result["check_results"].append(result)
+
+        self.end_time = datetime.now()
+
+        summary = self.get_results_summary()
+
+        duration = (self.end_time - self.start_time).total_seconds()
+        self.log(
+            logging.INFO,
+            f"Check execution complete. Duration: {duration:.2f}s. "
+            f"PASSED: {summary['passed']}, FAILED: {summary['failed']}, "
+            f"WARNING: {summary['warnings']},"
+            f"SKIPPED: {summary['skipped']}",
+        )
+
+        self.result.update(
+            {
+                "status": (
+                    TestStatus.SUCCESS.value if summary["failed"] == 0 else TestStatus.ERROR.value
+                ),
+                "message": f"Check execution completed with {summary['failed']} failures",
+                "summary": summary,
+                "check_results": results,
+            }
+        )
+        return results
+
+    def get_results_summary(self) -> Dict[str, int]:
+        """
+        Get summary statistics for check results
+
+        :return: Dictionary with result summaries
+        :rtype: Dict[str, int]
+        """
+        if not self.result["check_results"]:
+            return {
+                "total": 0,
+                "passed": 0,
+                "failed": 0,
+                "warnings": 0,
+                "skipped": 0,
+                "info": 0,
+            }
+
+        return {
+            "total": len(self.result["check_results"]),
+            "passed": sum(
+                1 for r in self.result["check_results"] if r.status == TestStatus.SUCCESS.value
+            ),
+            "failed": sum(
+                1 for r in self.result["check_results"] if r.status == TestStatus.ERROR.value
+            ),
+            "warnings": sum(
+                1 for r in self.result["check_results"] if r.status == TestStatus.WARNING.value
+            ),
+            "skipped": sum(
+                1 for r in self.result["check_results"] if r.status == TestStatus.SKIPPED.value
+            ),
+            "info": sum(
+                1 for r in self.result["check_results"] if r.status == TestStatus.INFO.value
+            ),
+        }
+
+    def format_results_for_html_report(self):
+        """
+        Reformat results for HTML report
+        """
+        serialized_results = []
+        for check_result in self.result["check_results"]:
+            result_dict = {
+                "check": {
+                    "id": check_result.check.id,
+                    "name": check_result.check.name,
+                    "description": check_result.check.description,
+                    "category": check_result.check.category,
+                    "workload": check_result.check.workload,
+                    "severity": (
+                        check_result.check.severity.value
+                        if hasattr(check_result.check.severity, "value")
+                        else str(check_result.check.severity)
+                    ),
+                    "collector_type": check_result.check.collector_type,
+                    "collector_args": check_result.check.collector_args,
+                    "validator_type": check_result.check.validator_type,
+                    "validator_args": check_result.check.validator_args,
+                    "tags": check_result.check.tags,
+                    "references": check_result.check.references,
+                    "report": check_result.check.report,
+                },
+                "status": (
+                    check_result.status.value
+                    if hasattr(check_result.status, "value")
+                    else str(check_result.status)
+                ),
+                "hostname": check_result.hostname,
+                "expected_value": check_result.expected_value,
+                "actual_value": check_result.actual_value,
+                "execution_time": check_result.execution_time,
+                "timestamp": (
+                    check_result.timestamp.isoformat()
+                    if hasattr(check_result.timestamp, "isoformat")
+                    else str(check_result.timestamp)
+                ),
+                "details": check_result.details,
+            }
+            serialized_results.append(result_dict)
+        self.result["check_results"] = serialized_results
+
+    def run(self):
+        """
+        Run the module with enhanced error handling and reporting
+        """
+        execution_start_time = datetime.now()
+        try:
+            context = self.module_params["context"]
+            custom_hostname = self.module_params["hostname"]
+
+            if custom_hostname:
+                context["hostname"] = custom_hostname
+
+            self.set_context(context)
+            if self.context.get("check_type", {}).get("file_name") == "hana":
+                temp_context = FileSystemCollector(parent=self).collect(
+                    check=None, context=self.context
+                )
+                self.context.update(temp_context)
+
+            if not self.module_params["check_file_content"]:
+                self.module.fail_json(
+                    msg="No check file content provided",
+                    error_type="CONFIGURATION_ERROR",
+                    error_details="Check file content is required but was empty or None",
+                )
+
+            self.load_checks(raw_file_content=self.module_params["check_file_content"])
+            if not self.checks:
+                self.log(logging.WARNING, "No applicable checks found for current context")
+                self.result.update(
+                    {
+                        "status": "SUCCESS",
+                        "message": "No applicable checks found for current context",
+                        "check_results": [],
+                        "summary": {
+                            "passed": 0,
+                            "failed": 0,
+                            "warnings": 0,
+                            "skipped": 0,
+                            "total": 0,
+                        },
+                        "execution_warnings": ["No checks matched the current system context"],
+                    }
+                )
+                self.module.exit_json(**self.result)
+                return
+            self.execute_checks(
+                filter_tags=self.module_params["filter_tags"],
+                filter_categories=self.module_params["filter_categories"],
+                parallel=self.module_params.get("parallel_execution", False),
+                max_workers=self.module_params.get("max_workers", 3),
+                enable_retry=self.module_params.get("enable_retry", False),
+            )
+            self.format_results_for_html_report()
+            result = dict(self.result)
+            execution_end_time = datetime.now()
+            execution_duration = (execution_end_time - execution_start_time).total_seconds()
+
+            result.update(
+                {
+                    "formatted_filesystem_info": self.context.get("formatted_filesystem_info", {}),
+                    "azure_disks_info": self.context.get("azure_disks_info", []),
+                    "lvm_groups_info": self.context.get("lvm_groups_info", []),
+                    "lvm_volumes_info": self.context.get("lvm_volumes_info", []),
+                    "anf_volumes_info": self.context.get("anf_volumes_info", []),
+                    "execution_metadata": {
+                        "start_time": execution_start_time.isoformat(),
+                        "end_time": execution_end_time.isoformat(),
+                        "duration_seconds": execution_duration,
+                        "total_checks_attempted": len(self.checks),
+                        "checks_completed": len(result.get("check_results", [])),
+                        "python_module_version": "1.0.0",
+                        "execution_mode": (
+                            "parallel"
+                            if self.module_params.get("parallel_execution", False)
+                            else "sequential"
+                        ),
+                    },
+                }
+            )
+
+            if "summary" in result:
+                summary = dict(result["summary"])
+                result["summary"] = summary
+            self.module.exit_json(**result)
+        except Exception as e:
+            execution_end_time = datetime.now()
+            execution_duration = (execution_end_time - execution_start_time).total_seconds()
+
+            error_details = {
+                "error_type": type(e).__name__,
+                "error_message": str(e),
+                "execution_duration": execution_duration,
+                "module_params": {
+                    k: v for k, v in self.module_params.items() if k != "check_file_content"
+                },
+                "checks_loaded": len(self.checks) if hasattr(self, "checks") else 0,
+                "timestamp": datetime.now().isoformat(),
+            }
+            partial_results = self.result.get("check_results", [])
+            if partial_results:
+                error_details["partial_results_available"] = True
+                error_details["completed_checks"] = len(partial_results)
+
+            self.module.fail_json(
+                msg=f"Configuration check execution failed: {str(e)}",
+                error_details=error_details,
+                **self.result,
+            )
+
+
+def main():
+    """
+    Main function to run the Ansible module
+    """
+    module_args = dict(
+        check_file_content=dict(type="str", required=True),
+        context=dict(type="dict", required=True),
+        filter_tags=dict(type="list", elements="str", required=False, default=None),
+        filter_categories=dict(type="list", elements="str", required=False, default=None),
+        parallel_execution=dict(type="bool", required=False, default=False),
+        max_workers=dict(type="int", required=False, default=3),
+        enable_retry=dict(type="bool", required=False, default=False),
+        workspace_directory=dict(type="str", required=True),
+        hostname=dict(type="str", required=False, default=None),
+        test_group_invocation_id=dict(type="str", required=True),
+        test_group_name=dict(type="str", required=True),
+        azure_resources=dict(type="dict", required=False, default={}),
+    )
+    module = AnsibleModule(argument_spec=module_args, supports_check_mode=True)
+    runner = ConfigurationCheckModule(module)
+    runner.run()
+
+
+if __name__ == "__main__":
+    main()
diff --git a/src/modules/get_azure_lb.py b/src/modules/get_azure_lb.py
index 73c3f159..ebff1dae 100644
--- a/src/modules/get_azure_lb.py
+++ b/src/modules/get_azure_lb.py
@@ -247,17 +247,17 @@ def get_load_balancers_details(self) -> None:
         parameters = []
 
         def check_parameters(entity, parameters_dict, entity_type):
-            for key, expected_value in parameters_dict.items():
+            for key, value_object in parameters_dict.items():
                 parameters.append(
                     Parameters(
                         category=entity_type,
                         id=entity["name"],
                         name=key,
                         value=str(entity[key]),
-                        expected_value=str(expected_value),
+                        expected_value=str(value_object.get("value", "")),
                         status=(
                             TestStatus.SUCCESS.value
-                            if entity[key] == expected_value
+                            if entity[key] == value_object.get("value", "")
                             else TestStatus.ERROR.value
                         ),
                     ).to_dict()
@@ -317,6 +317,12 @@ def check_parameters(entity, parameters_dict, entity_type):
                 )
                 self.result["message"] += "Successfully validated load balancer parameters"
             else:
+                self.result.update(
+                    {
+                        "details": {"parameters": []},
+                        "status": TestStatus.ERROR.value,
+                    }
+                )
                 self.result["message"] += (
                     "Load Balancer details not fetched."
                     " Ensure that the Managed Identity (MSI) has sufficient permissions "
diff --git a/src/modules/render_html_report.py b/src/modules/render_html_report.py
index fc8bcbef..7a6ffdb7 100644
--- a/src/modules/render_html_report.py
+++ b/src/modules/render_html_report.py
@@ -113,6 +113,8 @@ def __init__(
         test_group_name: str,
         report_template: str,
         workspace_directory: str,
+        test_case_results: List[Dict[str, Any]] = [],
+        system_info: Dict[str, Any] = {},
     ):
         super().__init__()
         self.test_group_invocation_id = test_group_invocation_id
@@ -124,6 +126,8 @@ def __init__(
                 "status": None,
             }
         )
+        self.test_case_results = test_case_results or []
+        self.system_info = system_info or {}
 
     def read_log_file(self) -> List[Dict[str, Any]]:
         """
@@ -137,7 +141,17 @@ def read_log_file(self) -> List[Dict[str, Any]]:
         )
         try:
             with open(log_file_path, "r", encoding="utf-8") as log_file:
-                return [json.loads(line) for line in log_file.readlines()]
+                results = []
+                for line_num, line in enumerate(log_file.readlines(), 1):
+                    try:
+                        results.append(json.loads(line))
+                    except json.JSONDecodeError as json_ex:
+                        self.log(
+                            logging.WARNING,
+                            f"Invalid JSON on line {line_num} in {log_file_path}: {json_ex}",
+                        )
+                        continue
+                return results
         except FileNotFoundError as ex:
             self.log(
                 logging.ERROR,
@@ -169,6 +183,7 @@ def render_report(self, test_case_results: List[Dict[str, Any]]) -> None:
                             "report_generation_time": datetime.now().strftime(
                                 "%m/%d/%Y, %I:%M:%S %p"
                             ),
+                            "system_info": self.system_info,
                         }
                     )
                 )
@@ -188,6 +203,8 @@ def run_module() -> None:
         test_group_name=dict(type="str", required=True),
         report_template=dict(type="str", required=True),
         workspace_directory=dict(type="str", required=True),
+        test_case_results=dict(type="list", required=False),
+        system_info=dict(type="dict", required=False),
     )
 
     module = AnsibleModule(argument_spec=module_args, supports_check_mode=True)
@@ -197,9 +214,13 @@ def run_module() -> None:
         test_group_name=module.params["test_group_name"],
         report_template=module.params["report_template"],
         workspace_directory=module.params["workspace_directory"],
+        test_case_results=module.params.get("test_case_results", []),
+        system_info=module.params.get("system_info", {}),
     )
 
-    test_case_results = renderer.read_log_file()
+    test_case_results = (
+        renderer.read_log_file() if not renderer.test_case_results else renderer.test_case_results
+    )
     renderer.render_report(test_case_results)
 
     module.exit_json(**renderer.get_result())
diff --git a/src/playbook_00_configuration_checks.yml b/src/playbook_00_configuration_checks.yml
new file mode 100644
index 00000000..3c828415
--- /dev/null
+++ b/src/playbook_00_configuration_checks.yml
@@ -0,0 +1,380 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# /*---------------------------------------------------------------------------8
+# |                           Configuration Checks                             |
+# +------------------------------------4--------------------------------------*/
+
+- hosts:                                localhost
+  gather_facts:                         true
+  name:                                 "Setup deployer for Configuration Checks"
+  vars_files:                           "./vars/input-api.yaml"
+  tasks:
+    - name:                             "Install python azure packages required"
+      become:                           true
+      ansible.builtin.pip:
+        name:
+          - ansible-runner
+          - azure-kusto-data
+          - azure-kusto-ingest
+
+    - name:                             "Generate test group ID and timestamp"
+      ansible.builtin.set_fact:
+        test_group_invocation_id:       "{{ lookup('pipe', 'uuidgen') }}"
+        test_group_start_time:          "{{ now(utc=true,fmt='%Y-%m-%d %H:%M:%S') }}"
+        configuration_test_type:        "{{ configuration_test_type | default('all') }}"
+
+    - name:                             "Set the test group name"
+      ansible.builtin.set_fact:
+        test_group_name:                "{{ configuration_test_type_map
+                                        | selectattr('name', 'equalto', configuration_test_type)
+                                        | map(attribute='value')
+                                        | first }}"
+
+
+- hosts: "{{ sap_sid | upper }}_SCS:
+          {{ sap_sid | upper }}_ERS:
+          {{ sap_sid | upper }}_DB:
+          {{ sap_sid | upper }}_APP:
+          {{ sap_sid | upper }}_WEB:
+          {{ sap_sid | upper }}_OBSERVER:
+          {{ sap_sid | upper }}_PAS"
+  name:                                 "Host tasks"
+  gather_facts:                         true
+  vars_files:                           "./vars/input-api.yaml"
+  tasks:
+    - name:                             "Enable profile_tasks callback plugin"
+      ansible.builtin.set_fact:
+        ansible_callbacks:
+          profile_tasks:                true
+
+    - name:                             "Set configuration test type if not defined"
+      ansible.builtin.set_fact:
+        configuration_test_type:        "{{ configuration_test_type | default('all') }}"
+      run_once:                         true
+
+    - name:                             "Get test group details from control node"
+      ansible.builtin.set_fact:
+        test_group_invocation_id:       "{{ hostvars['localhost'].test_group_invocation_id }}"
+        test_group_name:                "{{ hostvars['localhost'].test_group_name }}"
+        test_group_start_time:          "{{ hostvars['localhost'].test_group_start_time }}"
+        configuration_test_type:        "{{ hostvars['localhost'].configuration_test_type }}"
+
+    - name:                             "Set role from inventory group"
+      ansible.builtin.set_fact:
+        role:                           "{{ (group_names
+                                        | select('match', sap_sid + '_.*')
+                                        | map('regex_replace', sap_sid + '_(.*)', '\\1')
+                                        | list)[0] | default('UNKNOWN') }}"
+
+    - name:                             "Debug host role assignment"
+      ansible.builtin.debug:
+        msg:                            "Host {{ inventory_hostname }} assigned role: {{ role }} from groups: {{ group_names }}"
+
+    - name:                             "Load supported VM information"
+      ansible.builtin.include_vars:
+        file:                           "./roles/configuration_checks/vars/vm-support.yml"
+        name:                           vm_support
+
+    - name:                             "Run common VM information checks on all hosts"
+      ansible.builtin.include_tasks:
+        file:                           "./roles/configuration_checks/tasks/main.yml"
+      loop:
+        - {
+                                        name: "VM Information",
+                                        file_name: "virtual_machine",
+                                        checks_var: "vm_info_checks",
+                                        results_var: "vm_info_results"
+          }
+        - {
+                                        name: "Package Information",
+                                        file_name: "package",
+                                        checks_var: "package_info_checks",
+                                        results_var: "package_info_results"
+          }
+        - {
+                                        name: "Common SAP",
+                                        file_name: "sap",
+                                        checks_var: "common_sap_checks",
+                                        results_var: "common_sap_results"
+          }
+      loop_control:
+        loop_var:                       check_type
+
+    - name:                             "Run role-specific checks for DB hosts"
+      ansible.builtin.include_tasks:
+        file:                           "./roles/configuration_checks/tasks/main.yml"
+      vars:
+        check_type:
+          name:                         "Database (HANA) Checks"
+          file_name:                    "hana"
+          checks_var:                   "db_hana_checks"
+          results_var:                  "db_hana_results"
+      when:                             >-
+                                        role == 'DB' and
+                                        (configuration_test_type == 'all' or
+                                          configuration_test_type == 'Database')
+
+    - name:                             "Debug DB checks execution"
+      ansible.builtin.debug:
+        msg:                            "Executing Database (HANA) checks on host {{ inventory_hostname }}"
+      when:                             >-
+                                        role == 'DB' and
+                                        (configuration_test_type == 'all' or
+                                         configuration_test_type == 'Database')
+
+    - name:                             "Run HA configuration checks for DB hosts"
+      ansible.builtin.include_tasks:
+        file:                           "./roles/configuration_checks/tasks/main.yml"
+      vars:
+        check_type:
+          name:                         "Database HA Configuration"
+          file_name:                    "high_availability"
+          checks_var:                   "db_ha_config_checks"
+          results_var:                  "db_ha_config_results"
+      when:                             >-
+                                        role == 'DB' and
+                                        database_high_availability | default(false) | bool and
+                                        (configuration_test_type == 'all' or
+                                         configuration_test_type == 'Database')
+
+    - name:                             "Run role-specific checks for ASCS/SCS hosts"
+      ansible.builtin.include_tasks:
+        file:                           "./roles/configuration_checks/tasks/main.yml"
+      vars:
+        check_type:
+          name:                         "ASCS/SCS Checks"
+          file_name:                    "ascs"
+          checks_var:                   "ascs_scs_checks"
+          results_var:                  "ascs_scs_results"
+      when:                             >-
+                                        role in ['SCS', 'ERS'] and
+                                        (configuration_test_type == 'all' or
+                                         configuration_test_type == 'CentralServiceInstances')
+
+    - name:                             "Debug ASCS/SCS checks execution"
+      ansible.builtin.debug:
+        msg:                            "Executing ASCS/SCS checks on host {{ inventory_hostname }}"
+      when:                             >-
+                                        role in ['SCS', 'ERS'] and
+                                        (configuration_test_type == 'all' or
+                                         configuration_test_type == 'CentralServiceInstances')
+
+    - name:                             "Run HA configuration checks for SCS/ERS hosts"
+      ansible.builtin.include_tasks:
+        file:                           "./roles/configuration_checks/tasks/main.yml"
+      vars:
+        check_type:
+          name:                         "SCS/ERS HA Configuration"
+          file_name:                    "high_availability"
+          checks_var:                   "scs_ha_config_checks"
+          results_var:                  "scs_ha_config_results"
+      when:                             >-
+                                        role in ['SCS', 'ERS'] and
+                                        scs_high_availability | default(false) | bool and
+                                        (configuration_test_type == 'all' or
+                                         configuration_test_type == 'CentralServiceInstances')
+
+    - name:                             "Run role-specific checks for Application Server hosts"
+      ansible.builtin.include_tasks:
+        file:                           "./roles/configuration_checks/tasks/main.yml"
+      vars:
+        check_type:
+          name:                         "Application Server Checks"
+          file_name:                    "app"
+          checks_var:                   "app_server_checks"
+          results_var:                  "app_server_results"
+      when:                             >-
+                                        role in ['APP', 'PAS', 'WEB'] and
+                                        (configuration_test_type == 'all' or
+                                         configuration_test_type == 'ApplicationInstances' or
+                                         configuration_test_type == 'WebDispatcherInstances')
+
+    - name:                             "Debug Application Server checks execution"
+      ansible.builtin.debug:
+        msg:                            "Executing Application Server checks on host {{ inventory_hostname }}"
+      when:                             >-
+                                        role in ['APP', 'PAS', 'WEB'] and
+                                        (configuration_test_type == 'all' or
+                                         configuration_test_type == 'ApplicationInstances' or
+                                         configuration_test_type == 'WebDispatcherInstances')
+
+- hosts:                                localhost
+  name:                                 "Generate Configuration Checks Report"
+  gather_facts:                         false
+  vars_files:                           "./vars/input-api.yaml"
+  tasks:
+    - name:                             "Set workspace directory if not defined"
+      ansible.builtin.set_fact:
+        _workspace_directory:           "{{ _workspace_directory | default('/tmp/sap_automation_qa') }}"
+
+    - name:                             "Collect all configuration check results"
+      ansible.builtin.set_fact:
+        all_results:                    []
+        execution_metadata:             []
+
+    - name:                             "Collect common check results"
+      ansible.builtin.set_fact:
+        all_results:                    "{{ all_results + hostvars[item].vm_info_results
+                                            | default([]) }}"
+        execution_metadata:             "{{ execution_metadata + [
+                                          {'host': item,
+                                          'check_type': 'vm_info',
+                                          'metadata': hostvars[item].vm_info_results_metadata
+                                          | default({})}] }}"
+      loop:                           "{{ groups[sap_sid | upper + '_SCS']|default([]) +
+                                        groups[sap_sid | upper + '_ERS']|default([]) +
+                                        groups[sap_sid | upper + '_DB']|default([]) +
+                                        groups[sap_sid | upper + '_APP']|default([]) +
+                                        groups[sap_sid | upper + '_WEB']|default([]) +
+                                        groups[sap_sid | upper + '_PAS']|default([]) }}"
+      when:                             hostvars[item].vm_info_results is defined
+
+    - name:                             "Collect package info check results"
+      ansible.builtin.set_fact:
+        all_results:                    "{{ all_results + hostvars[item].package_info_results
+                                            | default([]) }}"
+        execution_metadata:             "{{ execution_metadata + [
+                                          {'host': item,
+                                          'check_type': 'package_info',
+                                          'metadata': hostvars[item].package_info_results_metadata
+                                          | default({})}] }}"
+      loop:                             "{{ groups[sap_sid | upper + '_SCS']|default([]) +
+                                          groups[sap_sid | upper + '_ERS']|default([]) +
+                                          groups[sap_sid | upper + '_DB']|default([]) +
+                                          groups[sap_sid | upper + '_APP']|default([]) +
+                                          groups[sap_sid | upper + '_WEB']|default([]) +
+                                          groups[sap_sid | upper + '_PAS']|default([]) }}"
+      when:                             hostvars[item].package_info_results is defined
+
+    - name:                             "Collect common SAP check results"
+      ansible.builtin.set_fact:
+        all_results:                    "{{ all_results + hostvars[item].common_sap_results
+                                            | default([]) }}"
+        execution_metadata:             "{{ execution_metadata + [
+                                          {'host': item,
+                                          'check_type': 'common_sap',
+                                          'metadata': hostvars[item].common_sap_results_metadata
+                                          | default({})}] }}"
+      loop:                             "{{ groups[sap_sid | upper + '_SCS']|default([]) +
+                                          groups[sap_sid | upper + '_ERS']|default([]) +
+                                          groups[sap_sid | upper + '_DB']|default([]) +
+                                          groups[sap_sid | upper + '_APP']|default([]) +
+                                          groups[sap_sid | upper + '_WEB']|default([]) +
+                                          groups[sap_sid | upper + '_PAS']|default([]) }}"
+      when:                             hostvars[item].common_sap_results is defined
+
+    - name:                             "Collect DB (HANA) check results"
+      ansible.builtin.set_fact:
+        all_results:                    "{{ all_results + hostvars[item].db_hana_results
+                                            | default([]) }}"
+        execution_metadata:             "{{ execution_metadata + [
+                                          {'host': item,
+                                          'check_type': 'db_hana',
+                                          'metadata': hostvars[item].db_hana_results_metadata
+                                          | default({})}] }}"
+      loop:                             "{{ groups[sap_sid | upper + '_DB']|default([]) }}"
+      when:                             hostvars[item].db_hana_results is defined
+
+    - name:                             "Collect DB HA configuration check results"
+      ansible.builtin.set_fact:
+        all_results:                    "{{ all_results + hostvars[item].db_ha_config_results
+                                            | default([]) }}"
+        execution_metadata:             "{{ execution_metadata + [
+                                          {'host': item,
+                                          'check_type': 'db_ha_config',
+                                          'metadata': hostvars[item].db_ha_config_results_metadata
+                                          | default({})}] }}"
+      loop:                             "{{ groups[sap_sid | upper + '_DB']|default([]) }}"
+      when:                             hostvars[item].db_ha_config_results is defined
+
+    - name:                             "Collect ASCS/SCS check results"
+      ansible.builtin.set_fact:
+        all_results:                    "{{ all_results + hostvars[item].ascs_scs_results
+                                            | default([]) }}"
+        execution_metadata:             "{{ execution_metadata + [
+                                          {'host': item,
+                                          'check_type': 'ascs_scs',
+                                          'metadata': hostvars[item].ascs_scs_results_metadata
+                                          | default({})}] }}"
+      loop:                             "{{ groups[sap_sid | upper + '_SCS']|default([]) +
+                                          groups[sap_sid | upper + '_ERS']|default([]) }}"
+      when:                             hostvars[item].ascs_scs_results is defined
+
+    - name:                             "Collect SCS/ERS HA configuration check results"
+      ansible.builtin.set_fact:
+        all_results:                    "{{ all_results + hostvars[item].scs_ha_config_results
+                                            | default([]) }}"
+        execution_metadata:             "{{ execution_metadata + [
+                                          {'host': item,
+                                          'check_type': 'scs_ha_config',
+                                          'metadata': hostvars[item].scs_ha_config_results_metadata
+                                          | default({})}] }}"
+      loop:                             "{{ groups[sap_sid | upper + '_SCS']|default([]) +
+                                          groups[sap_sid | upper + '_ERS']|default([]) }}"
+      when:                             hostvars[item].scs_ha_config_results is defined
+
+    - name:                             "Collect Application Server check results"
+      ansible.builtin.set_fact:
+        all_results:                    "{{ all_results + hostvars[item].app_server_results
+                                            | default([]) }}"
+        execution_metadata:             "{{ execution_metadata + [
+                                          {'host': item,
+                                          'check_type': 'app_server',
+                                          'metadata': hostvars[item].app_server_results_metadata
+                                          | default({})}] }}"
+      loop:                             "{{ groups[sap_sid | upper + '_APP']|default([]) +
+                                          groups[sap_sid | upper + '_PAS']|default([]) +
+                                          groups[sap_sid | upper + '_WEB']|default([]) }}"
+      when:                             hostvars[item].app_server_results is defined
+
+    - name:                             "Debug execution metadata"
+      ansible.builtin.debug:
+        msg:                            "Configuration checks completed. Check types executed: {{ execution_metadata | map(attribute='check_type') | unique | list }}"
+      run_once:                         true
+
+    - name:                             "Set the summary"
+      ansible.builtin.set_fact:
+        passed_count:                   "{{ all_results | selectattr('status', 'equalto', 'PASSED') | list | length }}"
+        error_count:                    "{{ all_results | selectattr('status', 'equalto', 'FAILED') | list | length }}"
+        warning_count:                  "{{ all_results | selectattr('status', 'equalto', 'WARNING') | list | length }}"
+        info_count:                     "{{ all_results | selectattr('status', 'equalto', 'INFO') | list | length }}"
+        config_check_types:             "{{ all_results | map(attribute='check.category') | unique | list }}"
+
+
+    - name:                             "Collect system information for report"
+      ansible.builtin.set_fact:
+        system_info:
+          sap_sid:                      "{{ sap_sid | upper }}"
+          db_sid:                       "{{ db_sid | upper }}"
+          db_type:                      "{{ platform | upper }}"
+          storage_type:                 "{{ NFS_provider | default(['Premium_LRS']) }}"
+          high_availability:            >-
+                                        "{{ (database_high_availability | default(false) | bool) or
+                                        (scs_high_availability | default(false) | bool) }}"
+          high_availability_agent:      >-
+                                        "{{ database_cluster_type
+                                        | default('AFA')
+                                        if database_high_availability
+                                        | default(false) | bool
+                                        else  scs_cluster_type
+                                        | default('AFA')
+                                        if scs_high_availability
+                                        | default(false) | bool
+                                        else 'N/A' }}"
+          hostnames:                    "{{ groups[sap_sid | upper + '_SCS']|default([]) +
+                                          groups[sap_sid | upper + '_ERS']|default([]) +
+                                          groups[sap_sid | upper + '_DB']|default([]) +
+                                          groups[sap_sid | upper + '_APP']|default([]) +
+                                          groups[sap_sid | upper + '_WEB']|default([]) +
+                                          groups[sap_sid | upper + '_PAS']|default([]) }}"
+          passed_count:                 "{{ all_results | selectattr('status', 'equalto', 'PASSED') | list | length }}"
+          error_count:                  "{{ all_results | selectattr('status', 'equalto', 'FAILED') | list | length }}"
+          warning_count:                "{{ all_results | selectattr('status', 'equalto', 'WARNING') | list | length }}"
+          info_count:                   "{{ all_results | selectattr('status', 'equalto', 'INFO') | list | length }}"
+          config_check_types:           "{{ all_results | map(attribute='check.category') | unique | list }}"
+
+    - name:                            "Render HTML report for configuration checks"
+      ansible.builtin.include_tasks:   "./roles/misc/tasks/render-html-report.yml"
+      vars:
+        html_template_name:            "./templates/config_checks_report.html"
diff --git a/src/playbook_00_ha_db_functional_tests.yml b/src/playbook_00_ha_db_functional_tests.yml
index e8daa9ae..e0b91e04 100644
--- a/src/playbook_00_ha_db_functional_tests.yml
+++ b/src/playbook_00_ha_db_functional_tests.yml
@@ -58,7 +58,7 @@
     - name:                            "Set the test group name based on the inputs"
       ansible.builtin.set_fact:
         test_group_name:               "{{ sap_functional_test_type_map
-                                        | selectattr('name', 'equalto', sap_functional_test_type)
+                                        | selectattr('name', 'equalto', SAP_FUNCTIONAL_TEST_TYPE)
                                         | map(attribute='value') | first }}_{{ platform | upper }}"
       run_once:                        true
 
@@ -78,7 +78,7 @@
       vars:
         group_invocation_id:           "{{ test_group_invocation_id }}"
         group_start_time:              "{{ test_group_start_time }}"
-        group_name:                    "{{ sap_functional_test_type }}"
+        group_name:                    "{{ SAP_FUNCTIONAL_TEST_TYPE }}"
       when:
                                        - test_group_name is defined
                                        - item.enabled | default(true)
diff --git a/src/playbook_00_ha_scs_functional_tests.yml b/src/playbook_00_ha_scs_functional_tests.yml
index aef99511..9adcda14 100644
--- a/src/playbook_00_ha_scs_functional_tests.yml
+++ b/src/playbook_00_ha_scs_functional_tests.yml
@@ -33,7 +33,7 @@
     - name:                            "Set the test group name based on the inputs"
       ansible.builtin.set_fact:
         test_group_name:               "{{ sap_functional_test_type_map
-                                            | selectattr('name', 'equalto', sap_functional_test_type)
+                                            | selectattr('name', 'equalto', SAP_FUNCTIONAL_TEST_TYPE)
                                             | map(attribute='value')
                                             | first }}"
       run_once:                        true
@@ -54,7 +54,7 @@
       vars:
         group_invocation_id:           "{{ test_group_invocation_id }}"
         group_start_time:              "{{ test_group_start_time }}"
-        group_name:                    "{{ sap_functional_test_type }}"
+        group_name:                    "{{ SAP_FUNCTIONAL_TEST_TYPE }}"
       when:                            test_group_name is defined
 
     - name:                            "Render HTML report for the test group logs"
diff --git a/src/playbook_01_ha_offline_tests.yml b/src/playbook_01_ha_offline_tests.yml
index f12040e6..ba1dad0d 100644
--- a/src/playbook_01_ha_offline_tests.yml
+++ b/src/playbook_01_ha_offline_tests.yml
@@ -24,9 +24,9 @@
     - name:                            "Set the test group name based on the inputs"
       ansible.builtin.set_fact:
         test_group_name:               "{{ sap_functional_test_type_map
-                                        | selectattr('name', 'equalto', sap_functional_test_type)
+                                        | selectattr('name', 'equalto', SAP_FUNCTIONAL_TEST_TYPE)
                                         | map(attribute='value') | first }}{{ '_' + (platform | upper)
-                                        if sap_functional_test_type == 'DatabaseHighAvailability' else '' }}"
+                                        if SAP_FUNCTIONAL_TEST_TYPE == 'DatabaseHighAvailability' else '' }}"
       run_once:                        true
 
     - name:                            Set the test group facts
@@ -45,7 +45,7 @@
       vars:
         group_invocation_id:           "{{ test_group_invocation_id }}"
         group_start_time:              "{{ test_group_start_time }}"
-        group_name:                    "{{ sap_functional_test_type }}"
+        group_name:                    "{{ SAP_FUNCTIONAL_TEST_TYPE }}"
       when:                             test_group_name is defined
 
     - name:                            "Render HTML report for the test group logs"
diff --git a/src/roles/configuration_checks/CHECK.MD b/src/roles/configuration_checks/CHECK.MD
new file mode 100644
index 00000000..4823d02d
--- /dev/null
+++ b/src/roles/configuration_checks/CHECK.MD
@@ -0,0 +1,123 @@
+```yaml
+enums:
+  severity:
+    - info:                           &info "INFO"
+    - high:                           &high "HIGH"
+    - low:                            &low "LOW"
+    - warning:                        &warning "WARNING"
+    - critical:                       &critical "CRITICAL"
+    - all_severity:                   &severity [*info, *high, *low, *warning, *critical]
+
+  os_type:
+    - suse:                           &suse "SLES_SAP"
+    - redhat:                         &redhat "REDHAT"
+    - oraclelinux:                    &oraclelinux "OracleLinux"
+    - windows:                        &windows "Windows"
+    - all_os:                         &os_type [*suse, *redhat, *oraclelinux, *windows]
+
+  os_version:
+    - suse_12_3:                      &suse_12_3 "SUSE 12 SP3"
+    - suse_12_4:                      &suse_12_4 "SUSE 12 SP4"
+    - suse_12_5:                      &suse_12_5 "SUSE 12 SP5"
+    - all_versions:                   &all_versions "all"
+
+  hardware_type:
+    - vm:                             &vm "VM"
+    - hli:                            &hli "HLI"
+    - all_hardware:                   &all_hardware [*vm, *hli]
+
+  storage_type:
+    premium_storage:                  &premium_storage ["Premium_LRS","UltraSSD_LRS","ANF","PremiumV2_LRS"]
+    anf:                              &anf ["ANF"]
+
+  workload:
+    - sap:                            &sap "SAP"
+    - all_workload:                   &workload [*sap]
+
+  db:
+    - hana:                           &hana "HANA"
+    - mssql:                          &mssql "MSSQL"
+    - oracle:                         &oracle "Oracle"
+    - db2:                            &db2 "Db2"
+    - ase:                            &ase "ASE"
+    - all_db:                         &db [*hana, *mssql, *oracle, *db2, *ase]
+
+  role:
+    - db:                             &db_role "DB"
+    - ascs:                           &ascs_role "SCS"
+    - ers:                            &ers_role "ERS"
+    - app:                            &app_role "APP"
+    - webdispatcher:                  &web_dispatch "WEB"
+    - pas:                            &pas "PAS"
+    - all_role:                       &role [*db_role, *ascs_role, *ers_role, *app_role, *web_dispatch, *pas]
+
+  cluster_type:
+    - sbd:                            &sbd "ISCSI"
+    - fencing_agent:                  &fencing_agent "AFA"
+    - all_fencing_agent:              &cluster_type [*sbd, *fencing_agent]
+
+  collector_type:
+    - command:                        &command "command"
+    - azure:                          &azure "azure"
+    - all_collector_type:             &collector_type [*command, *azure]
+
+  category:
+    - package:                        &package_check "Package"
+    - vm:                             &vm_check "Virtual Machine"
+    - sap:                            &sap_check "SAP"
+    - os:                             &os_check "Operating System"
+    - all_check_types:                &category [*package_check, *vm_check, *sap_check, *os_check]
+
+  user:
+    - root:                           &root "root"
+    - sidadm:                         &sidadm "sidadm"
+    - all_users:                      &user [*root, *sidadm]
+
+  validator_type:
+    - string:                         &string "string"
+    - range:                          &range "range"
+    - list:                           &list "list"
+    - all:                            &validator_type [*string, *range, *list]
+
+  report:
+    - check:                          &check "check"
+    - section:                        &section "section"
+    - report:                         &report [*check, *section]
+```
+
+```yaml
+CHECK_DEFINITION:
+  id:                               str
+  name:                             str
+  description:                      str
+  category:                         *category
+  severity:                         *severity
+  workload:                         *workload
+  applicability:
+    - os_type:                      *os_type
+    - os_version:                   *all_versions
+    - hardware_type:                *vm
+    - storage_type:                 *premium_storage
+    - role:                         *role
+    - database_type:                *db
+    - high_availability:            bool
+    - high_availability_agent:      *cluster_type
+  collector_type:                   *collector_type
+  collector_args:
+    - command:                      str
+    - user:                         *user
+  validator_type:                   *validator_type
+  validator_args:
+    - expected_output:              string
+    - case_insensitive:             bool
+    - strip_whitespace:             bool
+    - max:                          float
+    - min:                          float
+    - regex:                        string
+  report:                           *report
+  references:
+    sap:                            str
+    microsoft:                      str
+    other:                          str
+    remediation:                    str
+```
\ No newline at end of file
diff --git a/src/roles/configuration_checks/tasks/disks.yml b/src/roles/configuration_checks/tasks/disks.yml
new file mode 100644
index 00000000..ec75facd
--- /dev/null
+++ b/src/roles/configuration_checks/tasks/disks.yml
@@ -0,0 +1,169 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# /*---------------------------------------------------------------------------8
+# |                           Disks Collector Tasks                            |
+# +------------------------------------4--------------------------------------*/
+
+- name:                                 Disks Collector Tasks
+  become:                               true
+  block:
+    - name:                             Collect azure disks data
+      ansible.builtin.uri:
+        url:                            http://169.254.169.254/metadata/instance/compute/storageProfile/dataDisks/?api-version=2021-12-13
+        use_proxy:                      false
+        headers:
+          Metadata:                     true
+        timeout:                        10
+      register:                         disks_metadata
+      retries:                          3
+      delay:                            2
+      ignore_errors:                    true
+
+    - name:                             Collect mount information
+      ansible.builtin.shell:
+        cmd:                            findmnt -r -n -o TARGET,SOURCE,FSTYPE,OPTIONS
+      register:                         mount_info
+      changed_when:                     false
+
+    - name:                             Collect disk usage information
+      ansible.builtin.shell:
+        cmd:                            df -BG
+      register:                         df_info
+      changed_when:                     false
+
+    - name:                             LVM fullreport
+      ansible.builtin.shell:
+        cmd:                            /sbin/lvm fullreport --reportformat json
+      register:                         lvm_fullreport
+      changed_when:                     false
+      failed_when:                      false
+
+    - name:                             Collect device-to-lun mapping from Azure symlinks
+      ansible.builtin.shell:
+        cmd: |
+                                        set -o pipefail
+                                        for lun_link in /dev/disk/azure/scsi1/lun*; do
+                                          if [ -L "$lun_link" ]; then
+                                            lun=$(basename "$lun_link" | sed 's/lun//')
+                                            device=$(readlink -f "$lun_link" | xargs basename)
+                                            echo "${device}:${lun}"
+                                          fi
+                                        done
+      register:                         device_lun_mapping_raw
+      changed_when:                     false
+      failed_when:                      false
+
+    - name:                             Parse device-to-lun mapping into dictionary
+      ansible.builtin.set_fact:
+        device_lun_map: >-
+                                        {{
+                                          dict(device_lun_mapping_raw.stdout_lines
+                                          | map('split', ':')
+                                          | map('list'))
+                                        }}
+      when:                             device_lun_mapping_raw is defined and device_lun_mapping_raw.stdout_lines | length > 0
+
+    - name:                             Set empty device_lun_map if no mapping found
+      ansible.builtin.set_fact:
+        device_lun_map:                 {}
+      when:                             device_lun_mapping_raw is not defined or device_lun_mapping_raw.stdout_lines | length == 0
+
+    - name:                             Debug device-to-lun mapping
+      ansible.builtin.debug:
+        var:                            device_lun_map
+        verbosity:                      1
+
+    - name:                             Extract disk names
+      when:                             disks_metadata is not failed and disks_metadata.json is defined
+      ansible.builtin.set_fact:
+        azure_disk_names:               "{{ disks_metadata.json | map(attribute='name') | list }}"
+
+    - name:                             Collect detailed azure disks data (loop per disk defined in azure_disk_names)
+      when:                             azure_disk_names is defined and azure_disk_names | length > 0
+      register:                         azure_disks_metadata_results
+      loop:                             "{{ azure_disk_names }}"
+      delegate_to:                      localhost
+      ansible.builtin.shell: |
+                                        az disk show --name {{ item }} \
+                                        --subscription {{ compute_metadata.json.compute.subscriptionId }} \
+                                        --resource-group {{ compute_metadata.json.compute.resourceGroupName }} \
+                                        --query "{name:name, sku:sku.name, size:sizeGb, encryption:encryption.type, iops:diskIOPSReadWrite, mbps:diskMBpsReadWrite, size:diskSizeGB}" --output json
+
+    - name:                             Debug azure disks data collected
+      when:                             azure_disks_metadata_results is defined
+      ansible.builtin.debug:
+        var:                            azure_disks_metadata_results
+        verbosity:                      1
+
+    - name:                             Collect ANF storage data if NFS is used
+      when:                             NFS_provider is defined and 'ANF' in NFS_provider and ANF_account_rg is defined and ANF_account_name is defined
+      register:                         anf_storage_metadata_results
+      delegate_to:                      localhost
+      ansible.builtin.shell: |
+                                        set -o pipefail
+                                        printf "["
+                                        first=true
+                                        for pool in $(az netappfiles pool list \
+                                          --resource-group "{{ ANF_account_rg | default(compute_metadata.json.compute.resourceGroupName) }}" \
+                                          --account-name "{{ ANF_account_name }}" \
+                                          --query '[].name' -o tsv | awk -F/ '{print $NF}'); do
+                                            qos=$(az netappfiles pool show \
+                                              --resource-group "{{ ANF_account_rg | default(compute_metadata.json.compute.resourceGroupName) }}" \
+                                              --account-name "{{ ANF_account_name }}" \
+                                              --pool-name "$pool" \
+                                              --query "qosType" -o tsv)
+                                            for vol in $(az netappfiles volume list \
+                                              --resource-group "{{ ANF_account_rg | default(compute_metadata.json.compute.resourceGroupName) }}" \
+                                              --account-name "{{ ANF_account_name }}" \
+                                              --pool-name "$pool" \
+                                              --query '[].name' -o tsv | awk -F/ '{print $NF}'); do
+                                                if [ "$first" = true ]; then
+                                                  first=false
+                                                else
+                                                  printf ","
+                                                fi
+                                                az netappfiles volume show \
+                                                  --resource-group "{{ ANF_account_rg | default(compute_metadata.json.compute.resourceGroupName) }}" \
+                                                  --account-name "{{ ANF_account_name }}" \
+                                                  --pool-name "$pool" \
+                                                  --volume-name "$vol" \
+                                                  --query "{name:name, id:id, throughputMibps:throughputMibps, provisionedAvailabilityZone:provisionedAvailabilityZone, protocolTypes:protocolTypes, serviceLevel:serviceLevel, qosType:'$qos', ip:mountTargets[0].ipAddress, token:creationToken}" \
+                                                  -o json
+                                            done
+                                        done
+                                        printf "]"
+
+    - name:                             Debug ANF storage data collected
+      when:                             anf_storage_metadata_results is defined
+      ansible.builtin.debug:
+        var:                            anf_storage_metadata_results
+        verbosity:                      1
+
+    - name:                             Collect AFS storage data if NFS is used
+      when:                             NFS_provider is defined and 'AFS' in NFS_provider
+      register:                         afs_storage_metadata_results
+      delegate_to:                      localhost
+      ansible.builtin.shell: |
+                                        set -o pipefail
+                                        for sa in $(az storage account list \
+                                          --query "[?kind=='FileStorage'].{rg:resourceGroup,name:name,id:id}" \
+                                          -o tsv | awk '{print $1":"$2":"$3}'); do rg=$(echo $sa | cut -d: -f1); \
+                                          acc=$(echo $sa | cut -d: -f2); sid=$(echo $sa | cut -d: -f3); \
+                                          dns="$acc.file.core.windows.net"; for sh in $(az storage share-rm list --resource-group $rg --storage-account $acc \
+                                          --query "[?enabledProtocols=='NFS'].[name,accessTier,quotaGiB]" -o tsv); \
+                                          do name=$(echo $sh | awk '{print $1}'); tier=$(echo $sh | awk '{print $2}'); \
+                                          quota=$(echo $sh | awk '{print $3}'); \
+                                          peip=$(az network private-endpoint list \
+                                          --query "[?privateLinkServiceConnections[?privateLinkServiceId=='$sid']].customDnsConfigs[].ipAddresses[]" -o tsv); \
+                                          for ip in $peip; do thr=$((100 + ( (quota*4+99)/100 ) + ( (quota*6+99)/100 ) )); \
+                                          iops=$((quota+3000)); \
+                                          if [ $iops -gt 100000 ]; then iops=100000; fi; \
+                                          echo "{\"Type\":\"AFS\",\"Name\":\"$name\",\"Pool\":\"$acc\",\"ServiceLevel\":\"$tier\",\"ThroughputMibps\":$thr,\"ProtocolTypes\":\"NFS4.1\",\"NFSAddressDNS\":\"$dns:/$acc/$name\",\"NFSAddress\":\"$ip:/$acc/$name\",\"QoSType\":\"Manual\",\"IOPS\":$iops,\"Id\":\"$sid\"}"; \
+                                          done; done; done
+
+    - name:                             Debug AFS storage data collected
+      when:                             afs_storage_metadata_results is defined
+      ansible.builtin.debug:
+        verbosity:                      1
+        var:                            afs_storage_metadata_results
diff --git a/src/roles/configuration_checks/tasks/files/app.yml b/src/roles/configuration_checks/tasks/files/app.yml
new file mode 100644
index 00000000..b0fe7d77
--- /dev/null
+++ b/src/roles/configuration_checks/tasks/files/app.yml
@@ -0,0 +1,264 @@
+enums:
+  os_type:
+    - suse:                           &suse "SLES_SAP"
+    - redhat:                         &redhat "REDHAT"
+    - oraclelinux:                    &oraclelinux "OracleLinux"
+    - windows:                        &windows "Windows"
+    - all_os:                         &all_os [*suse, *redhat, *oraclelinux, *windows]
+
+  os_version:
+    - suse_12_3:                      &suse_12_3 "SUSE 12 SP3"
+    - suse_12_4:                      &suse_12_4 "SUSE 12 SP4"
+    - suse_12_5:                      &suse_12_5 "SUSE 12 SP5"
+    - all_versions:                   &all_versions "all"
+
+  hardware_type:
+    - vm:                             &vm "VM"
+    - hli:                            &hli "HLI"
+    - all_hardware:                   &all_hardware [*vm, *hli]
+
+  storage_type:
+    premium_storage:                  &premium_storage ["Premium_LRS","UltraSSD_LRS","StandardSSD_LRS","Standard_LRS","PremiumV2_LRS","AFS"]
+    anf:                              &anf ["ANF"]
+    all_storage:                      &all_storage ["Premium_LRS","UltraSSD_LRS","StandardSSD_LRS","Standard_LRS","ANF","PremiumV2_LRS","AFS"]
+
+  workload:
+    - sap:                            &sap "SAP"
+    - all_workload:                   &all_workload [*sap]
+
+  db:
+    - hana:                           &hana "HANA"
+    - mssql:                          &mssql "MSSQL"
+    - oracle:                         &oracle "Oracle"
+    - db2:                            &db2 "Db2"
+    - ase:                            &ase "ASE"
+    - all_db:                         &all_db [*hana, *mssql, *oracle, *db2, *ase]
+
+  role:
+    - db:                             &db_role "DB"
+    - ascs:                           &ascs_role "SCS"
+    - ers:                            &ers_role "ERS"
+    - app:                            &app_role "APP"
+    - webdispatcher:                  &web_dispatch "WEB"
+    - pas:                            &pas "PAS"
+    - all_role:                       &all_role [*db_role, *ascs_role, *ers_role, *app_role, *web_dispatch, *pas]
+
+  fencing_agent:
+    - sbd:                            &sbd "ISCSI"
+    - fencing_agent:                  &fencing_agent "AFA"
+    - all_fencing_agent:              &all_fencing_agent [*sbd, *fencing_agent]
+
+  collector_type:
+    - command:                        &command "command"
+    - azure:                          &azure "azure"
+    - all_collector_type:             &all_collector_type [*command, *azure]
+
+  severity:
+    - info:                           &info "INFO"
+    - high:                           &high "HIGH"
+    - low:                            &low "LOW"
+    - warning:                        &warning "WARNING"
+    - all_severity:                   &all_severity [*info, *high, *low, *warning]
+
+  category:
+    - package:                        &package_check "Package"
+    - vm:                             &vm_check "Virtual Machine"
+    - sap:                            &sap_check "SAP"
+    - os:                             &os_check "Operating System"
+    - all_check_types:                &all_check_types [*package_check, *vm_check, *sap_check, *os_check]
+
+  user:
+    - root:                           &root "root"
+    - sidadm:                         &sidadm "sidadm"
+    - all_users:                      &all_users [*root, *sidadm]
+
+  validator_type:
+    - string:                         &string "string"
+    - range:                          &range "range"
+
+  report:
+    - check:                          &check "check"
+    - section:                        &section "section"
+
+# Checks for APP roles
+
+checks:
+  - id:                                 "APP-0001"
+    name:                               "IPv4 keepalive time"
+    description:                        "Optimize for faster reconnect after ASCS failover"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat, *oraclelinux]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *all_storage
+      role:                             [*pas, *app_role]
+      database_type:                    [*hana, *mssql, *oracle, *db2]
+      high_availability:                true
+      high_availability_agent:          [*sbd, *fencing_agent]
+    collector_type:                     *command
+    collector_args:
+      command:                          "/sbin/sysctl net.ipv4.tcp_keepalive_time"
+      user:                             *root
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "net.ipv4.tcp_keepalive_time = 300"
+    report:                             *check
+    references:
+      sap:                              "1410736"
+
+  - id:                                 "APP-0002"
+    name:                               "IPv4 tcp_retries2"
+    description:                        "Optimize for faster reconnect after ASCS failover"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat, *oraclelinux]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *all_storage
+      role:                             [*pas, *app_role]
+      database_type:                    [*hana, *mssql, *oracle, *db2]
+      high_availability:                true
+      high_availability_agent:          [*sbd, *fencing_agent]
+    collector_type:                     *command
+    collector_args:
+      command:                          "/sbin/sysctl net.ipv4.tcp_retries2"
+      user:                             *root
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "net.ipv4.tcp_retries2 = 15"
+    report:                             *check
+    references:
+      sap:                              "2696099"
+      other:                            "https://www.suse.com/de-de/support/kb/doc/?id=000019293"
+
+  - id:                                 "APP-0003"
+    name:                               "IPv4 keepalive interval"
+    description:                        "Optimize for faster reconnect after ASCS failover"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat, *oraclelinux]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *all_storage
+      role:                             [*pas, *app_role]
+      database_type:                    [*hana, *mssql, *oracle, *db2]
+    collector_type:                     *command
+    collector_args:
+      command:                          "/sbin/sysctl net.ipv4.tcp_keepalive_intvl"
+      user:                             *root
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "net.ipv4.tcp_keepalive_intvl = 75"
+    report:                             *check
+    references:
+      sap:                              "1410736"
+
+  - id:                                 "APP-0004"
+    name:                               "IPv4 keepalive probes"
+    description:                        "Optimize for faster reconnect after ASCS failover"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat, *oraclelinux]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *all_storage
+      role:                             [*pas, *app_role]
+      database_type:                    [*hana, *mssql, *oracle, *db2]
+    collector_type:                     *command
+    collector_args:
+      command:                          "/sbin/sysctl net.ipv4.tcp_keepalive_probes"
+      user:                             *root
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "net.ipv4.tcp_keepalive_probes = 9"
+    report:                             *check
+    references:
+      sap:                              "1410736"
+
+  - id:                                 "APP-0005"
+    name:                               "IPv4 tcp_tw_recycle"
+    description:                        "Optimize for faster reconnect after ASCS failover"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse]
+      os_version:                       [*suse_12_3]
+      hardware_type:                    *vm
+      storage_type:                     *all_storage
+      role:                             [*pas, *app_role]
+      database_type:                    [*hana, *mssql, *oracle, *db2]
+      high_availability:                true
+      high_availability_agent:          [*sbd, *fencing_agent]
+    collector_type:                     *command
+    collector_args:
+      command:                          "/sbin/sysctl net.ipv4.tcp_tw_recycle"
+      user:                             *root
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "net.ipv4.tcp_tw_recycle = 0"
+    report:                             *check
+    references:
+      other:                            "https://www.suse.com/support/kb/doc/?id=000019722"
+
+  - id:                                 "APP-0006"
+    name:                               "IPv4 tcp_tw_reuse"
+    description:                        "Optimize for faster reconnect after ASCS failover"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat, *oraclelinux]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *all_storage
+      role:                             [*app_role, *pas]
+      database_type:                    [*hana, *mssql, *oracle, *db2]
+      high_availability:                true
+      high_availability_agent:          [*sbd, *fencing_agent]
+    collector_type:                     *command
+    collector_args:
+      command:                          "/sbin/sysctl net.ipv4.tcp_tw_reuse"
+      user:                             *root
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "net.ipv4.tcp_tw_reuse = 0"
+    report:                             *check
+    references:
+      other:                            "https://www.suse.com/support/kb/doc/?id=000019722"
+
+  - id:                                 "APP-0007"
+    name:                               "IPv4 tcp_retries1"
+    description:                        "Optimize for faster reconnect after ASCS failover"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat, *oraclelinux]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *all_storage
+      role:                             [*pas, *app_role]
+      database_type:                    [*hana, *mssql, *oracle, *db2]
+      high_availability:                true
+      high_availability_agent:          [*sbd, *fencing_agent]
+    collector_type:                     *command
+    collector_args:
+      command:                          "/sbin/sysctl net.ipv4.tcp_retries1"
+      user:                             *root
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "net.ipv4.tcp_retries1 = 3"
+    report:                             *check
+    references:
+      other:                            "https://www.suse.com/support/kb/doc/?id=000019722"
+
diff --git a/src/roles/configuration_checks/tasks/files/ascs.yml b/src/roles/configuration_checks/tasks/files/ascs.yml
new file mode 100644
index 00000000..ae6360f0
--- /dev/null
+++ b/src/roles/configuration_checks/tasks/files/ascs.yml
@@ -0,0 +1,110 @@
+enums:
+  severity:
+    - info:                           &info "INFO"
+    - high:                           &high "HIGH"
+    - low:                            &low "LOW"
+    - warning:                        &warning "WARNING"
+    - critical:                       &critical "CRITICAL"
+    - all_severity:                   &severity [*info, *high, *low, *warning, *critical]
+
+  os_type:
+    - suse:                           &suse "SLES_SAP"
+    - redhat:                         &redhat "REDHAT"
+    - oraclelinux:                    &oraclelinux "OracleLinux"
+    - windows:                        &windows "Windows"
+    - all_os:                         &os_type [*suse, *redhat, *oraclelinux, *windows]
+
+  os_version:
+    - suse_12_3:                      &suse_12_3 "SUSE 12 SP3"
+    - suse_12_4:                      &suse_12_4 "SUSE 12 SP4"
+    - suse_12_5:                      &suse_12_5 "SUSE 12 SP5"
+    - all_versions:                   &all_versions "all"
+
+  hardware_type:
+    - vm:                             &vm "VM"
+    - hli:                            &hli "HLI"
+    - all_hardware:                   &all_hardware [*vm, *hli]
+
+  storage_type:
+    premium_storage:                  &premium_storage ["Premium_LRS","UltraSSD_LRS","ANF","PremiumV2_LRS","AFS"]
+    anf:                              &anf ["ANF"]
+    all_storage:                      &all_storage ["Premium_LRS","UltraSSD_LRS","StandardSSD_LRS","Standard_LRS","ANF","PremiumV2_LRS","AFS"]
+
+  workload:
+    - sap:                            &sap "SAP"
+    - all_workload:                   &workload [*sap]
+
+  db:
+    - hana:                           &hana "HANA"
+    - mssql:                          &mssql "MSSQL"
+    - oracle:                         &oracle "Oracle"
+    - db2:                            &db2 "Db2"
+    - ase:                            &ase "ASE"
+    - all_db:                         &db [*hana, *mssql, *oracle, *db2, *ase]
+
+  role:
+    - db:                             &db_role "DB"
+    - ascs:                           &ascs_role "SCS"
+    - ers:                            &ers_role "ERS"
+    - app:                            &app_role "APP"
+    - webdispatcher:                  &web_dispatch "WEB"
+    - pas:                            &pas "PAS"
+    - all_role:                       &role [*db_role, *ascs_role, *ers_role, *app_role, *web_dispatch, *pas]
+
+  cluster_type:
+    - sbd:                            &sbd "ISCSI"
+    - fencing_agent:                  &fencing_agent "AFA"
+    - all_fencing_agent:              &cluster_type [*sbd, *fencing_agent]
+
+  collector_type:
+    - command:                        &command "command"
+    - azure:                          &azure "azure"
+    - all_collector_type:             &collector_type [*command, *azure]
+
+  category:
+    - package:                        &package_check "Package"
+    - vm:                             &vm_check "Virtual Machine"
+    - sap:                            &sap_check "SAP"
+    - os:                             &os_check "Operating System"
+    - all_check_types:                &category [*package_check, *vm_check, *sap_check, *os_check]
+
+  user:
+    - root:                           &root "root"
+    - sidadm:                         &sidadm "sidadm"
+    - all_users:                      &user [*root, *sidadm]
+
+  validator_type:
+    - string:                         &string "string"
+    - range:                          &range "range"
+    - list:                           &list "list"
+    - all:                            &validator_type [*string, *range, *list]
+
+  report:
+    - check:                          &check "check"
+    - section:                        &section "section"
+    - report:                         &report [*check, *section]
+
+checks:
+  - id:                                 "ASCS-0001"
+    name:                               "Load Balancer timestamps"
+    description:                        "Timestamp parameter for HA Load Balancers"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      - os_type:                        [*suse, *redhat]
+      - os_version:                     *all_versions
+      - hardware_type:                  *vm
+      - storage_type:                   *all_storage
+      - role:                           [*ascs_role, *db_role]
+      - database_type:                  *db
+      - high_availability:              true
+      - high_availability_agent:        *cluster_type
+    collector_type:                     *command
+    collector_args:
+      command:                          "/sbin/sysctl net.ipv4.tcp_timestamps -n"
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "0"
+    report:                             *check
+
diff --git a/src/roles/configuration_checks/tasks/files/hana.yml b/src/roles/configuration_checks/tasks/files/hana.yml
new file mode 100644
index 00000000..9690d320
--- /dev/null
+++ b/src/roles/configuration_checks/tasks/files/hana.yml
@@ -0,0 +1,1287 @@
+enums:
+  severity:
+    - info:                           &info "INFO"
+    - high:                           &high "HIGH"
+    - low:                            &low "LOW"
+    - warning:                        &warning "WARNING"
+    - critical:                       &critical "CRITICAL"
+    - all_severity:                   &severity [*info, *high, *low, *warning, *critical]
+
+  os_type:
+    - suse:                           &suse "SLES_SAP"
+    - redhat:                         &redhat "REDHAT"
+    - oraclelinux:                    &oraclelinux "OracleLinux"
+    - windows:                        &windows "Windows"
+    - all_os:                         &os_type [*suse, *redhat, *oraclelinux, *windows]
+
+  os_version:
+    - suse_12_3:                      &suse_12_3 "SUSE 12 SP3"
+    - suse_12_4:                      &suse_12_4 "SUSE 12 SP4"
+    - suse_12_5:                      &suse_12_5 "SUSE 12 SP5"
+    - suse_15_0:                      &suse_15_0 "SUSE 15 SP0"
+    - suse_15_0:                      &suse_15_1 "SUSE 15 SP1"
+    - all_versions:                   &all_versions "all"
+
+  hardware_type:
+    - vm:                             &vm "VM"
+    - hli:                            &hli "HLI"
+    - all_hardware:                   &all_hardware [*vm, *hli]
+
+  storage_type:
+    premium_storage:                  &premium_storage ["Premium_LRS","UltraSSD_LRS","PremiumV2_LRS","AFS"]
+    anf:                              &anf ["ANF"]
+    all_storage:                      &all_storage ["Premium_LRS","UltraSSD_LRS","StandardSSD_LRS","Standard_LRS","ANF","PremiumV2_LRS","AFS"]
+
+  workload:
+    - sap:                            &sap "SAP"
+    - all_workload:                   &workload [*sap]
+
+  db:
+    - hana:                           &hana "HANA"
+    - mssql:                          &mssql "MSSQL"
+    - oracle:                         &oracle "Oracle"
+    - db2:                            &db2 "Db2"
+    - ase:                            &ase "ASE"
+    - all_db:                         &db [*hana, *mssql, *oracle, *db2, *ase]
+
+  role:
+    - db:                             &db_role "DB"
+    - ascs:                           &ascs_role "SCS"
+    - ers:                            &ers_role "ERS"
+    - app:                            &app_role "APP"
+    - webdispatcher:                  &web_dispatch "WEB"
+    - pas:                            &pas "PAS"
+    - all_role:                       &role [*db_role, *ascs_role, *ers_role, *app_role, *web_dispatch, *pas]
+
+  cluster_type:
+    - sbd:                            &sbd "ISCSI"
+    - fencing_agent:                  &fencing_agent "AFA"
+    - all_fencing_agent:              &cluster_type [*sbd, *fencing_agent]
+
+  collector_type:
+    - command:                        &command "command"
+    - azure:                          &azure "azure"
+    - all_collector_type:             &collector_type [*command, *azure]
+
+  category:
+    - package:                        &package_check "Package"
+    - vm:                             &vm_check "Virtual Machine"
+    - sap:                            &sap_check "SAP"
+    - os:                             &os_check "Operating System"
+    - all_check_types:                &category [*package_check, *vm_check, *sap_check, *os_check]
+
+  user:
+    - root:                           &root "root"
+    - sidadm:                         &sidadm "sidadm"
+    - all_users:                      &user [*root, *sidadm]
+
+  validator_type:
+    - string:                         &string "string"
+    - range:                          &range "range"
+    - list:                           &list "list"
+    - all:                            &validator_type [*string, *range, *list]
+
+  report:
+    - check:                          &check "check"
+    - section:                        &section "section"
+    - table:                          &table "table"
+    - report:                         &report [*check, *section, *table]
+
+# Checks for DB roles for database_type == hana
+
+checks:
+  - id:                                 "DB-HANA-0001"
+    name:                               "PREFER_SITE_TAKEOVER"
+    description:                        "SAP HANA Automatic Site Takeover"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *all_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+      high_availability:                true
+      high_availability_agent:          *cluster_type
+    collector_type:                     *command
+    collector_args:
+      command:                          cibadmin --query --xpath "//nvpair[@name='PREFER_SITE_TAKEOVER']" | grep -o 'value="[^\"]*"' | cut -d'"' -f2
+      user:                             *root
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "true"
+    report:                             *check
+
+  - id:                                 "DB-HANA-0002"
+    name:                               "AUTOMATED_REGISTER"
+    description:                        "SAP HANA Automated Register"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *all_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+      high_availability:                true
+      high_availability_agent:          *cluster_type
+    collector_type:                     *command
+    collector_args:
+      command:                          cibadmin --query --xpath "//nvpair[@name='AUTOMATED_REGISTER']" | grep -o 'value="[^\"]*"' | tail -n 1 | cut -d'"' -f2
+      user:                             *root
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "true"
+    report:                             *check
+
+  - id:                                 "DB-HANA-0003"
+    name:                               "stonith-action"
+    description:                        "SAP HANA stonith action (fencing)"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *all_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+      high_availability:                true
+      high_availability_agent:          *cluster_type
+    collector_type:                     *command
+    collector_args:
+      command:                          cibadmin --query --xpath "//nvpair[@name='stonith-action']" | grep -o 'value="[^\"]*"' | cut -d'"' -f2
+      user:                             *root
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "reboot"
+    report:                             *check
+
+  - id:                                 "DB-HANA-0006"
+    name:                               "Load Balancer timestamps Non-HA"
+    description:                        "Timestamp parameter for Non-HA Load Balancers"
+    category:                           *os_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *all_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+      high_availability:                false
+      high_availability_agent:          *cluster_type
+    collector_type:                     *command
+    collector_args:
+      command:                          "/sbin/sysctl net.ipv4.tcp_timestamps -n"
+      user:                             *root
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "1"
+    report:                             *check
+
+  - id:                                 "DB-HANA-0007"
+    name:                               "Load Balancer timestamps HA"
+    description:                        "Timestamp parameter for HA Load Balancers"
+    category:                           *os_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *all_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+      high_availability:                true
+      high_availability_agent:          *cluster_type
+    collector_type:                     *command
+    collector_args:
+      command:                          "/sbin/sysctl net.ipv4.tcp_timestamps -n"
+      user:                             *root
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "0"
+    report:                             *check
+
+  - id:                                 "DB-HANA-0008"
+    name:                               "sysctl net.core.rmem_max"
+    description:                        "SAP HANA sysctl net.core.rmem_max"
+    category:                           *os_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *all_hardware
+      storage_type:                     *all_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *command
+    collector_args:
+      command:                          "/sbin/sysctl net.core.rmem_max -n"
+      user:                             *root
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "16777216"
+    report:                             *check
+    references:
+      microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/sap-hana-scale-out-standby-netapp-files-suse"
+      sap:                              "3024346"
+
+  - id:                                 "DB-HANA-0009"
+    name:                               "sysctl net.core.wmem_max"
+    description:                        "SAP HANA sysctl net.core.wmem_max"
+    category:                           *os_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *all_hardware
+      storage_type:                     *all_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *command
+    collector_args:
+      command:                          "/sbin/sysctl net.core.wmem_max -n"
+      user:                             *root
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "16777216"
+    report:                             *check
+    references:
+      microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/sap-hana-scale-out-standby-netapp-files-suse"
+      sap:                              "3024346"
+
+  - id:                                 "DB-HANA-0010"
+    name:                               "sysctl net.ipv4.tcp_rmem"
+    description:                        "SAP HANA sysctl net.ipv4.tcp_rmem"
+    category:                           *os_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *all_hardware
+      storage_type:                     *all_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *command
+    collector_args:
+      command:                          "/sbin/sysctl net.ipv4.tcp_rmem -n"
+      user:                             *root
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "4096 131072 16777216"
+    report:                             *check
+    references:
+      microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/sap-hana-scale-out-standby-netapp-files-suse"
+      sap:                              "3024346"
+
+  - id:                                 "DB-HANA-0011"
+    name:                               "sysctl net.ipv4.tcp_wmem"
+    description:                        "SAP HANA sysctl net.ipv4.tcp_wmem"
+    category:                           *os_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *all_hardware
+      storage_type:                     *all_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *command
+    collector_args:
+      command:                          "/sbin/sysctl net.ipv4.tcp_wmem -n"
+      user:                             *root
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "4096 16384 16777216"
+    report:                             *check
+    references:
+      microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/sap-hana-scale-out-standby-netapp-files-suse"
+      sap:                              "3024346"
+
+  - id:                                 "DB-HANA-0012"
+    name:                               "sysctl net.core.netdev_max_backlog"
+    description:                        "SAP HANA sysctl net.core.netdev_max_backlog"
+    category:                           *os_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *all_hardware
+      storage_type:                     *all_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *command
+    collector_args:
+      command:                          "/sbin/sysctl net.core.netdev_max_backlog -n"
+      user:                             *root
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "300000"
+    report:                             *check
+    references:
+      microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/sap-hana-scale-out-standby-netapp-files-suse"
+      sap:                              "3024346"
+
+  - id:                                 "DB-HANA-0013"
+    name:                               "sysctl net.ipv4.tcp_slow_start_after_idle"
+    description:                        "SAP HANA sysctl net.ipv4.tcp_slow_start_after_idle"
+    category:                           *os_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *all_hardware
+      storage_type:                     *all_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *command
+    collector_args:
+      command:                          "/sbin/sysctl net.ipv4.tcp_slow_start_after_idle -n"
+      user:                             *root
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "0"
+    report:                             *check
+    references:
+      microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/sap-hana-scale-out-standby-netapp-files-suse"
+      sap:                              "3024346"
+
+  - id:                                 "DB-HANA-0014"
+    name:                               "sysctl net.ipv4.tcp_moderate_rcvbuf"
+    description:                        "SAP HANA sysctl net.ipv4.tcp_moderate_rcvbuf"
+    category:                           *os_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *all_hardware
+      storage_type:                     *all_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *command
+    collector_args:
+      command:                          "/sbin/sysctl net.ipv4.tcp_moderate_rcvbuf -n"
+      user:                             *root
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "1"
+    report:                             *check
+    references:
+      microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/sap-hana-scale-out-standby-netapp-files-suse"
+      sap:                              "3024346"
+
+  - id:                                 "DB-HANA-0015"
+    name:                               "sysctl net.ipv4.tcp_window_scaling"
+    description:                        "SAP HANA sysctl net.ipv4.tcp_window_scaling"
+    category:                           *os_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *all_hardware
+      storage_type:                     *all_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *command
+    collector_args:
+      command:                          "/sbin/sysctl net.ipv4.tcp_window_scaling -n"
+      user:                             *root
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "1"
+    report:                             *check
+    references:
+      microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/sap-hana-scale-out-standby-netapp-files-suse"
+      sap:                              "3024346"
+
+  - id:                                 "DB-HANA-0016"
+    name:                               "sysctl net.ipv4.tcp_timestamps"
+    description:                        "SAP HANA sysctl net.ipv4.tcp_timestamps"
+    category:                           *os_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *all_hardware
+      storage_type:                     *all_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *command
+    collector_args:
+      command:                          "/sbin/sysctl net.ipv4.tcp_timestamps -n"
+      user:                             *root
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "1"
+    report:                             *check
+    references:
+      microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/sap-hana-scale-out-standby-netapp-files-suse"
+      sap:                              "3024346"
+
+  - id:                                 "DB-HANA-0017"
+    name:                               "sysctl net.ipv4.tcp_sack"
+    description:                        "SAP HANA sysctl net.ipv4.tcp_sack"
+    category:                           *os_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *all_hardware
+      storage_type:                     *all_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *command
+    collector_args:
+      command:                          "/sbin/sysctl net.ipv4.tcp_sack -n"
+      user:                             *root
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "1"
+    report:                             *check
+    references:
+      microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/sap-hana-scale-out-standby-netapp-files-suse"
+      sap:                              "3024346"
+
+  - id:                                 "DB-HANA-0018"
+    name:                               "sysctl net.ipv6.conf.all.disable_ipv6"
+    description:                        "SAP HANA sysctl net.ipv6.conf.all.disable_ipv6"
+    category:                           *os_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *all_hardware
+      storage_type:                     *all_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *command
+    collector_args:
+      command:                          "/sbin/sysctl net.ipv6.conf.all.disable_ipv6 -n"
+      user:                             *root
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "1"
+    report:                             *check
+    references:
+      microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/sap-hana-scale-out-standby-netapp-files-suse"
+      sap:                              "3024346"
+
+  - id:                                 "DB-HANA-0019"
+    name:                               "sysctl net.ipv4.tcp_max_syn_backlog"
+    description:                        "SAP HANA sysctl net.ipv4.tcp_max_syn_backlog"
+    category:                           *os_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *all_hardware
+      storage_type:                     *all_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *command
+    collector_args:
+      command:                          "/sbin/sysctl net.ipv4.tcp_max_syn_backlog -n"
+      user:                             *root
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "16348"
+    report:                             *check
+    references:
+      microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/sap-hana-scale-out-standby-netapp-files-suse"
+      sap:                              "3024346"
+
+  - id:                                 "DB-HANA-0020"
+    name:                               "sysctl net.ipv4.ip_local_port_range"
+    description:                        "SAP HANA sysctl net.ipv4.ip_local_port_range"
+    category:                           *os_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *all_hardware
+      storage_type:                     *all_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *command
+    collector_args:
+      command:                          "/sbin/sysctl net.ipv4.ip_local_port_range -n"
+      user:                             *root
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "9000 65300"
+    report:                             *check
+    references:
+      microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/sap-hana-scale-out-standby-netapp-files-suse"
+      sap:                              "3024346"
+
+  - id:                                 "DB-HANA-0021"
+    name:                               "sysctl net.ipv4.conf.all.rp_filter"
+    description:                        "SAP HANA sysctl net.ipv4.conf.all.rp_filter"
+    category:                           *os_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *all_hardware
+      storage_type:                     *all_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *command
+    collector_args:
+      command:                          "/sbin/sysctl net.ipv4.conf.all.rp_filter -n"
+      user:                             *root
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "0"
+    report:                             *check
+    references:
+      microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/sap-hana-scale-out-standby-netapp-files-suse"
+      sap:                              "3024346"
+
+  - id:                                 "DB-HANA-0022"
+    name:                               "sysctl sunrpc.tcp_slot_table_entries"
+    description:                        "SAP HANA sysctl sunrpc.tcp_slot_table_entries"
+    category:                           *os_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *all_hardware
+      storage_type:                     *all_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *command
+    collector_args:
+      command:                          "/sbin/sysctl sunrpc.tcp_slot_table_entries -n"
+      user:                             *root
+    validator_type:                     *string
+    validator_args:
+      expected_output:                   "128"
+    report:                             *check
+    references:
+      microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/sap-hana-scale-out-standby-netapp-files-suse"
+      sap:                              "3024346"
+
+  - id:                                 "DB-HANA-0023"
+    name:                               "sysctl vm.swappiness"
+    description:                        "SAP HANA sysctl vm.swappiness"
+    category:                           *os_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *all_hardware
+      storage_type:                     *all_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *command
+    collector_args:
+      command:                          "/sbin/sysctl vm.swappiness -n"
+      user:                             *root
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "10"
+    report:                             *check
+    references:
+      microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/sap-hana-scale-out-standby-netapp-files-suse"
+      sap:                              "3024346"
+
+  - id:                                 "DB-HANA-0024"
+    name:                               "Red Hat tuned-adm profile"
+    description:                        "SAP HANA Red Hat tuned-adm profile"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *all_hardware
+      storage_type:                     *premium_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *command
+    collector_args:
+      command:                          "tuned-adm active"
+      user:                             *root
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "Current active profile: sap-hana"
+    report:                             *check
+    references:
+      sap:                              "2777782"
+
+  - id:                                 "DB-HANA-0025"
+    name:                               "Kernel version higher than 4.12.14-95.37.1"
+    description:                        "SAP HANA Backup fails on Azure - SLES 12.4"
+    category:                           *sap_check
+    severity:                           *warning
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse]
+      os_version:                       [*suse_12_4]
+      hardware_type:                    *vm
+      storage_type:                     *premium_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *command
+    collector_args:
+      command:                          "uname -r"
+      user:                             *root
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "4.12.14-95.37.1"
+    report:                             *check
+    references:
+      sap:                              "2814271"
+
+  - id:                                 "DB-HANA-0026"
+    name:                               "Mellanox TX timeout - CPU soft lockup"
+    description:                        "set hv_storvsc.storvsc_ringbuffer_size=131072 and hv_storvsc.storvsc_vcpus_per_sub_channel=1024 in kernel boot line"
+    category:                           *sap_check
+    severity:                           *warning
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse]
+      os_version:                       [*suse_12_4]
+      hardware_type:                    *vm
+      storage_type:                     *premium_storage
+      role:                             [*db_role]
+      database_type:                    [*hana, *db2]
+    collector_type:                     *command
+    collector_args:
+      command:                          "uname -r"
+      user:                             *root
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "4.12.14-95"
+    report:                             *check
+    references:
+      sap:                              "2814271"
+
+  - id:                                 "DB-HANA-0027"
+    name:                               "Kernel version higher than 4.12.14-122.7.1"
+    description:                        "SAP HANA Backup fails on Azure - SLES 12.5"
+    category:                           *sap_check
+    severity:                           *warning
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse]
+      os_version:                       [*suse_12_5]
+      hardware_type:                    *vm
+      storage_type:                     *premium_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *command
+    collector_args:
+      command:                          "uname -r"
+      user:                             *root
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "4.12.14-122.7.1"
+    report:                             *check
+    references:
+      sap:                              "2814271"
+
+  - id:                                 "DB-HANA-0028"
+    name:                               "Kernel version higher than 4.12.14-150.38.1"
+    description:                        "SAP HANA Backup fails on Azure - SLES 15.0"
+    category:                           *sap_check
+    severity:                           *warning
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse]
+      os_version:                       [*suse_15_0]
+      hardware_type:                    *vm
+      storage_type:                     *premium_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *command
+    collector_args:
+      command:                          "uname -r"
+      user:                             *root
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "4.12.14-150.38.1"
+    report:                             *check
+    references:
+      sap:                              "2814271"
+
+  - id:                                 "DB-HANA-0029"
+    name:                               "Kernel version higher than 4.12.14-197.21.1"
+    description:                        "SAP HANA Backup fails on Azure - SLES 15.1"
+    category:                           *sap_check
+    severity:                           *warning
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse]
+      os_version:                       [*suse_15_1]
+      hardware_type:                    *vm
+      storage_type:                     *premium_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *command
+    collector_args:
+      command:                          "uname -r"
+      user:                             *root
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "4.12.14-197.21.1"
+    report:                             *check
+    references:
+      sap:                              "2814271"
+
+  - id:                                 "DB-HANA-0030"
+    name:                               "Azure Fence Agent Configuration"
+    description:                        "When configuring the Azure Fence Agent, it must be configured with MSI. This is the default setting when using the Azure Portal to configure the agent."
+    category:                           *sap_check
+    severity:                           *warning
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *all_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+      high_availability:                true
+      high_availability_agent:          [*fencing_agent]
+    collector_type:                     *command
+    collector_args:
+      command:                          cibadmin --query --xpath "//nvpair[@name='msi']" | grep -o 'value=\"[^\"]*\"' | cut -d'"' -f2
+      user:                             *root
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "true"
+    report:                             *check
+    references:
+      microsoft:                        "https://learn.microsoft.com/en-us/azure/sap/workloads/high-availability-guide-suse-pacemaker#using-managed-identity"
+
+  - id:                                 "DB-HANA-0031"
+    name:                               "fstrim disabled"
+    description:                        "Disable fstrim to avoid potential inconsistency problems"
+    category:                           *os_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *premium_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *command
+    collector_args:
+      command:                          "/bin/systemctl | grep fstrim | grep active | wc -l"
+      user:                             *root
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "0"
+    report:                             *check
+    references:
+      other:                            "https://www.suse.com/support/kb/doc/?id=000019447"
+
+  - id:                                 "DB-HANA-0032"
+    name:                               "Swap space"
+    description:                        "Swap space should be 2GB"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *premium_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *command
+    collector_args:
+      command:                          "free -m | grep Swap | awk '{print $2}'"
+      user:                             *root
+    validator_type:                     *range
+    validator_args:
+      min:                              "2046"
+      max:                              "2049"
+    report:                             *check
+    references:
+      sap:                              "1999997"
+
+  - id:                                 DB-HANA-0033
+    name:                               "Filesystem type for /hana/data"
+    description:                        "The filesystem type for /hana/data should be xfs or nfs or nfs4"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *all_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *command
+    collector_args:
+      command:                          "df -T /hana/data | tail -1 | awk '{print $2}'"
+      user:                             *root
+    validator_type:                     *list
+    validator_args:
+      valid_list:                       ["xfs", "nfs", "nfs4"]
+    report:                             *check
+    references:
+      sap:                              "2972496"
+
+  - id:                                 DB-HANA-0034
+    name:                               "Stripe size for /hana/data"
+    description:                        "The stripe size for /hana/data should be 256k (256.00k or 262144 bytes)"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *premium_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *azure
+    collector_args:
+      resource_type:                    "disks"
+      property:                         "stripe_size"
+      mount_point:                      "/hana/data"
+    validator_type:                     *string
+    validator_args:
+      expected:                         "256.00k"
+    report:                             *check
+    references:
+      sap:                              "2972496"
+      microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/hana-vm-operations-storage"
+
+  - id:                                 DB-HANA-0035
+    name:                               "Filesystem type for /hana/log"
+    description:                        "The filesystem type for /hana/log should be xfs or nfs or nfs4"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *all_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *command
+    collector_args:
+      command:                          "df -T /hana/log | tail -1 | awk '{print $2}'"
+      user:                             *root
+    validator_type:                     *list
+    validator_args:
+      valid_list:                       ["xfs", "nfs", "nfs4"]
+    report:                             *check
+    references:
+      sap:                              "2972496"
+
+  - id:                                 DB-HANA-0036
+    name:                               "Stripe size for /hana/log"
+    description:                        "The stripe size for /hana/log should be 256k (256.00k or 262144 bytes)"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *premium_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *azure
+    collector_args:
+      resource_type:                    "disks"
+      property:                         "stripe_size"
+      mount_point:                      "/hana/log"
+    validator_type:                     *string
+    validator_args:
+      expected:                         "256.00k"
+    report:                             *check
+    references:
+      sap:                              "2972496"
+      microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/hana-vm-operations-storage"
+
+  - id:                                 DB-HANA-0037
+    name:                               "Filesystem type for /hana/shared"
+    description:                        "The filesystem type for /hana/shared should be xfs or nfs or nfs4"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *all_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *command
+    collector_args:
+      command:                          "df -T /hana/shared | tail -1 | awk '{print $2}'"
+      user:                             *root
+    validator_type:                     *list
+    validator_args:
+      valid_list:                       ["xfs", "nfs", "nfs4"]
+    report:                             *check
+    references:
+      sap:                              "2972496"
+
+  - id:                                 DB-HANA-0038
+    name:                               "Filesystem type for /usr/sap"
+    description:                        "The filesystem type for /usr/sap should be xfs or nfs or nfs4"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *all_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *command
+    collector_args:
+      command:                          "df -T /usr/sap | tail -1 | awk '{print $2}'"
+      user:                             *root
+    validator_type:                     *list
+    validator_args:
+      valid_list:                       ["xfs", "nfs", "nfs4"]
+    report:                             *check
+    references:
+      sap:                              "2972496"
+
+  - id:                                 DB-HANA-0039
+    name:                               "Sector size for /hana/data Premium SSD V2"
+    description:                        "The logical block size for /hana/data on Premium SSD V2 should be 4096 bytes"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *premium_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *command
+    collector_args:
+      command:                          "stat -f -c '%s' /hana/data 2>/dev/null || echo 'N/A'"
+      user:                             *root
+    validator_type:                     *range
+    validator_args:
+      min:                              "4096"
+    report:                             *check
+    references:
+      sap:                              "2972496"
+
+  - id:                                 DB-HANA-0040
+    name:                               "Sector size for /hana/log Premium SSD V2"
+    description:                        "The logical block size for /hana/log on Premium SSD V2 should be 4096 bytes"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *premium_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *command
+    collector_args:
+      command:                          "stat -f -c '%s' /hana/log 2>/dev/null || echo 'N/A'"
+      user:                             *root
+    validator_type:                     *range
+    validator_args:
+      min:                              "4096"
+    report:                             *check
+    references:
+      sap:                              "2972496"
+
+  - id:                                 DB-HANA-0041
+    name:                               "Disk performance for /hana/data (MBPS)"
+    description:                        "The disk performance for /hana/data should be >= 400 MByte/s"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *premium_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *azure
+    collector_args:
+      resource_type:                    "disks"
+      property:                         "mbps"
+      mount_point:                      "/hana/data"
+    validator_type:                     *range
+    validator_args:
+      min:                              "400"
+    report:                             *check
+    references:
+      sap:                              "2972496"
+      microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/hana-vm-operations-storage"
+
+  - id:                                 DB-HANA-0042
+    name:                               "Disk performance for /hana/data (IOPS)"
+    description:                        "The disk performance for /hana/data should be >= 7000 IOPS"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *premium_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *azure
+    collector_args:
+      resource_type:                    "disks"
+      property:                         "iops"
+      mount_point:                      "/hana/data"
+    validator_type:                     *range
+    validator_args:
+      min:                              "7000"
+    report:                             *check
+    references:
+      sap:                              "2972496"
+      microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/hana-vm-operations-storage"
+
+  - id:                                 DB-HANA-0043
+    name:                               "Disk performance for /hana/log (MBPS)"
+    description:                        "The disk performance for /hana/log should be >= 250 MByte/s"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *premium_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *azure
+    collector_args:
+      resource_type:                    "disks"
+      property:                         "mbps"
+      mount_point:                      "/hana/log"
+    validator_type:                     *range
+    validator_args:
+      min:                              "250"
+    report:                             *check
+    references:
+      sap:                              "2972496"
+      microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/hana-vm-operations-storage"
+
+  - id:                                 DB-HANA-0044
+    name:                               "Disk performance for /hana/log (IOPS)"
+    description:                        "The disk performance for /hana/log should be >= 7000 IOPS"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *premium_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *azure
+    collector_args:
+      resource_type:                    "disks"
+      property:                         "iops"
+      mount_point:                      "/hana/log"
+    validator_type:                     *range
+    validator_args:
+      min:                              "2000"
+    report:                             *check
+    references:
+      sap:                              "2972496"
+      microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/hana-vm-operations-storage"
+
+  - id:                                 DB-HANA-0045
+    name:                               "Filesystem Mount Points"
+    description:                        "Lists all mounted filesystems and their types to ensure SAP HANA directories are configured with supported filesystems."
+    category:                           *sap_check
+    severity:                           *info
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *all_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *azure
+    collector_args:
+      resource_type:                    "filesystem"
+    report:                             *table
+    references:
+      sap:                              "2972496"
+      microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/hana-vm-operations-storage"
+
+  - id:                                 DB-HANA-0046
+    name:                               "Azure Disks"
+    description:                        "Lists all attached Azure disks to ensure SAP HANA directories are configured with supported disks."
+    category:                           *sap_check
+    severity:                           *info
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *all_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *azure
+    collector_args:
+      resource_type:                    "azure_disks"
+    report:                             *table
+    references:
+      sap:                              "2972496"
+      microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/hana-vm-operations-storage"
+
+  - id:                                 DB-HANA-0047
+    name:                               "LVM Groups"
+    description:                        "Lists all LVM groups to ensure SAP HANA directories are configured with supported LVM configurations."
+    category:                           *sap_check
+    severity:                           *info
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *all_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *azure
+    collector_args:
+      resource_type:                    "lvm_groups"
+    report:                             *table
+    references:
+      sap:                              "2972496"
+      microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/hana-vm-operations-storage"
+
+  - id:                                 DB-HANA-0048
+    name:                               "LVM Volumes"
+    description:                        "Lists all LVM volumes to ensure SAP HANA directories are configured with supported LVM configurations."
+    category:                           *sap_check
+    severity:                           *info
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *all_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *azure
+    collector_args:
+      resource_type:                    "lvm_volumes"
+    report:                             *table
+    references:
+      sap:                              "2972496"
+      microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/hana-vm-operations-storage"
+
+  - id:                                 DB-HANA-0049
+    name:                               "ANF Volumes"
+    description:                        "Lists all ANF volumes to ensure SAP HANA directories are configured with supported ANF configurations."
+    category:                           *sap_check
+    severity:                           *info
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *all_storage
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *azure
+    collector_args:
+      resource_type:                    "anf_volumes"
+    report:                             *table
+    references:
+      sap:                              "2972496"
+      microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/hana-vm-operations-storage"
+
+  - id:                                 DB-HANA-0050
+    name:                               "Disk performance for /hana/data (MBPS)"
+    description:                        "The disk performance for /hana/data should be >= 400 MByte/s"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *anf
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *azure
+    collector_args:
+      resource_type:                    "anf"
+      property:                         "throughputMibps"
+      mount_point:                      "/hana/data"
+    validator_type:                     *range
+    validator_args:
+      min:                              "64"
+    report:                             *check
+    references:
+      sap:                              "2972496"
+      microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/hana-vm-operations-storage"
+
+  - id:                                 DB-HANA-0051
+    name:                               "Disk performance for /hana/data (MBPS)"
+    description:                        "The disk performance for /hana/data should be >= 400 MByte/s"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *anf
+      role:                             [*db_role]
+      database_type:                    [*hana]
+    collector_type:                     *azure
+    collector_args:
+      resource_type:                    "anf"
+      property:                         "throughputMibps"
+      mount_point:                      "/hana/log"
+    validator_type:                     *range
+    validator_args:
+      min:                              "64"
+    report:                             *check
+    references:
+      sap:                              "2972496"
+      microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/hana-vm-operations-storage"
\ No newline at end of file
diff --git a/src/roles/configuration_checks/tasks/files/high_availability.yml b/src/roles/configuration_checks/tasks/files/high_availability.yml
new file mode 100644
index 00000000..d92880cd
--- /dev/null
+++ b/src/roles/configuration_checks/tasks/files/high_availability.yml
@@ -0,0 +1,125 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# /*---------------------------------------------------------------------------8
+# |                    High Availability Configuration Checks                  |
+# +------------------------------------4--------------------------------------*/
+
+enums:
+  severity:
+    - info:                           &info "INFO"
+    - high:                           &high "HIGH"
+    - low:                            &low "LOW"
+    - warning:                        &warning "WARNING"
+    - critical:                       &critical "CRITICAL"
+
+  os_type:
+    - suse:                           &suse "SLES_SAP"
+    - redhat:                         &redhat "REDHAT"
+    - all_os:                         &os_type [*suse, *redhat]
+
+  collector_type:
+    - command:                        &command "command"
+    - azure:                          &azure "azure"
+    - module:                         &module "module"
+
+  category:
+    - ha:                             &ha_check "High Availability"
+
+  report:
+    - table:                          &table "table"
+    - check:                          &check "check"
+
+  role:
+    - db:                             &db_role "DB"
+    - ascs:                           &ascs_role "SCS"
+    - ers:                            &ers_role "ERS"
+
+  cluster_type:
+    - sbd:                            &sbd "ISCSI"
+    - fencing_agent:                  &fencing_agent "AFA"
+    - all_fencing_agent:              &cluster_type [*sbd, *fencing_agent]
+
+checks:
+  - id:                               "HA-HANA-001"
+    name:                             "Database HA Cluster Configuration"
+    description:                      "Validates Pacemaker cluster configuration parameters for SAP HANA database high availability"
+    category:                         *ha_check
+    severity:                         *info
+    applicability:
+      os_type:                        *os_type
+      role:                           [*db_role]
+      high_availability:              true
+      high_availability_agent:        *cluster_type
+    collector_type:                   *module
+    collector_args:
+      module_name:                    "get_pcmk_properties_db"
+      module_args:                    {}
+    report:                           *table
+
+  - id:                               "HA-SCS-001"
+    name:                             "SCS/ERS HA Cluster Configuration"
+    description:                      "Validates Pacemaker cluster configuration parameters for SAP ASCS/ERS high availability"
+    category:                         *ha_check
+    severity:                         *info
+    applicability:
+      os_type:                        *os_type
+      role:                           [*ascs_role, *ers_role]
+      high_availability:              true
+      high_availability_agent:        *cluster_type
+    collector_type:                   *module
+    collector_args:
+      module_name:                    "get_pcmk_properties_scs"
+      module_args:                    {}
+    report:                           *table
+
+  - id:                               "HA-LB-002"
+    name:                             "Load Balancer Configuration"
+    description:                      "Validates load balancers configuration parameters in SAP VMs' Load Balancer backend address pools"
+    category:                         *ha_check
+    severity:                         *info
+    applicability:
+      os_type:                        *os_type
+      role:                           [*ascs_role, *db_role, *ers_role]
+      high_availability:              true
+      high_availability_agent:        *cluster_type
+    collector_type:                   *module
+    collector_args:
+      module_name:                    "get_azure_lb"
+      module_args:                    {}
+    report:                           *table
+
+  - id:                               "HA-LB-001"
+    name:                             "Load Balancer Name"
+    description:                      "Name of the load balancer"
+    category:                         *ha_check
+    severity:                         *info
+    applicability:
+      os_type:                        *os_type
+      role:                           [*ascs_role, *db_role, *ers_role]
+      high_availability:              true
+      high_availability_agent:        *cluster_type
+    collector_type:                   *azure
+    collector_args:
+      command:                        |-
+                                      if command -v az >/dev/null 2>&1; then
+                                        nic_id=$(az vm show --resource-group {{ CONTEXT.resource_group_name }} --name {{ CONTEXT.vm_name }} --query 'networkProfile.networkInterfaces[0].id' -o tsv 2>/dev/null);
+                                        if [ $? -eq 0 ] && [ -n "$nic_id" ] && [ "$nic_id" != "null" ]; then
+                                          lb_backend_pools=$(az network nic show --ids "$nic_id" --query 'ipConfigurations[0].loadBalancerBackendAddressPools[0].id' -o tsv 2>/dev/null);
+                                          if [ -n "$lb_backend_pools" ] && [ "$lb_backend_pools" != "null" ]; then
+                                            load_balancer_name=$(echo "$lb_backend_pools" | grep -oP '/loadBalancers/\K[^/]+');
+                                            if [ -n "$load_balancer_name" ]; then
+                                              echo "$load_balancer_name";
+                                            else
+                                              echo "No Load Balancer defined";
+                                            fi
+                                          else
+                                            echo "No Load Balancer defined";
+                                          fi
+                                        else
+                                          echo "Error: Failed to retrieve NIC";
+                                        fi
+                                      else
+                                        echo "Error: Azure CLI not available";
+                                      fi
+    report:                           *check
\ No newline at end of file
diff --git a/src/roles/configuration_checks/tasks/files/package.yml b/src/roles/configuration_checks/tasks/files/package.yml
new file mode 100644
index 00000000..56dc7cd7
--- /dev/null
+++ b/src/roles/configuration_checks/tasks/files/package.yml
@@ -0,0 +1,438 @@
+# Enumeration definitions
+enums:
+  severity:
+    - info:                           &info "INFO"
+    - high:                           &high "HIGH"
+    - low:                            &low "LOW"
+    - warning:                        &warning "WARNING"
+    - critical:                       &critical "CRITICAL"
+    - all_severity:                   &severity [*info, *high, *low, *warning, *critical]
+
+  os_type:
+    - suse:                           &suse "SLES_SAP"
+    - redhat:                         &redhat "REDHAT"
+    - oraclelinux:                    &oraclelinux "OracleLinux"
+    - windows:                        &windows "Windows"
+    - all_os:                         &os_type [*suse, *redhat, *oraclelinux, *windows]
+
+  os_version:
+    - suse_12_3:                      &suse_12_3 "SUSE 12 SP3"
+    - suse_12_4:                      &suse_12_4 "SUSE 12 SP4"
+    - suse_12_5:                      &suse_12_5 "SUSE 12 SP5"
+    - all_versions:                   &all_versions "all"
+
+  hardware_type:
+    - vm:                             &vm "VM"
+    - hli:                            &hli "HLI"
+    - all_hardware:                   &all_hardware [*vm, *hli]
+
+  storage_type:
+    premium_storage:                  &premium_storage ["Premium_LRS","UltraSSD_LRS","ANF","PremiumV2_LRS","AFS"]
+    anf:                              &anf ["ANF"]
+    all_storage:                      &all_storage ["Premium_LRS","UltraSSD_LRS","StandardSSD_LRS","Standard_LRS","ANF","PremiumV2_LRS","AFS"]
+
+  workload:
+    - sap:                            &sap "SAP"
+    - all_workload:                   &workload [*sap]
+
+  db:
+    - hana:                           &hana "HANA"
+    - mssql:                          &mssql "MSSQL"
+    - oracle:                         &oracle "Oracle"
+    - db2:                            &db2 "Db2"
+    - ase:                            &ase "ASE"
+    - db:                         &db [*hana, *mssql, *oracle, *db2, *ase]
+
+  role:
+    - db:                             &db_role "DB"
+    - ascs:                           &ascs_role "SCS"
+    - ers:                            &ers_role "ERS"
+    - app:                            &app_role "APP"
+    - webdispatcher:                  &web_dispatch "WEB"
+    - pas:                            &pas "PAS"
+    - role:                       &role [*db_role, *ascs_role, *ers_role, *app_role, *web_dispatch, *pas]
+
+  cluster_type:
+    - sbd:                            &sbd "ISCSI"
+    - fencing_agent:                  &fencing_agent "AFA"
+    - all_fencing_agent:              &cluster_type [*sbd, *fencing_agent]
+
+  collector_type:
+    - command:                        &command "command"
+    - azure:                          &azure "azure"
+    - all_collector_type:             &collector_type [*command, *azure]
+
+  category:
+    - package:                        &package_check "Package"
+    - vm:                             &vm_check "Virtual Machine"
+    - sap:                            &sap_check "SAP"
+    - os:                             &os_check "Operating System"
+    - all_check_types:                &category [*package_check, *vm_check, *sap_check, *os_check]
+
+  user:
+    - root:                           &root "root"
+    - sidadm:                         &sidadm "sidadm"
+    - all_users:                      &user [*root, *sidadm]
+
+  validator_type:
+    - string:                         &string "string"
+    - range:                          &range "range"
+    - list:                           &list "list"
+    - all:                            &validator_type [*string, *range, *list]
+
+  report:
+    - check:                          &check "check"
+    - section:                        &section "section"
+    - report:                         &report [*check, *section]
+
+# Check definitions
+checks:
+  - id:                               "FC-0001"
+    name:                             "EndpointProtection-DefenderLinux"
+    description:                      "Checks if Microsoft Defender for Linux is installed"
+    category:                         *package_check
+    severity:                         *low
+    workload:                         *sap
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux]
+      os_version:                     *all_versions
+      hardware_type:                  *all_hardware
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *command
+    collector_args:
+      command:                        "[ -f /usr/bin/mdatp ] && echo 'Installed' || echo 'Not installed'"
+    validator_type:                   *string
+    validator_args:
+      expected_output:                "Installed"
+    references:
+      remediation:                    "Install Microsoft Defender using: sudo apt-get install mdatp"
+    report:                           *check
+
+  - id:                               "FC-0002"
+    name:                             "EndpointProtection-CrowdstrikeFalcon"
+    description:                      "Checks if Crowdstrike Falcon is installed"
+    category:                         *package_check
+    severity:                         *low
+    workload:                         *sap
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux]
+      os_version:                     *all_versions
+      hardware_type:                  *all_hardware
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *command
+    collector_args:
+      command:                        "[ -f /opt/CrowdStrike/falconctl ] && echo 'Installed' || echo 'Not installed'"
+    validator_type:                   *string
+    validator_args:
+      expected_output:                "Installed"
+    references:
+      remediation: |
+                                      Install Crowdstrike Falcon using the installation package
+                                      provided by your security team"
+    report:                           *check
+
+  - id:                               "FC-0003"
+    name:                             "EndpointProtection-SentinelOne"
+    description:                      "Checks if SentinelOne agent is installed"
+    category:                         *package_check
+    severity:                         *low
+    workload:                         *sap
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux]
+      os_version:                     *all_versions
+      hardware_type:                  *all_hardware
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *command
+    collector_args:
+      command:                        "[ -f /opt/sentinelone/bin/sentinelctl ] && echo 'Installed' || echo 'Not installed'"
+    validator_type:                   *string
+    validator_args:
+      expected_output:                "Installed"
+    references:
+      remediation: |
+                                      Install SentinelOne agent using the installation package provided
+                                      by your security team"
+    report:                           *check
+
+  - id:                               "FC-0004"
+    name:                             "EndpointProtection-Trendmicro"
+    description:                      "Checks if Trendmicro Deep Security agent is installed"
+    category:                         *package_check
+    severity:                         *low
+    workload:                         *sap
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux]
+      os_version:                     *all_versions
+      hardware_type:                  *all_hardware
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *command
+    collector_args:
+      command:                        "[ -f /opt/ds_agent/dsa_control ] && echo 'Installed' || echo 'Not installed'"
+    validator_type:                   *string
+    validator_args:
+      expected_output:                "Installed"
+    references:
+      remediation: |
+                                      Install Trendmicro Deep Security agent using the instructions
+                                      provided by your security team"
+    report:                           *check
+
+  - id:                               "FC-0005"
+    name:                             "EndpointProtection-Sophos"
+    description:                      "Checks if Sophos Server Protection is installed"
+    category:                         *package_check
+    severity:                         *low
+    workload:                         *sap
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux]
+      os_version:                     *all_versions
+      hardware_type:                  *all_hardware
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *command
+    collector_args:
+      command:                        "[ -f /opt/sophos-spl/plugins/av/bin/avscanner ] && echo 'Installed' || echo 'Not installed'"
+    validator_type:                   *string
+    validator_args:
+      expected_output:                "Installed"
+    references:
+      remediation: |
+                                      Install Sophos Server Protection using the installation package
+                                      provided by your security team
+    report:                           *check
+
+  - id:                               "FC-0006"
+    name:                             "EndpointProtection-Trellix"
+    description:                      "Checks if Trellix Endpoint Security (formerly McAfee) is installed"
+    category:                         *package_check
+    severity:                         *low
+    workload:                         *sap
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux]
+      os_version:                     *all_versions
+      hardware_type:                  *all_hardware
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *command
+    collector_args:
+      command:                        "[ -f /usr/local/bin/uvscan ] && echo 'Installed' || echo 'Not installed'"
+    validator_type:                   *string
+    validator_args:
+      expected_output:                "Installed"
+    references:
+      remediation: |
+                                      Install Trellix Endpoint Security using the installation package
+                                      provided by your security team
+    report:                           *check
+
+  - id:                               "FC-0007"
+    name:                             "EndpointProtection-ClamAV"
+    description:                      "Checks if ClamAV antivirus is installed"
+    category:                         *package_check
+    severity:                         *low
+    workload:                         *sap
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux]
+      os_version:                     *all_versions
+      hardware_type:                  *all_hardware
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *command
+    collector_args:
+      command:                        "[ -f /usr/bin/clamscan ] && echo 'Installed' || echo 'Not installed'"
+    validator_type:                   *string
+    validator_args:
+      expected_output:                "Installed"
+    references:
+      remediation: |
+                                      Install ClamAV using the package manager: sudo apt-get install
+                                      clamav or sudo zypper install clamav or sudo yum install clamav
+    report:                           *check
+
+  - id:                               "FC-0008"
+    name:                             "Microsoft Defender Health"
+    description:                      "Checks if Microsoft Defender for Linux is healthy"
+    category:                         *package_check
+    severity:                         *low
+    workload:                         *sap
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *command
+    collector_args:
+      command:                        "if command -v mdatp >/dev/null 2>&1; then mdatp health | grep healthy | tr -d ' ' | cut -d':' -f2; else echo 'mdatp_not_installed'; fi"
+    validator_type:                   *string
+    validator_args:
+      expected_output:                "true"
+    references:
+      microsoft:
+        url:                          "https://learn.microsoft.com/en-us/defender-endpoint/mde-linux-deployment-on-sap"
+    report:                           *check
+
+  - id:                               "FC-0009"
+    name:                             "Microsoft Defender Release Ring"
+    description:                      "Checks if Microsoft Defender for Linux is using the production release ring"
+    category:                         *package_check
+    severity:                         *low
+    workload:                         *sap
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *command
+    collector_args:
+      command:                        "if command -v mdatp >/dev/null 2>&1; then mdatp health | grep release_ring | tr -d ' ' | tr -d '\"' | cut -d':' -f2; else echo 'mdatp_not_installed'; fi"
+    validator_type:                   *string
+    validator_args:
+      expected_output:                "Production"
+    references:
+      microsoft:
+        url:                          "https://learn.microsoft.com/en-us/defender-endpoint/mde-linux-deployment-on-sap"
+    report:                           *check
+
+  - id:                               "FC-0010"
+    name:                             "Microsoft Defender Realtime Protection"
+    description:                      "Checks if Microsoft Defender for Linux has realtime protection disabled"
+    category:                         *package_check
+    severity:                         *low
+    workload:                         *sap
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *command
+    collector_args:
+      command:                        "if command -v mdatp >/dev/null 2>&1; then mdatp health | grep real_time_protection_enabled | tr -d ' ' | tr -d '\"' | cut -d':' -f2; else echo 'mdatp_not_installed'; fi"
+    validator_type:                   *string
+    validator_args:
+      expected_output:                "false"
+    references:
+      microsoft:
+        url:                          "https://learn.microsoft.com/en-us/defender-endpoint/mde-linux-deployment-on-sap"
+    report:                           *check
+
+  - id:                               "FC-0011"
+    name:                             "Microsoft Defender Automatic Definition Update"
+    description:                      "Checks if Microsoft Defender for Linux has automatic definition updates enabled"
+    category:                         *package_check
+    severity:                         *low
+    workload:                         *sap
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *command
+    collector_args:
+      command:                        "if command -v mdatp >/dev/null 2>&1; then mdatp health | grep automatic_definition_update_enabled | tr -d ' ' | tr -d '\"' | cut -d':' -f2; else echo 'mdatp_not_installed'; fi"
+    validator_type:                   *string
+    validator_args:
+      expected_output:                "true"
+    references:
+      microsoft:
+        url:                          "https://learn.microsoft.com/en-us/defender-endpoint/mde-linux-deployment-on-sap"
+    report:                           *check
+
+  - id:                               "FC-0012"
+    name:                             "Microsoft Defender Definition Status"
+    description:                      "Checks if Microsoft Defender for Linux definitions are up to date"
+    category:                         *package_check
+    severity:                         *low
+    workload:                         *sap
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *command
+    collector_args:
+      command:                        "if command -v mdatp >/dev/null 2>&1; then mdatp health | grep definitions_status | tr -d ' ' | tr -d '\"' | cut -d':' -f2; else echo 'mdatp_not_installed'; fi"
+    validator_type:                   *string
+    validator_args:
+      expected_output:                "up_to_date"
+    references:
+      microsoft:
+        url:                          "https://learn.microsoft.com/en-us/defender-endpoint/mde-linux-deployment-on-sap"
+    report:                           *check
+
+  - id:                               "FC-0013"
+    name:                             "Microsoft Defender EDR Early Preview"
+    description:                      "Checks if Microsoft Defender for Linux has EDR early preview disabled"
+    category:                         *package_check
+    severity:                         *low
+    workload:                         *sap
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *command
+    collector_args:
+      command:                        "if command -v mdatp >/dev/null 2>&1; then mdatp health | grep edr_early_preview_enabled | tr -d ' ' | tr -d '\"' | cut -d':' -f2; else echo 'mdatp_not_installed'; fi"
+    validator_type:                   *string
+    validator_args:
+      expected_output:                "disabled"
+    references:
+      microsoft:
+        url:                          "https://learn.microsoft.com/en-us/defender-endpoint/mde-linux-deployment-on-sap"
+    report:                           *check
+
+  - id:                               "FC-0014"
+    name:                             "Microsoft Defender Conflicting Applications"
+    description:                      "Checks if Microsoft Defender for Linux has no conflicting applications"
+    category:                         *package_check
+    severity:                         *low
+    workload:                         *sap
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *command
+    collector_args:
+      command:                        "if command -v mdatp >/dev/null 2>&1; then mdatp health | grep conflicting_applications | tr -d ' ' | tr -d '\"' | cut -d':' -f2; else echo 'mdatp_not_installed'; fi"
+    validator_type:                   *string
+    validator_args:
+      expected_output:                "[]"
+    references:
+      microsoft:
+        url:                          "https://learn.microsoft.com/en-us/defender-endpoint/mde-linux-deployment-on-sap"
+    report:                           *check
+
+  - id:                               "FC-0015"
+    name:                             "Microsoft Defender Supplementary Events Subsystem"
+    description:                      "Checks if Microsoft Defender for Linux is using the eBPF subsystem"
+    category:                         *package_check
+    severity:                         *low
+    workload:                         *sap
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *command
+    collector_args:
+      command:                        "if command -v mdatp >/dev/null 2>&1; then mdatp health | grep supplementary_events_subsystem | tr -d ' ' | tr -d '\"' | cut -d':' -f2; else echo 'mdatp_not_installed'; fi"
+    validator_type:                   *string
+    validator_args:
+      expected_output:                "ebpf"
+    references:
+      microsoft:
+        url:                          "https://learn.microsoft.com/en-us/defender-endpoint/mde-linux-deployment-on-sap"
+    report:                           *check
diff --git a/src/roles/configuration_checks/tasks/files/sap.yml b/src/roles/configuration_checks/tasks/files/sap.yml
new file mode 100644
index 00000000..9350686b
--- /dev/null
+++ b/src/roles/configuration_checks/tasks/files/sap.yml
@@ -0,0 +1,534 @@
+# Enumeration definitions
+enums:
+  severity:
+    - info:                           &info "INFO"
+    - high:                           &high "HIGH"
+    - low:                            &low "LOW"
+    - warning:                        &warning "WARNING"
+    - critical:                       &critical "CRITICAL"
+    - all_severity:                   &severity [*info, *high, *low, *warning, *critical]
+
+  os_type:
+    - suse:                           &suse "SLES_SAP"
+    - redhat:                         &redhat "REDHAT"
+    - oraclelinux:                    &oraclelinux "OracleLinux"
+    - windows:                        &windows "Windows"
+    - all_os:                         &os_type [*suse, *redhat, *oraclelinux, *windows]
+
+  os_version:
+    - suse_12_3:                      &suse_12_3 "SUSE 12 SP3"
+    - suse_12_4:                      &suse_12_4 "SUSE 12 SP4"
+    - suse_12_5:                      &suse_12_5 "SUSE 12 SP5"
+    - all_versions:                   &all_versions "all"
+
+  hardware_type:
+    - vm:                             &vm "VM"
+    - hli:                            &hli "HLI"
+    - all_hardware:                   &all_hardware [*vm, *hli]
+
+  storage_type:
+    premium_storage:                  &premium_storage ["Premium_LRS","UltraSSD_LRS","ANF","PremiumV2_LRS","AFS"]
+    anf:                              &anf ["ANF"]
+    all_storage:                      &all_storage ["Premium_LRS","UltraSSD_LRS","StandardSSD_LRS","Standard_LRS","ANF","PremiumV2_LRS","AFS"]
+
+  workload:
+    - sap:                            &sap "SAP"
+    - all_workload:                   &workload [*sap]
+
+  db:
+    - hana:                           &hana "HANA"
+    - mssql:                          &mssql "MSSQL"
+    - oracle:                         &oracle "Oracle"
+    - db2:                            &db2 "Db2"
+    - ase:                            &ase "ASE"
+    - all_db:                         &db [*hana, *mssql, *oracle, *db2, *ase]
+
+  role:
+    - db:                             &db_role "DB"
+    - ascs:                           &ascs_role "SCS"
+    - ers:                            &ers_role "ERS"
+    - app:                            &app_role "APP"
+    - webdispatcher:                  &web_dispatch "WEB"
+    - pas:                            &pas "PAS"
+    - all_role:                       &role [*db_role, *ascs_role, *ers_role, *app_role, *web_dispatch, *pas]
+
+  cluster_type:
+    - sbd:                            &sbd "ISCSI"
+    - fencing_agent:                  &fencing_agent "AFA"
+    - all_fencing_agent:              &cluster_type [*sbd, *fencing_agent]
+
+  collector_type:
+    - command:                        &command "command"
+    - azure:                          &azure "azure"
+    - all_collector_type:             &collector_type [*command, *azure]
+
+  category:
+    - package:                        &package_check "Package"
+    - vm:                             &vm_check "Virtual Machine"
+    - sap:                            &sap_check "SAP"
+    - os:                             &os_check "Operating System"
+    - all_check_types:                &category [*package_check, *vm_check, *sap_check, *os_check]
+
+  user:
+    - root:                           &root "root"
+    - sidadm:                         &sidadm "sidadm"
+    - all_users:                      &user [*root, *sidadm]
+
+  validator_type:
+    - string:                         &string "string"
+    - range:                          &range "range"
+    - list:                           &list "list"
+    - check_support:                  &check_support "check_support"
+    - all:                            &validator_type [*string, *range, *list]
+
+  report:
+    - check:                          &check "check"
+    - section:                        &section "section"
+    - report:                         &report [*check, *section]
+
+# Checks for more than SAP roles, e.g. ASCS+ERS, ASCS+DB, ASCS+APP etc.
+checks:
+  - id:                               "SAP-0001"
+    name:                             "Supported VM with supplied VM Role and Database"
+    description:                      "Is the VM Type support for SAP on Azure in this scenario"
+    category:                         *sap_check
+    severity:                         *high
+    workload:                         *sap
+    applicability:
+      os_type:                        *os_type
+      os_version:                     *all_versions
+      hardware_type:                  *all_hardware
+      storage_type:                   *all_storage
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *command
+    collector_args:
+      command:                        curl -s --noproxy '*' -H Metadata:true 'http://169.254.169.254/metadata/instance/compute/vmSize?api-version=2021-02-01&format=text'
+    validator_type:                   *check_support
+    validator_args:
+      validation_rules:               "SupportedVMs"
+    report:                           *check
+    references:
+      microsoft:                      "https://learn.microsoft.com/en-us/azure/sap/workloads/certifications"
+      sap:                            "1928533"
+
+  - id:                               "SAP-0002"
+    name:                             "OS/DB combination supported"
+    description:                      "Is OS/DB combination supported for SAP on Azure"
+    category:                         *sap_check
+    severity:                         *high
+    workload:                         *sap
+    applicability:
+      os_type:                        *os_type
+      os_version:                     *all_versions
+      hardware_type:                  *all_hardware
+      storage_type:                   *all_storage
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *command
+    collector_args:
+      command:                        curl -s --noproxy '*' -H Metadata:true 'http://169.254.169.254/metadata/instance/compute/storageProfile/imageReference/publisher?api-version=2021-02-01&format=text'
+    validator_type:                   *check_support
+    validator_args:
+      validation_rules:               "SupportedOSDBCombinations"
+    report:                           *check
+    references:
+      microsoft:                      "https://learn.microsoft.com/en-us/azure/sap/workloads/certifications"
+      sap:                            "1928533"
+
+  - id:                               "SAP-0003"
+    name:                             "stonith-enabled"
+    description:                      "Is stonith-enabled set to true"
+    category:                         *sap_check
+    severity:                         *high
+    workload:                         *sap
+    applicability:
+      os_type:                        [*suse, *redhat]
+      os_version:                     *all_versions
+      hardware_type:                  *all_hardware
+      storage_type:                   *all_storage
+      role:                           [*ascs_role, *db_role]
+      database_type:                  [*hana]
+      high_availability:              true
+      high_availability_agent:        [*cluster_type]
+    collector_type:                   *command
+    collector_args:
+      command: |
+                                      cibadmin --query --xpath "//nvpair[@name='stonith-enabled']" | grep -o 'value="[^"]*"' | cut -d'"' -f2
+    validator_type:                   *string
+    validator_args:
+      expected_output:                "true"
+    report:                           *check
+
+  - id:                                 "SAP-0004"
+    name:                               "stonith-timeout"
+    description:                        "SAP stonith timeout (fencing)"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *all_storage
+      role:                             [*db_role, *ascs_role]
+      database_type:                    [*hana]
+      high_availability:                true
+      high_availability_agent:          [*cluster_type]
+    collector_type:                     *command
+    collector_args:
+      command: |
+                                        cibadmin --query --xpath "//nvpair[@name='stonith-timeout']" | grep -o 'value="[^"]*"' | cut -d'"' -f2
+    validator_type:                     *range
+    validator_args:
+      min:                              "144"
+      max:                              "900"
+    report:                             *check
+
+  - id:                                 "SAP-0005"
+    name:                               "Pacemaker corosync token"
+    description:                        "SAP Pacemaker corosync token"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse]
+      os_version:                       *all_versions
+      hardware_type:                    *all_hardware
+      storage_type:                     *all_storage
+      role:                             [*db_role, *ascs_role]
+      database_type:                    [*hana]
+      high_availability:                true
+      high_availability_agent:          *cluster_type
+    collector_type:                     *command
+    collector_args:
+      command:                          "corosync-cmapctl -g runtime.config.totem.token | awk -F'= ' '{print $2}'"
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "30000"
+    report:                             *check
+    references:
+      microsoft:                        "https://learn.microsoft.com/en-us/azure/sap/workloads/high-availability-guide-suse-pacemaker"
+
+  - id:                                 "SAP-0006"
+    name:                               "Pacemaker corosync token_retransmits_before_loss_const"
+    description:                        "SAP Pacemaker corosync token_retransmits_before_loss_const"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse]
+      os_version:                       *all_versions
+      hardware_type:                    *all_hardware
+      storage_type:                     *all_storage
+      role:                             [*db_role, *ascs_role]
+      database_type:                    [*hana]
+      high_availability:                true
+      high_availability_agent:          *cluster_type
+    collector_type:                     *command
+    collector_args:
+      command:                          "/usr/sbin/crm corosync get totem.token_retransmits_before_loss_const"
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "10"
+    report:                             *check
+    references:
+      microsoft:                        "https://learn.microsoft.com/en-us/azure/sap/workloads/high-availability-guide-suse-pacemaker"
+
+  - id:                                 "SAP-0007"
+    name:                               "Pacemaker corosync join"
+    description:                        "SAP Pacemaker corosync join"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *all_storage
+      role:                             [*db_role, *ascs_role]
+      database_type:                    [*hana]
+      high_availability:                true
+      high_availability_agent:          *cluster_type
+    collector_type:                     *command
+    collector_args:
+      command:                          "/usr/sbin/crm corosync get totem.join"
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "60"
+    report:                             *check
+    references:
+      microsoft:                        "https://learn.microsoft.com/en-us/azure/sap/workloads/high-availability-guide-suse-pacemaker"
+
+  - id:                                 "SAP-0008"
+    name:                               "Pacemaker corosync consensus"
+    description:                        "SAP Pacemaker corosync consensus"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *all_storage
+      role:                             [*db_role, *ascs_role]
+      database_type:                    [*hana]
+      high_availability:                true
+      high_availability_agent:          *cluster_type
+    collector_type:                     *command
+    collector_args:
+      command:                          "corosync-cmapctl -g runtime.config.totem.consensus | awk -F'= ' '{print $2}'"
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "36000"
+    report:                             *check
+    references:
+      microsoft:                        "https://learn.microsoft.com/en-us/azure/sap/workloads/high-availability-guide-suse-pacemaker"
+
+  - id:                                 "SAP-0009"
+    name:                               "Pacemaker corosync max_messages"
+    description:                        "SAP Pacemaker corosync max_messages"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *all_storage
+      role:                             [*db_role, *ascs_role]
+      database_type:                    [*hana]
+      high_availability:                true
+      high_availability_agent:          *cluster_type
+    collector_type:                     *command
+    collector_args:
+      command:                          "/usr/sbin/crm corosync get totem.max_messages"
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "20"
+    report:                             *check
+    references:
+      microsoft:                        "https://learn.microsoft.com/en-us/azure/sap/workloads/high-availability-guide-suse-pacemaker"
+
+  - id:                                 "SAP-0010"
+    name:                               "Pacemaker corosync expected_votes"
+    description:                        "SAP Pacemaker corosync expected_votes"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *all_storage
+      role:                             [*db_role, *ascs_role]
+      database_type:                    [*hana]
+      high_availability:                true
+      high_availability_agent:          *cluster_type
+    collector_type:                     *command
+    collector_args:
+      command:                          "/usr/sbin/crm corosync get quorum.expected_votes"
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "2"
+    report:                             *check
+    references:
+      microsoft:                        "https://learn.microsoft.com/en-us/azure/sap/workloads/high-availability-guide-suse-pacemaker"
+
+  - id:                                 "SAP-0011"
+    name:                               "Pacemaker corosync two_node"
+    description:                        "SAP Pacemaker corosync two_node"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *all_storage
+      role:                             [*db_role, *ascs_role]
+      database_type:                    [*hana]
+      high_availability:                true
+      high_availability_agent:          *cluster_type
+    collector_type:                     *command
+    collector_args:
+      command:                          "/usr/sbin/crm corosync get quorum.two_node"
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "1"
+    report:                             *check
+    references:
+      microsoft:                        "https://learn.microsoft.com/en-us/azure/sap/workloads/high-availability-guide-suse-pacemaker"
+
+  - id:                                 "SAP-0012"
+    name:                               "concurrent-fencing"
+    description:                        "SAP concurrent fencing (fencing)"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *all_storage
+      role:                             [*db_role, *ascs_role]
+      database_type:                    [*hana]
+      high_availability:                true
+      high_availability_agent:          [*fencing_agent]
+    collector_type:                     *command
+    collector_args:
+      command:                          /usr/sbin/crm_attribute --name concurrent-fencing --query --quiet
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "true"
+    report:                             *check
+
+  - id:                                 "SAP-0013"
+    name:                               "Pacemaker number of fence_azure_arm instances"
+    description:                        "SAP Pacemaker number of fence_azure_arm instances"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse, *redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *all_storage
+      role:                             [*db_role, *ascs_role]
+      database_type:                    [*hana]
+      high_availability:                true
+      high_availability_agent:          [*fencing_agent]
+    collector_type:                     *command
+    collector_args:
+      command:                          cibadmin -Q --xpath "//resources/primitive[@class='stonith']" | grep "<primitive" | wc -l
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "1"
+    report:                             *check
+    references:
+      microsoft:                        "https://learn.microsoft.com/en-us/azure/sap/workloads/high-availability-guide-suse-pacemaker"
+
+  - id:                                 "SAP-0014"
+    name:                               "Pacemaker softdog config file"
+    description:                        "SAP Pacemaker softdog config file"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *all_storage
+      role:                             [*db_role, *ascs_role]
+      database_type:                    [*hana]
+      high_availability:                true
+      high_availability_agent:          [*cluster_type]
+    collector_type:                     *command
+    collector_args:
+      command:                          "/bin/cat /etc/modules-load.d/softdog.conf"
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "softdog"
+    report:                             *check
+    references:
+      microsoft:                        "https://learn.microsoft.com/en-us/azure/sap/workloads/high-availability-guide-suse-pacemaker"
+
+  - id:                                 "SAP-0015"
+    name:                               "Pacemaker softdog module loaded"
+    description:                        "SAP Pacemaker softdog module loaded"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*suse]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *all_storage
+      role:                             [*db_role, *ascs_role]
+      database_type:                    [*hana]
+      high_availability:                true
+      high_availability_agent:          [*sbd]
+    collector_type:                     *command
+    collector_args:
+      command:                          "lsmod | grep softdog | wc -l"
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "1"
+    report:                             *check
+    references:
+      microsoft:                        "https://learn.microsoft.com/en-us/azure/sap/workloads/high-availability-guide-suse-pacemaker"
+
+  - id:                                 "SAP-0016"
+    name:                               "Pacemaker corosync token"
+    description:                        "SAP Pacemaker corosync token"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *all_storage
+      role:                             [*db_role, *ascs_role]
+      database_type:                    [*hana]
+      high_availability:                true
+      high_availability_agent:          [*fencing_agent]
+    collector_type:                     *command
+    collector_args:
+      command:                          "grep -E '^[[:space:]]*token:' /etc/corosync/corosync.conf | awk '{print $2}'"
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "30000"
+    report:                             *check
+    references:
+      microsoft:                        "https://learn.microsoft.com/en-us/azure/sap/workloads/high-availability-guide-rhel-pacemaker"
+
+  - id:                                 "SAP-0017"
+    name:                               "Pacemaker expected_votes"
+    description:                        "SAP HANA Pacemaker expected_votes"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *all_storage
+      role:                             [*db_role, *ascs_role]
+      database_type:                    [*hana]
+      high_availability:                true
+      high_availability_agent:          [*fencing_agent]
+    collector_type:                     *command
+    collector_args:
+      command:                          "/sbin/pcs quorum status | xargs | grep -i 'Expected votes: 2' | wc -l"
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "1"
+    report:                             *check
+    references:
+      microsoft:                        "https://learn.microsoft.com/en-us/azure/sap/workloads/high-availability-guide-rhel-pacemaker"
+
+  - id:                                 "SAP-0018"
+    name:                               "Pacemaker optional fence_kdump"
+    description:                        "SAP Pacemaker optional fence_kdump"
+    category:                           *sap_check
+    severity:                           *high
+    workload:                           *sap
+    applicability:
+      os_type:                          [*redhat]
+      os_version:                       *all_versions
+      hardware_type:                    *vm
+      storage_type:                     *all_storage
+      role:                             [*db_role, *ascs_role]
+      database_type:                    [*hana]
+      high_availability:                true
+      high_availability_agent:          [*fencing_agent]
+    collector_type:                     *command
+    collector_args:
+      command:                          "/sbin/pcs config show | grep -i 'fence_kdump' | wc -l"
+    validator_type:                     *string
+    validator_args:
+      expected_output:                  "1"
+    report:                             *check
+    references:
+      microsoft:                        "https://learn.microsoft.com/en-us/azure/sap/workloads/high-availability-guide-rhel-pacemaker"
diff --git a/src/roles/configuration_checks/tasks/files/virtual_machine.yml b/src/roles/configuration_checks/tasks/files/virtual_machine.yml
new file mode 100644
index 00000000..56068fbb
--- /dev/null
+++ b/src/roles/configuration_checks/tasks/files/virtual_machine.yml
@@ -0,0 +1,905 @@
+# Enumeration definitions
+enums:
+  severity:
+    - info:                           &info "INFO"
+    - high:                           &high "HIGH"
+    - low:                            &low "LOW"
+    - warning:                        &warning "WARNING"
+    - critical:                       &critical "CRITICAL"
+    - all_severity:                   &severity [*info, *high, *low, *warning, *critical]
+
+  os_type:
+    - suse:                           &suse "SLES_SAP"
+    - redhat:                         &redhat "REDHAT"
+    - oraclelinux:                    &oraclelinux "OracleLinux"
+    - windows:                        &windows "Windows"
+    - all_os:                         &os_type [*suse, *redhat, *oraclelinux, *windows]
+
+  os_version:
+    - suse_12_3:                      &suse_12_3 "SUSE 12 SP3"
+    - suse_12_4:                      &suse_12_4 "SUSE 12 SP4"
+    - suse_12_5:                      &suse_12_5 "SUSE 12 SP5"
+    - all_versions:                   &all_versions "all"
+
+  hardware_type:
+    - vm:                             &vm "VM"
+    - hli:                            &hli "HLI"
+    - all_hardware:                   &all_hardware [*vm, *hli]
+
+  storage_type:
+    premium_storage:                  &premium_storage ["Premium_LRS","UltraSSD_LRS","ANF","PremiumV2_LRS","AFS"]
+    anf:                              &anf ["ANF"]
+    all_storage:                      &all_storage ["Premium_LRS","UltraSSD_LRS","StandardSSD_LRS","Standard_LRS","ANF","PremiumV2_LRS","AFS"]
+
+  workload:
+    - sap:                            &sap "SAP"
+    - all_workload:                   &workload [*sap]
+
+  db:
+    - hana:                           &hana "HANA"
+    - mssql:                          &mssql "MSSQL"
+    - oracle:                         &oracle "Oracle"
+    - db2:                            &db2 "Db2"
+    - ase:                            &ase "ASE"
+    - all_db:                         &db [*hana, *mssql, *oracle, *db2, *ase]
+
+  role:
+    - db:                             &db_role "DB"
+    - ascs:                           &ascs_role "SCS"
+    - ers:                            &ers_role "ERS"
+    - app:                            &app_role "APP"
+    - webdispatcher:                  &web_dispatch "WEB"
+    - pas:                            &pas "PAS"
+    - all_role:                       &role [*db_role, *ascs_role, *ers_role, *app_role, *web_dispatch, *pas]
+
+  cluster_type:
+    - sbd:                            &sbd "ISCSI"
+    - fencing_agent:                  &fencing_agent "AFA"
+    - all_fencing_agent:              &cluster_type [*sbd, *fencing_agent]
+
+  collector_type:
+    - command:                        &command "command"
+    - azure:                          &azure "azure"
+    - all_collector_type:             &collector_type [*command, *azure]
+
+  category:
+    - package:                        &package_check "Package"
+    - vm:                             &vm_check "Virtual Machine"
+    - sap:                            &sap_check "SAP"
+    - os:                             &os_check "Operating System"
+    - all_check_types:                &category [*package_check, *vm_check, *sap_check, *os_check]
+
+  user:
+    - root:                           &root "root"
+    - sidadm:                         &sidadm "sidadm"
+    - all_users:                      &user [*root, *sidadm]
+
+  validator_type:
+    - string:                         &string "string"
+    - range:                          &range "range"
+    - list:                           &list "list"
+    - all:                            &validator_type [*string, *range, *list]
+
+  report:
+    - check:                          &check "check"
+    - section:                        &section "section"
+    - report:                         &report [*check, *section]
+
+
+# Check definitions
+checks:
+  - id:                               "IC-0001"
+    name:                             "Virtual Machine Name"
+    description:                      "Checks the name of the virtual machine"
+    category:                         *vm_check
+    severity:                         *info
+    workload:                         *workload
+    collector_type:                   *command
+    collector_args:
+      command:                        "curl -H 'Metadata: true' 'http://169.254.169.254/metadata/instance/compute/name?api-version=2021-02-01&format=text' -s"
+    report:                           *check
+
+  - id:                               "IC-0002"
+    name:                             "Resource Group Name"
+    description:                      "Checks the resource group name of the virtual machine"
+    category:                         *vm_check
+    severity:                         *info
+    workload:                         *workload
+    collector_type:                   *command
+    collector_args:
+      command:                        "curl -H 'Metadata: true' 'http://169.254.169.254/metadata/instance/compute/resourceGroupName?api-version=2021-02-01&format=text' -s"
+    report:                           *check
+
+  - id:                               "IC-0003"
+    name:                             "Region"
+    description:                      "Virtual Machine Region"
+    category:                         *vm_check
+    severity:                         *info
+    workload:                         *workload
+    collector_type:                   *command
+    collector_args:
+      command:                        "curl -H 'Metadata: true' 'http://169.254.169.254/metadata/instance/compute/location?api-version=2021-02-01&format=text' -s"
+    report:                           *check
+
+  - id:                               "IC-0004"
+    name:                             "Availability Zone"
+    description:                      "Virtual Machine Availabilty Zone"
+    category:                         *vm_check
+    severity:                         *info
+    workload:                         *workload
+    collector_type:                   *command
+    collector_args:
+      command:                        "curl -H 'Metadata: true' 'http://169.254.169.254/metadata/instance/compute/zone?api-version=2021-02-01&format=text' -s"
+    report:                           *check
+
+  - id:                               "IC-0005"
+    name:                             "Hostname"
+    description:                      "Checks the hostname of the system on Linux"
+    category:                         *vm_check
+    severity:                         *info
+    workload:                         *workload
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *command
+    collector_args:
+      command:                        "/bin/hostname"
+      user:                           *root
+    report:                           *check
+
+  - id:                               "IC-0006"
+    name:                             "Hostname"
+    description:                      "Checks the hostname of the system on Windows"
+    category:                         *vm_check
+    severity:                         *info
+    workload:                         *workload
+    applicability:
+      os_type:                        *windows
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *command
+    collector_args:
+      command:                        "hostname"
+      user:                           *root
+    report:                           *check
+
+  - id:                               "IC-0007"
+    name:                             "Hosts"
+    description:                      "Checks the hosts file on Linux"
+    category:                         *vm_check
+    severity:                         *info
+    workload:                         *workload
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *command
+    collector_args:
+      command:                        "/bin/cat /etc/hosts"
+      user:                           *root
+    report:                           *section
+
+  - id:                               "IC-0008"
+    name:                             "Kernel Version"
+    description:                      "Checks the kernel version of the system"
+    category:                         *vm_check
+    severity:                         *info
+    workload:                         *workload
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *command
+    collector_args:
+      command:                        "/bin/uname -r"
+      user:                           *root
+    report:                           *check
+
+  - id:                               "IC-0009"
+    name:                             "Azure Hypervisor Host"
+    description:                      "Checks the Azure hypervisor host"
+    category:                         *vm_check
+    severity:                         *info
+    workload:                         *workload
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *command
+    collector_args:
+      command:                        "/bin/cat /var/lib/hyperv/.kvp_pool_3 | tr -d '\\000' | grep -o -P '(?<=HostName).*(?=HostingSystemEditionId)'"
+      user:                           *root
+    report:                           *check
+
+  - id:                               "IC-0010"
+    name:                             "Linux Release File"
+    description:                      "Checks the Linux release file"
+    category:                         *vm_check
+    severity:                         *info
+    workload:                         *workload
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *command
+    collector_args:
+      command:                        "/bin/cat /etc/os-release"
+      user:                           *root
+    report:                           *section
+
+  - id:                               "IC-0011"
+    name:                             "Linux Major and Minor Release"
+    description:                      "Checks the Linux major and minor release"
+    category:                         *vm_check
+    severity:                         *info
+    workload:                         *workload
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *command
+    collector_args:
+      command:                        "/bin/cat /etc/os-release | grep PRETTY_NAME | cut -d '=' -f2 | tr -d '\"'"
+      user:                           *root
+    report:                           *check
+
+  - id:                               "IC-0012"
+    name:                             "OS Timezone"
+    description:                      "Checks the OS timezone"
+    category:                         *vm_check
+    severity:                         *info
+    workload:                         *workload
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *command
+    collector_args:
+      command:                        "/bin/date +%Z"
+      user:                           *root
+    report:                           *check
+
+  - id:                               "IC-0013"
+    name:                             "OS KDUMP Configuration"
+    description:                      "Checks the KDUMP configuration of the system"
+    category:                         *vm_check
+    severity:                         *info
+    workload:                         *workload
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *command
+    collector_args:
+      command:                        "/bin/systemctl status kdump.service | grep -o 'Active:.*'"
+      user:                           *root
+    report:                           *check
+
+  - id:                               "IC-0014"
+    name:                             "Oracle gclib version"
+    description:                      "Checks the Oracle gclib version"
+    category:                         *vm_check
+    severity:                         *info
+    workload:                         *workload
+    applicability:
+      os_type:                        [*oraclelinux]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           *role
+      database_type:                  [*oracle]
+    collector_type:                   *command
+    collector_args:
+      command:                        "/bin/rpm -q glibc"
+      user:                           *root
+    report:                           *check
+
+  - id:                               "IC-0015"
+    name:                             "Sysctl"
+    description:                      "Checks the sysctl configuration of the system"
+    category:                         *vm_check
+    severity:                         *info
+    workload:                         *workload
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *command
+    collector_args:
+      command:                        "/sbin/sysctl -a 2> /dev/null"
+      user:                           *root
+    report:                           *section
+
+  - id:                               "IC-0016"
+    name:                             "fstab"
+    description:                      "Checks the fstab configuration of the system"
+    category:                         *vm_check
+    severity:                         *info
+    workload:                         *workload
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *command
+    collector_args:
+      command:                        "/bin/cat /etc/fstab"
+      user:                           *root
+    report:                           *section
+
+  - id:                               "IC-0017"
+    name:                             "systemctl"
+    description:                      "Checks the systemctl configuration of the system"
+    category:                         *vm_check
+    severity:                         *info
+    workload:                         *workload
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *command
+    collector_args:
+      command:                        "/bin/systemctl list-unit-files --state=enabled"
+      user:                           *root
+    report:                           *section
+
+  - id:                               "IC-0018"
+    name:                             "chkconfig"
+    description:                      "Checks the chkconfig configuration of the system"
+    category:                         *vm_check
+    severity:                         *info
+    workload:                         *workload
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *command
+    collector_args:
+      command:                        "systemctl list-unit-files 2> /dev/null"
+      user:                           *root
+    report:                           *section
+
+  - id:                               "IC-0019"
+    name:                             "Installed Packages"
+    description:                      "Checks the installed packages of the system"
+    category:                         *vm_check
+    severity:                         *info
+    workload:                         *workload
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *command
+    collector_args:
+      command:                        "/bin/rpm -qa"
+      user:                           *root
+    report:                           *section
+
+  - id:                               "IC-0020"
+    name:                             "Microsoft Defender Health"
+    description:                      "Checks the Microsoft Defender Health"
+    category:                         *vm_check
+    severity:                         *info
+    workload:                         *workload
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           [*db_role, *ascs_role, *app_role]
+      database_type:                  [*hana, *ase, *db2, *oracle]
+    collector_type:                   *command
+    collector_args:
+      command:                        "/bin/mdatp health"
+      user:                           *root
+    report:                           *section
+
+  - id:                               "IC-0021"
+    name:                             "SBD Configuration"
+    description:                      "Checks the SBD configuration of the system"
+    category:                         *sap_check
+    severity:                         *info
+    workload:                         *workload
+    applicability:
+      os_type:                        [*suse]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           [*db_role, *ascs_role]
+      database_type:                  *db
+      high_availability:              true
+      high_availability_agent:        [*sbd]
+    collector_type:                   *command
+    collector_args:
+      command:                        "/bin/cat /etc/sysconfig/sbd"
+      user:                           *root
+    report:                           *section
+
+  - id:                               "IC-0022"
+    name:                             "Cluster Configuration"
+    description:                      "Checks the cluster configuration of the system"
+    category:                         *sap_check
+    severity:                         *info
+    workload:                         *workload
+    applicability:
+      os_type:                        [*redhat]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           [*db_role, *ascs_role]
+      database_type:                  *db
+      high_availability:              true
+      high_availability_agent:        [*sbd, *fencing_agent]
+    collector_type:                   *command
+    collector_args:
+      command:                        "pcs config show"
+      user:                           *root
+    report:                           *section
+
+  - id:                               "IC-0023"
+    name:                             "Cluster Status"
+    description:                      "Checks the cluster status of the system"
+    category:                         *sap_check
+    severity:                         *info
+    workload:                         *workload
+    applicability:
+      os_type:                        [*suse, *redhat]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           [*db_role, *ascs_role]
+      database_type:                  *db
+      high_availability:              true
+      high_availability_agent:        [*sbd, *fencing_agent]
+    collector_type:                   *command
+    collector_args:
+      command:                        "crm_mon -1"
+      user:                           *root
+    report:                           *section
+
+  - id:                               "IC-0024"
+    name:                             "lsscsi"
+    description:                      "Checks the lsscsi configuration of the system"
+    category:                         *vm_check
+    severity:                         *info
+    workload:                         *workload
+    applicability:
+      os_type:                        [*suse, *redhat]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           [*db_role, *ascs_role]
+      database_type:                  *db
+    collector_type:                   *command
+    collector_args:
+      command:                        "/usr/bin/lsscsi"
+      user:                           *root
+    report:                           *section
+
+  - id:                               "IC-0025"
+    name:                             "storage-metadata"
+    description:                      "Checks the storage metadata of the system"
+    category:                         *vm_check
+    severity:                         *info
+    workload:                         *workload
+    applicability:
+      os_type:                        [*suse, *redhat]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           [*db_role, *ascs_role, *app_role]
+      database_type:                  *db
+    collector_type:                   *command
+    collector_args:
+      command:                        "curl -s --noproxy '*' -H Metadata:true 'http://169.254.169.254/metadata/instance/compute/storageProfile?api-version=2021-12-13';echo"
+      user:                           *root
+    report:                           *section
+
+  - id:                               "IC-0026"
+    name:                             "lvm fullreport"
+    description:                      "Checks the lvm fullreport configuration of the system"
+    category:                         *vm_check
+    severity:                         *info
+    workload:                         *workload
+    applicability:
+      os_type:                        [*suse, *redhat]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           [*db_role, *ascs_role, *app_role]
+      database_type:                  *db
+    collector_type:                   *command
+    collector_args:
+      command:                        "/sbin/lvm fullreport --reportformat json"
+      user:                           *root
+    report:                           *section
+
+  - id:                               "IC-0027"
+    name:                             "SrHook Configuration"
+    description:                      "Checks the SrHook configuration of the system"
+    category:                         *sap_check
+    severity:                         *info
+    workload:                         *workload
+    applicability:
+      os_type:                        [*suse, *redhat]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           [*db_role]
+      database_type:                  [*hana]
+    collector_type:                   *command
+    collector_args:
+      command:                        "/bin/cat /etc/sudoers.d/20-saphana"
+      user:                           *root
+    report:                           *section
+
+  - id:                               "IC-0028"
+    name:                             "HADR Dump"
+    description:                      "Checks the HADR Dump of the system"
+    category:                         *sap_check
+    severity:                         *info
+    workload:                         *workload
+    applicability:
+      os_type:                        [*suse, *redhat]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           [*db_role]
+      database_type:                  [*db2]
+    collector_type:                   *command
+    collector_args:
+      command:                        "db2pd -alldbs -hadr"
+      user:                           *sidadm
+    report:                           *section
+
+  - id:                               "IC-0029"
+    name:                             "Microsoft Defender Exclusion List"
+    description:                      "Checks the Microsoft Defender Exclusion List"
+    category:                         *vm_check
+    severity:                         *info
+    workload:                         *workload
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           [*db_role, *ascs_role, *app_role]
+      database_type:                  [*hana, *ase, *db2, *oracle]
+    collector_type:                   *command
+    collector_args:
+      command:                        "/bin/mdatp exclusion list"
+      user:                           *root
+    report:                           *section
+
+  - id:                               "IC-0030"
+    name:                             "Kernel Version"
+    description:                      "Checks the kernel version of the system"
+    category:                         *vm_check
+    severity:                         *info
+    workload:                         *workload
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *command
+    collector_args:
+      command:                        "/bin/uname -r"
+      user:                           *root
+    report:                           *check
+
+  - id:                               "IC-0031"
+    name:                             "Availability Set"
+    description:                      "Checks the availability set of the system"
+    category:                         *vm_check
+    severity:                         *info
+    workload:                         *workload
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux, *windows]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *azure
+    collector_args:
+      command:                        "if command -v az >/dev/null 2>&1; then avset_id=$(az vm show --resource-group {{ CONTEXT.resource_group_name }} --name {{ CONTEXT.vm_name }} --query 'availabilitySet.id' -o tsv 2>/dev/null); if [ -z \"$avset_id\" ] || [ \"$avset_id\" = 'null' ]; then echo 'No AvSet defined'; else echo \"$avset_id\"; fi; else echo 'Error: Azure CLI not available'; fi"
+    report:                           *check
+
+  - id:                               "IC-0032"
+    name:                             "Proximity Placement Group (PPG)"
+    description:                      "Checks the PPG of the system"
+    category:                         *vm_check
+    severity:                         *info
+    workload:                         *workload
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux, *windows]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *azure
+    collector_args:
+      command:                        "if command -v az >/dev/null 2>&1; then ppg_id=$(az vm show --resource-group {{ CONTEXT.resource_group_name }} --name {{ CONTEXT.vm_name }} --query 'proximityPlacementGroup.id' -o tsv 2>/dev/null); if [ -z \"$ppg_id\" ] || [ \"$ppg_id\" = 'null' ]; then echo 'No PPG defined'; else echo \"$ppg_id\"; fi; else echo 'Error: Azure CLI not available'; fi"
+    report:                           *check
+
+  - id:                               "IC-0033"
+    name:                             "Proximity Placement Group (PPG) VMs Associated"
+    description:                      "Checks the PPG VMs associated of the system"
+    category:                         *vm_check
+    severity:                         *info
+    workload:                         *workload
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux, *windows]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *azure
+    collector_args:
+      command:                        |-
+                                      if command -v az >/dev/null 2>&1; then
+                                        ppg_id=$(az vm show --resource-group {{ CONTEXT.resource_group_name }} --name {{ CONTEXT.vm_name }} --query 'proximityPlacementGroup.id' -o tsv 2>/dev/null);
+                                        if [ $? -eq 0 ]; then
+                                          if [ -z "$ppg_id" ] || [ "$ppg_id" = "null" ]; then
+                                            echo "No PPG defined";
+                                          else
+                                            az ppg show --ids "$ppg_id" --query 'virtualMachines[].id' -o tsv 2>/dev/null || echo "Error: Failed to retrieve PPG VMs";
+                                          fi
+                                        else
+                                          echo "Error: Failed to retrieve VM PPG";
+                                        fi
+                                      else
+                                        echo "Error: Azure CLI not available";
+                                      fi
+    report:                           *check
+
+  - id:                               "IC-0034"
+    name:                             "VM Generation"
+    description:                      "Checks the VM generation of the system"
+    category:                         *vm_check
+    severity:                         *info
+    workload:                         *workload
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux, *windows]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *azure
+    collector_args:
+      command:                        |-
+                                      if command -v az >/dev/null 2>&1; then
+                                        hyperv_generation=$(az vm show --resource-group {{ CONTEXT.resource_group_name }} --name {{ CONTEXT.vm_name }} --query "storageProfile.osDisk.managedDisk.id" -o tsv 2>/dev/null | xargs -I {} az disk show --ids {} --query "hyperVGeneration" -o tsv 2>/dev/null);
+                                        if [ $? -eq 0 ] && [ -n "$hyperv_generation" ]; then
+                                          if [ "$hyperv_generation" = "V1" ]; then
+                                            echo "Gen1";
+                                          else
+                                            echo "Gen2";
+                                          fi
+                                        else
+                                          echo "Error: Failed to retrieve disk generation";
+                                        fi
+                                      else
+                                        echo "Error: Azure CLI not available";
+                                      fi
+    report:                           *check
+
+  - id:                               "IC-0035"
+    name:                             "Extensions & Applications Installed"
+    description:                      "Checks the extensions and applications installed on the system"
+    category:                         *vm_check
+    severity:                         *info
+    workload:                         *workload
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux, *windows]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *azure
+    collector_args:
+      command:                        |-
+                                      if command -v az >/dev/null 2>&1; then
+                                        extensions=$(az vm extension list --resource-group {{ CONTEXT.resource_group_name }} --vm-name {{ CONTEXT.vm_name }} --query '[].name' -o tsv 2>/dev/null);
+                                        if [ $? -eq 0 ]; then
+                                          if [ -z "$extensions" ]; then
+                                            echo "No extensions installed";
+                                          else
+                                            echo "$extensions";
+                                          fi
+                                        else
+                                          echo "Error: Failed to retrieve VM extensions";
+                                        fi
+                                      else
+                                        echo "Error: Azure CLI not available";
+                                      fi
+    report:                           *section
+
+  - id:                               "IC-0036"
+    name:                             "Secondary IP Configuration"
+    description:                      "Checks the secondary IP configuration of the system"
+    category:                         *vm_check
+    severity:                         *info
+    workload:                         *workload
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux, *windows]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *azure
+    collector_args:
+      command:                        |-
+                                      if command -v az >/dev/null 2>&1; then
+                                        nic_id=$(az vm show --resource-group {{ CONTEXT.resource_group_name }} --name {{ CONTEXT.vm_name }} --query 'networkProfile.networkInterfaces[0].id' -o tsv 2>/dev/null);
+                                        if [ $? -eq 0 ] && [ -n "$nic_id" ] && [ "$nic_id" != "null" ]; then
+                                          ip_count=$(az network nic show --ids "$nic_id" --query 'length(ipConfigurations)' -o tsv 2>/dev/null);
+                                          if [ $? -eq 0 ] && [ -n "$ip_count" ]; then
+                                            case "$ip_count" in
+                                              ''|*[!0-9]*)
+                                                echo "Error: Invalid IP count"
+                                                ;;
+                                              *)
+                                                if [ "$ip_count" -gt 1 ]; then
+                                                  echo "Yes";
+                                                else
+                                                  echo "No";
+                                                fi
+                                                ;;
+                                            esac
+                                          else
+                                            echo "Error: Failed to retrieve IP configurations";
+                                          fi
+                                        else
+                                          echo "Error: Failed to retrieve NIC ID";
+                                        fi
+                                      else
+                                        echo "Error: Azure CLI not available";
+                                      fi
+    report:                           *check
+
+  - id:                               "IC-0037"
+    name:                             "Security Type"
+    description:                      "Checks the security type of the system"
+    category:                         *vm_check
+    severity:                         *info
+    workload:                         *workload
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux, *windows]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *azure
+    collector_args:
+      command:                        |-
+                                      if command -v az >/dev/null 2>&1; then
+                                        security_type=$(az vm show --resource-group {{ CONTEXT.resource_group_name }} --name {{ CONTEXT.vm_name }} --query "securityProfile.securityType" -o tsv 2>/dev/null);
+                                        if [ $? -eq 0 ]; then
+                                          if [ -z "$security_type" ] || [ "$security_type" == "null" ]; then
+                                            echo "Standard";
+                                          else
+                                            echo "$security_type";
+                                          fi
+                                        else
+                                          echo "Error: Failed to retrieve security type";
+                                        fi
+                                      else
+                                        echo "Error: Azure CLI not available";
+                                      fi
+    report:                           *check
+
+  - id:                               "IC-0038"
+    name:                             "Azure Disks"
+    description:                      "Checks the Azure disks of the system"
+    category:                         *vm_check
+    severity:                         *info
+    workload:                         *workload
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux, *windows]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *azure
+    collector_args:
+      command:                        |-
+                                      if command -v az >/dev/null 2>&1; then
+                                        disk_ids=$(az vm show --resource-group {{ CONTEXT.resource_group_name }} --name {{ CONTEXT.vm_name }} --query "storageProfile.dataDisks[].managedDisk.id" -o tsv 2>/dev/null);
+                                        if [ $? -eq 0 ]; then
+                                          disk_json="[";
+                                          if [ -n "$disk_ids" ]; then
+                                            first=true;
+                                            for disk_id in $disk_ids; do
+                                              if [ "$first" = true ]; then
+                                                first=false;
+                                              else
+                                                disk_json="${disk_json},";
+                                              fi;
+                                              disk_details=$(az disk show --ids "$disk_id" -o json 2>/dev/null);
+                                              if [ $? -eq 0 ]; then
+                                                disk_json="${disk_json}${disk_details}";
+                                              else
+                                                disk_json="${disk_json}{\"error\":\"Failed to retrieve disk details for $disk_id\"}";
+                                              fi;
+                                            done;
+                                          fi;
+                                          disk_json="${disk_json}]";
+                                          echo "$disk_json"
+                                        else
+                                          echo "Error: Failed to retrieve disk IDs";
+                                        fi
+                                      else
+                                        echo "Error: Azure CLI not available";
+                                      fi
+    report:                           *section
+
+  - id:                               "IC-0039"
+    name:                             "VMSS Flex ID"
+    description:                      "Checks the VMSS flex ID of the system"
+    category:                         *vm_check
+    severity:                         *info
+    workload:                         *workload
+    applicability:
+      os_type:                        [*suse, *redhat, *oraclelinux, *windows]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           *role
+      database_type:                  *db
+    collector_type:                   *azure
+    collector_args:
+      command:                        |-
+                                      if command -v az >/dev/null 2>&1; then
+                                        vmss_id=$(az vm show --resource-group {{ CONTEXT.resource_group_name }} --name {{ CONTEXT.vm_name }} --query "virtualMachineScaleSet.id" -o tsv 2>/dev/null);
+                                        if [ $? -eq 0 ]; then
+                                          if [ -z "$vmss_id" ] || [ "$vmss_id" == "null" ]; then
+                                            echo "No VMSS defined";
+                                          else
+                                            echo "$vmss_id";
+                                          fi
+                                        else
+                                          echo "Error: Failed to retrieve VMSS ID";
+                                        fi
+                                      else
+                                        echo "Error: Azure CLI not available";
+                                      fi
+    report:                           *check
+
+
+  - id:                               "IC-0039"
+    name:                             "Cluster Configuration"
+    description:                      "Checks the cluster configuration of the system"
+    category:                         *sap_check
+    severity:                         *info
+    workload:                         *workload
+    applicability:
+      os_type:                        [*suse]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      role:                           [*db_role, *ascs_role]
+      database_type:                  *db
+      high_availability:              true
+      high_availability_agent:        [*sbd, *fencing_agent]
+    collector_type:                   *command
+    collector_args:
+      command:                        "crm config show"
+      user:                           *root
+    report:                           *section
diff --git a/src/roles/configuration_checks/tasks/ha_modules.yml b/src/roles/configuration_checks/tasks/ha_modules.yml
new file mode 100644
index 00000000..9810c577
--- /dev/null
+++ b/src/roles/configuration_checks/tasks/ha_modules.yml
@@ -0,0 +1,84 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# /*---------------------------------------------------------------------------8
+# |                  HA Module Execution for Configuration Checks              |
+# +------------------------------------4--------------------------------------*/
+
+- name:                                 "High Availability Checks"
+  become:                               true
+  block:
+    - name:                             "Get the SAPHanaSR provider (SUSE only)"
+      when:                             >-
+                                        (ansible_os_family | upper) == "SUSE" and
+                                        role == 'DB'
+      ansible.builtin.include_tasks:    "roles/misc/tasks/get-saphanasr-provider.yml"
+
+    - name:                             "Execute HA DB Configuration Module"
+      when:                             role == 'DB'
+      get_pcmk_properties_db:
+        sid:                            "{{ db_sid | upper }}"
+        instance_number:                "{{ db_instance_number }}"
+        virtual_machine_name:           "{{ compute_metadata.json.compute.name }}"
+        fencing_mechanism:              "{{ database_cluster_type }}"
+        pcmk_constants:                 "{{ lookup('file', 'roles/ha_db_hana/tasks/files/constants.yaml') | from_yaml }}"
+        saphanasr_provider:             "{{ saphanasr_provider | default('SAPHanaSR') }}"
+      register:                         ha_db_module_result
+
+    - name:                             "Store HA DB configuration result"
+      when:                             >-
+                                        role == 'DB' and
+                                        ha_db_module_result is defined
+      ansible.builtin.set_fact:
+        ha_db_config:                   "{{ ha_db_module_result.details.parameters }}"
+
+    - name:                             "Execute HA SCS Configuration Module"
+      when:                             role in ['SCS', 'ERS']
+      get_pcmk_properties_scs:
+        sid:                            "{{ sap_sid | upper }}"
+        ascs_instance_number:           "{{ scs_instance_number }}"
+        ers_instance_number:            "{{ ers_instance_number }}"
+        virtual_machine_name:           "{{ compute_metadata.json.compute.name }}"
+        fencing_mechanism:              "{{ scs_cluster_type }}"
+        nfs_provider:                   "{{ NFS_provider }}"
+        pcmk_constants:                 "{{ lookup('file', 'roles/ha_scs/tasks/files/constants.yaml') | from_yaml }}"
+      register:                         ha_scs_module_result
+
+    - name:                             "Store HA SCS configuration result"
+      when:                             >-
+                                        role in ['SCS', 'ERS'] and
+                                        ha_scs_module_result is defined
+      ansible.builtin.set_fact:
+        ha_scs_config:                  "{{ ha_scs_module_result.details.parameters }}"
+
+    - name:                             "Get the Azure Load Balancer IP"
+      ansible.builtin.uri:
+        url:                            http://169.254.169.254:80/metadata/loadbalancer?api-version=2020-10-01
+        use_proxy:                      false
+        headers:
+          Metadata:                     true
+      register:                         azure_loadbalancer_metadata
+
+    - name:                             "Execute Azure Load Balancer Configuration Module"
+      delegate_to:                      localhost
+      get_azure_lb:
+        subscription_id:                "{{ compute_metadata.json.compute.subscriptionId }}"
+        region:                         "{{ compute_metadata.json.compute.location }}"
+        inbound_rules:                  "{{ azure_loadbalancer_metadata.json.loadbalancer.inboundRules }}"
+        constants:                      "{{ lookup('file', 'roles/ha_scs/tasks/files/constants.yaml') | from_yaml }}"
+        msi_client_id:                  "{{ user_assigned_identity_client_id | default('') }}"
+      register:                         ha_loadbalancer_module_result
+
+    - name:                             "Debug HA Load Balancer configuration result"
+      when:                             ha_loadbalancer_module_result is defined
+      ansible.builtin.debug:
+        var:                            ha_loadbalancer_module_result
+        verbosity:                      1
+
+    - name:                             "Store HA Load Balancer configuration result"
+      when:                             >-
+                                        ha_loadbalancer_module_result is defined and
+                                        ha_loadbalancer_module_result.details is defined and
+                                        ha_loadbalancer_module_result.details.parameters is defined
+      ansible.builtin.set_fact:
+        ha_loadbalancer_config:        "{{ ha_loadbalancer_module_result.details.parameters | default([]) }}"
diff --git a/src/roles/configuration_checks/tasks/main.yml b/src/roles/configuration_checks/tasks/main.yml
new file mode 100644
index 00000000..56c84a10
--- /dev/null
+++ b/src/roles/configuration_checks/tasks/main.yml
@@ -0,0 +1,236 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# /*---------------------------------------------------------------------------8
+# |                           Configuration Check                              |
+# +------------------------------------4--------------------------------------*/
+
+---
+- name:                             "{{ check_type.name }} - Get virtual machine properties from IMDS"
+  ansible.builtin.uri:
+    url:                            http://169.254.169.254/metadata/instance?api-version=2021-02-01
+    use_proxy:                      false
+    headers:
+      Metadata:                     true
+    timeout:                        10
+  register:                         compute_metadata
+  retries:                          3
+  delay:                           2
+  until:                           compute_metadata is not failed
+  ignore_errors:                   true
+
+- name:                             "{{ check_type.name }} - Handle IMDS failure gracefully"
+  ansible.builtin.set_fact:
+    compute_metadata:
+      json:
+        compute:
+          resourceGroupName:        "unknown"
+          location:                 "unknown"
+          vmSize:                   "unknown"
+          osType:                   "{{ ansible_os_family }}"
+          zone:                     "unknown"
+    imds_available:                 false
+    execution_warnings:             "{{ execution_warnings | default([]) + ['IMDS endpoint unavailable - using fallback values'] }}"
+  when:                             compute_metadata is failed
+
+- name:                             "{{ check_type.name }} - Set IMDS success flag"
+  ansible.builtin.set_fact:
+    imds_available:                 true
+    execution_warnings:             "{{ execution_warnings | default([]) }}"
+  when:                             compute_metadata is not failed
+
+- name:                             "{{ check_type.name }} - Include disks task when HANA checks to be run"
+  ansible.builtin.include_tasks:    disks.yml
+  when:                             check_type.file_name == "hana"
+
+- name:                             "{{ check_type.name }} - Execute HA and Load Balancer module when high_availability checks to be run"
+  ansible.builtin.include_tasks:    ha_modules.yml
+  when:                             >-
+                                    check_type.file_name == "high_availability" and
+                                    role in ['SCS', 'ERS', 'DB']
+
+- name:                             "{{ check_type.name }} - Prepare system context information"
+  ansible.builtin.set_fact:
+    system_context:
+      check_type:                   "{{ check_type }}"
+      vm_name:                      "{{ compute_metadata.json.compute.name }}"
+      resource_group_name:          "{{ compute_metadata.json.compute.resourceGroupName }}"
+      supported_configurations:     "{{ vm_support }}"
+      hostname:                     "{{ inventory_hostname }}"
+      os_type:                      "{{ ansible_distribution | upper }}"
+      os_version:                   "{{ ansible_distribution_version }}"
+      sap_sid:                      "{{ sap_sid | default('') }}"
+      database_sid:                 "{{ db_sid | default('') }}"
+      database_type:                "{{ platform | default('HANA') }}"
+      role:                         "{{ role }}"
+      high_availability:            >-
+                                    {% if role == 'DB' %}
+                                      {{ database_high_availability | default(false) | bool }}
+                                    {% elif role in ['SCS', 'ERS', 'PAS', 'APP'] %}
+                                      {{ scs_high_availability | default(false) | bool }}
+                                    {% else %}
+                                      false
+                                    {% endif %}
+      hardware_type:                "VM"
+      storage_type:                 "{{ NFS_provider | default(['Premium_LRS']) }}"
+      high_availability_agent:      >-
+                                    {% if role == 'DB' %}
+                                      {{ database_cluster_type | default("AFA") }}
+                                    {% elif role in ['SCS', 'ERS'] %}
+                                      {{ scs_cluster_type | default("AFA") }}
+                                    {% else %}
+                                      "AFA"
+                                    {% endif %}
+      imds_disks_metadata:          "{{ disks_metadata.json | default([]) }}"
+      device_lun_map:               "{{ device_lun_map | default({}) }}"
+      azure_disks_metadata:         "{{ azure_disks_metadata_results.results | default([]) | map(attribute='stdout') | list }}"
+      anf_storage_metadata:         "{{ anf_storage_metadata_results.stdout | default({}) }}"
+      afs_storage_metadata:         "{{ afs_storage_metadata_results.stdout | default({}) }}"
+      mount_info:                   "{{ mount_info.stdout | default([]) }}"
+      df_info:                      "{{ df_info.stdout | default([]) }}"
+      lvm_fullreport:               "{{ lvm_fullreport.stdout | default('{}') | from_json }}"
+      ha_db_config:                 "{{ ha_db_config | default([]) }}"
+      ha_scs_config:                "{{ ha_scs_config | default([]) }}"
+      ha_loadbalancer_config:       "{{ ha_loadbalancer_config | default({}) }}"
+
+- name:                             "{{ check_type.name }} - Debug system context prepared"
+  ansible.builtin.debug:
+    var:                            system_context | default({})
+    verbosity:                      1
+
+- name:                             Load checks file for {{ check_type.name }} from {{ check_type.file_name }}.yml
+  no_log:                           true
+  ansible.builtin.set_fact:
+    check_file_content:             "{{ lookup('file', check_type.file_name + '.yml') }}"
+
+- name:                             "{{ check_type.name }} - Parse check file to identify collector {{ check_type.file_name }}"
+  no_log:                           true
+  ansible.builtin.set_fact:
+    parsed_checks:                  "{{ check_file_content | from_yaml }}"
+
+- name:                             Filter checks by collector type
+  no_log:                           true
+  ansible.builtin.set_fact:
+    command_checks:                 "{{ parsed_checks.checks | selectattr('collector_type', 'equalto', 'command') | list }}"
+    azure_checks:                   "{{ parsed_checks.checks | selectattr('collector_type', 'equalto', 'azure') | list }}"
+    module_checks:                  "{{ parsed_checks.checks | selectattr('collector_type', 'equalto', 'module') | list }}"
+
+- name:                             "{{ check_type.name }} - Convert filtered checks back to YAML"
+  no_log:                           true
+  ansible.builtin.set_fact:
+    command_checks_yaml:            "{{ {'checks': command_checks} | to_yaml }}"
+    azure_checks_yaml:              "{{ {'checks': azure_checks} | to_yaml }}"
+    module_checks_yaml:             "{{ {'checks': module_checks} | to_yaml }}"
+  when:                             command_checks is defined or azure_checks is defined or module_checks is defined
+
+- name:                             "{{ check_type.name }} - Execute command-based configuration checks"
+  when:                             command_checks is defined and command_checks | length > 0
+  block:
+    - name:                         "{{ check_type.name }} - Run command-based configuration checks"
+      become:                       true
+      configuration_check_module:
+        check_file_content:         "{{ command_checks_yaml }}"
+        context:                    "{{ system_context }}"
+        filter_tags:                "{{ tags_filter | default(omit) }}"
+        filter_categories:          "{{ categories_filter | default(omit) }}"
+        workspace_directory:        "{{ _workspace_directory }}"
+        test_group_invocation_id:   "{{ test_group_invocation_id }}"
+        test_group_name:            "ConfigurationChecks"
+        hostname:                   "{{ ansible_hostname }}"
+        parallel_execution:         true
+        max_workers:                1
+        enable_retry:               true
+      register:                     command_check_results
+  rescue:
+    - name:                         Log command check failure
+      ansible.builtin.debug:
+        msg:                        "Command-based configuration checks failed {{ command_check_results.msg }}"
+
+- name:                             "{{ check_type.name }} - Debug the logs from configuration check python module"
+  when:                             command_check_results is defined and command_check_results.log is defined
+  ansible.builtin.debug:
+    msg:                            "{{ command_check_results.log }}"
+    verbosity:                      1
+
+- name:                             "{{ check_type.name }} - Execute Azure-based configuration checks"
+  when:                             azure_checks is defined and azure_checks | length > 0
+  block:
+    - name:                         Run Azure-based configuration checks
+      become:                       true
+      delegate_to:                  localhost
+      configuration_check_module:
+        check_file_content:         "{{ azure_checks_yaml }}"
+        context:                    "{{ system_context }}"
+        filter_tags:                "{{ tags_filter | default(omit) }}"
+        filter_categories:          "{{ categories_filter | default(omit) }}"
+        workspace_directory:        "{{ _workspace_directory }}"
+        test_group_invocation_id:   "{{ test_group_invocation_id }}"
+        test_group_name:            "ConfigurationChecks"
+        hostname:                   "{{ ansible_hostname }}"
+        parallel_execution:         true
+        max_workers:                1
+        enable_retry:               true
+      register:                     azure_check_results
+  rescue:
+    - name:                         Log Azure check failure
+      ansible.builtin.debug:
+        msg:                        "Azure-based configuration checks failed but continuing {{ azure_check_results.msg }}"
+
+- name:                             "{{ check_type.name }} - Debug the formatted filesystem info from configuration check python module"
+  when:                             azure_check_results is defined and azure_check_results.formatted_filesystem_info is defined
+  ansible.builtin.debug:
+    msg:                            "{{ azure_check_results.formatted_filesystem_info }}"
+    verbosity:                      1
+
+- name:                             "{{ check_type.name }} - Execute module-based configuration checks"
+  when:                             module_checks is defined and module_checks | length > 0
+  block:
+    - name:                         Run module-based configuration checks
+      become:                       true
+      configuration_check_module:
+        check_file_content:         "{{ module_checks_yaml }}"
+        context:                    "{{ system_context }}"
+        filter_tags:                "{{ tags_filter | default(omit) }}"
+        filter_categories:          "{{ categories_filter | default(omit) }}"
+        workspace_directory:        "{{ _workspace_directory }}"
+        test_group_invocation_id:   "{{ test_group_invocation_id }}"
+        test_group_name:            "ConfigurationChecks"
+        hostname:                   "{{ ansible_hostname }}"
+        parallel_execution:         true
+        max_workers:                1
+        enable_retry:               true
+      register:                     module_check_results
+  rescue:
+    - name:                         Log module check failure
+      ansible.builtin.debug:
+        msg:                        "Module-based configuration checks failed but continuing {{ module_check_results.msg }}"
+
+- name:                             "{{ check_type.name }} - Debug the module check results"
+  when:                             module_check_results is defined and module_check_results.check_results is defined
+  ansible.builtin.debug:
+    msg:                            "Module checks: {{ module_check_results.check_results | length }} results"
+    verbosity:                      1
+
+- name:                             "{{ check_type.name }} - Merge check results with error handling"
+  ansible.builtin.set_fact:
+    combined_results:               "{{ (command_check_results.check_results | default([])) +
+                                        (azure_check_results.check_results | default([])) +
+                                        (module_check_results.check_results | default([])) }}"
+    execution_summary:
+      total_command_checks:         "{{ command_checks | default([]) | length }}"
+      total_azure_checks:           "{{ azure_checks | default([]) | length }}"
+      total_module_checks:          "{{ module_checks | default([]) | length }}"
+      command_checks_executed:      "{{ command_check_results.check_results | default([]) | length }}"
+      azure_checks_executed:        "{{ azure_check_results.check_results | default([]) | length }}"
+      module_checks_executed:       "{{ module_check_results.check_results | default([]) | length }}"
+      command_check_failed:         "{{ command_check_results.failed | default(false) }}"
+      azure_check_failed:           "{{ azure_check_results.failed | default(false) }}"
+      module_check_failed:          "{{ module_check_results.failed | default(false) }}"
+      imds_available:               "{{ imds_available | default(true) }}"
+      execution_warnings:           "{{ execution_warnings | default([]) }}"
+      execution_errors:             "{{ execution_errors | default([]) }}"
+
+- name:                             "{{ check_type.name }} - Set dynamic result variable with metadata"
+  ansible.builtin.set_fact:
+    "{{ check_type.results_var }}": "{{ combined_results }}"
+    "{{ check_type.results_var }}_metadata": "{{ execution_summary }}"
diff --git a/src/roles/configuration_checks/vars/vm-support.yml b/src/roles/configuration_checks/vars/vm-support.yml
new file mode 100644
index 00000000..fa12a719
--- /dev/null
+++ b/src/roles/configuration_checks/vars/vm-support.yml
@@ -0,0 +1,592 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+os_type:
+  - suse:                        &suse "SUSE"
+  - redhat:                      &redhat "REDHAT"
+  - oraclelinux:                 &oraclelinux "ORACLELINUX"
+  - windows:                     &windows "WINDOWS"
+
+SupportedOSDBCombinations:
+  HANA:
+    DB:                          [*redhat, *suse]
+    SCS:                         [*windows, *redhat, *suse]
+    ERS:                         [*windows, *redhat, *suse]
+    APP:                         [*windows, *redhat, *suse]
+    PAS:                         [*windows, *redhat, *suse]
+  MSSQL:
+    DB:                          [*windows]
+    SCS:                         [*windows, *redhat, *suse]
+    ERS:                         [*windows, *redhat, *suse]
+    APP:                         [*windows, *redhat, *suse]
+    PAS:                         [*windows, *redhat, *suse]
+  Oracle:
+    DB:                          [*windows, *oraclelinux]
+    SCS:                         [*suse, *redhat, *oraclelinux, *windows]
+    ERS:                         [*suse, *redhat, *oraclelinux, *windows]
+    APP:                         [*windows, *oraclelinux]
+    PAS:                         [*windows, *oraclelinux]
+  Db2:
+    DB:                          [*windows, *redhat, *suse]
+    SCS:                         [*windows, *redhat, *suse]
+    ERS:                         [*windows, *redhat, *suse]
+    APP:                         [*windows, *redhat, *suse]
+    PAS:                         [*windows, *redhat, *suse]
+  ASE:
+    DB:                          [*windows, *redhat, *suse]
+    SCS:                         [*windows, *redhat, *suse]
+    ERS:                         [*windows, *redhat, *suse]
+    APP:                         [*windows, *redhat, *suse]
+    PAS:                         [*windows, *redhat, *suse]
+
+
+# Database configurations
+db_types:
+  non_hana_dbs:                &db_type_non_hana ["MSSQL", "Oracle", "Db2", "ASE"]
+  non_hana_dbs_ase:            &db_type_non_hana_ase ["MSSQL", "Oracle", "Db2"]
+  all_dbs:                     &db_type_all ["MSSQL", "Oracle", "Db2", "HANA", "ASE"]
+
+# Storage configurations
+storage_types:
+  premium:                     &storage_premium ["Premium_LRS", "UltraSSD_LRS", "ANF", "PremiumV2_LRS"]
+  ultra:                       &storage_ultra ["UltraSSD_LRS", "ANF", "PremiumV2_LRS"]
+
+# HANA scenarios
+hana_scenarios:
+  oltp:                        &hana_scenario_oltp ["OLTP"]
+  olap:                        &hana_scenario_olap ["OLAP"]
+  olap_scale_out:              &hana_scenario_olap_scale_out ["OLAP-ScaleOut"]
+  oltp_scale_out:              &hana_scenario_oltp_scale_out ["OLTP-ScaleOut"]
+  basic:                       &hana_scenario_basic [*hana_scenario_oltp, *hana_scenario_olap]
+  scale_out:                   &hana_scenario_scale_out [*hana_scenario_olap_scale_out, *hana_scenario_oltp_scale_out]
+
+# HANA Storage Requirements
+hana_storage_requirements:
+  HANADataMBPS:                400
+  HANALogMBPS:                 250
+  HANADataIOPS:                7000
+  HANALogIOPS:                 2000
+  HANADataStripeSize:          "256.00k"
+  HANALOGStripeSize:           "64.00k"
+
+# DB2 Storage Requirements
+db2_storage_requirements:
+  DB2DataStripeSize:           "256.00k"
+  DB2LOGStripeSize:            "64.00k"
+
+# VM deployment patterns
+vm_patterns:
+  app_only:                    &vm_pattern_app_only
+    DB:
+      SupportedDB:             []
+    APP:
+      SupportedDB:             *db_type_all
+    PAS:
+      SupportedDB:             *db_type_all
+    SCS:
+      SupportedDB:             *db_type_all
+    ERS:
+      SupportedDB:             *db_type_all
+
+  non_hana_db:                 &vm_pattern_non_hana_db
+    DB:
+      SupportedDB:             *db_type_non_hana
+    APP:
+      SupportedDB:             *db_type_all
+    PAS:
+      SupportedDB:             *db_type_all
+    SCS:
+      SupportedDB:             *db_type_all
+    ERS:
+      SupportedDB:             *db_type_all
+
+  non_hana_db_ase:             &vm_pattern_non_hana_db_ase
+    DB:
+      SupportedDB:             *db_type_non_hana_ase
+    APP:
+      SupportedDB:             *db_type_all
+    PAS:
+      SupportedDB:             *db_type_all
+    SCS:
+      SupportedDB:             *db_type_all
+    ERS:
+      SupportedDB:             *db_type_all
+
+  hana_db_ultra_log:           &vm_pattern_hana_ultra_log
+    DB:
+      SupportedDB:             *db_type_all
+      HANAStorageTypeData:     *storage_premium
+      HANAStorageTypeLog:      *storage_ultra
+      HANAScenario:            [*hana_scenario_oltp, *hana_scenario_olap]
+    APP:
+      SupportedDB:             *db_type_all
+    PAS:
+      SupportedDB:             *db_type_all
+    SCS:
+      SupportedDB:             *db_type_all
+    ERS:
+      SupportedDB:             *db_type_all
+
+  hana_db_ultra_log_oltp:      &vm_pattern_hana_ultra_log_oltp
+    DB:
+      SupportedDB:             *db_type_all
+      HANAStorageTypeData:     *storage_premium
+      HANAStorageTypeLog:      *storage_ultra
+      HANAScenario:            *hana_scenario_oltp
+    APP:
+      SupportedDB:             *db_type_all
+    PAS:
+      SupportedDB:             *db_type_all
+    SCS:
+      SupportedDB:             *db_type_all
+    ERS:
+      SupportedDB:             *db_type_all
+
+  hana_db_premium_log_oltp:    &vm_pattern_hana_premium_log_oltp
+    DB:
+      SupportedDB:             *db_type_all
+      HANAStorageTypeData:     *storage_premium
+      HANAStorageTypeLog:      *storage_premium
+      HANAScenario:            *hana_scenario_oltp
+    APP:
+      SupportedDB:             *db_type_all
+    PAS:
+      SupportedDB:             *db_type_all
+    SCS:
+      SupportedDB:             *db_type_all
+    ERS:
+      SupportedDB:             *db_type_all
+
+  hana_db_premium_log_olap:    &vm_pattern_hana_premium_log_olap
+    DB:
+      SupportedDB:             *db_type_all
+      HANAStorageTypeData:     *storage_premium
+      HANAStorageTypeLog:      *storage_premium
+      HANAScenario:            *hana_scenario_olap
+    APP:
+      SupportedDB:             *db_type_all
+    PAS:
+      SupportedDB:             *db_type_all
+    SCS:
+      SupportedDB:             *db_type_all
+    ERS:
+      SupportedDB:             *db_type_all
+
+  hana_db_premium_log:         &vm_pattern_hana_premium_log
+    DB:
+      SupportedDB:             *db_type_all
+      HANAStorageTypeData:     *storage_premium
+      HANAStorageTypeLog:      *storage_premium
+      HANAScenario:            *hana_scenario_basic
+    APP:
+      SupportedDB:             *db_type_all
+    PAS:
+      SupportedDB:             *db_type_all
+    SCS:
+      SupportedDB:             *db_type_all
+    ERS:
+      SupportedDB:             *db_type_all
+
+  hana_db_so_premium_log:      &vm_pattern_hana_so_premium_log
+    DB:
+      SupportedDB:             *db_type_all
+      HANAStorageTypeData:     *storage_premium
+      HANAStorageTypeLog:      *storage_premium
+      HANAScenario:            [*hana_scenario_basic, *hana_scenario_scale_out]
+    APP:
+      SupportedDB:             *db_type_all
+    PAS:
+      SupportedDB:             *db_type_all
+    SCS:
+      SupportedDB:             *db_type_all
+    ERS:
+      SupportedDB:             *db_type_all
+
+  hana_db_olap_scale_out:      &vm_pattern_hana_olap_scale_out
+    DB:
+      SupportedDB:             *db_type_all
+      HANAStorageTypeData:     *storage_premium
+      HANAStorageTypeLog:      *storage_premium
+      HANAScenario:            [*hana_scenario_basic, *hana_scenario_olap_scale_out]
+    APP:
+      SupportedDB:             *db_type_all
+    PAS:
+      SupportedDB:             *db_type_all
+    SCS:
+      SupportedDB:             *db_type_all
+    ERS:
+      SupportedDB:             *db_type_all
+
+  hana_db_oltp_scale_out:      &vm_pattern_hana_oltp_scale_out
+    DB:
+      SupportedDB:             *db_type_all
+      HANAStorageTypeData:     *storage_premium
+      HANAStorageTypeLog:      *storage_premium
+      HANAScenario:            [*hana_scenario_basic, *hana_scenario_oltp_scale_out]
+    APP:
+      SupportedDB:             *db_type_all
+    PAS:
+      SupportedDB:             *db_type_all
+    SCS:
+      SupportedDB:             *db_type_all
+    ERS:
+      SupportedDB:             *db_type_all
+
+# Supported VM types
+SupportedVMs:
+  # D-series VMs
+  Standard_D11:                *vm_pattern_app_only
+  Standard_DS11:               *vm_pattern_non_hana_db
+  Standard_DS11_v2:            *vm_pattern_non_hana_db
+
+  Standard_D12:                *vm_pattern_app_only
+  Standard_DS12:               *vm_pattern_non_hana_db
+  Standard_DS12_v2:            *vm_pattern_non_hana_db
+
+  Standard_D13:                *vm_pattern_app_only
+  Standard_DS13:               *vm_pattern_non_hana_db
+  Standard_DS13_v2:            *vm_pattern_non_hana_db
+
+  Standard_D14:                *vm_pattern_app_only
+  Standard_DS14:               *vm_pattern_non_hana_db
+  Standard_DS14_v2:            *vm_pattern_non_hana_db
+
+  Standard_DS15_v2:            *vm_pattern_non_hana_db
+
+  Standard_D2s_v3:             *vm_pattern_non_hana_db
+  Standard_D2as_v4:            *vm_pattern_non_hana_db
+  Standard_D2ds_v4:            *vm_pattern_non_hana_db
+  Standard_D2s_v5:             *vm_pattern_non_hana_db
+  Standard_D2ds_v5:            *vm_pattern_non_hana_db
+  Standard_D2as_v5:            *vm_pattern_non_hana_db
+  Standard_D2ads_v5:           *vm_pattern_non_hana_db
+  Standard_D2s_v6:             *vm_pattern_non_hana_db
+  Standard_D2ds_v6:            *vm_pattern_non_hana_db
+  Standard_D2as_v6:            *vm_pattern_non_hana_db
+  Standard_D2ads_v6:           *vm_pattern_non_hana_db
+
+  Standard_D4s_v3:             *vm_pattern_non_hana_db
+  Standard_D4as_v4:            *vm_pattern_non_hana_db
+  Standard_D4ds_v4:            *vm_pattern_non_hana_db
+  Standard_D4s_v5:             *vm_pattern_non_hana_db
+  Standard_D4ds_v5:            *vm_pattern_non_hana_db
+  Standard_D4as_v5:            *vm_pattern_non_hana_db
+  Standard_D4ads_v5:           *vm_pattern_non_hana_db
+  Standard_D4s_v6:             *vm_pattern_non_hana_db
+  Standard_D4ds_v6:            *vm_pattern_non_hana_db
+  Standard_D4as_v6:            *vm_pattern_non_hana_db
+  Standard_D4ads_v6:           *vm_pattern_non_hana_db
+
+  Standard_D8s_v3:             *vm_pattern_non_hana_db
+  Standard_D8as_v4:            *vm_pattern_non_hana_db
+  Standard_D8ds_v4:            *vm_pattern_non_hana_db
+  Standard_D8s_v5:             *vm_pattern_non_hana_db
+  Standard_D8ds_v5:            *vm_pattern_non_hana_db
+  Standard_D8as_v5:            *vm_pattern_non_hana_db
+  Standard_D8ads_v5:           *vm_pattern_non_hana_db
+  Standard_D8s_v6:             *vm_pattern_non_hana_db
+  Standard_D8ds_v6:            *vm_pattern_non_hana_db
+  Standard_D8as_v6:            *vm_pattern_non_hana_db
+  Standard_D8ads_v6:           *vm_pattern_non_hana_db
+
+  Standard_D16s_v3:            *vm_pattern_non_hana_db
+  Standard_D16as_v4:           *vm_pattern_non_hana_db
+  Standard_D16ds_v4:           *vm_pattern_non_hana_db
+  Standard_D16s_v5:            *vm_pattern_non_hana_db
+  Standard_D16ds_v5:           *vm_pattern_non_hana_db
+  Standard_D16as_v5:           *vm_pattern_non_hana_db
+  Standard_D16ads_v5:          *vm_pattern_non_hana_db
+  Standard_D16s_v6:            *vm_pattern_non_hana_db
+  Standard_D16ds_v6:           *vm_pattern_non_hana_db
+  Standard_D16as_v6:           *vm_pattern_non_hana_db
+  Standard_D16ads_v6:          *vm_pattern_non_hana_db
+
+  Standard_D32s_v3:            *vm_pattern_non_hana_db
+  Standard_D32as_v4:           *vm_pattern_non_hana_db
+  Standard_D32ds_v4:           *vm_pattern_non_hana_db
+  Standard_D32s_v5:            *vm_pattern_non_hana_db
+  Standard_D32ds_v5:           *vm_pattern_non_hana_db
+  Standard_D32as_v5:           *vm_pattern_non_hana_db
+  Standard_D32ads_v5:          *vm_pattern_non_hana_db
+  Standard_D32s_v6:            *vm_pattern_non_hana_db
+  Standard_D32ds_v6:           *vm_pattern_non_hana_db
+  Standard_D32as_v6:           *vm_pattern_non_hana_db
+  Standard_D32ads_v6:          *vm_pattern_non_hana_db
+
+  Standard_D48s_v3:            *vm_pattern_non_hana_db
+  Standard_D48as_v4:           *vm_pattern_non_hana_db
+  Standard_D48ds_v4:           *vm_pattern_non_hana_db
+  Standard_D48s_v5:            *vm_pattern_non_hana_db
+  Standard_D48ds_v5:           *vm_pattern_non_hana_db
+  Standard_D48as_v5:           *vm_pattern_non_hana_db
+  Standard_D48ads_v5:          *vm_pattern_non_hana_db
+  Standard_D48s_v6:            *vm_pattern_non_hana_db
+  Standard_D48ds_v6:           *vm_pattern_non_hana_db
+  Standard_D48as_v6:           *vm_pattern_non_hana_db
+  Standard_D48ads_v6:          *vm_pattern_non_hana_db
+
+  Standard_D64s_v3:            *vm_pattern_non_hana_db
+  Standard_D64as_v4:           *vm_pattern_non_hana_db
+  Standard_D64ds_v4:           *vm_pattern_non_hana_db
+  Standard_D64s_v5:            *vm_pattern_non_hana_db
+  Standard_D64ds_v5:           *vm_pattern_non_hana_db
+  Standard_D64as_v5:           *vm_pattern_non_hana_db
+  Standard_D64ads_v5:          *vm_pattern_non_hana_db
+  Standard_D64s_v6:            *vm_pattern_non_hana_db
+  Standard_D64ds_v6:           *vm_pattern_non_hana_db
+  Standard_D64as_v6:           *vm_pattern_non_hana_db
+  Standard_D64ads_v6:          *vm_pattern_non_hana_db
+
+  Standard_D96as_v4:           *vm_pattern_non_hana_db
+  Standard_D96s_v5:            *vm_pattern_non_hana_db
+  Standard_D96ds_v5:           *vm_pattern_non_hana_db
+  Standard_D96as_v5:           *vm_pattern_non_hana_db
+  Standard_D96ads_v5:          *vm_pattern_non_hana_db
+  Standard_D96s_v6:            *vm_pattern_non_hana_db
+  Standard_D96ds_v6:           *vm_pattern_non_hana_db
+  Standard_D96as_v6:           *vm_pattern_non_hana_db
+  Standard_D96ads_v6:          *vm_pattern_non_hana_db
+
+  Standard_D128s_v6:           *vm_pattern_non_hana_db
+  Standard_D128ds_v6:          *vm_pattern_non_hana_db
+
+  # F-series VMs
+  Standard_F2as_v6:            *vm_pattern_non_hana_db
+  Standard_F2ams_v6:           *vm_pattern_non_hana_db
+
+  Standard_F4as_v6:            *vm_pattern_non_hana_db
+  Standard_F4ams_v6:           *vm_pattern_non_hana_db
+
+  Standard_F8as_v6:            *vm_pattern_non_hana_db
+  Standard_F8ams_v6:           *vm_pattern_non_hana_db
+
+  Standard_F16as_v6:           *vm_pattern_non_hana_db
+  Standard_F16ams_v6:          *vm_pattern_non_hana_db
+
+  Standard_F32as_v6:           *vm_pattern_non_hana_db
+  Standard_F32ams_v6:          *vm_pattern_non_hana_db
+
+  Standard_F48as_v6:           *vm_pattern_non_hana_db
+  Standard_F48ams_v6:          *vm_pattern_non_hana_db
+
+  Standard_F64as_v6:           *vm_pattern_non_hana_db
+  Standard_F64ams_v6:          *vm_pattern_non_hana_db
+
+  # G-series VMs
+  Standard_GS1:                *vm_pattern_non_hana_db
+  Standard_GS2:                *vm_pattern_non_hana_db
+  Standard_GS3:                *vm_pattern_non_hana_db
+  Standard_GS4:                *vm_pattern_non_hana_db
+  Standard_GS5:                *vm_pattern_non_hana_db
+
+  # E-series VMs
+  Standard_E2s_v3:             *vm_pattern_non_hana_db
+  Standard_E2as_v4:            *vm_pattern_non_hana_db
+  Standard_E2ds_v4:            *vm_pattern_non_hana_db
+  Standard_E2s_v5:             *vm_pattern_non_hana_db_ase
+  Standard_E2ds_v5:            *vm_pattern_non_hana_db
+  Standard_E2as_v5:            *vm_pattern_non_hana_db
+  Standard_E2ads_v5:           *vm_pattern_non_hana_db
+  Standard_E2s_v6:             *vm_pattern_non_hana_db
+  Standard_E2ds_v6:            *vm_pattern_non_hana_db
+  Standard_E2as_v6:            *vm_pattern_non_hana_db
+  Standard_E2ads_v6:           *vm_pattern_non_hana_db
+
+  Standard_E4s_v3:             *vm_pattern_non_hana_db
+  Standard_E4as_v4:            *vm_pattern_non_hana_db
+  Standard_E4ds_v4:            *vm_pattern_non_hana_db
+  Standard_E4s_v5:             *vm_pattern_non_hana_db
+  Standard_E4ds_v5:            *vm_pattern_non_hana_db
+  Standard_E4as_v5:            *vm_pattern_non_hana_db
+  Standard_E4ads_v5:           *vm_pattern_non_hana_db
+  Standard_E4s_v6:             *vm_pattern_non_hana_db
+  Standard_E4ds_v6:            *vm_pattern_non_hana_db
+  Standard_E4as_v6:            *vm_pattern_non_hana_db
+  Standard_E4ads_v6:           *vm_pattern_non_hana_db
+
+  Standard_E8s_v3:             *vm_pattern_non_hana_db
+  Standard_E8as_v4:            *vm_pattern_non_hana_db
+  Standard_E8ds_v4:            *vm_pattern_non_hana_db
+  Standard_E8s_v5:             *vm_pattern_non_hana_db
+  Standard_E8ds_v5:            *vm_pattern_non_hana_db
+  Standard_E8as_v5:            *vm_pattern_non_hana_db
+  Standard_E8ads_v5:           *vm_pattern_non_hana_db
+  Standard_E8s_v6:             *vm_pattern_non_hana_db
+  Standard_E8ds_v6:            *vm_pattern_non_hana_db
+  Standard_E8as_v6:            *vm_pattern_non_hana_db
+  Standard_E8ads_v6:           *vm_pattern_non_hana_db
+
+  Standard_E16s_v3:            *vm_pattern_non_hana_db
+  Standard_E16as_v4:           *vm_pattern_non_hana_db
+  Standard_E16s_v5:            *vm_pattern_non_hana_db
+  Standard_E16ds_v4:           *vm_pattern_non_hana_db
+  Standard_E16ds_v5:           *vm_pattern_non_hana_db
+  Standard_E16as_v5:           *vm_pattern_non_hana_db
+  Standard_E16ads_v5:          *vm_pattern_non_hana_db
+  Standard_E16s_v6:            *vm_pattern_non_hana_db
+  Standard_E16ds_v6:           *vm_pattern_non_hana_db
+  Standard_E16as_v6:           *vm_pattern_non_hana_db
+  Standard_E16ads_v6:          *vm_pattern_non_hana_db
+
+  Standard_E20s_v3:            *vm_pattern_non_hana_db
+  Standard_E20as_v4:           *vm_pattern_non_hana_db
+  Standard_E20ds_v4:           *vm_pattern_hana_ultra_log
+  Standard_E20s_v5:            *vm_pattern_hana_ultra_log_oltp
+  Standard_E20ds_v5:           *vm_pattern_hana_ultra_log_oltp
+  Standard_E20as_v5:           *vm_pattern_non_hana_db
+  Standard_E20ads_v5:          *vm_pattern_non_hana_db
+  Standard_E20s_v6:            *vm_pattern_non_hana_db
+  Standard_E20ds_v6:           *vm_pattern_non_hana_db
+  Standard_E20as_v6:           *vm_pattern_non_hana_db
+  Standard_E20ads_v6:          *vm_pattern_non_hana_db
+
+  Standard_E32s_v3:            *vm_pattern_non_hana_db
+  Standard_E32ds_v4:           *vm_pattern_hana_ultra_log
+  Standard_E32as_v4:           *vm_pattern_non_hana_db
+  Standard_E32s_v5:            *vm_pattern_hana_ultra_log_oltp
+  Standard_E32ds_v5:           *vm_pattern_hana_ultra_log_oltp
+  Standard_E32as_v5:           *vm_pattern_non_hana_db
+  Standard_E32ads_v5:          *vm_pattern_non_hana_db
+  Standard_E32s_v6:            *vm_pattern_non_hana_db
+  Standard_E32ds_v6:           *vm_pattern_non_hana_db
+  Standard_E32as_v6:           *vm_pattern_non_hana_db
+  Standard_E32ads_v6:          *vm_pattern_non_hana_db
+
+  Standard_E48s_v3:            *vm_pattern_non_hana_db
+  Standard_E48ds_v4:           *vm_pattern_hana_ultra_log
+  Standard_E48as_v4:           *vm_pattern_non_hana_db
+  Standard_E48s_v5:            *vm_pattern_hana_ultra_log_oltp
+  Standard_E48ds_v5:           *vm_pattern_hana_ultra_log_oltp
+  Standard_E48as_v5:           *vm_pattern_non_hana_db
+  Standard_E48ads_v5:          *vm_pattern_non_hana_db
+  Standard_E48s_v6:            *vm_pattern_non_hana_db
+  Standard_E48ds_v6:           *vm_pattern_non_hana_db
+  Standard_E48as_v6:           *vm_pattern_non_hana_db
+  Standard_E48ads_v6:          *vm_pattern_non_hana_db
+
+  Standard_E64is_v3:           *vm_pattern_non_hana_db
+  Standard_E64as_v4:           *vm_pattern_non_hana_db
+  Standard_E64s_v3:            *vm_pattern_hana_ultra_log
+  Standard_E64ds_v4:           *vm_pattern_hana_ultra_log
+  Standard_E64s_v5:            *vm_pattern_hana_ultra_log_oltp
+  Standard_E64ds_v5:           *vm_pattern_hana_ultra_log_oltp
+  Standard_E64as_v5:           *vm_pattern_non_hana_db
+  Standard_E64ads_v5:          *vm_pattern_non_hana_db
+  Standard_E64s_v6:            *vm_pattern_non_hana_db
+  Standard_E64ds_v6:           *vm_pattern_non_hana_db
+  Standard_E64as_v6:           *vm_pattern_non_hana_db
+  Standard_E64ads_v6:          *vm_pattern_non_hana_db
+
+  Standard_E96as_v4:           *vm_pattern_non_hana_db
+  Standard_E96s_v5:            *vm_pattern_hana_ultra_log_oltp
+  Standard_E96ds_v5:           *vm_pattern_hana_ultra_log_oltp
+  Standard_E96as_v5:           *vm_pattern_non_hana_db
+  Standard_E96ads_v5:          *vm_pattern_non_hana_db
+  Standard_E96s_v6:            *vm_pattern_non_hana_db
+  Standard_E96ds_v6:           *vm_pattern_non_hana_db
+  Standard_E96as_v6:           *vm_pattern_non_hana_db
+  Standard_E96ads_v6:          *vm_pattern_non_hana_db
+
+  Standard_E128s_v6:           *vm_pattern_non_hana_db
+  Standard_E128ds_v6:          *vm_pattern_non_hana_db
+
+  # M-series VMs
+  Standard_M8ms:               *vm_pattern_non_hana_db
+
+  Standard_M12s_v3:            *vm_pattern_non_hana_db
+  Standard_M12ds_v3:           *vm_pattern_non_hana_db
+
+  Standard_M16ms:              *vm_pattern_non_hana_db
+  Standard_M16bds_v3:          *vm_pattern_non_hana_db
+  Standard_M16bs_v3:           *vm_pattern_non_hana_db
+
+  Standard_M24s_v3:            *vm_pattern_non_hana_db
+  Standard_M24ds_v3:           *vm_pattern_non_hana_db
+
+  Standard_M32ts:              *vm_pattern_hana_premium_log
+  Standard_M32ls:              *vm_pattern_hana_premium_log
+  Standard_M32ms_v2:           *vm_pattern_hana_premium_log
+  Standard_M32dms_v2:          *vm_pattern_hana_premium_log
+  Standard_M32bds_v3:          *vm_pattern_non_hana_db
+  Standard_M32bs_v3:           *vm_pattern_non_hana_db
+
+  Standard_M48s_1_v3:          *vm_pattern_non_hana_db
+  Standard_M48ds_1_v3:         *vm_pattern_hana_premium_log_oltp
+  Standard_M48bds_v3:          *vm_pattern_hana_premium_log
+  Standard_M48bs_v3:           *vm_pattern_non_hana_db
+
+  Standard_M64ls:              *vm_pattern_hana_premium_log
+  Standard_M64s:               *vm_pattern_hana_premium_log
+  Standard_M64ms:              *vm_pattern_hana_premium_log
+  Standard_M64s_v2:            *vm_pattern_hana_premium_log
+  Standard_M64ms_v2:           *vm_pattern_hana_premium_log
+  Standard_M64ds_v2:           *vm_pattern_hana_premium_log
+  Standard_M64dms_v2:          *vm_pattern_hana_premium_log
+  Standard_M64bds_v3:          *vm_pattern_hana_premium_log
+  Standard_M64bs_v3:           *vm_pattern_non_hana_db
+  Standard_M64bds_1_v3:        *vm_pattern_hana_premium_log
+
+  Standard_M96s_1_v3:          *vm_pattern_non_hana_db
+  Standard_M96s_2_v3:          *vm_pattern_non_hana_db
+  Standard_M96ds_1_v3:         *vm_pattern_hana_olap_scale_out
+  Standard_M96ds_2_v3:         *vm_pattern_hana_premium_log_olap
+  Standard_M96ds_4_v3:         *vm_pattern_hana_olap_scale_out
+  Standard_M96bds_v3:          *vm_pattern_hana_premium_log
+  Standard_M96bs_v3:           *vm_pattern_non_hana_db
+  Standard_M96bds_1_v3:        *vm_pattern_hana_premium_log
+
+  Standard_M128s:              *vm_pattern_hana_premium_log
+  Standard_M128ms:             *vm_pattern_hana_premium_log
+  Standard_M128ms_v2:          *vm_pattern_hana_premium_log
+  Standard_M128ds_v2:          *vm_pattern_hana_premium_log
+  Standard_M128dms_v2:         *vm_pattern_hana_premium_log
+  Standard_M128s_v2:           *vm_pattern_hana_olap_scale_out
+  Standard_M128bds_v3:         *vm_pattern_hana_premium_log
+  Standard_M128bs_v3:          *vm_pattern_non_hana_db
+  Standard_M128bds_3_v3:       *vm_pattern_hana_olap_scale_out
+
+  Standard_M176s_3_v3:         *vm_pattern_non_hana_db
+  Standard_M176s_4_v3:         *vm_pattern_non_hana_db
+  Standard_M176ds_3_v3:        *vm_pattern_hana_olap_scale_out
+  Standard_M176ds_4_v3:        *vm_pattern_hana_olap_scale_out
+  Standard_M176bds_3_v3:       *vm_pattern_hana_so_premium_log
+  Standard_M176bs_3_v3:        *vm_pattern_hana_so_premium_log
+  Standard_M176bds_v3:         *vm_pattern_hana_so_premium_log
+  Standard_M176bs_v3:          *vm_pattern_non_hana_db
+  Standard_M176bds_4_v3:       *vm_pattern_hana_olap_scale_out
+
+  Standard_M208s_v2:           *vm_pattern_hana_premium_log
+  Standard_M208ms_v2:          *vm_pattern_hana_premium_log
+
+  Standard_M192is_v2:          *vm_pattern_hana_olap_scale_out
+  Standard_M192ims_v2:         *vm_pattern_hana_olap_scale_out
+  Standard_M192ids_v2:         *vm_pattern_hana_olap_scale_out
+  Standard_M192idms_v2:        *vm_pattern_hana_olap_scale_out
+
+  Standard_M416s_v2:           *vm_pattern_hana_so_premium_log
+  Standard_M416ms_v2:          *vm_pattern_hana_so_premium_log
+  Standard_M416s_8_v2:         *vm_pattern_hana_so_premium_log
+  Standard_M416s_6_v3:         *vm_pattern_hana_olap_scale_out
+  Standard_M416s_8_v3:         *vm_pattern_hana_olap_scale_out
+  Standard_M416ds_6_v3:        *vm_pattern_hana_olap_scale_out
+  Standard_M416ds_8_v3:        *vm_pattern_hana_olap_scale_out
+
+  Standard_M420ixs_v2:         *vm_pattern_hana_oltp_scale_out
+
+  Standard_M624s_12_v3:        *vm_pattern_hana_olap_scale_out
+  Standard_M624ds_12_v3:       *vm_pattern_hana_olap_scale_out
+
+  Standard_M832ixs_v2:         *vm_pattern_hana_oltp_scale_out
+  Standard_M832ixs_8_v2:       *vm_pattern_hana_oltp_scale_out
+  Standard_M832s_12_v3:        *vm_pattern_hana_olap_scale_out
+  Standard_M832s_16_v3:        *vm_pattern_hana_olap_scale_out
+  Standard_M832ds_12_v3:       *vm_pattern_hana_olap_scale_out
+  Standard_M832ds_16_v3:       *vm_pattern_hana_olap_scale_out
+  Standard_M832is_16_v3:       *vm_pattern_hana_premium_log_oltp
+  Standard_M832is_12_v3:       *vm_pattern_hana_premium_log_oltp
+  Standard_M832ids_16_v3:      *vm_pattern_hana_premium_log_oltp
+  Standard_M832ids_12_v3:      *vm_pattern_hana_premium_log_oltp
+
+  Standard_M896ixds_32_v3:     *vm_pattern_hana_premium_log
+
+  Standard_M1792ixds_32_v3:    *vm_pattern_hana_premium_log
diff --git a/src/roles/misc/tasks/offline-validation.yml b/src/roles/misc/tasks/offline-validation.yml
index 942cd147..a98ce24a 100644
--- a/src/roles/misc/tasks/offline-validation.yml
+++ b/src/roles/misc/tasks/offline-validation.yml
@@ -21,7 +21,7 @@
 - name:                                 "HA Configuration check for {{ current_hostname }}"
   block:
     - name:                             "Offline HA Configuration validation for DB"
-      when:                             sap_functional_test_type == "DatabaseHighAvailability"
+      when:                             SAP_FUNCTIONAL_TEST_TYPE == "DatabaseHighAvailability"
       block:
         - name:                         "Get Pacemaker properties for DB"
           get_pcmk_properties_db:
@@ -44,7 +44,7 @@
             test_case_hostname:         "{{ current_hostname }}"
 
     - name:                             "Offline HA Configuration validation for SCS"
-      when:                             sap_functional_test_type == "CentralServicesHighAvailability"
+      when:                             SAP_FUNCTIONAL_TEST_TYPE == "CentralServicesHighAvailability"
       block:
         - name:                         "Get Pacemaker properties for SCS"
           get_pcmk_properties_scs:
diff --git a/src/roles/misc/tasks/render-html-report.yml b/src/roles/misc/tasks/render-html-report.yml
index a54cb2d6..3c4ba8e4 100644
--- a/src/roles/misc/tasks/render-html-report.yml
+++ b/src/roles/misc/tasks/render-html-report.yml
@@ -11,12 +11,14 @@
   block:
     - name:                             "Load HTML jinja2 template"
       ansible.builtin.set_fact:
-        html_report_template:           "{{ lookup('file', './templates/report.html') }}"
+        html_report_template:           "{{ lookup('file', html_template_name | default('./templates/report.html')) }}"
 
     - name:                             "Read the log file and create a HTML report"
       render_html_report:
         test_group_invocation_id:       "{{ test_group_invocation_id }}"
-        test_group_name:                "{{ test_group_name }}_{{ target_os_family | default(ansible_os_family | default('SUSE')) | upper }}"
+        test_group_name:                "{{ test_group_name }}_{{ ansible_os_family | upper }}"
         report_template:                "{{ html_report_template }}"
         workspace_directory:            "{{ _workspace_directory }}"
+        test_case_results:              "{{ all_results | default({}) }}"
+        system_info:                    "{{ system_info | default({}) }}"
       register:                         report_file_path
diff --git a/src/templates/config_checks_report.html b/src/templates/config_checks_report.html
new file mode 100644
index 00000000..62bbe2c7
--- /dev/null
+++ b/src/templates/config_checks_report.html
@@ -0,0 +1,1523 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>SAP Configuration Checks Report</title>
+  <link rel="preconnect" href="https://fonts.googleapis.com">
+  <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+  <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700;800&display=swap" rel="stylesheet">
+  
+  {% macro render_table(data, is_nested=false) %}
+    {% if not data %}
+      <div class="table-empty-state">No data available</div>
+    {% elif data is mapping %}
+      {% set has_nested = namespace(value=false) %}
+      {% for value in data.values() %}
+        {% if value is mapping or value is iterable and value is not string %}
+          {% set has_nested.value = true %}
+        {% endif %}
+      {% endfor %}
+      
+      {% if has_nested.value %}
+        {% for key, value in data.items() %}
+          {% if value is mapping or (value is iterable and value is not string) %}
+            <div class="nested-section">
+              <div class="nested-section-title">{{ key }}</div>
+              {{ render_table(value, is_nested=true) }}
+            </div>
+          {% else %}
+            <table class="dynamic-table{% if is_nested %} nested-table{% endif %}">
+              <tbody>
+                <tr><th>{{ key }}</th><td>{{ value }}</td></tr>
+              </tbody>
+            </table>
+          {% endif %}
+        {% endfor %}
+      {% else %}
+        <table class="dynamic-table{% if is_nested %} nested-table{% endif %}">
+          <tbody>
+            {% for key, value in data.items() %}
+              <tr><th>{{ key }}</th><td>{{ value }}</td></tr>
+            {% endfor %}
+          </tbody>
+        </table>
+      {% endif %}
+    {% elif data is iterable and data is not string %}
+      {% if data|length > 0 and data[0] is mapping %}
+        {% set first_item = data[0] %}
+        {% set all_keys = first_item.keys()|list %}
+        
+        {% for item in data[1:] %}
+          {% if item is mapping %}
+            {% for key in item.keys() %}
+              {% if key not in all_keys %}
+                {% set _ = all_keys.append(key) %}
+              {% endif %}
+            {% endfor %}
+          {% endif %}
+        {% endfor %}
+        <table class="dynamic-table{% if is_nested %} nested-table{% endif %}">
+          <thead>
+            <tr>
+              {% for key in all_keys %}
+                <th>{{ key }}</th>
+              {% endfor %}
+            </tr>
+          </thead>
+          <tbody>
+            {% for item in data %}
+              {% if item is mapping %}
+                <tr>
+                  {% for key in all_keys %}
+                    {% set value = item.get(key, '') %}
+                    {% if key|lower == 'status' %}
+                      <td class="status-{{ value|lower }}">{{ value }}</td>
+                    {% else %}
+                      <td>
+                        {% if value is mapping %}
+                          {{ render_table(value, is_nested=true) }}
+                        {% elif value is iterable and value is not string %}
+                          {% for list_item in value %}
+                            {{ list_item }}<br>
+                          {% endfor %}
+                        {% else %}
+                          {{ value }}
+                        {% endif %}
+                      </td>
+                    {% endif %}
+                  {% endfor %}
+                </tr>
+              {% endif %}
+            {% endfor %}
+          </tbody>
+        </table>
+      {% else %}
+        {% if is_nested %}
+          {% for item in data %}
+            {{ item }}<br>
+          {% endfor %}
+        {% else %}
+          <table class="dynamic-table">
+            <thead><tr><th>Value</th></tr></thead>
+            <tbody>
+              {% for item in data %}
+                <tr>
+                  <td>
+                    {% if item is mapping or (item is iterable and item is not string) %}
+                      {{ render_table(item, is_nested=true) }}
+                    {% else %}
+                      {{ item }}
+                    {% endif %}
+                  </td>
+                </tr>
+              {% endfor %}
+            </tbody>
+          </table>
+        {% endif %}
+      {% endif %}
+    {% else %}
+      <div>{{ data }}</div>
+    {% endif %}
+  {% endmacro %}
+
+  <style>
+    :root {
+      --primary-color: #0078d7;
+      --primary-gradient: linear-gradient(135deg, #0078d7 0%, #005a9e 100%);
+      --success-color: #107c10;
+      --success-gradient: linear-gradient(135deg, #107c10 0%, #0e6b0e 100%);
+      --error-color: #d13438;
+      --error-gradient: linear-gradient(135deg, #d13438 0%, #a72b2e 100%);
+      --warning-color: #ff8c00;
+      --warning-gradient: linear-gradient(135deg, #ff8c00 0%, #e67e00 100%);
+      --info-color: #0078d7;
+      --info-gradient: linear-gradient(135deg, #0078d7 0%, #005a9e 100%);
+      --bg-light: #f3f2f1;
+      --bg-pattern: radial-gradient(circle at 20% 50%, rgba(0, 120, 215, 0.05) 0%, transparent 50%),
+                     radial-gradient(circle at 80% 80%, rgba(0, 90, 158, 0.05) 0%, transparent 50%),
+                     repeating-linear-gradient(0deg, rgba(0, 120, 215, 0.03) 0px, transparent 1px, transparent 40px, rgba(0, 120, 215, 0.03) 41px),
+                     repeating-linear-gradient(90deg, rgba(0, 120, 215, 0.03) 0px, transparent 1px, transparent 40px, rgba(0, 120, 215, 0.03) 41px);
+      --shadow-sm: 0 1px 3px rgba(0, 0, 0, 0.05), 0 1px 2px rgba(0, 0, 0, 0.03);
+      --shadow-md: 0 4px 6px -1px rgba(0, 0, 0, 0.08), 0 2px 4px -1px rgba(0, 0, 0, 0.04);
+      --shadow-lg: 0 10px 15px -3px rgba(0, 0, 0, 0.08), 0 4px 6px -2px rgba(0, 0, 0, 0.03);
+      --shadow-xl: 0 20px 25px -5px rgba(0, 0, 0, 0.1), 0 10px 10px -5px rgba(0, 0, 0, 0.04);
+      --radius-sm: 8px;
+      --radius-md: 16px;
+      --radius-lg: 24px;
+      --transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+      --transition-bounce: all 0.5s cubic-bezier(0.68, -0.55, 0.265, 1.55);
+    }
+    /* Base Styles */
+    html,
+    body {
+      height: 100%;
+      margin: 0;
+      display: flex;
+      flex-direction: column;
+      font-family: 'Inter', system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
+      background: var(--bg-light);
+      background-image: var(--bg-pattern);
+      background-attachment: fixed;
+    }
+
+    @keyframes fadeInUp {
+      from {
+        opacity: 0;
+        transform: translateY(20px);
+      }
+      to {
+        opacity: 1;
+        transform: translateY(0);
+      }
+    }
+
+    @keyframes fadeInDown {
+      from {
+        opacity: 0;
+        transform: translateY(-20px);
+      }
+      to {
+        opacity: 1;
+        transform: translateY(0);
+      }
+    }
+
+    @keyframes shimmer {
+      0% {
+        left: -100%;
+      }
+      100% {
+        left: 100%;
+      }
+    }
+
+    @keyframes countUp {
+      from {
+        opacity: 0;
+        transform: scale(0.5);
+      }
+      to {
+        opacity: 1;
+        transform: scale(1);
+      }
+    }
+
+    @keyframes ripple {
+      0% {
+        transform: scale(0);
+        opacity: 0.6;
+      }
+      100% {
+        transform: scale(2.5);
+        opacity: 0;
+      }
+    }
+
+    @keyframes slideDown {
+      from {
+        opacity: 0;
+        max-height: 0;
+        transform: translateY(-10px);
+      }
+      to {
+        opacity: 1;
+        max-height: 1000px;
+        transform: translateY(0);
+      }
+    }
+
+    @keyframes gradientShift {
+      0%, 100% {
+        background-position: 0% 50%;
+      }
+      50% {
+        background-position: 100% 50%;
+      }
+    }
+
+    @keyframes scaleIn {
+      from {
+        opacity: 0;
+        transform: scale(0.9);
+      }
+      to {
+        opacity: 1;
+        transform: scale(1);
+      }
+    }
+
+    @keyframes skeletonLoading {
+      0% {
+        background-position: -200% 0;
+      }
+      100% {
+        background-position: 200% 0;
+      }
+    }
+
+    @keyframes rotate {
+      from {
+        transform: rotate(0deg);
+      }
+      to {
+        transform: rotate(180deg);
+      }
+    }
+
+    @keyframes fadeInFromTop {
+      from {
+        opacity: 0;
+        transform: translateY(-20px);
+      }
+      to {
+        opacity: 1;
+        transform: translateY(0);
+      }
+    }
+
+    /* Layout Components */
+    .navbar {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      padding: 24px;
+      background: var(--primary-gradient);
+      color: #ffffff;
+      transition: var(--transition);
+      font-size: 28px;
+      font-weight: 700;
+      width: 100%;
+      box-shadow: var(--shadow-lg);
+      letter-spacing: -0.5px;
+      position: relative;
+      overflow: hidden;
+      animation: fadeInDown 1.2s cubic-bezier(0.4, 0, 0.2, 1);
+    }
+
+    .navbar::before {
+      content: '';
+      position: absolute;
+      top: 0;
+      left: -100%;
+      width: 100%;
+      height: 100%;
+      background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.2), transparent);
+      animation: shimmer 30s infinite;
+    }
+
+    .main-content {
+      flex: 1;
+      padding: 32px 20px;
+    }
+
+    .navbar .system-id {
+      font-weight: bold;
+    }
+
+    .container {
+      display: grid;
+      grid-template-columns: minmax(0, 1fr) minmax(auto, 1400px) minmax(0, 1fr);
+      gap: 20px;
+    }
+
+    .left-bar {
+      grid-column: 2;
+      padding: 20px;
+    }
+
+    /* System Info Styles */
+    .system-info-container {
+      background: rgba(255, 255, 255, 0.95);
+      backdrop-filter: blur(10px);
+      border-radius: var(--radius-lg);
+      box-shadow: var(--shadow-lg);
+      padding: 32px;
+      margin-bottom: 24px;
+      position: relative;
+      transition: var(--transition);
+      border: 1px solid rgba(0, 120, 215, 0.1);
+      animation: fadeInUp 0.6s ease-out;
+    }
+
+    .system-info-container:hover {
+      box-shadow: 0 20px 40px -10px rgba(0, 120, 215, 0.2), 0 0 0 1px rgba(0, 120, 215, 0.1);
+      transform: translateY(-4px);
+      border-color: rgba(0, 120, 215, 0.3);
+    }
+
+    .system-info-heading {
+      width: 100%;
+      text-align: left;
+      margin-bottom: 20px;
+    }
+
+    .system-info-columns {
+      display: flex;
+      justify-content: space-between;
+    }
+
+    .system-info-column {
+      width: 30%;
+      position: relative;
+      flex-direction: column;
+      display: flex;
+      align-items: flex-start;
+    }
+
+    .system-info-container h2 {
+      color: #64748b;
+      margin-bottom: 24px;
+      font-size: 13px;
+      font-weight: 800;
+      letter-spacing: 2px;
+      text-transform: uppercase;
+      background: var(--primary-gradient);
+      -webkit-background-clip: text;
+      -webkit-text-fill-color: transparent;
+      background-clip: text;
+    }
+
+    .system-info-container p {
+      color: #475569;
+      margin-bottom: 12px;
+      font-size: 15px;
+      line-height: 1.6;
+    }
+
+    .system-info p strong {
+      color: #1e293b;
+      font-weight: 600;
+    }
+
+    /* Configuration Checks Styles */
+    .config-checks-container {
+      background: rgba(255, 255, 255, 0.95);
+      backdrop-filter: blur(10px);
+      border-radius: var(--radius-lg);
+      box-shadow: var(--shadow-lg);
+      padding: 32px;
+      margin-bottom: 24px;
+      transition: var(--transition);
+      border: 1px solid rgba(0, 120, 215, 0.1);
+      animation: fadeInUp 0.8s ease-out;
+    }
+
+    .config-checks-container:hover {
+      box-shadow: 0 20px 40px -10px rgba(0, 120, 215, 0.2), 0 0 0 1px rgba(0, 120, 215, 0.1);
+    }
+
+    .config-checks-container h2 {
+      color: #64748b;
+      margin-bottom: 24px;
+      font-size: 13px;
+      font-weight: 800;
+      letter-spacing: 2px;
+      text-transform: uppercase;
+      background: var(--primary-gradient);
+      -webkit-background-clip: text;
+      -webkit-text-fill-color: transparent;
+      background-clip: text;
+    }
+
+    .config-checks-container h3 {
+      color: #64748b;
+      font-size: 13px;
+      font-weight: 800;
+      margin: 32px 0 20px 0;
+      padding-bottom: 12px;
+      border-bottom: 3px solid;
+      border-image: var(--primary-gradient) 1;
+      letter-spacing: 2px;
+      text-transform: uppercase;
+      background: var(--primary-gradient);
+      -webkit-background-clip: text;
+      -webkit-text-fill-color: transparent;
+      background-clip: text;
+    }
+
+    .config-checks-table {
+      width: 100%;
+      border-collapse: collapse;
+      margin-bottom: 20px;
+      border-radius: var(--radius-md);
+      overflow: hidden;
+    }
+
+    .config-checks-table th,
+    .config-checks-table td {
+      padding: 16px;
+      text-align: left;
+      border-bottom: 1px solid #e2e8f0;
+      font-size: 14px;
+    }
+
+    .config-checks-table th {
+      background: var(--primary-gradient);
+      background-size: 200% 200%;
+      position: sticky;
+      top: 0;
+      font-weight: 700;
+      color: white;
+      text-transform: uppercase;
+      font-size: 11px;
+      letter-spacing: 1px;
+      padding: 18px 16px;
+      animation: gradientShift 6s ease infinite;
+    }
+
+    .config-checks-table tbody tr {
+      cursor: pointer;
+      transition: var(--transition);
+      background: white;
+      animation: fadeInFromTop 0.1s ease-out backwards;
+    }
+
+    .config-checks-table tbody tr:nth-child(1) { animation-delay: 0.02s; }
+    .config-checks-table tbody tr:nth-child(2) { animation-delay: 0.04s; }
+    .config-checks-table tbody tr:nth-child(3) { animation-delay: 0.06s; }
+    .config-checks-table tbody tr:nth-child(4) { animation-delay: 0.08s; }
+    .config-checks-table tbody tr:nth-child(5) { animation-delay: 0.1s; }
+    .config-checks-table tbody tr:nth-child(n+6) { animation-delay: 0.12s; }
+
+    .config-checks-table tbody tr:hover {
+      background: linear-gradient(90deg, #f0f9ff 0%, #e0f2fe 100%);
+      transform: scale(1.005);
+      box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
+    }
+
+    .config-section {
+      margin-top: 20px;
+      padding: 20px;
+      background: linear-gradient(135deg, #f8fafc 0%, #f1f5f9 100%);
+      border-radius: var(--radius-md);
+      font-size: 13px;
+      border: 1px solid #e2e8f0;
+      transition: var(--transition);
+    }
+
+    .config-section:hover {
+      box-shadow: var(--shadow-md);
+      transform: translateX(4px);
+    }
+
+    .config-section h4 {
+      margin-top: 0;
+      color: #1e293b;
+      font-weight: 700;
+    }
+
+    .status-passed {
+      color: var(--success-color);
+      font-weight: 700;
+    }
+
+    .status-failed {
+      color: var(--error-color);
+      font-weight: 700;
+    }
+
+    .status-warning {
+      color: var(--warning-color);
+      font-weight: 700;
+    }
+
+    .status-info {
+      color: var(--info-color);
+      font-weight: 700;
+    }
+
+    .summary-box {
+      display: grid;
+      grid-template-columns: repeat(auto-fit, minmax(140px, 1fr));
+      gap: 20px;
+      margin-bottom: 24px;
+    }
+
+    .status-count {
+      padding: 10px 10px;
+      border-radius: var(--radius-md);
+      text-align: center;
+      transition: var(--transition-bounce);
+      border: 2px solid;
+      position: relative;
+      overflow: hidden;
+      cursor: pointer;
+      background: white;
+      animation: scaleIn 0.5s cubic-bezier(0.68, -0.55, 0.265, 1.55) backwards;
+    }
+
+    .status-count::before {
+      content: '';
+      position: absolute;
+      top: 0;
+      left: 0;
+      right: 0;
+      bottom: 0;
+      background: currentColor;
+      opacity: 0;
+      transition: var(--transition);
+    }
+
+    .status-count::after {
+      content: '';
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      width: 0;
+      height: 0;
+      border-radius: 50%;
+      background: currentColor;
+      opacity: 0;
+      transform: translate(-50%, -50%);
+      transition: width 0.6s, height 0.6s, opacity 0.6s;
+    }
+
+    .status-count:hover::after {
+      width: 300px;
+      height: 300px;
+      opacity: 0.1;
+    }
+
+    .status-count:hover::before {
+      opacity: 0.05;
+    }
+
+    .status-count:hover {
+      transform: translateY(-8px) scale(1.05);
+      box-shadow: 0 12px 24px -8px currentColor;
+      opacity: 0.9;
+      border-width: 3px;
+    }
+
+    .status-count.active {
+      background: currentColor;
+      color: white;
+      transform: scale(1.08);
+      box-shadow: 0 16px 32px -12px currentColor;
+      border-width: 3px;
+    }
+
+    .status-count.active::before {
+      opacity: 0.2;
+    }
+
+    .status-count.active h3,
+    .status-count.active p {
+      color: white;
+      opacity: 1;
+    }
+
+    .status-count h3 {
+      margin: 0 0 8px 0;
+      font-size: 42px;
+      font-weight: 800;
+      animation: countUp 0.6s cubic-bezier(0.68, -0.55, 0.265, 1.55) backwards;
+    }
+
+    .status-count p {
+      margin: 0;
+      font-size: 13px;
+      font-weight: 600;
+      text-transform: uppercase;
+      letter-spacing: 1px;
+      opacity: 0.8;
+    }
+
+    .status-count.passed {
+      border-color: var(--success-color);
+      color: var(--success-color);
+    }
+
+    .status-count.failed,
+    .status-count.error {
+      border-color: var(--error-color);
+      color: var(--error-color);
+    }
+
+    .status-count.warning {
+      border-color: var(--warning-color);
+      color: var(--warning-color);
+    }
+
+    .status-count.info {
+      border-color: var(--info-color);
+      color: var(--info-color);
+    }
+
+    .detail-row {
+      display: grid;
+      grid-template-columns: 200px 1fr;
+      padding: 12px;
+      border-bottom: 1px solid #e2e8f0;
+      transition: var(--transition);
+    }
+
+    .detail-row:hover {
+      background: rgba(0, 120, 215, 0.03);
+    }
+
+    .detail-label {
+      font-weight: 700;
+      color: #475569;
+      text-transform: uppercase;
+      font-size: 11px;
+      letter-spacing: 0.5px;
+    }
+
+    .expanded-content {
+      display: none;
+      padding: 0;
+      background-color: #f9f9f9;
+      border-top: none;
+    }
+
+    .expanded-content.show {
+      display: table-row;
+      animation: slideDown 0.1s cubic-bezier(0.4, 0, 0.2, 1);
+    }
+
+    .expanded-content td {
+      padding: 0;
+    }
+
+    .expanded-content-inner {
+      padding: 24px;
+      border-left: 4px solid;
+      border-image: var(--primary-gradient) 1;
+      background: linear-gradient(to right, rgba(0, 120, 215, 0.05) 0%, transparent 100%);
+      border-radius: 0 var(--radius-sm) var(--radius-sm) 0;
+      animation: fadeInUp 0.3s ease-out;
+    }
+
+    .references-section {
+      margin-top: 15px;
+      padding-top: 15px;
+      border-top: 1px solid #ddd;
+    }
+
+    .references-section h4 {
+      margin-top: 0;
+      color: #0078d7;
+    }
+
+    pre {
+      background: linear-gradient(135deg, #1e293b 0%, #334155 100%);
+      color: #e2e8f0;
+      padding: 16px;
+      border-radius: var(--radius-sm);
+      overflow-x: auto;
+      margin: 8px 0;
+      font-family: 'Fira Code', 'Consolas', monospace;
+      font-size: 13px;
+      line-height: 1.6;
+      box-shadow: var(--shadow-md);
+    }
+
+    /* Dynamic Table Styles */
+    .dynamic-table-container {
+      margin-top: 16px;
+      overflow-x: auto;
+    }
+
+    .table-report-section {
+      background: white;
+      border: 1px solid #e2e8f0;
+    }
+
+    .dynamic-table {
+      width: 100%;
+      border-collapse: collapse;
+      margin: 12px 0;
+      border-radius: var(--radius-sm);
+      overflow: hidden;
+      box-shadow: var(--shadow-sm);
+      background: white;
+    }
+
+    .dynamic-table th {
+      background: linear-gradient(135deg, #334155 0%, #475569 100%);
+      color: white;
+      padding: 12px 16px;
+      text-align: left;
+      font-weight: 600;
+      font-size: 13px;
+      text-transform: uppercase;
+      letter-spacing: 0.5px;
+      border-bottom: 2px solid #1e293b;
+    }
+
+    .dynamic-table td {
+      padding: 12px 16px;
+      border-bottom: 1px solid #e2e8f0;
+      font-size: 14px;
+      color: #475569;
+      vertical-align: top;
+    }
+
+    .dynamic-table tbody tr {
+      transition: var(--transition);
+      background: white;
+    }
+
+    .dynamic-table tbody tr:hover {
+      background: linear-gradient(90deg, #f0f9ff 0%, #e0f2fe 50%, #f0f9ff 100%);
+      transform: scale(1.002);
+    }
+
+    .dynamic-table tbody tr:last-child td {
+      border-bottom: none;
+    }
+
+    /* Nested section styles for grouped data */
+    .nested-section {
+      margin: 16px 0;
+      padding: 16px;
+      background: linear-gradient(135deg, #f8fafc 0%, #f1f5f9 100%);
+      border-radius: var(--radius-sm);
+      border-left: 4px solid var(--primary-color);
+      box-shadow: var(--shadow-sm);
+    }
+
+    .nested-section-title {
+      font-weight: 700;
+      color: #1e293b;
+      margin-bottom: 12px;
+      font-size: 15px;
+      display: flex;
+      align-items: center;
+      gap: 8px;
+    }
+
+    .nested-section-title::before {
+      content: '▸';
+      color: var(--primary-color);
+      font-weight: bold;
+    }
+
+    .nested-table {
+      margin-left: 0;
+    }
+
+    /* Alternating row colors for better readability */
+    .dynamic-table tbody tr:nth-child(even) {
+      background: #f8fafc;
+    }
+
+    .dynamic-table tbody tr:nth-child(even):hover {
+      background: linear-gradient(90deg, #e0f2fe 0%, #dbeafe 50%, #e0f2fe 100%);
+    }
+
+    /* Empty state */
+    .table-empty-state {
+      padding: 32px;
+      text-align: center;
+      color: #94a3b8;
+      font-style: italic;
+    }
+
+    /* Table header info styles */
+    .table-header-info {
+      padding: 20px;
+      background: linear-gradient(135deg, #f8fafc 0%, #f1f5f9 100%);
+      border-radius: var(--radius-sm);
+      margin-bottom: 16px;
+      border-left: 4px solid var(--primary-color);
+    }
+
+    .table-check-name {
+      font-size: 18px;
+      font-weight: 700;
+      color: #1e293b;
+      margin: 0 0 8px 0;
+    }
+
+    .table-check-id {
+      font-size: 12px;
+      color: #64748b;
+      margin: 0 0 12px 0;
+      font-weight: 600;
+      text-transform: uppercase;
+      letter-spacing: 0.5px;
+    }
+
+    .table-check-description {
+      font-size: 14px;
+      color: #475569;
+      margin: 0 0 12px 0;
+      line-height: 1.6;
+    }
+
+    .table-check-command {
+      font-size: 13px;
+      color: #475569;
+      margin: 0;
+    }
+
+    .table-check-command code {
+      background: #1e293b;
+      color: #e2e8f0;
+      padding: 4px 8px;
+      border-radius: 4px;
+      font-family: 'Fira Code', 'Consolas', monospace;
+      font-size: 12px;
+    }
+
+    .table-report-section {
+      margin-bottom: 32px;
+    }
+
+    /* Collapsible Section Styles */
+    .section-header {
+      cursor: pointer;
+      user-select: none;
+      display: flex;
+      align-items: center;
+      margin: 0;
+      padding: 10px 0;
+    }
+
+    .toggle-icon {
+      display: inline-block;
+      margin-right: 10px;
+      transition: transform 0.3s cubic-bezier(0.68, -0.55, 0.265, 1.55);
+    }
+
+    .section-header.active .toggle-icon {
+      transform: rotate(90deg);
+    }
+
+    .section-content {
+      overflow: hidden;
+      transition: max-height 0.3s ease;
+    }
+
+    .section-content.collapsed {
+      display: none;
+    }
+
+    .section-header:hover {
+      color: #0078d7;
+    }
+
+    /* Tab Styles */
+    .tabs-container {
+      margin-bottom: 20px;
+    }
+
+    .tab-navigation {
+      display: flex;
+      overflow-x: auto;
+      border-bottom: 1px solid #ccc;
+      margin-bottom: 20px;
+    }
+
+    .tab-button {
+      padding: 14px 28px;
+      background: transparent;
+      border: none;
+      border-bottom: 3px solid transparent;
+      cursor: pointer;
+      margin-right: 4px;
+      font-weight: 600;
+      transition: var(--transition);
+      color: #64748b;
+      font-size: 14px;
+      position: relative;
+    }
+
+    .tab-button::after {
+      content: '';
+      position: absolute;
+      bottom: -3px;
+      left: 50%;
+      transform: translateX(-50%) scaleX(0);
+      width: 100%;
+      height: 3px;
+      background: var(--primary-gradient);
+      transition: var(--transition);
+      border-radius: 2px 2px 0 0;
+    }
+
+    .tab-button:hover {
+      background: rgba(0, 120, 215, 0.08);
+      color: #0078d7;
+    }
+
+    .tab-button.active {
+      background: transparent;
+      color: #0078d7;
+      font-weight: 700;
+    }
+
+    .tab-button.active::after {
+      transform: translateX(-50%) scaleX(1);
+    }
+
+    .tab-content {
+      display: none;
+    }
+
+    .tab-content.active {
+      display: block;
+    }
+
+    /* Badge Styles */
+    .hostname-badge {
+      display: inline-flex;
+      align-items: center;
+      justify-content: center;
+      width: 20px;
+      height: 20px;
+      padding: 0;
+      background: #f1f5f9;
+      border-radius: 50%;
+      font-size: 11px;
+      margin-left: 8px;
+      font-weight: 800;
+      transition: var(--transition);
+      border: 2px solid transparent;
+      color: #64748b;
+    }
+
+    .hostname-badge.failed {
+      background: var(--error-gradient);
+      color: white;
+      animation: pulse 2s infinite;
+      transform: scale(1.1);
+    }
+
+    @keyframes pulse {
+      0%, 100% {
+        opacity: 1;
+      }
+      50% {
+        opacity: 0.8;
+      }
+    }
+
+    .table-check-status {
+      display: flex;
+      align-items: center;
+      gap: 12px;
+      margin-top: 8px;
+    }
+
+    .status-badge {
+      padding: 4px 12px;
+      border-radius: 12px;
+      font-size: 0.75rem;
+      font-weight: 600;
+      text-transform: uppercase;
+      letter-spacing: 0.5px;
+    }
+
+    .status-badge.status-success {
+      background-color: #d4edda;
+      color: #155724;
+      border: 1px solid #c3e6cb;
+    }
+
+    .status-badge.status-error {
+      background-color: #f8d7da;
+      color: #721c24;
+      border: 1px solid #f5c6cb;
+    }
+
+    .status-badge.status-warning {
+      background-color: #fff3cd;
+      color: #856404;
+      border: 1px solid #ffeeba;
+    }
+
+    .status-badge.status-info,
+    .status-badge.status-n\/a {
+      background-color: #d1ecf1;
+      color: #0c5460;
+      border: 1px solid #bee5eb;
+    }
+
+    .table-check-message {
+      color: #666;
+      font-size: 0.875rem;
+      font-style: italic;
+      flex: 1;
+    }
+
+    /* Skeleton Loading Styles */
+    .skeleton {
+      background: linear-gradient(90deg,
+        #f0f0f0 0%,
+        #e0e0e0 20%,
+        #f0f0f0 40%,
+        #f0f0f0 100%);
+      background-size: 200% 100%;
+      animation: skeletonLoading 1.5s ease-in-out infinite;
+      border-radius: var(--radius-sm);
+    }
+
+    .skeleton-text {
+      height: 16px;
+      margin-bottom: 8px;
+    }
+
+    .skeleton-title {
+      height: 24px;
+      width: 60%;
+      margin-bottom: 16px;
+    }
+
+    /* Scroll-triggered animations */
+    .fade-in-on-scroll {
+      opacity: 0;
+      transform: translateY(30px);
+      transition: opacity 0.6s ease-out, transform 0.6s ease-out;
+    }
+
+    .fade-in-on-scroll.visible {
+      opacity: 1;
+      transform: translateY(0);
+    }
+
+    /* Stagger delays for status count boxes */
+    .status-count:nth-child(1) { animation-delay: 0s; }
+    .status-count:nth-child(2) { animation-delay: 0.1s; }
+    .status-count:nth-child(3) { animation-delay: 0.2s; }
+    .status-count:nth-child(4) { animation-delay: 0.3s; }
+
+    /* Footer Styles */
+    .footer {
+      bottom: 0;
+      width: 100%;
+      padding: 20px;
+      text-align: center;
+      background: var(--primary-gradient);
+      color: #ffffff;
+      box-shadow: var(--shadow-lg);
+      font-size: 14px;
+      font-weight: 500;
+      letter-spacing: 0.3px;
+    }
+
+    /* Media Queries */
+    @media only screen and (max-width: 600px) {
+      .container {
+        max-width: 100%;
+        padding: 0 15px;
+      }
+
+      .navbar,
+      .footer {
+        flex-direction: column;
+        text-align: center;
+      }
+    }
+  </style>
+</head>
+
+<body>
+  <div class="navbar">
+    <div class="system-id">SAP Configuration Checks Report</div>
+  </div>
+  <div class="main-content">
+    <div class="container">
+      <div class="left-bar">
+        <div class="system-info-container">
+          <h2 class="system-info-heading">System Information</h2>
+          <div class="system-info-columns">
+            <div class="system-info-column">
+              <p>
+                <strong>SAP SID:</strong> {{ system_info.sap_sid }}
+              </p>
+              <p>
+                <strong>DB SID:</strong> {{ system_info.db_sid }}
+              </p>
+            </div>
+            <div class="system-info-column">
+              <p>
+                <strong>DB Type:</strong> {{ system_info.db_type }}
+              </p>
+              <p>
+                <strong>Storage Type:</strong> {{ system_info.storage_type }}
+              </p>
+            </div>
+            <div class="system-info-column">
+              <p>
+                <strong>Total Checks:</strong> {{ test_case_results|rejectattr('status', 'equalto',
+                'SKIPPED')|list|length }}
+              </p>
+            </div>
+          </div>
+          <p>
+            <strong>Hostnames:</strong> {{ system_info.hostnames|join(', ') }}
+          </p>
+        </div>
+        <div class="system-info-container">
+          <h2 class="system-info-heading">Configuration Checks Summary</h2>
+          <div class="summary-box">
+            <div class="status-count passed" onclick="filterByStatus('passed')" data-status="passed">
+              <h3>{{ test_case_results|selectattr('status', 'equalto', 'PASSED')|list|length }}</h3>
+              <p>Passed</p>
+            </div>
+            <div class="status-count error" onclick="filterByStatus('error')" data-status="error">
+              <h3>{{ test_case_results|selectattr('status', 'equalto', 'FAILED')|list|length }}</h3>
+              <p>Error</p>
+            </div>
+            <div class="status-count warning" onclick="filterByStatus('warning')" data-status="warning">
+              <h3>{{ test_case_results|selectattr('status', 'equalto', 'WARNING')|list|length }}</h3>
+              <p>Warning</p>
+            </div>
+            <div class="status-count info" onclick="filterByStatus('info')" data-status="info">
+              <h3>{{ test_case_results|selectattr('status', 'equalto', 'INFO')|list|length }}</h3>
+              <p>Info</p>
+            </div>
+          </div>
+        </div>
+        <div class="config-checks-container">
+
+          <div class="tab-navigation">
+            {% for hostname in system_info.hostnames %}
+            {% set host_checks = test_case_results|selectattr('hostname', 'equalto', hostname)|rejectattr('status',
+            'equalto', 'SKIPPED')|list %}
+            {% set error_count = host_checks|selectattr('status', 'equalto', 'FAILED')|list|length %}
+            {% set no_error_count = host_checks|rejectattr('status', 'equalto', 'FAILED')|list|length %}
+            <button class="tab-button {% if loop.first %}active{% endif %}" onclick="openTab('host-{{ hostname }}')">
+              {{ hostname }}
+              <span class="hostname-badge {% if error_count > 0 %}failed{% endif %}">{{ error_count }}</span>
+            </button>
+            {% endfor %}
+          </div>
+
+          <div class="tabs-container">
+            {% for hostname in system_info.hostnames %}
+            <div id="host-{{ hostname }}" class="tab-content {% if loop.first %}active{% endif %}">
+              {% for check_type in system_info.config_check_types|default([]) %}
+              {% set type_checks = test_case_results|selectattr('hostname', 'equalto', hostname)|
+              selectattr('check.category', 'defined')|
+              selectattr('check.category', 'equalto', check_type)|
+              rejectattr('status', 'equalto', 'SKIPPED')|list %}
+              {% if type_checks|length > 0 %}
+              <h3>{{ check_type }}</h3>
+              
+              {% set type_regular_checks = type_checks|selectattr('check.report', 'equalto', 'check')|list %}
+              {% if type_regular_checks|length > 0 %}
+              <table class="config-checks-table">
+                <thead>
+                  <tr>
+                    <th>ID</th>
+                    <th>Name</th>
+                    <th>Output</th>
+                    <th>Expected</th>
+                    <th>Status</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  {% for check in type_regular_checks %}
+                  <tr onclick="toggleDetails('{{ check.hostname }}-{{ check.check.id }}')">
+                    <td>{{ check.check.id }}</td>
+                    <td>{{ check.check.name }}</td>
+                    <td>{{ check.actual_value|truncate(40) }}</td>
+                    <td>{{ check.expected_value }}</td>
+                    <td class="status-{{ check.status|lower }}">{{ check.status }}</td>
+                  </tr>
+                  <tr id="details-{{ check.hostname }}-{{ check.check.id }}" class="expanded-content">
+                    <td colspan="6">
+                      <div class="expanded-content-inner">
+                        <div class="detail-row">
+                          <div class="detail-label">Description:</div>
+                          <div>{{ check.check.description }}</div>
+                        </div>
+                        <div class="detail-row">
+                          <div class="detail-label">Collector Type:</div>
+                          <div>
+                            {{ check.check.collector_type|default('') }}</code>
+                          </div>
+                        </div>
+                        {% if check.check.collector_args.command is defined %}
+                        <div class="detail-row">
+                          <div class="detail-label">Command:</div>
+                          <div>
+                            {{ check.check.collector_args.command|default('') }}</code>
+                          </div>
+                        </div>
+                        {% endif %}
+                        {% if check.expected_value is defined %}
+                        <div class="detail-row">
+                          <div class="detail-label">Expected Output:</div>
+                          <div>{{ check.expected_value|default('') }}</div>
+                        </div>
+                        {% endif %}
+                        <div class="detail-row">
+                          <div class="detail-label">Actual Value:</div>
+                          {{ check.actual_value|default('') }}</code>
+                        </div>
+                        <div class="detail-row">
+                          <div class="detail-label">Execution Time:</div>
+                          <div>{{ check.execution_time|default('') }}</div>
+                        </div>
+
+                        {% if check.check.references is defined and check.check.references.microsoft|default('') or
+                        check.check.references.sap|default('') or check.check.references.remediation|default('') or
+                        check.check.references.other|default('') %}
+                        <div class="references-section">
+                          <h4>References</h4>
+                          {% if check.check.references.microsoft|default('') %}
+                          <div class="detail-row">
+                            <div class="detail-label">Microsoft:</div>
+                            <div><a href="{{ check.check.references.microsoft|default('') }}" target="_blank">Microsoft
+                                Docs</a></div>
+                          </div>
+                          {% endif %}
+
+                          {% if check.check.references.sap|default('') %}
+                          <div class="detail-row">
+                            <div class="detail-label">SAP:</div>
+                            <div><a href="https://me.sap.com/notes/{{ check.check.references.sap|default('') }}"
+                                target="_blank">Note</a>
+                            </div>
+                          </div>
+                          {% endif %}
+
+                          {% if check.check.references.remediation|default('') %}
+                          <div class="detail-row">
+                            <div class="detail-label">Remediation:</div>
+                            <div>{{ check.check.references.remediation|default('') }}</div>
+                          </div>
+                          {% endif %}
+
+                          {% if check.check.references.other|default('') %}
+                          <div class="detail-row">
+                            <div class="detail-label">Other:</div>
+                            <div><a href="{{ check.check.references.other|default('') }}" target="_blank">Other
+                                Reference</a></div>
+                          </div>
+                          {% endif %}
+                        </div>
+                        {% endif %}
+                      </div>
+                    </td>
+                  </tr>
+                  {% endfor %}
+                </tbody>
+              </table>
+              {% endif %}
+              
+              {% set type_table_checks = type_checks|selectattr('check.report', 'equalto', 'table')|list %}
+              {% if type_table_checks|length > 0 %}
+              {% for check in type_table_checks %}
+              <div class="config-section table-report-section">
+                <h4 class="table-check-name">{{ check.check.name }} ({{ check.check.id }})</h4>
+                <p class="table-check-description">{{ check.check.description }}</p>
+                {% if check.check.collector_args.command is defined %}
+                <p class="table-check-command">
+                  <strong>Command:</strong> <code>{{ check.check.collector_args.command }}</code>
+                </p>
+                {% endif %}
+                <div class="dynamic-table-container">
+                  {{ render_table(check.actual_value) }}
+                </div>
+              </div>
+              {% endfor %}
+              {% endif %}
+              
+              {% endif %}
+              {% endfor %}
+
+              {% set host_sections = test_case_results|selectattr('hostname', 'equalto',
+              hostname)|selectattr('check.report', 'equalto', 'section')|rejectattr('status', 'equalto', 'SKIPPED')|list
+              %}
+              {% if host_sections|length > 0 %}
+              <h3>Detailed Output Reports</h3>
+              {% for check in host_sections %}
+              <div class="config-section">
+                <h4 class="section-header" onclick="toggleSection('section-{{ check.hostname }}-{{ check.check.id }}')">
+                  <span class="toggle-icon">+</span> {{ check.check.name }} ({{ check.check.id }})</h4>
+                <div id="section-{{ check.hostname }}-{{ check.check.id }}" class="section-content collapsed">
+                  <p>
+                    <strong>Description:</strong> {{ check.check.description }}
+                  </p>
+                  <p>
+                    <strong>Command:</strong> <code>{{ check.check.collector_args.command|default('') }}</code>
+                  </p>
+                  <p>
+                    <strong>Output:</strong>
+                  </p>
+                  <pre>{{ check.actual_value }}</pre>
+                </div>
+              </div>
+              {% endfor %}
+              {% endif %}
+            </div>
+            {% endfor %}
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="footer">Report generated on: {{ report_generation_time }}</div>
+  <script>
+    function toggleDetails(checkId) {
+      const detailsRow = document.getElementById('details-' + checkId)
+      if (detailsRow.style.display === 'table-row') {
+        detailsRow.classList.remove('show')
+        setTimeout(() => {
+          detailsRow.style.display = 'none'
+        }, 300)
+      } else {
+        const expandedRows = document.querySelectorAll('.expanded-content')
+        expandedRows.forEach((row) => {
+          row.classList.remove('show')
+          row.style.display = 'none'
+        })
+        detailsRow.style.display = 'table-row'
+        setTimeout(() => {
+          detailsRow.classList.add('show')
+        }, 10)
+      }
+    }
+
+    function toggleSection(sectionId) {
+      const sectionContent = document.getElementById(sectionId)
+      if (!sectionContent) return
+
+      const sectionHeader = sectionContent.previousElementSibling
+      const toggleIcon = sectionHeader.querySelector('.toggle-icon')
+
+      if (sectionContent.classList.contains('collapsed')) {
+        sectionContent.classList.remove('collapsed')
+        sectionHeader.classList.add('active')
+        toggleIcon.textContent = '-'
+      } else {
+        sectionContent.classList.add('collapsed')
+        sectionHeader.classList.remove('active')
+        toggleIcon.textContent = '+'
+      }
+    }
+
+    function openTab(tabId) {
+      const tabContents = document.querySelectorAll('.tab-content')
+      tabContents.forEach((tab) => tab.classList.remove('active'))
+
+      const tabButtons = document.querySelectorAll('.tab-button')
+      tabButtons.forEach((button) => button.classList.remove('active'))
+
+      document.getElementById(tabId).classList.add('active')
+      event.currentTarget.classList.add('active')
+    }
+
+    document.addEventListener('DOMContentLoaded', function () {
+      const expandedRows = document.querySelectorAll('.expanded-content')
+      expandedRows.forEach((row) => (row.style.display = 'none'))
+
+      const sectionContents = document.querySelectorAll('.section-content')
+      sectionContents.forEach((section) => {
+        section.classList.add('collapsed')
+      })
+
+      const firstTab = document.querySelector('.tab-content')
+      if (firstTab) firstTab.classList.add('active')
+
+      const firstButton = document.querySelector('.tab-button')
+      if (firstButton) firstButton.classList.add('active')
+
+      const observerOptions = {
+        threshold: 0.1,
+        rootMargin: '0px 0px -50px 0px'
+      }
+
+      const observer = new IntersectionObserver((entries) => {
+        entries.forEach(entry => {
+          if (entry.isIntersecting) {
+            entry.target.classList.add('visible')
+            observer.unobserve(entry.target)
+          }
+        })
+      }, observerOptions)
+
+      // Observe elements that should fade in on scroll
+      document.querySelectorAll('.fade-in-on-scroll').forEach(el => {
+        observer.observe(el)
+      })
+
+      const counters = document.querySelectorAll('.status-count h3')
+      counters.forEach(counter => {
+        const target = parseInt(counter.innerText)
+        if (isNaN(target)) return
+
+        const duration = 1000
+        const increment = target / (duration / 16)
+        let current = 0
+
+        const updateCounter = () => {
+          current += increment
+          if (current < target) {
+            counter.innerText = Math.ceil(current)
+            requestAnimationFrame(updateCounter)
+          } else {
+            counter.innerText = target
+          }
+        }
+
+        setTimeout(() => {
+          counter.innerText = '0'
+          updateCounter()
+        }, 300)
+      })
+    })
+
+    let activeFilter = null
+
+    function filterByStatus(status) {
+      const statusBoxes = document.querySelectorAll('.status-count')
+      const allRows = document.querySelectorAll('.config-checks-table tbody tr:not(.expanded-content)')
+      if (activeFilter === status) {
+        activeFilter = null
+        statusBoxes.forEach(box => box.classList.remove('active'))
+        allRows.forEach(row => {
+          row.style.display = ''
+        })
+        return
+      }
+      activeFilter = status
+
+      statusBoxes.forEach(box => {
+        if (box.dataset.status === status) {
+          box.classList.add('active')
+        } else {
+          box.classList.remove('active')
+        }
+      })
+
+      // Filter table rows
+      allRows.forEach(row => {
+        const statusCell = row.querySelector('td:nth-child(5)')
+        if (!statusCell) {
+          row.style.display = 'none'
+          return
+        }
+
+        const rowStatus = statusCell.textContent.toLowerCase().trim()
+        let mappedStatus = rowStatus
+        if (rowStatus === 'failed') {
+          mappedStatus = 'error'
+        } else if (rowStatus === 'ok' || rowStatus === 'passed') {
+          mappedStatus = 'passed'
+        }
+
+        if (mappedStatus === status) {
+          row.style.display = ''
+        } else {
+          row.style.display = 'none'
+          const detailsId = row.getAttribute('onclick')?.match(/toggleDetails\('([^']+)'\)/)?.[1]
+          if (detailsId) {
+            const detailsRow = document.getElementById('details-' + detailsId)
+            if (detailsRow) {
+              detailsRow.style.display = 'none'
+              detailsRow.classList.remove('show')
+            }
+          }
+        }
+      })
+    }
+  </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/src/vars/input-api.yaml b/src/vars/input-api.yaml
index 0b535dfb..8b591169 100644
--- a/src/vars/input-api.yaml
+++ b/src/vars/input-api.yaml
@@ -11,6 +11,21 @@ sap_functional_test_type_map:
   - name:                           "CentralServicesHighAvailability"
     value:                          HA_SCS
 
+configuration_test_type_map:
+  - name:                           "CentralServiceInstances"
+    value:                          ascs
+  - name:                           "Database"
+    value:                          database
+  - name:                           "ApplicationInstances"
+    value:                          application
+  - name:                           "WebDispatcherInstances"
+    value:                          webdispatcher
+  - name:                           "ObserverInstances"
+    value:                          observer
+  - name:                           "all"
+    value:                          all
+
+
 test_groups:
   - name:                           HA_DB_HANA
     test_cases:
diff --git a/vars.yaml b/vars.yaml
index d18d38f9..c177c393 100644
--- a/vars.yaml
+++ b/vars.yaml
@@ -4,12 +4,13 @@
 
 # Input parameters for executing the SAP Functional Tests:
 # SAP Functional Test Type
-# Options: SAPFunctionalTests
+# Options: SAPFunctionalTests, ConfigurationChecks
 TEST_TYPE:                  SAPFunctionalTests
 
 # SAP Functional Test Tier
 # Options: Database High Availability, Central Services High Availability
-sap_functional_test_type:   DatabaseHighAvailability
+# Not required if TEST_TYPE is ConfigurationChecks
+SAP_FUNCTIONAL_TEST_TYPE:   DatabaseHighAvailability
 
 # SAP System Configuration
 # String: Name of the SAP system configuration to be tested (Location: WORKSPACES/SYSTEM/DEV-WEEU-SAP01-X00 directory)

From 574052f5d610f3e56a9940a80dbd76c21d8c9b11 Mon Sep 17 00:00:00 2001
From: devanshjain <devanshjain@microsoft.com>
Date: Tue, 14 Oct 2025 05:03:03 +0000
Subject: [PATCH 02/12] Refactor playbook name determination and update
 configuration checks for improved clarity and functionality

---
 scripts/sap_automation_qa.sh                  | 66 +++++++++++--------
 .../configuration_checks/tasks/disks.yml      |  9 ++-
 .../configuration_checks/tasks/files/ascs.yml | 16 ++---
 .../configuration_checks/tasks/files/hana.yml | 38 +++++------
 .../tasks/files/virtual_machine.yml           |  2 +-
 5 files changed, 74 insertions(+), 57 deletions(-)

diff --git a/scripts/sap_automation_qa.sh b/scripts/sap_automation_qa.sh
index 034d5636..1e972b51 100755
--- a/scripts/sap_automation_qa.sh
+++ b/scripts/sap_automation_qa.sh
@@ -194,37 +194,49 @@ extract_error_message() {
     echo "$extracted_message"
 }
 
-# Determine the playbook name based on the SAP_FUNCTIONAL_TEST_TYPE.
-# :param test_type: The type of SAP functional test.
+# Determine the playbook name based on TEST_TYPE and SAP_FUNCTIONAL_TEST_TYPE.
+# :param test_type: The overall test type (e.g., "SAPFunctionalTests", "ConfigurationChecks").
+# :param sap_functional_test_type: The specific SAP functional test type (e.g., "DatabaseHighAvailability", "CentralServicesHighAvailability").
 # :param offline_mode: Whether to use offline mode (optional).
 # :return: The name of the playbook.
 get_playbook_name() {
     local test_type=$1
-    local offline_mode=${2:-""}
+    local sap_functional_test_type=$2
+    local offline_mode=${3:-""}
 
-    case "$test_type" in
-        "DatabaseHighAvailability")
-            if [[ "$offline_mode" == "true" ]]; then
-                echo "playbook_01_ha_offline_tests"
-            else
-                echo "playbook_00_ha_db_functional_tests"
-            fi
-            ;;
-        "CentralServicesHighAvailability")
-            if [[ "$offline_mode" == "true" ]]; then
-                echo "playbook_01_ha_offline_tests"
-            else
-                echo "playbook_00_ha_scs_functional_tests"
-            fi
-            ;;
-        "ConfigurationChecks")
-            echo "playbook_00_configuration_checks"
-            ;;
-        *)
-            log "ERROR" "Unknown SAP_FUNCTIONAL_TEST_TYPE: $test_type"
-            exit 1
-            ;;
-    esac
+    if [[ "$test_type" == "ConfigurationChecks" ]]; then
+        echo "playbook_00_configuration_checks"
+        return
+    fi
+
+    if [[ "$test_type" == "SAPFunctionalTests" ]]; then
+        case "$sap_functional_test_type" in
+            "DatabaseHighAvailability")
+                if [[ "$offline_mode" == "true" ]]; then
+                    echo "playbook_01_ha_offline_tests"
+                else
+                    echo "playbook_00_ha_db_functional_tests"
+                fi
+                ;;
+            "CentralServicesHighAvailability")
+                if [[ "$offline_mode" == "true" ]]; then
+                    echo "playbook_01_ha_offline_tests"
+                else
+                    echo "playbook_00_ha_scs_functional_tests"
+                fi
+                ;;
+            "ConfigurationChecks")
+                echo "playbook_00_configuration_checks"
+                ;;
+            *)
+                log "ERROR" "Unknown SAP_FUNCTIONAL_TEST_TYPE: $sap_functional_test_type"
+                exit 1
+                ;;
+        esac
+        return
+    fi
+    log "ERROR" "Unknown TEST_TYPE: $test_type. Expected 'SAPFunctionalTests' or 'ConfigurationCheck'"
+    exit 1
 }
 
 # Generate filtered test configuration as JSON for Ansible extra vars
@@ -527,7 +539,7 @@ main() {
         log "INFO" "Found $cib_files CIB file(s) for offline analysis"
     fi
 
-    playbook_name=$(get_playbook_name "$SAP_FUNCTIONAL_TEST_TYPE" "$OFFLINE_MODE")
+    playbook_name=$(get_playbook_name "$TEST_TYPE" "$SAP_FUNCTIONAL_TEST_TYPE" "$OFFLINE_MODE")
     log "INFO" "Using playbook: $playbook_name."
 
     run_ansible_playbook "$playbook_name" "$SYSTEM_HOSTS" "$SYSTEM_PARAMS" "$AUTHENTICATION_TYPE" "$SYSTEM_CONFIG_FOLDER"
diff --git a/src/roles/configuration_checks/tasks/disks.yml b/src/roles/configuration_checks/tasks/disks.yml
index ec75facd..7e380fe4 100644
--- a/src/roles/configuration_checks/tasks/disks.yml
+++ b/src/roles/configuration_checks/tasks/disks.yml
@@ -41,6 +41,7 @@
 
     - name:                             Collect device-to-lun mapping from Azure symlinks
       ansible.builtin.shell:
+        executable:                     /bin/bash
         cmd: |
                                         set -o pipefail
                                         for lun_link in /dev/disk/azure/scsi1/lun*; do
@@ -100,7 +101,9 @@
       when:                             NFS_provider is defined and 'ANF' in NFS_provider and ANF_account_rg is defined and ANF_account_name is defined
       register:                         anf_storage_metadata_results
       delegate_to:                      localhost
-      ansible.builtin.shell: |
+      ansible.builtin.shell:
+        executable:                     /bin/bash
+        cmd: |
                                         set -o pipefail
                                         printf "["
                                         first=true
@@ -144,7 +147,9 @@
       when:                             NFS_provider is defined and 'AFS' in NFS_provider
       register:                         afs_storage_metadata_results
       delegate_to:                      localhost
-      ansible.builtin.shell: |
+      ansible.builtin.shell:
+        executable:                     /bin/bash
+        cmd: |
                                         set -o pipefail
                                         for sa in $(az storage account list \
                                           --query "[?kind=='FileStorage'].{rg:resourceGroup,name:name,id:id}" \
diff --git a/src/roles/configuration_checks/tasks/files/ascs.yml b/src/roles/configuration_checks/tasks/files/ascs.yml
index ae6360f0..680b345a 100644
--- a/src/roles/configuration_checks/tasks/files/ascs.yml
+++ b/src/roles/configuration_checks/tasks/files/ascs.yml
@@ -92,14 +92,14 @@ checks:
     severity:                           *high
     workload:                           *sap
     applicability:
-      - os_type:                        [*suse, *redhat]
-      - os_version:                     *all_versions
-      - hardware_type:                  *vm
-      - storage_type:                   *all_storage
-      - role:                           [*ascs_role, *db_role]
-      - database_type:                  *db
-      - high_availability:              true
-      - high_availability_agent:        *cluster_type
+      os_type:                        [*suse, *redhat]
+      os_version:                     *all_versions
+      hardware_type:                  *vm
+      storage_type:                   *all_storage
+      role:                           [*ascs_role, *db_role]
+      database_type:                  *db
+      high_availability:              true
+      high_availability_agent:        *cluster_type
     collector_type:                     *command
     collector_args:
       command:                          "/sbin/sysctl net.ipv4.tcp_timestamps -n"
diff --git a/src/roles/configuration_checks/tasks/files/hana.yml b/src/roles/configuration_checks/tasks/files/hana.yml
index 9690d320..7a866521 100644
--- a/src/roles/configuration_checks/tasks/files/hana.yml
+++ b/src/roles/configuration_checks/tasks/files/hana.yml
@@ -829,7 +829,7 @@ checks:
     references:
       sap:                              "1999997"
 
-  - id:                                 DB-HANA-0033
+  - id:                                 "DB-HANA-0033"
     name:                               "Filesystem type for /hana/data"
     description:                        "The filesystem type for /hana/data should be xfs or nfs or nfs4"
     category:                           *sap_check
@@ -853,7 +853,7 @@ checks:
     references:
       sap:                              "2972496"
 
-  - id:                                 DB-HANA-0034
+  - id:                                 "DB-HANA-0034"
     name:                               "Stripe size for /hana/data"
     description:                        "The stripe size for /hana/data should be 256k (256.00k or 262144 bytes)"
     category:                           *sap_check
@@ -879,7 +879,7 @@ checks:
       sap:                              "2972496"
       microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/hana-vm-operations-storage"
 
-  - id:                                 DB-HANA-0035
+  - id:                                 "DB-HANA-0035"
     name:                               "Filesystem type for /hana/log"
     description:                        "The filesystem type for /hana/log should be xfs or nfs or nfs4"
     category:                           *sap_check
@@ -903,7 +903,7 @@ checks:
     references:
       sap:                              "2972496"
 
-  - id:                                 DB-HANA-0036
+  - id:                                 "DB-HANA-0036"
     name:                               "Stripe size for /hana/log"
     description:                        "The stripe size for /hana/log should be 256k (256.00k or 262144 bytes)"
     category:                           *sap_check
@@ -929,7 +929,7 @@ checks:
       sap:                              "2972496"
       microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/hana-vm-operations-storage"
 
-  - id:                                 DB-HANA-0037
+  - id:                                 "DB-HANA-0037"
     name:                               "Filesystem type for /hana/shared"
     description:                        "The filesystem type for /hana/shared should be xfs or nfs or nfs4"
     category:                           *sap_check
@@ -953,7 +953,7 @@ checks:
     references:
       sap:                              "2972496"
 
-  - id:                                 DB-HANA-0038
+  - id:                                 "DB-HANA-0038"
     name:                               "Filesystem type for /usr/sap"
     description:                        "The filesystem type for /usr/sap should be xfs or nfs or nfs4"
     category:                           *sap_check
@@ -977,7 +977,7 @@ checks:
     references:
       sap:                              "2972496"
 
-  - id:                                 DB-HANA-0039
+  - id:                                 "DB-HANA-0039"
     name:                               "Sector size for /hana/data Premium SSD V2"
     description:                        "The logical block size for /hana/data on Premium SSD V2 should be 4096 bytes"
     category:                           *sap_check
@@ -1001,7 +1001,7 @@ checks:
     references:
       sap:                              "2972496"
 
-  - id:                                 DB-HANA-0040
+  - id:                                 "DB-HANA-0040"
     name:                               "Sector size for /hana/log Premium SSD V2"
     description:                        "The logical block size for /hana/log on Premium SSD V2 should be 4096 bytes"
     category:                           *sap_check
@@ -1025,7 +1025,7 @@ checks:
     references:
       sap:                              "2972496"
 
-  - id:                                 DB-HANA-0041
+  - id:                                 "DB-HANA-0041"
     name:                               "Disk performance for /hana/data (MBPS)"
     description:                        "The disk performance for /hana/data should be >= 400 MByte/s"
     category:                           *sap_check
@@ -1051,7 +1051,7 @@ checks:
       sap:                              "2972496"
       microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/hana-vm-operations-storage"
 
-  - id:                                 DB-HANA-0042
+  - id:                                 "DB-HANA-0042"
     name:                               "Disk performance for /hana/data (IOPS)"
     description:                        "The disk performance for /hana/data should be >= 7000 IOPS"
     category:                           *sap_check
@@ -1077,7 +1077,7 @@ checks:
       sap:                              "2972496"
       microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/hana-vm-operations-storage"
 
-  - id:                                 DB-HANA-0043
+  - id:                                 "DB-HANA-0043"
     name:                               "Disk performance for /hana/log (MBPS)"
     description:                        "The disk performance for /hana/log should be >= 250 MByte/s"
     category:                           *sap_check
@@ -1103,7 +1103,7 @@ checks:
       sap:                              "2972496"
       microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/hana-vm-operations-storage"
 
-  - id:                                 DB-HANA-0044
+  - id:                                 "DB-HANA-0044"
     name:                               "Disk performance for /hana/log (IOPS)"
     description:                        "The disk performance for /hana/log should be >= 7000 IOPS"
     category:                           *sap_check
@@ -1129,7 +1129,7 @@ checks:
       sap:                              "2972496"
       microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/hana-vm-operations-storage"
 
-  - id:                                 DB-HANA-0045
+  - id:                                 "DB-HANA-0045"
     name:                               "Filesystem Mount Points"
     description:                        "Lists all mounted filesystems and their types to ensure SAP HANA directories are configured with supported filesystems."
     category:                           *sap_check
@@ -1150,7 +1150,7 @@ checks:
       sap:                              "2972496"
       microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/hana-vm-operations-storage"
 
-  - id:                                 DB-HANA-0046
+  - id:                                 "DB-HANA-0046"
     name:                               "Azure Disks"
     description:                        "Lists all attached Azure disks to ensure SAP HANA directories are configured with supported disks."
     category:                           *sap_check
@@ -1171,7 +1171,7 @@ checks:
       sap:                              "2972496"
       microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/hana-vm-operations-storage"
 
-  - id:                                 DB-HANA-0047
+  - id:                                 "DB-HANA-0047"
     name:                               "LVM Groups"
     description:                        "Lists all LVM groups to ensure SAP HANA directories are configured with supported LVM configurations."
     category:                           *sap_check
@@ -1192,7 +1192,7 @@ checks:
       sap:                              "2972496"
       microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/hana-vm-operations-storage"
 
-  - id:                                 DB-HANA-0048
+  - id:                                 "DB-HANA-0048"
     name:                               "LVM Volumes"
     description:                        "Lists all LVM volumes to ensure SAP HANA directories are configured with supported LVM configurations."
     category:                           *sap_check
@@ -1213,7 +1213,7 @@ checks:
       sap:                              "2972496"
       microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/hana-vm-operations-storage"
 
-  - id:                                 DB-HANA-0049
+  - id:                                 "DB-HANA-0049"
     name:                               "ANF Volumes"
     description:                        "Lists all ANF volumes to ensure SAP HANA directories are configured with supported ANF configurations."
     category:                           *sap_check
@@ -1234,7 +1234,7 @@ checks:
       sap:                              "2972496"
       microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/hana-vm-operations-storage"
 
-  - id:                                 DB-HANA-0050
+  - id:                                 "DB-HANA-0050"
     name:                               "Disk performance for /hana/data (MBPS)"
     description:                        "The disk performance for /hana/data should be >= 400 MByte/s"
     category:                           *sap_check
@@ -1260,7 +1260,7 @@ checks:
       sap:                              "2972496"
       microsoft:                        "https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/hana-vm-operations-storage"
 
-  - id:                                 DB-HANA-0051
+  - id:                                 "DB-HANA-0051"
     name:                               "Disk performance for /hana/data (MBPS)"
     description:                        "The disk performance for /hana/data should be >= 400 MByte/s"
     category:                           *sap_check
diff --git a/src/roles/configuration_checks/tasks/files/virtual_machine.yml b/src/roles/configuration_checks/tasks/files/virtual_machine.yml
index 56068fbb..671517a3 100644
--- a/src/roles/configuration_checks/tasks/files/virtual_machine.yml
+++ b/src/roles/configuration_checks/tasks/files/virtual_machine.yml
@@ -884,7 +884,7 @@ checks:
     report:                           *check
 
 
-  - id:                               "IC-0039"
+  - id:                               "IC-0040"
     name:                             "Cluster Configuration"
     description:                      "Checks the cluster configuration of the system"
     category:                         *sap_check

From a1cc3deb56de75a5e97c55f4eac664c007726b5b Mon Sep 17 00:00:00 2001
From: devanshjain <devanshjain@microsoft.com>
Date: Tue, 14 Oct 2025 05:07:43 +0000
Subject: [PATCH 03/12] Refactor conditional statements for improved
 readability in disk and main configuration checks

---
 src/roles/configuration_checks/tasks/disks.yml | 6 +++++-
 src/roles/configuration_checks/tasks/main.yml  | 6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/roles/configuration_checks/tasks/disks.yml b/src/roles/configuration_checks/tasks/disks.yml
index 7e380fe4..036bec4b 100644
--- a/src/roles/configuration_checks/tasks/disks.yml
+++ b/src/roles/configuration_checks/tasks/disks.yml
@@ -98,7 +98,11 @@
         verbosity:                      1
 
     - name:                             Collect ANF storage data if NFS is used
-      when:                             NFS_provider is defined and 'ANF' in NFS_provider and ANF_account_rg is defined and ANF_account_name is defined
+      when:
+                                        - NFS_provider is defined
+                                        - "'ANF' in NFS_provider"
+                                        - ANF_account_rg is defined
+                                        - ANF_account_name is defined
       register:                         anf_storage_metadata_results
       delegate_to:                      localhost
       ansible.builtin.shell:
diff --git a/src/roles/configuration_checks/tasks/main.yml b/src/roles/configuration_checks/tasks/main.yml
index 56c84a10..c0f2fa6e 100644
--- a/src/roles/configuration_checks/tasks/main.yml
+++ b/src/roles/configuration_checks/tasks/main.yml
@@ -45,9 +45,9 @@
 
 - name:                             "{{ check_type.name }} - Execute HA and Load Balancer module when high_availability checks to be run"
   ansible.builtin.include_tasks:    ha_modules.yml
-  when:                             >-
-                                    check_type.file_name == "high_availability" and
-                                    role in ['SCS', 'ERS', 'DB']
+  when:
+                                    - check_type.file_name == "high_availability"
+                                    - role in ['SCS', 'ERS', 'DB']
 
 - name:                             "{{ check_type.name }} - Prepare system context information"
   ansible.builtin.set_fact:

From 88ba96584a6c6b92708894de0c1662d9c8e45575 Mon Sep 17 00:00:00 2001
From: devanshjain <devanshjain@microsoft.com>
Date: Tue, 14 Oct 2025 05:35:54 +0000
Subject: [PATCH 04/12] Refactor conditional statements for improved
 readability in configuration checks

---
 .../configuration_checks/tasks/disks.yml      | 16 +++++++++----
 src/roles/configuration_checks/tasks/main.yml | 24 ++++++++++++++-----
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/src/roles/configuration_checks/tasks/disks.yml b/src/roles/configuration_checks/tasks/disks.yml
index 036bec4b..603afc30 100644
--- a/src/roles/configuration_checks/tasks/disks.yml
+++ b/src/roles/configuration_checks/tasks/disks.yml
@@ -63,7 +63,9 @@
                                           | map('split', ':')
                                           | map('list'))
                                         }}
-      when:                             device_lun_mapping_raw is defined and device_lun_mapping_raw.stdout_lines | length > 0
+      when:
+                                        - device_lun_mapping_raw is defined
+                                        - device_lun_mapping_raw.stdout_lines | length > 0
 
     - name:                             Set empty device_lun_map if no mapping found
       ansible.builtin.set_fact:
@@ -76,12 +78,16 @@
         verbosity:                      1
 
     - name:                             Extract disk names
-      when:                             disks_metadata is not failed and disks_metadata.json is defined
+      when:
+                                        - disks_metadata is not failed
+                                        - disks_metadata.json is defined
       ansible.builtin.set_fact:
         azure_disk_names:               "{{ disks_metadata.json | map(attribute='name') | list }}"
 
     - name:                             Collect detailed azure disks data (loop per disk defined in azure_disk_names)
-      when:                             azure_disk_names is defined and azure_disk_names | length > 0
+      when:
+                                        - azure_disk_names is defined
+                                        - azure_disk_names | length > 0
       register:                         azure_disks_metadata_results
       loop:                             "{{ azure_disk_names }}"
       delegate_to:                      localhost
@@ -148,7 +154,9 @@
         verbosity:                      1
 
     - name:                             Collect AFS storage data if NFS is used
-      when:                             NFS_provider is defined and 'AFS' in NFS_provider
+      when:
+                                        - NFS_provider is defined
+                                        - "'AFS' in NFS_provider"
       register:                         afs_storage_metadata_results
       delegate_to:                      localhost
       ansible.builtin.shell:
diff --git a/src/roles/configuration_checks/tasks/main.yml b/src/roles/configuration_checks/tasks/main.yml
index c0f2fa6e..be9623fb 100644
--- a/src/roles/configuration_checks/tasks/main.yml
+++ b/src/roles/configuration_checks/tasks/main.yml
@@ -124,7 +124,9 @@
   when:                             command_checks is defined or azure_checks is defined or module_checks is defined
 
 - name:                             "{{ check_type.name }} - Execute command-based configuration checks"
-  when:                             command_checks is defined and command_checks | length > 0
+  when:
+                                    - command_checks is defined
+                                    - command_checks | length > 0
   block:
     - name:                         "{{ check_type.name }} - Run command-based configuration checks"
       become:                       true
@@ -147,13 +149,17 @@
         msg:                        "Command-based configuration checks failed {{ command_check_results.msg }}"
 
 - name:                             "{{ check_type.name }} - Debug the logs from configuration check python module"
-  when:                             command_check_results is defined and command_check_results.log is defined
+  when:
+                                    - command_check_results is defined
+                                    - command_check_results.log is defined
   ansible.builtin.debug:
     msg:                            "{{ command_check_results.log }}"
     verbosity:                      1
 
 - name:                             "{{ check_type.name }} - Execute Azure-based configuration checks"
-  when:                             azure_checks is defined and azure_checks | length > 0
+  when:
+                                    - azure_checks is defined
+                                    - azure_checks | length > 0
   block:
     - name:                         Run Azure-based configuration checks
       become:                       true
@@ -177,13 +183,17 @@
         msg:                        "Azure-based configuration checks failed but continuing {{ azure_check_results.msg }}"
 
 - name:                             "{{ check_type.name }} - Debug the formatted filesystem info from configuration check python module"
-  when:                             azure_check_results is defined and azure_check_results.formatted_filesystem_info is defined
+  when:
+                                    - azure_check_results is defined
+                                    - azure_check_results.formatted_filesystem_info is defined
   ansible.builtin.debug:
     msg:                            "{{ azure_check_results.formatted_filesystem_info }}"
     verbosity:                      1
 
 - name:                             "{{ check_type.name }} - Execute module-based configuration checks"
-  when:                             module_checks is defined and module_checks | length > 0
+  when:
+                                    - module_checks is defined
+                                    - module_checks | length > 0
   block:
     - name:                         Run module-based configuration checks
       become:                       true
@@ -206,7 +216,9 @@
         msg:                        "Module-based configuration checks failed but continuing {{ module_check_results.msg }}"
 
 - name:                             "{{ check_type.name }} - Debug the module check results"
-  when:                             module_check_results is defined and module_check_results.check_results is defined
+  when:
+                                    - module_check_results is defined
+                                    - module_check_results.check_results is defined
   ansible.builtin.debug:
     msg:                            "Module checks: {{ module_check_results.check_results | length }} results"
     verbosity:                      1

From 06b2083b3564c8319ade1836d4c8425c81ec6952 Mon Sep 17 00:00:00 2001
From: devanshjain <devanshjain@microsoft.com>
Date: Tue, 14 Oct 2025 21:45:09 +0000
Subject: [PATCH 05/12] Add SAP Configuration Checks documentation and setup
 instructions

---
 docs/CONFIGURATION_CHECKS.md | 114 ++++++++++++++++
 docs/HIGH_AVAILABILITY.md    | 238 +---------------------------------
 docs/SETUP.MD                | 245 +++++++++++++++++++++++++++++++++++
 3 files changed, 363 insertions(+), 234 deletions(-)
 create mode 100644 docs/CONFIGURATION_CHECKS.md

diff --git a/docs/CONFIGURATION_CHECKS.md b/docs/CONFIGURATION_CHECKS.md
new file mode 100644
index 00000000..2ccc9b65
--- /dev/null
+++ b/docs/CONFIGURATION_CHECKS.md
@@ -0,0 +1,114 @@
+# SAP Configuration Checks
+
+## Overview
+
+SAP Configuration Checks is an integral part of the SAP Testing Automation framework, providing comprehensive validation of SAP system configurations on Azure infrastructure. This module ensures that SAP Database and SAP Central Services deployments meet enterprise requirements for compliance before entering production. This tool is designed to identify misconfigurations, deviations from best practices, and potential issues that could impact system's stability and performance.
+
+This tool is a new version of the existing [Quality Checks scripts](https://github.com/Azure/SAP-on-Azure-Scripts-and-Utilities/tree/main/QualityCheck), re-architected to provide a extensible, and maintainable solution. It leverages Python for core logic and Ansible for orchestration.
+
+## Purpose
+
+Configuration validation serves as a critical quality gate in the SAP deployment lifecycle by:
+
+- **Validating Azure Infrastructure**: Ensuring compute, storage, and network configurations align with SAP best practices
+- **Verifying SAP Parameters**: Checking critical SAP HANA and application server settings
+- **Assessing Cluster Health**: Validating Pacemaker configurations and resource constraints
+- **Ensuring Compliance**: Confirming adherence to organizational and SAP security standards
+
+## Configuration Check Categories
+
+**Azure Compute**
+- VM SKU appropriateness for SAP workloads
+- Accelerated Networking enablement
+- Availability Set/Zone configuration
+- Proximity Placement Group setup
+
+**Storage Configuration**
+- Premium SSD/Ultra Disk usage for critical paths
+- Write Accelerator for log volumes
+- Storage account redundancy settings
+- Disk caching policies
+
+**SAP HANA Configuration**
+- Memory allocation
+- System replication parameters
+
+**Pacemaker Cluster**
+- Resource agent versions and parameters
+- Fencing (STONITH) configuration
+- Resource constraints and colocation rules
+- Cluster communication settings
+
+**SAP HA Resources**
+- Virtual hostname configuration
+- File system mount options
+- Service startup ordering
+- Failover timeout values
+
+
+### 1. Setup Configuration
+
+Follow the steps (1.1 - 1.5) in [Setup Guide for SAP Testing Automation Framework](./SETUP.MD) to set up the framework on a management server.
+
+### 2. System Configuration
+
+Update the `TEST_TYPE` parameter in [`vars.yaml`](./../vars.yaml) file to `ConfigurationChecks` to enable the Configuration Checks test scenarios.
+
+Follow the steps (2.1 - 2.2) in [Setup Guide for SAP Testing Automation Framework](./SETUP.MD#2-system-configuration) to configure your system details.
+
+
+### 3. Test Execution
+
+To execute the script, run following command:
+
+```bash
+# Help option
+./scripts/sap_automation_qa.sh --help
+
+# Run all the configuration checks with default parameters
+./scripts/sap_automation_qa.sh
+
+# Run checks with verbose logging
+./scripts/sap_automation_qa.sh -vv
+
+# Run only Database (HANA) configuration checks
+./scripts/sap_automation_qa.sh --extra-vars='{"configuration_test_type":"Database"}'
+
+# Run only ASCS/ERS configuration checks
+./scripts/sap_automation_qa.sh --extra-vars='{"configuration_test_type":"CentralServiceInstances"}'
+
+# Run only Application Server configuration checks
+./scripts/sap_automation_qa.sh --extra-vars='{"configuration_test_type":"ApplicationInstances"}'
+```
+
+### 4. Viewing Test Results
+
+After the test execution completes, a detailed HTML report is generated that summarizes the PASS/FAIL status of each test case and includes detailed execution logs for every step of the automation run.
+
+**To locate and view your test report:**
+
+1. **Navigate to your SAP system’s workspace directory:**
+
+   Replace `<SYSTEM_CONFIG_NAME>` with the name of your SAP system configuration (for example, `DEV-WEEU-SAP01-X00`):
+
+   ```bash
+   cd WORKSPACES/SYSTEM/<SYSTEM_CONFIG_NAME>/quality_assurance/
+   ```
+2. **Find your report file:**
+
+   The report file is named using the following format:
+
+   ```
+   HA_{SAP_TIER}_{DATABASE_TYPE}_{OS_DISTRO_NAME}_{INVOCATION_ID}.html
+   ```
+
+   - `SAP_TIER`: The SAP tier tested (e.g., DB, SCS)
+   - `DATABASE_TYPE`: The database type (e.g., HANA)
+   - `OS_DISTRO_NAME`: The operating system distribution (e.g., SLES15SP4)
+   - `INVOCATION_ID`: A unique identifier (Group invocation ID) for the test run which is logged at the end of test execution. Find example screenshot below:
+
+      ![Test Execution Completion Screenshot](./images/execution_screenshot.png)
+
+3. **View the report**
+
+   You can open the HTML report in any web browser to review the results and logs.
\ No newline at end of file
diff --git a/docs/HIGH_AVAILABILITY.md b/docs/HIGH_AVAILABILITY.md
index 64cbedfd..11a55c07 100644
--- a/docs/HIGH_AVAILABILITY.md
+++ b/docs/HIGH_AVAILABILITY.md
@@ -40,194 +40,13 @@ pcs cluster enable --all  # for RedHat virtual machine
 
 ### 1. Setup Configuration
 
-Follow the steps in [Setup Guide for SAP Testing Automation Framework](./SETUP.MD) to set up the framework on a management server.
+Follow the steps (1.1 - 1.5) in [Setup Guide for SAP Testing Automation Framework](./SETUP.MD) to set up the framework on a management server.
 
-### 2. Configuration
+### 2. System Configuration
 
-#### 2.1. Test Environment Configuration
+Update the `TEST_TYPE` parameter in [`vars.yaml`](./../vars.yaml) file to `SAPFunctionalTests` to enable the High Availability test scenarios.
 
-2.1.1. Navigate to the root directory
-
-```bash
-cd sap-automation-qa
-```
-
-2.1.2. Update `vars.yaml` with your test parameters. This file contains the variables used in the test cases:
-
-```yaml
-# The type of test to be executed. Supported values are:
-# - SAPFunctionalTests
-TEST_TYPE: "SAPFunctionalTests"
-
-# The type of SAP functional test to be executed. Supported values are:
-# - DatabaseHighAvailability
-# - CentralServicesHighAvailability
-SAP_FUNCTIONAL_TEST_TYPE: "DatabaseHighAvailability"  # or "CentralServicesHighAvailability"
-
-# The name of the SAP system configuration for which you want to execute the test cases.
-# It would be the name of the folder under 'WORKSPACE/SYSTEM/' where it could find hosts.yaml, sap-parameters.yaml files of the SAP system configuration
-SYSTEM_CONFIG_NAME: "DEV-WEEU-SAP01-X00"
-
-# The type of authentication to be used for the telemetry data destination. Supported values are: VMPASSWORD and SSHKEY
-AUTHENTICATION_TYPE: 
-
-# The destination of the telemetry data. Supported values are:
-# - azureloganalytics
-# - azuredataexplorer (only recommended for long-term storage)
-telemetry_data_destination: "azureloganalytics"
-
-# The name of the telemetry table in the telemetry data destination.
-telemetry_table_name: "your-telemetry-table-name"
-
-# The workspace id, shared key of the Log Analytics workspace.
-laws_shared_key: "your-log-analytics-shared-key"
-laws_workspace_id: "your-log-analytics-workspace-id"
-
-# The cluster name, data ingestion URI, and client ID of the Azure Data Explorer.
-adx_cluster_fqdn: "your-adx-cluster-fqdn"
-adx_database_name: "your-adx-database-name"
-ade_client_id: "your-adx-client-id"
-```
-
-#### 2.2. System Configuration (WORKSPACES)
-
-Create your system workspace. This directory contains the configuration files specific to your SAP system, necessary for connecting to the system and executing test scenarios. The `WORKSPACE/SYSTEM/` directory holds sub-directories, each representing a different [SAP system](./WORKSPACES/SYSTEM/DEV-WEEU-SAP01-X00).
-
-```bash
-cd WORKSPACES/SYSTEM
-mkdir ENV-REGION-VNET-SID
-cd ENV-REGION-VNET-SID
-```
-
-The system workspace should include the following files, containing all necessary details about the SAP system.
-
-2.2.1. **hosts.yaml** - System [Inventory file](https://docs.ansible.com/ansible/latest/inventory_guide/intro_inventory.html) (required)
-
-This file contains the connection details for the SAP system hosts and is used as an inventory file by the Ansible framework to connect to the SAP system. You can find the inventory file in the path [hosts.yaml](../WORKSPACES/SYSTEM/DEV-WEEU-SAP01-X00/hosts.yaml).
-
-Here is an example of the hosts.yaml file format:
-
-```yaml
-X00_DB:
-  hosts:
-    hostname0:
-      ansible_host: "IP_ADDRESS0"
-      ansible_user: "USERNAME"
-      ansible_connection: "ssh"
-      connection_type: "key"
-      virtual_host: "VIRTUAL_HOSTNAME0"
-      become_user: "USERNAME1" #Username with root privilege
-      os_type: "linux"
-      vm_name: "AZURE_VM_NAME0"
-    hostname1:
-      ansible_host: "IP_ADDRESS1"
-      ansible_user: "USERNAME"
-      ansible_connection: "ssh"
-      connection_type: "key"
-      virtual_host: "VIRTUAL_HOSTNAME1"
-      become_user: "USERNAME1" #Username with root privilege
-      os_type: "linux"
-      vm_name: "AZURE_VM_NAME1"
-  vars:
-    node_tier: "hana"  # or "ers", "scs"
-```
-
-In the file:
-
-- X00 represents the SAP SID (System ID) of the SAP system, followed by the host type (e.g., DB, ASCS, PAS). You must provide the SAP SID of the system, regardless of whether you are testing Database High Availability or Central Services High Availability.
-
-The file includes the following details:
-
-- **ansible_host**: The IP address of the host.
-- **ansible_user**: The user for connecting to the host.
-- **ansible_connection**: The connection type (usually "ssh").
-- **connection_type**: The connection type, used when connecting via SSH key (not needed for password-based connections).
-- **virtual_host**: The virtual host name of the SCS/DB host.
-- **become_user**: The user with root privileges. For example, user "azureadm" must be able to change to root without password.
-- **os_type**: The operating system type (e.g., Linux or Windows).
-- **vm_name**: The computer name of the Azure VM.
-- **node_tier**: The type of node tier. Supported values: hana, ers, scs.
-
-2.2.2. **sap-parameters.yaml** - SAP Configuration (required)
-
-This file contains the SAP system configuration parameters. The parameters are used by the test scenarios to validate the system's high availability configuration. You can find the inventory file in the path [sap-parameters.yaml](../WORKSPACES/SYSTEM/DEV-WEEU-SAP01-X00/sap-parameters.yaml).
-
-Here is an example of the sap-parameters.yaml file format:
-
-```yaml
-# The SAP and Database SID of the SAP system.
-sap_sid: "your-sap-sid"
-db_sid: "your-db-sid"
-
-# Boolean indicating if the SCS and database is configured as highly available.
-scs_high_availability: true
-database_high_availability: true
-
-# The high availability configuration of the SCS and DB instance. Supported values are:
-# - AFA (for Azure Fencing Agent)
-# - ISCSI (for SBD devices with ISCSI target servers)
-# - ASD (for SBD devices with Azure Shared Disks)
-scs_cluster_type: "AFA"  # or "ISCSI" or "ASD"
-database_cluster_type: "AFA"  # or "ISCSI" or "ASD"
-
-# The instance number of the SCS, ERS and DB instance.
-scs_instance_number: "00"
-ers_instance_number: "01"
-db_instance_number: "00"
-
-# The type of database. Supported values are:
-# - HANA
-platform: "HANA"
-
-# The NFS provider used for shared storage. Supported values are:
-# - ANF (for Azure NetApp Files)
-# - AFS (for Azure File Share)
-NFS_provider: "ANF"  # or "AFS"
-
-# If you're using a user-assigned managed identity (as explained in "Azure RBAC" section above):
-#  - Enter the client ID of that identity here
-#  - You can find this ID in Azure Portal → Managed Identities → Your Identity → Properties → Client ID
-# If you're using system-assigned managed identity instead:
-#  - Leave this blank or set to empty string ""
-user_assigned_identity_client_id: "000000-00000-00000-00000-000000"
-
-# If you have the SSH key or VM password stored in an Azure Key Vault as a secret:
-#  - Enter the Azure Key Vault Resource ID in the key_vault_id parameter and the Secret ID in the secret_id parameter.
-#  - You can find the Resource ID of the Key Vault in Azure Portal → Key Vaults → Your Key Vault → JSON view → Copy the Resource ID  
-#  - You can find the Resource ID of the Secret in Your Key Vault → Secrets → Select Secret → Current Version → Copy the Secret Identifier  
-# If you're creating SSHKEY or VMPASSWORD file locally:
-#  - Remove the following two parameters
-key_vault_id:                  /subscriptions/<subscription-id>/resourceGroups/<resource-group>/providers/Microsoft.KeyVault/vaults/<key-vault-name>
-secret_id:                     https://<key-vault-name>.vault.azure.net/secrets/<secret-name>/<id>
-```
-
-2.2.3. **Credential Files** (Available locally)
-
-The required credential files depend on the authentication method used to connect to the SAP system:
-
-1. **SSH Key Authentication**: If connecting via SSH key, place the private key inside `WORKSPACE/SYSTEM/<DIRECTORY>` and name the file "ssh_key.ppk".
-1. **Password Authentication**: If connecting using a username and password, create a password file by running the following command. It takes the username from hosts.yaml file. 
-
-  ```bash
-  echo "password" > WORKSPACES/SYSTEM/<DIRECTORY>/password
-  ```
-
-2.2.4. **Credential Files** (From Azure Key Vault)
-
-When using Azure Key Vault to store credentials, the framework retrieves authentication details directly from the key vault using the configured managed identity.
-
-  **Authentication Methods:**
-
-  1. **SSH Key Authentication**: Store the private SSH key content in Azure Key Vault as a secret.
-  2. **Password Authentication**: Store the password in Azure Key Vault as a secret. The username is taken from the `hosts.yaml` file.
-
-  **Setup:**
-
-  1. Ensure the managed identity has "Key Vault Secrets User" role on the key vault.
-
-  2. Configure `key_vault_id` and `secret_id` parameters in `sap-parameters.yaml` as shown in section 2.2.2.
-
-  **Important**: When using Key Vault authentication, do NOT create local credential files (`ssh_key.ppk` or `password` files).
+Follow the steps (2.1 - 2.2) in [Setup Guide for SAP Testing Automation Framework](./SETUP.MD#2-system-configuration) to configure your system details.
 
 
 ### 3. Test Execution
@@ -279,52 +98,3 @@ After the test execution completes, a detailed HTML report is generated that sum
 3. **View the report**
 
    You can open the HTML report in any web browser to review the results and logs.
-
-## Update the framework
-
-To ensure you have the latest features and fixes, it's important to keep your fork of the SAP Testing Automation Framework up to date. You can do this by pulling the latest changes from the original repository into your fork.
-
-### Steps to update your fork
-
-1. **Ensure you have the upstream repository configured**:
-
-    ```bash
-    # Check if you already have the upstream remote
-    git remote -v
-
-    # If you don't see an 'upstream' entry, add it
-    git remote add upstream https://github.com/Azure/sap-automation-qa.git
-    ```
-
-2. **Fetch the latest changes from the upstream repository**:
-
-    ```bash
-    git fetch upstream
-    ```
-
-3. **Ensure you're on your main branch**:
-
-    ```bash
-    git checkout main
-    ```
-
-4. **Merge the changes from upstream into your local fork**:
-
-    ```bash
-    git merge upstream/main
-    ```
-
-5. **Push the updated code to your GitHub fork**:
-
-    ```bash
-    git push origin main
-    ```
-
-This process will update your fork with all the latest features, bug fixes, and improvements from the original SAP Testing Automation Framework repository.
-
-> **NOTE**
-> If you've made local changes to your fork, you might encounter merge conflicts during step 4. In that case, you'll need to resolve these conflicts before proceeding with the push in step 5.
-
-## Additional Resources
-
-- [Azure SAP Documentation](https://docs.microsoft.com/azure/sap)
diff --git a/docs/SETUP.MD b/docs/SETUP.MD
index 2b12804b..411f18c1 100644
--- a/docs/SETUP.MD
+++ b/docs/SETUP.MD
@@ -99,3 +99,248 @@ cd sap-automation-qa
 ```bash
 source .venv/bin/activate
 ```
+
+### 2. System Configuration
+
+#### 2.1. Test Environment Configuration
+
+2.1.1. Navigate to the root directory
+
+```bash
+cd sap-automation-qa
+```
+
+2.1.2. Update `vars.yaml` with your test parameters. This file contains the variables used in the test cases:
+
+```yaml
+# The type of test to be executed. Supported values are:
+# - SAPFunctionalTests
+# - ConfigurationChecks
+TEST_TYPE: "SAPFunctionalTests"
+
+# The type of SAP functional test to be executed. Supported values are:
+# - DatabaseHighAvailability
+# - CentralServicesHighAvailability
+# - Not required for ConfigurationChecks test type
+SAP_FUNCTIONAL_TEST_TYPE: "DatabaseHighAvailability"  # or "CentralServicesHighAvailability"
+
+# The name of the SAP system configuration for which you want to execute the test cases.
+# It would be the name of the folder under 'WORKSPACE/SYSTEM/' where it could find hosts.yaml, sap-parameters.yaml files of the SAP system configuration
+SYSTEM_CONFIG_NAME: "DEV-WEEU-SAP01-X00"
+
+# The type of authentication to be used for the telemetry data destination. Supported values are: VMPASSWORD and SSHKEY
+AUTHENTICATION_TYPE: 
+
+# The destination of the telemetry data. Supported values are:
+# - azureloganalytics
+# - azuredataexplorer (only recommended for long-term storage)
+telemetry_data_destination: "azureloganalytics"
+
+# The name of the telemetry table in the telemetry data destination.
+telemetry_table_name: "your-telemetry-table-name"
+
+# The workspace id, shared key of the Log Analytics workspace.
+laws_shared_key: "your-log-analytics-shared-key"
+laws_workspace_id: "your-log-analytics-workspace-id"
+
+# The cluster name, data ingestion URI, and client ID of the Azure Data Explorer.
+adx_cluster_fqdn: "your-adx-cluster-fqdn"
+adx_database_name: "your-adx-database-name"
+ade_client_id: "your-adx-client-id"
+```
+
+#### 2.2. System Configuration (WORKSPACES)
+
+Create your system workspace. This directory contains the configuration files specific to your SAP system, necessary for connecting to the system and executing test scenarios. The `WORKSPACE/SYSTEM/` directory holds sub-directories, each representing a different [SAP system](./WORKSPACES/SYSTEM/DEV-WEEU-SAP01-X00).
+
+```bash
+cd WORKSPACES/SYSTEM
+mkdir ENV-REGION-VNET-SID
+cd ENV-REGION-VNET-SID
+```
+
+The system workspace should include the following files, containing all necessary details about the SAP system.
+
+2.2.1. **hosts.yaml** - System [Inventory file](https://docs.ansible.com/ansible/latest/inventory_guide/intro_inventory.html) (required)
+
+This file contains the connection details for the SAP system hosts and is used as an inventory file by the Ansible framework to connect to the SAP system. You can find the inventory file in the path [hosts.yaml](../WORKSPACES/SYSTEM/DEV-WEEU-SAP01-X00/hosts.yaml).
+
+Here is an example of the hosts.yaml file format:
+
+```yaml
+X00_DB:
+  hosts:
+    hostname0:
+      ansible_host: "IP_ADDRESS0"
+      ansible_user: "USERNAME"
+      ansible_connection: "ssh"
+      connection_type: "key"
+      virtual_host: "VIRTUAL_HOSTNAME0"
+      become_user: "USERNAME1" #Username with root privilege
+      os_type: "linux"
+      vm_name: "AZURE_VM_NAME0"
+    hostname1:
+      ansible_host: "IP_ADDRESS1"
+      ansible_user: "USERNAME"
+      ansible_connection: "ssh"
+      connection_type: "key"
+      virtual_host: "VIRTUAL_HOSTNAME1"
+      become_user: "USERNAME1" #Username with root privilege
+      os_type: "linux"
+      vm_name: "AZURE_VM_NAME1"
+  vars:
+    node_tier: "hana"  # or "ers", "scs"
+```
+
+In the file:
+
+- X00 represents the SAP SID (System ID) of the SAP system, followed by the host type (e.g., DB, ASCS, PAS). You must provide the SAP SID of the system, regardless of whether you are testing Database High Availability or Central Services High Availability.
+
+The file includes the following details:
+
+- **ansible_host**: The IP address of the host.
+- **ansible_user**: The user for connecting to the host.
+- **ansible_connection**: The connection type (usually "ssh").
+- **connection_type**: The connection type, used when connecting via SSH key (not needed for password-based connections).
+- **virtual_host**: The virtual host name of the SCS/DB host.
+- **become_user**: The user with root privileges. For example, user "azureadm" must be able to change to root without password.
+- **os_type**: The operating system type (e.g., Linux or Windows).
+- **vm_name**: The computer name of the Azure VM.
+- **node_tier**: The type of node tier. Supported values: hana, ers, scs.
+
+2.2.2. **sap-parameters.yaml** - SAP Configuration (required)
+
+This file contains the SAP system configuration parameters. The parameters are used by the test scenarios to validate the system's high availability configuration. You can find the inventory file in the path [sap-parameters.yaml](../WORKSPACES/SYSTEM/DEV-WEEU-SAP01-X00/sap-parameters.yaml).
+
+Here is an example of the sap-parameters.yaml file format:
+
+```yaml
+# The SAP and Database SID of the SAP system.
+sap_sid: "your-sap-sid"
+db_sid: "your-db-sid"
+
+# Boolean indicating if the SCS and database is configured as highly available.
+scs_high_availability: true
+database_high_availability: true
+
+# The high availability configuration of the SCS and DB instance. Supported values are:
+# - AFA (for Azure Fencing Agent)
+# - ISCSI (for SBD devices with ISCSI target servers)
+# - ASD (for SBD devices with Azure Shared Disks)
+scs_cluster_type: "AFA"  # or "ISCSI" or "ASD"
+database_cluster_type: "AFA"  # or "ISCSI" or "ASD"
+
+# The instance number of the SCS, ERS and DB instance.
+scs_instance_number: "00"
+ers_instance_number: "01"
+db_instance_number: "00"
+
+# The type of database. Supported values are:
+# - HANA
+platform: "HANA"
+
+# The NFS provider used for shared storage. Supported values are:
+# - ANF (for Azure NetApp Files)
+# - AFS (for Azure File Share)
+NFS_provider: "ANF"  # or "AFS"
+
+# If you're using a user-assigned managed identity (as explained in "Azure RBAC" section above):
+#  - Enter the client ID of that identity here
+#  - You can find this ID in Azure Portal → Managed Identities → Your Identity → Properties → Client ID
+# If you're using system-assigned managed identity instead:
+#  - Leave this blank or set to empty string ""
+user_assigned_identity_client_id: "000000-00000-00000-00000-000000"
+
+# If you have the SSH key or VM password stored in an Azure Key Vault as a secret:
+#  - Enter the Azure Key Vault Resource ID in the key_vault_id parameter and the Secret ID in the secret_id parameter.
+#  - You can find the Resource ID of the Key Vault in Azure Portal → Key Vaults → Your Key Vault → JSON view → Copy the Resource ID  
+#  - You can find the Resource ID of the Secret in Your Key Vault → Secrets → Select Secret → Current Version → Copy the Secret Identifier  
+# If you're creating SSHKEY or VMPASSWORD file locally:
+#  - Remove the following two parameters
+key_vault_id:                  /subscriptions/<subscription-id>/resourceGroups/<resource-group>/providers/Microsoft.KeyVault/vaults/<key-vault-name>
+secret_id:                     https://<key-vault-name>.vault.azure.net/secrets/<secret-name>/<id>
+
+# ANF specific parameters (if NFS_provider is set to ANF)
+# You can find these values in the Azure Portal → Your NetApp Account → Overview page
+# ANF_account_rg: The resource group where the Azure NetApp Files account is located
+# ANF_account_name: The name of the Azure NetApp Files account
+ANF_account_rg:                "ANF-RESOURCE-GROUP"
+ANF_account_name:              "ANF-ACCOUNT-NAME"
+```
+
+2.2.3. **Credential Files** (Available locally)
+
+The required credential files depend on the authentication method used to connect to the SAP system:
+
+1. **SSH Key Authentication**: If connecting via SSH key, place the private key inside `WORKSPACE/SYSTEM/<DIRECTORY>` and name the file "ssh_key.ppk".
+1. **Password Authentication**: If connecting using a username and password, create a password file by running the following command. It takes the username from hosts.yaml file. 
+
+  ```bash
+  echo "password" > WORKSPACES/SYSTEM/<DIRECTORY>/password
+  ```
+
+2.2.4. **Credential Files** (From Azure Key Vault)
+
+When using Azure Key Vault to store credentials, the framework retrieves authentication details directly from the key vault using the configured managed identity.
+
+  **Authentication Methods:**
+
+  1. **SSH Key Authentication**: Store the private SSH key content in Azure Key Vault as a secret.
+  2. **Password Authentication**: Store the password in Azure Key Vault as a secret. The username is taken from the `hosts.yaml` file.
+
+  **Setup:**
+
+  1. Ensure the managed identity has "Key Vault Secrets User" role on the key vault.
+
+  2. Configure `key_vault_id` and `secret_id` parameters in `sap-parameters.yaml` as shown in section 2.2.2.
+
+  **Important**: When using Key Vault authentication, do NOT create local credential files (`ssh_key.ppk` or `password` files).
+
+## Update the framework
+
+To ensure you have the latest features and fixes, it's important to keep your fork of the SAP Testing Automation Framework up to date. You can do this by pulling the latest changes from the original repository into your fork.
+
+### Steps to update your fork
+
+1. **Ensure you have the upstream repository configured**:
+
+    ```bash
+    # Check if you already have the upstream remote
+    git remote -v
+
+    # If you don't see an 'upstream' entry, add it
+    git remote add upstream https://github.com/Azure/sap-automation-qa.git
+    ```
+
+2. **Fetch the latest changes from the upstream repository**:
+
+    ```bash
+    git fetch upstream
+    ```
+
+3. **Ensure you're on your main branch**:
+
+    ```bash
+    git checkout main
+    ```
+
+4. **Merge the changes from upstream into your local fork**:
+
+    ```bash
+    git merge upstream/main
+    ```
+
+5. **Push the updated code to your GitHub fork**:
+
+    ```bash
+    git push origin main
+    ```
+
+This process will update your fork with all the latest features, bug fixes, and improvements from the original SAP Testing Automation Framework repository.
+
+> **NOTE**
+> If you've made local changes to your fork, you might encounter merge conflicts during step 4. In that case, you'll need to resolve these conflicts before proceeding with the push in step 5.
+
+## Additional Resources
+
+- [Azure SAP Documentation](https://docs.microsoft.com/azure/sap)

From ba6b31a718fb09041f8f790921b6f9f0bf0fba03 Mon Sep 17 00:00:00 2001
From: devanshjain <devanshjain@microsoft.com>
Date: Tue, 14 Oct 2025 21:45:15 +0000
Subject: [PATCH 06/12] Fix documentation for configuration checks to use
 TEST_TYPE instead of SAP_FUNCTIONAL_TEST_TYPE

---
 scripts/sap_automation_qa.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/sap_automation_qa.sh b/scripts/sap_automation_qa.sh
index 1e972b51..136106c6 100755
--- a/scripts/sap_automation_qa.sh
+++ b/scripts/sap_automation_qa.sh
@@ -99,7 +99,7 @@ Examples:
   $0 --test_groups=HA_DB_HANA --test_cases=[ha-config,primary-node-crash] --extra-vars='{"key":"value"}'
   $0 --test_groups=HA_DB_HANA --test_cases=[ha-config] --offline
 
-  # Configuration Checks (requires SAP_FUNCTIONAL_TEST_TYPE: ConfigurationChecks in vars.yaml)
+  # Configuration Checks (requires TEST_TYPE: ConfigurationChecks in vars.yaml)
   $0 --extra-vars='{"configuration_test_type":"all"}'
   $0 --extra-vars='{"configuration_test_type":"high_availability"}'
   $0 --extra-vars='{"configuration_test_type":"Database"}' -vv
@@ -132,7 +132,7 @@ Available Test Cases for groups:
 				manual-restart => Manual Restart
 				ha-failover-to-node => HA Failover to Secondary Node
 
-Configuration Checks (set SAP_FUNCTIONAL_TEST_TYPE: ConfigurationChecks in vars.yaml):
+Configuration Checks (set TEST_TYPE: ConfigurationChecks in vars.yaml):
 	configuration_test_type options (use with --extra-vars):
 				all => Run all configuration checks
 				Database => Database (HANA) configuration checks only

From 9f0eaba16432a8a973f0ebc1339864c60a7791b2 Mon Sep 17 00:00:00 2001
From: devanshjain <devanshjain@microsoft.com>
Date: Tue, 14 Oct 2025 21:55:00 +0000
Subject: [PATCH 07/12] Add permissions requirements for high availability and
 configuration checks in setup guide

---
 docs/SETUP.MD | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/SETUP.MD b/docs/SETUP.MD
index 411f18c1..5f808ef9 100644
--- a/docs/SETUP.MD
+++ b/docs/SETUP.MD
@@ -34,10 +34,19 @@ For the framework to access the properties of the Azure Load Balancer in a high
 
 1. Create user-assigned managed identity as described in [manage user-assigned managed identities](https://learn.microsoft.com/entra/identity/managed-identities-azure-resources/how-manage-user-assigned-managed-identities?pivots=identity-mi-methods-azp#create-a-user-assigned-managed-identity)
 1. Assign user-assigned managed identity to management server as described in [configure managed identities on Azure VMs](https://learn.microsoft.com/entra/identity/managed-identities-azure-resources/how-to-configure-managed-identities?pivots=qs-configure-portal-windows-vm#assign-a-user-assigned-managed-identity-to-an-existing-vm)
+
+**Permissiongs required for High Availability tests:**
 1. Open the Azure Load Balancer used for the high availability deployment of your SAP system on Azure.
 1. In the Azure Load Balancer panel, go to Access control (IAM).
 1. Assign the required role to the user-assigned managed identity by following the steps in [assign roles using Azure portal](https://learn.microsoft.com/azure/role-based-access-control/role-assignments-portal).
 
+**Permissions required for Configuration Checks:**
+1. "Reader" role to the user-assigned managed identity on the resource group containing the SAP VMs.
+1. "Reader" role to the user-assigned managed identity on the resource group containing the Azure NetApp Files account (if using Azure NetApp Files as shared storage).
+1. "Storage Account Reader" role to the user-assigned managed identity on the resource group containing the storage account (if using Azure File Share as shared storage).
+1. "Reader" role to the user-assigned managed identity on the resource group containing the managed disks (if using Azure Managed Disks for SAP HANA data and log volumes).
+1. "Reader" role to the user-assigned managed identity on the resource group containing the shared disks (if using Azure Shared Disks for SBD devices).
+
 ### Network Connectivity
 
 The management server must have network connectivity to the SAP system to perform tests and validations. You can establish this connection by peering the networks as outlined in [manage a virtual network peering](https://learn.microsoft.com/azure/virtual-network/virtual-network-manage-peering?tabs=peering-portal).

From 561ac8e1b73f82ef2b8f97989f08e3a714ca56cc Mon Sep 17 00:00:00 2001
From: devanshjain <devanshjain@microsoft.com>
Date: Tue, 14 Oct 2025 22:56:06 +0000
Subject: [PATCH 08/12] Update HANA configuration checks for high availability
 command and validator type

---
 src/roles/configuration_checks/tasks/files/hana.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/roles/configuration_checks/tasks/files/hana.yml b/src/roles/configuration_checks/tasks/files/hana.yml
index 7a866521..68f27a9f 100644
--- a/src/roles/configuration_checks/tasks/files/hana.yml
+++ b/src/roles/configuration_checks/tasks/files/hana.yml
@@ -155,11 +155,11 @@ checks:
       high_availability_agent:          *cluster_type
     collector_type:                     *command
     collector_args:
-      command:                          cibadmin --query --xpath "//nvpair[@name='stonith-action']" | grep -o 'value="[^\"]*"' | cut -d'"' -f2
+      command:                          "crm configure get_property stonith-action 2>/dev/null || pcs property config stonith-action 2>/dev/null | tail -1"
       user:                             *root
-    validator_type:                     *string
+    validator_type:                     *list
     validator_args:
-      expected_output:                  "reboot"
+      expected_output:                  ["reboot", "stonith-action=reboot"]
     report:                             *check
 
   - id:                                 "DB-HANA-0006"

From b39b2e8eef6cc010229d4e2056534253d7a62700 Mon Sep 17 00:00:00 2001
From: devanshjain <devanshjain@microsoft.com>
Date: Tue, 14 Oct 2025 23:07:09 +0000
Subject: [PATCH 09/12] Rename expected_output to valid_list in HANA
 configuration checks

---
 src/roles/configuration_checks/tasks/files/hana.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/roles/configuration_checks/tasks/files/hana.yml b/src/roles/configuration_checks/tasks/files/hana.yml
index 68f27a9f..16cecb0a 100644
--- a/src/roles/configuration_checks/tasks/files/hana.yml
+++ b/src/roles/configuration_checks/tasks/files/hana.yml
@@ -159,7 +159,7 @@ checks:
       user:                             *root
     validator_type:                     *list
     validator_args:
-      expected_output:                  ["reboot", "stonith-action=reboot"]
+      valid_list:                       ["reboot", "stonith-action=reboot"]
     report:                             *check
 
   - id:                                 "DB-HANA-0006"

From 76dddf15e0aae5b1f0c9382c1cfeacd704d2d1c6 Mon Sep 17 00:00:00 2001
From: devanshjain <devanshjain@microsoft.com>
Date: Tue, 14 Oct 2025 23:09:26 +0000
Subject: [PATCH 10/12] Fix typo in permissions section and clarify role
 assignments for high availability tests

---
 docs/SETUP.MD | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/SETUP.MD b/docs/SETUP.MD
index 5f808ef9..91e2c935 100644
--- a/docs/SETUP.MD
+++ b/docs/SETUP.MD
@@ -35,13 +35,14 @@ For the framework to access the properties of the Azure Load Balancer in a high
 1. Create user-assigned managed identity as described in [manage user-assigned managed identities](https://learn.microsoft.com/entra/identity/managed-identities-azure-resources/how-manage-user-assigned-managed-identities?pivots=identity-mi-methods-azp#create-a-user-assigned-managed-identity)
 1. Assign user-assigned managed identity to management server as described in [configure managed identities on Azure VMs](https://learn.microsoft.com/entra/identity/managed-identities-azure-resources/how-to-configure-managed-identities?pivots=qs-configure-portal-windows-vm#assign-a-user-assigned-managed-identity-to-an-existing-vm)
 
-**Permissiongs required for High Availability tests:**
+**Permissions required for High Availability tests:**
 1. Open the Azure Load Balancer used for the high availability deployment of your SAP system on Azure.
 1. In the Azure Load Balancer panel, go to Access control (IAM).
 1. Assign the required role to the user-assigned managed identity by following the steps in [assign roles using Azure portal](https://learn.microsoft.com/azure/role-based-access-control/role-assignments-portal).
+1. Assign the "Reader" role to the user-assigned managed identity on the resource group containing the SAP VMs and the Azure Load Balancer.
 
 **Permissions required for Configuration Checks:**
-1. "Reader" role to the user-assigned managed identity on the resource group containing the SAP VMs.
+1. "Reader" role to the user-assigned managed identity on the resource group containing the SAP VMs and the Azure Load Balancer.
 1. "Reader" role to the user-assigned managed identity on the resource group containing the Azure NetApp Files account (if using Azure NetApp Files as shared storage).
 1. "Storage Account Reader" role to the user-assigned managed identity on the resource group containing the storage account (if using Azure File Share as shared storage).
 1. "Reader" role to the user-assigned managed identity on the resource group containing the managed disks (if using Azure Managed Disks for SAP HANA data and log volumes).

From f5e01cca4724e6b7b0651992c31de1bc2928acde Mon Sep 17 00:00:00 2001
From: devanshjain <devanshjain@microsoft.com>
Date: Tue, 14 Oct 2025 23:53:28 +0000
Subject: [PATCH 11/12] Enhance execute_command_subprocess tests to validate
 output for both string and list commands

---
 tests/module_utils/sap_automation_qa_test.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/module_utils/sap_automation_qa_test.py b/tests/module_utils/sap_automation_qa_test.py
index 3672fcfe..63301e96 100644
--- a/tests/module_utils/sap_automation_qa_test.py
+++ b/tests/module_utils/sap_automation_qa_test.py
@@ -178,9 +178,14 @@ def mock_get_logger(name):
                 "src.module_utils.sap_automation_qa.logging.getLogger", mock_get_logger
             )
             sap_qa = SapAutomationQA()
+            
             command = "echo 'Hello World'"
-            result = sap_qa.execute_command_subprocess(command)
-            assert result == ""
+            result = sap_qa.execute_command_subprocess(command, shell_command=True)
+            assert "Hello World" in result
+
+            command_list = ["echo", "Hello World"]
+            result_list = sap_qa.execute_command_subprocess(command_list, shell_command=False)
+            assert "Hello World" in result_list
 
     def test_parse_xml_output(self, monkeypatch):
         """

From 010cf8a3a0b89b0cefcbf5364216642fcfc3a7ba Mon Sep 17 00:00:00 2001
From: devanshjain <devanshjain@microsoft.com>
Date: Tue, 14 Oct 2025 23:53:40 +0000
Subject: [PATCH 12/12] Fix formatting in execute_command_subprocess test for
 clarity

---
 tests/module_utils/sap_automation_qa_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/module_utils/sap_automation_qa_test.py b/tests/module_utils/sap_automation_qa_test.py
index 63301e96..cf9d6d3e 100644
--- a/tests/module_utils/sap_automation_qa_test.py
+++ b/tests/module_utils/sap_automation_qa_test.py
@@ -178,7 +178,7 @@ def mock_get_logger(name):
                 "src.module_utils.sap_automation_qa.logging.getLogger", mock_get_logger
             )
             sap_qa = SapAutomationQA()
-            
+
             command = "echo 'Hello World'"
             result = sap_qa.execute_command_subprocess(command, shell_command=True)
             assert "Hello World" in result