Datasources: Support new attributes (#506)

* Datasources: Support new attributes
Adds `xpack_enabled` and `manage_alerts` to datasource json_data

Closes #458
Closes #300

* Generate docs

Author: julienduchesne

docs/resources/data_source.md

@@ -130,6 +130,7 @@ Optional:
 - `interval` (String) (Elasticsearch) Index date time format. nil(No Pattern), 'Hourly', 'Daily', 'Weekly', 'Monthly' or 'Yearly'.
 - `log_level_field` (String) (Elasticsearch) Which field should be used to indicate the priority of the log message.
 - `log_message_field` (String) (Elasticsearch) Which field should be used as the log message.
+- `manage_alerts` (Boolean) (Prometheus) Manage alerts.
 - `max_concurrent_shard_requests` (Number) (Elasticsearch) Maximum number of concurrent shard requests.
 - `max_idle_conns` (Number) (MySQL, PostgreSQL and MSSQL) Maximum number of connections in the idle connection pool (Grafana v5.4+).
 - `max_lines` (Number) (Loki) Upper limit for the number of log lines returned by Loki
@@ -162,6 +163,7 @@ Optional:
 - `tsdb_version` (Number) (OpenTSDB) Version.
 - `version` (String) (InfluxDB) InfluxQL or Flux.
 - `workgroup` (String) (Athena) Workgroup to use.
+- `xpack_enabled` (Boolean) (Elasticsearch) Enable X-Pack support.
 
 <a id="nestedblock--json_data--derived_field"></a>
 ### Nested Schema for `json_data.derived_field`

go.mod

@@ -5,7 +5,7 @@ go 1.18
 require (
 	github.com/Masterminds/semver/v3 v3.1.1
 	github.com/grafana/amixr-api-go-client v0.0.1
-	github.com/grafana/grafana-api-golang-client v0.5.3
+	github.com/grafana/grafana-api-golang-client v0.6.0
 	github.com/grafana/machine-learning-go-client v0.1.1
 	github.com/grafana/synthetic-monitoring-agent v0.8.2
 	github.com/grafana/synthetic-monitoring-api-go-client v0.6.0

go.sum

@@ -114,8 +114,8 @@ github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/grafana/amixr-api-go-client v0.0.1 h1:vj5gNxZ1LC3Yu6AavRfDKdqzq1h4WR5wXZEyHLaGkm8=
 github.com/grafana/amixr-api-go-client v0.0.1/go.mod h1:N6x26XUrM5zGtK5zL5vNJnAn2JFMxLFPPLTw/6pDkFE=
-github.com/grafana/grafana-api-golang-client v0.5.3 h1:QoIesfzqt4Ges7ocNDatHIBRjagGInOJ50LSIfzPmp4=
-github.com/grafana/grafana-api-golang-client v0.5.3/go.mod h1:24W29gPe9yl0/3A9X624TPkAOR8DpHno490cPwnkv8E=
+github.com/grafana/grafana-api-golang-client v0.6.0 h1:vIHRlBFuhv8RblcinH31ez1+JYYFhuJGx4kIRKlT6l8=
+github.com/grafana/grafana-api-golang-client v0.6.0/go.mod h1:24W29gPe9yl0/3A9X624TPkAOR8DpHno490cPwnkv8E=
 github.com/grafana/machine-learning-go-client v0.1.1 h1:Gw6cX8xAd6IVF2LApkXOIdBK8Gzz07B3jQPukecw7fc=
 github.com/grafana/machine-learning-go-client v0.1.1/go.mod h1:QFfZz8NkqVF8++skjkKQXJEZfpCYd8S0yTWJUpsLLTA=
 github.com/grafana/synthetic-monitoring-agent v0.8.2 h1:retJc4xWxoHwqhWa4HZ9t4mO+Je0DWm8wCGdPW2hmuw=

grafana/resource_data_source.go

@@ -262,6 +262,11 @@ source selected (via the 'type' argument).
 							Optional:    true,
 							Description: "(Elasticsearch) Which field should be used as the log message.",
 						},
+						"manage_alerts": {
+							Type:        schema.TypeBool,
+							Optional:    true,
+							Description: "(Prometheus) Manage alerts.",
+						},
 						"max_concurrent_shard_requests": {
 							Type:        schema.TypeInt,
 							Optional:    true,
@@ -423,6 +428,11 @@ source selected (via the 'type' argument).
 							Optional:    true,
 							Description: "(Athena) Workgroup to use.",
 						},
+						"xpack_enabled": {
+							Type:        schema.TypeBool,
+							Optional:    true,
+							Description: "(Elasticsearch) Enable X-Pack support.",
+						},
 					},
 				},
 			},
