Skip to content

Added missing SQL service objectives #2153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jhendrixMSFT merged 4 commits into from
Dec 15, 2017
Merged

Added missing SQL service objectives #2153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
65b88bd
Add missing service objectives and editions
jaredmoo Nov 7, 2017
56cb5ef
Fixed import export
jaredmoo Dec 14, 2017
f115637
Merge branch 'current' into serviceobjectives
jaredmoo Dec 14, 2017
fcd6328
Merge remote-tracking branch 'azure/current' into serviceobjectives
jaredmoo Dec 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 53 additions & 2 deletions specification/sql/resource-manager/Microsoft.Sql/2014-04-01/importExport.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,7 @@
"Basic",
"Standard",
"Premium",
"PremiumRS",
"Free",
"Stretch",
"DataWarehouse",
Expand All @@ -388,20 +389,70 @@
"type": "string",
"description": "The name of the service objective to assign to the database.",
"enum": [
"System",
"System0",
"System1",
"System2",
"System3",
"System4",
"System2L",
"System3L",
"System4L",
"Free",
"Basic",
"S0",
"S1",
"S2",
"S3",
"S4",
"S6",
"S7",
"S9",
"S12",
"P1",
"P2",
"P3",
"P4",
"P6",
"P11",
"P15",
"System",
"System2",
"PRS1",
"PRS2",
"PRS4",
"PRS6",
"DW100",
"DW200",
"DW300",
"DW400",
"DW500",
"DW600",
"DW1000",
"DW1200",
"DW1000c",
"DW1500",
"DW1500c",
"DW2000",
"DW2000c",
"DW3000",
"DW2500c",
"DW3000c",
"DW6000",
"DW5000c",
"DW6000c",
"DW7500c",
"DW10000c",
"DW15000c",
"DW30000c",
"DS100",
"DS200",
"DS300",
"DS400",
"DS500",
"DS600",
"DS1000",
"DS1200",
"DS1500",
"DS2000",
"ElasticPool"
],
"x-ms-enum": {
Expand Down
171 changes: 161 additions & 10 deletions specification/sql/resource-manager/Microsoft.Sql/2014-04-01/sql.core.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2152,13 +2152,14 @@
},
"edition": {
"type": "string",
"description": "The edition of the database. The DatabaseEditions enumeration contains all the valid editions. If createMode is NonReadableSecondary or OnlineSecondary, this value is ignored. To see possible values, query the capabilities API (/subscriptions/{subscriptionId}/providers/Microsoft.Sql/locations/{locationID}/capabilities) referred to by operationId: \"Capabilities_ListByLocation.\"",
"description": "The edition of the database. The DatabaseEditions enumeration contains all the valid editions. If createMode is NonReadableSecondary or OnlineSecondary, this value is ignored. To see possible values, query the capabilities API (/subscriptions/{subscriptionId}/providers/Microsoft.Sql/locations/{locationID}/capabilities) referred to by operationId: \"Capabilities_ListByLocation.\" or use the Azure CLI command `az sql db list-editions -l westus --query [].name` .",
"enum": [
"Web",
"Business",
"Basic",
"Standard",
"Premium",
"PremiumRS",
"Free",
"Stretch",
"DataWarehouse",
Expand All @@ -2177,51 +2178,151 @@
"requestedServiceObjectiveId": {
"type": "string",
"format": "uuid",
"description": "The configured service level objective ID of the database. This is the service level objective that is in the process of being applied to the database. Once successfully updated, it will match the value of currentServiceObjectiveId property. If requestedServiceObjectiveId and requestedServiceObjectiveName are both updated, the value of requestedServiceObjectiveId overrides the value of requestedServiceObjectiveName. To see possible values, query the capabilities API (/subscriptions/{subscriptionId}/providers/Microsoft.Sql/locations/{locationID}/capabilities) referred to by operationId: \"Capabilities_ListByLocation.\""
"description": "The configured service level objective ID of the database. This is the service level objective that is in the process of being applied to the database. Once successfully updated, it will match the value of currentServiceObjectiveId property. If requestedServiceObjectiveId and requestedServiceObjectiveName are both updated, the value of requestedServiceObjectiveId overrides the value of requestedServiceObjectiveName. To see possible values, query the capabilities API (/subscriptions/{subscriptionId}/providers/Microsoft.Sql/locations/{locationID}/capabilities) referred to by operationId: \"Capabilities_ListByLocation.\" or use the Azure CLI command `az sql db list-editions --location <location> --query [].supportedServiceLevelObjectives[].name` ."
},
"requestedServiceObjectiveName": {
"type": "string",
"enum": [
"System",
"System0",
"System1",
"System2",
"System3",
"System4",
"System2L",
"System3L",
"System4L",
"Free",
"Basic",
"S0",
"S1",
"S2",
"S3",
"S4",
"S6",
"S7",
"S9",
"S12",
"P1",
"P2",
"P3",
"P4",
"P6",
"P11",
"P15",
"System",
"System2",
"PRS1",
"PRS2",
"PRS4",
"PRS6",
"DW100",
"DW200",
"DW300",
"DW400",
"DW500",
"DW600",
"DW1000",
"DW1200",
"DW1000c",
"DW1500",
"DW1500c",
"DW2000",
"DW2000c",
"DW3000",
"DW2500c",
"DW3000c",
"DW6000",
"DW5000c",
"DW6000c",
"DW7500c",
"DW10000c",
"DW15000c",
"DW30000c",
"DS100",
"DS200",
"DS300",
"DS400",
"DS500",
"DS600",
"DS1000",
"DS1200",
"DS1500",
"DS2000",
"ElasticPool"
],
],
"x-ms-enum": {
"modelAsString": true,
"name": "ServiceObjectiveName"
},
"description": "The name of the configured service level objective of the database. This is the service level objective that is in the process of being applied to the database. Once successfully updated, it will match the value of serviceLevelObjective property. To see possible values, query the capabilities API (/subscriptions/{subscriptionId}/providers/Microsoft.Sql/locations/{locationID}/capabilities) referred to by operationId: \"Capabilities_ListByLocation.\""
"description": "The name of the configured service level objective of the database. This is the service level objective that is in the process of being applied to the database. Once successfully updated, it will match the value of serviceLevelObjective property. To see possible values, query the capabilities API (/subscriptions/{subscriptionId}/providers/Microsoft.Sql/locations/{locationID}/capabilities) referred to by operationId: \"Capabilities_ListByLocation.\" or use the Azure CLI command `az sql db list-editions --location <location> --query [].supportedServiceLevelObjectives[].name` ."
},
"serviceLevelObjective": {
"readOnly": true,
"type": "string",
"enum": [
"System",
"System0",
"System1",
"System2",
"System3",
"System4",
"System2L",
"System3L",
"System4L",
"Free",
"Basic",
"S0",
"S1",
"S2",
"S3",
"S4",
"S6",
"S7",
"S9",
"S12",
"P1",
"P2",
"P3",
"P4",
"P6",
"P11",
"P15",
"System",
"System2",
"PRS1",
"PRS2",
"PRS4",
"PRS6",
"DW100",
"DW200",
"DW300",
"DW400",
"DW500",
"DW600",
"DW1000",
"DW1200",
"DW1000c",
"DW1500",
"DW1500c",
"DW2000",
"DW2000c",
"DW3000",
"DW2500c",
"DW3000c",
"DW6000",
"DW5000c",
"DW6000c",
"DW7500c",
"DW10000c",
"DW15000c",
"DW30000c",
"DS100",
"DS200",
"DS300",
"DS400",
"DS500",
"DS600",
"DS1000",
"DS1200",
"DS1500",
"DS2000",
"ElasticPool"
],
"x-ms-enum": {
Expand Down Expand Up @@ -2497,20 +2598,70 @@
"type": "string",
"description": "The serviceLevelObjective for SLO usage metric.",
"enum": [
"System",
"System0",
"System1",
"System2",
"System3",
"System4",
"System2L",
"System3L",
"System4L",
"Free",
"Basic",
"S0",
"S1",
"S2",
"S3",
"S4",
"S6",
"S7",
"S9",
"S12",
"P1",
"P2",
"P3",
"P4",
"P6",
"P11",
"P15",
"System",
"System2",
"PRS1",
"PRS2",
"PRS4",
"PRS6",
"DW100",
"DW200",
"DW300",
"DW400",
"DW500",
"DW600",
"DW1000",
"DW1200",
"DW1000c",
"DW1500",
"DW1500c",
"DW2000",
"DW2000c",
"DW3000",
"DW2500c",
"DW3000c",
"DW6000",
"DW5000c",
"DW6000c",
"DW7500c",
"DW10000c",
"DW15000c",
"DW30000c",
"DS100",
"DS200",
"DS300",
"DS400",
"DS500",
"DS600",
"DS1000",
"DS1200",
"DS1500",
"DS2000",
"ElasticPool"
],
"x-ms-enum": {
Expand Down