Skip to content

Commit 9c3858d

Browse files
authored
Merge pull request #92926 from craigcaseyMSFT/vcraic1022c
fix broken links from CATS report
2 parents 30c8e66 + 6e4624a commit 9c3858d

10 files changed

+33
-32
lines changed

articles/azure-australia/gateway-log-audit-visibility.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ ms.author: grgale
1010

1111
# Gateway logging, auditing, and visibility in Azure Australia
1212

13-
Detecting and responding to cyber security threats relies on generating, collecting and analysing data related to the operation of a system.
13+
Detecting and responding to cyber security threats relies on generating, collecting and analyzing data related to the operation of a system.
1414

15-
Microsoft has built-in tools in Azure to help you implement logging, auditing and visibility to manage the security of your systems deployed in Azure. There is also a reference architecture that aligns with the Australian Cyber Security Centre (ACSC) Consumer Guidance and the intent of the Information Security Manual (ISM).
15+
Microsoft has built-in tools in Azure to help you implement logging, auditing, and visibility to manage the security of your systems deployed in Azure. There is also a reference architecture that aligns with the Australian Cyber Security Centre (ACSC) Consumer Guidance and the intent of the Information Security Manual (ISM).
1616

1717
Gateways act as information flow control mechanisms at the network layer and may also control information at the higher layers of the Open System Interconnect (OSI) model. Gateways are necessary to control data flows between security domains and prevent unauthorised access from external networks. Given the criticality of gateways in controlling the flow of information between security domains, any failure, particularly at higher classifications, may have serious consequences. As such, robust mechanisms for alerting personnel to situations that may cause cyber security incidents are especially important for gateways.
1818

@@ -33,21 +33,21 @@ The overall security requirements for Commonwealth systems are defined in the AC
3333
* Enable Automatic Provisioning of the Microsoft Monitoring Agent to supported Azure VMs
3434
* Regularly review, prioritise, and mitigate the security recommendations and alerts on the Security Centre dashboard
3535

36-
4. Government entities must enable log and event forwarding from their Azure subscription to the ACSC to provide the ACSC with visibility of non-compliance with this guidance. Azure Event Hubs provides the capability to perform external log streaming to the ACSC or on-premise systems owned by the Commonwealth entity
36+
4. Government entities must enable log and event forwarding from their Azure subscription to the ACSC to provide the ACSC with visibility of non-compliance with this guidance. Azure Event Hubs provides the capability to perform external log streaming to the ACSC or on-premises systems owned by the Commonwealth entity
3737

3838
5. Commonwealth entities should align the logging they enable within Azure to the requirements specified in the ISM
3939

40-
6. Microsoft retains logs within Azure for 90 days. Customer entities must implement a log archival regime to ensure logs can be retained for the seven years required under the NAA AFDA
40+
6. Microsoft keeps logs within Azure for 90 days. Customer entities must implement a log archival regime to ensure logs can be kept for the seven years required under the NAA AFDA
4141

42-
7. Commonwealth entities that have on premise or Azure-based Security Information and Event Management (SIEM) capabilities can also forward logs to those systems
42+
7. Commonwealth entities that have on-premises or Azure-based Security Information and Event Management (SIEM) capabilities can also forward logs to those systems
4343

4444
8. Commonwealth entities should implement Network Watcher flow logs for Network Security Groups (NSGs) and Virtual Machines. These logs should be stored in a dedicated storage account containing only security logs, and access to the storage account should be secured with Role-Based Access Controls
4545

4646
9. Commonwealth entities must implement ACSC Consumer Guidance to ensure Azure workloads meet the intent of the ISM for logging and monitoring. Commonwealth entities must also opt in to Azure capabilities that assist the ACSC to receive real-time monitoring, alerting, and logs associated with Australian Government usage of Azure
4747

4848
## Architecture
4949

