Skip to content

Commit 40f3a77

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents 4e85e77 + 5a8c65d commit 40f3a77

File tree

56 files changed

+295
-266
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+295
-266
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4776,6 +4776,11 @@
47764776
"redirect_url": "/azure/app-service-mobile",
47774777
"redirect_document_id": false
47784778
},
4779+
{
4780+
"source_path": "articles/application-gateway/application-gateway-ssl-cli.md",
4781+
"redirect_url": "/azure/application-gateway/tutorial-ssl-cli",
4782+
"redirect_document_id": false
4783+
},
47794784
{
47804785
"source_path": "articles/application-gateway/application-gateway-ssl-arm.md",
47814786
"redirect_url": "/azure/application-gateway/tutorial-ssl-powershell",

articles/application-gateway/application-gateway-ssl-cli.md

Lines changed: 0 additions & 172 deletions
This file was deleted.

articles/azure-arc/servers/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ Log data collected by the [Microsoft Monitoring Agent (MMA)](https://docs.micros
128128

129129
- Machines that already have the MMA agent installed, will have **Azure Arc** functionality enabled via updated Management Packs.
130130
- [MMA agent version 10.20.18011 or above](https://docs.microsoft.com/azure/virtual-machines/extensions/oms-windows#agent-and-vm-extension-version) is required for Azure Arc for servers integration.
131-
- When querying for log data in [Azure Monitor](https://docs.microsoft.com/azure/azure-monitor/log-query/log-query-overview#log-queries), the returned data schema will contain the Hybrid **ResourceId** in the form `/subscriptions/<SubscriptionId/resourceGroups/<ResourceGroup>/providers/Microsoft.HybridCompute/machines/<MachineName>`.
131+
- When querying for log data in [Azure Monitor](https://docs.microsoft.com/azure/azure-monitor/log-query/log-query-overview), the returned data schema will contain the Hybrid **ResourceId** in the form `/subscriptions/<SubscriptionId/resourceGroups/<ResourceGroup>/providers/Microsoft.HybridCompute/machines/<MachineName>`.
132132

133133
For more information, see [Get started with Log Analytics in Azure Monitor](https://docs.microsoft.com/azure/azure-monitor/log-query/get-started-portal).
134134

articles/azure-databricks/databricks-stream-from-eventhubs.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ ms.author: alehall
1515

1616
# Tutorial: Stream data into Azure Databricks using Event Hubs
1717

18-
> [!IMPORTANT]
19-
> This tutorial works with the version of Azure Databricks runtime 5.2.
20-
2118
In this tutorial, you connect a data ingestion system with Azure Databricks to stream data into an Apache Spark cluster in near real-time. You set up data ingestion system using Azure Event Hubs and then connect it to Azure Databricks to process the messages coming through. To access a stream of data, you use Twitter APIs to ingest tweets into Event Hubs. Once you have the data in Azure Databricks, you can run analytical jobs to further analyze the data.
2219

2320
By the end of this tutorial, you would have streamed tweets from Twitter (that have the term "Azure" in them) and read the tweets in Azure Databricks.
@@ -100,7 +97,7 @@ In this section, you create an Azure Databricks workspace using the Azure portal
10097
Accept all other default values other than the following:
10198

10299
* Enter a name for the cluster.
103-
* For this article, create a cluster with **5.2** runtime.
100+
* For this article, create a cluster with **6.0* runtime.
104101
* Make sure you select the **Terminate after \_\_ minutes of inactivity** checkbox. Provide a duration (in minutes) to terminate the cluster, if the cluster is not being used.
105102

106103
Select cluster worker and driver node size suitable for your technical criteria and [budget](https://azure.microsoft.com/pricing/details/databricks/).

articles/azure-monitor/platform/metrics-supported.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1444,6 +1444,7 @@ Azure Monitor provides several ways to interact with metrics, including charting
14441444
|cpu_limit|CPU limit|Count|Average|CPU limit. Applies to vCore-based databases.|No Dimensions|
14451445
|cpu_used|CPU used|Count|Average|CPU used. Applies to vCore-based databases.|No Dimensions|
14461446
|deadlock|Deadlocks|Count|Total|Deadlocks. Not applicable to data warehouses.|No Dimensions|
1447+
|diff_backup_size_bytes|Differential backup storage size|Bytes|Maximum|Cumulative differential backup storage size. Applies to vCore-based databases. Not applicable to Hyperscale databases.|No Dimensions|
14471448
|dtu_limit|DTU Limit|Count|Average|DTU Limit. Applies to DTU-based databases.|No Dimensions|
14481449
|dtu_consumption_percent|DTU percentage|Percent|Average|DTU percentage. Applies to DTU-based databases.|No Dimensions|
14491450
|dtu_used|DTU used|Count|Average|DTU used. Applies to DTU-based databases.|No Dimensions|
@@ -1452,7 +1453,9 @@ Azure Monitor provides several ways to interact with metrics, including charting
14521453
|dwu_consumption_percent|DWU percentage|Percent|Maximum|DWU percentage. Applies only to data warehouses.|No Dimensions|
14531454
|dwu_limit|DWU limit|Count|Maximum|DWU limit. Applies only to data warehouses.|No Dimensions|
14541455
|dwu_used|DWU used|Count|Maximum|DWU used. Applies only to data warehouses.|No Dimensions|
1456+
|full_backup_size_bytes|Full backup storage size|Bytes|Maximum|Cumulative full backup storage size. Applies to vCore-based databases. Not applicable to Hyperscale databases.|No Dimensions|
14551457
|local_tempdb_usage_percent|Local tempdb percentage|Percent|Average|Local tempdb percentage. Applies only to data warehouses.|No Dimensions|
1458+
|log_backup_size_bytes|Log backup storage size|Bytes|Maximum|Cumulative log backup storage size. Applies to vCore-based databases. Not applicable to Hyperscale databases.|No Dimensions|
14561459
|log_write_percent|Log IO percentage|Percent|Average|Log IO percentage. Not applicable to data warehouses.|No Dimensions|
14571460
|physical_data_read_percent|Data IO percentage|Percent|Average|Data IO percentage|No Dimensions|
14581461
|sessions_percent|Sessions percentage|Percent|Average|Sessions percentage. Not applicable to data warehouses.|No Dimensions|

articles/cognitive-services/Academic-Knowledge/PaperEntityAttributes.md

Lines changed: 61 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,15 @@ manager: nitinme
99
ms.service: cognitive-services
1010
ms.subservice: academic-knowledge
1111
ms.topic: conceptual
12-
ms.date: 10/22/2019
12+
ms.date: 11/14/2019
1313
ms.author: darrine
1414
ROBOTS: NOINDEX
1515
---
1616

1717
# Paper Entity
1818

19-
<sub>
20-
*Below attributes are specific to paper entity. (Ty = '0')
21-
</sub>
19+
> [!NOTE]
20+
> Below attributes are specific to paper entity. (Ty = '0')
2221
2322
Name | Description | Type | Operations
2423
--- | --- | --- | ---
@@ -29,43 +28,78 @@ AA.AuN | Normalized author name | String | Equals, StartsWith
2928
AA.DAuN | Original author name | String | None
3029
AA.DAfN | Original affiliation name | String | None
3130
AA.S | Numeric position in author list | Int32 | Equals
32-
CC | Citation count | Int32 | None
31+
BT | BibTex document type ('a':Journal article, 'b':Book, 'c':Book chapter, 'p':Conference paper) | String | None
32+
BV | BibTex venue name | String | None
3333
C.CId | Conference series ID | Int64 | Equals
3434
C.CN | Conference series name | String | Equals, StartsWith
35+
CC | Citation count | Int32 | None
36+
CitCon | Citation contexts</br></br>List of referenced paper ID’s and the corresponding context in the paper (e.g. [{123:["brown foxes are known for jumping as referenced in paper 123", "the lazy dogs are a historical misnomer as shown in paper 123"]}) | Custom | None
3537
D | Date published in YYYY-MM-DD format | Date | Equals, IsBetween
36-
E | Extended metadata (see table below) | String | N/A
38+
DN | Original paper title | String | None
39+
DOI | Digital Object Identifier | String | Equals, StartsWith
40+
E | Extended metadata</br></br>**IMPORTANT**: This attribute has been deprecated and is only supported for legacy applications. Requesting this attribute individually (i.e. attributes=Id,Ti,E) will result in all extended metadata attributes being returned in a *serialized JSON string*</br></br>All attributes contained in the extended metadata are now available as a top-level attribute and can be requested as such (i.e. attributes=Id,Ti,DOI,IA) | [Extended](#extended) | None
3741
ECC | Estimated citation count | Int32 | None
3842
F.DFN | Original field of study name | String | None
3943
F.FId | Field of study ID | Int64 | Equals
4044
F.FN | Normalized field of study name | String | Equals, StartsWith
45+
FP | First page of paper in publication | String | Equals
46+
I | Publication issue | String | Equals
47+
IA | Inverted abstract | [InvertedAbstract](#invertedabstract) | None
4148
Id | Paper ID | Int64 | Equals
4249
J.JId | Journal ID | Int64 | Equals
4350
J.JN | Journal name | String | Equals, StartsWith
51+
LP | Last page of paper in publication | String | Equals
52+
PB | Publisher | String | None
4453
Pt | Publication type (0:Unknown, 1:Journal article, 2:Patent, 3:Conference paper, 4:Book chapter, 5:Book, 6:Book reference entry, 7:Dataset, 8:Repository | String | Equals
4554
RId | List of referenced paper IDs | Int64[] | Equals
55+
S | List of source URLs of the paper, sorted by relevance | [Source](#source)[] | None
4656
Ti | Normalized title | String | Equals, StartsWith
57+
V | Publication volume | String | Equals
58+
VFN | Full name of the Journal or Conference venue | String | None
59+
VSN | Short name of the Journal or Conference venue | String | None
4760
W | Unique words in title | String[] | Equals
4861
Y | Year published | Int32 | Equals, IsBetween
4962

50-
## Extended Metadata Attributes ##
63+
## Extended
64+
> [!IMPORTANT]
65+
> This attribute has been deprecated and is only supported for legacy applications. Requesting this attribute individually (i.e. attributes=Id,Ti,E) will result in all extended metadata attributes being returned in a *serialized JSON string*</br></br>All attributes contained in the extended metadata are now available as a top-level attribute and can be requested as such (i.e. attributes=Id,Ti,DOI,IA)
66+
67+
> [!IMPORTANT]
68+
> Support for requesting individual extended attributes by using the "E." scope, i.e. "E.DN" is being deprecated. While this is still technically supported, requesting individual extended attributes using the "E." scope will result in the attribute value being returned in two places in the JSON response, as part of the "E" object and as a top level attribute.
69+
70+
Name | Description | Type | Operations
71+
--- | --- | --- | ---
72+
BT | BibTex document type ('a':Journal article, 'b':Book, 'c':Book chapter, 'p':Conference paper) | String | None
73+
BV | BibTex venue name | String | None
74+
CC | Citation contexts</br></br>List of referenced paper ID’s and the corresponding context in the paper (e.g. [{123:["brown foxes are known for jumping as referenced in paper 123", "the lazy dogs are a historical misnomer as shown in paper 123"]}) | Custom | None
75+
DN | Original paper title | String | None
76+
DOI | Digital Object Identifier | String | None
77+
FP | First page of paper in publication | String | None
78+
I | Publication issue | String | None
79+
IA | Inverted Abstract | [InvertedAbstract](#invertedabstract) | None
80+
LP | Last page of paper in publication | String | None
81+
PB | Publisher | String | None
82+
S | List of source URLs of the paper, sorted by relevance | [Source](#source)[] | None
83+
V | Publication volume | String | None
84+
VFN | Full name of the Journal or Conference venue | String | None
85+
VSN | Short name of the Journal or Conference venue | String | None
86+
87+
## InvertedAbstract
88+
89+
> [!IMPORTANT]
90+
> InvertedAbstract attributes cannot be directly requested as a return attribute. If you need an individual attribute you must request the top level "IA" attribute, i.e. to get IA.IndexLength request attributes=IA
5191
52-
Name | Description
53-
--- | ---
54-
BT | BibTex document type ('a':Journal article, 'b':Book, 'c':Book chapter, 'p':Conference paper)
55-
BV | BibTex venue name
56-
CC | Citation Contexts – List of referenced paper ID’s and the corresponding context in the paper (e.g. [{123:["brown foxes are known for jumping as referenced in paper 123", "the lazy dogs are a historical misnomer as shown in paper 123"]})
57-
DN | Original paper title
58-
DOI | Digital Object Identifier
59-
FP | First page of paper in publication
60-
I | Publication issue
61-
IA | Inverted Abstract
62-
IA.IndexLength | Number of items in the index (abstract's word count)
63-
IA.InvertedIndex | List of abstract words and their corresponding position in the original abstract (e.g. [{"the":[0, 15, 30]}, {"brown":[1]}, {"fox":[2]}])
64-
LP | Last page of paper in publication
65-
PB | Publisher
66-
S | Sources - list of web sources of the paper, sorted by static rank
67-
S.Ty | Source Type (1:HTML, 2:Text, 3:PDF, 4:DOC, 5:PPT, 6:XLS, 7:PS)
68-
S.U | Source URL
69-
V | Publication volume
70-
VFN | Full name of the Journal or Conference venue
71-
VSN | Short name of the Journal or Conference venue
92+
Name | Description | Type | Operations
93+
--- | --- | --- | ---
94+
IndexLength | Number of items in the index (abstract's word count) | Int32 | None
95+
InvertedIndex | List of abstract words and their corresponding position in the original abstract (e.g. [{"the":[0, 15, 30]}, {"brown":[1]}, {"fox":[2]}]) | Custom | None
96+
97+
## Source
98+
99+
> [!IMPORTANT]
100+
> Source attributes cannot be directly requested as a return attribute. If you need an individual attribute you must request the top level "S" attribute, i.e. to get S.U request attributes=S
101+
102+
Name | Description | Type | Operations
103+
--- | --- | --- | ---
104+
Ty | Source URL type (1:HTML, 2:Text, 3:PDF, 4:DOC, 5:PPT, 6:XLS, 7:PS) | String | None
105+
U | Source URL | String | None

0 commit comments

Comments
 (0)