Skip to content

Commit 4148bde

Browse files
authored
Merge pull request #222262 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 318f378 + c53c083 commit 4148bde

File tree

3 files changed

+23
-6
lines changed

3 files changed

+23
-6
lines changed

articles/active-directory/fundamentals/security-operations-infrastructure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ For information on what and how to monitor configuration information refer to:
212212
| What to monitor| Risk level| Where| Filter/sub-filter| Notes |
213213
| - | - | - | - | - |
214214
| Scheduler changes|High | PowerShell| Set-ADSyncScheduler| Look for modifications to schedule |
215-
| Changes to scheduled tasks| High | Azure AD Audit logs| Activity = 4699(S): A scheduled task was deleted<br>-or-<br>Activity = 4701(s): A scheduled task was disabled<br>-or-<br>Activity = 4701(s): A scheduled task was updated| Monitor all |
215+
| Changes to scheduled tasks| High | Azure AD Audit logs| Activity = 4699(S): A scheduled task was deleted<br>-or-<br>Activity = 4701(s): A scheduled task was disabled<br>-or-<br>Activity = 4702(s): A scheduled task was updated| Monitor all |
216216

217217
* For more information on logging PowerShell script operations, see [Enabling Script Block Logging](/powershell/module/microsoft.powershell.core/about/about_logging_windows), which is part of the PowerShell reference documentation.
218218

articles/iot-edge/production-checklist.md

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,18 @@ The following steps illustrate how to pull a Docker image of **edgeAgent** and *
251251

252252
1. In the text editor, change your image values under `[agent.config]`. Replace the values in brackets with your own.
253253

254-
```bash
254+
```toml
255255
[agent.config]
256-
Image = "<registry-name/server>/azureiotedge-agent:1.4"
256+
image = "<registry-name/server>/azureiotedge-agent:1.4"
257+
```
258+
259+
1. If your private registry requires authentication, set the authentication parameters in `[agent.config.auth]`.
260+
261+
```toml
262+
[agent.config.auth]
263+
serveraddress = "<login-server>" # Almost always equivalent to <registry-name/server>
264+
username = "<username>"
265+
password = "<password>"
257266
```
258267

259268
1. Save your changes and exit your text editor.
@@ -531,4 +540,4 @@ These constraints can be applied to individual modules by using create options i
531540
## Next steps
532541

533542
* Learn more about [IoT Edge automatic deployment](module-deployment-monitoring.md).
534-
* See how IoT Edge supports [Continuous integration and continuous deployment](how-to-continuous-integration-continuous-deployment.md).
543+
* See how IoT Edge supports [Continuous integration and continuous deployment](how-to-continuous-integration-continuous-deployment.md).

articles/service-fabric/service-fabric-cluster-fabric-settings.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,12 @@ The following is a list of Fabric settings that you can customize, organized by
466466
| **Parameter** | **Allowed Values** | **Upgrade Policy** | **Guidance or Short Description** |
467467
| --- | --- | --- | --- |
468468
|IsEnabled|bool, default is FALSE|Static|Flag controlling the presence and status of the Managed Identity Token Service in the cluster;this is a prerequisite for using the managed identity functionality of Service Fabric applications.|
469+
| RunInStandaloneMode |bool, default is FALSE |Static|The RunInStandaloneMode for ManagedIdentityTokenService. |
470+
| StandalonePrincipalId |wstring, default is "" |Static|The StandalonePrincipalId for ManagedIdentityTokenService. |
471+
| StandaloneSendX509 |bool, default is FALSE |Static|The StandaloneSendX509 for ManagedIdentityTokenService. |
472+
| StandaloneTenantId |wstring, default is "" |Static|The StandaloneTenantId for ManagedIdentityTokenService. |
473+
| StandaloneX509CredentialFindType |wstring, default is "" |Static|The StandaloneX509CredentialFindType for ManagedIdentityTokenService. |
474+
| StandaloneX509CredentialFindValue |wstring, default is "" |Static|The StandaloneX509CredentialFindValue for ManagedIdentityTokenService |
469475

470476
## Management
471477

@@ -539,7 +545,7 @@ The following is a list of Fabric settings that you can customize, organized by
539545

540546
| **Parameter** | **Allowed Values** | **Upgrade Policy** | **Guidance or Short Description** |
541547
| --- | --- | --- | --- |
542-
|PropertyGroup |NodeCapacityCollectionMap | Dynamic |A collection of node capacities for different metrics. Dynamic as of Service Fabric 8.1, *Static* in earlier versions. |
548+
|PropertyGroup |NodeCapacityCollectionMap | Static |A collection of node capacities for different metrics.|
543549

544550
## NodeDomainIds
545551

@@ -552,7 +558,7 @@ The following is a list of Fabric settings that you can customize, organized by
552558

553559
| **Parameter** | **Allowed Values** | **Upgrade Policy** | **Guidance or Short Description** |
554560
| --- | --- | --- | --- |
555-
|PropertyGroup |NodePropertyCollectionMap | Dynamic |A collection of string key-value pairs for node properties. Dynamic as of Service Fabric 8.1, *Static* in earlier versions. |
561+
|PropertyGroup |NodePropertyCollectionMap | Static |A collection of string key-value pairs for node properties.|
556562

557563
## Paas
558564

@@ -774,6 +780,7 @@ The following is a list of Fabric settings that you can customize, organized by
774780
| **Parameter** | **Allowed Values** | **Upgrade Policy** | **Guidance or Short Description** |
775781
| --- | --- | --- | --- |
776782
|ActivateNode |string, default is "Admin" |Dynamic| Security configuration for activation a node. |
783+
|BlockAccessToWireServer|bool, default is FALSE| Static |Blocks access to ports of the WireServer endpoint from Docker containers deployed as Service Fabric applications. This parameter is supported for Service Fabric clusters deployed on Azure Virtual Machines, Windows and Linux, and defaults to 'false' (access is permitted).|
777784
|CancelTestCommand |string, default is "Admin" |Dynamic| Cancels a specific TestCommand - if it is in flight. |
778785
|CodePackageControl |string, default is "Admin" |Dynamic| Security configuration for restarting code packages. |
779786
|CreateApplication |string, default is "Admin" | Dynamic|Security configuration for application creation. |
@@ -839,6 +846,7 @@ The following is a list of Fabric settings that you can customize, organized by
839846
|RecoverPartitions |string, default is "Admin" | Dynamic|Security configuration for recovering partitions. |
840847
|RecoverServicePartitions |string, default is "Admin" |Dynamic| Security configuration for recovering service partitions. |
841848
|RecoverSystemPartitions |string, default is "Admin" |Dynamic| Security configuration for recovering system service partitions. |
849+
|RegisterAuthorizedConnection |wstring, default is L"Admin" | Dynamic |Register authorized connection. |
842850
|RemoveNodeDeactivations |string, default is "Admin" |Dynamic| Security configuration for reverting deactivation on multiple nodes. |
843851
|ReportCompletion |wstring, default is L"Admin" |Dynamic| Security configuration for reporting completion. |
844852
|ReportFabricUpgradeHealth |string, default is "Admin" |Dynamic| Security configuration for resuming cluster upgrades with the current upgrade progress. |

0 commit comments

Comments
 (0)