Skip to content

Commit de94c9e

Browse files
authored
Merge pull request #264718 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 41d6d63 + 1be1b25 commit de94c9e

File tree

4 files changed

+23
-9
lines changed

4 files changed

+23
-9
lines changed

articles/azure-monitor/containers/container-insights-metric-alerts.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,13 @@ The methods currently available for creating Prometheus alert rules are Azure Re
4141

4242
1. Download the template that includes the set of alert rules you want to enable. For a list of the rules for each, see [Alert rule details](#alert-rule-details).
4343

44-
- [Community alerts](https://aka.ms/azureprometheus-communityalerts)
45-
- [Recommended alerts](https://aka.ms/azureprometheus-recommendedalerts)
44+
[Recommended metric alerts](https://aka.ms/azureprometheus-recommendedmetricalerts)
4645

4746
2. Deploy the template by using any standard methods for installing ARM templates. For guidance, see [ARM template samples for Azure Monitor](../resource-manager-samples.md#deploy-the-sample-templates).
4847

4948
### [Bicep template](#tab/bicep)
5049

51-
1. To deploy community and recommended alerts, follow this [template](https://aka.ms/azureprometheus-alerts-bicep) and follow the README.md file in the same folder for how to deploy.
50+
1. To deploy recommended metric alerts, follow this [template](https://aka.ms/azureprometheus-recommendedmetricalertsbicep) and follow the README.md file in the same folder for how to deploy.
5251

5352

5453

@@ -111,7 +110,7 @@ The configuration change can take a few minutes to finish before it takes effect
111110
### Prerequisites
112111
113112
You might need to enable collection of custom metrics for your cluster. See [Metrics collected by Container insights](container-insights-custom-metrics.md).
114-
113+
115114
### Enable and configure metric alert rules
116115
117116
#### [Azure portal](#tab/azure-portal)
@@ -181,7 +180,7 @@ The following sections present information on the alert rules provided by Contai
181180
182181
### Community alert rules
183182
184-
These handpicked alerts come from the Prometheus community. Source code for these mixin alerts can be found in [GitHub](https://aka.ms/azureprometheus-communityalerts):
183+
These handpicked alerts come from the Prometheus community. Source code for these mixin alerts can be found in [GitHub](https://aka.ms/azureprometheus-recommendedmetricalerts):
185184
186185
| Alert name | Description | Default threshold |
187186
|:---|:---|:---|
@@ -207,7 +206,7 @@ These handpicked alerts come from the Prometheus community. Source code for thes
207206
### Recommended alert rules
208207
209208
The following table lists the recommended alert rules that you can enable for either Prometheus metrics or custom metrics.
210-
Source code for the recommended alerts can be found in [GitHub](https://github.com/Azure/prometheus-collector/blob/68ab5b195a77d72b0b8e36e5565b645c3d1e2d5d/mixins/kubernetes/rules/recording_and_alerting_rules/templates/ci_recommended_alerts.json):
209+
Source code for the recommended alerts can be found in [GitHub](https://aka.ms/azureprometheus-recommendedmetricalerts):
211210
212211
| Prometheus alert name | Custom metric alert name | Description | Default threshold |
213212
|:---|:---|:---|:---|

articles/azure-resource-manager/bicep/bicep-extensibility-kubernetes-provider.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,21 @@ ms.date: 04/18/2023
1010

1111
The Kubernetes provider allows you to create Kubernetes resources directly with Bicep. Bicep can deploy anything that can be deployed with the [Kubernetes command-line client (kubectl)](https://kubernetes.io/docs/reference/kubectl/kubectl/) and a [Kubernetes manifest file](../../aks/concepts-clusters-workloads.md#deployments-and-yaml-manifests).
1212

13+
> [!NOTE]
14+
> Kubernetes provider is not currently supported for private clusters:
15+
>
16+
> ```json
17+
> resource AKS 'Microsoft.ContainerService/managedClusters@2023-01-02-preview' = {
18+
> properties: {
19+
> "apiServerAccessProfile": {
20+
> "enablePrivateCluster": "true"
21+
> }
22+
> }
23+
> }
24+
>
25+
> ```
26+
>
27+
1328
## Enable the preview feature
1429
1530
This preview feature can be enabled by configuring the [bicepconfig.json](./bicep-config.md):

articles/machine-learning/how-to-r-modify-script-for-production.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ mlflow_log_param(<key-name>, <value>)
252252

253253
## Create an environment
254254

255-
To run your R script, you'll use the `ml` extension for Azure CLI, also referred to as CLI v2. The `ml` command uses a YAML job definitions file. For more information about submitting jobs with `az ml`, see [Train models with Azure Machine Learning CLI](how-to-train-model.md?tabs=azurecli#4-submit-the-training-job).
255+
To run your R script, you'll use the `ml` extension for Azure CLI, also referred to as CLI v2. The `ml` command uses a YAML job definitions file. For more information about submitting jobs with `az ml`, see [Train models with Azure Machine Learning CLI](how-to-train-model.md?tabs=azurecli#3-submit-the-training-job).
256256

257257
The YAML job file specifies an [environment](concept-environments.md). You'll need to create this environment in your workspace before you can run the job.
258258

articles/machine-learning/how-to-train-model.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ When you train using the REST API, data and training scripts must be uploaded to
136136
### 2. Create a compute resource for training
137137

138138
> [!NOTE]
139-
> To try [serverless compute](./how-to-use-serverless-compute.md), skip this step and proceed to [ 4. Submit the training job](#4-submit-the-training-job).
139+
> To try [serverless compute](./how-to-use-serverless-compute.md), skip this step and proceed to [ 3. Submit the training job](#3-submit-the-training-job).
140140
141141
An Azure Machine Learning compute cluster is a fully managed compute resource that can be used to run the training job. In the following examples, a compute cluster named `cpu-compute` is created.
142142

@@ -181,7 +181,7 @@ curl -X PUT \
181181
182182
---
183183

184-
### 4. Submit the training job
184+
### 3. Submit the training job
185185

186186
# [Python SDK](#tab/python)
187187

0 commit comments

Comments
 (0)