resilien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

provider/datadog: Default notify_no_data on datadog_monitor to false (#11903) 

Fixes: #11863

Backwards incompatible so will not be pushed to 0.8.x series. This
follows the datadog documentation as mentioned in the issue

```
% make testacc TEST=./builtin/providers/datadog TESTARGS='-run=TestAccDatadogMonitor_'
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /terraform/vendor/)
2017/02/13 12:30:24 Generated command/internal_plugin_list.go
TF_ACC=1 go test ./builtin/providers/datadog -v -run=TestAccDatadogMonitor_ -timeout 120m
=== RUN   TestAccDatadogMonitor_Basic
--- PASS: TestAccDatadogMonitor_Basic (84.23s)
=== RUN   TestAccDatadogMonitor_BasicNoTreshold
--- PASS: TestAccDatadogMonitor_BasicNoTreshold (81.92s)
=== RUN   TestAccDatadogMonitor_Updated
--- PASS: TestAccDatadogMonitor_Updated (82.91s)
=== RUN   TestAccDatadogMonitor_TrimWhitespace
--- PASS: TestAccDatadogMonitor_TrimWhitespace (63.34s)
=== RUN   TestAccDatadogMonitor_Basic_float_int
--- PASS: TestAccDatadogMonitor_Basic_float_int (75.84s)
PASS
ok  	github.com/hashicorp/terraform/builtin/providers/datadog	388.257s
```
This commit is contained in:
Paul Stack 2017-02-13 14:31:00 +00:00 committed by GitHub
parent 8985a8ce1b
commit a322e916ba
2 changed files with 32 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
builtin/providers/datadog/resource_datadog_monitor.go
View File

@ -23,51 +23,51 @@ func resourceDatadogMonitor() *schema.Resource {
},
Schema: map[string]*schema.Schema{
"name": &schema.Schema{
"name": {
Type: schema.TypeString,
Required: true,
},
"message": &schema.Schema{
"message": {
Type: schema.TypeString,
Required: true,
StateFunc: func(val interface{}) string {
return strings.TrimSpace(val.(string))
},
},
"escalation_message": &schema.Schema{
"escalation_message": {
Type: schema.TypeString,
Optional: true,
StateFunc: func(val interface{}) string {
return strings.TrimSpace(val.(string))
},
},
"query": &schema.Schema{
"query": {
Type: schema.TypeString,
Required: true,
StateFunc: func(val interface{}) string {
return strings.TrimSpace(val.(string))
},
},
"type": &schema.Schema{
"type": {
Type: schema.TypeString,
Required: true,
},
// Options
"thresholds": &schema.Schema{
"thresholds": {
Type: schema.TypeMap,
Optional: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"ok": &schema.Schema{
"ok": {
Type: schema.TypeFloat,
Optional: true,
},
"warning": &schema.Schema{
"warning": {
Type: schema.TypeFloat,
Optional: true,
},
"critical": &schema.Schema{
"critical": {
Type: schema.TypeFloat,
Optional: true,
},
@ -75,37 +75,37 @@ func resourceDatadogMonitor() *schema.Resource {
},
DiffSuppressFunc: suppressDataDogFloatIntDiff,
},
"notify_no_data": &schema.Schema{
"notify_no_data": {
Type: schema.TypeBool,
Optional: true,
Default: true,
Default: false,
},
"no_data_timeframe": &schema.Schema{
"no_data_timeframe": {
Type: schema.TypeInt,
Optional: true,
},
"renotify_interval": &schema.Schema{
"renotify_interval": {
Type: schema.TypeInt,
Optional: true,
},
"notify_audit": &schema.Schema{
"notify_audit": {
Type: schema.TypeBool,
Optional: true,
},
"timeout_h": &schema.Schema{
"timeout_h": {
Type: schema.TypeInt,
Optional: true,
},
"require_full_window": &schema.Schema{
"require_full_window": {
Type: schema.TypeBool,
Optional: true,
},
"locked": &schema.Schema{
"locked": {
Type: schema.TypeBool,
Optional: true,
},
// TODO should actually be map[string]int
"silenced": &schema.Schema{
"silenced": {
Type: schema.TypeMap,
Optional: true,
Elem: &schema.Schema{
@ -114,11 +114,11 @@ func resourceDatadogMonitor() *schema.Resource {
Type: schema.TypeInt},
},
},
"include_tags": &schema.Schema{
"include_tags": {
Type: schema.TypeBool,
Optional: true,
},
"tags": &schema.Schema{
"tags": {
Type: schema.TypeList,
Optional: true,
Elem: &schema.Schema{Type: schema.TypeString},
@ -142,7 +142,8 @@ func buildMonitorStruct(d *schema.ResourceData) *datadog.Monitor {
}
o := datadog.Options{
Thresholds: thresholds,
Thresholds: thresholds,
NotifyNoData: d.Get("notify_no_data").(bool),
}
if attr, ok := d.GetOk("silenced"); ok {
s := make(map[string]int)
@ -152,9 +153,6 @@ func buildMonitorStruct(d *schema.ResourceData) *datadog.Monitor {
}
o.Silenced = s
}
if attr, ok := d.GetOk("notify_no_data"); ok {
o.NotifyNoData = attr.(bool)
}
if attr, ok := d.GetOk("no_data_timeframe"); ok {
o.NoDataTimeframe = datadog.NoDataTimeframe(attr.(int))
}
@ -314,7 +312,9 @@ func resourceDatadogMonitorUpdate(d *schema.ResourceData, meta interface{}) erro
m.Tags = s
}
o := datadog.Options{}
o := datadog.Options{
NotifyNoData: d.Get("notify_no_data").(bool),
}
if attr, ok := d.GetOk("thresholds"); ok {
thresholds := attr.(map[string]interface{})
if thresholds["ok"] != nil {
@ -328,9 +328,6 @@ func resourceDatadogMonitorUpdate(d *schema.ResourceData, meta interface{}) erro
}
}
if attr, ok := d.GetOk("notify_no_data"); ok {
o.NotifyNoData = attr.(bool)
}
if attr, ok := d.GetOk("no_data_timeframe"); ok {
o.NoDataTimeframe = datadog.NoDataTimeframe(attr.(int))
}

15
builtin/providers/datadog/resource_datadog_monitor_test.go
View File

@ -17,7 +17,7 @@ func TestAccDatadogMonitor_Basic(t *testing.T) {
Providers: testAccProviders,
CheckDestroy: testAccCheckDatadogMonitorDestroy,
Steps: []resource.TestStep{
resource.TestStep{
{
Config: testAccCheckDatadogMonitorConfig,
Check: resource.ComposeTestCheckFunc(
testAccCheckDatadogMonitorExists("datadog_monitor.foo"),
@ -57,7 +57,7 @@ func TestAccDatadogMonitor_BasicNoTreshold(t *testing.T) {
Providers: testAccProviders,
CheckDestroy: testAccCheckDatadogMonitorDestroy,
Steps: []resource.TestStep{
resource.TestStep{
{
Config: testAccCheckDatadogMonitorConfigNoThresholds,
Check: resource.ComposeTestCheckFunc(
testAccCheckDatadogMonitorExists("datadog_monitor.foo"),
@ -93,7 +93,7 @@ func TestAccDatadogMonitor_Updated(t *testing.T) {
Providers: testAccProviders,
CheckDestroy: testAccCheckDatadogMonitorDestroy,
Steps: []resource.TestStep{
resource.TestStep{
{
Config: testAccCheckDatadogMonitorConfig,
Check: resource.ComposeTestCheckFunc(
testAccCheckDatadogMonitorExists("datadog_monitor.foo"),
@ -131,7 +131,7 @@ func TestAccDatadogMonitor_Updated(t *testing.T) {
"datadog_monitor.foo", "tags.1", "baz"),
),
},
resource.TestStep{
{
Config: testAccCheckDatadogMonitorConfigUpdated,
Check: resource.ComposeTestCheckFunc(
testAccCheckDatadogMonitorExists("datadog_monitor.foo"),
@ -185,7 +185,7 @@ func TestAccDatadogMonitor_TrimWhitespace(t *testing.T) {
Providers: testAccProviders,
CheckDestroy: testAccCheckDatadogMonitorDestroy,
Steps: []resource.TestStep{
resource.TestStep{
{
Config: testAccCheckDatadogMonitorConfigWhitespace,
Check: resource.ComposeTestCheckFunc(
testAccCheckDatadogMonitorExists("datadog_monitor.foo"),
@ -219,7 +219,7 @@ func TestAccDatadogMonitor_Basic_float_int(t *testing.T) {
Providers: testAccProviders,
CheckDestroy: testAccCheckDatadogMonitorDestroy,
Steps: []resource.TestStep{
resource.TestStep{
{
Config: testAccCheckDatadogMonitorConfig_ints,
Check: resource.ComposeTestCheckFunc(
testAccCheckDatadogMonitorExists("datadog_monitor.foo"),
@ -230,7 +230,7 @@ func TestAccDatadogMonitor_Basic_float_int(t *testing.T) {
),
},
resource.TestStep{
{
Config: testAccCheckDatadogMonitorConfig_ints_mixed,
Check: resource.ComposeTestCheckFunc(
testAccCheckDatadogMonitorExists("datadog_monitor.foo"),
@ -277,7 +277,6 @@ resource "datadog_monitor" "foo" {
critical = "2.0"
}
notify_no_data = false
renotify_interval = 60
notify_audit = false