Skip to content

Commit 80d5174

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into vnet-encrypt
2 parents a697012 + 4d3868e commit 80d5174

14 files changed

+43
-32
lines changed

articles/aks/image-cleaner.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Once `eraser-controller-manager` is deployed, the following steps will be taken
4747

4848
* It immediately starts the cleanup process and creates `eraser-aks-xxxxx` worker pods for each node.
4949
* There are three containers in each worker pod:
50-
* A **collector**, which collects unused images
50+
* A **collector**, which collects unused images.
5151
* A **trivy-scanner**, which leverages [trivy](https://github.com/aquasecurity/trivy) to scan image vulnerabilities.
5252
* A **remover**, which removes unused images with vulnerabilities.
5353
* After the cleanup process completes, the worker pod is deleted and the next scheduled cleanup happens according to the `--image-cleaner-interval-hours` you define.

articles/azure-monitor/agents/data-collection-log-json.md

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -146,34 +146,40 @@ Use the following ARM template to create a DCR for collecting text log files. In
146146
"type": "string",
147147
"metadata": {
148148
"description": "Unique name for the DCR. "
149-
},
149+
}
150150
},
151151
"location": {
152152
"type": "string",
153153
"metadata": {
154154
"description": "Region for the DCR. Must be the same location as the Log Analytics workspace. "
155+
}
155156
},
156157
"filePatterns": {
157158
"type": "string",
158159
"metadata": {
159160
"description": "Path on the local disk for the log file to collect. May include wildcards.Enter multiple file patterns separated by commas (AMA version 1.26 or higher required for multiple file patterns on Linux)."
160-
},
161+
}
161162
},
162163
"tableName": {
163164
"type": "string",
164165
"metadata": {
165166
"description": "Name of destination table in your Log Analytics workspace. "
166-
},
167+
}
167168
},
168169
"workspaceResourceId": {
169170
"type": "string",
170171
"metadata": {
171172
"description": "Resource ID of the Log Analytics workspace with the target table."
172-
},
173-
}
173+
}
174+
},
175+
"dataCollectionEndpointResourceId": {
176+
"type": "string",
177+
"metadata": { "description": "Resource ID of the Data Collection Endpoint to be used with this rule."
178+
}
179+
}
174180
},
175181
"variables": {
176-
"tableOutputStream": "['Custom-',concat(parameters('tableName'))]"
182+
"tableOutputStream": "[concat('Custom-', parameters('tableName'))]]"
177183
},
178184
"resources": [
179185
{
@@ -191,7 +197,7 @@ Use the following ARM template to create a DCR for collecting text log files. In
191197
},
192198
{
193199
"name": "FilePath",
194-
"type": "String"
200+
"type": "string"
195201
},
196202
{
197203
"name": "MyStringColumn",
@@ -207,7 +213,7 @@ Use the following ARM template to create a DCR for collecting text log files. In
207213
},
208214
{
209215
"name": "MyBooleanColumn",
210-
"type": "bool"
216+
"type": "boolean"
211217
}
212218
]
213219
}
@@ -237,7 +243,7 @@ Use the following ARM template to create a DCR for collecting text log files. In
237243
"dataFlows": [
238244
{
239245
"streams": [
240-
"Custom-Json-dataSource"
246+
"Custom-JSONLog-stream"
241247
],
242248
"destinations": [
243249
"workspace"
@@ -246,6 +252,7 @@ Use the following ARM template to create a DCR for collecting text log files. In
246252
"outputStream": "[variables('tableOutputStream')]"
247253
}
248254
]
255+
"dataCollectionEndpointId" : "[parameters('dataCollectionEndpointResourceId')]"
249256
}
250257
}
251258
]

