Skip to content

Commit dc1ddfe

Browse files
authored
Merge branch 'main' into 6-azure-purview-to-microsoft-purview
2 parents e1989a1 + 91029fe commit dc1ddfe

File tree

108 files changed

+1544
-1590
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+1544
-1590
lines changed

.openpublishing.redirection.azure-monitor.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@
3030
"redirect_url": "/azure/azure-monitor/change/change-analysis-visualizations",
3131
"redirect_document_id": false
3232
},
33+
{
34+
"source_path_from_root": "/articles/azure-monitor/app/troubleshoot-portal-connectivity.md",
35+
"redirect_url": "https://docs.microsoft.com/troubleshoot/azure/azure-monitor/app-insights/troubleshoot-portal-connectivity",
36+
"redirect_document_id": false
37+
},
3338
{
3439
"source_path_from_root": "/articles/azure-monitor/app/change-analysis-troubleshoot.md",
3540
"redirect_url": "/azure/azure-monitor/change/change-analysis-troubleshoot",

articles/active-directory/roles/security-planning.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ keywords:
77
author: rolyon
88
manager: karenhoran
99
ms.author: rolyon
10-
ms.date: 11/04/2021
10+
ms.date: 04/19/2022
1111
ms.topic: conceptual
1212
ms.service: active-directory
1313
ms.workload: identity
@@ -110,7 +110,7 @@ Evaluate the accounts that are assigned or eligible for the Global Administrator
110110

111111
#### Turn on multi-factor authentication and register all other highly privileged single-user non-federated administrator accounts
112112

113-
Require Azure AD Multi-Factor Authentication (MFA) at sign-in for all individual users who are permanently assigned to one or more of the Azure AD administrator roles: Global Administrator, Privileged Role Administrator, Exchange Administrator, and SharePoint Administrator. Use the guide to enable [Multi-factor Authentication (MFA) for your administrator accounts](../authentication/howto-mfa-userstates.md) and ensure that all those users have registered at [https://aka.ms/mfasetup](https://aka.ms/mfasetup). More information can be found under step 2 and step 3 of the guide [Protect access to data and services in Microsoft 365](https://support.office.com/article/Protect-access-to-data-and-services-in-Office-365-a6ef28a4-2447-4b43-aae2-f5af6d53c68e).
113+
Require Azure AD Multi-Factor Authentication (MFA) at sign-in for all individual users who are permanently assigned to one or more of the Azure AD administrator roles: Global Administrator, Privileged Role Administrator, Exchange Administrator, and SharePoint Administrator. Use the guidance at [Enforce multifactor authentication on your administrators](../authentication/how-to-authentication-find-coverage-gaps.md#enforce-multifactor-authentication-on-your-administrators) and ensure that all those users have registered at [https://aka.ms/mfasetup](https://aka.ms/mfasetup). More information can be found under step 2 and step 3 of the guide [Protect user and device access in Microsoft 365](/microsoft-365/compliance/protect-access-to-data-and-services).
114114

115115
## Stage 2: Mitigate frequently used attacks
116116

articles/attestation/audit-logs.md

Lines changed: 60 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -11,123 +11,75 @@ ms.author: mbaldwin
1111

1212
---
1313

14-
# Audit logs for Azure Attestation
14+
# Azure Attestation logging
1515

16-
Audit logs are secure, immutable, timestamped records of discrete events that happened over time. These logs capture important events that may affect the functionality of your attestation instance.
16+
If you create one or more Azure Attestation resources, you’ll want to monitor how and when your attestation instance is accessed, and by whom. You can do this by enabling logging for Microsoft Azure Attestation, which saves information in an Azure storage account you provide.
1717

18-
Azure Attestation manages attestation instances and the policies associated with them. Actions associated with instance management and policy changes are audited and logged.
18+
Logging information will be available up to 10 minutes after the operation occurred (in most cases, it will be quicker than this). Since you provide the storage account, you can secure your logs via standard Azure access controls and delete logs you no longer want to keep in your storage account.
1919

20-
This article contains information on the events that are logged, the information collected, and the location of these logs.
20+
## Interpret your Azure Attestation logs
2121

22-
## About Audit logs
22+
When logging is enabled, up to three containers may be automatically created for you in your specified storage account: **insights-logs-auditevent, insights-logs-operational, insights-logs-notprocessed**. It is recommended to only use **insights-logs-operational** and **insights-logs-notprocessed**. **insights-logs-auditevent** was created to provide early access to logs for customers using VBS. Future enhancements to logging will occur in the **insights-logs-operational** and **insights-logs-notprocessed**.
2323

24-
Azure Attestation uses code to produce audit logs for events that affect the way attestation is performed. This typically boils down to how or when policy changes are made to your attestation instance as well as some admin actions.
24+
**Insights-logs-operational** contains generic information across all TEE types.
2525

26-
### Auditable Events
27-
Here are some of the audit logs we collect:
26+
**Insights-logs-notprocessed** contains requests which the service was unable to process, typically due to malformed HTTP headers, incomplete message bodies, or similar issues.
2827

29-
| Event/API | Event Description |
30-
|--------------------------------------------|-----------------------------------------------------------------------------------------------|
31-
| Create Instance | Creates a new instance of an attestation service. |
32-
| Destroy Instance | Destroys an instance of an attestation service. |
33-
| Add Policy Certificate | Addition of a certificate to the current set of policy management certificates. |
34-
| Remove Policy Certificate | Remove a certificate from the current set of policy management certificates. |
35-
| Set Current Policy | Sets the attestation policy for a given TEE type. |
36-
| Reset Attestation Policy | Resets the attestation policy for a given TEE type. |
37-
| Prepare to Update Policy | Prepare to update attestation policy for a given TEE type. |
38-
| Rehydrate Tenants After Disaster | Re-seals all of the attestation tenants on this instance of the attestation service. This can only be performed by Attestation Service admins. |
28+
Individual blobs are stored as text, formatted as a JSON blob. Let’s look at an example log entry:
3929

40-
### Collected information
41-
For each of these events, Azure Attestation collects the following information:
4230

43-
- Operation Name
44-
- Operation Success
45-
- Operation Caller, which could be any of the following:
46-
- Azure AD UPN
47-
- Object ID
48-
- Certificate
49-
- Azure AD Tenant ID
50-
- Operation Target, which could be any of the following:
51-
- Environment
52-
- Service Region
53-
- Service Role
54-
- Service Role Instance
55-
- Resource ID
56-
- Resource Region
31+
```json
32+
{
33+
"Time": "2021-11-03T19:33:54.3318081Z",
34+
"resourceId": "/subscriptions/<subscription ID>/resourceGroups/<resource group name>/providers/Microsoft.Attestation/attestationProviders/<instance name>",
35+
"region": "EastUS",
36+
"operationName": "AttestSgxEnclave",
37+
"category": "Operational",
38+
"resultType": "Succeeded",
39+
"resultSignature": "400",
40+
"durationMs": 636,
41+
"callerIpAddress": "::ffff:24.17.183.201",
42+
"traceContext": "{\"traceId\":\"e4c24ac88f33c53f875e5141a0f4ce13\",\"parentId\":\"0000000000000000\",}",
43+
"identity": "{\"callerAadUPN\":\"[email protected]\",\"callerAadObjectId\":\"6ab02abe-6ca2-44ac-834d-42947dbde2b2\",\"callerId\":\"[email protected]\"}",
44+
"uri": "https://deschumatestrp.eus.test.attest.azure.net:443/attest/SgxEnclave?api-version=2018-09-01-preview",
45+
"level": "Informational",
46+
"location": "EastUS",
47+
"properties":
48+
{
49+
"failureResourceId": "",
50+
"failureCategory": "None",
51+
"failureDetails": "",
52+
"infoDataReceived":
53+
{
54+
"Headers":
55+
{
56+
"User-Agent": "PostmanRuntime/7.28.4"
57+
},
58+
"HeaderCount": 10,
59+
"ContentType": "application/json",
60+
"ContentLength": 6912,
61+
"CookieCount": 0,
62+
"TraceParent": ""
63+
}
64+
}
65+
}
66+
```
5767

58-
### Sample Audit log
68+
Most of these fields are documented in the [Top-level common schema](/azure-monitor/essentials/resource-logs-schema#top-level-common-schema). The following table lists the field names and descriptions for the entries not included in the top-level common schema:
5969

60-
Audit logs are provided in JSON format. Here is an example of what an audit log may look like.
70+
| Field Name | Description |
71+
|------------------------------------------|-----------------------------------------------------------------------------------------------|
72+
| traceContext | JSON blob representing the W3C trace-context |
73+
| uri | Request URI |
6174

62-
```json
63-
{
64-
"operationName": "SetCurrentPolicy",
65-
"resultType": "Success",
66-
"resultDescription": null,
67-
"auditEventCategory": [
68-
"ApplicationManagement"
69-
],
70-
"nCloud": null,
71-
"requestId": null,
72-
"callerIpAddress": null,
73-
"callerDisplayName": null,
74-
"callerIdentities": [
75-
{
76-
"callerIdentityType": "ObjectID",
77-
"callerIdentity": "<some object ID>"
78-
},
79-
{
80-
"callerIdentityType": "TenantId",
81-
"callerIdentity": "<some tenant ID>"
82-
}
83-
],
84-
"targetResources": [
85-
{
86-
"targetResourceType": "Environment",
87-
"targetResourceName": "PublicCloud"
88-
},
89-
{
90-
"targetResourceType": "ServiceRegion",
91-
"targetResourceName": "EastUS2"
92-
},
93-
{
94-
"targetResourceType": "ServiceRole",
95-
"targetResourceName": "AttestationRpType"
96-
},
97-
{
98-
"targetResourceType": "ServiceRoleInstance",
99-
"targetResourceName": "<some service role instance>"
100-
},
101-
{
102-
"targetResourceType": "ResourceId",
103-
"targetResourceName": "/subscriptions/<some subscription ID>/resourceGroups/<some resource group name>/providers/Microsoft.Attestation/attestationProviders/<some instance name>"
104-
},
105-
{
106-
"targetResourceType": "ResourceRegion",
107-
"targetResourceName": "EastUS2"
108-
}
109-
],
110-
"ifxAuditFormat": "Json",
111-
"env_ver": "2.1",
112-
"env_name": "#Ifx.AuditSchema",
113-
"env_time": "2020-11-23T18:23:29.9427158Z",
114-
"env_epoch": "MKZ6G",
115-
"env_seqNum": 1277,
116-
"env_popSample": 0.0,
117-
"env_iKey": null,
118-
"env_flags": 257,
119-
"env_cv": "##00000000-0000-0000-0000-000000000000_00000000-0000-0000-0000-000000000000_00000000-0000-0000-0000-000000000000",
120-
"env_os": null,
121-
"env_osVer": null,
122-
"env_appId": null,
123-
"env_appVer": null,
124-
"env_cloud_ver": "1.0",
125-
"env_cloud_name": null,
126-
"env_cloud_role": null,
127-
"env_cloud_roleVer": null,
128-
"env_cloud_roleInstance": null,
129-
"env_cloud_environment": null,
130-
"env_cloud_location": null,
131-
"env_cloud_deploymentUnit": null
132-
}
133-
```
75+
The properties contain additional Azure attestation specific context:
76+
77+
| Field Name | Description |
78+
|------------------------------------------|-----------------------------------------------------------------------------------------------|
79+
| failureResourceId | Resource ID of component which resulted in request failure |
80+
| failureCategory | Broad category indicating category of a request failure. Includes categories such as AzureNetworkingPhysical, AzureAuthorization etc. |
81+
| failureDetails | Detailed information about a request failure, if available |
82+
| infoDataReceived | Information about the request received from the client. Includes some HTTP headers, the number of headers received, the content type and content length |
83+
84+
## Next steps
85+
- [How to enable Microsoft Azure Attestation logging ](azure-diagnostic-monitoring.md)

articles/attestation/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ OE standardizes specific requirements for verification of an enclave evidence. T
4646

4747
Client applications can be designed to take advantage of TPM attestation by delegating security-sensitive tasks to only take place after a platform has been validated to be secure. Such applications can then make use of Azure Attestation to routinely establish trust in the platform and its ability to access sensitive data.
4848

49-
### Azure Confidential VM attestation
49+
### AMD SEV-SNP attestation
5050

5151
Azure [Confidential VM](../confidential-computing/confidential-vm-overview.md) (CVM) is based on [AMD processors with SEV-SNP technology](../confidential-computing/virtual-machine-solutions-amd.md) and aims to improve VM security posture by removing trust in host, hypervisor and Cloud Service Provider (CSP). To achieve this, CVM offers VM OS disk encryption option with platform-managed keys and binds the disk encryption keys to the virtual machine's TPM. When a CVM boots up, SNP report containing the guest VM firmware measurements will be sent to Azure Attestation. The service validates the measurements and issues an attestation token that is used to release keys from [Managed-HSM](../key-vault/managed-hsm/overview.md) or [Azure Key Vault](../key-vault/general/basic-concepts.md). These keys are used to decrypt the vTPM state of the guest VM, unlock the OS disk and start the CVM. The attestation and key release process is performed automatically on each CVM boot, and the process ensures the CVM boots up only upon successful attestation of the hardware.
5252

articles/attestation/toc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@
4747
href: claim-sets.md
4848
- name: Workflow
4949
href: workflow.md
50+
- name: Azure Attestation logging
51+
href: audit-logs.md
5052
- name: References
5153
items:
5254
- name: Regional availability

articles/azure-monitor/app/troubleshoot-portal-connectivity.md

Lines changed: 0 additions & 24 deletions
This file was deleted.

articles/azure-monitor/logs/cost-logs.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,20 +41,16 @@ Some solutions have more specific policies about free data ingestion. For exampl
4141
See the documentation for different services and solutions for any unique billing calculations.
4242

4343
## Commitment Tiers
44-
In addition to the Pay-As-You-Go model, Log Analytics has **Commitment Tiers**, which can save you as much as 30 percent compared to the Pay-As-You-Go price. With commitment tier pricing, you can commit to buy data ingestion starting at 100 GB/day at a lower price than Pay-As-You-Go pricing. Any usage above the commitment level (overage) is billed at that same price per GB as provided by the current commitment tier. The commitment tiers have a 31-day commitment period from the time a commitment tier is selected.
44+
In addition to the Pay-As-You-Go model, Log Analytics has **Commitment Tiers**, which can save you as much as 30 percent compared to the Pay-As-You-Go price. With commitment tier pricing, you can commit to buy data ingestion for a workspace, starting at 100 GB/day, at a lower price than Pay-As-You-Go pricing. Any usage above the commitment level (overage) is billed at that same price per GB as provided by the current commitment tier. The commitment tiers have a 31-day commitment period from the time a commitment tier is selected.
4545

4646
- During the commitment period, you can change to a higher commitment tier (which restarts the 31-day commitment period), but you can't move back to Pay-As-You-Go or to a lower commitment tier until after you finish the commitment period.
4747
- At the end of the commitment period, the workspace retains the selected commitment tier, and the workspace can be moved to Pay-As-You-Go or to a different commitment tier at any time.
4848

49-
Billing for the commitment tiers is done on a daily basis. See [Azure Monitor pricing](https://azure.microsoft.com/pricing/details/monitor/) for a detailed listing of the commitment tiers and their prices.
49+
Billing for the commitment tiers is done per workspace on a daily basis. If the workspace is part of a [dedicated cluster](#dedicated-clusters), the billing is done for the cluster (see below). See [Azure Monitor pricing](https://azure.microsoft.com/pricing/details/monitor/) for a detailed listing of the commitment tiers and their prices.
5050

5151
> [!TIP]
5252
> The **Usage and estimated costs** menu item for each Log Analytics workspace hows an estimate of your monthly charges at each commitment level. You should periodically review this information to determine if you can reduce your charges by moving to another tier. See [Usage and estimated costs](../usage-estimated-costs.md#usage-and-estimated-costs) for information on this view.
5353
54-
55-
> [!NOTE]
56-
> Starting June 2, 2021, **Capacity Reservations** were renamed to **Commitment Tiers**. Data collected above your commitment tier level (overage) is now billed at the same price-per-GB as the current commitment tier level, lowering costs compared to the old method of billing at the Pay-As-You-Go rate, and reducing the need for users with large data volumes to fine-tune their commitment level. Three new commitment tiers were also added: 1000, 2000, and 5000 GB/day.
57-
5854
## Dedicated clusters
5955
An [Azure Monitor Logs dedicated cluster](logs-dedicated-clusters.md) is a collection of workspaces in a single managed Azure Data Explorer cluster. Dedicated clusters support advanced features such as [customer-managed keys](customer-managed-keys.md) and use the same commitment tier pricing model as workspaces although they must have a commitment level of at least 500 GB/day. Any usage above the commitment level (overage) is billed at that same price per GB as provided by the current commitment tier. There is no Pay-As-You-Go option for clusters.
6056

articles/azure-monitor/toc.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -785,10 +785,6 @@ items:
785785
href: app/app-insights-overview.md
786786
- name: FAQ
787787
href: /azure/azure-monitor/faq#application-insights
788-
- name: Troubleshooting
789-
items:
790-
- name: Error retrieving data in Portal
791-
href: app/troubleshoot-portal-connectivity.md
792788
- name: Auto-instrumentation
793789
items:
794790
- name: Overview

articles/azure-monitor/whats-new.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ This article lists significant changes to Azure Monitor documentation.
2929

3030
**New articles**
3131

32-
- [Error retrieving data message on Application Insights portal](app/troubleshoot-portal-connectivity.md)
3332
- [Troubleshooting Azure Application Insights auto-instrumentation](app/auto-instrumentation-troubleshoot.md)
3433

3534
**Updated articles**

0 commit comments

Comments
 (0)