[Feat] v1.23.0 (#223)

* drop metrics: Add `drop_policy` field

* Update group_1.txt

Author: yotamloe

.github/test-groups/group_1.txt

@@ -29,6 +29,7 @@ TestAccLogzioDropMetric_UpdateDropMetrics
 TestAccLogzioDropMetric_UpdateDropMetricsWithName
 TestAccLogzioDropMetric_UpdateDropMetricsEnable
 TestAccLogzioDropMetric_UpdateDropMetricsDisable
+TestAccLogzioDropMetric_CreateDropMetricWithDropPolicy
 TestAccDataSourceDropMetric
 TestAccDataSourceDropMetricById
 TestAccDataSourceDropMetricWithName

CHANGELOG.md

@@ -1,7 +1,12 @@
 # Changes by Version
 
 <!-- next version -->
-## v1.21.1
+## v1.23.0
+- Upgrade `logzio_client_terraform` to `1.27.4`.
+- Metrics Drop Filters: Add optional `drop_policy` field with values `DROP_BEFORE_PROCESSING` (default) and `DROP_BEFORE_STORING`.
+- Metrics Drop Filters: Remove name length validation - the name field no longer has a 256-character limit.
+
+## v1.22.0
 - Upgrade `logzio_client_terraform` to `1.27.3`.
 - Metrics Rollup Rules: Support all aggregation types for `MEASUREMENT`
 

docs/resources/drop_metrics.md

@@ -18,6 +18,7 @@ provider "logzio" {
 resource "logzio_drop_metrics" "test_filter" {
   name = test_filter
   account_id = 1234
+  drop_policy = "DROP_BEFORE_STORING"
   filters {
     name = "__name__"
     value = "my_metric_name"
@@ -34,7 +35,8 @@ resource "logzio_drop_metrics" "test_filter" {
 ## Argument Reference
 * `account_id` - (Required) The Logz.io metrics account ID to which the drop filter applies.
 * `active` - (Optional) If true, the drop filter is active and metrics that match the filter are dropped before indexing. If false, the drop filter is disabled. Defaults to true.
-* `name` - (Optional) name for the drop metric.
+* `name` - (Optional) Name for the drop metric filter.
+* `drop_policy` - (Optional) When to drop the metrics. Valid values are `DROP_BEFORE_PROCESSING` (default) and `DROP_BEFORE_STORING`. `DROP_BEFORE_PROCESSING` drops metrics before any processing, while `DROP_BEFORE_STORING` drops metrics after processing but before storage.
 * `filter` - (Required) The filter object that defines the drop filter criteria. See below for nested schema.
   * `name` - (Required) The name of the metric label to filter on.
   * `value` - (Required) The value of the metric label to match against.

examples/drop_metric/main.tf

@@ -35,10 +35,11 @@ resource "logzio_drop_metrics" "simple_metric_drop" {
 
 # Complex drop metrics example - drop metrics based on multiple conditions
 resource "logzio_drop_metrics" "complex_metric_drop" {
-  account_id = var.account_id
-  name       = "Drop Staging HTTP Requests with 2xx Status"
-  active     = true
-  operator   = "AND"
+  account_id  = var.account_id
+  name        = "Drop Staging HTTP Requests with 2xx Status"
+  active      = true
+  drop_policy = "DROP_BEFORE_STORING"
+  operator    = "AND"
 
   filters {
     name      = "__name__"

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/hashicorp/go-cty v1.5.0
 	github.com/hashicorp/terraform-plugin-log v0.9.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0
-	github.com/logzio/logzio_terraform_client v1.27.3
+	github.com/logzio/logzio_terraform_client v1.27.4
 	github.com/stoewer/go-strcase v1.3.1
 	github.com/stretchr/testify v1.10.0
 )

go.sum

@@ -126,6 +126,8 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/logzio/logzio_terraform_client v1.27.3 h1:Sf58iy88N4H4JBMiyl90joWpHUrDcoUCdB/WEnGnZbU=
 github.com/logzio/logzio_terraform_client v1.27.3/go.mod h1:pzXrr7gGIi6tU1mk2vTtg8dr6ttKMlt03kz6asC53o4=
+github.com/logzio/logzio_terraform_client v1.27.4 h1:IEu7h4XymUXKp8PLNaOJEUDc/TQX1yE60guDbOb+7jo=
+github.com/logzio/logzio_terraform_client v1.27.4/go.mod h1:pzXrr7gGIi6tU1mk2vTtg8dr6ttKMlt03kz6asC53o4=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=

logzio/datasource_drop_metrics.go

@@ -69,6 +69,14 @@ func dataSourceDropMetrics() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			dropMetricsDropPolicy: {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+				ValidateFunc: validation.StringInSlice(
+					[]string{drop_metrics.DropPolicyBeforeProcessing, drop_metrics.DropPolicyBeforeStoring},
+					false),
+			},
 			dropMetricsFilters: {
 				Type:     schema.TypeSet,
 				Optional: true,

logzio/datasource_drop_metrics_test.go

@@ -42,6 +42,7 @@ func TestAccDataSourceDropMetric(t *testing.T) {
 					datasourceDropMetricMatchingResource(datasourceFilterName, accountId),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(datasourceName, dropMetricsAccountId, accountId),
+					resource.TestCheckResourceAttr(datasourceName, dropMetricsDropPolicy, "DROP_BEFORE_PROCESSING"),
 					resource.TestCheckResourceAttr(datasourceName, dropMetricsFilters+".#", "2"),
 					resource.TestCheckResourceAttr(datasourceName, dropMetricsFilterOperator, "AND"),
 					resource.TestCheckResourceAttr(datasourceName, dropMetricsActive, "true"),

logzio/resource_drop_metrics.go

@@ -20,6 +20,7 @@ const (
 	dropMetricsAccountId            = "account_id"
 	dropMetricsName                 = "name"
 	dropMetricsActive               = "active"
+	dropMetricsDropPolicy           = "drop_policy"
 	dropMetricsFilters              = "filters"
 	dropMetricsFilterOperator       = "operator"
 	dropMetricsExpressionLabelName  = "name"
@@ -82,15 +83,22 @@ func resourceDropMetrics() *schema.Resource {
 				Required: true,
 			},
 			dropMetricsName: {
-				Type:         schema.TypeString,
-				Optional:     true,
-				ValidateFunc: validation.StringLenBetween(0, 256),
+				Type:     schema.TypeString,
+				Optional: true,
 			},
 			dropMetricsActive: {
 				Type:     schema.TypeBool,
 				Optional: true,
 				Default:  true,
 			},
+			dropMetricsDropPolicy: {
+				Type:     schema.TypeString,
+				Optional: true,
+				Default:  drop_metrics.DropPolicyBeforeProcessing,
+				ValidateFunc: validation.StringInSlice(
+					[]string{drop_metrics.DropPolicyBeforeProcessing, drop_metrics.DropPolicyBeforeStoring},
+					false),
+			},
 			dropMetricsFilters: {
 				Type:     schema.TypeSet,
 				Required: true,
@@ -208,9 +216,10 @@ func createCreateUpdateDropMetricsFromSchema(d *schema.ResourceData) drop_metric
 	activePtr := &activeVal
 
 	return drop_metrics.CreateUpdateDropMetric{
-		AccountId: int64Attr(d, dropMetricsAccountId),
-		Name:      d.Get(dropMetricsName).(string),
-		Active:    activePtr,
+		AccountId:  int64Attr(d, dropMetricsAccountId),
+		Name:       d.Get(dropMetricsName).(string),
+		Active:     activePtr,
+		DropPolicy: d.Get(dropMetricsDropPolicy).(string),
 		Filter: drop_metrics.FilterObject{
 			Operator:   d.Get(dropMetricsFilterOperator).(string),
 			Expression: schemaToDropMetricsFilterExpression(d),
@@ -224,6 +233,7 @@ func setDropMetrics(d *schema.ResourceData, dropMetric *drop_metrics.DropMetric)
 	d.Set(dropMetricsAccountId, int(dropMetric.AccountId))
 	d.Set(dropMetricsName, dropMetric.Name)
 	d.Set(dropMetricsActive, dropMetric.Active)
+	d.Set(dropMetricsDropPolicy, dropMetric.DropPolicy)
 	d.Set(dropMetricsCreatedAt, dropMetric.CreatedAt)
 	d.Set(dropMetricsCreatedBy, dropMetric.CreatedBy)
 	d.Set(dropMetricsModifiedAt, dropMetric.ModifiedAt)

logzio/resource_drop_metrics_test.go

@@ -15,6 +15,7 @@ const (
 	dropMetricResourceCreateSimple           = "create_drop_metrics_simple"
 	dropMetricResourceCreateComplex          = "create_drop_metrics_complex"
 	dropMetricResourceCreateWithName         = "create_drop_metrics_with_name"
+	dropMetricResourceCreateWithDropPolicy   = "create_drop_metrics_with_drop_policy"
 	dropMetricResourceCreateNoLabelName      = "create_drop_metrics_missing_label_name"
 	dropMetricResourceCreateNoValue          = "create_drop_metrics_missing_value"
 	dropMetricResourceCreateEmptyCondition   = "create_drop_metrics_empty_condition"
@@ -43,6 +44,7 @@ func TestAccLogzioDropMetric_CreateDropMetricSimple(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr(resourceName, dropMetricsAccountId, accountId),
 					resource.TestCheckResourceAttr(resourceName, dropMetricsName, ""),
+					resource.TestCheckResourceAttr(resourceName, dropMetricsDropPolicy, "DROP_BEFORE_PROCESSING"),
 					resource.TestCheckResourceAttr(resourceName, dropMetricsFilters+".#", "1"),
 					resource.TestCheckResourceAttr(resourceName, dropMetricsFilterOperator, "AND"),
 					resource.TestCheckResourceAttr(resourceName, dropMetricsActive, "true"),
@@ -372,6 +374,41 @@ func TestAccLogzioDropMetric_UpdateDropMetricsWithName(t *testing.T) {
 	})
 }
 
+func TestAccLogzioDropMetric_CreateDropMetricWithDropPolicy(t *testing.T) {
+	filterName := "test_create_drop_metrics_with_drop_policy"
+	resourceName := "logzio_drop_metrics." + filterName
+	accountId := os.Getenv(envLogzioMetricsAccountId)
+
+	defer utils.SleepAfterTest()
+
+	resource.Test(t, resource.TestCase{
+		PreCheck: func() {
+			testAccPreCheckApiToken(t)
+			testAccPreCheckMetricsAccountId(t)
+		},
+		ProviderFactories: testAccProviderFactories,
+		Steps: []resource.TestStep{
+			{
+				Config: resourceTestDropMetrics(filterName, dropMetricResourceCreateWithDropPolicy, accountId),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(resourceName, dropMetricsAccountId, accountId),
+					resource.TestCheckResourceAttr(resourceName, dropMetricsName, "test-drop-metrics-with-policy"),
+					resource.TestCheckResourceAttr(resourceName, dropMetricsDropPolicy, "DROP_BEFORE_STORING"),
+					resource.TestCheckResourceAttr(resourceName, dropMetricsFilters+".#", "1"),
+					resource.TestCheckResourceAttr(resourceName, dropMetricsFilterOperator, "AND"),
+					resource.TestCheckResourceAttr(resourceName, dropMetricsActive, "true"),
+				),
+			},
+			{
+				Config:            resourceTestDropMetrics(filterName, dropMetricResourceCreateWithDropPolicy, accountId),
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
 func resourceTestDropMetrics(name, path, accountId string) string {
 	content, err := os.ReadFile(fmt.Sprintf("testdata/fixtures/%s.tf", path))
 	if err != nil {