Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add full support for timeseries definitions #282

Merged
merged 1 commit into from
Sep 4, 2019
Merged

Add full support for timeseries definitions #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 63 additions & 0 deletions datadog/resource_datadog_dashboard.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2960,6 +2960,21 @@ func getTimeseriesDefinitionSchema() map[string]*schema.Schema {
Schema: getWidgetMarkerSchema(),
},
},
"event": {
Type: schema.TypeList,
Optional: true,
Elem: &schema.Resource{
Schema: getWidgetEventSchema(),
},
},
"yaxis": {
Type: schema.TypeList,
MaxItems: 1,
Optional: true,
Elem: &schema.Resource{
Schema: getWidgetAxisSchema(),
},
},
"title": {
Type: schema.TypeString,
Optional: true,
Expand Down Expand Up @@ -3000,6 +3015,14 @@ func buildDatadogTimeseriesDefinition(terraformDefinition map[string]interface{}
if v, ok := terraformDefinition["marker"].([]interface{}); ok && len(v) > 0 {
datadogDefinition.Markers = *buildDatadogWidgetMarkers(&v)
}
if v, ok := terraformDefinition["event"].([]interface{}); ok && len(v) > 0 {
datadogDefinition.Events = *buildDatadogWidgetEvents(&v)
}
if v, ok := terraformDefinition["yaxis"].([]interface{}); ok && len(v) > 0 {
if _axis, ok := v[0].(map[string]interface{}); ok && len(_axis) > 0 {
datadogDefinition.Yaxis = buildDatadogWidgetAxis(_axis)
}
}
if v, ok := terraformDefinition["title"].(string); ok && len(v) != 0 {
datadogDefinition.Title = datadog.String(v)
}
Expand All @@ -3023,6 +3046,13 @@ func buildTerraformTimeseriesDefinition(datadogDefinition datadog.TimeseriesDefi
if datadogDefinition.Markers != nil {
terraformDefinition["marker"] = buildTerraformWidgetMarkers(&datadogDefinition.Markers)
}
if datadogDefinition.Events != nil {
terraformDefinition["event"] = buildTerraformWidgetEvents(&datadogDefinition.Events)
}
if datadogDefinition.Yaxis != nil {
_axis := buildTerraformWidgetAxis(*datadogDefinition.Yaxis)
terraformDefinition["yaxis"] = []map[string]interface{}{_axis}
}
if datadogDefinition.Title != nil {
terraformDefinition["title"] = *datadogDefinition.Title
}
Expand Down Expand Up @@ -3601,6 +3631,39 @@ func buildTerraformWidgetConditionalFormat(datadogWidgetConditionalFormat *[]dat
return &terraformWidgetConditionalFormat
}

// Widget Event helpers

func getWidgetEventSchema() map[string]*schema.Schema {
return map[string]*schema.Schema{
"q": {
Type: schema.TypeString,
Required: true,
},
}
}
func buildDatadogWidgetEvents(terraformWidgetEvents *[]interface{}) *[]datadog.WidgetEvent {
datadogWidgetEvents := make([]datadog.WidgetEvent, len(*terraformWidgetEvents))
for i, _event := range *terraformWidgetEvents {
terraformEvent := _event.(map[string]interface{})
datadogWidgetEvent := datadog.WidgetEvent{}
// Required params
datadogWidgetEvent.Query = datadog.String(terraformEvent["q"].(string))
datadogWidgetEvents[i] = datadogWidgetEvent
}

return &datadogWidgetEvents
}
func buildTerraformWidgetEvents(datadogWidgetEvents *[]datadog.WidgetEvent) *[]map[string]string {
terraformWidgetEvents := make([]map[string]string, len(*datadogWidgetEvents))
for i, datadogWidget := range *datadogWidgetEvents {
terraformWidget := map[string]string{}
// Required params
terraformWidget["q"] = *datadogWidget.Query
terraformWidgetEvents[i] = terraformWidget
}
return &terraformWidgetEvents
}

// Widget Time helpers

func getWidgetTimeSchema() map[string]*schema.Schema {
Expand Down
16 changes: 16 additions & 0 deletions datadog/resource_datadog_dashboard_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,17 @@ resource "datadog_dashboard" "ordered_dashboard" {
time = {
live_span = "1h"
}
event {
q = "sources:test tags:1"
}
event {
q = "sources:test tags:2"
}
yaxis = {
scale = "log"
include_zero = false
max = 100
}
}
}
widget {
Expand Down Expand Up @@ -657,6 +668,11 @@ func TestAccDatadogDashboard_update(t *testing.T) {
resource.TestCheckResourceAttr("datadog_dashboard.ordered_dashboard", "widget.10.timeseries_definition.0.marker.1.value", "10 < y < 999"),
resource.TestCheckResourceAttr("datadog_dashboard.ordered_dashboard", "widget.10.timeseries_definition.0.title", "Widget Title"),
resource.TestCheckResourceAttr("datadog_dashboard.ordered_dashboard", "widget.10.timeseries_definition.0.time.live_span", "1h"),
resource.TestCheckResourceAttr("datadog_dashboard.ordered_dashboard", "widget.10.timeseries_definition.0.event.0.q", "sources:test tags:1"),
resource.TestCheckResourceAttr("datadog_dashboard.ordered_dashboard", "widget.10.timeseries_definition.0.event.1.q", "sources:test tags:2"),
resource.TestCheckResourceAttr("datadog_dashboard.ordered_dashboard", "widget.10.timeseries_definition.0.yaxis.scale", "log"),
resource.TestCheckResourceAttr("datadog_dashboard.ordered_dashboard", "widget.10.timeseries_definition.0.yaxis.include_zero", "false"),
resource.TestCheckResourceAttr("datadog_dashboard.ordered_dashboard", "widget.10.timeseries_definition.0.yaxis.max", "100"),
// Toplist widget
resource.TestCheckResourceAttr("datadog_dashboard.ordered_dashboard", "widget.11.toplist_definition.0.request.0.q", "avg:system.cpu.user{app:general} by {env}"),
resource.TestCheckResourceAttr("datadog_dashboard.ordered_dashboard", "widget.11.toplist_definition.0.request.0.conditional_formats.#", "2"),
Expand Down