Skip to content

Commit 6ae8e84

Browse files
authored
Merge pull request #180398 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents 29b7f01 + 3e1939d commit 6ae8e84

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

articles/azure-app-configuration/howto-best-practices.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,16 @@ When you use App Configuration in client applications, ensure that you consider
102102

103103
To address these concerns, we recommend that you use a proxy service between your client applications and your App Configuration store. The proxy service can securely authenticate with your App Configuration store without a security issue of leaking authentication information. You can build a proxy service by using one of the App Configuration provider libraries, so you can take advantage of built-in caching and refresh capabilities for optimizing the volume of requests sent to App Configuration. For more information about using App Configuration providers, see articles in Quickstarts and Tutorials. The proxy service serves the configuration from its cache to your client applications, and you avoid the two potential issues that are discussed in this section.
104104

105+
## Configuration as Code
106+
107+
Configuration as code is a practice of managing configuration files under your source control system, for example, a git repository. It gives you benefits like traceability and approval process for any configuration changes. If you adopt configuration as code, App Configuration has tools to assist you in deploying your configuration data. This way, your applications can access the latest data from your App Configuration store(s).
108+
109+
- For GitHub, you can enable the [App Configuration Sync GitHub Action](concept-github-action.md) for your repository. Changes to configuration files are synchronized to App Configuration automatically whenever a pull request is merged.
110+
- For Azure DevOps, you can include the [Azure App Configuration Push](push-kv-devops-pipeline.md), an Azure pipeline task, in your build or release pipelines for data synchronization.
111+
- You can also import configuration files to App Configuration using Azure CLI as part of your CI/CD system. For more information, see [az appconfig kv import](scripts/cli-import.md).
112+
113+
This model allows you to include validation and testing steps before committing data to App Configuration. If you use multiple App Configuration stores, you can also push the configuration data to them incrementally or all at once.
114+
105115
## Next steps
106116

107117
* [Keys and values](./concept-key-value.md)

articles/azure-monitor/essentials/metrics-custom-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ To understand the limit of 50,000 on time series, consider the following metric:
211211

212212
> *Server response time* with Dimensions: *Region*, *Department*, *CustomerID*
213213
214-
With this metric, if you have 10 regions, 20 departments, and 100 customers, that gives you 10 x 20 x 100 = 2,000 time series.
214+
With this metric, if you have 10 regions, 20 departments, and 100 customers, that gives you 10 x 20 x 100 = 20,000 time series.
215215

216216
If you have 100 regions, 200 departments, and 2,000 customers, that gives you 100 x 200 x 2,000 = 40 million time series, which is far over the limit just for this metric alone.
217217

@@ -244,4 +244,4 @@ Use custom metrics from various services:
244244
- [Azure virtual machine (classic)](../essentials/collect-custom-metrics-guestos-vm-classic.md)
245245
- [Linux virtual machine using the Telegraf agent](../essentials/collect-custom-metrics-linux-telegraf.md)
246246
- [REST API](./metrics-store-custom-rest-api.md)
247-
- [Classic cloud service](../essentials/collect-custom-metrics-guestos-vm-cloud-service-classic.md)
247+
- [Classic cloud service](../essentials/collect-custom-metrics-guestos-vm-cloud-service-classic.md)

articles/sentinel/threat-intelligence-integration.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@ To connect to TAXII threat intelligence feeds, follow the instructions to [conne
5959
- [Learn more about STIX and TAXII @ThreatConnect](https://threatconnect.com/stix-taxii/)
6060
- [TAXII Services documentation @ThreatConnect](https://docs.threatconnect.com/en/latest/rest_api/v2/taxii/taxii.html)
6161

62+
### Sectrio
63+
64+
- [Learn more about Sectrio integration](https://sectrio.com/threat-intelligence/)
65+
- [Step by step process for integrating Sectrio's TI feed into Microsoft Sentinel](https://techcommunity.microsoft.com/t5/microsoft-sentinel-blog/microsoft-sentinel-bring-threat-intelligence-from-sectrio-using/ba-p/2964648)
66+
6267
## Integrated threat intelligence platform products
6368

6469
To connect to Threat Intelligence Platform (TIP) feeds, follow the instructions to [connect Threat Intelligence platforms to Microsoft Sentinel](connect-threat-intelligence-tip.md). The second part of these instructions calls for you to enter information into your TIP solution. See the links below for more information.

0 commit comments

Comments
 (0)