Skip to content

Commit d8c9cdc

Browse files
authored
Merge pull request #285806 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 7697bee + 6d98c72 commit d8c9cdc

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

articles/azure-monitor/logs/data-retention-configure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ Status code: 200
133133

134134
To set the default interactive retention period of Analytics tables within a Log Analytics workspace, run the [az monitor log-analytics workspace update](/cli/azure/monitor/log-analytics/workspace/#az-monitor-log-analytics-workspace-update) command and pass the `--retention-time` parameter.
135135

136-
This example sets the table's interactive retention to 30 days, and the total retention to two years, which means that the long-term retention period is 23 months:
136+
This example sets the table's interactive retention to 30 days:
137137

138138
```azurecli
139139
az monitor log-analytics workspace update --resource-group myresourcegroup --retention-time 30 --workspace-name myworkspace

articles/container-registry/container-registry-artifact-cache.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ Before configuring the Credentials, you have to create and store secrets in the
170170
```azurecli-interactive
171171
az acr credential-set create
172172
-r MyRegistry \
173-
-n MyRule \
173+
-n MyDockerHubCredSet \
174174
-l docker.io \
175175
-u https://MyKeyvault.vault.azure.net/secrets/usernamesecret \
176176
-p https://MyKeyvault.vault.azure.net/secrets/passwordsecret
@@ -181,15 +181,15 @@ Before configuring the Credentials, you have to create and store secrets in the
181181
- For example, to update the username or password KV secret ID on the credentials for a given `MyRegistry` Azure Container Registry.
182182
183183
```azurecli-interactive
184-
az acr credential-set update -r MyRegistry -n MyRule -p https://MyKeyvault.vault.azure.net/secrets/newsecretname
184+
az acr credential-set update -r MyRegistry -n MyDockerHubCredSet -p https://MyKeyvault.vault.azure.net/secrets/newsecretname
185185
```
186186
187-
3. Run [az-acr-credential-set-show][az-acr-credential-set-show] to show the credentials.
187+
3. Run [az acr credential-set show][az-acr-credential-set-show] to show the credentials.
188188
189-
- For example, to show the credentials for a given `MyRegistry` Azure Container Registry.
189+
- For example, to show a credential set in a given `MyRegistry` Azure Container Registry.
190190
191191
```azurecli-interactive
192-
az acr credential-set show -r MyRegistry -n MyCredSet
192+
az acr credential-set show -r MyRegistry -n MyDockerHubCredSet
193193
```
194194
195195
### Configure and create a cache rule with the credentials
@@ -199,7 +199,7 @@ Before configuring the Credentials, you have to create and store secrets in the
199199
- For example, to create a cache rule with the credentials for a given `MyRegistry` Azure Container Registry.
200200
201201
```azurecli-interactive
202-
az acr cache create -r MyRegistry -n MyRule -s docker.io/library/ubuntu -t ubuntu -c MyCredSet
202+
az acr cache create -r MyRegistry -n MyRule -s docker.io/library/ubuntu -t ubuntu -c MyDockerHubCredSet
203203
```
204204
205205
2. Run [az acr cache update][az-acr-cache-update] command to update the credentials on a cache rule.
@@ -230,7 +230,7 @@ Before configuring the Credentials, you have to create and store secrets in the
230230
231231
```azurecli-interactive
232232
PRINCIPAL_ID=$(az acr credential-set show
233-
-n MyCredSet \
233+
-n MyDockerHubCredSet \
234234
-r MyRegistry \
235235
--query 'identity.principalId' \
236236
-o tsv)
@@ -282,12 +282,12 @@ Before configuring the Credentials, you have to create and store secrets in the
282282
az acr credential-set list -r MyRegistry
283283
```
284284
285-
4. Run [az-acr-credential-set-delete][az-acr-credential-set-delete] to delete the credentials.
285+
4. Run [az acr credential-set delete][az-acr-credential-set-delete] to delete the credentials.
286286
287287
- For example, to delete the credentials for a given `MyRegistry` Azure Container Registry.
288288
289289
```azurecli-interactive
290-
az acr credential-set delete -r MyRegistry -n MyCredSet
290+
az acr credential-set delete -r MyRegistry -n MyDockerHubCredSet
291291
```
292292
293293
:::zone-end

0 commit comments

Comments
 (0)