Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into normesta-reg-updates-11

Author: normesta

articles/energy-data-services/how-to-manage-audit-logs.md

@@ -0,0 +1,95 @@
+---
+title: How to manage audit logs for Microsoft Azure Data Manager for Energy Preview
+description: Learn how to use audit logs on Azure Data Manager for Energy Preview
+author: sandeepchads
+ms.author: sancha
+ms.service: energy-data-services    
+ms.topic: how-to
+ms.date: 04/11/2023
+ms.custom: template-how-to
+#Customer intent: As a developer, I want to use audit logs to check audit trail for data plane APIs for Azure Data Manager for Energy Preview.
+---
+
+
+# Manage audit logs  
+Audit logs provide auditing trails for data plane APIs on Azure Data Manager for Energy. With audit logs, you can tell:
+* Who performed an action
+* What was the action
+* When was the action performed
+* Status of the action
+
+For example, when you “Add a new member” to the ```users.datalake.admins``` entitlement group using entitlements API, you're able to see this information in audit logs. 
+
+[![Screenshot of audit logs for entitlement](media/how-to-manage-audit-logs/how-to-manage-audit-logs-4-entilements.png)](media/how-to-manage-audit-logs/how-to-manage-audit-logs-4-entilements.png#lightbox)
+ 
+## Enable audit logs
+To enable audit logs in diagnostic logging, select your Azure Data Manager for Energy instance in the Azure portal.
+* Select the **Activity log** screen, and then select **Diagnostic settings**.
+* Select **+ Add diagnostic setting**.
+* Enter the Diagnostic settings name.
+* Select **Audit Events** as the Category. 
+
+[![Screenshot of audit events option in diagnostic settings](media/how-to-manage-audit-logs/how-to-manage-audit-logs-1-audit-event-diagnostic-logs.png)](media/how-to-manage-audit-logs/how-to-manage-audit-logs-1-audit-event-diagnostic-logs.png#lightbox)
+
+* Select appropriate Destination details for accessing the diagnostic logs. 
+ 
+> [!NOTE]
+> It might take up to 15 minutes for the first Logs to show in Log Analytics. 
+For information on how to work with diagnostic logs, see [Azure Resource Log documentation.](../azure-monitor/essentials/platform-logs-overview.md)
+
+## Audit log details
+The audit logs for Azure Data Manager for Energy service returns the following fields.
+
+|Field Name| 	  Type| 	Description|
+|----------|----------|----------------| 
+| TenantID |	String |	The tenant of your Azure Data Manager for Energy instance.|
+| TimeGenerated | UTC format |	The time of the audit log. |
+| Category 	| String | The diagnostic settings category to which the logs belong.|
+| Location | 	string | 	Location of the Azure Data Manager for Energy resource.  |
+| ServiceName 	| String |  	Name of OSDU service running in Azure Data Manager for Energy. For example: Partition, Search, Indexer, Legal, Entitlements, Workflow, Register, Unit, Crs-catalog, File, Schema, and Dataset |
+| OperationName | 	String  |Operation ID or operation name associated to data plane APIs, which emits audit logs for example "Add member" |
+| Data partition ID | 	String |  	Data partition ID on which operation is performed. |
+| Action  |	String | 	Action refers to the type of operation that is, whether it's create, delete, update etc.|
+| ActionID | 	String 	| ID associated with operation. |
+| PuID |	String	| ObjectId of the user in Azure AD|
+| ResultType |	String 	| Define success or failure of operation | 
+| Operation Description	| String |	Provides specific details of the response. These details can include tracing information, such as the symptoms, of the result that are used for further analysis. |
+| RequestId | 	 String 	| This is the unique ID associated to the request, which triggered the operation on data plane. |
+| Message |	String |	Provides message associated with the success or failure of the operation.|
+| ResourceID | 	String | 	The Azure Data Manager for Energy resource ID of the customer under which the audit log belongs. |
+
+## Sample queries
+
+Basic Application Insights queries you can use to explore your log data.
+
+1. Run the following query to group operations by ServiceName:
+
+```sql
+OEPAuditLogs
+| summarize count() by ServiceName
+```
+
+[![Screenshot of key vault, key, user assigned identity, and CMK on encryption tab](media/how-to-manage-audit-logs/how-to-manage-audit-logs-3-allservices.png)](media/how-to-manage-audit-logs/how-to-manage-audit-logs-3-allservices.png#lightbox)
+ 
+2. Run the following query to see the 100 most recent logs:
+
+```sql
+OEPAuditLogs
+| limit 100
+```
+
+3. Run the following query to get all the failed results:
+
+```sql
+OEPAuditLogs
+| where ResultType contains "Failure"
+```
+
+
+## Next steps
+
+Learn about Managed Identity:
+> [!div class="nextstepaction"]
+> [Managed Identity in Azure Data Manager for Energy Preview](how-to-use-managed-identity.md)
+
+

articles/energy-data-services/index.yml

@@ -111,4 +111,6 @@ landingContent:
           - text: Set up use Managed Identity
             url: how-to-use-managed-identity.md
           - text: Enable resource sharing (CORS)
-            url: how-to-enable-cors.md
+            url: how-to-enable-cors.md
+          - text: Set up audit logs
+            url: how-to-manage-audit-logs.md

articles/energy-data-services/media/how-to-manage-audit-logs/how-to-manage-audit-logs-1-audit-event-diagnostic-logs.png

@@ -86,6 +86,8 @@
       href: how-to-convert-segy-to-ovds.md
     - name: Generate a refresh token
       href: how-to-generate-refresh-token.md
+    - name: Set up audit logs
+      href: how-to-manage-audit-logs.md
 - name: References
   items:
   - name: REST API

articles/energy-data-services/media/how-to-manage-audit-logs/how-to-manage-audit-logs-2-audit-log-table.png

@@ -12,6 +12,9 @@ ms.custom: template-how-to, engagement-fy23
 
 # Upgrade a public IP address using the Azure portal
 
+>[!Important]
+>On September 30, 2025, Basic SKU public IPs will be retired. For more information, see the [official announcement](https://azure.microsoft.com/updates/upgrade-to-standard-sku-public-ip-addresses-in-azure-by-30-september-2025-basic-sku-will-be-retired/). If you are currently using Basic SKU public IPs, make sure to upgrade to Standard SKU public IPs prior to the retirement date.
+
 Azure public IP addresses are created with a SKU, either Basic or Standard. The SKU determines their functionality including allocation method, feature support, and resources they can be associated with. 
 
 In this article, you'll learn how to upgrade a static Basic SKU public IP address to Standard SKU in the Azure portal.