upload thrid set of changes

rboucher · rboucher · commit 944a4a670e9b · 2020-04-22T15:42:33.000-07:00
diff --git a/articles/postgresql/concepts-audit.md b/articles/postgresql/concepts-audit.md
@@ -21,14 +21,14 @@ If you want Azure resource-level logs for operations like compute and storage sc
 ## Usage considerations
 By default, pgAudit log statements are emitted along with your regular log statements by using Postgres's standard logging facility. In Azure Database for PostgreSQL, these .log files can be downloaded through the Azure portal or the CLI. The maximum storage for the collection of files is 1 GB, and each file is available for a maximum of seven days (the default is three days). This service is a short-term storage option.
 
-Alternatively, you can configure all logs to be emitted to Azure Monitor's diagnostic log service. If you enable Azure Monitor diagnostic logging, your logs will be automatically sent (in JSON format) to Azure Storage, Event Hubs, and/or Azure Monitor logs, depending on your choice.
+Alternatively, you can configure all logs to be sent to Azure Monitor Log store for later analytics in Log Analytics. If you enable Azure Monitor resource logging, your logs will be automatically sent (in JSON format) to Azure Storage, Event Hubs, and/or Azure Monitor logs, depending on your choice.
 
-Enabling pgAudit generates a large volume of logging on a server, which has an impact on performance and log storage. We recommend that you use the Azure diagnostic log service, which offers longer-term storage options, as well as analysis and alerting features. We recommend that you turn off standard logging to reduce the performance impact of additional logging:
+Enabling pgAudit generates a large volume of logging on a server, which has an impact on performance and log storage. We recommend that you use Azure Monitor Logs, which offers longer-term storage options, as well as analysis and alerting features. We recommend that you turn off standard logging to reduce the performance impact of additional logging:
 
    1. Set the parameter `logging_collector` to OFF. 
    2. Restart the server to apply this change.
 
-To learn how to set up logging to Azure Storage, Event Hubs, or Azure Monitor logs, visit the diagnostic logs section of the [server logs article](concepts-server-logs.md).
+To learn how to set up logging to Azure Storage, Event Hubs, or Azure Monitor logs, visit the resource logs section of the [server logs article](concepts-server-logs.md).
 
 ## Installing pgAudit
 
diff --git a/articles/postgresql/concepts-monitoring.md b/articles/postgresql/concepts-monitoring.md
@@ -37,7 +37,7 @@ These metrics are available for Azure Database for PostgreSQL:
 |pg_replica_log_delay_in_seconds|Replica Lag|Seconds|The time since the last replayed transaction. This metric is available for replica servers only.|
 
 ## Server logs
-You can enable logging on your server. These logs are also available through Azure Diagnostic Logs in [Azure Monitor logs](../azure-monitor/log-query/log-query-overview.md), Event Hubs, and Storage Account. To learn more about logging, visit the [server logs](concepts-server-logs.md) page.
+You can enable logging on your server. These resource logs can be sent to [Azure Monitor logs](../azure-monitor/log-query/log-query-overview.md), Event Hubs, and a Storage Account. To learn more about logging, visit the [server logs](concepts-server-logs.md) page.
 
 ## Query Store
 [Query Store](concepts-query-store.md) keeps track of query performance over time including query runtime statistics and wait events. The feature persists query runtime performance information in a system database named **azure_sys** under the query_store schema. You can control the collection and storage of data via various configuration knobs.
diff --git a/articles/postgresql/concepts-server-logs.md b/articles/postgresql/concepts-server-logs.md
@@ -41,7 +41,8 @@ For longer-term retention of logs and log analysis, you can download the .log fi
 
 You can stop generating .log files by setting the parameter `logging_collector` to OFF. Turning off .log file generation is recommended if you are using Azure Monitor diagnostic settings. This configuration will reduce the performance impact of additional logging.
 
