Skip to content

Commit fc23773

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into ConvLims
2 parents a88e849 + b270ce4 commit fc23773

29 files changed

+330
-412
lines changed

.openpublishing.redirection.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4162,6 +4162,21 @@
41624162
"redirect_url": "/azure/service-fabric/service-fabric-best-practices-security",
41634163
"redirect_document_id": false
41644164
},
4165+
{
4166+
"source_path_from_root": "/articles/service-fabric/service-fabric-diagnostics-overview.md",
4167+
"redirect_url": "/azure/service-fabric/monitor-service-fabric",
4168+
"redirect_document_id": false
4169+
},
4170+
{
4171+
"source_path_from_root": "/articles/service-fabric/service-fabric-diagnostics-event-generation-perf.md",
4172+
"redirect_url": "/azure/service-fabric/monitor-service-fabric-reference#performance-metrics",
4173+
"redirect_document_id": false
4174+
},
4175+
{
4176+
"source_path_from_root": "/articles/service-fabric/service-fabric-diagnostics-event-generation-app.md",
4177+
"redirect_url": "/azure/service-fabric/monitor-service-fabric#application-monitoring",
4178+
"redirect_document_id": false
4179+
},
41654180
{
41664181
"source_path_from_root": "/articles/virtual-desktop/partners.md",
41674182
"redirect_url": "https://azuremarketplace.microsoft.com/marketplace/apps?page=1&search=azure%20virtual%20desktop",

articles/ai-studio/tutorials/copilot-sdk-build-rag.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ This system is able to interpret the intent of the query "how much does it cost?
393393

394394
If you navigate to the trace from this flow run, you see this in action. The local traces link shows in the console output before the result of the flow test run.
395395

396-
:::image type="content" source="../media/tutorials/develop-rag-copilot-sdk/trace-for-chat-history.png" alt-text="Screenshot shows the console output for the pf flow.":::
396+
:::image type="content" source="../media/tutorials/develop-rag-copilot-sdk/trace-for-chat-history.png" alt-text="Screenshot shows the console output for the pf flow." lightbox="../media/tutorials/develop-rag-copilot-sdk/trace-for-chat-history.png" :::
397397

398398
## Clean up resources
399399

articles/governance/policy/concepts/policy-for-kubernetes.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,6 +606,25 @@ Finally, to identify the AKS cluster version that you're using, follow the linke
606606

607607
### Add-on versions available per each AKS cluster version
608608

609+
#### 1.7.0
610+
Introducing expansion, a shift left feature that lets you know up front whether your workload resources (Deployments, ReplicaSets, Jobs, etc.) will produce admissible pods. Expansion shouldn't change the behavior of your policies; rather, it just shifts Gatekeeper's evaluation of pod-scoped policies to occur at workload admission time rather than pod admission time. However, to perform this evaluation it must generate and evaluate a what-if pod that is based on the pod spec defined in the workload, which may have incomplete metadata. For instance, the what-if pod will not contain the proper owner references. Because of this small risk of policy behavior changing, we're introducing expansion as disabled by default. To enable expansion for a given policy definition, set `.policyRule.then.details.source` to `All`. Built-ins will be updated soon to enable parameterization of this field. If you test your policy definition and find that the what-if pod being generated for evaluation purposes is incomplete, you can also use a mutation with source `Generated` to mutate the what-if pods. For more information on this option, view the [Gatekeeper documentation](https://open-policy-agent.github.io/gatekeeper/website/docs/expansion#mutating-example).
611+
612+
Security improvements.
613+
- Released July 2024
614+
- Kubernetes 1.27+
615+
- Gatekeeper 3.16.3
616+
617+
#### 1.6.1
618+
Security improvements.
619+
- Released May 2024
620+
- Gatekeeper 3.14.2
621+
622+
#### 1.5.0
623+
Security improvements.
624+
- Released May 2024
625+
- Kubernetes 1.27+
626+
- Gatekeeper 3.16.3
627+
609628
#### 1.4.0
610629

611630
Enables mutation and external data by default. The additional mutating webhook and increased validating webhook timeout cap might add latency to calls in the worst case. Also introduces support for viewing policy definition and set definition version in compliance results.

articles/service-fabric/monitor-service-fabric-reference.md

Lines changed: 67 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ See [Monitor Service Fabric](monitor-service-fabric.md) for details on the data
1818
Azure Monitor doesn't collect any platform metrics or resource logs for Service Fabric. You can monitor and collect:
1919

2020
- Service Fabric system, node, and application events. For the full event listing, see [List of Service Fabric events](service-fabric-diagnostics-event-generation-operational.md).
21-
- Windows performance counters on nodes and applications. For the list of performance counters, see [Performance metrics](service-fabric-diagnostics-event-generation-perf.md).
21+
- Windows performance counters on nodes and applications. For the list of performance counters, see [Performance metrics](#performance-metrics).
2222
- Cluster, node, and system service health data. You can use the [FabricClient.HealthManager property](/dotnet/api/system.fabric.fabricclient.healthmanager) to get the health client to use for health related operations, like report health or get entity health.
2323
- Metrics for the guest operating system (OS) that runs on a cluster node, through one or more agents that run on the guest OS.
2424

@@ -27,9 +27,74 @@ Azure Monitor doesn't collect any platform metrics or resource logs for Service
2727
> [!NOTE]
2828
> The Azure Monitor agent replaces the previously-used Azure Diagnostics extension and Log Analytics agent. For more information, see [Overview of Azure Monitor agents](/azure/azure-monitor/agents/agents-overview).
2929
30+
## Performance metrics
31+
32+
Metrics should be collected to understand the performance of your cluster as well as the applications running in it. For Service Fabric clusters, we recommend collecting the following performance counters.
33+
34+
### Nodes
35+
36+
For the machines in your cluster, consider collecting the following performance counters to better understand the load on each machine and make appropriate cluster scaling decisions.
37+
38+
| Counter Category | Counter Name |
39+
| --- | --- |
40+
| Logical Disk | Logical Disk Free Space |
41+
| PhysicalDisk(per Disk) | Avg. Disk Read Queue Length |
42+
| PhysicalDisk(per Disk) | Avg. Disk Write Queue Length |
43+
| PhysicalDisk(per Disk) | Avg. Disk sec/Read |
44+
| PhysicalDisk(per Disk) | Avg. Disk sec/Write |
45+
| PhysicalDisk(per Disk) | Disk Reads/sec |
46+
| PhysicalDisk(per Disk) | Disk Read Bytes/sec |
47+
| PhysicalDisk(per Disk) | Disk Writes/sec |
48+
| PhysicalDisk(per Disk) | Disk Write Bytes/sec |
49+
| Memory | Available MBytes |
50+
| PagingFile | % Usage |
51+
| Processor(Total) | % Processor Time |
52+
| Process (per service) | % Processor Time |
53+
| Process (per service) | ID Process |
54+
| Process (per service) | Private Bytes |
55+
| Process (per service) | Thread Count |
56+
| Process (per service) | Virtual Bytes |
57+
| Process (per service) | Working Set |
58+
| Process (per service) | Working Set - Private |
59+
| Network Interface(all-instances) | Bytes recd |
60+
| Network Interface(all-instances) | Bytes sent |
61+
| Network Interface(all-instances) | Bytes total |
62+
| Network Interface(all-instances) | Output Queue Length |
63+
| Network Interface(all-instances) | Packets Outbound Discarded |
64+
| Network Interface(all-instances) | Packets Received Discarded |
65+
| Network Interface(all-instances) | Packets Outbound Errors |
66+
| Network Interface(all-instances) | Packets Received Errors |
67+
68+
### .NET applications and services
69+
70+
Collect the following counters if you are deploying .NET services to your cluster.
71+
72+
| Counter Category | Counter Name |
73+
| --- | --- |
74+
| .NET CLR Memory (per service) | Process ID |
75+
| .NET CLR Memory (per service) | # Total committed Bytes |
76+
| .NET CLR Memory (per service) | # Total reserved Bytes |
77+
| .NET CLR Memory (per service) | # Bytes in all Heaps |
78+
| .NET CLR Memory (per service) | Large Object Heap size |
79+
| .NET CLR Memory (per service) | # GC Handles |
80+
| .NET CLR Memory (per service) | # Gen 0 Collections |
81+
| .NET CLR Memory (per service) | # Gen 1 Collections |
82+
| .NET CLR Memory (per service) | # Gen 2 Collections |
83+
| .NET CLR Memory (per service) | % Time in GC |
84+
85+
### Service Fabric's custom performance counters
86+
87+
Service Fabric generates a substantial amount of custom performance counters. If you have the SDK installed, you can see the comprehensive list on your Windows machine in your Performance Monitor application (Start > Performance Monitor).
88+
89+
In the applications you are deploying to your cluster, if you are using Reliable Actors, add counters from `Service Fabric Actor` and `Service Fabric Actor Method` categories (see [Service Fabric Reliable Actors Diagnostics](service-fabric-reliable-actors-diagnostics.md)).
90+
91+
If you use Reliable Services or Service Remoting, we similarly have `Service Fabric Service` and `Service Fabric Service Method` counter categories that you should collect counters from, see [monitoring with service remoting](service-fabric-reliable-serviceremoting-diagnostics.md) and [reliable services performance counters](service-fabric-reliable-services-diagnostics.md#performance-counters).
92+
93+
If you use Reliable Collections, we recommend adding the `Avg. Transaction ms/Commit` from the `Service Fabric Transactional Replicator` to collect the average commit latency per transaction metric.
94+
3095
[!INCLUDE [horz-monitor-ref-logs-tables](~/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-ref-logs-tables.md)]
3196

32-
### Service Fabric Clusters
97+
### Service Fabric clusters
3398
Microsoft.ServiceFabric/clusters
3499

35100
- [AzureActivity](/azure/azure-monitor/reference/tables/AzureActivity#columns)
@@ -44,4 +109,3 @@ Microsoft.ServiceFabric/clusters
44109
- See [Monitor Service Fabric](monitor-service-fabric.md) for a description of monitoring Service Fabric.
45110
- See [Monitor Azure resources with Azure Monitor](/azure/azure-monitor/essentials/monitor-azure-resource) for details on monitoring Azure resources.
46111
- See [List of Service Fabric events](service-fabric-diagnostics-event-generation-operational.md) for the list of Service Fabric system, node, and application events.
47-
- See [Performance metrics](service-fabric-diagnostics-event-generation-perf.md) for the list of Windows performance counters on nodes and applications.

0 commit comments

Comments
 (0)