Add custom labels for Machine Learning Forecasting (#894)

Add support for adding custom labels on forecasting. 
Using the updated machine-learning-go-client v0.5.0

Author: ioanarm

docs/resources/machine_learning_job.md

@@ -24,6 +24,7 @@ A job defines the queries and model parameters for a machine learning task.
 
 ### Optional
 
+- `custom_labels` (Map of String) An object representing the custom labels added on the forecast.
 - `datasource_id` (Number) The id of the datasource to query.
 - `datasource_uid` (String) The uid of the datasource to query.
 - `description` (String) A description of the job.

examples/resources/grafana_machine_learning_job/tuned_job.tf

@@ -10,4 +10,7 @@ resource "grafana_machine_learning_job" "test_job" {
     daily_seasonality  = 15
     weekly_seasonality = 10
   }
+  custom_labels = {
+    example_label = "example_value"
+  }
 }

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/Masterminds/semver/v3 v3.2.1
 	github.com/grafana/amixr-api-go-client v0.0.7
 	github.com/grafana/grafana-api-golang-client v0.19.0
-	github.com/grafana/machine-learning-go-client v0.4.0
+	github.com/grafana/machine-learning-go-client v0.5.0
 	github.com/grafana/synthetic-monitoring-agent v0.14.3
 	github.com/grafana/synthetic-monitoring-api-go-client v0.7.0
 	github.com/hashicorp/go-cleanhttp v0.5.2

go.sum

@@ -74,8 +74,8 @@ github.com/grafana/amixr-api-go-client v0.0.7 h1:U6W6yKxMMybI+Qz4zl+Vih48o6CczLa
 github.com/grafana/amixr-api-go-client v0.0.7/go.mod h1:N6x26XUrM5zGtK5zL5vNJnAn2JFMxLFPPLTw/6pDkFE=
 github.com/grafana/grafana-api-golang-client v0.19.0 h1:4z8voB2nv/bMiP4WbCKdhCym2mltSDFUzOrDqzohrw0=
 github.com/grafana/grafana-api-golang-client v0.19.0/go.mod h1:24W29gPe9yl0/3A9X624TPkAOR8DpHno490cPwnkv8E=
-github.com/grafana/machine-learning-go-client v0.4.0 h1:UAkJPE7xujzFTm0d9ctbX/FsCID8rqejWjnkRPGNM6E=
-github.com/grafana/machine-learning-go-client v0.4.0/go.mod h1:QFfZz8NkqVF8++skjkKQXJEZfpCYd8S0yTWJUpsLLTA=
+github.com/grafana/machine-learning-go-client v0.5.0 h1:Q1K+MPSy8vfMm2jsk3WQ7O77cGr2fM5hxwtPSoPc5NU=
+github.com/grafana/machine-learning-go-client v0.5.0/go.mod h1:QFfZz8NkqVF8++skjkKQXJEZfpCYd8S0yTWJUpsLLTA=
 github.com/grafana/synthetic-monitoring-agent v0.14.3 h1:M7HZmTJKJLF53Fv7KZeb2KyzHSx7gbHiJ3Mr/ApfCRA=
 github.com/grafana/synthetic-monitoring-agent v0.14.3/go.mod h1:izjAJZb+Q+/GZogJ8Nls6HQlmIUaHUfCtinPCU3HhSw=
 github.com/grafana/synthetic-monitoring-api-go-client v0.7.0 h1:3ZfQzmXDBPcQTTgMAIIiTw5Dwxm/B4lzf34Sto0d0YY=

internal/resources/machinelearning/resource_job.go

@@ -69,6 +69,12 @@ A job defines the queries and model parameters for a machine learning task.
 				Type:        schema.TypeMap,
 				Required:    true,
 			},
+			"custom_labels": {
+				Description: "An object representing the custom labels added on the forecast.",
+				Type:        schema.TypeMap,
+				Optional:    true,
+				Default:     nil,
+			},
 			"interval": {
 				Description: "The data interval in seconds to train the data on.",
 				Type:        schema.TypeInt,
@@ -148,6 +154,7 @@ func ResourceJobRead(ctx context.Context, d *schema.ResourceData, meta interface
 	d.Set("query_params", job.QueryParams)
 	d.Set("interval", job.Interval)
 	d.Set("hyper_params", job.HyperParams)
+	d.Set("custom_labels", job.CustomLabels)
 	d.Set("training_window", job.TrainingWindow)
 	d.Set("holidays", job.Holidays)
 
@@ -196,6 +203,7 @@ func makeMLJob(d *schema.ResourceData, meta interface{}) (mlapi.Job, error) {
 		Interval:          uint(d.Get("interval").(int)),
 		Algorithm:         "grafana_prophet_1_0_1",
 		HyperParams:       d.Get("hyper_params").(map[string]interface{}),
+		CustomLabels:      d.Get("custom_labels").(map[string]interface{}),
 		TrainingWindow:    uint(d.Get("training_window").(int)),
 		TrainingFrequency: uint(24 * time.Hour / time.Second),
 		Holidays:          common.ListToStringSlice(d.Get("holidays").([]interface{})),

internal/resources/machinelearning/resource_job_test.go

@@ -61,6 +61,7 @@ func TestAccResourceJob(t *testing.T) {
 					resource.TestCheckResourceAttr("grafana_machine_learning_job.test_job", "training_window", "7776000"),
 					resource.TestCheckResourceAttr("grafana_machine_learning_job.test_job", "hyper_params.daily_seasonality", "15"),
 					resource.TestCheckResourceAttr("grafana_machine_learning_job.test_job", "hyper_params.weekly_seasonality", "10"),
+					resource.TestCheckResourceAttr("grafana_machine_learning_job.test_job", "custom_labels.example_label", "example_value"),
 				),
 			},
 			{