50-
To confidently understand the network traffic entering and leaving your Azure environment, the necessary logging must be enabled on the right set of components. This ensures complete visibility of the environment and provides the necessary data to perform analysis.
50+
To confidently understand the network traffic entering and leaving your Azure environment, the necessary logging must be enabled on the right set of components. Doing this ensures complete visibility of the environment and provides the necessary data to do analysis.
5151

5252
![Azure Monitoring Architecture](media/visibility.png)
5353

@@ -64,7 +64,7 @@ The architecture shown above is made up of discrete components that provide the
6464
|Incident Response|<ul><li>Azure Alerts</li><li>Azure Automation</li></ul>|
6565
|
6666

67-
The architecture works by first generating logs from the necessary sources and then collecting them into centralised repositories. Once you have collected the logs, they can be:
67+
The architecture works by first generating logs from the necessary sources and then collecting them into centralised repositories. Once you've collected the logs, they can be:
6868

6969
* used by Azure analysis services to get insight,
7070
* get forwarded to external systems, or
@@ -80,7 +80,7 @@ When implementing the components listed in this article, the following general g
8080

8181
* Refer to the *Azure - ACSC Certification Report – Protected 2018* publication for the certification status of individual services and perform self-assessments on any relevant components not included in the report as per the *ACSC CONSUMER GUIDE – Microsoft Azure at PROTECTED*
8282

83-
* For components not referenced in this article, Commonwealth entities should follow the principles included regarding generating, capturing, analysing, and retaining logs
83+
* For components not referenced in this article, Commonwealth entities should follow the principles included about generating, capturing, analysing, and keeping logs
8484

8585
* Identify and prioritise the logging, auditing, and visibility on high value systems as well as all network ingress and egress points to systems hosted in Azure
8686

@@ -159,7 +159,7 @@ Azure Firewall provides a controlled exit point from an Azure environment and th
159159

160160
### Network Virtual Appliances (NVA)
161161

162-
NVAs can be used to complement the security capabilities available natively in Azure. The logs generated on NVAs can be valuable resources in detecting cyber security incidents and are a key part of an overall logging, auditing, and visibility strategy. To capture logs from NVAs, utilise the Microsoft Monitoring Agent (MMA). For NVAs that do not support the installation of the MMA, consider using a Syslog or other log collection server to relay logs.
162+
NVAs can be used to complement the security capabilities available natively in Azure. The logs generated on NVAs can be valuable resources in detecting cyber security incidents and are a key part of an overall logging, auditing, and visibility strategy. To capture logs from NVAs, utilise the Microsoft Monitoring Agent (MMA). For NVAs that don't support the installation of the MMA, consider using a Syslog or other log collection server to relay logs.
163163

164164
|Resources|Link|
165165
|---|---|
@@ -179,7 +179,7 @@ Azure Load Balancer logs are used to obtain useful information about the connect
179179

180180
### Virtual Machines
181181

182-
Virtual Machines are end points that send and receive network communications, process data and provide services. As Virtual Machines can host data or crucial system services, ensuring that they are operating correctly and detecting cyber security incidents can be critical. Virtual Machines collect various event and audit logs that can track the operation of the system and the actions performed on that system. Logs collected on Virtual Machines can be forwarded to a Log Analytics Workspace using the Microsoft Monitoring Agent where they can be analysed by Azure Security Center and applicable Log Analytics solutions. Virtual Machines can also integrate directly with Azure Event Hubs or to a SIEM, either directly or through a Log Collection Server.
182+
Virtual Machines are end points that send and receive network communications, process data and provide services. As Virtual Machines can host data or crucial system services, ensuring that they're operating correctly and detecting cyber security incidents can be critical. Virtual Machines collect various event and audit logs that can track the operation of the system and the actions done on that system. Logs collected on Virtual Machines can be forwarded to a Log Analytics Workspace using the Microsoft Monitoring Agent where they can be analysed by Azure Security Center and applicable Log Analytics solutions. Virtual Machines can also integrate directly with Azure Event Hubs or to a SIEM, either directly or through a Log Collection Server.
183183

