Merge pull request Azure#12641 from gloo-shock/master

Add support of lacking event types

Author: v-atulyadav

Solutions/WithSecureElementsViaFunction/Data Connectors/WithSecureElementsAzureFunction/lib/events_formatter.py

@@ -1,4 +1,3 @@
-from .message_factory import MessageFactory
 import re
 
 
@@ -43,17 +42,14 @@ class Formatter:
     }
     DEEP_GUARD_RARITY_REPUTATION_REGEX = "Rarity: (\\d+), Reputation: (\\d+)"
 
-    def __init__(self):
-        self._message_factory = MessageFactory()
-
     def format(self, event):
         engine = event.engine
         result = {
             "DeviceVendor": "WithSecure",
             "DeviceEventClassID": f"{engine}.{event.action}",
             "Activity": Formatter.ENGINE_TO_ACTIVITY.get(engine, engine),
             "LogSeverity": Formatter.SEVERITY_TO_INDEX.get(event.severity),
-            "Message": self._message_factory.get_message(event),
+            "Message": event.message,
             "DeviceAction": event.action,
             "SimplifiedDeviceAction": event.action,
             "PersistenceTimestamp": event.persistenceTimestamp,

Solutions/WithSecureElementsViaFunction/Data Connectors/WithSecureElementsAzureFunction/lib/message_factory.py

@@ -101,7 +101,7 @@ def _get_events_page(self, auth_token, from_date, org_id=None, next_page=None):
             engine_param_value = self._engine_group
         else:
             engine_param = "engineGroup"
-            engine_param_value = "epp,edr,ecp"
+            engine_param_value = "epp,edr,ecp,xm"
 
         data = {
             "limit": 100,

Solutions/WithSecureElementsViaFunction/Data Connectors/WithSecureElementsAzureFunction/lib/messages.properties

@@ -425,7 +425,8 @@
         "scope": "[resourceId('Microsoft.Insights/dataCollectionRules', variables('ruleName'))]",
         "properties": {
           "roleDefinitionId": "[resourceId('Microsoft.Authorization/roleDefinitions', variables('dcrRoleId'))]",
-          "principalId": "[parameters('entraObjectId')]"
+          "principalId": "[parameters('entraObjectId')]",
+          "principalType": "ServicePrincipal"
         }
       }
   ],

Solutions/WithSecureElementsViaFunction/Data Connectors/WithSecureElementsAzureFunction/lib/withsecure_client.py

@@ -1,25 +1,30 @@
-azure-core==1.38.0 ; python_version >= "3.10" and python_version < "3.11"
-azure-data-tables==12.5.0 ; python_version >= "3.10" and python_version < "3.11"
-azure-identity==1.15.0 ; python_version >= "3.10" and python_version < "3.11"
-azure-monitor-ingestion==1.0.3 ; python_version >= "3.10" and python_version < "3.11"
-azure-storage-file-share==12.15.0 ; python_version >= "3.10" and python_version < "3.11"
-azure-functions==1.11.2 ; python_version >= "3.10" and python_version < "3.11"
-certifi==2024.2.2 ; python_version >= "3.10" and python_version < "3.11"
-cffi==1.16.0 ; python_version >= "3.10" and python_version < "3.11" and platform_python_implementation != "PyPy"
-charset-normalizer==3.3.2 ; python_version >= "3.10" and python_version < "3.11"
-cryptography==44.0.1 ; python_version >= "3.10" and python_version < "3.11"
-idna==3.6 ; python_version >= "3.10" and python_version < "3.11"
-isodate==0.6.1 ; python_version >= "3.10" and python_version < "3.11"
-msal-extensions==1.1.0 ; python_version >= "3.10" and python_version < "3.11"
-msal==1.26.0 ; python_version >= "3.10" and python_version < "3.11"
-multidict==6.0.5 ; python_version >= "3.10" and python_version < "3.11"
-packaging==23.2 ; python_version >= "3.10" and python_version < "3.11"
-portalocker==2.8.2 ; python_version >= "3.10" and python_version < "3.11"
-pycparser==2.21 ; python_version >= "3.10" and python_version < "3.11" and platform_python_implementation != "PyPy"
-pyjwt[crypto]==2.8.0 ; python_version >= "3.10" and python_version < "3.11"
-pywin32==306 ; python_version >= "3.10" and python_version < "3.11" and platform_system == "Windows"
-requests==2.32.4 ; python_version >= "3.10" and python_version < "3.11"
-six==1.16.0 ; python_version >= "3.10" and python_version < "3.11"
-typing-extensions==4.9.0 ; python_version >= "3.10" and python_version < "3.11"
-urllib3==2.6.3 ; python_version >= "3.10" and python_version < "3.11"
-yarl==1.9.4 ; python_version >= "3.10" and python_version < "3.11"
+azure-core==1.38.0 ; python_version == "3.12"
+azure-data-tables==12.4.4 ; python_version == "3.12"
+azure-identity==1.15.0 ; python_version == "3.12"
+azure-monitor-ingestion==1.0.3 ; python_version == "3.12"
+azure-storage-file-share==12.13.0 ; python_version == "3.12"
+black==25.1.0 ; python_version == "3.12"
+certifi==2024.7.4 ; python_version == "3.12"
+cffi==1.16.0 ; python_version == "3.12" and platform_python_implementation != "PyPy"
+charset-normalizer==3.3.2 ; python_version == "3.12"
+click==8.1.7 ; python_version == "3.12"
+colorama==0.4.6 ; python_version == "3.12" and platform_system == "Windows"
+cryptography==43.0.1 ; python_version == "3.12"
+idna==3.7 ; python_version == "3.12"
+isodate==0.6.1 ; python_version == "3.12"
+msal-extensions==1.1.0 ; python_version == "3.12"
+msal==1.26.0 ; python_version == "3.12"
+multidict==6.0.5 ; python_version == "3.12"
+mypy-extensions==1.0.0 ; python_version == "3.12"
+packaging==23.2 ; python_version == "3.12"
+pathspec==0.12.1 ; python_version == "3.12"
+platformdirs==4.2.0 ; python_version == "3.12"
+portalocker==2.8.2 ; python_version == "3.12"
+pycparser==2.21 ; python_version == "3.12" and platform_python_implementation != "PyPy"
+pyjwt==2.8.0 ; python_version == "3.12"
+pywin32==306 ; python_version == "3.12" and platform_system == "Windows"
+requests==2.31.0 ; python_version == "3.12"
+six==1.16.0 ; python_version == "3.12"
+typing-extensions==4.9.0 ; python_version == "3.12"
+urllib3==2.6.3 ; python_version == "3.12"
+yarl==1.9.4 ; python_version == "3.12"