@@ -707,6 +717,7 @@ func makeJSONData(d *schema.ResourceData) gapi.JSONData {
 		Implementation:             d.Get("json_data.0.implementation").(string),
 		LogLevelField:              d.Get("json_data.0.log_level_field").(string),
 		LogMessageField:            d.Get("json_data.0.log_message_field").(string),
+		ManageAlerts:               d.Get("json_data.0.manage_alerts").(bool),
 		MaxConcurrentShardRequests: int64(d.Get("json_data.0.max_concurrent_shard_requests").(int)),
 		MaxIdleConns:               int64(d.Get("json_data.0.max_idle_conns").(int)),
 		MaxLines:                   d.Get("json_data.0.max_lines").(int),
@@ -739,6 +750,7 @@ func makeJSONData(d *schema.ResourceData) gapi.JSONData {
 		TsdbVersion:                int64(d.Get("json_data.0.tsdb_version").(int)),
 		Version:                    d.Get("json_data.0.version").(string),
 		Workgroup:                  d.Get("json_data.0.workgroup").(string),
+		XpackEnabled:               d.Get("json_data.0.xpack_enabled").(bool),
 	}
 }
 

grafana/resource_data_source_test.go

@@ -1,6 +1,7 @@
 package grafana
 
 import (
+	"errors"
 	"fmt"
 	"reflect"
 	"strconv"
@@ -214,6 +215,7 @@ func TestAccDataSource_basic(t *testing.T) {
 					log_message_field = "message"
 					log_level_field   = "fields.level"
 					max_concurrent_shard_requests = 8
+					xpack_enabled     = true
 				}
 			}
 			`,
@@ -229,6 +231,17 @@ func TestAccDataSource_basic(t *testing.T) {
 				"json_data.0.log_level_field":   "fields.level",
 				"json_data.0.max_concurrent_shard_requests": "8",
 			},
+			additionalChecks: []resource.TestCheckFunc{
+				func(s *terraform.State) error {
+					if dataSource.Name != "elasticsearch" {
+						return fmt.Errorf("bad name: %s", dataSource.Name)
+					}
+					if dataSource.JSONData.XpackEnabled != true {
+						return errors.New("xpack_enabled should be true")
+					}
+					return nil
+				},
+			},
 		},
 		{
 			resource: "grafana_data_source.opentsdb",
@@ -372,6 +385,7 @@ func TestAccDataSource_basic(t *testing.T) {
 					sigv4_auth   = true
 					sigv4_auth_type = "default"
 					sigv4_region    = "eu-west-1"
+					manage_alerts   = true
 				}
 
 				http_headers = {
@@ -398,10 +412,12 @@ func TestAccDataSource_basic(t *testing.T) {
 					if len(dataSource.HTTPHeaders) != 1 {
 						return fmt.Errorf("expected 1 http header, got %d", len(dataSource.HTTPHeaders))
 					}
-
 					if _, ok := dataSource.HTTPHeaders["header1"]; !ok {
 						return fmt.Errorf("http header header1 not found")
 					}
+					if dataSource.JSONData.ManageAlerts != true {
+						return errors.New("expected manage_alerts to be true")
+					}
 					return nil
 				},
 			},