Skip to content

Commit 6cd32d3

Browse files
edersonbrilhanteedersonbrilhante
authored
fix: add restricted_suggestions in variables (#211)
1 parent 90d8a53 commit 6cd32d3

File tree

4 files changed

+63
-54
lines changed

4 files changed

+63
-54
lines changed

‎modules/integrations/splunk_o11y_conf_shared/dashboard_billing.tf‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -215,25 +215,27 @@ resource "signalfx_dashboard" "billing" {
215215
time_range = "-31d"
216216

217217
variable {
218-
property = "forgecicd_tenant"
219-
alias = "ForgeCICD Tenant Name"
220-
description = ""
221-
values = []
222-
value_required = false
223-
values_suggested = var.dashboard_variables.runner_k8s.tenant_names
218+
property = "forgecicd_tenant"
219+
alias = "ForgeCICD Tenant Name"
220+
description = ""
221+
values = []
222+
value_required = false
223+
values_suggested = var.dashboard_variables.runner_k8s.tenant_names
224+
restricted_suggestions = true
224225
}
225226

226227
dynamic "variable" {
227228
for_each = var.dashboard_variables.billing.dynamic_variables
228229
iterator = var_def
229230

230231
content {
231-
property = var_def.value.property
232-
alias = var_def.value.alias
233-
description = var_def.value.description
234-
values = var_def.value.values
235-
value_required = var_def.value.value_required
236-
values_suggested = var_def.value.values_suggested
232+
property = var_def.value.property
233+
alias = var_def.value.alias
234+
description = var_def.value.description
235+
values = var_def.value.values
236+
value_required = var_def.value.value_required
237+
values_suggested = var_def.value.values_suggested
238+
restricted_suggestions = var_def.value.restricted_suggestions
237239
}
238240
}
239241

‎modules/integrations/splunk_o11y_conf_shared/dashboard_runner_ec2.tf‎

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1517,34 +1517,37 @@ resource "signalfx_dashboard" "runner_ec2" {
15171517
dashboard_group = signalfx_dashboard_group.forgecicd.id
15181518

15191519
variable {
1520-
property = "aws_tag_TenantName"
1521-
alias = "ForgeCICD Tenant Name"
1522-
description = ""
1523-
values = []
1524-
value_required = false
1525-
values_suggested = var.dashboard_variables.runner_ec2.tenant_names
1520+
property = "aws_tag_TenantName"
1521+
alias = "ForgeCICD Tenant Name"
1522+
description = ""
1523+
values = []
1524+
value_required = false
1525+
values_suggested = var.dashboard_variables.runner_ec2.tenant_names
1526+
restricted_suggestions = true
15261527
}
15271528

15281529
variable {
1529-
property = "aws_instance_id"
1530-
alias = "ForgeCICD Instance ID"
1531-
description = ""
1532-
values = []
1533-
value_required = false
1534-
values_suggested = []
1530+
property = "aws_instance_id"
1531+
alias = "ForgeCICD Instance ID"
1532+
description = ""
1533+
values = []
1534+
value_required = false
1535+
values_suggested = []
1536+
restricted_suggestions = false
15351537
}
15361538

15371539
dynamic "variable" {
15381540
for_each = var.dashboard_variables.runner_ec2.dynamic_variables
15391541
iterator = var_def
15401542

15411543
content {
1542-
property = var_def.value.property
1543-
alias = var_def.value.alias
1544-
description = var_def.value.description
1545-
values = var_def.value.values
1546-
value_required = var_def.value.value_required
1547-
values_suggested = var_def.value.values_suggested
1544+
property = var_def.value.property
1545+
alias = var_def.value.alias
1546+
description = var_def.value.description
1547+
values = var_def.value.values
1548+
value_required = var_def.value.value_required
1549+
values_suggested = var_def.value.values_suggested
1550+
restricted_suggestions = var_def.value.restricted_suggestions
15481551
}
15491552
}
15501553
chart {

‎modules/integrations/splunk_o11y_conf_shared/dashboard_runner_k8s.tf‎

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -441,34 +441,37 @@ resource "signalfx_dashboard" "runner_k8s" {
441441
dashboard_group = signalfx_dashboard_group.forgecicd.id
442442

443443
variable {
444-
property = "k8s.namespace.name"
445-
alias = "ForgeCICD Tenant Name"
446-
description = ""
447-
values = []
448-
value_required = false
449-
values_suggested = var.dashboard_variables.runner_k8s.tenant_names
444+
property = "k8s.namespace.name"
445+
alias = "ForgeCICD Tenant Name"
446+
description = ""
447+
values = []
448+
value_required = false
449+
values_suggested = var.dashboard_variables.runner_k8s.tenant_names
450+
restricted_suggestions = true
450451
}
451452

452453
variable {
453-
property = "k8s.pod.name"
454-
alias = "ForgeCICD Instance Id"
455-
description = ""
456-
values = []
457-
value_required = false
458-
values_suggested = []
454+
property = "k8s.pod.name"
455+
alias = "ForgeCICD Instance Id"
456+
description = ""
457+
values = []
458+
value_required = false
459+
values_suggested = []
460+
restricted_suggestions = false
459461
}
460462

461463
dynamic "variable" {
462464
for_each = var.dashboard_variables.runner_k8s.dynamic_variables
463465
iterator = var_def
464466

465467
content {
466-
property = var_def.value.property
467-
alias = var_def.value.alias
468-
description = var_def.value.description
469-
values = var_def.value.values
470-
value_required = var_def.value.value_required
471-
values_suggested = var_def.value.values_suggested
468+
property = var_def.value.property
469+
alias = var_def.value.alias
470+
description = var_def.value.description
471+
values = var_def.value.values
472+
value_required = var_def.value.value_required
473+
values_suggested = var_def.value.values_suggested
474+
restricted_suggestions = var_def.value.restricted_suggestions
472475
}
473476
}
474477
chart {

‎modules/integrations/splunk_o11y_conf_shared/variables.tf‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,13 @@ variable "dashboard_variables" {
5757
billing = object({
5858
tenant_names = list(string)
5959
dynamic_variables = list(object({
60-
property = string
61-
alias = string
62-
description = string
63-
values = list(string)
64-
value_required = bool
65-
values_suggested = list(string)
60+
property = string
61+
alias = string
62+
description = string
63+
values = list(string)
64+
value_required = bool
65+
values_suggested = list(string)
66+
restricted_suggestions = bool
6667
}
6768
))
6869
})

0 commit comments

Comments
 (0)