-## Diagnostic logs
+## Resource logs
+
 Azure Database for PostgreSQL is integrated with Azure Monitor diagnostic settings. Diagnostic settings allows you to send your Postgres logs in JSON format to Azure Monitor Logs for analytics and alerting, Event Hubs for streaming, and Azure Storage for archiving. 
 
 > [!IMPORTANT]
@@ -51,7 +52,7 @@ Azure Database for PostgreSQL is integrated with Azure Monitor diagnostic settin
 ### Configure diagnostic settings
 You can enable diagnostic settings for your Postgres server using the Azure portal, CLI, REST API, and Powershell. The log category to select is **PostgreSQLLogs**. (There are other logs you can configure if you are using [Query Store](concepts-query-store.md).)
 
-To enable Diagnostic logs using the Azure portal:
+To enable resource logs using the Azure portal:
 
    1. In the portal, go to *Diagnostic Settings* in the navigation menu of your Postgres server.
    2. Select *Add Diagnostic Setting*.
@@ -60,9 +61,9 @@ To enable Diagnostic logs using the Azure portal:
    5. Select the log type **PostgreSQLLogs**.
    7. Save your setting.
 
-To enable Diagnostic logs using Powershell, CLI, or REST API, visit the [diagnostic settings](../azure-monitor/platform/diagnostic-settings.md) article.
+To enable resource logs using Powershell, CLI, or REST API, visit the [diagnostic settings](../azure-monitor/platform/diagnostic-settings.md) article.
 
-### Access diagnostic logs
+### Access resource logs
 
 The way you access the logs depends on which endpoint you choose. For Azure Storage, see the [logs storage account](../azure-monitor/platform/resource-logs-collect-storage.md) article. For Event Hubs, see the [stream Azure logs](../azure-monitor/platform/resource-logs-stream-event-hubs.md) article.
 
diff --git a/articles/postgresql/security-baseline.md b/articles/postgresql/security-baseline.md
@@ -193,7 +193,7 @@ How to onboard Azure Sentinel: https://docs.microsoft.com/azure/sentinel/quickst
 
 ### 2.3: Enable audit logging for Azure resources
 
-**Guidance**: Enable Diagnostic Settings on your Azure Database for PostgreSQL instances for access to audit, security, and diagnostic logs. Ensure that you specifically enable the PostgreSQL Audit log. Activity logs, which are automatically available, include event source, date, user, timestamp, source addresses, destination addresses, and other useful elements. You may also enable Azure Activity Log Diagnostic Settings and send the logs to the same Log Analytics workspace or Storage Account.
+**Guidance**: Enable Diagnostic Settings on your Azure Database for PostgreSQL instances for access to audit, security, and resource logs. Ensure that you specifically enable the PostgreSQL Audit log. Activity logs, which are automatically available, include event source, date, user, timestamp, source addresses, destination addresses, and other useful elements. You may also enable Azure Activity Log Diagnostic Settings and send the logs to the same Log Analytics workspace or Storage Account.
 
 How to configure and access Server Logs for Azure Database for PostgreSQL: https://docs.microsoft.com/azure/postgresql/howto-configure-server-logs-in-portal
 
diff --git a/articles/role-based-access-control/resource-provider-operations.md b/articles/role-based-access-control/resource-provider-operations.md
@@ -4281,7 +4281,7 @@ Azure service: [Event Grid](../event-grid/index.yml)
 > |  | **domains/privateLinkResources** |  |
 > | Action | Microsoft.EventGrid/domains/privateLinkResources/read | Get or List PrivateLinkResources for domains |
 > |  | **domains/providers/Microsoft.Insights/logDefinitions** |  |
-> | Action | Microsoft.EventGrid/domains/providers/Microsoft.Insights/logDefinitions/read | Allows access to diagnostic logs |
+> | Action | Microsoft.EventGrid/domains/providers/Microsoft.Insights/logDefinitions/read | Allows access to resource logs |
 > |  | **domains/providers/Microsoft.Insights/metricDefinitions** |  |
 > | Action | Microsoft.EventGrid/domains/providers/Microsoft.Insights/metricDefinitions/read | Gets the available metrics for domains |
 > |  | **domains/topics** |  |
