Cloud Stack: Add traces and graphite attributes (#612)

Closes #566

Author: julienduchesne

docs/data-sources/cloud_stack.md

@@ -40,6 +40,10 @@ available at “https://<stack_slug>.grafana.net".
 - `alertmanager_url` (String) Base URL of the Alertmanager instance configured for this stack.
 - `alertmanager_user_id` (Number) User ID of the Alertmanager instance configured for this stack.
 - `description` (String) Description of stack.
+- `graphite_name` (String)
+- `graphite_status` (String)
+- `graphite_url` (String)
+- `graphite_user_id` (Number)
 - `id` (String) The stack id assigned to this stack by Grafana.
 - `logs_name` (String)
 - `logs_status` (String)
@@ -54,9 +58,13 @@ available at “https://<stack_slug>.grafana.net".
 - `prometheus_remote_write_endpoint` (String) Use this URL to send prometheus metrics to Grafana cloud
 - `prometheus_status` (String) Prometheus status for this instance.
 - `prometheus_url` (String) Prometheus url for this instance.
-- `prometheus_user_id` (Number) Promehteus user ID. Used for e.g. remote_write.
+- `prometheus_user_id` (Number) Prometheus user ID. Used for e.g. remote_write.
 - `region_slug` (String) The region this stack is deployed to.
 - `status` (String) Status of the stack.
+- `traces_name` (String)
+- `traces_status` (String)
+- `traces_url` (String)
+- `traces_user_id` (Number)
 - `url` (String) Custom URL for the Grafana instance. Must have a CNAME setup to point to `.grafana.net` before creating the stack
 
 

docs/resources/cloud_stack.md

@@ -45,6 +45,10 @@ Changing region will destroy the existing stack and create a new one in the desi
 - `alertmanager_status` (String) Status of the Alertmanager instance configured for this stack.
 - `alertmanager_url` (String) Base URL of the Alertmanager instance configured for this stack.
 - `alertmanager_user_id` (Number) User ID of the Alertmanager instance configured for this stack.
+- `graphite_name` (String)
+- `graphite_status` (String)
+- `graphite_url` (String)
+- `graphite_user_id` (Number)
 - `id` (String) The stack id assigned to this stack by Grafana.
 - `logs_name` (String)
 - `logs_status` (String)
@@ -58,8 +62,12 @@ Changing region will destroy the existing stack and create a new one in the desi
 - `prometheus_remote_write_endpoint` (String) Use this URL to send prometheus metrics to Grafana cloud
 - `prometheus_status` (String) Prometheus status for this instance.
 - `prometheus_url` (String) Prometheus url for this instance.
-- `prometheus_user_id` (Number) Promehteus user ID. Used for e.g. remote_write.
+- `prometheus_user_id` (Number) Prometheus user ID. Used for e.g. remote_write.
 - `status` (String) Status of the stack.
+- `traces_name` (String)
+- `traces_status` (String)
+- `traces_url` (String)
+- `traces_user_id` (Number)
 
 ## Import
 

grafana/resource_cloud_stack.go

@@ -125,10 +125,12 @@ Changing region will destroy the existing stack and create a new one in the desi
 				Computed:    true,
 				Description: "Status of the stack.",
 			},
+
+			// Hosted Metrics
 			"prometheus_user_id": {
 				Type:        schema.TypeInt,
 				Computed:    true,
-				Description: "Promehteus user ID. Used for e.g. remote_write.",
+				Description: "Prometheus user ID. Used for e.g. remote_write.",
 			},
 			"prometheus_url": {
 				Type:        schema.TypeString,
@@ -155,6 +157,8 @@ Changing region will destroy the existing stack and create a new one in the desi
 				Computed:    true,
 				Description: "Prometheus status for this instance.",
 			},
+
+			// Alerting
 			"alertmanager_user_id": {
 				Type:        schema.TypeInt,
 				Computed:    true,
@@ -175,6 +179,8 @@ Changing region will destroy the existing stack and create a new one in the desi
 				Computed:    true,
 				Description: "Status of the Alertmanager instance configured for this stack.",
 			},
+
+			// Hosted Logs
 			"logs_user_id": {
 				Type:     schema.TypeInt,
 				Computed: true,
@@ -191,6 +197,42 @@ Changing region will destroy the existing stack and create a new one in the desi
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+
+			// Traces
+			"traces_user_id": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"traces_name": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"traces_url": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"traces_status": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
+			// Graphite
+			"graphite_user_id": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"graphite_name": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"graphite_url": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"graphite_status": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 		},
 	}
 }
@@ -316,10 +358,10 @@ func FlattenStack(d *schema.ResourceData, stack gapi.Stack) error {
 	d.Set("prometheus_url", stack.HmInstancePromURL)
 	d.Set("prometheus_name", stack.HmInstancePromName)
 	reURL, err := appendPath(stack.HmInstancePromURL, "/api/prom")
-	d.Set("prometheus_remote_endpoint", reURL)
 	if err != nil {
 		return err
 	}
+	d.Set("prometheus_remote_endpoint", reURL)
 	rweURL, err := appendPath(stack.HmInstancePromURL, "/api/prom/push")
 	if err != nil {
 		return err
@@ -337,6 +379,16 @@ func FlattenStack(d *schema.ResourceData, stack gapi.Stack) error {
 	d.Set("alertmanager_url", stack.AmInstanceURL)
 	d.Set("alertmanager_status", stack.AmInstanceStatus)
 
+	d.Set("traces_user_id", stack.HtInstanceID)
+	d.Set("traces_name", stack.HtInstanceName)
+	d.Set("traces_url", stack.HtInstanceURL)
+	d.Set("traces_status", stack.HtInstanceStatus)
+
+	d.Set("graphite_user_id", stack.HmInstanceGraphiteID)
+	d.Set("graphite_name", stack.HmInstanceGraphiteName)
+	d.Set("graphite_url", stack.HmInstanceGraphiteURL)
+	d.Set("graphite_status", stack.HmInstanceGraphiteStatus)
+
 	return nil
 }
 

grafana/resource_cloud_stack_test.go

@@ -40,6 +40,11 @@ func TestResourceCloudStack_Basic(t *testing.T) {
 					resource.TestCheckResourceAttr("grafana_cloud_stack.test", "status", "active"),
 					resource.TestCheckResourceAttr("grafana_cloud_stack.test", "prometheus_remote_endpoint", "https://prometheus-prod-01-eu-west-0.grafana.net/api/prom"),
 					resource.TestCheckResourceAttr("grafana_cloud_stack.test", "prometheus_remote_write_endpoint", "https://prometheus-prod-01-eu-west-0.grafana.net/api/prom/push"),
+					resource.TestCheckResourceAttrSet("grafana_cloud_stack.test", "prometheus_user_id"),
+					resource.TestCheckResourceAttrSet("grafana_cloud_stack.test", "alertmanager_user_id"),
+					resource.TestCheckResourceAttrSet("grafana_cloud_stack.test", "logs_user_id"),
+					resource.TestCheckResourceAttrSet("grafana_cloud_stack.test", "traces_user_id"),
+					resource.TestCheckResourceAttrSet("grafana_cloud_stack.test", "graphite_user_id"),
 				),
 			},
 			{