articles/azure-monitor/includes/azure-monitor-app-insights-opentelemetry-faqs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ The following chart breaks out OpenTelemetry feature support for each language.
9494
| [Custom Events](../app/usage.md#track-user-interactions-with-custom-events) | :warning: | :warning: | :warning: | :white_check_mark: |
9595
| [Microsoft Entra authentication](../app/azure-ad-authentication.md) | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
9696
| [Live metrics](../app/live-stream.md) | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
97-
| [Live Metrics Filtering](../app/live-stream.md#select-and-filter-your-metrics) | :x: | :x: | :x: | :x: |
97+
| [Live Metrics Filtering](../app/live-stream.md#select-and-filter-your-metrics) | :white_check_mark: | :x: | :x: | :x: |
9898
| Detect Resource Context for VM/VMSS and App Service | :white_check_mark: | :x: | :white_check_mark: | :white_check_mark: |
9999
| Detect Resource Context for Azure Kubernetes Service (AKS) and Functions | :x: | :x: | :x: | :white_check_mark: |
100100
| Availability Testing Events generated using the Track Availability API | :x: | :x: | :x: | :white_check_mark: |
@@ -147,4 +147,4 @@ You could be trying to visualize raw text logs rather than OpenTelemetry traces.
147147

148148
In Application Insights, the 'Traces' table stores raw text logs for diagnostic purposes. They aid in identifying and correlating traces associated with user requests, other events, and exception reports. However, the 'Traces' table doesn't directly contribute to the end-to-end transaction view (waterfall chart) in visualization tools like Grafana.
149149

150-
With the growing adoption of cloud-native practices, there's an evolution in telemetry collection and terminology. OpenTelemetry became a standard for collecting and instrumenting telemetry data. In this context, the term 'Traces' took on a new meaning. Rather than raw logs, 'Traces' in OpenTelemetry refer to a richer, structured form of telemetry that includes spans, which represent individual units of work. These spans are crucial for constructing detailed transaction views, enabling better monitoring and diagnostics of cloud-native applications.
150+
With the growing adoption of cloud-native practices, there's an evolution in telemetry collection and terminology. OpenTelemetry became a standard for collecting and instrumenting telemetry data. In this context, the term 'Traces' took on a new meaning. Rather than raw logs, 'Traces' in OpenTelemetry refer to a richer, structured form of telemetry that includes spans, which represent individual units of work. These spans are crucial for constructing detailed transaction views, enabling better monitoring and diagnostics of cloud-native applications.

articles/copilot/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
href: deploy-vms-effectively.md
2323
- name: Build infrastructure and deploy workloads
2424
href: build-infrastructure-deploy-workloads.md
25-
- name: Use guided deployments
25+
- name: Use interactive deployments
2626
href: use-guided-deployments.md
2727
- name: Get monitoring information
2828
href: get-monitoring-information.md

articles/copilot/capabilities.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Use Microsoft Copilot in Azure to perform many basic tasks in the Azure portal o
3030
- Work smarter with Azure services:
3131
- [Deploy virtual machines effectively](deploy-vms-effectively.md)
3232
- [Build infrastructure and deploy workloads](build-infrastructure-deploy-workloads.md)
33-
- [Create resources using guided deployments](use-guided-deployments.md)
33+
- [Create resources using interactive deployments](use-guided-deployments.md)
3434
- [Work with AKS clusters efficiently](work-aks-clusters.md)
3535
- [Get information about Azure Monitor metrics and logs](get-monitoring-information.md)
3636
- [Work smarter with Azure Stack HCI](work-smarter-edge.md)

articles/copilot/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ conceptualContent:
6868
text: Build infrastructure and deploy workloads
6969
- url: ./use-guided-deployments.md
7070
itemType: get-started
71-
text: Create resources with guided deployments
71+
text: Create resources with interactive deployments
7272
- url: ./work-aks-clusters.md
7373
itemType: get-started
7474
text: Work with AKS clusters efficiently
13.1 KB
Loading
-41.6 KB
Loading
4.56 KB
Loading
-236 KB
Loading

0 commit comments

Comments
 (0)