Skip to content

Commit e979d9b

Browse files
authored
Merge pull request #278550 from MicrosoftDocs/main
Publish to live, Tuesday 4 AM PST, 6/18
2 parents e1c47df + 33a90bb commit e979d9b

37 files changed

+396
-162
lines changed

.openpublishing.redirection.azure-monitor.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@
1010
"redirect_url": "/azure/azure-monitor/vm/scom-managed-instance-overview",
1111
"redirect_document_id": false
1212
},
13+
{
14+
"source_path_from_root": "/articles/azure-monitor/vm/scom-managed-instance-overview.md",
15+
"redirect_url": "/azure/azure-monitor/scom-manage-instance/overview",
16+
"redirect_document_id": false
17+
},
1318
{
1419
"source_path_from_root": "/articles/azure-monitor/best-practices.md",
1520
"redirect_url": "/azure/azure-monitor/getting-started",

articles/ai-services/openai/how-to/gpt-with-vision.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ The following is a sample request body. The format is the same as the chat compl
4747
> [!IMPORTANT]
4848
> Remember to set a `"max_tokens"` value, or the return output will be cut off.
4949
50+
> [!IMPORTANT]
51+
> When uploading images, there is a limit of 10 images per chat request.
52+
5053
```json
5154
{
5255
"messages": [

articles/azure-functions/configure-monitoring.md

Lines changed: 83 additions & 72 deletions
Large diffs are not rendered by default.
3.29 KB
Loading
13.9 KB
Loading
-91.5 KB
Loading
17.4 KB
Loading
-39 KB
Loading
24.5 KB
Loading

articles/azure-monitor/agents/agents-overview.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,11 @@ View [supported operating systems for Azure Arc Connected Machine agent](../../a
228228
> [!NOTE]
229229
> CBL-Mariner 2.0's disk size is by default around 1GB to provide storage savings, compared to other Azure VMs that are around 30GB. However, the Azure Monitor Agent requires at least 4GB disk size in order to install and run successfully. Please check out [CBL-Mariner's documentation](https://eng.ms/docs/products/mariner-linux/gettingstarted/azurevm/azurevm#disk-size) for more information and instructions on how to increase disk size before installing the agent.
230230
231-
### Linux Hardening Standards
231+
### Hardening Standards
232+
233+
Azure Monitoring Agent supports most industry-standard hardening standards and is continuously tested and certified against these standards every release. All Azure Monitor Agent scenarios are designed from the ground up with with security in mind.
234+
235+
## Linux Hardening
232236

233237
The Azure Monitoring Agent for Linux now officially supports various hardening standards for Linux operating systems and distros. Every release of the agent is tested and certified against the supported hardening standards. We test against the images that are publicly available on the Azure Marketplace and published by CIS and only support the settings and hardening that are applied to those images. If you apply additional customizations on your own golden images, and those settings are not covered by the CIS images, it will be considered a non-supported scenario.
234238

@@ -241,6 +245,10 @@ Currently supported hardening standards:
241245
- FIPs
242246
- FedRamp
243247

248+
## Windows Hardening
249+
250+
Azure Monitoring Agent supports all standard Windows hardening standards, including STIG and FIPs, and is FedRamp compliant under Azure Monitor.
251+
244252
| Operating system | Azure Monitor agent <sup>1</sup> | Legacy Agent<sup>1</sup> |
245253
|:---|:---:|:---:|:---:|
246254
| CentOS Linux 7 || |

0 commit comments

Comments
 (0)