Merge pull request #341 from SumoLogic/vishal-add-domain-field

Author: sumovishal

sumologic/resource_sumologic_dashboard.go

@@ -91,6 +91,10 @@ func resourceSumologicDashboard() *schema.Resource {
 					},
 				},
 			},
+			"domain": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 			"refresh_interval": {
 				Type:         schema.TypeInt,
 				Optional:     true,
@@ -705,6 +709,7 @@ func resourceToDashboard(d *schema.ResourceData) Dashboard {
 		Description:      d.Get("description").(string),
 		FolderId:         d.Get("folder_id").(string),
 		TopologyLabelMap: topologyLabel,
+		Domain:           d.Get("domain").(string),
 		RefreshInterval:  d.Get("refresh_interval").(int),
 		TimeRange:        timeRange,
 		Panels:           panels,
@@ -1102,6 +1107,9 @@ func setDashboard(d *schema.ResourceData, dashboard *Dashboard) error {
 	if err := d.Set("folder_id", dashboard.FolderId); err != nil {
 		return err
 	}
+	if err := d.Set("domain", dashboard.Domain); err != nil {
+		return err
+	}
 	if err := d.Set("refresh_interval", dashboard.RefreshInterval); err != nil {
 		return err
 	}
@@ -1140,10 +1148,11 @@ func setDashboard(d *schema.ResourceData, dashboard *Dashboard) error {
 	}
 
 	log.Println("=====================================================================")
-	log.Printf("title: %+v\n", d.Get("title"))
-	log.Printf("description: %+v\n", d.Get("description"))
-	log.Printf("folder_id: %+v\n", d.Get("folder_id"))
+	log.Printf("title: %s\n", d.Get("title"))
+	log.Printf("description: %s\n", d.Get("description"))
+	log.Printf("folder_id: %s\n", d.Get("folder_id"))
 	log.Printf("topology_label_map: %+v\n", d.Get("topology_label_map"))
+	log.Printf("domain: %s\n", d.Get("domain"))
 	log.Printf("time_range: %+v\n", d.Get("time_range"))
 	log.Printf("panel: %+v\n", d.Get("panel"))
 	log.Printf("layout: %+v\n", d.Get("layout"))

sumologic/resource_sumologic_dashboard_test.go

@@ -50,7 +50,7 @@ func TestAccSumologicDashboard_create(t *testing.T) {
 	description := "Test dashboard description"
 	theme := "Dark"
 	refreshInterval := 120
-
+	domain := "aws"
 	literalRangeName := "today"
 	textPanel := TextPanel{
 		Key:   "text-panel-001",
@@ -85,7 +85,7 @@ func TestAccSumologicDashboard_create(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Config: dashboardCreateConfig(title, description, theme, refreshInterval,
-					topologyLabel, literalRangeName, textPanel, layout, variable),
+					topologyLabel, domain, literalRangeName, textPanel, layout, variable),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckDashboardExists("sumologic_dashboard.tf_crud_test", &dashboard, t),
 					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
@@ -98,6 +98,8 @@ func TestAccSumologicDashboard_create(t *testing.T) {
 						"theme", theme),
 					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
 						"topology_label_map.0.data.#", "2"),
+					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
+						"domain", domain),
 					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
 						"time_range.#", "1"),
 					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
@@ -130,6 +132,7 @@ func TestAccSumologicDashboard_update(t *testing.T) {
 	description := "Test dashboard description"
 	theme := "Dark"
 	refreshInterval := 120
+	domain := "aws"
 	literalRangeName := "today"
 	textPanel := TextPanel{
 		Key:   "text-panel-001",
@@ -160,6 +163,7 @@ func TestAccSumologicDashboard_update(t *testing.T) {
 	newTheme := "Light"
 	newRefreshInterval := 300
 	newFirstLabelValue := "collection-cluster"
+	updatedDomain := "app"
 	newLiteralRangeName := "week"
 	searchPanel := SumoSearchPanel{
 		Key:   "search-panel-001",
@@ -211,7 +215,7 @@ func TestAccSumologicDashboard_update(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Config: dashboardCreateConfig(title, description, theme, refreshInterval,
-					topologyLabel, literalRangeName, textPanel, layout, csvVariable),
+					topologyLabel, domain, literalRangeName, textPanel, layout, csvVariable),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckDashboardExists("sumologic_dashboard.tf_crud_test", &dashboard, t),
 					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
@@ -222,6 +226,8 @@ func TestAccSumologicDashboard_update(t *testing.T) {
 						"theme", theme),
 					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
 						"topology_label_map.0.data.#", "2"),
+					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
+						"domain", domain),
 					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
 						"time_range.0.begin_bounded_time_range.0.from.0.literal_time_range.0.range_name",
 						literalRangeName),
@@ -241,8 +247,8 @@ func TestAccSumologicDashboard_update(t *testing.T) {
 			},
 			{
 				Config: dashboardUpdateConfig(title, description, newTheme, newRefreshInterval,
-					firstLabelKey, newFirstLabelValue, newLiteralRangeName, textPanel, searchPanel,
-					newLayout, newVariables),
+					firstLabelKey, newFirstLabelValue, updatedDomain, newLiteralRangeName, textPanel,
+					searchPanel, newLayout, newVariables),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckDashboardExists("sumologic_dashboard.tf_crud_test", &dashboard, t),
 					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
@@ -253,6 +259,8 @@ func TestAccSumologicDashboard_update(t *testing.T) {
 						"theme", newTheme),
 					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
 						"topology_label_map.0.data.#", "1"),
+					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
+						"domain", updatedDomain),
 					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
 						"time_range.0.begin_bounded_time_range.0.from.0.literal_time_range.0.range_name",
 						newLiteralRangeName),