184184
|Resources|Link|
185185
|---|---|
@@ -240,7 +240,7 @@ Azure Monitor diagnostic logs are logs emitted by an Azure service that provide
240240

241241
### Azure Policy
242242

243-
Azure Policy enforces rules on how resources can be deployed, such as the type, location, and configuration. Azure Policy can be configured to ensure resources can only be deployed if they are compliant with requirements. Azure Policy is a core component to maintaining the integrity of an Azure environment. Events related to Azure Policy are logged to the Azure Activity Log and are automatically available for use in Log Analytics solutions or can be sent to Event Hubs or Azure Storage for processing or retention.
243+
Azure Policy enforces rules on how resources can be deployed, such as the type, location, and configuration. Azure Policy can be configured to ensure resources can only be deployed if they're compliant with requirements. Azure Policy is a core component to maintaining the integrity of an Azure environment. Events related to Azure Policy are logged to the Azure Activity Log and are automatically available for use in Log Analytics solutions or can be sent to Event Hubs or Azure Storage for processing or retention.
244244

245245
|Resources|Link|
246246
|---|---|
@@ -284,7 +284,7 @@ The use of Network Watcher is recommended by the ACSC to assist in understanding
284284

285285
## Log retention
286286

287-
For Australian Government organisations, the logs captured within Azure must be retained in accordance with the National Archives of Australia [Administrative Functions Disposal Authority (AFDA)](http://www.naa.gov.au/information-management/records-authorities/types-of-records-authorities/AFDA/index.aspx), which specifies retaining logs up to seven years.
287+
For Australian Government organisations, the logs captured within Azure must be retained in accordance with the National Archives of Australia [Administrative Functions Disposal Authority (AFDA)](https://www.naa.gov.au/information-management/records-authorities/types-records-authorities/afda-express-version-2-functions), which specifies retaining logs up to seven years.
288288

289289
|Log Location|Retention Period|
290290
|---|---|

articles/azure-monitor/insights/vminsights-overview.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ The features are organized into three perspectives:
2929
- Map
3030

3131
>[!NOTE]
32-
>We recently [announced changes](https://azure.microsoft.com/updates/upcoming-changes-for-azure-monitor-for-vms-as-we-prepare-for-ga) we are making changes to the Health feature based on the feedback we have received from our public preview customers. Given the number of changes we will be making, we are going to stop offering the Health feature for new customers. Existing customers can continue to use the health feature. For more details, please refer to our [General Availability FAQ](vminsights-ga-release-faq.md).
32+
>We recently [announced changes](https://azure.microsoft.com/updates/updates-to-azure-monitor-for-virtual-machines-preview-before-general-availability-release/
33+
) we are making changes to the Health feature based on the feedback we have received from our public preview customers. Given the number of changes we will be making, we are going to stop offering the Health feature for new customers. Existing customers can continue to use the health feature. For more details, please refer to our [General Availability FAQ](vminsights-ga-release-faq.md).
3334

3435
Integration with Azure Monitor logs delivers powerful aggregation and filtering, and it can analyze data trends over time. Such comprehensive workload monitoring can't be achieved with Azure Monitor or Service Map alone.
3536

articles/cosmos-db/cosmosdb-migrationchoices.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ For APIs other than the SQL API, Mongo API and the Cassandra API, there are vari
6868
* Learn more by trying out the sample applications consuming the bulk executor library in [.NET](bulk-executor-dot-net.md) and [Java](bulk-executor-java.md).
6969
* The bulk executor library is integrated into the Cosmos DB Spark connector, to learn more, see [Azure Cosmos DB Spark connector](spark-connector.md) article.
7070
* Contact the Azure Cosmos DB product team by opening a support ticket under the "General Advisory" problem type and "Large (TB+) migrations" problem subtype for additional help with large scale migrations.
71-
* Use the [Cosmos DB Bootstrap Program](https://azurecosmosdb.github.io/CosmosBootstrap/) to accelerate building or migrating your applications on Azure Cosmos DB.
71+
* Use the [Cosmos DB Bootstrap Program](https://gotcosmos.com/bootstrap) to accelerate building or migrating your applications on Azure Cosmos DB.
7272

7373
> [!div class="nextstepaction"]
74-
> [Cosmos DB Bootstrap Program](https://azurecosmosdb.github.io/CosmosBootstrap/)
74+
> [Cosmos DB Bootstrap Program](https://gotcosmos.com/bootstrap)

articles/cosmos-db/introduction.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ You can [Try Azure Cosmos DB for Free](https://azure.microsoft.com/try/cosmosdb/
2020
> [!div class="nextstepaction"]
2121
> [Try Azure Cosmos DB for Free](https://azure.microsoft.com/try/cosmosdb/)
2222
23-
You can also use the [Cosmos DB Bootstrap Program](https://azurecosmosdb.github.io/CosmosBootstrap/) to accelerate building or migrating your applications on Azure Cosmos DB. When you sign up for this program, the Azure Cosmos DB engineers are assigned to assist with your project and they can help you migrate your data to Azure Cosmos DB or building new apps on Azure Cosmos DB.
23+
You can also use the [Cosmos DB Bootstrap Program](https://gotcosmos.com/bootstrap) to accelerate building or migrating your applications on Azure Cosmos DB. When you sign up for this program, the Azure Cosmos DB engineers are assigned to assist with your project and they can help you migrate your data to Azure Cosmos DB or building new apps on Azure Cosmos DB.
2424

2525
> [!div class="nextstepaction"]
26-
> [Sign up for the Cosmos DB bootstrap program](https://azurecosmosdb.github.io/CosmosBootstrap/)
26+
> [Sign up for the Cosmos DB bootstrap program](https://gotcosmos.com/bootstrap)
2727
2828
![Azure Cosmos DB is Microsoft's globally distributed database service with elastic scale-out, guaranteed low latency, five consistency models, and comprehensive guaranteed SLAs](./media/introduction/azure-cosmos-db.png)
2929

articles/cosmos-db/migrate-cosmosdb-data.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ Azure Cosmos DB can store terabytes of data. You can perform a large-scale data
1616

1717
Before you migrate the entire workload to Azure Cosmos DB, you can migrate a subset of data to validate some of the aspects like partition key choice, query performance, and data modeling. After you validate the proof of concept, you can move the entire workload to Azure Cosmos DB.
1818

19-
You can also use the [Cosmos DB Bootstrap Program](https://azurecosmosdb.github.io/CosmosBootstrap/) to accelerate building or migrating your applications on Azure Cosmos DB. As a part of this program, engineers from the Azure Cosmos DB team would be assigned to your project and would help you migrate your data to Azure Cosmos DB. Click the below button to sign up for the Cosmos DB bootstrap program:
19+
You can also use the [Cosmos DB Bootstrap Program](https://gotcosmos.com/bootstrap) to accelerate building or migrating your applications on Azure Cosmos DB. As a part of this program, engineers from the Azure Cosmos DB team would be assigned to your project and would help you migrate your data to Azure Cosmos DB. Click the below button to sign up for the Cosmos DB bootstrap program:
2020

2121
> [!div class="nextstepaction"]
22-
> [Cosmos DB Bootstrap Program](https://azurecosmosdb.github.io/CosmosBootstrap/)
22+
> [Cosmos DB Bootstrap Program](https://gotcosmos.com/bootstrap)
2323
2424
## Tools for data migration
2525

@@ -154,7 +154,7 @@ To contact the Azure Cosmos DB team for assistance with large scale migrations,
154154
* Learn more by trying out the sample applications consuming the bulk executor library in [.NET](bulk-executor-dot-net.md) and [Java](bulk-executor-java.md).
155155
* The bulk executor library is integrated into the Cosmos DB Spark connector, to learn more, see [Azure Cosmos DB Spark connector](spark-connector.md) article.
156156
* Contact the Azure Cosmos DB product team by opening a support ticket under the "General Advisory" problem type and "Large (TB+) migrations" problem subtype for additional help with large scale migrations.
157-
* Use the [Cosmos DB Bootstrap Program](https://azurecosmosdb.github.io/CosmosBootstrap/) to accelerate building or migrating your applications on Azure Cosmos DB.
157+
* Use the [Cosmos DB Bootstrap Program](https://gotcosmos.com/bootstrap) to accelerate building or migrating your applications on Azure Cosmos DB.
158158

159159
> [!div class="nextstepaction"]
160-
> [Cosmos DB Bootstrap Program](https://azurecosmosdb.github.io/CosmosBootstrap/)
160+
> [Cosmos DB Bootstrap Program](https://gotcosmos.com/bootstrap)

articles/event-hubs/event-hubs-storm-getstarted-receive.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ You can learn more about Event Hubs by visiting the following links:
248248
<!-- Links -->
249249
[Event Hubs overview]: event-hubs-what-is-event-hubs.md
250250
[HDInsight Storm]: ../hdinsight/storm/apache-storm-overview.md
251-
[HDInsight Storm with Event Hub example]: https://azure.microsoft.com/resources/samples/hdinsight-java-storm-eventhub/
251+
[HDInsight Storm with Event Hub example]: https://github.com/Azure-Samples/hdinsight-java-storm-eventhub
252252
253253
<!-- Images -->
254254

articles/hdinsight/storm/apache-storm-develop-csharp-event-hub-topology.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ROBOTS: NOINDEX
1515
Learn how to work with Azure Event Hubs from [Apache Storm](https://storm.apache.org/) on HDInsight. This document uses a C# Storm topology to read and write data from Event Hubs
1616

1717
> [!NOTE]
18-
> For a Java version of this project, see [Process events from Azure Event Hubs with Apache Storm on HDInsight (Java)](https://azure.microsoft.com/resources/samples/hdinsight-java-storm-eventhub/).
18+
> For a Java version of this project, see [Process events from Azure Event Hubs with Apache Storm on HDInsight (Java)](https://github.com/Azure-Samples/hdinsight-java-storm-eventhub).
1919
2020
## SCP.NET
2121

articles/hdinsight/storm/apache-storm-example-topology.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ The following is a list of examples created and maintained by Microsoft for use
2121
| [Develop Java-based topologies for Apache Storm on HDInsight][5797064f] |Maven |Java |
2222
| [Develop C# topologies for Apache Storm on HDInsight using Visual Studio][16fce2d1] |HDInsight Tools for Visual Studio |C#, Java |
2323
| [Process events from Azure Event Hubs with Apache Storm on HDInsight (C#)][844d1d81] |Event Hubs |C# and Java |
24-
| [Process events from Azure Event Hubs with Storm on HDInsight (Java)](https://azure.microsoft.com/resources/samples/hdinsight-java-storm-eventhub/) |Event Hubs |Java |
24+
| [Process events from Azure Event Hubs with Storm on HDInsight (Java)](https://github.com/Azure-Samples/hdinsight-java-storm-eventhub) |Event Hubs |Java |
2525
| [Process vehicle sensor data from Event Hubs using Apache Storm on HDInsight][246ee964] |Event Hubs, Cosmos DB, Azure Storage Blob (WASB) |C#, Java |
2626
| [Extract, Transform, and Load (ETL) from Azure Event Hubs to Apache HBase, using Apache Storm on HDInsight][b4b68194] |Event Hubs, HBase |C# |
2727
| [Template C# Storm topology project for working with Azure services from Apache Storm on HDInsight][ce0c02a2] |Event Hubs, Cosmos DB, SQL Database, HBase, SignalR |C#, Java |

0 commit comments

Comments
 (0)