@@ -4349,7 +4349,7 @@ Azure service: [Event Grid](../event-grid/index.yml)
 > | Action | Microsoft.EventGrid/systemTopics/providers/Microsoft.Insights/diagnosticSettings/read | Gets the diagnostic setting for system topics |
 > | Action | Microsoft.EventGrid/systemTopics/providers/Microsoft.Insights/diagnosticSettings/write | Creates or updates the diagnostic setting for system topics |
 > |  | **systemTopics/providers/Microsoft.Insights/logDefinitions** |  |
-> | Action | Microsoft.EventGrid/systemTopics/providers/Microsoft.Insights/logDefinitions/read | Allows access to diagnostic logs |
+> | Action | Microsoft.EventGrid/systemTopics/providers/Microsoft.Insights/logDefinitions/read | Allows access to resource logs |
 > |  | **systemTopics/providers/Microsoft.Insights/metricDefinitions** |  |
 > | Action | Microsoft.EventGrid/systemTopics/providers/Microsoft.Insights/metricDefinitions/read | Gets the available metrics for system topics |
 > |  | **topics** |  |
@@ -4373,7 +4373,7 @@ Azure service: [Event Grid](../event-grid/index.yml)
 > | Action | Microsoft.EventGrid/topics/providers/Microsoft.Insights/diagnosticSettings/read | Gets the diagnostic setting for topics |
 > | Action | Microsoft.EventGrid/topics/providers/Microsoft.Insights/diagnosticSettings/write | Creates or updates the diagnostic setting for topics |
 > |  | **topics/providers/Microsoft.Insights/logDefinitions** |  |
-> | Action | Microsoft.EventGrid/topics/providers/Microsoft.Insights/logDefinitions/read | Allows access to diagnostic logs |
+> | Action | Microsoft.EventGrid/topics/providers/Microsoft.Insights/logDefinitions/read | Allows access to resource logs |
 > |  | **topics/providers/Microsoft.Insights/metricDefinitions** |  |
 > | Action | Microsoft.EventGrid/topics/providers/Microsoft.Insights/metricDefinitions/read | Gets the available metrics for topics |
 > |  | **topictypes** |  |
diff --git a/articles/role-based-access-control/troubleshooting.md b/articles/role-based-access-control/troubleshooting.md
@@ -148,7 +148,7 @@ If you grant a user read-only access to a single web app, some features are disa
 * Changing settings like general configuration, scale settings, backup settings, and monitoring settings
 * Accessing publishing credentials and other secrets like app settings and connection strings
 * Streaming logs
-* Diagnostic logs configuration
+* Resource logs configuration
 * Console (command prompt)
 * Active and recent deployments (for local git continuous deployment)
 * Estimated spend
