Skip to content

Commit 13a9aaa

Browse files
committed
dashboard: Update avaiable major versions of Grafana in grafana_major_version
1 parent ee84ce9 commit 13a9aaa

6 files changed

+10
-10
lines changed

internal/services/dashboard/dashboard_grafana_data_source_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func TestAccDashboardGrafanaDataSource_basic(t *testing.T) {
2222
Config: r.basic(data),
2323
Check: acceptance.ComposeTestCheckFunc(
2424
check.That(data.ResourceName).Key("resource_group_name").Exists(),
25-
check.That(data.ResourceName).Key("grafana_major_version").HasValue("11"),
25+
check.That(data.ResourceName).Key("grafana_major_version").HasValue("12"),
2626
),
2727
},
2828
})

internal/services/dashboard/dashboard_grafana_managed_private_endpoint_resource_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ resource "azurerm_dashboard_grafana" "test" {
107107
name = "a-dg-%d"
108108
resource_group_name = azurerm_resource_group.test.name
109109
location = azurerm_resource_group.test.location
110-
grafana_major_version = "11"
110+
grafana_major_version = "12"
111111
}
112112
113113
resource "azurerm_monitor_workspace" "test" {

internal/services/dashboard/dashboard_grafana_resource.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ func (r DashboardGrafanaResource) Arguments() map[string]*pluginsdk.Schema {
199199
Type: pluginsdk.TypeString,
200200
Required: true,
201201
ValidateFunc: validation.StringInSlice([]string{
202-
"10", "11",
202+
"11", "12",
203203
}, false),
204204
},
205205

internal/services/dashboard/dashboard_grafana_resource_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ resource "azurerm_dashboard_grafana" "test" {
141141
name = "a-dg-%d"
142142
resource_group_name = azurerm_resource_group.test.name
143143
location = azurerm_resource_group.test.location
144-
grafana_major_version = "11"
144+
grafana_major_version = "12"
145145
}
146146
`, template, data.RandomInteger)
147147
}
@@ -171,7 +171,7 @@ resource "azurerm_dashboard_grafana" "import" {
171171
name = azurerm_dashboard_grafana.test.name
172172
resource_group_name = azurerm_dashboard_grafana.test.resource_group_name
173173
location = azurerm_dashboard_grafana.test.location
174-
grafana_major_version = "11"
174+
grafana_major_version = "12"
175175
}
176176
`, config)
177177
}
@@ -193,7 +193,7 @@ resource "azurerm_dashboard_grafana" "test" {
193193
api_key_enabled = true
194194
deterministic_outbound_ip_enabled = true
195195
public_network_access_enabled = false
196-
grafana_major_version = "11"
196+
grafana_major_version = "12"
197197
smtp {
198198
enabled = true
199199
host = "localhost:25"
@@ -235,7 +235,7 @@ resource "azurerm_dashboard_grafana" "test" {
235235
name = "a-dg-%d"
236236
resource_group_name = azurerm_resource_group.test.name
237237
location = azurerm_resource_group.test.location
238-
grafana_major_version = "11"
238+
grafana_major_version = "12"
239239
240240
identity {
241241
type = "SystemAssigned"

website/docs/r/dashboard_grafana.html.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ resource "azurerm_dashboard_grafana" "example" {
2222
name = "example-dg"
2323
resource_group_name = azurerm_resource_group.example.name
2424
location = "West Europe"
25-
grafana_major_version = 11
25+
grafana_major_version = 12
2626
api_key_enabled = true
2727
deterministic_outbound_ip_enabled = true
2828
public_network_access_enabled = false
@@ -47,7 +47,7 @@ The following arguments are supported:
4747

4848
* `location` - (Required) Specifies the Azure Region where the Dashboard Grafana should exist. Changing this forces a new Dashboard Grafana to be created.
4949

50-
* `grafana_major_version` - (Required) Which major version of Grafana to deploy. Possible values are `10`, `11`.
50+
* `grafana_major_version` - (Required) Which major version of Grafana to deploy. Possible values are `11`, `12`.
5151

5252
* `api_key_enabled` - (Optional) Whether to enable the api key setting of the Grafana instance. Defaults to `false`.
5353

website/docs/r/dashboard_grafana_managed_private_endpoint.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ resource "azurerm_dashboard_grafana" "example" {
3131
name = "example-dg"
3232
resource_group_name = azurerm_resource_group.example.name
3333
location = azurerm_resource_group.example.location
34-
grafana_major_version = 11
34+
grafana_major_version = 12
3535
public_network_access_enabled = false
3636
3737
azure_monitor_workspace_integrations {

0 commit comments

Comments
 (0)