diff --git a/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ReplicasListByServer.json b/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ReplicasListByServer.json new file mode 100644 index 000000000000..e5deac0bb9aa --- /dev/null +++ b/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ReplicasListByServer.json @@ -0,0 +1,109 @@ +{ + "parameters": { + "serverName": "testmaster", + "resourceGroupName": "TestGroup", + "api-version": "2018-06-01-preview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMariaDB/servers/testserver", + "name": "testserver", + "type": "Microsoft.DBforMariaDB/servers", + "location": "northeurope", + "tags": { + "elasticServer": "1" + }, + "sku": { + "name": "GP_Gen4_2", + "tier": "GeneralPurpose", + "family": "Gen4", + "capacity": 2 + }, + "properties": { + "storageProfile": { + "storageMB": 256000, + "backupRetentionDays": 35, + "geoRedundantBackup": "Enabled" + }, + "administratorLogin": "cloudsa", + "sslEnforcement":"Enabled", + "userVisibleState": "Ready", + "fullyQualifiedDomainName": "testserver.mariadb.database.azure.com", + "version": "5.6", + "earliestRestoreDate": "2018-06-11T23:56:54.3+00:00", + "replicationRole": "Replica", + "masterServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMariaDB/servers/testmaster", + "replicaCapacity": 0 + } + }, + { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMariaDB/servers/testserver1", + "name": "testserver1", + "type": "Microsoft.DBforMariaDB/servers", + "location": "northeurope", + "tags": { + "elasticServer": "1" + }, + "sku": { + "name": "GP_Gen4_2", + "tier": "GeneralPurpose", + "family": "Gen4", + "capacity": 2 + }, + "properties": { + "storageProfile": { + "storageMB": 256000, + "backupRetentionDays": 35, + "geoRedundantBackup": "Enabled" + }, + "administratorLogin": "cloudsa", + "sslEnforcement":"Enabled", + "userVisibleState": "Ready", + "fullyQualifiedDomainName": "testserver1.mariadb.database.azure.com", + "version": "5.6", + "earliestRestoreDate": "2018-06-11T23:56:54.3+00:00", + "replicationRole": "Replica", + "masterServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMariaDB/servers/testmaster", + "replicaCapacity": 0 + } + }, + { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMariaDB/servers/testserver2", + "name": "testserver2", + "type": "Microsoft.DBforMariaDB/servers", + "location": "northeurope", + "tags": { + "elasticServer": "1" + }, + "sku": { + "name": "GP_Gen4_2", + "tier": "GeneralPurpose", + "family": "Gen4", + "capacity": 2 + }, + "properties": { + "storageProfile": { + "storageMB": 256000, + "backupRetentionDays": 35, + "geoRedundantBackup": "Enabled" + }, + "administratorLogin": "cloudsa", + "sslEnforcement":"Enabled", + "userVisibleState": "Ready", + "fullyQualifiedDomainName": "testserver2.mariadb.database.azure.com", + "version": "5.6", + "earliestRestoreDate": "2018-06-11T23:56:54.3+00:00", + "replicationRole": "Replica", + "masterServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMariaDB/servers/testmaster", + "replicaCapacity": 0 + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerCreateReplicaMode.json b/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerCreateReplicaMode.json new file mode 100644 index 000000000000..171406e889c5 --- /dev/null +++ b/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerCreateReplicaMode.json @@ -0,0 +1,84 @@ +{ + "parameters": { + "serverName": "targetserver", + "resourceGroupName": "TargetResourceGroup", + "api-version": "2018-06-01-preview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "parameters": { + "location": "westus", + "properties": { + "createMode": "Replica", + "sourceServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/MasterResourceGroup/providers/Microsoft.DBforMariaDB/servers/masterserver" + } + } + }, + "responses": { + "201": { + "body": { + "sku": { + "name": "GP_Gen5_2", + "tier": "GeneralPurpose", + "family": "Gen5", + "capacity": 2 + }, + "properties": { + "administratorLogin": "cloudsa", + "storageProfile": { + "storageMB": 128000, + "backupRetentionDays": 14, + "geoRedundantBackup": "Enabled" + }, + "version": "5.7", + "sslEnforcement": "Enabled", + "userVisibleState": "Ready", + "fullyQualifiedDomainName": "targetserver.mariadb.database.azure.com", + "earliestRestoreDate": "2018-03-14T18:02:41.577+00:00", + "replicationRole": "Replica", + "masterServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/MasterResourceGroup/providers/Microsoft.DBforMariaDB/servers/masterserver", + "replicaCapacity": 0 + }, + "location": "westus", + "tags": { + "ElasticServer": "1" + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TargetResourceGroup/providers/Microsoft.DBforMariaDB/servers/targetserver", + "name": "targetserver", + "type": "Microsoft.DBforMariaDB/servers" + } + }, + "200": { + "body": { + "sku": { + "name": "GP_Gen5_2", + "tier": "GeneralPurpose", + "family": "Gen5", + "capacity": 2 + }, + "properties": { + "administratorLogin": "cloudsa", + "storageProfile": { + "storageMB": 128000, + "backupRetentionDays": 14, + "geoRedundantBackup": "Enabled" + }, + "version": "5.7", + "sslEnforcement": "Enabled", + "userVisibleState": "Ready", + "fullyQualifiedDomainName": "targetserver.mariadb.database.azure.com", + "earliestRestoreDate": "2018-03-14T18:02:41.577+00:00", + "replicationRole": "Replica", + "masterServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/MasterResourceGroup/providers/Microsoft.DBforMariaDB/servers/masterserver", + "replicaCapacity": 0 + }, + "location": "westus", + "tags": { + "ElasticServer": "1" + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TargetResourceGroup/providers/Microsoft.DBforMariaDB/servers/targetserver", + "name": "targetserver", + "type": "Microsoft.DBforMariaDB/servers" + } + }, + "202": {} + } +} \ No newline at end of file diff --git a/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerGet.json b/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerGet.json index 9f9660282197..4ae14f56fadb 100644 --- a/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerGet.json +++ b/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerGet.json @@ -25,7 +25,10 @@ "sslEnforcement": "Enabled", "userVisibleState": "Ready", "fullyQualifiedDomainName": "mariadbtestsvc4.mariadb.database.azure.com", - "earliestRestoreDate": "2018-03-14T18:02:41.577+00:00" + "earliestRestoreDate": "2018-03-14T18:02:41.577+00:00", + "replicationRole": "None", + "masterServerId": "", + "replicaCapacity": 5 }, "location": "westus", "tags": { diff --git a/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerRestart.json b/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerRestart.json new file mode 100644 index 000000000000..25b3cbbc7cfc --- /dev/null +++ b/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/examples/ServerRestart.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "serverName": "testserver", + "resourceGroupName": "TestGroup", + "api-version": "2018-06-01-preview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + }, + "responses": { + "200": {}, + "202": {} + } + } \ No newline at end of file diff --git a/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/mariadb.json b/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/mariadb.json index 546d4a7d2886..c71cc25e2aae 100644 --- a/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/mariadb.json +++ b/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/mariadb.json @@ -49,6 +49,9 @@ }, "Create a server as a geo restore ": { "$ref": "./examples/ServerCreateGeoRestoreMode.json" + }, + "Create a replica server": { + "$ref": "./examples/ServerCreateReplicaMode.json" } }, "description": "Creates a new server or updates an existing server. The update action will overwrite the existing server.", @@ -283,6 +286,86 @@ } } }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMariaDB/servers/{serverName}/restart": { + "post": { + "tags": [ + "ServerRestart" + ], + "operationId": "Servers_Restart", + "x-ms-examples": { + "ServerRestart": { "$ref": "./examples/ServerRestart.json" } + }, + "description": "Restarts a server.", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + } + ], + "responses": { + "200": { + "description": "OK" + }, + "202": { + "description": "Accepted" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-long-running-operation": true + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMariaDB/servers/{serverName}/replicas": { + "get": { + "tags": [ + "Replicas" + ], + "operationId": "Replicas_ListByServer", + "x-ms-examples": { + "ReplicasListByServer": { + "$ref": "./examples/ReplicasListByServer.json" + } + }, + "description": "List all the replicas for a given server.", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ServerListResult" + } + } + }, + "x-ms-pageable": { + "nextLinkName": null + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMariaDB/servers/{serverName}/firewallRules/{firewallRuleName}": { "put": { "tags": [ @@ -1323,6 +1406,20 @@ "storageProfile": { "$ref": "#/definitions/StorageProfile", "description": "Storage profile of a server." + }, + "replicationRole": { + "type": "string", + "description": "The replication role of the server." + }, + "masterServerId": { + "type": "string", + "description": "The master server id of a replica server." + }, + "replicaCapacity": { + "type": "integer", + "format": "int32", + "minimum": 0, + "description": "The maximum number of replicas that a master server can have." } }, "description": "The properties of a server." @@ -1349,6 +1446,18 @@ "type": "integer", "format": "int32", "description": "Max storage allowed for a server." + }, + "storageAutogrow" : { + "type": "string", + "description": "Enable Storage Auto Grow.", + "enum": [ + "Enabled", + "Disabled" + ], + "x-ms-enum": { + "name": "StorageAutogrow", + "modelAsString": true + } } }, "description": "Storage Profile properties of a server" @@ -1377,7 +1486,8 @@ "enum": [ "Default", "PointInTimeRestore", - "GeoRestore" + "GeoRestore", + "Replica" ], "x-ms-enum": { "name": "CreateMode", @@ -1453,6 +1563,24 @@ ], "description": "The properties used to create a new server by restoring to a different region from a geo replicated backup." }, + "ServerPropertiesForReplica": { + "x-ms-discriminator-value": "Replica", + "allOf": [ + { + "$ref": "#/definitions/ServerPropertiesForCreate" + } + ], + "properties": { + "sourceServerId": { + "type": "string", + "description": "The master server id to create replica from." + } + }, + "required": [ + "sourceServerId" + ], + "description": "The properties to create a new replica." + }, "Sku": { "properties": { "name": { @@ -1561,6 +1689,10 @@ "sslEnforcement": { "$ref": "#/definitions/SslEnforcement", "description": "Enable ssl enforcement or not when connect to server." + }, + "replicationRole": { + "type": "string", + "description": "The replication role of the server." } }, "x-ms-client-flatten": true, @@ -2110,7 +2242,41 @@ "x-ms-client-flatten": true } } - } + }, + "CloudError": { + "x-ms-external": true, + "properties": { + "error": { + "$ref": "#/definitions/CloudErrorBody" + } + }, + "description": "An error response from the Batch service." + }, + "CloudErrorBody": { + "x-ms-external": true, + "properties": { + "code": { + "type": "string", + "description": "An identifier for the error. Codes are invariant and are intended to be consumed programmatically." + }, + "message": { + "type": "string", + "description": "A message describing the error, intended to be suitable for display in a user interface." + }, + "target": { + "type": "string", + "description": "The target of the particular error. For example, the name of the property in error." + }, + "details": { + "type": "array", + "items": { + "$ref": "#/definitions/CloudErrorBody" + }, + "description": "A list of additional details about the error." + } + }, + "description": "An error response from the Batch service." + } }, "parameters": { "SubscriptionIdParameter": { diff --git a/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/stable/2018-06-01/mariadb.json b/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/stable/2018-06-01/mariadb.json index 546ca981ce57..fa9fd646f5fa 100644 --- a/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/stable/2018-06-01/mariadb.json +++ b/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/stable/2018-06-01/mariadb.json @@ -1446,6 +1446,18 @@ "type": "integer", "format": "int32", "description": "Max storage allowed for a server." + }, + "storageAutogrow" : { + "type": "string", + "description": "Enable Storage Auto Grow.", + "enum": [ + "Enabled", + "Disabled" + ], + "x-ms-enum": { + "name": "StorageAutogrow", + "modelAsString": true + } } }, "description": "Storage Profile properties of a server" diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ConfigurationCreateOrUpdate.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ConfigurationCreateOrUpdate.json index bb88477ecfcd..7b1c0a923c2a 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ConfigurationCreateOrUpdate.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ConfigurationCreateOrUpdate.json @@ -1,6 +1,6 @@ { "parameters": { - "configurationName": "array_nulls", + "configurationName": "event_scheduler", "serverName": "testserver", "resourceGroupName": "TestGroup", "api-version": "2017-12-01-preview", @@ -16,15 +16,15 @@ "200": { "body": { "properties": { - "value": "off", - "description": "Enable input of NULL elements in arrays.", - "defaultValue": "on", - "dataType": "Boolean", - "allowedValues": "on,off", + "value": "ON", + "description": "Indicates the status of the Event Scheduler.", + "defaultValue": "OFF", + "dataType": "Enumeration", + "allowedValues": "ON,OFF,DISABLED", "source": "user-override" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/testserver/configurations/array_nulls", - "name": "array_nulls", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/testserver/configurations/event_scheduler", + "name": "event_scheduler", "type": "Microsoft.DBforMySQL/servers/configurations" } }, diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ConfigurationGet.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ConfigurationGet.json index f5ddd514a211..024f87a440d1 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ConfigurationGet.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ConfigurationGet.json @@ -1,6 +1,6 @@ { "parameters": { - "configurationName": "array_nulls", + "configurationName": "event_scheduler", "serverName": "testserver", "resourceGroupName": "TestGroup", "api-version": "2017-12-01-preview", @@ -10,16 +10,16 @@ "200": { "body": { "properties": { - "value": "on", - "description": "Enable input of NULL elements in arrays.", - "defaultValue": "on", - "dataType": "Boolean", - "allowedValues": "on,off", - "source": "system-default" + "value": "ON", + "description": "Indicates the status of the Event Scheduler.", + "defaultValue": "OFF", + "dataType": "Enumeration", + "allowedValues": "ON,OFF,DISABLED", + "source": "user-override" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/testserver/configurations/array_nulls", - "name": "array_nulls", - "type": "Microsoft.DBforMySQL/servers/configurations" + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/testserver/configurations/event_scheduler", + "name": "event_scheduler", + "type": "Microsoft.DBforMySQL/servers/configurations" } } } diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ConfigurationListByServer.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ConfigurationListByServer.json index 423e430da94f..3a84ec0f91c6 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ConfigurationListByServer.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ConfigurationListByServer.json @@ -1,7 +1,7 @@ { "parameters": { - "serverName": "mysql56cdb50", - "resourceGroupName": "TestGroup", + "serverName": "mysqltestsvc1", + "resourceGroupName": "testrg", "api-version": "2017-12-01-preview", "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" }, @@ -18,7 +18,7 @@ "allowedValues": "ON,OFF,DISABLED", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/event_scheduler", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/event_scheduler", "name": "event_scheduler", "type": "Microsoft.DBforMySQL/servers/configurations" }, @@ -31,7 +31,7 @@ "allowedValues": "0-30", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/div_precision_increment", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/div_precision_increment", "name": "div_precision_increment", "type": "Microsoft.DBforMySQL/servers/configurations" }, @@ -44,7 +44,7 @@ "allowedValues": "4-16777216", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/group_concat_max_len", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/group_concat_max_len", "name": "group_concat_max_len", "type": "Microsoft.DBforMySQL/servers/configurations" }, @@ -57,7 +57,7 @@ "allowedValues": "ON,OFF", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/innodb_adaptive_hash_index", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/innodb_adaptive_hash_index", "name": "innodb_adaptive_hash_index", "type": "Microsoft.DBforMySQL/servers/configurations" }, @@ -70,7 +70,7 @@ "allowedValues": "1-3600", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/innodb_lock_wait_timeout", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/innodb_lock_wait_timeout", "name": "innodb_lock_wait_timeout", "type": "Microsoft.DBforMySQL/servers/configurations" }, @@ -83,7 +83,7 @@ "allowedValues": "10-1800", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/interactive_timeout", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/interactive_timeout", "name": "interactive_timeout", "type": "Microsoft.DBforMySQL/servers/configurations" }, @@ -96,7 +96,7 @@ "allowedValues": "ON,OFF", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/log_queries_not_using_indexes", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/log_queries_not_using_indexes", "name": "log_queries_not_using_indexes", "type": "Microsoft.DBforMySQL/servers/configurations" }, @@ -109,7 +109,7 @@ "allowedValues": "0-4294967295", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/log_throttle_queries_not_using_indexes", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/log_throttle_queries_not_using_indexes", "name": "log_throttle_queries_not_using_indexes", "type": "Microsoft.DBforMySQL/servers/configurations" }, @@ -122,7 +122,7 @@ "allowedValues": "ON,OFF", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/log_slow_admin_statements", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/log_slow_admin_statements", "name": "log_slow_admin_statements", "type": "Microsoft.DBforMySQL/servers/configurations" }, @@ -135,7 +135,7 @@ "allowedValues": "ON,OFF", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/log_slow_slave_statements", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/log_slow_slave_statements", "name": "log_slow_slave_statements", "type": "Microsoft.DBforMySQL/servers/configurations" }, @@ -148,7 +148,7 @@ "allowedValues": "ON,OFF", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/log_bin_trust_function_creators", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/log_bin_trust_function_creators", "name": "log_bin_trust_function_creators", "type": "Microsoft.DBforMySQL/servers/configurations" }, @@ -161,7 +161,7 @@ "allowedValues": "0-1E+100", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/long_query_time", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/long_query_time", "name": "long_query_time", "type": "Microsoft.DBforMySQL/servers/configurations" }, @@ -174,7 +174,7 @@ "allowedValues": "0-18446744073709551615", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/min_examined_row_limit", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/min_examined_row_limit", "name": "min_examined_row_limit", "type": "Microsoft.DBforMySQL/servers/configurations" }, @@ -187,7 +187,7 @@ "allowedValues": "ON,OFF", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/slow_query_log", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/slow_query_log", "name": "slow_query_log", "type": "Microsoft.DBforMySQL/servers/configurations" }, @@ -200,7 +200,7 @@ "allowedValues": ",ALLOW_INVALID_DATES,ANSI_QUOTES,ERROR_FOR_DIVISION_BY_ZERO,HIGH_NOT_PRECEDENCE,IGNORE_SPACE,NO_AUTO_CREATE_USER,NO_AUTO_VALUE_ON_ZERO,NO_BACKSLASH_ESCAPES,NO_DIR_IN_CREATE,NO_ENGINE_SUBSTITUTION,NO_FIELD_OPTIONS,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_UNSIGNED_SUBTRACTION,NO_ZERO_DATE,NO_ZERO_IN_DATE,ONLY_FULL_GROUP_BY,PAD_CHAR_TO_FULL_LENGTH,PIPES_AS_CONCAT,REAL_AS_FLOAT,STRICT_ALL_TABLES,STRICT_TRANS_TABLES", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/sql_mode", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/sql_mode", "name": "sql_mode", "type": "Microsoft.DBforMySQL/servers/configurations" }, @@ -213,7 +213,7 @@ "allowedValues": "60-86400", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/wait_timeout", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/wait_timeout", "name": "wait_timeout", "type": "Microsoft.DBforMySQL/servers/configurations" }, @@ -226,7 +226,7 @@ "allowedValues": "10-3600", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/net_read_timeout", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/net_read_timeout", "name": "net_read_timeout", "type": "Microsoft.DBforMySQL/servers/configurations" }, @@ -239,20 +239,20 @@ "allowedValues": "10-3600", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/net_write_timeout", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/net_write_timeout", "name": "net_write_timeout", "type": "Microsoft.DBforMySQL/servers/configurations" }, { "properties": { - "value": "1880975364", + "value": "1381286943", "description": "The server ID, used in replication to give each master and slave a unique identity.", "defaultValue": "1000", "dataType": "Integer", "allowedValues": "1000-4294967295", "source": "user-override" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/server_id", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/server_id", "name": "server_id", "type": "Microsoft.DBforMySQL/servers/configurations" }, @@ -265,7 +265,7 @@ "allowedValues": "1024-1073741824", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/max_allowed_packet", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/max_allowed_packet", "name": "max_allowed_packet", "type": "Microsoft.DBforMySQL/servers/configurations" }, @@ -278,7 +278,7 @@ "allowedValues": "30-3600", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/slave_net_timeout", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/slave_net_timeout", "name": "slave_net_timeout", "type": "Microsoft.DBforMySQL/servers/configurations" }, @@ -291,10 +291,36 @@ "allowedValues": "[+|-][0]{0,1}[0-9]:[0-5][0-9]|[+|-][1][0-2]:[0-5][0-9]|SYSTEM", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/time_zone", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/time_zone", "name": "time_zone", "type": "Microsoft.DBforMySQL/servers/configurations" }, + { + "properties": { + "value": "1000", + "description": "Controls how many microseconds the binary log commit waits before synchronizing the binary log file to disk.", + "defaultValue": "1000", + "dataType": "Integer", + "allowedValues": "0,11-1000000", + "source": "system-default" + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/binlog_group_commit_sync_delay", + "name": "binlog_group_commit_sync_delay", + "type": "Microsoft.DBforMySQL/servers/configurations" + }, + { + "properties": { + "value": "0", + "description": "The maximum number of transactions to wait for before aborting the current delay as specified by binlog-group-commit-sync-delay.", + "defaultValue": "0", + "dataType": "Integer", + "allowedValues": "0-1000000", + "source": "system-default" + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/binlog_group_commit_sync_no_delay_count", + "name": "binlog_group_commit_sync_no_delay_count", + "type": "Microsoft.DBforMySQL/servers/configurations" + }, { "properties": { "value": "latin1", @@ -304,7 +330,7 @@ "allowedValues": "BIG5,DEC8,CP850,HP8,KOI8R,LATIN1,LATIN2,SWE7,ASCII,UJIS,SJIS,HEBREW,TIS620,EUCKR,KOI8U,GB2312,GREEK,CP1250,GBK,LATIN5,ARMSCII8,UTF8,UCS2,CP866,KEYBCS2,MACCE,MACROMAN,CP852,LATIN7,UTF8MB4,CP1251,UTF16,CP1256,CP1257,UTF32,BINARY,GEOSTD8,CP932,EUCJPMS", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/character_set_server", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/character_set_server", "name": "character_set_server", "type": "Microsoft.DBforMySQL/servers/configurations" }, @@ -317,7 +343,7 @@ "allowedValues": "128-2097152", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/join_buffer_size", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/join_buffer_size", "name": "join_buffer_size", "type": "Microsoft.DBforMySQL/servers/configurations" }, @@ -330,23 +356,10 @@ "allowedValues": "1-4000", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/table_open_cache", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/table_open_cache", "name": "table_open_cache", "type": "Microsoft.DBforMySQL/servers/configurations" }, - { - "properties": { - "value": "OFF", - "description": "InnoDB stores the data and indexes for each newly created table in a separate .ibd file instead of the system tablespace.", - "defaultValue": "OFF", - "dataType": "Enumeration", - "allowedValues": "ON,OFF", - "source": "system-default" - }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/innodb_file_per_table", - "name": "innodb_file_per_table", - "type": "Microsoft.DBforMySQL/servers/configurations" - }, { "properties": { "value": "1", @@ -356,7 +369,7 @@ "allowedValues": "1,2", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/lower_case_table_names", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/lower_case_table_names", "name": "lower_case_table_names", "type": "Microsoft.DBforMySQL/servers/configurations" }, @@ -369,7 +382,7 @@ "allowedValues": "ON,OFF", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/slave_compressed_protocol", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/slave_compressed_protocol", "name": "slave_compressed_protocol", "type": "Microsoft.DBforMySQL/servers/configurations" }, @@ -382,7 +395,7 @@ "allowedValues": "100-1500", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/innodb_io_capacity", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/innodb_io_capacity", "name": "innodb_io_capacity", "type": "Microsoft.DBforMySQL/servers/configurations" }, @@ -395,7 +408,7 @@ "allowedValues": "1-64", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/innodb_read_io_threads", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/innodb_read_io_threads", "name": "innodb_read_io_threads", "type": "Microsoft.DBforMySQL/servers/configurations" }, @@ -408,7 +421,7 @@ "allowedValues": "0-1000", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/innodb_thread_concurrency", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/innodb_thread_concurrency", "name": "innodb_thread_concurrency", "type": "Microsoft.DBforMySQL/servers/configurations" }, @@ -421,21 +434,21 @@ "allowedValues": "1-64", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/innodb_write_io_threads", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/innodb_write_io_threads", "name": "innodb_write_io_threads", "type": "Microsoft.DBforMySQL/servers/configurations" }, { "properties": { - "value": "8388608", - "description": "he size in bytes of a memory pool InnoDB uses to store data dictionary information and other internal data structures.", - "defaultValue": "8388608", + "value": "4", + "description": "The number of page cleaner threads that flush dirty pages from buffer pool instances.", + "defaultValue": "4", "dataType": "Integer", - "allowedValues": "5242880-52428800", + "allowedValues": "1-64", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/innodb_additional_mem_pool_size", - "name": "innodb_additional_mem_pool_size", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/innodb_page_cleaners", + "name": "innodb_page_cleaners", "type": "Microsoft.DBforMySQL/servers/configurations" }, { @@ -447,7 +460,7 @@ "allowedValues": "65536-2147483648", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/innodb_online_alter_log_max_size", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/innodb_online_alter_log_max_size", "name": "innodb_online_alter_log_max_size", "type": "Microsoft.DBforMySQL/servers/configurations" }, @@ -460,7 +473,7 @@ "allowedValues": "", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/init_connect", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/init_connect", "name": "init_connect", "type": "Microsoft.DBforMySQL/servers/configurations" }, @@ -473,20 +486,20 @@ "allowedValues": "READ-UNCOMMITTED,READ-COMMITTED,REPEATABLE-READ,SERIALIZABLE", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/tx_isolation", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/tx_isolation", "name": "tx_isolation", "type": "Microsoft.DBforMySQL/servers/configurations" }, { "properties": { - "value": "10", + "value": "200", "description": "This variable indicates the number of equality ranges in an equality comparison condition when the optimizer should switch from using index dives to index statistics in estimating the number of qualifying rows.", - "defaultValue": "10", + "defaultValue": "200", "dataType": "Integer", "allowedValues": "0-4294967295", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/eq_range_index_dive_limit", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/eq_range_index_dive_limit", "name": "eq_range_index_dive_limit", "type": "Microsoft.DBforMySQL/servers/configurations" }, @@ -499,7 +512,7 @@ "allowedValues": "5-95", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/innodb_old_blocks_pct", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/innodb_old_blocks_pct", "name": "innodb_old_blocks_pct", "type": "Microsoft.DBforMySQL/servers/configurations" }, @@ -512,7 +525,7 @@ "allowedValues": "0-4294967295", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/innodb_old_blocks_time", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/innodb_old_blocks_time", "name": "innodb_old_blocks_time", "type": "Microsoft.DBforMySQL/servers/configurations" }, @@ -525,7 +538,7 @@ "allowedValues": "0-64", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/innodb_read_ahead_threshold", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/innodb_read_ahead_threshold", "name": "innodb_read_ahead_threshold", "type": "Microsoft.DBforMySQL/servers/configurations" }, @@ -538,7 +551,7 @@ "allowedValues": "4-8388608", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/max_length_for_sort_data", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/max_length_for_sort_data", "name": "max_length_for_sort_data", "type": "Microsoft.DBforMySQL/servers/configurations" }, @@ -551,7 +564,7 @@ "allowedValues": "1-18446744073709551615", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/max_connect_errors", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/max_connect_errors", "name": "max_connect_errors", "type": "Microsoft.DBforMySQL/servers/configurations" }, @@ -564,20 +577,20 @@ "allowedValues": "0-1000000", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/innodb_thread_sleep_delay", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/innodb_thread_sleep_delay", "name": "innodb_thread_sleep_delay", "type": "Microsoft.DBforMySQL/servers/configurations" }, { "properties": { - "value": "Antelope", + "value": "Barracuda", "description": "Indicates the InnoDB file format for file-per-table tablespaces.", - "defaultValue": "Antelope", + "defaultValue": "Barracuda", "dataType": "Enumeration", "allowedValues": "Antelope,Barracuda", "source": "system-default" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/mysql56cdb50/configurations/innodb_file_format", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/configurations/innodb_file_format", "name": "innodb_file_format", "type": "Microsoft.DBforMySQL/servers/configurations" } @@ -585,4 +598,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/DatabaseListByServer.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/DatabaseListByServer.json index 6743dde8b79c..80032843b496 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/DatabaseListByServer.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/DatabaseListByServer.json @@ -1,7 +1,7 @@ { "parameters": { "serverName": "testserver", - "resourceGroupName": "TestGroup-preview", + "resourceGroupName": "TestGroup", "api-version": "2017-12-01-preview", "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" }, diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/LogFileListByServer.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/LogFileListByServer.json index 9b33651dab2a..42686020cbb7 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/LogFileListByServer.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/LogFileListByServer.json @@ -11,28 +11,14 @@ "value": [ { "properties": { - "name": "postgresql-2017-06-22_010000.log", - "sizeInKB": 4, - "createdTime": "0001-01-01T00:00:00+00:00", - "lastModifiedTime": "2017-06-22T01:59:36+00:00", - "type": "text", - "url": "https://wasd2stageneu1btlm4.file.core.windows.net/42679871f6cc4302b39ab9c2e3044df3/pg_log/postgresql-2017-06-22_010000.log?sv=2015-04-05&sr=f&sig=gqIQsa6VyGyUNpzYYPWLP5gM%2BeF1so9GYbHKu6Zs0DM%3D&se=2017-06-22T03%3A21%3A09Z&sp=r" - }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/testserver/logFiles/postgresql-2017-06-22_010000.log", - "name": "postgresql-2017-06-22_010000.log", - "type": "Microsoft.DBforMySQL/servers/logFiles" - }, - { - "properties": { - "name": "postgresql-2017-06-22_020000.log", "sizeInKB": 1, "createdTime": "0001-01-01T00:00:00+00:00", - "lastModifiedTime": "2017-06-22T02:19:36+00:00", - "type": "text", - "url": "https://wasd2stageneu1btlm4.file.core.windows.net/42679871f6cc4302b39ab9c2e3044df3/pg_log/postgresql-2017-06-22_020000.log?sv=2015-04-05&sr=f&sig=i99UWBlYfR0tKaxix8yHAOnfym4HV9Auto6BbZogyRs%3D&se=2017-06-22T03%3A21%3A09Z&sp=r" + "lastModifiedTime": "2018-03-01T06:09:20+00:00", + "type": "slowlog", + "url": "https://wasd2prodwus1afse42.file.core.windows.net/833c99b2f36c47349e5554b903fe0440/serverlogs/mysql-slow-mysqltestsvc1-2018022823.log?sv=2015-04-05&sr=f&sig=D9Ga4N5Pa%2BPe5Bmjpvs7A0TPD%2FF7IZpk9e4KWR0jgpM%3D&se=2018-03-01T07%3A12%3A13Z&sp=r" }, - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/testserver/logFiles/postgresql-2017-06-22_020000.log", - "name": "postgresql-2017-06-22_020000.log", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1/logFiles/mysql-slow-mysqltestsvc1-2018022823.log", + "name": "mysql-slow-mysqltestsvc1-2018022823.log", "type": "Microsoft.DBforMySQL/servers/logFiles" } ] diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/OperationList.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/OperationList.json index c2185d968e99..17898b0ec9ae 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/OperationList.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/OperationList.json @@ -9,79 +9,88 @@ { "name": "Microsoft.DBforMySQL/locations/performanceTiers/read", "display": { - "provider": "Microsoft DB for PostgreSQL", + "provider": "Microsoft DB for MySQL", "resource": "Performance Tiers", "operation": "List Performance Tiers", "description": "Returns the list of Performance Tiers available." } }, + { + "name": "Microsoft.DBforMySQL/servers/firewallRules/read", + "display": { + "provider": "Microsoft DB for MySQL", + "resource": "Firewall Rules", + "operation": "List/Get Firewall Rules", + "description": "Return the list of firewall rules for a server or gets the properties for the specified firewall rule." + } + }, + { + "name": "Microsoft.DBforMySQL/servers/firewallRules/write", + "display": { + "provider": "Microsoft DB for MySQL", + "resource": "Firewall Rules", + "operation": "Create/Update Firewall Rule", + "description": "Creates a firewall rule with the specified parameters or update an existing rule." + } + }, + { + "name": "Microsoft.DBforMySQL/servers/firewallRules/delete", + "display": { + "provider": "Microsoft DB for MySQL", + "resource": "Firewall Rules", + "operation": "Delete Firewall Rule", + "description": "Deletes an existing firewall rule." + } + }, { "name": "Microsoft.DBforMySQL/servers/read", "display": { - "provider": "Microsoft DB for PostgreSQL", - "resource": "PostgreSQL Server", - "operation": "List/Get PostgreSQL Servers", + "provider": "Microsoft DB for MySQL", + "resource": "MySQL Server", + "operation": "List/Get MySQL Servers", "description": "Return the list of servers or gets the properties for the specified server." } }, { "name": "Microsoft.DBforMySQL/servers/write", "display": { - "provider": "Microsoft DB for PostgreSQL", - "resource": "PostgreSQL Server", - "operation": "Create/Update PostgreSQL Server", + "provider": "Microsoft DB for MySQL", + "resource": "MySQL Server", + "operation": "Create/Update MySQL Server", "description": "Creates a server with the specified parameters or update the properties or tags for the specified server." } }, { "name": "Microsoft.DBforMySQL/servers/delete", "display": { - "provider": "Microsoft DB for PostgreSQL", - "resource": "PostgreSQL Server", - "operation": "Delete PostgreSQL Server", + "provider": "Microsoft DB for MySQL", + "resource": "MySQL Server", + "operation": "Delete MySQL Server", "description": "Deletes an existing server." } }, { "name": "Microsoft.DBforMySQL/performanceTiers/read", "display": { - "provider": "Microsoft DB for PostgreSQL", + "provider": "Microsoft DB for MySQL", "resource": "Performance Tiers", "operation": "List Performance Tiers", "description": "Returns the list of Performance Tiers available." } }, { - "name": "Microsoft.DBforMySQL/servers/firewallRules/read", - "display": { - "provider": "Microsoft DB for PostgreSQL", - "resource": "Firewall Rules", - "operation": "List/Get Firewall Rules", - "description": "Return the list of firewall rules for a server or gets the properties for the specified firewall rule." - } - }, - { - "name": "Microsoft.DBforMySQL/servers/firewallRules/write", - "display": { - "provider": "Microsoft DB for PostgreSQL", - "resource": "Firewall Rules", - "operation": "Create/Update Firewall Rule", - "description": "Creates a firewall rule with the specified parameters or update an existing rule." - } - }, - { - "name": "Microsoft.DBforMySQL/servers/firewallRules/delete", + "name": "Microsoft.DBforMySQL/servers/recoverableServers/read", "display": { - "provider": "Microsoft DB for PostgreSQL", - "resource": "Firewall Rules", - "operation": "Delete Firewall Rule", - "description": "Deletes an existing firewall rule." + "provider": "Microsoft DB for MySQL", + "resource": "Recoverable MySQL Server", + "operation": "Get Recoverable MySQL Server info", + "description": "Return the recoverable MySQL Server info" } }, { "name": "Microsoft.DBforMySQL/servers/providers/Microsoft.Insights/metricDefinitions/read", "display": { - "provider": "Microsoft DB for PostgreSQL", + "provider": "Microsoft DB for MySQL", "resource": "Database Metric Definition", "operation": "Get database metric definitions", "description": "Return types of metrics that are available for databases" @@ -97,21 +106,6 @@ "aggregationType": "Average", "fillGapWithZero": true }, - { - "name": "compute_limit", - "displayName": "Compute Unit limit", - "displayDescription": "Compute Unit limit", - "unit": "Count", - "aggregationType": "Average" - }, - { - "name": "compute_consumption_percent", - "displayName": "Compute Unit percentage", - "displayDescription": "Compute Unit percentage", - "unit": "Percent", - "aggregationType": "Average", - "fillGapWithZero": true - }, { "name": "memory_percent", "displayName": "Memory percent", @@ -149,6 +143,27 @@ "unit": "Bytes", "aggregationType": "Average" }, + { + "name": "serverlog_storage_percent", + "displayName": "Server Log storage percent", + "displayDescription": "Server Log storage percent", + "unit": "Percent", + "aggregationType": "Average" + }, + { + "name": "serverlog_storage_usage", + "displayName": "Server Log storage used", + "displayDescription": "Server Log storage used", + "unit": "Bytes", + "aggregationType": "Average" + }, + { + "name": "serverlog_storage_limit", + "displayName": "Server Log storage limit", + "displayDescription": "Server Log storage limit", + "unit": "Bytes", + "aggregationType": "Average" + }, { "name": "active_connections", "displayName": "Total active connections", @@ -164,6 +179,14 @@ "unit": "Count", "aggregationType": "Average", "fillGapWithZero": true + }, + { + "name": "seconds_behind_master", + "displayName": "Replication lag in seconds", + "displayDescription": "Replication lag in seconds", + "unit": "Count", + "aggregationType": "Average", + "fillGapWithZero": true } ] } @@ -172,7 +195,7 @@ { "name": "Microsoft.DBforMySQL/servers/providers/Microsoft.Insights/diagnosticSettings/read", "display": { - "provider": "Microsoft DB for PostgreSQL", + "provider": "Microsoft DB for MySQL", "resource": "Database Metric Definition", "operation": "Read diagnostic setting", "description": "Gets the disagnostic setting for the resource" @@ -181,7 +204,7 @@ { "name": "Microsoft.DBforMySQL/servers/providers/Microsoft.Insights/diagnosticSettings/write", "display": { - "provider": "Microsoft DB for PostgreSQL", + "provider": "Microsoft DB for MySQL", "resource": "Database Metric Definition", "operation": "Write diagnostic setting", "description": "Creates or updates the diagnostic setting for the resource" diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/PerformanceTiersListByLocation.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/PerformanceTiersListByLocation.json index 31c938f6aa34..65f92bde8968 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/PerformanceTiersListByLocation.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/PerformanceTiersListByLocation.json @@ -15,31 +15,23 @@ "edition": "Basic", "vCore": 1, "hardwareGeneration": "Gen4", + "minStorageMB": 5120, + "maxStorageMB": 1048576, + "minBackupRetentionDays": 7, + "maxBackupRetentionDays": 35, "id": "B_Gen4_1" }, { "edition": "Basic", "vCore": 2, "hardwareGeneration": "Gen4", + "minStorageMB": 5120, + "maxStorageMB": 1048576, + "minBackupRetentionDays": 7, + "maxBackupRetentionDays": 35, "id": "B_Gen4_2" - }, - { - "edition": "Basic", - "vCore": 1, - "hardwareGeneration": "Gen5", - "id": "B_Gen5_1" - }, - { - "edition": "Basic", - "vCore": 2, - "hardwareGeneration": "Gen5", - "id": "B_Gen5_2" } - ], - "minStorageMB": 5120, - "maxStorageMB": 1048576, - "minBackupRetentionDays": 7, - "maxBackupRetentionDays": 35 + ] }, { "id": "GeneralPurpose", @@ -48,106 +40,53 @@ "edition": "GeneralPurpose", "vCore": 2, "hardwareGeneration": "Gen4", + "minStorageMB": 5120, + "maxStorageMB": 2097152, + "minBackupRetentionDays": 7, + "maxBackupRetentionDays": 35, "id": "GP_Gen4_2" }, { "edition": "GeneralPurpose", "vCore": 4, "hardwareGeneration": "Gen4", + "minStorageMB": 5120, + "maxStorageMB": 2097152, + "minBackupRetentionDays": 7, + "maxBackupRetentionDays": 35, "id": "GP_Gen4_4" }, { "edition": "GeneralPurpose", "vCore": 8, "hardwareGeneration": "Gen4", + "minStorageMB": 5120, + "maxStorageMB": 2097152, + "minBackupRetentionDays": 7, + "maxBackupRetentionDays": 35, "id": "GP_Gen4_8" }, { "edition": "GeneralPurpose", "vCore": 16, "hardwareGeneration": "Gen4", + "minStorageMB": 5120, + "maxStorageMB": 2097152, + "minBackupRetentionDays": 7, + "maxBackupRetentionDays": 35, "id": "GP_Gen4_16" }, { "edition": "GeneralPurpose", "vCore": 32, "hardwareGeneration": "Gen4", + "minStorageMB": 5120, + "maxStorageMB": 2097152, + "minBackupRetentionDays": 7, + "maxBackupRetentionDays": 35, "id": "GP_Gen4_32" - }, - { - "edition": "GeneralPurpose", - "vCore": 2, - "hardwareGeneration": "Gen5", - "id": "GP_Gen5_2" - }, - { - "edition": "GeneralPurpose", - "vCore": 4, - "hardwareGeneration": "Gen5", - "id": "GP_Gen5_4" - }, - { - "edition": "GeneralPurpose", - "vCore": 8, - "hardwareGeneration": "Gen5", - "id": "GP_Gen5_8" - }, - { - "edition": "GeneralPurpose", - "vCore": 16, - "hardwareGeneration": "Gen5", - "id": "GP_Gen5_16" - }, - { - "edition": "GeneralPurpose", - "vCore": 32, - "hardwareGeneration": "Gen5", - "id": "GP_Gen5_32" - } - ], - "minStorageMB": 5120, - "maxStorageMB": 2097152, - "minBackupRetentionDays": 7, - "maxBackupRetentionDays": 35 - }, - { - "id": "MemoryOptimized", - "serviceLevelObjectives": [ - { - "edition": "MemoryOptimized", - "vCore": 2, - "hardwareGeneration": "Gen5", - "id": "MO_Gen5_2" - }, - { - "edition": "MemoryOptimized", - "vCore": 4, - "hardwareGeneration": "Gen5", - "id": "MO_Gen5_4" - }, - { - "edition": "MemoryOptimized", - "vCore": 8, - "hardwareGeneration": "Gen5", - "id": "MO_Gen5_8" - }, - { - "edition": "MemoryOptimized", - "vCore": 16, - "hardwareGeneration": "Gen5", - "id": "MO_Gen5_16" - }, - { - "edition": "MemoryOptimized", - "vCore": 32, - "hardwareGeneration": "Gen5", - "id": "MO_Gen5_32" } - ], - "minStorageMB": 5120, - "maxStorageMB": 2097152, - "minBackupRetentionDays": 7, - "maxBackupRetentionDays": 35 + ] } ] } diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ReplicasListByServer.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ReplicasListByServer.json new file mode 100644 index 000000000000..d92bda51d4f5 --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ReplicasListByServer.json @@ -0,0 +1,109 @@ +{ + "parameters": { + "serverName": "testmaster", + "resourceGroupName": "TestGroup", + "api-version": "2017-12-01-preview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/testserver", + "name": "testserver", + "type": "Microsoft.DBforMySQL/servers", + "location": "northeurope", + "tags": { + "elasticServer": "1" + }, + "sku": { + "name": "GP_Gen4_2", + "tier": "GeneralPurpose", + "family": "Gen4", + "capacity": 2 + }, + "properties": { + "storageProfile": { + "storageMB": 256000, + "backupRetentionDays": 35, + "geoRedundantBackup": "Enabled" + }, + "administratorLogin": "cloudsa", + "sslEnforcement":"Enabled", + "userVisibleState": "Ready", + "fullyQualifiedDomainName": "testserver.mysql.database.azure.com", + "version": "5.6", + "earliestRestoreDate": "2018-06-11T23:56:54.3+00:00", + "replicationRole": "Replica", + "masterServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/testmaster", + "replicaCapacity": 0 + } + }, + { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/testserver1", + "name": "testserver1", + "type": "Microsoft.DBforMySQL/servers", + "location": "northeurope", + "tags": { + "elasticServer": "1" + }, + "sku": { + "name": "GP_Gen4_2", + "tier": "GeneralPurpose", + "family": "Gen4", + "capacity": 2 + }, + "properties": { + "storageProfile": { + "storageMB": 256000, + "backupRetentionDays": 35, + "geoRedundantBackup": "Enabled" + }, + "administratorLogin": "cloudsa", + "sslEnforcement":"Enabled", + "userVisibleState": "Ready", + "fullyQualifiedDomainName": "testserver1.mysql.database.azure.com", + "version": "5.6", + "earliestRestoreDate": "2018-06-11T23:56:54.3+00:00", + "replicationRole": "Replica", + "masterServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/testmaster", + "replicaCapacity": 0 + } + }, + { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/testserver2", + "name": "testserver2", + "type": "Microsoft.DBforMySQL/servers", + "location": "northeurope", + "tags": { + "elasticServer": "1" + }, + "sku": { + "name": "GP_Gen4_2", + "tier": "GeneralPurpose", + "family": "Gen4", + "capacity": 2 + }, + "properties": { + "storageProfile": { + "storageMB": 256000, + "backupRetentionDays": 35, + "geoRedundantBackup": "Enabled" + }, + "administratorLogin": "cloudsa", + "sslEnforcement":"Enabled", + "userVisibleState": "Ready", + "fullyQualifiedDomainName": "testserver2.mysql.database.azure.com", + "version": "5.6", + "earliestRestoreDate": "2018-06-11T23:56:54.3+00:00", + "replicationRole": "Replica", + "masterServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/testmaster", + "replicaCapacity": 0 + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerCreate.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerCreate.json index e97e970bbba5..dd25d294395a 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerCreate.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerCreate.json @@ -1,14 +1,14 @@ { "parameters": { - "serverName": "testserver", - "resourceGroupName": "TestGroup", + "serverName": "mysqltestsvc4", + "resourceGroupName": "testrg", "api-version": "2017-12-01-preview", "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", "parameters": { - "location": "eastus", + "location": "westus", "properties": { "administratorLogin": "cloudsa", - "administratorLoginPassword": "password", + "administratorLoginPassword": "pass$w0rd", "sslEnforcement": "Enabled", "storageProfile": { "storageMB": 128000, @@ -18,8 +18,8 @@ "createMode": "Default" }, "sku": { - "name": "B_Gen5_2", - "tier": "Basic", + "name": "GP_Gen5_2", + "tier": "GeneralPurpose", "capacity": 2, "family": "Gen5" }, @@ -31,64 +31,64 @@ "responses": { "201": { "body": { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/testserver", - "name": "testserver", - "type": "Microsoft.DBforMySQL/servers", - "location": "eastus", "sku": { - "capacity": 2, + "name": "GP_Gen5_2", + "tier": "GeneralPurpose", "family": "Gen5", - "name": "B_Gen5_2", - "size": null, - "tier": "Basic" - }, - "tags": { - "elasticServer": "1" + "capacity": 2 }, "properties": { + "administratorLogin": "cloudsa", "storageProfile": { "storageMB": 128000, "backupRetentionDays": 7, "geoRedundantBackup": "Enabled" }, - "administratorLogin": "cloudsa", + "version": "5.7", "sslEnforcement": "Enabled", "userVisibleState": "Ready", - "fullyQualifiedDomainName": "testserver.test-vm1.onebox.xdb.mscds.com", - "earliestRestoreDate": "2018-02-07T16:47:04.027+00:00" - } + "fullyQualifiedDomainName": "mysqltestsvc4.mysql.database.azure.com", + "earliestRestoreDate": "2018-03-14T18:02:41.577+00:00" + }, + "location": "westus", + "tags": { + "ElasticServer": "1" + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc4", + "name": "mysqltestsvc4", + "type": "Microsoft.DBforMySQL/servers" } }, "200": { "body": { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/testserver", - "name": "testserver", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc4", + "name": "mysqltestsvc4", "type": "Microsoft.DBforMySQL/servers", - "location": "eastus", + "location": "westus", "sku": { - "capacity": 2, + "name": "GP_Gen5_2", + "tier": "GeneralPurpose", "family": "Gen5", - "name": "B_Gen5_2", - "size": null, - "tier": "Basic" + "capacity": 2 }, "tags": { "elasticServer": "1" }, "properties": { + "administratorLogin": "cloudsa", "storageProfile": { "storageMB": 128000, "backupRetentionDays": 7, "geoRedundantBackup": "Enabled" }, - "administratorLogin": "cloudsa", + "version": "5.7", "sslEnforcement": "Enabled", "userVisibleState": "Ready", - "fullyQualifiedDomainName": "testserver.test-vm1.onebox.xdb.mscds.com", - "earliestRestoreDate": "2018-02-07T16:47:04.027+00:00" + "fullyQualifiedDomainName": "mysqltestsvc4.mysql.database.azure.com", + "earliestRestoreDate": "2018-03-14T18:02:41.577+00:00" } } }, "202": {} } -} \ No newline at end of file +} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerCreateGeoRestoreMode.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerCreateGeoRestoreMode.json new file mode 100644 index 000000000000..9efce0135830 --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerCreateGeoRestoreMode.json @@ -0,0 +1,87 @@ +{ + "parameters": { + "serverName": "targetserver", + "resourceGroupName": "TargetResourceGroup", + "api-version": "2017-12-01-preview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "parameters": { + "location": "westus", + "properties": { + "createMode": "GeoRestore", + "sourceServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/SourceResourceGroup/providers/Microsoft.DBforMySQL/servers/sourceserver" + }, + "sku": { + "name": "GP_Gen5_2", + "tier": "GeneralPurpose", + "family": "Gen5", + "capacity": 2 + }, + "tags": { + "ElasticServer": "1" + } + } + }, + "responses": { + "201": { + "body": { + "sku": { + "name": "GP_Gen5_2", + "tier": "GeneralPurpose", + "family": "Gen5", + "capacity": 2 + }, + "properties": { + "administratorLogin": "cloudsa", + "storageProfile": { + "storageMB": 128000, + "backupRetentionDays": 14, + "geoRedundantBackup": "Enabled" + }, + "version": "5.7", + "sslEnforcement": "Enabled", + "userVisibleState": "Ready", + "fullyQualifiedDomainName": "targetserver.mysql.database.azure.com", + "earliestRestoreDate": "2018-03-14T18:02:41.577+00:00" + }, + "location": "westus", + "tags": { + "ElasticServer": "1" + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/targetserver", + "name": "targetserver", + "type": "Microsoft.DBforMySQL/servers" + } + }, + "200": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/targetserver", + "name": "targetserver", + "type": "Microsoft.DBforMySQL/servers", + "location": "westus", + "sku": { + "name": "GP_Gen5_2", + "tier": "GeneralPurpose", + "family": "Gen5", + "capacity": 2 + }, + "tags": { + "elasticServer": "1" + }, + "properties": { + "administratorLogin": "cloudsa", + "storageProfile": { + "storageMB": 128000, + "backupRetentionDays": 14, + "geoRedundantBackup": "Enabled" + }, + "version": "5.7", + "sslEnforcement": "Enabled", + "userVisibleState": "Ready", + "fullyQualifiedDomainName": "targetserver.mysql.database.azure.com", + "earliestRestoreDate": "2018-03-14T18:02:41.577+00:00" + } + } + }, + "202": {} + } +} \ No newline at end of file diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerCreatePointInTimeRestore.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerCreatePointInTimeRestore.json new file mode 100644 index 000000000000..ea5a8b6e8573 --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerCreatePointInTimeRestore.json @@ -0,0 +1,88 @@ +{ + "parameters": { + "serverName": "targetserver", + "resourceGroupName": "TargetResourceGroup", + "api-version": "2017-12-01-preview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "parameters": { + "location": "brazilsouth", + "properties": { + "restorePointInTime": "2017-12-14T00:00:37.467Z", + "createMode": "PointInTimeRestore", + "sourceServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/SourceResourceGroup/providers/Microsoft.DBforMySQL/servers/sourceserver" + }, + "sku": { + "name": "GP_Gen5_2", + "tier": "GeneralPurpose", + "family": "Gen5", + "capacity": 2 + }, + "tags": { + "ElasticServer": "1" + } + } + }, + "responses": { + "201": { + "body": { + "sku": { + "name": "GP_Gen5_2", + "tier": "GeneralPurpose", + "family": "Gen5", + "capacity": 2 + }, + "properties": { + "administratorLogin": "cloudsa", + "storageProfile": { + "storageMB": 128000, + "backupRetentionDays": 7, + "geoRedundantBackup": "Enabled" + }, + "version": "5.7", + "sslEnforcement": "Enabled", + "userVisibleState": "Ready", + "fullyQualifiedDomainName": "targetserver.mysql.database.azure.com", + "earliestRestoreDate": "2018-03-14T18:02:41.577+00:00" + }, + "location": "brazilsouth", + "tags": { + "ElasticServer": "1" + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/targetserver", + "name": "targetserver", + "type": "Microsoft.DBforMySQL/servers" + } + }, + "200": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/targetserver", + "name": "targetserver", + "type": "Microsoft.DBforMySQL/servers", + "location": "brazilsouth", + "sku": { + "name": "GP_Gen5_2", + "tier": "GeneralPurpose", + "family": "Gen5", + "capacity": 2 + }, + "tags": { + "elasticServer": "1" + }, + "properties": { + "administratorLogin": "cloudsa", + "storageProfile": { + "storageMB": 128000, + "backupRetentionDays": 7, + "geoRedundantBackup": "Enabled" + }, + "version": "5.7", + "sslEnforcement": "Enabled", + "userVisibleState": "Ready", + "fullyQualifiedDomainName": "targetserver.mysql.database.azure.com", + "earliestRestoreDate": "2018-03-14T18:02:41.577+00:00" + } + } + }, + "202": {} + } +} \ No newline at end of file diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerCreateReplicaMode.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerCreateReplicaMode.json new file mode 100644 index 000000000000..42d22bb2929f --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerCreateReplicaMode.json @@ -0,0 +1,84 @@ +{ + "parameters": { + "serverName": "targetserver", + "resourceGroupName": "TargetResourceGroup", + "api-version": "2017-12-01-preview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "parameters": { + "location": "westus", + "properties": { + "createMode": "Replica", + "sourceServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/MasterResourceGroup/providers/Microsoft.DBforMySQL/servers/masterserver" + } + } + }, + "responses": { + "201": { + "body": { + "sku": { + "name": "GP_Gen5_2", + "tier": "GeneralPurpose", + "family": "Gen5", + "capacity": 2 + }, + "properties": { + "administratorLogin": "cloudsa", + "storageProfile": { + "storageMB": 128000, + "backupRetentionDays": 14, + "geoRedundantBackup": "Enabled" + }, + "version": "5.7", + "sslEnforcement": "Enabled", + "userVisibleState": "Ready", + "fullyQualifiedDomainName": "targetserver.mysql.database.azure.com", + "earliestRestoreDate": "2018-03-14T18:02:41.577+00:00", + "replicationRole": "Replica", + "masterServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/MasterResourceGroup/providers/Microsoft.DBforMySQL/servers/masterserver", + "replicaCapacity": 0 + }, + "location": "westus", + "tags": { + "ElasticServer": "1" + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TargetResourceGroup/providers/Microsoft.DBforMySQL/servers/targetserver", + "name": "targetserver", + "type": "Microsoft.DBforMySQL/servers" + } + }, + "200": { + "body": { + "sku": { + "name": "GP_Gen5_2", + "tier": "GeneralPurpose", + "family": "Gen5", + "capacity": 2 + }, + "properties": { + "administratorLogin": "cloudsa", + "storageProfile": { + "storageMB": 128000, + "backupRetentionDays": 14, + "geoRedundantBackup": "Enabled" + }, + "version": "5.7", + "sslEnforcement": "Enabled", + "userVisibleState": "Ready", + "fullyQualifiedDomainName": "targetserver.mysql.database.azure.com", + "earliestRestoreDate": "2018-03-14T18:02:41.577+00:00", + "replicationRole": "Replica", + "masterServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/MasterResourceGroup/providers/Microsoft.DBforMySQL/servers/masterserver", + "replicaCapacity": 0 + }, + "location": "westus", + "tags": { + "ElasticServer": "1" + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TargetResourceGroup/providers/Microsoft.DBforMySQL/servers/targetserver", + "name": "targetserver", + "type": "Microsoft.DBforMySQL/servers" + } + }, + "202": {} + } +} \ No newline at end of file diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerGet.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerGet.json index 1a4ef056abbe..dd1f7afc6158 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerGet.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerGet.json @@ -1,41 +1,43 @@ { "parameters": { - "serverName": "testserver", - "resourceGroupName": "TestGroup", + "serverName": "mysqltestsvc4", + "resourceGroupName": "testrg", "api-version": "2017-12-01-preview", "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" }, "responses": { "200": { "body": { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/testserver", - "name": "testserver", - "type": "Microsoft.DBforMySQL/servers", - "location": "eastus", - "tags": { - "elasticServer": "1" - }, "sku": { - "capacity": 2, + "name": "GP_Gen4_2", + "tier": "GeneralPurpose", "family": "Gen4", - "name": "B_Gen4_2", - "size": null, - "tier": "Basic" + "capacity": 2 }, "properties": { + "administratorLogin": "cloudsa", "storageProfile": { "storageMB": 128000, "backupRetentionDays": 7, "geoRedundantBackup": "Enabled" }, - "administratorLogin": "cloudsa", + "version": "5.7", "sslEnforcement": "Enabled", "userVisibleState": "Ready", - "fullyQualifiedDomainName": "testserver.test-vm1.onebox.xdb.mscds.com", - "earliestRestoreDate": "2018-01-26T23:06:03.3217581+00:00", - "version": "5.6" - } + "fullyQualifiedDomainName": "mysqltestsvc4.mysql.database.azure.com", + "earliestRestoreDate": "2018-03-14T18:02:41.577+00:00", + "replicationRole": "None", + "masterServerId": "", + "replicaCapacity": 5 + }, + "location": "westus", + "tags": { + "ElasticServer": "1" + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc4", + "name": "mysqltestsvc4", + "type": "Microsoft.DBforMySQL/servers" } } } -} \ No newline at end of file +} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerList.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerList.json index 8b1ff25d8103..ec45f333a798 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerList.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerList.json @@ -8,91 +8,82 @@ "body": { "value": [ { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/testserver", - "name": "testserver", - "type": "Microsoft.DBforMySQL/servers", - "location": "eastus", - "tags": { - "elasticServer": "1" - }, "sku": { - "capacity": 2, - "family": "Gen4", "name": "B_Gen4_2", - "size": null, - "tier": "Basic" + "tier": "Basic", + "family": "Gen4", + "capacity": 2 }, "properties": { + "administratorLogin": "testuser", "storageProfile": { - "storageMB": 128000, + "storageMB": 5120, "backupRetentionDays": 7, - "geoRedundantBackup": "Enabled" + "geoRedundantBackup": "Disabled" }, - "administratorLogin": "cloudsa", + "version": "5.7", "sslEnforcement": "Enabled", "userVisibleState": "Ready", - "fullyQualifiedDomainName": "testserver.test-vm1.onebox.xdb.mscds.com", - "version": "5.6" - } + "fullyQualifiedDomainName": "mysqltestsvc1.mysql.database.azure.com", + "earliestRestoreDate": "2018-02-28T23:56:02.627+00:00" + }, + "location": "westus", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1", + "name": "mysqltestsvc1", + "type": "Microsoft.DBforMySQL/servers" }, { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/testserver1", - "name": "testserver1", - "type": "Microsoft.DBforMySQL/servers", - "location": "eastus", - "tags": { - "elasticServer": "1" - }, "sku": { - "capacity": 2, + "name": "GP_Gen4_2", + "tier": "GeneralPurpose", "family": "Gen4", - "name": "B_Gen4_2", - "size": null, - "tier": "Basic" + "capacity": 2 }, "properties": { + "administratorLogin": "testuser", "storageProfile": { - "storageMB": 128000, + "storageMB": 5120, "backupRetentionDays": 7, - "geoRedundantBackup": "Enabled" + "geoRedundantBackup": "Disabled" }, - "administratorLogin": "cloudsa", + "version": "5.7", "sslEnforcement": "Enabled", "userVisibleState": "Ready", - "fullyQualifiedDomainName": "testserver.test-vm1.onebox.xdb.mscds.com", - "version": "5.6" - } + "fullyQualifiedDomainName": "mysqltstsvc2.mysql.database.azure.com", + "earliestRestoreDate": "2018-02-28T23:56:54.3+00:00" + }, + "location": "westus", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltstsvc2", + "name": "mysqltstsvc2", + "type": "Microsoft.DBforMySQL/servers" }, { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/testserver2", - "name": "testserver2", - "type": "Microsoft.DBforMySQL/servers", - "location": "eastus", - "tags": { - "elasticServer": "1" - }, "sku": { - "capacity": 2, + "name": "GP_Gen4_4", + "tier": "GeneralPurpose", "family": "Gen4", - "name": "B_Gen4_2", - "size": null, - "tier": "Basic" + "capacity": 4 }, "properties": { + "administratorLogin": "testuser", "storageProfile": { - "storageMB": 128000, - "backupRetentionDays": 7, + "storageMB": 102400, + "backupRetentionDays": 35, "geoRedundantBackup": "Enabled" }, - "administratorLogin": "cloudsa", + "version": "5.7", "sslEnforcement": "Enabled", "userVisibleState": "Ready", - "fullyQualifiedDomainName": "testserver.test-vm1.onebox.xdb.mscds.com", - "version": "5.6" - } + "fullyQualifiedDomainName": "mysqltestsvc3.mysql.database.azure.com", + "earliestRestoreDate": "2018-02-28T23:59:44.847+00:00" + }, + "location": "westus", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg1/providers/Microsoft.DBforMySQL/servers/mysqltestsvc3", + "name": "mysqltestsvc3", + "type": "Microsoft.DBforMySQL/servers" } ] } } } -} \ No newline at end of file +} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerListByResourceGroup.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerListByResourceGroup.json index be14e41536e6..c2d1950af81b 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerListByResourceGroup.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerListByResourceGroup.json @@ -1,6 +1,6 @@ { "parameters": { - "resourceGroupName": "TestGroup", + "resourceGroupName": "testrg", "api-version": "2017-12-01-preview", "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" }, @@ -9,91 +9,57 @@ "body": { "value": [ { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/testserver", - "name": "testserver", - "type": "Microsoft.DBforMySQL/servers", - "location": "eastus", - "tags": { - "elasticServer": "1" - }, "sku": { - "capacity": 2, + "name": "B_Gen4_1", + "tier": "Basic", "family": "Gen4", - "name": "B_Gen4_2", - "size": null, - "tier": "Basic" + "capacity": 1 }, "properties": { + "administratorLogin": "testuser", "storageProfile": { - "storageMB": 128000, + "storageMB": 5120, "backupRetentionDays": 7, - "geoRedundantBackup": "Enabled" + "geoRedundantBackup": "Disabled" }, - "administratorLogin": "cloudsa", + "version": "5.7", "sslEnforcement": "Enabled", "userVisibleState": "Ready", - "fullyQualifiedDomainName": "testserver.test-vm1.onebox.xdb.mscds.com", - "version": "5.6" - } - }, - { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/testserver1", - "name": "testserver1", - "type": "Microsoft.DBforMySQL/servers", - "location": "eastus", - "tags": { - "elasticServer": "1" + "fullyQualifiedDomainName": "mysqltestsvc1.mysql.database.azure.com", + "earliestRestoreDate": "2018-03-07T18:17:35.729321+00:00" }, - "sku": { - "capacity": 2, - "family": "Gen4", - "name": "B_Gen4_2", - "size": null, - "tier": "Basic" - }, - "properties": { - "storageProfile": { - "storageMB": 128000, - "backupRetentionDays": 7, - "geoRedundantBackup": "Enabled" - }, - "administratorLogin": "cloudsa", - "sslEnforcement": "Enabled", - "userVisibleState": "Ready", - "fullyQualifiedDomainName": "testserver.test-vm1.onebox.xdb.mscds.com", - "version": "5.6" - } + "location": "westus", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc1", + "name": "mysqltestsvc1", + "type": "Microsoft.DBforMySQL/servers" }, { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/testserver2", - "name": "testserver2", - "type": "Microsoft.DBforMySQL/servers", - "location": "eastus", - "tags": { - "elasticServer": "1" - }, "sku": { - "capacity": 2, + "name": "GP_Gen4_2", + "tier": "GeneralPurpose", "family": "Gen4", - "name": "B_Gen4_2", - "size": null, - "tier": "Basic" + "capacity": 2 }, "properties": { + "administratorLogin": "testuser", "storageProfile": { - "storageMB": 128000, + "storageMB": 5120, "backupRetentionDays": 7, - "geoRedundantBackup": "Enabled" + "geoRedundantBackup": "Disabled" }, - "administratorLogin": "cloudsa", + "version": "5.7", "sslEnforcement": "Enabled", "userVisibleState": "Ready", - "fullyQualifiedDomainName": "testserver.test-vm1.onebox.xdb.mscds.com", - "version": "5.6" - } + "fullyQualifiedDomainName": "mysqltstsvc2.mysql.database.azure.com", + "earliestRestoreDate": "2018-03-07T18:17:35.729321+00:00" + }, + "location": "westus", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltstsvc2", + "name": "mysqltstsvc2", + "type": "Microsoft.DBforMySQL/servers" } ] } } } -} \ No newline at end of file +} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerRestart.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerRestart.json new file mode 100644 index 000000000000..0f58486f743a --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerRestart.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "serverName": "testserver", + "resourceGroupName": "TestGroup", + "api-version": "2017-12-01-preview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + }, + "responses": { + "200": {}, + "202": {} + } + } \ No newline at end of file diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerSecurityAlertsCreateMax.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerSecurityAlertsCreateMax.json new file mode 100644 index 000000000000..ce8f70a65a88 --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerSecurityAlertsCreateMax.json @@ -0,0 +1,39 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "securityalert-4799", + "serverName": "securityalert-6440", + "securityAlertPolicyName": "Default", + "api-version": "2017-12-01-preview", + "parameters": { + "properties": { + "state": "Enabled", + "emailAccountAdmins": true, + "emailAddresses": ["testSecurityAlert@microsoft.com"], + "disabledAlerts": ["Access_Anomaly", "Usage_Anomaly"], + "retentionDays": 5, + "storageAccountAccessKey": "sdlfkjabc+sdlfkjsdlkfsjdfLDKFTERLKFDFKLjsdfksjdflsdkfD2342309432849328476458/3RSD==", + "storageEndpoint": "https://mystorage.blob.core.windows.net" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/securityalert-4799/providers/Microsoft.DBforMySQL/servers/securityalert-6440/securityAlertPolicies/default", + "name": "Default", + "type": "Microsoft.DBforMySQL/servers/securityAlertPolicies", + "properties": { + "state": "Enabled", + "emailAccountAdmins": true, + "emailAddresses": ["testSecurityAlert@microsoft.com"], + "disabledAlerts": ["Access_Anomaly","Usage_Anomaly"], + "retentionDays": 5, + "storageEndpoint": "https://mystorage.blob.core.windows.net" + } + } + }, + "202": { + } + } +} \ No newline at end of file diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerSecurityAlertsCreateMin.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerSecurityAlertsCreateMin.json new file mode 100644 index 000000000000..32d9e90c033a --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerSecurityAlertsCreateMin.json @@ -0,0 +1,34 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "securityalert-4799", + "serverName": "securityalert-6440", + "securityAlertPolicyName": "Default", + "api-version": "2017-12-01-preview", + "parameters": { + "properties": { + "state": "Disabled", + "emailAccountAdmins": true + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/securityalert-4799/providers/Microsoft.DBforMySQL/servers/securityalert-6440/securityAlertPolicies/default", + "name": "Default", + "type": "Microsoft.DBforMySQL/servers/securityAlertPolicies", + "properties": { + "state": "Enabled", + "emailAccountAdmins": true, + "emailAddresses": [], + "disabledAlerts": [], + "retentionDays": 0, + "storageEndpoint": "" + } + } + }, + "202": { + } + } +} \ No newline at end of file diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerSecurityAlertsGet.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerSecurityAlertsGet.json new file mode 100644 index 000000000000..d189ddd73a3f --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerSecurityAlertsGet.json @@ -0,0 +1,26 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "securityalert-4799", + "serverName": "securityalert-6440", + "securityAlertPolicyName": "Default", + "api-version": "2017-03-01-preview" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/securityalert-4799/providers/Microsoft.DBforMySQL/servers/securityalert-6440/securityAlertPolicies/default", + "name": "Default", + "type": "Microsoft.DBforMySQL/servers/securityAlertPolicies", + "properties": { + "state": "Disabled", + "emailAccountAdmins": true, + "emailAddresses": [ "test@microsoft.com;user@microsoft.com" ], + "disabledAlerts": ["Access_Anomaly"], + "retentionDays": 0, + "storageEndpoint": "https://mystorage.blob.core.windows.net" + } + } + } + } +} \ No newline at end of file diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerUpdate.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerUpdate.json index 4be7be89e3f8..473671f3fc54 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerUpdate.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerUpdate.json @@ -1,12 +1,12 @@ { "parameters": { - "serverName": "testserver", - "resourceGroupName": "TestGroup", + "serverName": "mysqltestsvc4", + "resourceGroupName": "testrg", "api-version": "2017-12-01-preview", "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", "parameters": { - "properties":{ - "administratorLoginPassword":"newpassword", + "properties": { + "administratorLoginPassword": "newpa$$w0rd", "sslEnforcement": "Disabled" } } @@ -14,19 +14,11 @@ "responses": { "200": { "body": { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/testserver", - "name": "testserver", - "type": "Microsoft.DBforMySQL/servers", - "location": "eastus", "sku": { - "capacity": 2, + "name": "GP_Gen4_2", + "tier": "GeneralPurpose", "family": "Gen4", - "name": "B_Gen4_2", - "size": null, - "tier": "Basic" - }, - "tags": { - "elasticServer": "1" + "capacity": 2 }, "properties": { "administratorLogin": "cloudsa", @@ -35,12 +27,21 @@ "backupRetentionDays": 7, "geoRedundantBackup": "Enabled" }, + "version": "5.7", "sslEnforcement": "Disabled", "userVisibleState": "Ready", - "fullyQualifiedDomainName": "testserver.test-vm1.onebox.xdb.mscds.com" - } + "fullyQualifiedDomainName": "mysqltestsvc4.mysql.database.azure.com", + "earliestRestoreDate": "2018-03-14T18:02:41.577+00:00" + }, + "location": "westus", + "tags": { + "ElasticServer": "1" + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc4", + "name": "mysqltestsvc4", + "type": "Microsoft.DBforMySQL/servers" } }, "202": {} } -} \ No newline at end of file +} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/VirtualNetworkRulesCreateOrUpdate.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/VirtualNetworkRulesCreateOrUpdate.json new file mode 100644 index 000000000000..e49272d97d31 --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/VirtualNetworkRulesCreateOrUpdate.json @@ -0,0 +1,40 @@ +{ + "parameters": { + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "TestGroup", + "serverName": "vnet-test-svr", + "virtualNetworkRuleName": "vnet-firewall-rule", + "api-version": "2017-12-01-preview", + "parameters": { + "properties": { + "ignoreMissingVnetServiceEndpoint": false, + "virtualNetworkSubnetId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.Network/virtualNetworks/testvnet/subnets/testsubnet" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/vnet-test-svr/virtualNetworkRules/vnet-firewall-rule", + "name": "vnet-firewall-rule", + "type": "Microsoft.DBforMySQL/servers/virtualNetworkRules", + "properties": { + "ignoreMissingVnetServiceEndpoint": false, + "virtualNetworkSubnetId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.Network/virtualNetworks/testvnet/subnets/testsubnet" + } + } + }, + "201": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/vnet-test-svr/virtualNetworkRules/vnet-firewall-rule", + "name": "vnet-firewall-rule", + "type": "Microsoft.DBforMySQL/servers/virtualNetworkRules", + "properties": { + "ignoreMissingVnetServiceEndpoint": false, + "virtualNetworkSubnetId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.Network/virtualNetworks/testvnet/subnets/testsubnet" + } + } + }, + "202": {} + } +} \ No newline at end of file diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/VirtualNetworkRulesDelete.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/VirtualNetworkRulesDelete.json new file mode 100644 index 000000000000..a6dc2113e0d5 --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/VirtualNetworkRulesDelete.json @@ -0,0 +1,20 @@ +{ + "parameters": { + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "TestGroup", + "serverName": "vnet-test-svr", + "virtualNetworkRuleName": "vnet-firewall-rule", + "api-version": "2017-12-01-preview" + }, + "responses": { + "200": { + "body": "" + }, + "202": { + "body": "" + }, + "204": { + "body": "" + } + } +} \ No newline at end of file diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/VirtualNetworkRulesGet.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/VirtualNetworkRulesGet.json new file mode 100644 index 000000000000..176df67d2998 --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/VirtualNetworkRulesGet.json @@ -0,0 +1,23 @@ +{ + "parameters": { + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "TestGroup", + "serverName": "vnet-test-svr", + "virtualNetworkRuleName": "vnet-firewall-rule", + "api-version": "2017-12-01-preview" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/vnet-test-svr/virtualNetworkRules/vnet-firewall-rule", + "name": "vnet-firewall-rule", + "type": "Microsoft.DBforMySQL/servers/virtualNetworkRules", + "properties": { + "ignoreMissingVnetServiceEndpoint": false, + "state": "Ready", + "virtualNetworkSubnetId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.Network/virtualNetworks/testvnet/subnets/testsubnet" + } + } + } + } +} \ No newline at end of file diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/VirtualNetworkRulesList.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/VirtualNetworkRulesList.json new file mode 100644 index 000000000000..3574662d1ed5 --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/VirtualNetworkRulesList.json @@ -0,0 +1,37 @@ +{ + "parameters": { + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "TestGroup", + "serverName": "vnet-test-svr", + "virtualNetworkRuleName": "vnet-firewall-rule", + "api-version": "2017-12-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/vnet-test-svr/virtualNetworkRules/vnet-firewall-rule", + "name": "vnet-firewall-rule", + "type": "Microsoft.DBforMySQL/servers/virtualNetworkRules", + "properties": { + "ignoreMissingVnetServiceEndpoint": false, + "state": "Ready", + "virtualNetworkSubnetId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.Network/virtualNetworks/testvnet/subnets/testsubnet" + } + }, + { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/vnet-test-svr/virtualNetworkRules/vnet-firewall-rule", + "name": "vnet-firewall-rule", + "type": "Microsoft.DBforMySQL/servers/virtualNetworkRules", + "properties": { + "ignoreMissingVnetServiceEndpoint": false, + "state": "Ready", + "virtualNetworkSubnetId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.Network/virtualNetworks/testvnet/subnets/testsubnet" + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/mysql.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/mysql.json index 018318240bc1..938a97c6e252 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/mysql.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/mysql.json @@ -2,7 +2,7 @@ "swagger": "2.0", "info": { "title": "MySQLManagementClient", - "description": "The Microsoft Azure management API provides create, read, update, and delete functionality for Azure MySQL resources including servers, databases, firewall rules, log files and configurations with new business model.", + "description": "The Microsoft Azure management API provides create, read, update, and delete functionality for Azure MySQL resources including servers, databases, firewall rules, VNET rules, log files and configurations with new business model.", "version": "2017-12-01-preview" }, "host": "management.azure.com", @@ -41,8 +41,17 @@ ], "operationId": "Servers_Create", "x-ms-examples": { - "ServerCreate": { + "Create a new server": { "$ref": "./examples/ServerCreate.json" + }, + "Create a database as a point in time restore": { + "$ref":"./examples/ServerCreatePointInTimeRestore.json" + }, + "Create a server as a geo restore ": { + "$ref": "./examples/ServerCreateGeoRestoreMode.json" + }, + "Create a replica server": { + "$ref": "./examples/ServerCreateReplicaMode.json" } }, "description": "Creates a new server or updates an existing server. The update action will overwrite the existing server.", @@ -277,6 +286,86 @@ } } }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/servers/{serverName}/restart": { + "post": { + "tags": [ + "ServerRestart" + ], + "operationId": "Servers_Restart", + "x-ms-examples": { + "ServerRestart": { "$ref": "./examples/ServerRestart.json" } + }, + "description": "Restarts a server.", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + } + ], + "responses": { + "200": { + "description": "OK" + }, + "202": { + "description": "Accepted" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-long-running-operation": true + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/servers/{serverName}/replicas": { + "get": { + "tags": [ + "Replicas" + ], + "operationId": "Replicas_ListByServer", + "x-ms-examples": { + "ReplicasListByServer": { + "$ref": "./examples/ReplicasListByServer.json" + } + }, + "description": "List all the replicas for a given server.", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ServerListResult" + } + } + }, + "x-ms-pageable": { + "nextLinkName": null + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/servers/{serverName}/firewallRules/{firewallRuleName}": { "put": { "tags": [ @@ -452,6 +541,193 @@ } } }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/servers/{serverName}/virtualNetworkRules/{virtualNetworkRuleName}": { + "get": { + "tags": [ + "VirtualNetworkRules" + ], + "description": "Gets a virtual network rule.", + "operationId": "VirtualNetworkRules_Get", + "parameters": [ + { + "$ref": "#/parameters/ResourceGroupParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/virtualNetworkRuleNameParameter" + } + ], + "responses": { + "200": { + "description": "Successfully retrieved a specified virtual network rule.", + "schema": { + "$ref": "#/definitions/VirtualNetworkRule" + } + }, + "default": { + "description": "*** Error Responses: ***\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 ResourceNotFound - The requested resource was not found." + } + }, + "x-ms-examples": { + "Gets a virtual network rule": { + "$ref": "./examples/VirtualNetworkRulesGet.json" + } + } + }, + "put": { + "tags": [ + "VirtualNetworkRules" + ], + "description": "Creates or updates an existing virtual network rule.", + "operationId": "VirtualNetworkRules_CreateOrUpdate", + "parameters": [ + { + "$ref": "#/parameters/ResourceGroupParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/virtualNetworkRuleNameParameter" + }, + { + "name": "parameters", + "in": "body", + "description": "The requested virtual Network Rule Resource state.", + "required": true, + "schema": { + "$ref": "#/definitions/VirtualNetworkRule" + } + } + ], + "responses": { + "200": { + "description": "Successfully updated a virtual network rule.", + "schema": { + "$ref": "#/definitions/VirtualNetworkRule" + } + }, + "default": { + "description": "*** Error Responses: ***\n\n * 400 InvalidResourceId - Invalid resource identifier.\n\n * 400 MismatchingSubscriptionWithUrl - The provided subscription did not match the subscription in the Url.\n\n * 400 MismatchingResourceGroupNameWithUrl - The provided resource group name did not match the name in the Url.\n\n * 400 MismatchingServerNameWithUrl - The provided server name did not match the name in the Url.\n\n * 400 NullVirtualNetworkRequest - Virtual Network Request is Null\n\n * 400 NullVirtualNetworkRequestParameters - Virtual Network Request Parameters are Null\n\n * 400 NullVirtualNetworkSubnetId - The Virtual Network Subnet Id is null\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 VirtualNetworkRuleNotEnabled - Azure SQL Server Virtual Network Rule feature is not enabled\n\n * 404 OperationIdNotFound - The operation with Id does not exist.\n\n * 409 OperationCancelled - The operation has been cancelled by user.\n\n * 409 OperationInterrupted - The operation on the resource could not be completed because it was interrupted by another operation on the same resource.\n\n * 500 OperationTimedOut - The operation timed out and automatically rolled back. Please retry the operation." + }, + "202": { + "description": "Accepted" + }, + "201": { + "description": "Successfully created a virtual network rule.", + "schema": { + "$ref": "#/definitions/VirtualNetworkRule" + } + } + }, + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Create or update a virtual network rule": { + "$ref": "./examples/VirtualNetworkRulesCreateOrUpdate.json" + } + } + }, + "delete": { + "tags": [ + "VirtualNetworkRules" + ], + "description": "Deletes the virtual network rule with the given name.", + "operationId": "VirtualNetworkRules_Delete", + "parameters": [ + { + "$ref": "#/parameters/ResourceGroupParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + }, + { + "$ref": "#/parameters/virtualNetworkRuleNameParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Successfully deleted the virtual network rule." + }, + "default": { + "description": "*** Error Responses: ***\n\n * 400 InvalidResourceId - Invalid resource identifier.\n\n * 400 MismatchingSubscriptionWithUrl - The provided subscription did not match the subscription in the Url.\n\n * 400 MismatchingResourceGroupNameWithUrl - The provided resource group name did not match the name in the Url.\n\n * 400 MismatchingServerNameWithUrl - The provided server name did not match the name in the Url.\n\n * 400 NullVirtualNetworkRequest - Virtual Network Request is Null\n\n * 400 NullVirtualNetworkRequestParameters - Virtual Network Request Parameters are Null\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 OperationIdNotFound - The operation with Id does not exist.\n\n * 409 OperationCancelled - The operation has been cancelled by user.\n\n * 409 OperationInterrupted - The operation on the resource could not be completed because it was interrupted by another operation on the same resource.\n\n * 500 OperationTimedOut - The operation timed out and automatically rolled back. Please retry the operation." + }, + "202": { + "description": "Accepted" + }, + "204": { + "description": "The specified virtual network rule does not exist." + } + }, + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Delete a virtual network rule": { + "$ref": "./examples/VirtualNetworkRulesDelete.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/servers/{serverName}/virtualNetworkRules": { + "get": { + "tags": [ + "VirtualNetworkRules" + ], + "description": "Gets a list of virtual network rules in a server.", + "operationId": "VirtualNetworkRules_ListByServer", + "parameters": [ + { + "$ref": "#/parameters/ResourceGroupParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Successfully retrieved the list of virtual network rules.", + "schema": { + "$ref": "#/definitions/VirtualNetworkRuleListResult" + } + }, + "default": { + "description": "*** Error Responses: ***\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 ResourceNotFound - The requested resource was not found." + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "List virtual network rules": { + "$ref": "./examples/VirtualNetworkRulesList.json" + } + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/servers/{serverName}/databases/{databaseName}": { "put": { "tags": [ @@ -869,6 +1145,126 @@ } } }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMySQL/servers/{serverName}/securityAlertPolicies/{securityAlertPolicyName}": { + "get": { + "tags": [ + "ServerSecurityAlertPolicies" + ], + "description": "Get a server's security alert policy.", + "operationId": "ServerSecurityAlertPolicies_Get", + "parameters": [ + { + "$ref": "#/parameters/ResourceGroupParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + }, + { + "name": "securityAlertPolicyName", + "in": "path", + "description": "The name of the security alert policy.", + "required": true, + "type": "string", + "enum": [ + "Default" + ], + "x-ms-enum": { + "name": "SecurityAlertPolicyName", + "modelAsString": true + } + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Successfully retrieved the server threat detection policy.", + "schema": { + "$ref": "#/definitions/ServerSecurityAlertPolicy" + } + }, + "default": { + "description": "Error response describing why the operation of getting security alert policies failed." + } + }, + "x-ms-examples": { + "Get a server's threat detection policy": { + "$ref": "./examples/ServerSecurityAlertsGet.json" + } + } + }, + "put": { + "tags": [ + "ServerSecurityAlertPolicies" + ], + "description": "Creates or updates a threat detection policy.", + "operationId": "ServerSecurityAlertPolicies_CreateOrUpdate", + "parameters": [ + { + "$ref": "#/parameters/ResourceGroupParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + }, + { + "name": "securityAlertPolicyName", + "in": "path", + "description": "The name of the threat detection policy.", + "required": true, + "type": "string", + "enum": [ + "Default" + ], + "x-ms-enum": { + "name": "SecurityAlertPolicyName", + "modelAsString": true + } + }, + { + "name": "parameters", + "in": "body", + "description": "The server security alert policy.", + "required": true, + "schema": { + "$ref": "#/definitions/ServerSecurityAlertPolicy" + } + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Successfully updated the threat detection policy.", + "schema": { + "$ref": "#/definitions/ServerSecurityAlertPolicy" + } + }, + "default": { + "description": "Error response describing why the operation of setting security alert policies failed." + }, + "202": { + "description": "Created request to set the server threat detection policy." + } + }, + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Update a server's threat detection policy with all parameters": { + "$ref": "./examples/ServerSecurityAlertsCreateMax.json" + }, + "Update a server's threat detection policy with minimal parameters": { + "$ref": "./examples/ServerSecurityAlertsCreateMin.json" + } + } + } + }, "/providers/Microsoft.DBforMySQL/operations": { "get": { "tags": [ @@ -1006,6 +1402,20 @@ "storageProfile": { "$ref": "#/definitions/StorageProfile", "description": "Storage profile of a server." + }, + "replicationRole": { + "type": "string", + "description": "The replication role of the server." + }, + "masterServerId": { + "type": "string", + "description": "The master server id of a replica server." + }, + "replicaCapacity": { + "type": "integer", + "format": "int32", + "minimum": 0, + "description": "The maximum number of replicas that a master server can have." } }, "description": "The properties of a server." @@ -1032,6 +1442,18 @@ "type": "integer", "format": "int32", "description": "Max storage allowed for a server." + }, + "storageAutogrow" : { + "type": "string", + "description": "Enable Storage Auto Grow.", + "enum": [ + "Enabled", + "Disabled" + ], + "x-ms-enum": { + "name": "StorageAutogrow", + "modelAsString": true + } } }, "description": "Storage Profile properties of a server" @@ -1059,7 +1481,9 @@ "description": "The mode to create a new server.", "enum": [ "Default", - "PointInTimeRestore" + "PointInTimeRestore", + "GeoRestore", + "Replica" ], "x-ms-enum": { "name": "CreateMode", @@ -1115,7 +1539,43 @@ "sourceServerId", "restorePointInTime" ], - "description": "The properties to a new server by restoring from a backup." + "description": "The properties used to create a new server by restoring from a backup." + }, + "ServerPropertiesForGeoRestore": { + "x-ms-discriminator-value": "GeoRestore", + "allOf": [ + { + "$ref": "#/definitions/ServerPropertiesForCreate" + } + ], + "properties": { + "sourceServerId": { + "type": "string", + "description": "The source server id to restore from." + } + }, + "required": [ + "sourceServerId" + ], + "description": "The properties used to create a new server by restoring to a different region from a geo replicated backup." + }, + "ServerPropertiesForReplica": { + "x-ms-discriminator-value": "Replica", + "allOf": [ + { + "$ref": "#/definitions/ServerPropertiesForCreate" + } + ], + "properties": { + "sourceServerId": { + "type": "string", + "description": "The master server id to create replica from." + } + }, + "required": [ + "sourceServerId" + ], + "description": "The properties to create a new replica." }, "Sku": { "properties": { @@ -1225,6 +1685,10 @@ "sslEnforcement": { "$ref": "#/definitions/SslEnforcement", "description": "Enable ssl enforcement or not when connect to server." + }, + "replicationRole": { + "type": "string", + "description": "The replication role of the server." } }, "x-ms-client-flatten": true, @@ -1301,6 +1765,74 @@ }, "description": "A list of firewall rules." }, + "VirtualNetworkRuleProperties": { + "description": "Properties of a virtual network rule.", + "required": [ + "virtualNetworkSubnetId" + ], + "type": "object", + "properties": { + "virtualNetworkSubnetId": { + "description": "The ARM resource id of the virtual network subnet.", + "type": "string" + }, + "ignoreMissingVnetServiceEndpoint": { + "description": "Create firewall rule before the virtual network has vnet service endpoint enabled.", + "type": "boolean" + }, + "state": { + "description": "Virtual Network Rule State", + "enum": [ + "Initializing", + "InProgress", + "Ready", + "Deleting", + "Unknown" + ], + "type": "string", + "readOnly": true, + "x-ms-enum": { + "name": "VirtualNetworkRuleState", + "modelAsString": true + } + } + } + }, + "VirtualNetworkRule": { + "description": "A virtual network rule.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/ProxyResource" + } + ], + "properties": { + "properties": { + "$ref": "#/definitions/VirtualNetworkRuleProperties", + "description": "Resource properties.", + "x-ms-client-flatten": true + } + } + }, + "VirtualNetworkRuleListResult": { + "description": "A list of virtual network rules.", + "type": "object", + "properties": { + "value": { + "description": "Array of results.", + "type": "array", + "items": { + "$ref": "#/definitions/VirtualNetworkRule" + }, + "readOnly": true + }, + "nextLink": { + "description": "Link to retrieve next page of results.", + "type": "string", + "readOnly": true + } + } + }, "DatabaseProperties": { "properties": { "charset": { @@ -1478,10 +2010,6 @@ }, "LogFileProperties": { "properties": { - "name": { - "type": "string", - "description": "Log file name." - }, "sizeInKB": { "type": "integer", "format": "int64", @@ -1558,15 +2086,6 @@ "hardwareGeneration": { "type": "string", "description": "Hardware generation associated with the service level objective" - } - }, - "description": "Service level objectives for performance tier." - }, - "PerformanceTierProperties": { - "properties": { - "id": { - "type": "string", - "description": "ID of the performance tier." }, "maxBackupRetentionDays": { "type": "integer", @@ -1585,6 +2104,15 @@ "type": "integer", "format": "int32", "description": "Max storage allowed for a server." + } + }, + "description": "Service level objectives for performance tier." + }, + "PerformanceTierProperties": { + "properties": { + "id": { + "type": "string", + "description": "ID of the performance tier." }, "serviceLevelObjectives": { "type": "array", @@ -1640,7 +2168,109 @@ } }, "description": "Represents a resource name availability." - } + }, + "SecurityAlertPolicyProperties": { + "description": "Properties of a security alert policy.", + "required": [ + "state" + ], + "type": "object", + "properties": { + "state": { + "description": "Specifies the state of the policy, whether it is enabled or disabled.", + "enum": [ + "Enabled", + "Disabled" + ], + "type": "string", + "x-ms-enum": { + "name": "ServerSecurityAlertPolicyState", + "modelAsString": false + } + }, + "disabledAlerts": { + "description": "Specifies an array of alerts that are disabled. Allowed values are: Sql_Injection, Sql_Injection_Vulnerability, Access_Anomaly", + "type": "array", + "items": { + "type": "string" + } + }, + "emailAddresses": { + "description": "Specifies an array of e-mail addresses to which the alert is sent.", + "type": "array", + "items": { + "type": "string" + } + }, + "emailAccountAdmins": { + "description": "Specifies that the alert is sent to the account administrators.", + "type": "boolean" + }, + "storageEndpoint": { + "description": "Specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). This blob storage will hold all Threat Detection audit logs.", + "type": "string" + }, + "storageAccountAccessKey": { + "description": "Specifies the identifier key of the Threat Detection audit storage account.", + "type": "string" + }, + "retentionDays": { + "format": "int32", + "description": "Specifies the number of days to keep in the Threat Detection audit logs.", + "type": "integer" + } + } + }, + "ServerSecurityAlertPolicy": { + "description": "A server security alert policy.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/ProxyResource" + } + ], + "properties": { + "properties": { + "$ref": "#/definitions/SecurityAlertPolicyProperties", + "description": "Resource properties.", + "x-ms-client-flatten": true + } + } + }, + "CloudError": { + "x-ms-external": true, + "properties": { + "error": { + "$ref": "#/definitions/CloudErrorBody" + } + }, + "description": "An error response from the Batch service." + }, + "CloudErrorBody": { + "x-ms-external": true, + "properties": { + "code": { + "type": "string", + "description": "An identifier for the error. Codes are invariant and are intended to be consumed programmatically." + }, + "message": { + "type": "string", + "description": "A message describing the error, intended to be suitable for display in a user interface." + }, + "target": { + "type": "string", + "description": "The target of the particular error. For example, the name of the property in error." + }, + "details": { + "type": "array", + "items": { + "$ref": "#/definitions/CloudErrorBody" + }, + "description": "A list of additional details about the error." + } + }, + "description": "An error response from the Batch service." + } }, "parameters": { "SubscriptionIdParameter": { @@ -1681,6 +2311,14 @@ "description": "The name of the server firewall rule.", "x-ms-parameter-location": "method" }, + "virtualNetworkRuleNameParameter": { + "name": "virtualNetworkRuleName", + "in": "path", + "description": "The name of the virtual network rule.", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, "DatabaseNameParameter": { "name": "databaseName", "in": "path", @@ -1704,6 +2342,17 @@ "type": "string", "description": "The name of the location.", "x-ms-parameter-location": "method" + }, + "SecurityAlertPolicyNameParameter": { + "name": "securityAlertPolicyName", + "in": "path", + "description": "The name of the security alert policy.", + "required": true, + "type": "string", + "enum": [ + "default" + ], + "x-ms-parameter-location": "method" } } } \ No newline at end of file diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2017-12-01/mysql.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2017-12-01/mysql.json index 29e2f1dc6fc1..384e97d91ba6 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2017-12-01/mysql.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2017-12-01/mysql.json @@ -1442,6 +1442,18 @@ "type": "integer", "format": "int32", "description": "Max storage allowed for a server." + }, + "storageAutogrow" : { + "type": "string", + "description": "Enable Storage Auto Grow.", + "enum": [ + "Enabled", + "Disabled" + ], + "x-ms-enum": { + "name": "StorageAutogrow", + "modelAsString": true + } } }, "description": "Storage Profile properties of a server" diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/LogFileListByServer.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/LogFileListByServer.json index 3879fd1dadc5..9d6d6eb242b8 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/LogFileListByServer.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/LogFileListByServer.json @@ -11,7 +11,6 @@ "value": [ { "properties": { - "name": "postgresql-2017-06-22_010000.log", "sizeInKB": 4, "createdTime": "0001-01-01T00:00:00+00:00", "lastModifiedTime": "2017-06-22T01:59:36+00:00", @@ -24,7 +23,6 @@ }, { "properties": { - "name": "postgresql-2017-06-22_020000.log", "sizeInKB": 1, "createdTime": "0001-01-01T00:00:00+00:00", "lastModifiedTime": "2017-06-22T02:19:36+00:00", diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/PerformanceTiersListByLocation.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/PerformanceTiersListByLocation.json index 31c938f6aa34..65f92bde8968 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/PerformanceTiersListByLocation.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/PerformanceTiersListByLocation.json @@ -15,31 +15,23 @@ "edition": "Basic", "vCore": 1, "hardwareGeneration": "Gen4", + "minStorageMB": 5120, + "maxStorageMB": 1048576, + "minBackupRetentionDays": 7, + "maxBackupRetentionDays": 35, "id": "B_Gen4_1" }, { "edition": "Basic", "vCore": 2, "hardwareGeneration": "Gen4", + "minStorageMB": 5120, + "maxStorageMB": 1048576, + "minBackupRetentionDays": 7, + "maxBackupRetentionDays": 35, "id": "B_Gen4_2" - }, - { - "edition": "Basic", - "vCore": 1, - "hardwareGeneration": "Gen5", - "id": "B_Gen5_1" - }, - { - "edition": "Basic", - "vCore": 2, - "hardwareGeneration": "Gen5", - "id": "B_Gen5_2" } - ], - "minStorageMB": 5120, - "maxStorageMB": 1048576, - "minBackupRetentionDays": 7, - "maxBackupRetentionDays": 35 + ] }, { "id": "GeneralPurpose", @@ -48,106 +40,53 @@ "edition": "GeneralPurpose", "vCore": 2, "hardwareGeneration": "Gen4", + "minStorageMB": 5120, + "maxStorageMB": 2097152, + "minBackupRetentionDays": 7, + "maxBackupRetentionDays": 35, "id": "GP_Gen4_2" }, { "edition": "GeneralPurpose", "vCore": 4, "hardwareGeneration": "Gen4", + "minStorageMB": 5120, + "maxStorageMB": 2097152, + "minBackupRetentionDays": 7, + "maxBackupRetentionDays": 35, "id": "GP_Gen4_4" }, { "edition": "GeneralPurpose", "vCore": 8, "hardwareGeneration": "Gen4", + "minStorageMB": 5120, + "maxStorageMB": 2097152, + "minBackupRetentionDays": 7, + "maxBackupRetentionDays": 35, "id": "GP_Gen4_8" }, { "edition": "GeneralPurpose", "vCore": 16, "hardwareGeneration": "Gen4", + "minStorageMB": 5120, + "maxStorageMB": 2097152, + "minBackupRetentionDays": 7, + "maxBackupRetentionDays": 35, "id": "GP_Gen4_16" }, { "edition": "GeneralPurpose", "vCore": 32, "hardwareGeneration": "Gen4", + "minStorageMB": 5120, + "maxStorageMB": 2097152, + "minBackupRetentionDays": 7, + "maxBackupRetentionDays": 35, "id": "GP_Gen4_32" - }, - { - "edition": "GeneralPurpose", - "vCore": 2, - "hardwareGeneration": "Gen5", - "id": "GP_Gen5_2" - }, - { - "edition": "GeneralPurpose", - "vCore": 4, - "hardwareGeneration": "Gen5", - "id": "GP_Gen5_4" - }, - { - "edition": "GeneralPurpose", - "vCore": 8, - "hardwareGeneration": "Gen5", - "id": "GP_Gen5_8" - }, - { - "edition": "GeneralPurpose", - "vCore": 16, - "hardwareGeneration": "Gen5", - "id": "GP_Gen5_16" - }, - { - "edition": "GeneralPurpose", - "vCore": 32, - "hardwareGeneration": "Gen5", - "id": "GP_Gen5_32" - } - ], - "minStorageMB": 5120, - "maxStorageMB": 2097152, - "minBackupRetentionDays": 7, - "maxBackupRetentionDays": 35 - }, - { - "id": "MemoryOptimized", - "serviceLevelObjectives": [ - { - "edition": "MemoryOptimized", - "vCore": 2, - "hardwareGeneration": "Gen5", - "id": "MO_Gen5_2" - }, - { - "edition": "MemoryOptimized", - "vCore": 4, - "hardwareGeneration": "Gen5", - "id": "MO_Gen5_4" - }, - { - "edition": "MemoryOptimized", - "vCore": 8, - "hardwareGeneration": "Gen5", - "id": "MO_Gen5_8" - }, - { - "edition": "MemoryOptimized", - "vCore": 16, - "hardwareGeneration": "Gen5", - "id": "MO_Gen5_16" - }, - { - "edition": "MemoryOptimized", - "vCore": 32, - "hardwareGeneration": "Gen5", - "id": "MO_Gen5_32" } - ], - "minStorageMB": 5120, - "maxStorageMB": 2097152, - "minBackupRetentionDays": 7, - "maxBackupRetentionDays": 35 + ] } ] } diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/ServerCreate.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/ServerCreate.json index d48932d9e6d1..1cdf9fa6922e 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/ServerCreate.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/ServerCreate.json @@ -1,11 +1,11 @@ { "parameters": { - "serverName": "testserver", + "serverName": "pgtestsvc4", "resourceGroupName": "TestGroup", "api-version": "2017-12-01-preview", "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", "parameters": { - "location": "eastus", + "location": "westus", "properties": { "administratorLogin": "cloudsa", "administratorLoginPassword": "password", @@ -31,62 +31,62 @@ "responses": { "201": { "body": { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/servers/testserver", - "name": "testserver", - "type": "Microsoft.DBforPostgreSQL/servers", - "location": "eastus", "sku": { - "capacity": 2, - "family": "Gen5", "name": "B_Gen5_2", - "size": null, - "tier": "Basic" - }, - "tags": { - "elasticServer": "1" + "tier": "Basic", + "family": "Gen5", + "capacity": 2 }, "properties": { + "administratorLogin": "cloudsa", "storageProfile": { "storageMB": 128000, "backupRetentionDays": 7, "geoRedundantBackup": "Enabled" }, - "administratorLogin": "cloudsa", + "version": "9.6", "sslEnforcement": "Enabled", "userVisibleState": "Ready", - "fullyQualifiedDomainName": "testserver.test-vm1.onebox.xdb.mscds.com", - "earliestRestoreDate": "2018-02-07T16:47:04.027+00:00" - } + "fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com", + "earliestRestoreDate": "2018-03-14T21:08:24.637+00:00" + }, + "location": "westus", + "tags": { + "ElasticServer": "1" + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforPostgreSQL/servers/pgtestsvc4", + "name": "pgtestsvc4", + "type": "Microsoft.DBforPostgreSQL/servers" } }, "200": { "body": { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/servers/testserver", - "name": "testserver", - "type": "Microsoft.DBforPostgreSQL/servers", - "location": "eastus", "sku": { - "capacity": 2, - "family": "Gen4", - "name": "PGSQL_B_Gen4_2", - "size": null, - "tier": "Basic" - }, - "tags": { - "elasticServer": "1" + "name": "B_Gen5_2", + "tier": "Basic", + "family": "Gen5", + "capacity": 2 }, "properties": { + "administratorLogin": "cloudsa", "storageProfile": { "storageMB": 128000, "backupRetentionDays": 7, "geoRedundantBackup": "Enabled" }, - "administratorLogin": "cloudsa", + "version": "9.6", "sslEnforcement": "Enabled", "userVisibleState": "Ready", - "fullyQualifiedDomainName": "testserver.test-vm1.onebox.xdb.mscds.com", - "earliestRestoreDate": "2018-02-07T16:47:04.027+00:00" - } + "fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com", + "earliestRestoreDate": "2018-03-14T21:08:24.637+00:00" + }, + "location": "westus", + "tags": { + "ElasticServer": "1" + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforPostgreSQL/servers/pgtestsvc4", + "name": "pgtestsvc4", + "type": "Microsoft.DBforPostgreSQL/servers" } }, "202": {} diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/ServerCreateReplicaMode.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/ServerCreateReplicaMode.json index 8795c17e6072..ac7e711f7438 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/ServerCreateReplicaMode.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/ServerCreateReplicaMode.json @@ -4,21 +4,27 @@ "resourceGroupName": "TestGroup_WestCentralUS", "api-version": "2017-12-01-preview", "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", - "parameters": { - "Location": "westcentralus", - "Properties": { - "createMode": "Replica", - "sourceServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup_WestCentralUS/providers/Microsoft.DBforPostgreSQL/servers/testserver-master" - } + "parameters": { + "location": "westcentralus", + "properties": { + "createMode": "Replica", + "sourceServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup_WestCentralUS/providers/Microsoft.DBforPostgreSQL/servers/testserver-master" + }, + "sku": { + "name": "GP_Gen5_2", + "tier": "GeneralPurpose", + "family": "Gen5", + "capacity": 2 + } } }, "responses": { "201": { "body": { "sku": { - "name": "GP_Gen4_2", + "name": "GP_Gen5_2", "tier": "GeneralPurpose", - "family": "Gen4", + "family": "Gen5", "capacity": 2 }, "properties": { @@ -46,7 +52,7 @@ "200": { "body": { "sku": { - "name": "GP_Gen4_2", + "name": "GP_Gen5_2", "tier": "GeneralPurpose", "family": "Gen4", "capacity": 2 diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/ServerGet.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/ServerGet.json index a44cf96aa0a4..18ee10f46a86 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/ServerGet.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/ServerGet.json @@ -1,43 +1,38 @@ { "parameters": { - "serverName": "testserver", - "resourceGroupName": "TestGroup", + "serverName": "pgtestsvc1", + "resourceGroupName": "testrg", "api-version": "2017-12-01-preview", "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" }, "responses": { "200": { "body": { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/servers/testserver", - "name": "testserver", - "type": "Microsoft.DBforPostgreSQL/servers", - "location": "eastus", - "tags": { - "elasticServer": "1" - }, "sku": { - "capacity": 2, + "name": "B_Gen4_1", + "tier": "Basic", "family": "Gen4", - "name": "PGSQL_B_Gen4_2", - "size": null, - "tier": "Basic" + "capacity": 1 }, "properties": { + "administratorLogin": "testuser", "storageProfile": { - "storageMB": 128000, - "backupRetentionDays": 7, - "geoRedundantBackup": "Enabled" + "storageMB": 5120, + "backupRetentionDays": 10, + "geoRedundantBackup": "Disabled" }, - "administratorLogin": "cloudsa", + "version": "9.5", "sslEnforcement": "Enabled", "userVisibleState": "Ready", - "fullyQualifiedDomainName": "testserver.postgres.database.azure.com", - "version": "9.6", - "earliestRestoreDate": "2018-06-12T21:42:59.6651019+00:00", - "replicationRole": "None", - "masterServerId": "", - "replicaCapacity": 5 - } + "fullyQualifiedDomainName": "pgtestsvc1.postgres.database.azure.com", + "earliestRestoreDate": "2018-03-04T21:00:58.9243541+00:00", + "replicationRole": "", + "masterServerId": "" + }, + "location": "westus", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforPostgreSQL/servers/pgtestsvc1", + "name": "pgtestsvc1", + "type": "Microsoft.DBforPostgreSQL/servers" } } } diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/ServerList.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/ServerList.json index 4e093b7a3cbd..661f70a6e16a 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/ServerList.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/ServerList.json @@ -8,88 +8,107 @@ "body": { "value": [ { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/servers/testserver", - "name": "testserver", - "type": "Microsoft.DBforPostgreSQL/servers", - "location": "eastus", - "tags": { - "elasticServer": "1" + "sku": { + "name": "B_Gen4_1", + "tier": "Basic", + "family": "Gen4", + "capacity": 1 }, + "properties": { + "administratorLogin": "testuser", + "storageProfile": { + "storageMB": 5120, + "backupRetentionDays": 10, + "geoRedundantBackup": "Disabled" + }, + "version": "9.5", + "sslEnforcement": "Enabled", + "userVisibleState": "Ready", + "fullyQualifiedDomainName": "pgtestsvc1.postgres.database.azure.com", + "earliestRestoreDate": "2018-03-04T21:01:55.1498475+00:00" + }, + "location": "westus", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforPostgreSQL/servers/pgtestsvc1", + "name": "pgtestsvc1", + "type": "Microsoft.DBforPostgreSQL/servers" + }, + { "sku": { - "capacity": 2, + "name": "GP_Gen4_2", + "tier": "GeneralPurpose", "family": "Gen4", - "name": "PGSQL_B_Gen4_2", - "size": null, - "tier": "Basic" + "capacity": 2 }, "properties": { + "administratorLogin": "testuser", "storageProfile": { - "storageMB": 128000, + "storageMB": 5120, "backupRetentionDays": 7, - "geoRedundantBackup": "Enabled" + "geoRedundantBackup": "Disabled" }, - "administratorLogin": "cloudsa", + "version": "9.6", "sslEnforcement": "Enabled", "userVisibleState": "Ready", - "fullyQualifiedDomainName": "testserver.test-vm1.onebox.xdb.mscds.com", - "version": "9.6" - } + "fullyQualifiedDomainName": "pgtestsvc2.postgres.database.azure.com", + "earliestRestoreDate": "2018-03-07T21:01:55.1498475+00:00" + }, + "location": "westus", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforPostgreSQL/servers/pgtestsvc2", + "name": "pgtestsvc2", + "type": "Microsoft.DBforPostgreSQL/servers" }, { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/servers/testserver1", - "name": "testserver1", - "type": "Microsoft.DBforPostgreSQL/servers", - "location": "eastus", - "tags": { - "elasticServer": "1" - }, "sku": { - "capacity": 2, + "name": "GP_Gen4_4", + "tier": "GeneralPurpose", "family": "Gen4", - "name": "PGSQL_B_Gen4_2", - "size": null, - "tier": "Basic" + "capacity": 4 }, "properties": { + "administratorLogin": "testuser", "storageProfile": { - "storageMB": 128000, - "backupRetentionDays": 7, + "storageMB": 204800, + "backupRetentionDays": 35, "geoRedundantBackup": "Enabled" }, - "administratorLogin": "cloudsa", + "version": "9.6", "sslEnforcement": "Enabled", "userVisibleState": "Ready", - "fullyQualifiedDomainName": "testserver.test-vm1.onebox.xdb.mscds.com", - "version": "9.6" - } + "fullyQualifiedDomainName": "pgtestsvc3.postgres.database.azure.com", + "earliestRestoreDate": "2018-03-01T00:11:08.55+00:00" + }, + "location": "westus", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg1/providers/Microsoft.DBforPostgreSQL/servers/pgtestsvc3", + "name": "pgtestsvc3", + "type": "Microsoft.DBforPostgreSQL/servers" }, { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/servers/testserver2", - "name": "testserver2", - "type": "Microsoft.DBforPostgreSQL/servers", - "location": "eastus", - "tags": { - "elasticServer": "1" - }, "sku": { - "capacity": 2, + "name": "B_Gen4_2", + "tier": "Basic", "family": "Gen4", - "name": "PGSQL_B_Gen4_2", - "size": null, - "tier": "Basic" + "capacity": 2 }, "properties": { + "administratorLogin": "cloudsa", "storageProfile": { "storageMB": 128000, "backupRetentionDays": 7, - "geoRedundantBackup": "Enabled" + "geoRedundantBackup": "Disabled" }, - "administratorLogin": "cloudsa", + "version": "9.6", "sslEnforcement": "Enabled", "userVisibleState": "Ready", - "fullyQualifiedDomainName": "testserver.test-vm1.onebox.xdb.mscds.com", - "version": "9.6" - } + "fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com", + "earliestRestoreDate": "2018-03-14T21:08:24.637+00:00" + }, + "location": "westus", + "tags": { + "ElasticServer": "1" + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforPostgreSQL/servers/pgtestsvc4", + "name": "pgtestsvc4", + "type": "Microsoft.DBforPostgreSQL/servers" } ] } diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/ServerListByResourceGroup.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/ServerListByResourceGroup.json index 4366edbe65c4..cf56fd86261d 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/ServerListByResourceGroup.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/ServerListByResourceGroup.json @@ -9,88 +9,82 @@ "body": { "value": [ { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/servers/testserver", - "name": "testserver", - "type": "Microsoft.DBforPostgreSQL/servers", - "location": "eastus", - "tags": { - "elasticServer": "1" - }, "sku": { - "capacity": 2, + "name": "B_Gen4_1", + "tier": "Basic", "family": "Gen4", - "name": "PGSQL_B_Gen4_2", - "size": null, - "tier": "Basic" + "capacity": 1 }, "properties": { + "administratorLogin": "testuser", "storageProfile": { - "storageMB": 128000, - "backupRetentionDays": 7, - "geoRedundantBackup": "Enabled" + "storageMB": 5120, + "backupRetentionDays": 10, + "geoRedundantBackup": "Disabled" }, - "administratorLogin": "cloudsa", + "version": "9.5", "sslEnforcement": "Enabled", "userVisibleState": "Ready", - "fullyQualifiedDomainName": "testserver.test-vm1.onebox.xdb.mscds.com", - "version": "9.6" - } + "fullyQualifiedDomainName": "pgtestsvc1.postgres.database.azure.com", + "earliestRestoreDate": "2018-03-04T21:01:55.1498475+00:00" + }, + "location": "westus", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforPostgreSQL/servers/pgtestsvc1", + "name": "pgtestsvc1", + "type": "Microsoft.DBforPostgreSQL/servers" }, { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/servers/testserver1", - "name": "testserver1", - "type": "Microsoft.DBforPostgreSQL/servers", - "location": "eastus", - "tags": { - "elasticServer": "1" - }, "sku": { - "capacity": 2, + "name": "GP_Gen4_2", + "tier": "GeneralPurpose", "family": "Gen4", - "name": "PGSQL_B_Gen4_2", - "size": null, - "tier": "Basic" + "capacity": 2 }, "properties": { + "administratorLogin": "testuser", "storageProfile": { - "storageMB": 128000, + "storageMB": 5120, "backupRetentionDays": 7, - "geoRedundantBackup": "Enabled" + "geoRedundantBackup": "Disabled" }, - "administratorLogin": "cloudsa", + "version": "9.6", "sslEnforcement": "Enabled", "userVisibleState": "Ready", - "fullyQualifiedDomainName": "testserver.test-vm1.onebox.xdb.mscds.com", - "version": "9.6" - } + "fullyQualifiedDomainName": "pgtestsvc2.postgres.database.azure.com", + "earliestRestoreDate": "2018-03-07T21:01:55.1498475+00:00" + }, + "location": "westus", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforPostgreSQL/servers/pgtestsvc2", + "name": "pgtestsvc2", + "type": "Microsoft.DBforPostgreSQL/servers" }, { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/servers/testserver2", - "name": "testserver2", - "type": "Microsoft.DBforPostgreSQL/servers", - "location": "eastus", - "tags": { - "elasticServer": "1" - }, "sku": { - "capacity": 2, + "name": "B_Gen4_2", + "tier": "Basic", "family": "Gen4", - "name": "PGSQL_B_Gen4_2", - "size": null, - "tier": "Basic" + "capacity": 2 }, "properties": { + "administratorLogin": "cloudsa", "storageProfile": { "storageMB": 128000, "backupRetentionDays": 7, - "geoRedundantBackup": "Enabled" + "geoRedundantBackup": "Disabled" }, - "administratorLogin": "cloudsa", + "version": "9.6", "sslEnforcement": "Enabled", "userVisibleState": "Ready", - "fullyQualifiedDomainName": "testserver.test-vm1.onebox.xdb.mscds.com", - "version": "9.6" - } + "fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com", + "earliestRestoreDate": "2018-03-14T21:08:24.637+00:00" + }, + "location": "westus", + "tags": { + "ElasticServer": "1" + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforPostgreSQL/servers/pgtestsvc4", + "name": "pgtestsvc4", + "type": "Microsoft.DBforPostgreSQL/servers" } ] } diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/ServerRestart.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/ServerRestart.json new file mode 100644 index 000000000000..0f58486f743a --- /dev/null +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/ServerRestart.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "serverName": "testserver", + "resourceGroupName": "TestGroup", + "api-version": "2017-12-01-preview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" + }, + "responses": { + "200": {}, + "202": {} + } + } \ No newline at end of file diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/ServerSecurityAlertsCreateMax.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/ServerSecurityAlertsCreateMax.json new file mode 100644 index 000000000000..a2d76526b423 --- /dev/null +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/ServerSecurityAlertsCreateMax.json @@ -0,0 +1,39 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "securityalert-4799", + "serverName": "securityalert-6440", + "securityAlertPolicyName": "Default", + "api-version": "2017-12-01-preview", + "parameters": { + "properties": { + "state": "Enabled", + "emailAccountAdmins": true, + "emailAddresses": ["testSecurityAlert@microsoft.com"], + "disabledAlerts": ["Access_Anomaly", "Usage_Anomaly"], + "retentionDays": 5, + "storageAccountAccessKey": "sdlfkjabc+sdlfkjsdlkfsjdfLDKFTERLKFDFKLjsdfksjdflsdkfD2342309432849328476458/3RSD==", + "storageEndpoint": "https://mystorage.blob.core.windows.net" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/securityalert-4799/providers/Microsoft.DBforPostgreSQL/servers/securityalert-6440/securityAlertPolicies/default", + "name": "Default", + "type": "Microsoft.DBforPostgreSQL/servers/securityAlertPolicies", + "properties": { + "state": "Enabled", + "emailAccountAdmins": true, + "emailAddresses": ["testSecurityAlert@microsoft.com"], + "disabledAlerts": ["Access_Anomaly","Usage_Anomaly"], + "retentionDays": 5, + "storageEndpoint": "https://mystorage.blob.core.windows.net" + } + } + }, + "202": { + } + } +} \ No newline at end of file diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/ServerSecurityAlertsCreateMin.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/ServerSecurityAlertsCreateMin.json new file mode 100644 index 000000000000..684a83f7891b --- /dev/null +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/ServerSecurityAlertsCreateMin.json @@ -0,0 +1,34 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "securityalert-4799", + "serverName": "securityalert-6440", + "securityAlertPolicyName": "Default", + "api-version": "2017-12-01-preview", + "parameters": { + "properties": { + "state": "Disabled", + "emailAccountAdmins": true + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/securityalert-4799/providers/Microsoft.DBforPostgreSQL/servers/securityalert-6440/securityAlertPolicies/default", + "name": "Default", + "type": "Microsoft.DBforPostgreSQL/servers/securityAlertPolicies", + "properties": { + "state": "Enabled", + "emailAccountAdmins": true, + "emailAddresses": [""], + "disabledAlerts": [""], + "retentionDays": 0, + "storageEndpoint": "" + } + } + }, + "202": { + } + } +} \ No newline at end of file diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/ServerSecurityAlertsGet.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/ServerSecurityAlertsGet.json new file mode 100644 index 000000000000..6a7000e0ae50 --- /dev/null +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/ServerSecurityAlertsGet.json @@ -0,0 +1,26 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "securityalert-4799", + "serverName": "securityalert-6440", + "securityAlertPolicyName": "Default", + "api-version": "2017-03-01-preview" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/securityalert-4799/providers/Microsoft.DBforPostgreSQL/servers/securityalert-6440/securityAlertPolicies/default", + "name": "Default", + "type": "Microsoft.DBforPostgreSQL/servers/securityAlertPolicies", + "properties": { + "state": "Disabled", + "emailAccountAdmins": true, + "emailAddresses": [ "test@microsoft.com;user@microsoft.com" ], + "disabledAlerts": ["Access_Anomaly"], + "retentionDays": 0, + "storageEndpoint": "https://mystorage.blob.core.windows.net" + } + } + } + } +} \ No newline at end of file diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/ServerUpdate.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/ServerUpdate.json index aa4cce64aa4d..871ab1339c1a 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/ServerUpdate.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/ServerUpdate.json @@ -1,7 +1,7 @@ { "parameters": { - "serverName": "testserver", - "resourceGroupName": "TestGroup", + "serverName": "pgtestsvc4", + "resourceGroupName": "testrg", "api-version": "2017-12-01-preview", "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", "parameters": { @@ -14,31 +14,32 @@ "responses": { "200": { "body": { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/servers/testserver", - "name": "testserver", - "type": "Microsoft.DBforPostgreSQL/servers", - "location": "eastus", "sku": { - "capacity": 2, - "family": "Gen4", "name": "B_Gen4_2", - "size": null, - "tier": "Basic" - }, - "tags": { - "elasticServer": "1" + "tier": "Basic", + "family": "Gen4", + "capacity": 2 }, "properties": { "administratorLogin": "cloudsa", "storageProfile": { "storageMB": 128000, "backupRetentionDays": 7, - "geoRedundantBackup": "Enabled" + "geoRedundantBackup": "Disabled" }, - "sslEnforcement": "Disabled", + "version": "9.6", + "sslEnforcement": "Enabled", "userVisibleState": "Ready", - "fullyQualifiedDomainName": "testserver.test-vm1.onebox.xdb.mscds.com" - } + "fullyQualifiedDomainName": "pgtestsvc4.postgres.database.azure.com", + "earliestRestoreDate": "2018-03-14T21:08:24.637+00:00" + }, + "location": "westus", + "tags": { + "ElasticServer": "1" + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforPostgreSQL/servers/pgtestsvc4", + "name": "pgtestsvc4", + "type": "Microsoft.DBforPostgreSQL/servers" } }, "202": {} diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/VirtualNetworkRulesCreateOrUpdate.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/VirtualNetworkRulesCreateOrUpdate.json new file mode 100644 index 000000000000..c3f47a970bf5 --- /dev/null +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/VirtualNetworkRulesCreateOrUpdate.json @@ -0,0 +1,40 @@ +{ + "parameters": { + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "TestGroup", + "serverName": "vnet-test-svr", + "virtualNetworkRuleName": "vnet-firewall-rule", + "api-version": "2017-12-01-preview", + "parameters": { + "properties": { + "ignoreMissingVnetServiceEndpoint": false, + "virtualNetworkSubnetId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.Network/virtualNetworks/testvnet/subnets/testsubnet" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/servers/vnet-test-svr/virtualNetworkRules/vnet-firewall-rule", + "name": "vnet-firewall-rule", + "type": "Microsoft.DBforPostgreSQL/servers/virtualNetworkRules", + "properties": { + "ignoreMissingVnetServiceEndpoint": false, + "virtualNetworkSubnetId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.Network/virtualNetworks/testvnet/subnets/testsubnet" + } + } + }, + "201": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/servers/vnet-test-svr/virtualNetworkRules/vnet-firewall-rule", + "name": "vnet-firewall-rule", + "type": "Microsoft.DBforPostgreSQL/servers/virtualNetworkRules", + "properties": { + "ignoreMissingVnetServiceEndpoint": false, + "virtualNetworkSubnetId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.Network/virtualNetworks/testvnet/subnets/testsubnet" + } + } + }, + "202": {} + } +} \ No newline at end of file diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/VirtualNetworkRulesDelete.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/VirtualNetworkRulesDelete.json new file mode 100644 index 000000000000..a6dc2113e0d5 --- /dev/null +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/VirtualNetworkRulesDelete.json @@ -0,0 +1,20 @@ +{ + "parameters": { + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "TestGroup", + "serverName": "vnet-test-svr", + "virtualNetworkRuleName": "vnet-firewall-rule", + "api-version": "2017-12-01-preview" + }, + "responses": { + "200": { + "body": "" + }, + "202": { + "body": "" + }, + "204": { + "body": "" + } + } +} \ No newline at end of file diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/VirtualNetworkRulesGet.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/VirtualNetworkRulesGet.json new file mode 100644 index 000000000000..2b8bf084bd18 --- /dev/null +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/VirtualNetworkRulesGet.json @@ -0,0 +1,23 @@ +{ + "parameters": { + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "TestGroup", + "serverName": "vnet-test-svr", + "virtualNetworkRuleName": "vnet-firewall-rule", + "api-version": "2017-12-01-preview" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/servers/vnet-test-svr/virtualNetworkRules/vnet-firewall-rule", + "name": "vnet-firewall-rule", + "type": "Microsoft.DBforPostgreSQL/servers/virtualNetworkRules", + "properties": { + "ignoreMissingVnetServiceEndpoint": false, + "state": "Ready", + "virtualNetworkSubnetId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.Network/virtualNetworks/testvnet/subnets/testsubnet" + } + } + } + } +} \ No newline at end of file diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/VirtualNetworkRulesList.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/VirtualNetworkRulesList.json new file mode 100644 index 000000000000..e199e4cd2784 --- /dev/null +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/examples/VirtualNetworkRulesList.json @@ -0,0 +1,37 @@ +{ + "parameters": { + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "TestGroup", + "serverName": "vnet-test-svr", + "virtualNetworkRuleName": "vnet-firewall-rule", + "api-version": "2017-12-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/servers/vnet-test-svr/virtualNetworkRules/vnet-firewall-rule", + "name": "vnet-firewall-rule", + "type": "Microsoft.DBforPostgreSQL/servers/virtualNetworkRules", + "properties": { + "ignoreMissingVnetServiceEndpoint": false, + "state": "Ready", + "virtualNetworkSubnetId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.Network/virtualNetworks/testvnet/subnets/testsubnet" + } + }, + { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/servers/vnet-test-svr/virtualNetworkRules/vnet-firewall-rule", + "name": "vnet-firewall-rule", + "type": "Microsoft.DBforPostgreSQL/servers/virtualNetworkRules", + "properties": { + "ignoreMissingVnetServiceEndpoint": false, + "state": "Ready", + "virtualNetworkSubnetId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.Network/virtualNetworks/testvnet/subnets/testsubnet" + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/postgresql.json index 56d006949857..2c85b3425e3e 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/postgresql.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2017-12-01-preview/postgresql.json @@ -2,7 +2,7 @@ "swagger": "2.0", "info": { "title": "PostgreSQLManagementClient", - "description": "The Microsoft Azure management API provides create, read, update, and delete functionality for Azure PostgreSQL resources including servers, databases, firewall rules, log files and configurations with new business model.", + "description": "The Microsoft Azure management API provides create, read, update, and delete functionality for Azure PostgreSQL resources including servers, databases, firewall rules, VNET rules, security alert policies, log files and configurations with new business model.", "version": "2017-12-01-preview" }, "host": "management.azure.com", @@ -325,6 +325,47 @@ } } }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}/restart": { + "post": { + "tags": [ + "ServerRestart" + ], + "operationId": "Servers_Restart", + "x-ms-examples": { + "ServerRestart": { "$ref": "./examples/ServerRestart.json" } + }, + "description": "Restarts a server.", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + } + ], + "responses": { + "200": { + "description": "OK" + }, + "202": { + "description": "Accepted" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-long-running-operation": true + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}/firewallRules/{firewallRuleName}": { "put": { "tags": [ @@ -500,6 +541,193 @@ } } }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}/virtualNetworkRules/{virtualNetworkRuleName}": { + "get": { + "tags": [ + "VirtualNetworkRules" + ], + "description": "Gets a virtual network rule.", + "operationId": "VirtualNetworkRules_Get", + "parameters": [ + { + "$ref": "#/parameters/ResourceGroupParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/virtualNetworkRuleNameParameter" + } + ], + "responses": { + "200": { + "description": "Successfully retrieved a specified virtual network rule.", + "schema": { + "$ref": "#/definitions/VirtualNetworkRule" + } + }, + "default": { + "description": "*** Error Responses: ***\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 ResourceNotFound - The requested resource was not found." + } + }, + "x-ms-examples": { + "Gets a virtual network rule": { + "$ref": "./examples/VirtualNetworkRulesGet.json" + } + } + }, + "put": { + "tags": [ + "VirtualNetworkRules" + ], + "description": "Creates or updates an existing virtual network rule.", + "operationId": "VirtualNetworkRules_CreateOrUpdate", + "parameters": [ + { + "$ref": "#/parameters/ResourceGroupParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/virtualNetworkRuleNameParameter" + }, + { + "name": "parameters", + "in": "body", + "description": "The requested virtual Network Rule Resource state.", + "required": true, + "schema": { + "$ref": "#/definitions/VirtualNetworkRule" + } + } + ], + "responses": { + "200": { + "description": "Successfully updated a virtual network rule.", + "schema": { + "$ref": "#/definitions/VirtualNetworkRule" + } + }, + "default": { + "description": "*** Error Responses: ***\n\n * 400 InvalidResourceId - Invalid resource identifier.\n\n * 400 MismatchingSubscriptionWithUrl - The provided subscription did not match the subscription in the Url.\n\n * 400 MismatchingResourceGroupNameWithUrl - The provided resource group name did not match the name in the Url.\n\n * 400 MismatchingServerNameWithUrl - The provided server name did not match the name in the Url.\n\n * 400 NullVirtualNetworkRequest - Virtual Network Request is Null\n\n * 400 NullVirtualNetworkRequestParameters - Virtual Network Request Parameters are Null\n\n * 400 NullVirtualNetworkSubnetId - The Virtual Network Subnet Id is null\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 VirtualNetworkRuleNotEnabled - Azure SQL Server Virtual Network Rule feature is not enabled\n\n * 404 OperationIdNotFound - The operation with Id does not exist.\n\n * 409 OperationCancelled - The operation has been cancelled by user.\n\n * 409 OperationInterrupted - The operation on the resource could not be completed because it was interrupted by another operation on the same resource.\n\n * 500 OperationTimedOut - The operation timed out and automatically rolled back. Please retry the operation." + }, + "202": { + "description": "Accepted" + }, + "201": { + "description": "Successfully created a virtual network rule.", + "schema": { + "$ref": "#/definitions/VirtualNetworkRule" + } + } + }, + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Create or update a virtual network rule": { + "$ref": "./examples/VirtualNetworkRulesCreateOrUpdate.json" + } + } + }, + "delete": { + "tags": [ + "VirtualNetworkRules" + ], + "description": "Deletes the virtual network rule with the given name.", + "operationId": "VirtualNetworkRules_Delete", + "parameters": [ + { + "$ref": "#/parameters/ResourceGroupParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + }, + { + "$ref": "#/parameters/virtualNetworkRuleNameParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Successfully deleted the virtual network rule." + }, + "default": { + "description": "*** Error Responses: ***\n\n * 400 InvalidResourceId - Invalid resource identifier.\n\n * 400 MismatchingSubscriptionWithUrl - The provided subscription did not match the subscription in the Url.\n\n * 400 MismatchingResourceGroupNameWithUrl - The provided resource group name did not match the name in the Url.\n\n * 400 MismatchingServerNameWithUrl - The provided server name did not match the name in the Url.\n\n * 400 NullVirtualNetworkRequest - Virtual Network Request is Null\n\n * 400 NullVirtualNetworkRequestParameters - Virtual Network Request Parameters are Null\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 OperationIdNotFound - The operation with Id does not exist.\n\n * 409 OperationCancelled - The operation has been cancelled by user.\n\n * 409 OperationInterrupted - The operation on the resource could not be completed because it was interrupted by another operation on the same resource.\n\n * 500 OperationTimedOut - The operation timed out and automatically rolled back. Please retry the operation." + }, + "202": { + "description": "Accepted" + }, + "204": { + "description": "The specified virtual network rule does not exist." + } + }, + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Delete a virtual network rule": { + "$ref": "./examples/VirtualNetworkRulesDelete.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}/virtualNetworkRules": { + "get": { + "tags": [ + "VirtualNetworkRules" + ], + "description": "Gets a list of virtual network rules in a server.", + "operationId": "VirtualNetworkRules_ListByServer", + "parameters": [ + { + "$ref": "#/parameters/ResourceGroupParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Successfully retrieved the list of virtual network rules.", + "schema": { + "$ref": "#/definitions/VirtualNetworkRuleListResult" + } + }, + "default": { + "description": "*** Error Responses: ***\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 ResourceNotFound - The requested resource was not found." + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "List virtual network rules": { + "$ref": "./examples/VirtualNetworkRulesList.json" + } + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}/databases/{databaseName}": { "put": { "tags": [ @@ -917,6 +1145,126 @@ } } }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/servers/{serverName}/securityAlertPolicies/{securityAlertPolicyName}": { + "get": { + "tags": [ + "ServerSecurityAlertPolicies" + ], + "description": "Get a server's security alert policy.", + "operationId": "ServerSecurityAlertPolicies_Get", + "parameters": [ + { + "$ref": "#/parameters/ResourceGroupParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + }, + { + "name": "securityAlertPolicyName", + "in": "path", + "description": "The name of the security alert policy.", + "required": true, + "type": "string", + "enum": [ + "Default" + ], + "x-ms-enum": { + "name": "SecurityAlertPolicyName", + "modelAsString": true + } + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Successfully retrieved the server threat detection policy.", + "schema": { + "$ref": "#/definitions/ServerSecurityAlertPolicy" + } + }, + "default": { + "description": "Error response describing why the operation of getting security alert policies failed." + } + }, + "x-ms-examples": { + "Get a server's threat detection policy": { + "$ref": "./examples/ServerSecurityAlertsGet.json" + } + } + }, + "put": { + "tags": [ + "ServerSecurityAlertPolicies" + ], + "description": "Creates or updates a threat detection policy.", + "operationId": "ServerSecurityAlertPolicies_CreateOrUpdate", + "parameters": [ + { + "$ref": "#/parameters/ResourceGroupParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + }, + { + "name": "securityAlertPolicyName", + "in": "path", + "description": "The name of the threat detection policy.", + "required": true, + "type": "string", + "enum": [ + "Default" + ], + "x-ms-enum": { + "name": "SecurityAlertPolicyName", + "modelAsString": true + } + }, + { + "name": "parameters", + "in": "body", + "description": "The server security alert policy.", + "required": true, + "schema": { + "$ref": "#/definitions/ServerSecurityAlertPolicy" + } + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Successfully updated the threat detection policy.", + "schema": { + "$ref": "#/definitions/ServerSecurityAlertPolicy" + } + }, + "default": { + "description": "Error response describing why the operation of setting security alert policies failed." + }, + "202": { + "description": "Created request to set the server threat detection policy." + } + }, + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Update a server's threat detection policy with all parameters": { + "$ref": "./examples/ServerSecurityAlertsCreateMax.json" + }, + "Update a server's threat detection policy with minimal parameters": { + "$ref": "./examples/ServerSecurityAlertsCreateMin.json" + } + } + } + }, "/providers/Microsoft.DBforPostgreSQL/operations": { "get": { "tags": [ @@ -951,7 +1299,10 @@ "description": "The version of a server.", "enum": [ "9.5", - "9.6" + "9.6", + "10", + "10.0", + "10.2" ], "x-ms-enum": { "name": "ServerVersion", @@ -1094,6 +1445,18 @@ "type": "integer", "format": "int32", "description": "Max storage allowed for a server." + }, + "storageAutogrow" : { + "type": "string", + "description": "Enable Storage Auto Grow.", + "enum": [ + "Enabled", + "Disabled" + ], + "x-ms-enum": { + "name": "StorageAutogrow", + "modelAsString": true + } } }, "description": "Storage Profile properties of a server" @@ -1325,6 +1688,10 @@ "sslEnforcement": { "$ref": "#/definitions/SslEnforcement", "description": "Enable ssl enforcement or not when connect to server." + }, + "replicationRole": { + "type": "string", + "description": "The replication role of the server." } }, "x-ms-client-flatten": true, @@ -1401,6 +1768,74 @@ }, "description": "A list of firewall rules." }, + "VirtualNetworkRuleProperties": { + "description": "Properties of a virtual network rule.", + "required": [ + "virtualNetworkSubnetId" + ], + "type": "object", + "properties": { + "virtualNetworkSubnetId": { + "description": "The ARM resource id of the virtual network subnet.", + "type": "string" + }, + "ignoreMissingVnetServiceEndpoint": { + "description": "Create firewall rule before the virtual network has vnet service endpoint enabled.", + "type": "boolean" + }, + "state": { + "description": "Virtual Network Rule State", + "enum": [ + "Initializing", + "InProgress", + "Ready", + "Deleting", + "Unknown" + ], + "type": "string", + "readOnly": true, + "x-ms-enum": { + "name": "VirtualNetworkRuleState", + "modelAsString": true + } + } + } + }, + "VirtualNetworkRule": { + "description": "A virtual network rule.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/ProxyResource" + } + ], + "properties": { + "properties": { + "$ref": "#/definitions/VirtualNetworkRuleProperties", + "description": "Resource properties.", + "x-ms-client-flatten": true + } + } + }, + "VirtualNetworkRuleListResult": { + "description": "A list of virtual network rules.", + "type": "object", + "properties": { + "value": { + "description": "Array of results.", + "type": "array", + "items": { + "$ref": "#/definitions/VirtualNetworkRule" + }, + "readOnly": true + }, + "nextLink": { + "description": "Link to retrieve next page of results.", + "type": "string", + "readOnly": true + } + } + }, "DatabaseProperties": { "properties": { "charset": { @@ -1736,6 +2171,108 @@ } }, "description": "Represents a resource name availability." + }, + "SecurityAlertPolicyProperties": { + "description": "Properties of a security alert policy.", + "required": [ + "state" + ], + "type": "object", + "properties": { + "state": { + "description": "Specifies the state of the policy, whether it is enabled or disabled.", + "enum": [ + "Enabled", + "Disabled" + ], + "type": "string", + "x-ms-enum": { + "name": "ServerSecurityAlertPolicyState", + "modelAsString": false + } + }, + "disabledAlerts": { + "description": "Specifies an array of alerts that are disabled. Allowed values are: Sql_Injection, Sql_Injection_Vulnerability, Access_Anomaly", + "type": "array", + "items": { + "type": "string" + } + }, + "emailAddresses": { + "description": "Specifies an array of e-mail addresses to which the alert is sent.", + "type": "array", + "items": { + "type": "string" + } + }, + "emailAccountAdmins": { + "description": "Specifies that the alert is sent to the account administrators.", + "type": "boolean" + }, + "storageEndpoint": { + "description": "Specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). This blob storage will hold all Threat Detection audit logs.", + "type": "string" + }, + "storageAccountAccessKey": { + "description": "Specifies the identifier key of the Threat Detection audit storage account.", + "type": "string" + }, + "retentionDays": { + "format": "int32", + "description": "Specifies the number of days to keep in the Threat Detection audit logs.", + "type": "integer" + } + } + }, + "ServerSecurityAlertPolicy": { + "description": "A server security alert policy.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/ProxyResource" + } + ], + "properties": { + "properties": { + "$ref": "#/definitions/SecurityAlertPolicyProperties", + "description": "Resource properties.", + "x-ms-client-flatten": true + } + } + }, + "CloudError": { + "x-ms-external": true, + "properties": { + "error": { + "$ref": "#/definitions/CloudErrorBody" + } + }, + "description": "An error response from the Batch service." + }, + "CloudErrorBody": { + "x-ms-external": true, + "properties": { + "code": { + "type": "string", + "description": "An identifier for the error. Codes are invariant and are intended to be consumed programmatically." + }, + "message": { + "type": "string", + "description": "A message describing the error, intended to be suitable for display in a user interface." + }, + "target": { + "type": "string", + "description": "The target of the particular error. For example, the name of the property in error." + }, + "details": { + "type": "array", + "items": { + "$ref": "#/definitions/CloudErrorBody" + }, + "description": "A list of additional details about the error." + } + }, + "description": "An error response from the Batch service." } }, "parameters": { @@ -1777,6 +2314,14 @@ "description": "The name of the server firewall rule.", "x-ms-parameter-location": "method" }, + "virtualNetworkRuleNameParameter": { + "name": "virtualNetworkRuleName", + "in": "path", + "description": "The name of the virtual network rule.", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, "DatabaseNameParameter": { "name": "databaseName", "in": "path", @@ -1800,6 +2345,17 @@ "type": "string", "description": "The name of the location.", "x-ms-parameter-location": "method" + }, + "SecurityAlertPolicyNameParameter": { + "name": "securityAlertPolicyName", + "in": "path", + "description": "The name of the security alert policy.", + "required": true, + "type": "string", + "enum": [ + "default" + ], + "x-ms-parameter-location": "method" } } } \ No newline at end of file diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2017-12-01/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2017-12-01/postgresql.json index 1bea10d78c29..a865df369604 100644 --- a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2017-12-01/postgresql.json +++ b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2017-12-01/postgresql.json @@ -1445,6 +1445,18 @@ "type": "integer", "format": "int32", "description": "Max storage allowed for a server." + }, + "storageAutogrow" : { + "type": "string", + "description": "Enable Storage Auto Grow.", + "enum": [ + "Enabled", + "Disabled" + ], + "x-ms-enum": { + "name": "StorageAutogrow", + "modelAsString": true + } } }, "description": "Storage Profile properties of a server"