diff --git a/articles/search/search-monitor-logs-powerbi.md b/articles/search/search-monitor-logs-powerbi.md
@@ -16,7 +16,9 @@ ms.date: 02/24/2020
 You can find the Power BI Template App **Azure Cognitive Search: Analyze Logs and Metrics** in the [Power BI Apps marketplace](https://appsource.microsoft.com/marketplace/apps).
 
 ## How to get started with the app
-1. Enable diagnostic logging for your search service:
+
+1. Enable metric and resource logging for your search service:
+
     1. Create or identify an existing [Azure Storage account](https://docs.microsoft.com/azure/storage/common/storage-quickstart-create-account) where you can archive the logs
     1. Navigate to your Azure Cognitive Search service in the Azure portal
     1. Under the Monitoring section on the left column, select **Diagnostic settings**
diff --git a/articles/search/search-monitor-logs.md b/articles/search/search-monitor-logs.md
@@ -62,7 +62,7 @@ For Blob storage, it takes one hour before the containers will appear in Blob st
 
 ## Query log information
 
-In diagnostic logs, two tables contain logs and metrics for Azure Cognitive Search: **AzureDiagnostics** and **AzureMetrics**.
+Two tables contain logs and metrics for Azure Cognitive Search: **AzureDiagnostics** and **AzureMetrics**.
 
 1. Under **Monitoring**, select **Logs**.
 
@@ -93,7 +93,7 @@ Data structures that contain Azure Cognitive Search log data conform to the sche
 
 For Blob storage, each blob has one root object called **records** containing an array of log objects. Each blob contains records for all the operations that took place during the same hour.
 
-The following table is a partial list of fields common to diagnostic logging.
+The following table is a partial list of fields common to resource logging.
 
 | Name | Type | Example | Notes |
 | --- | --- | --- | --- |
diff --git a/articles/search/search-monitor-queries.md b/articles/search/search-monitor-queries.md
@@ -1,7 +1,7 @@
 ---
 title: Monitor queries
 titleSuffix: Azure Cognitive Search
-description: Monitor query metrics for performance and throughput. Collect and analyze query string inputs in diagnostic logs.
+description: Monitor query metrics for performance and throughput. Collect and analyze query string inputs in resource logs.
 
 manager: nitinme
 author: HeidiSteen
@@ -13,7 +13,7 @@ ms.date: 02/18/2020
 
 # Monitor query requests in Azure Cognitive Search
 
-This article explains how to measure query performance and volume using metrics and diagnostic logging. It also explains how to collect the input terms used in queries - necessary information when you need to assess the utility and effectiveness of your search corpus.
+This article explains how to measure query performance and volume using metrics and resource logging. It also explains how to collect the input terms used in queries - necessary information when you need to assess the utility and effectiveness of your search corpus.
 
 Historical data that feeds into metrics is preserved for 30 days. For longer retention, or to report on operational data and query strings, be sure to enable a [diagnostic setting](search-monitor-logs.md) that specifies a storage option for persisting logged events and metrics.
 
@@ -114,7 +114,7 @@ For deeper exploration, open metrics explorer from the **Monitoring** menu so th
 
 ## Identify strings used in queries
 
-When you enable diagnostic logging, the system captures query requests in the **AzureDiagnostics** table. As a prerequisite, you must have already enabled [diagnostic logging](search-monitor-logs.md), specifying a log analytics workspace or another storage option.
+When you enable resource logging, the system captures query requests in the **AzureDiagnostics** table. As a prerequisite, you must have already enabled [resource logging](search-monitor-logs.md), specifying a log analytics workspace or another storage option.
 
 1. Under the Monitoring section, select **Logs** to open up an empty query window in Log Analytics.
 
diff --git a/articles/search/search-traffic-analytics.md b/articles/search/search-traffic-analytics.md
@@ -19,7 +19,7 @@ Search traffic analytics is a pattern for collecting telemetry about user intera
 This pattern takes a dependency on [Application Insights](https://docs.microsoft.com/azure/azure-monitor/app/app-insights-overview) (a feature of [Azure Monitor](https://docs.microsoft.com/azure/azure-monitor/)) to collect user data. It requires that you add instrumentation to your client code, as described in this article. Finally, you will need a reporting mechanism to analyze the data. We recommend Power BI but you can use the Application Dashboard or any tool that connects to Application Insights.
 
 > [!NOTE]
-> The pattern described in this article is for advanced scenarios and clickstream data generated by code you add to your client. In contrast, service logs are easy to set up, provide a range of metrics, and can be done in the portal with no code required. Enabling diagnostic logging is recommended for all scenarios. For more information, see [Collect and analyze log data](search-monitor-logs.md).
+> The pattern described in this article is for advanced scenarios and clickstream data generated by code you add to your client. In contrast, service logs are easy to set up, provide a range of metrics, and can be done in the portal with no code required. Enabling logging is recommended for all scenarios. For more information, see [Collect and analyze log data](search-monitor-logs.md).
 
 ## Identify relevant search data
 
