Skip to content
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

Jump to bottom

New Log Analytics Sku for azurerm_log_analytics_workspace (#1078) #1079

Merged
merged 2 commits into from
Jun 18, 2018
+7 −4
Merged

New Log Analytics Sku for azurerm_log_analytics_workspace (#1078) #1079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b68f4cd
New Log Analytics Sku for `azurerm_log_analytics_workspace` (#1078)
MattMencel Apr 5, 2018
e055bad
Migrating to use the new SKU's. Tests pass:
tombuildsstuff Jun 18, 2018
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
1 change: 1 addition & 0 deletions azurerm/resource_arm_log_analytics_workspace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ func resourceArmLogAnalyticsWorkspace() *schema.Resource {
string(operationalinsights.Standalone),
string(operationalinsights.Standard),
string(operationalinsights.Unlimited),
string(operationalinsights.PerGB2018),
}, true),
DiffSuppressFunc: ignoreCaseDiffSuppressFunc,
},
Expand Down
6 changes: 3 additions & 3 deletions azurerm/resource_arm_log_analytics_workspace_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ func TestAccAzureRMLogAnalyticsWorkspace_requiredOnly(t *testing.T) {
},
})
}

func TestAccAzureRMLogAnalyticsWorkspace_retentionInDaysComplete(t *testing.T) {
ri := acctest.RandInt()
config := testAccAzureRMLogAnalyticsWorkspace_retentionInDaysComplete(ri, testLocation())
Expand Down Expand Up @@ -143,7 +144,6 @@ func testCheckAzureRMLogAnalyticsWorkspaceExists(name string) resource.TestCheck
return nil
}
}

func testAccAzureRMLogAnalyticsWorkspace_requiredOnly(rInt int, location string) string {
return fmt.Sprintf(`
resource "azurerm_resource_group" "test" {
Expand All @@ -155,7 +155,7 @@ resource "azurerm_log_analytics_workspace" "test" {
name = "acctest-%d"
location = "${azurerm_resource_group.test.location}"
resource_group_name = "${azurerm_resource_group.test.name}"
sku = "Free"
sku = "PerGB2018"
}
`, rInt, location, rInt)
}
Expand All @@ -171,7 +171,7 @@ resource "azurerm_log_analytics_workspace" "test" {
name = "acctest-%d"
location = "${azurerm_resource_group.test.location}"
resource_group_name = "${azurerm_resource_group.test.name}"
sku = "Standard"
sku = "PerGB2018"
retention_in_days = 30
}
`, rInt, location, rInt)
Expand Down
4 changes: 3 additions & 1 deletion website/docs/r/log_analytics_workspace.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ The following arguments are supported:

* `location` - (Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created.

* `sku` - (Required) Specifies the Sku of the Log Analytics Workspace. Possible values are `Free`, `PerNode`, `Premium`, `Standard`, `Standalone` and `Unlimited.`
* `sku` - (Required) Specifies the Sku of the Log Analytics Workspace. Possible values are `Free`, `PerNode`, `Premium`, `Standard`, `Standalone`, `Unlimited`, and `PerGB2018` (new Sku as of `2018-04-03`).

~> **NOTE:** A new pricing model took effect on `2018-04-03`, which requires the SKU `PerGB2018`. If you're provisioned resources before this date you have the option of remaining with the previous Pricing SKU and using the other SKU's defined above. More information about [the Pricing SKU's is available at the following URI](http://aka.ms/PricingTierWarning).

* `retention_in_days` - (Optional) The workspace data retention in days. Possible values range between 30 and 730.

Expand Down