Skip to content

Commit 177ab4c

Browse files
authored
Merge pull request #267405 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 61cce11 + 4cacb1a commit 177ab4c

File tree

5 files changed

+33
-33
lines changed

5 files changed

+33
-33
lines changed

articles/azure-monitor/containers/container-insights-troubleshoot.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,41 +41,41 @@ To diagnose the problem if you can't view status information or no results are r
4141

4242
`kubectl get ds ama-logs --namespace=kube-system`
4343

44-
The output should resemble the following example, which indicates that it was deployed properly:
44+
The number of pods should be equal to the number of Linux nodes on the cluster. The output should resemble the following example, which indicates that it was deployed properly:
4545

4646
```
4747
User@aksuser:~$ kubectl get ds ama-logs --namespace=kube-system
48-
NAME DESIRED CURRENT READY UP-TO-DATE AVAILABLE NODE SELECTOR AGE
49-
ama-logs 2 2 2 2 2 beta.kubernetes.io/os=linux 1d
48+
NAME DESIRED CURRENT READY UP-TO-DATE AVAILABLE NODE SELECTOR AGE
49+
ama-logs 2 2 2 2 2 <none> 1d
5050
```
5151
5252
1. If you have Windows Server nodes, check the status of the agent by running the following command:
5353
54-
`kubectl get ds omsagent-win --namespace=kube-system`
54+
`kubectl get ds ama-logs-windows --namespace=kube-system`
5555
56-
The output should resemble the following example, which indicates that it was deployed properly:
56+
The number of pods should be equal to the number of Windows nodes on the cluster. The output should resemble the following example, which indicates that it was deployed properly:
5757
5858
```
5959
User@aksuser:~$ kubectl get ds ama-logs-windows --namespace=kube-system
60-
NAME DESIRED CURRENT READY UP-TO-DATE AVAILABLE NODE SELECTOR AGE
61-
ama-logs-windows 2 2 2 2 2 beta.kubernetes.io/os=windows 1d
60+
NAME DESIRED CURRENT READY UP-TO-DATE AVAILABLE NODE SELECTOR AGE
61+
ama-logs-windows 2 2 2 2 2 <none> 1d
6262
```
6363
64-
1. Check the deployment status with agent version **06072018** or later by using the following command:
64+
1. Check the deployment status by using the following command:
6565
66-
`kubectl get deployment ama-logs-rs -n=kube-system`
66+
`kubectl get deployment ama-logs-rs --namespace=kube-system`
6767
6868
The output should resemble the following example, which indicates that it was deployed properly:
6969
7070
```
71-
User@aksuser:~$ kubectl get deployment omsagent-rs -n=kube-system
72-
NAME DESIRED CURRENT UP-TO-DATE AVAILABLE AGE
73-
ama-logs 1 1 1 1 3h
71+
User@aksuser:~$ kubectl get deployment ama-logs-rs --namespace=kube-system
72+
NAME READY UP-TO-DATE AVAILABLE AGE
73+
ama-logs-rs 1/1 1 1 24d
7474
```
7575
7676
1. Check the status of the pod to verify that it's running by using the command `kubectl get pods --namespace=kube-system`.
7777
78-
The output should resemble the following example with a status of `Running` for the omsagent:
78+
The output should resemble the following example with a status of `Running` for ama-logs:
7979
8080
```
8181
User@aksuser:~$ kubectl get pods --namespace=kube-system
@@ -85,7 +85,7 @@ To diagnose the problem if you can't view status information or no results are r
8585
azure-vote-front-3826909965-30n62 1/1 Running 0 22d
8686
ama-logs-484hw 1/1 Running 0 1d
8787
ama-logs-fkq7g 1/1 Running 0 1d
88-
ama-logs-windows-6drwq 1/1 Running 0 1d
88+
ama-logs-windows-6drwq 1/1 Running 0 1d
8989
```
9090
9191
1. If the pods are in a running state, but there is no data in Log Analytics or data appears to only send during a certain part of the day, it might be an indication that the daily cap has been met. When this limit is met each day, data stops ingesting into the Log Analytics Workspace and resets at the reset time. For more information, see [Log Analytics Daily Cap](../../azure-monitor/logs/daily-cap.md#determine-your-daily-cap).

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -693,37 +693,37 @@ The number of pods should be equal to the number of Linux nodes on the cluster.
693693

694694
```output
695695
User@aksuser:~$ kubectl get ds ama-logs --namespace=kube-system
696-
NAME DESIRED CURRENT READY UP-TO-DATE AVAILABLE NODE SELECTOR AGE
697-
ama-logs 2 2 2 2 2 beta.kubernetes.io/os=linux 1d
696+
NAME DESIRED CURRENT READY UP-TO-DATE AVAILABLE NODE SELECTOR AGE
697+
ama-logs 2 2 2 2 2 <none> 1d
698698
```
699699

700700
**Verify that Windows nodes were deployed properly**
701701

702702
```
703-
kubectl get ds ama-metrics-win-node --namespace=kube-system
703+
kubectl get ds ama-logs-windows --namespace=kube-system
704704
```
705705

706706
The number of pods should be equal to the number of Windows nodes on the cluster. The output should resemble the following example:
707707

708708
```output
709709
User@aksuser:~$ kubectl get ds ama-logs-windows --namespace=kube-system
710-
NAME DESIRED CURRENT READY UP-TO-DATE AVAILABLE NODE SELECTOR AGE
711-
ama-logs-windows 2 2 2 2 2 beta.kubernetes.io/os=windows 1d
710+
NAME DESIRED CURRENT READY UP-TO-DATE AVAILABLE NODE SELECTOR AGE
711+
ama-logs-windows 2 2 2 2 2 <none> 1d
712712
```
713713

714714

715715
**Verify deployment of the Container insights solution**
716716

717717
```
718-
kubectl get deployment ama-logs-rs -n=kube-system
718+
kubectl get deployment ama-logs-rs --namespace=kube-system
719719
```
720720

721721
The output should resemble the following example:
722722

723723
```output
724-
User@aksuser:~$ kubectl get deployment ama-logs-rs -n=kube-system
725-
NAME DESIRED CURRENT UP-TO-DATE AVAILABLE AGE
726-
ama-logs-rs 1 1 1 1 3h
724+
User@aksuser:~$ kubectl get deployment ama-logs-rs --namespace=kube-system
725+
NAME READY UP-TO-DATE AVAILABLE AGE
726+
ama-logs-rs 1/1 1 1 24d
727727
```
728728

729729
**View configuration with CLI**

articles/azure-vmware/protect-azure-vmware-solution-with-application-gateway.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ The diagram shows how Application Gateway is used to protect Azure IaaS virtual
2828
:::image type="content" source="media/application-gateway/app-gateway-protects.png" alt-text="Diagram showing how Application Gateway protects Azure IaaS virtual machines (VMs), Azure Virtual Machine Scale Sets, or on-premises servers."lightbox="media/application-gateway/app-gateway-protects.png" border="false":::
2929

3030
> [!IMPORTANT]
31-
> Azure Application Gateway is currently the only supported method to expose web apps running on Azure VMware Solution VMs.
31+
> Azure Application Gateway is the preferred method to expose web apps running on Azure VMware Solution VMs.
3232
3333
The diagram shows the testing scenario used to validate the Application Gateway with Azure VMware Solution web applications.
3434

articles/iot-operations/manage-layered-network/howto-deploy-aks-layered-network.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ These steps deploy Layered Network Management to the AKS cluster. The cluster is
5454
You should see an output that looks like the following example:
5555

5656
```Output
57-
NAME READY STATUS RESTARTS AGE
57+
NAME READY STATUS RESTARTS AGE
5858
aio-lnm-operator-7db49dc9fd-kjf5x 1/1 Running 0 78s
5959
```
6060

@@ -137,9 +137,9 @@ These steps deploy Layered Network Management to the AKS cluster. The cluster is
137137
The output should look like:
138138

139139
```Output
140-
NAME READY STATUS RESTARTS AGE
141-
aio-lnm-operator-7db49dc9fd-kjf5x 1/1 Running 0 78s
142-
lnm-level4-7598574bf-2lgss 1/1 Running 0 4s
140+
NAME READY STATUS RESTARTS AGE
141+
aio-lnm-operator-7db49dc9fd-kjf5x 1/1 Running 0 78s
142+
aio-lnm-level4-7598574bf-2lgss 1/1 Running 0 4s
143143
```
144144

145145
1. To view the service, run:
@@ -151,8 +151,8 @@ These steps deploy Layered Network Management to the AKS cluster. The cluster is
151151
The output should look like the following example:
152152

153153
```Output
154-
NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE
155-
lnm-level4 LoadBalancer 10.0.141.101 20.81.111.118 80:30960/TCP,443:31214/TCP 29s
154+
NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE
155+
aio-lnm-level4 LoadBalancer 10.0.141.101 20.81.111.118 80:30960/TCP,443:31214/TCP 29s
156156
```
157157
1. To view the config maps, run:
158158

articles/postgresql/flexible-server/generative-ai-azure-cognitive.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
2-
title: Integrate with Azure Cognitive Services Preview
3-
description: Integrate Azure Database for PostgreSQL - Flexible Server with Azure Cognitive Services - Preview.
2+
title: Integrate Azure AI Language Services with Azure Database for PostgreSQL
3+
description: Implement scenarios like sentiment analysis with Cognitive Services and Azure Database for PostgreSQL.
44
author: mulander
55
ms.author: adamwolk
6-
ms.date: 12/12/2023
6+
ms.date: 2/26/2024
77
ms.service: postgresql
88
ms.subservice: flexible-server
99
ms.custom:

0 commit comments

Comments
 (0)