Skip to content

Commit ec42341

Browse files
authored
Merge pull request #146058 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 ed794c4 + fe6ece1 commit ec42341

File tree

4 files changed

+17
-15
lines changed

4 files changed

+17
-15
lines changed

articles/azure-monitor/app/app-map.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,10 +229,10 @@ For Python, [OpenCensus Python telemetry processors](api-filtering-sampling.md#o
229229
def callback_function(envelope):
230230
envelope.tags['ai.cloud.role'] = 'new_role_name'
231231

232-
// AzureLogHandler
232+
# AzureLogHandler
233233
handler.add_telemetry_processor(callback_function)
234234

235-
// AzureExporter
235+
# AzureExporter
236236
exporter.add_telemetry_processor(callback_function)
237237
```
238238
---

articles/hdinsight/hdinsight-component-versioning.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,3 +129,5 @@ For more information on which virtual machine SKUs to select for your cluster, s
129129
- [Enterprise Security Package](./enterprise-security-package.md)
130130
- [Hortonworks release notes associated with Azure HDInsight versions](./hortonworks-release-notes.md)
131131
- [Work in Apache Hadoop on HDInsight from a Windows PC](hdinsight-hadoop-windows-tools.md)
132+
133+

articles/mysql/concepts-compatibility.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,17 @@ Azure Database for MySQL uses the world's most popular community edition of MySQ
3737
## Management Tools
3838
The compatibility advantage extends to database management tools as well. Your existing tools should continue to work with Azure Database for MySQL, as long as the database manipulation operates within the confines of user permissions. Three common database management tools that have been tested and found to be compatible with Azure Database for MySQL 5.6 and 5.7 are listed in the following table:
3939

40-
| | **MySQL Workbench 6.x and up** | **Navicat 12** | **PHPMyAdmin 4.x and up** |
41-
| :---------------------------------- | :----------------------------- | :------------- | :-------------------------|
42-
| **Create, Update, Read, Write, Delete** | X | X | X |
43-
| **SSL Connection** | X | X | X |
44-
| **SQL Query Auto Completion** | X | X | |
45-
| **Import and Export Data** | X | X | X |
46-
| **Export to Multiple Formats** | X | X | X |
47-
| **Backup and Restore** | | X | |
48-
| **Display Server Parameters** | X | X | X |
49-
| **Display Client Connections** | X | X | X |
40+
| | **MySQL Workbench 6.x and up** | **Navicat 12** | **PHPMyAdmin 4.x and up** | **dbForge Studio for MySQL 9.0** |
41+
| :---------------------------------- | :----------------------------- | :------------- | :-------------------------| :------------------------------- |
42+
| **Create, Update, Read, Write, Delete** | X | X | X | X |
43+
| **SSL Connection** | X | X | X | X |
44+
| **SQL Query Auto Completion** | X | X | | X |
45+
| **Import and Export Data** | X | X | X | X |
46+
| **Export to Multiple Formats** | X | X | X | X |
47+
| **Backup and Restore** | | X | | X |
48+
| **Display Server Parameters** | X | X | X | X |
49+
| **Display Client Connections** | X | X | X | X |
5050

5151
## Next steps
5252

53-
- [Troubleshoot connection issues to Azure Database for MySQL](howto-troubleshoot-common-connection-issues.md)
53+
- [Troubleshoot connection issues to Azure Database for MySQL](howto-troubleshoot-common-connection-issues.md)

articles/synapse-analytics/security/synapse-workspace-synapse-rbac-roles.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ The following table describes the built-in roles and the scopes at which they ca
3737
|Synapse Administrator |Full Synapse access to serverless SQL pools, Apache Spark pools, and Integration runtimes.  Includes create, read, update, and delete access to all published code artifacts. Includes Compute Operator, Linked Data Manager, and Credential User permissions on the workspace system identity credential.  Includes assigning Synapse RBAC roles. In addition to Synapse Administrator, Azure Owners can also assign Synapse RBAC roles. Azure permissions are required to create, delete, and manage compute resources. </br></br>_Can read and write artifacts</br> Can do all actions on Spark activities.</br> Can view Spark pool logs</br> Can view saved notebook and pipeline output </br> Can use the secrets stored by linked services or credentials</br>Can connect to SQL serverless endpoints with SQL `db_datareader`, `db_datawriter`, `connect`, and `grant` permissions </br>Can assign and revoke Synapse RBAC roles at current scope_|Workspace </br> Spark pool<br/>Integration runtime </br>Linked service</br>Credential |
3838
|Synapse Apache Spark Administrator</br>|Full Synapse access to Apache Spark Pools. Create, read, update, and delete access to published Spark job definitions, notebooks and their outputs, and to libraries, linked services, and credentials.  Includes read access to all other published code artifacts. Doesn't include permission to use credentials and run pipelines. Doesn't include granting access. </br></br>_Can do all actions on Spark artifacts</br>Can do all actions on Spark activities_|Workspace</br>Spark pool|
3939
|Synapse SQL Administrator|Full Synapse access to serverless SQL pools. Create, read, update, and delete access to published SQL scripts, credentials, and linked services.  Includes read access to all other published code artifacts.  Doesn't include permission to use credentials and run pipelines. Doesn't include granting access. </br></br>*Can do all actions on SQL scripts<br/>Can connect to SQL serverless endpoints with SQL `db_datareader`, `db_datawriter`, `connect`, and `grant` permissions*|Workspace|
40-
|Synapse Contributor|Full Synapse access to serverless SQL pools, Apache Spark pools, Integration runtimes. Includes create, read, update, and delete access to all published code artifacts and their outputs, including credentials and linked services.  Includes compute operator permissions. Doesn't include permission to use credentials and run pipelines. Doesn't include granting access. </br></br>_Can read and write artifacts</br>Can view saved notebook and pipeline output</br>Can do all actions on Spark activities</br>Can view Spark pool logs_|Workspace </br> Spark pool<br/> Integration runtime|
40+
|Synapse Contributor|Full Synapse access to Apache Spark pools and Integration runtimes. Includes create, read, update, and delete access to all published code artifacts and their outputs, including credentials and linked services.  Includes compute operator permissions. Doesn't include permission to use credentials and run pipelines. Doesn't include granting access. </br></br>_Can read and write artifacts</br>Can view saved notebook and pipeline output</br>Can do all actions on Spark activities</br>Can view Spark pool logs_|Workspace </br> Spark pool<br/> Integration runtime|
4141
|Synapse Artifact Publisher|Create, read, update, and delete access to published code artifacts and their outputs. Doesn't include permission to run code or pipelines, or to grant access. </br></br>_Can read published artifacts and publish artifacts</br>Can view saved notebook, Spark job, and pipeline output_|Workspace
4242
|Synapse Artifact User|Read access to published code artifacts and their outputs. Can create new artifacts but can't publish changes or run code without additional permissions.|Workspace
4343
|Synapse Compute Operator |Submit Spark jobs and notebooks and view logs.  Includes canceling Spark jobs submitted by any user. Requires additional use credential permissions on the workspace system identity to run pipelines, view pipeline runs and outputs. </br></br>_Can submit and cancel jobs, including jobs submitted by others</br>Can view Spark pool logs_|Workspace</br>Spark pool</br>Integration runtime|
@@ -116,4 +116,4 @@ Credential |Synapse Administrator </br>Synapse Credential User
116116

117117
Learn [how to review Synapse RBAC role assignments](./how-to-review-synapse-rbac-role-assignments.md) for a workspace.
118118

119-
Learn [how to assign Synapse RBAC roles](./how-to-manage-synapse-rbac-role-assignments.md)
119+
Learn [how to assign Synapse RBAC roles](./how-to-manage-synapse-rbac-role-assignments.md)

0 commit comments

Comments
 (0)