@@ -395,8 +403,8 @@ func dashboardImportConfig(title string) string {
 }
 
 func dashboardCreateConfig(title string, description string, theme string, refreshInterval int,
-	topologyLabel TopologyLabel, rangeName string, textPanel TextPanel, layout GridLayout,
-	variable Variable) string {
+	topologyLabel TopologyLabel, domain string, rangeName string, textPanel TextPanel,
+	layout GridLayout, variable Variable) string {
 
 	return fmt.Sprintf(`
 		data "sumologic_personal_folder" "personalFolder" {}
@@ -416,6 +424,7 @@ func dashboardCreateConfig(title string, description string, theme string, refre
 					values = ["%s", "%s"]
 				}
 			}
+			domain = "%s"
 			time_range {
 				begin_bounded_time_range {
 					from {
@@ -458,15 +467,16 @@ func dashboardCreateConfig(title string, description string, theme string, refre
 		}`,
 		title, description, refreshInterval, theme, firstLabelKey, topologyLabel.Data[firstLabelKey][0],
 		secondLabelKey, topologyLabel.Data[secondLabelKey][0], topologyLabel.Data[secondLabelKey][1],
-		rangeName, textPanel.Key, textPanel.Title, textPanel.Text,
+		domain, rangeName, textPanel.Key, textPanel.Title, textPanel.Text,
 		layout.LayoutStructures[0].Key, variable.Name, variable.DisplayName, variable.DefaultValue,
 		variable.SourceDefinition.(CsvVariableSourceDefinition).Values,
 	)
 }
 
 func dashboardUpdateConfig(title string, description string, theme string, refreshInterval int,
-	topologyLabel string, topologyLabelValue string, rangeName string, textPanel TextPanel,
-	searchPanel SumoSearchPanel, layout GridLayout, variables []Variable) string {
+	topologyLabel string, topologyLabelValue string, domain string, rangeName string,
+	textPanel TextPanel, searchPanel SumoSearchPanel, layout GridLayout,
+	variables []Variable) string {
 
 	loqQuerySourceDef := variables[1].SourceDefinition.(LogQueryVariableSourceDefinition)
 	csvSourceDef := variables[0].SourceDefinition.(CsvVariableSourceDefinition)
@@ -485,6 +495,7 @@ func dashboardUpdateConfig(title string, description string, theme string, refre
 					values = ["%s"]
 				}
 			}
+			domain = "%s"
 			time_range {
 				begin_bounded_time_range {
 					from {
@@ -567,8 +578,8 @@ func dashboardUpdateConfig(title string, description string, theme string, refre
 				hide_from_ui = false
 			}
 		}`,
-		title, description, refreshInterval, theme, topologyLabel, topologyLabelValue, rangeName,
-		textPanel.Key, textPanel.Title, textPanel.Text,
+		title, description, refreshInterval, theme, topologyLabel, topologyLabelValue, domain,
+		rangeName, textPanel.Key, textPanel.Title, textPanel.Text,
 		searchPanel.Key, searchPanel.Title, searchPanel.Description, searchPanel.Queries[0].QueryString,
 		searchPanel.Queries[0].QueryKey,
 		layout.LayoutStructures[0].Key, layout.LayoutStructures[1].Key,

sumologic/sumologic_dashboard.go

@@ -58,6 +58,7 @@ type Dashboard struct {
 	Description      string         `json:"description"`
 	FolderId         string         `json:"folderId"`
 	TopologyLabelMap *TopologyLabel `json:"topologyLabelMap"`
+	Domain           string         `json:"domain"`
 	RefreshInterval  int            `json:"refreshInterval"`
 	TimeRange        interface{}    `json:"timeRange"`
 	Panels           []interface{}  `json:"panels"`

website/docs/r/dashboard.html.markdown

@@ -40,6 +40,8 @@ resource "sumologic_dashboard" "api-dashboard" {
 		}
 	}
 
+	domain = "app"
+
 	## text panel
 	panel {
 		text_panel {
@@ -277,6 +279,7 @@ personal folder.
 - `topology_label_map` - (Block List, Max: 1, Optional) Topology labels for the dashboard. See
 [topology label map schema](#schema-for-topology_label_map)
 for details.
+- `domain` - (Optional) Domain of the dashboard. If set denotes that the dashboard concerns a given domain.
 - `time_range` - (Block List, Max: 1, Required) Time range of the dashboard. See [time range schema](#schema-for-time_range)
 for details.
 - `panel` - (Block List, Optional) A list of panels in the dashboard. See [panel schema](#schema-for-panel) for details.