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

azurerm_log_analytics_workspace - remove "Free" option from sku #26477

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

azurerm_log_analytics_workspace - remove "Free" option from sku #26477

wants to merge 1 commit into from

Conversation

hqhqhqhqhqhqhqhqhqhqhq
Copy link
Contributor

Community Note

  • Please vote on this PR by adding a 👍 reaction to the original PR to help the community and maintainers prioritize for review
  • Please do not leave comments along the lines of "+1", "me too" or "any updates", they generate extra noise for PR followers and do not help prioritize for review

Description

Remove "Free" option from sku in azurerm_log_analytics_workspace. Only the doc has been updated now, the code support will be released in next major version as this change made the validation stricter.

PR Checklist

  • I have followed the guidelines in our Contributing Documentation.
  • I have checked to ensure there aren't other open Pull Requests for the same update/change.
  • I have checked if my changes close any open issues. If so please include appropriate closing keywords below.
  • I have updated/added Documentation as required written in a helpful and kind way to assist users that may be unfamiliar with the resource / data source.
  • I have used a meaningful PR title to help maintainers and other users understand this change and help prevent duplicate work.
    For example: “resource_name_here - description of change e.g. adding property new_property_name_here”

Changes to existing Resource / Data Source

  • I have added an explanation of what my changes do and why I'd like you to include them (This may be covered by linking to an issue above, but may benefit from additional explanation).
  • I have written new tests for my resource or datasource changes & updated any relevent documentation.
  • I have successfully run tests with my changes locally. If not, please provide details on testing challenges that prevented you running the tests.
  • (For changes that include a state migration only). I have manually tested the migration path between relevant versions of the provider.

Testing

  • My submission includes Test coverage as described in the Contribution Guide and the tests pass. (if this is not possible for any reason, please include details of why you did or could not add test coverage)

Change Log

Below please provide what should go into the changelog (if anything) conforming to the Changelog Format documented here.

  • azurerm_resource - support for the thing1 property [GH-00000]

This is a (please select all that apply):

  • Bug Fix
  • New Feature (ie adding a service, resource, or data source)
  • Enhancement
  • Breaking Change

Related Issue(s)

Fixes #26410

Note

If this PR changes meaningfully during the course of review please update the title and description as required.

ms-henglu
ms-henglu suggested changes Jun 27, 2024
View reviewed changes
Copy link
Contributor

@ms-henglu ms-henglu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for the PR! LGTM just some minor suggestions.

website/docs/r/log_analytics_workspace.html.markdown Outdated
@@ -41,13 +41,13 @@ The following arguments are supported:

* `local_authentication_disabled` - (Optional) Specifies if the log Analytics workspace should enforce authentication using Azure AD. Defaults to `false`.

* `sku` - (Optional) Specifies the SKU of the Log Analytics Workspace. Possible values are `Free`, `PerNode`, `Premium`, `Standard`, `Standalone`, `Unlimited`, `CapacityReservation`, and `PerGB2018` (new SKU as of `2018-04-03`). Defaults to `PerGB2018`.
* `sku` - (Optional) Specifies the SKU of the Log Analytics Workspace. Possible values are ~~`Free`~~ (no longer available), `PerNode`, `Premium`, `Standard`, `Standalone`, `Unlimited`, `CapacityReservation`, and `PerGB2018` (new SKU as of `2018-04-03`). Defaults to `PerGB2018`.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you can remove the Free from the document.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

website/docs/r/log_analytics_workspace.html.markdown Outdated

~> **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 SKUs defined above. More information about [the Pricing SKUs is available at the following URI](https://aka.ms/PricingTierWarning).

~> **NOTE:** Changing `sku` forces a new Log Analytics Workspace to be created, except when changing between `PerGB2018` and `CapacityReservation`. However, changing `sku` to `CapacityReservation` or changing `reservation_capacity_in_gb_per_day` to a higher tier will lead to a 31-days commitment period, during which the SKU cannot be changed to a lower one. Please refer to [official documentation](https://learn.microsoft.com/en-us/azure/azure-monitor/logs/cost-logs#commitment-tiers) for further information.

~> **NOTE:** The `Free` SKU has a default `daily_quota_gb` value of `0.5` (GB).
~> **NOTE:** The `Free` SKU was possible only until July 1, 2022. More information about [Azure Monitor Logs Free Trial pricing tier](https://learn.microsoft.com/en-us/azure/azure-monitor/logs/cost-logs#free-trial-pricing-tier).
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@hqhqhqhqhqhqhqhqhqhqhq hqhqhqhqhqhqhqhqhqhqhq force-pushed the bugfix/azurerm_log_analytics_workspace-free-sku branch from e0be233 to 1a482d4 Compare June 27, 2024 05:27
tombuildsstuff
tombuildsstuff reviewed Jun 27, 2024
View reviewed changes
internal/services/loganalytics/log_analytics_workspace_resource.go
@@ -107,7 +108,6 @@ func resourceLogAnalyticsWorkspace() *pluginsdk.Resource {
Optional: true,
Computed: true,
ValidateFunc: validation.StringInSlice([]string{
string(workspaces.WorkspaceSkuNameEnumFree),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Users who've previously provisioned a Resource using the Free SKU will be able to continue using it until they migrate to a different SKU - so removing this SKU would break support for those users?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @tombuildsstuff - It's removed in the next major release. Do you think we should keep it in the validation func in the next major release?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ms-henglu, how long has the free option no longer been valid? i think if it JUST changed maybe we want to keep the validation around in schema and maybe add a customize diff to prevent new ones from being created but if its been gone for a year then maybe it time to remove it?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @katbyte - The Free SKU was possible only until July 1, 2022. It's more than 2 years, I guess we could remove it.

@hqhqhqhqhqhqhqhqhqhqhq hqhqhqhqhqhqhqhqhqhqhq marked this pull request as ready for review June 28, 2024 02:31
@hqhqhqhqhqhqhqhqhqhqhq
update: remove free option directly as it is not supported long time …
ad8f077 
…a ago

fix: adjust doc and code to support sku free tier is no longer available
@hqhqhqhqhqhqhqhqhqhqhq hqhqhqhqhqhqhqhqhqhqhq force-pushed the bugfix/azurerm_log_analytics_workspace-free-sku branch from a8cd28f to ad8f077 Compare July 5, 2024 06:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tombuildsstuff tombuildsstuff tombuildsstuff left review comments

@katbyte katbyte katbyte left review comments

@ms-henglu ms-henglu ms-henglu requested changes

Assignees
No one assigned
Labels
documentation service/log-analytics size/XS
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

azurerm_log_analytics_workspace "Free" SKU is no longer a valid choice
4 participants
@hqhqhqhqhqhqhqhqhqhqhq @tombuildsstuff @katbyte @ms-henglu