Skip to content

fix(monitor-alert): validate metric field is not empty in alert v2 metric #710

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
tembleking merged 4 commits into from
Mar 4, 2026
Merged

fix(monitor-alert): validate metric field is not empty in alert v2 metric #710

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
16d361c
fix(monitor-alert): validate metric field is not empty in alert v2 me…
tembleking Feb 20, 2026
6a3e1d3
fix(monitor-alert): handle legacy alerts with metricId fallback
tembleking Feb 20, 2026
810b5ee
refactor: remove trivial model unmarshalling test
tembleking Feb 23, 2026
205f1e7
Merge branch 'master' into fix/alert-v2-metric-empty-metric-validation
tembleking Mar 4, 2026
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 sysdig/internal/client/v2/model.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,6 +773,7 @@ type AlertV2ConfigMetric struct {
GroupAggregation string `json:"groupAggregation"`
TimeAggregation string `json:"timeAggregation"`
Metric AlertMetricDescriptorV2 `json:"metric"`
MetricID string `json:"metricId,omitempty"` // Legacy API field, used as fallback when Metric.ID is empty
NoDataBehaviour string `json:"noDataBehaviour"`

Range int `json:"range"`
Expand Down
11 changes: 8 additions & 3 deletions sysdig/resource_sysdig_monitor_alert_v2_metric.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,9 @@ func resourceSysdigMonitorAlertV2Metric() *schema.Resource {
Default: "",
},
"metric": {
Type: schema.TypeString,
Required: true,
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.StringIsNotEmpty,
},
"time_aggregation": {
Type: schema.TypeString,
Expand Down Expand Up @@ -274,7 +275,11 @@ func updateAlertV2MetricState(d *schema.ResourceData, alert *v2.AlertV2Metric) e

_ = d.Set("group_aggregation", alert.Config.GroupAggregation)

_ = d.Set("metric", alert.Config.Metric.ID)
metricID := alert.Config.Metric.ID
if metricID == "" {
metricID = alert.Config.MetricID
}
_ = d.Set("metric", metricID)
Comment thread
tembleking marked this conversation as resolved.

_ = d.Set("no_data_behaviour", alert.Config.NoDataBehaviour)

Expand Down
34 changes: 34 additions & 0 deletions sysdig/resource_sysdig_monitor_alert_v2_metric_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ package sysdig_test

import (
"fmt"
"regexp"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
Expand Down Expand Up @@ -108,6 +109,39 @@ func TestAccAlertV2Metric(t *testing.T) {
})
}

func TestAccAlertV2MetricRejectsEmptyMetric(t *testing.T) {
rText := func() string { return acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum) }

resource.ParallelTest(t, resource.TestCase{
PreCheck: preCheckAnyEnv(t, SysdigMonitorApiTokenEnv, SysdigIBMMonitorAPIKeyEnv),
ProviderFactories: map[string]func() (*schema.Provider, error){
"sysdig": func() (*schema.Provider, error) {
return sysdig.Provider(), nil
},
},
Steps: []resource.TestStep{
{
Config: alertV2MetricWithEmptyMetric(rText()),
ExpectError: regexp.MustCompile(`expected "metric" to not be an empty string`),
},
},
})
}

func alertV2MetricWithEmptyMetric(name string) string {
return fmt.Sprintf(`
resource "sysdig_monitor_alert_v2_metric" "sample" {
name = "TERRAFORM TEST - METRICV2 %s"
metric = ""
group_aggregation = "avg"
time_aggregation = "avg"
operator = ">="
threshold = 50
range_seconds = 600
}
`, name)
}

func alertV2Metric(name string) string {
return fmt.Sprintf(`
resource "sysdig_monitor_alert_v2_metric" "sample" {
Expand Down
Loading