Skip to content

Commit ccc41d0

Browse files
authored
Merge pull request #265665 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 dd71632 + 5eb414c commit ccc41d0

File tree

5 files changed

+7
-11
lines changed

5 files changed

+7
-11
lines changed

articles/application-gateway/ingress-controller-install-existing.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,6 @@ Gateway should that become necessary
6363
helm init --tiller-namespace kube-system --service-account tiller-sa
6464
```
6565

66-
- *Kubernetes RBAC disabled* AKS cluster
67-
68-
```bash
69-
helm init
70-
```
71-
7266
2. Add the AGIC Helm repository:
7367
```bash
7468
helm repo add application-gateway-kubernetes-ingress https://appgwingress.blob.core.windows.net/ingress-azure-helm-package/

articles/application-gateway/ingress-controller-install-new.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ spec:
305305
- image: "mcr.microsoft.com/dotnet/samples:aspnetapp"
306306
name: aspnetapp-image
307307
ports:
308-
- containerPort: 80
308+
- containerPort: 8080
309309
protocol: TCP
310310
311311
---
@@ -320,7 +320,7 @@ spec:
320320
ports:
321321
- protocol: TCP
322322
port: 80
323-
targetPort: 80
323+
targetPort: 8080
324324
325325
---
326326
@@ -335,6 +335,7 @@ spec:
335335
- http:
336336
paths:
337337
- path: /
338+
pathType: Exact
338339
backend:
339340
service:
340341
name: aspnetapp

articles/azure-arc/data/validation-program.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ To see how all Azure Arc-enabled components are validated, see [Validation progr
104104

105105
|Solution and version | Kubernetes version | Azure Arc-enabled data services version | SQL engine version | PostgreSQL server version
106106
|-----|-----|-----|-----|-----|
107-
| [Wind River Cloud Platform 22.12](https://www.windriver.com/studio/operator/cloud-platform) | 1.24.4 | 1.21.0_2023-07-11 | 16.0.5100.7242 | Not validated |
107+
|[Wind River Cloud Platform 22.12](https://www.windriver.com/studio/operator/cloud-platform)|1.24.4|1.26.0_2023-12-12|16.0.5100.7246|Not validated|
108108
|Wind River Cloud Platform 22.06 | 1.23.1|1.9.0_2022-07-12 |16.0.312.4243| 12.3 (Ubuntu 12.3-1) |
109109

110110
## Data services validation process

articles/azure-monitor/containers/kubernetes-monitoring-disable.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,11 @@ The configuration change can take a few minutes to complete. Because Helm tracks
140140
141141
## Disable Prometheus
142142
143-
Use the following `az aks update` Azure CLI command with the `--disable-azure-monitor-metrics` parameter to remove the metrics add-on from your AKS cluster, and stop sending Prometheus metrics to Azure Monitor managed service for Prometheus. It doesn't remove the data already collected and stored in the Azure Monitor workspace for your cluster.
143+
Use the following `az aks update` Azure CLI command with the `--disable-azure-monitor-metrics` parameter to remove the metrics add-on from your AKS cluster or `az k8s-extension delete` Azure CLI command with the `--name azuremonitor-metrics` parameter to remove the metrics add-on from Arc-enabled cluster, and stop sending Prometheus metrics to Azure Monitor managed service for Prometheus. It doesn't remove the data already collected and stored in the Azure Monitor workspace for your cluster.
144144
145145
```azurecli
146146
az aks update --disable-azure-monitor-metrics -n <cluster-name> -g <cluster-resource-group>
147+
az k8s-extension delete --name azuremonitor-metrics --cluster-name <cluster-name> --resource-group <cluster-resource-group> --cluster-type connectedClusters
147148
```
148149

149150
This command performs the following actions:

articles/stream-analytics/stream-analytics-resource-model.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Once you have developed your job by configuring inputs, output and a query, you
3333
When your job is started, the Stream Analytics service takes care of compiling your query and assigns certain amount of compute and memory based on the number of Streaming Units configured in your job. You don't have to worry about any underlying infrastructure as cluster maintenance, security patches as that is automatically taken care by the platform. When running jobs in the Standard SKU, you are charged for the Streaming Units only when the job runs.
3434

3535
## Stream Analytics cluster
36-
By default, Stream Analytics jobs run in the Standard multi-tenant environment which forms the Standard SKU. Stream Analytics also provides a Dedicated SKU where you can provision an entire Stream Analytics cluster that belongs to you. Doing so gives you full control of which jobs run on your cluster. The minimum size of a Stream Analytics cluster is 36 Streaming Units and you are charged for the entire cluster capacity from when it gets provisioned. You can learn more about the [benefits of Stream Analytics clusters and when to use it](cluster-overview.md).
36+
By default, Stream Analytics jobs run in the Standard multi-tenant environment which forms the Standard SKU. Stream Analytics also provides a Dedicated SKU where you can provision an entire Stream Analytics cluster that belongs to you. Doing so gives you full control of which jobs run on your cluster. The minimum size of a Stream Analytics cluster is 12 Streaming Units and you are charged for the entire cluster capacity from when it gets provisioned. You can learn more about the [benefits of Stream Analytics clusters and when to use it](cluster-overview.md).
3737

3838
:::image type="content" source="./media/stream-analytics-resource-model/stream-analytics-standard-sku.png" alt-text="Diagram that shows Standard multi-tenant environment in Stream Analytics." border="false":::
3939

0 commit comments

Comments
 (0)