From 68c64580d6f4560f239ba89d1681cf07ea87fc3c Mon Sep 17 00:00:00 2001 From: Gregory Date: Tue, 23 Jun 2020 15:44:14 +0200 Subject: [PATCH] Add event, legend_size and show_legend fields to heatmap widget --- .../TestAccDatadogDashboardHeatMap.yaml | 164 +++++++------- ...TestAccDatadogDashboardHeatMap_import.yaml | 204 +++++++++--------- datadog/resource_datadog_dashboard.go | 38 +++- ...resource_datadog_dashboard_heatmap_test.go | 16 +- website/docs/r/dashboard.html.markdown | 5 + 5 files changed, 235 insertions(+), 192 deletions(-) diff --git a/datadog/cassettes/TestAccDatadogDashboardHeatMap.yaml b/datadog/cassettes/TestAccDatadogDashboardHeatMap.yaml index bd9ef181d..527d32f99 100644 --- a/datadog/cassettes/TestAccDatadogDashboardHeatMap.yaml +++ b/datadog/cassettes/TestAccDatadogDashboardHeatMap.yaml @@ -3,7 +3,7 @@ version: 1 interactions: - request: body: | - {"description":"Created using the Datadog provider in Terraform","id":"","is_read_only":true,"layout_type":"ordered","notify_list":[],"template_variable_presets":[],"template_variables":[],"title":"Acceptance Test Heatmap Widget Dashboard","widgets":[{"definition":{"requests":[{"q":"avg:system.cpu.user{account:prod} by {app}","style":{"palette":"blue"}}],"time":{"live_span":"1mo"},"title":"Avg of system.cpu.user over account:prod by app","title_align":"center","title_size":"16","type":"heatmap","yaxis":{"include_zero":false,"max":"100"}}}]} + {"description":"Created using the Datadog provider in Terraform","id":"","is_read_only":true,"layout_type":"ordered","notify_list":[],"template_variable_presets":[],"template_variables":[],"title":"Acceptance Test Heatmap Widget Dashboard","widgets":[{"definition":{"events":[{"q":"env:prod","tags_execution":"and"}],"legend_size":"2","requests":[{"q":"avg:system.cpu.user{account:prod} by {app}","style":{"palette":"blue"}}],"show_legend":true,"time":{"live_span":"1mo"},"title":"Avg of system.cpu.user over account:prod by app","title_align":"center","title_size":"16","type":"heatmap","yaxis":{"include_zero":false,"max":"100"}}}]} form: {} headers: Accept: @@ -13,15 +13,15 @@ interactions: Dd-Operation-Id: - CreateDashboard User-Agent: - - datadog-api-client-go/1.0.0-beta.4 (go go1.13; os darwin; arch amd64) + - datadog-api-client-go/1.0.0-beta.6 (go go1.13; os darwin; arch amd64) url: https://api.datadoghq.com/api/v1/dashboard method: POST response: body: '{"notify_list":[],"description":"Created using the Datadog provider in - Terraform","author_name":"Nicholas Muesch","template_variable_presets":[],"template_variables":[],"is_read_only":true,"id":"p7d-faj-gwv","title":"Acceptance - Test Heatmap Widget Dashboard","url":"/dashboard/p7d-faj-gwv/acceptance-test-heatmap-widget-dashboard","created_at":"2020-06-17T16:51:35.585437+00:00","modified_at":"2020-06-17T16:51:35.585437+00:00","author_handle":"nicholas.muesch@datadoghq.com","widgets":[{"definition":{"title_size":"16","title":"Avg - of system.cpu.user over account:prod by app","title_align":"center","yaxis":{"include_zero":false,"max":"100"},"time":{"live_span":"1mo"},"requests":[{"q":"avg:system.cpu.user{account:prod} - by {app}","style":{"palette":"blue"}}],"type":"heatmap"},"id":1386073392813399}],"layout_type":"ordered"}' + Terraform","author_name":"Nicholas Muesch","template_variable_presets":[],"template_variables":[],"is_read_only":true,"id":"whr-wtr-cb9","title":"Acceptance + Test Heatmap Widget Dashboard","url":"/dashboard/whr-wtr-cb9/acceptance-test-heatmap-widget-dashboard","created_at":"2020-06-23T13:42:25.549684+00:00","modified_at":"2020-06-23T13:42:25.549684+00:00","author_handle":"nicholas.muesch@datadoghq.com","widgets":[{"definition":{"title_size":"16","yaxis":{"include_zero":false,"max":"100"},"title_align":"center","events":[{"q":"env:prod","tags_execution":"and"}],"show_legend":true,"time":{"live_span":"1mo"},"title":"Avg + of system.cpu.user over account:prod by app","legend_size":"2","type":"heatmap","requests":[{"q":"avg:system.cpu.user{account:prod} + by {app}","style":{"palette":"blue"}}]},"id":5794412483082441}],"layout_type":"ordered"}' headers: Cache-Control: - no-cache @@ -32,13 +32,13 @@ interactions: Content-Type: - application/json Date: - - Wed, 17 Jun 2020 16:51:35 GMT + - Tue, 23 Jun 2020 13:42:25 GMT Dd-Pool: - dogweb Pragma: - no-cache Set-Cookie: - - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Wed, 24-Jun-2020 16:51:35 GMT; + - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Tue, 30-Jun-2020 13:42:25 GMT; secure; HttpOnly Strict-Transport-Security: - max-age=15724800; @@ -47,9 +47,9 @@ interactions: X-Content-Type-Options: - nosniff X-Dd-Debug: - - i90G6k4M6qI4UypyvMoczcO5m+jatiEQSMeHpdjycp0h4nWxRpKUHr6efynkbQs+ + - IWbeot5NPPjwzkLRJwJSrhKxooUYWPiItYmeOu7MvfpEU9kI8879nM2EukYnEnom X-Dd-Version: - - "35.2632563" + - "35.2655011" X-Frame-Options: - SAMEORIGIN status: 200 OK @@ -64,15 +64,15 @@ interactions: Dd-Operation-Id: - GetDashboard User-Agent: - - datadog-api-client-go/1.0.0-beta.4 (go go1.13; os darwin; arch amd64) - url: https://api.datadoghq.com/api/v1/dashboard/p7d-faj-gwv + - datadog-api-client-go/1.0.0-beta.6 (go go1.13; os darwin; arch amd64) + url: https://api.datadoghq.com/api/v1/dashboard/whr-wtr-cb9 method: GET response: body: '{"notify_list":[],"description":"Created using the Datadog provider in - Terraform","author_name":"Nicholas Muesch","template_variable_presets":[],"template_variables":[],"is_read_only":true,"id":"p7d-faj-gwv","title":"Acceptance - Test Heatmap Widget Dashboard","url":"/dashboard/p7d-faj-gwv/acceptance-test-heatmap-widget-dashboard","created_at":"2020-06-17T16:51:35.585437+00:00","modified_at":"2020-06-17T16:51:35.585437+00:00","author_handle":"nicholas.muesch@datadoghq.com","widgets":[{"definition":{"title_size":"16","title":"Avg - of system.cpu.user over account:prod by app","title_align":"center","yaxis":{"include_zero":false,"max":"100"},"time":{"live_span":"1mo"},"requests":[{"q":"avg:system.cpu.user{account:prod} - by {app}","style":{"palette":"blue"}}],"type":"heatmap"},"id":1386073392813399}],"layout_type":"ordered"}' + Terraform","author_name":"Nicholas Muesch","template_variable_presets":[],"template_variables":[],"is_read_only":true,"id":"whr-wtr-cb9","title":"Acceptance + Test Heatmap Widget Dashboard","url":"/dashboard/whr-wtr-cb9/acceptance-test-heatmap-widget-dashboard","created_at":"2020-06-23T13:42:25.549684+00:00","modified_at":"2020-06-23T13:42:25.549684+00:00","author_handle":"nicholas.muesch@datadoghq.com","widgets":[{"definition":{"title_size":"16","yaxis":{"include_zero":false,"max":"100"},"title_align":"center","events":[{"q":"env:prod","tags_execution":"and"}],"show_legend":true,"time":{"live_span":"1mo"},"title":"Avg + of system.cpu.user over account:prod by app","legend_size":"2","type":"heatmap","requests":[{"q":"avg:system.cpu.user{account:prod} + by {app}","style":{"palette":"blue"}}]},"id":5794412483082441}],"layout_type":"ordered"}' headers: Cache-Control: - no-cache @@ -83,13 +83,13 @@ interactions: Content-Type: - application/json Date: - - Wed, 17 Jun 2020 16:51:35 GMT + - Tue, 23 Jun 2020 13:42:25 GMT Dd-Pool: - dogweb Pragma: - no-cache Set-Cookie: - - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Wed, 24-Jun-2020 16:51:35 GMT; + - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Tue, 30-Jun-2020 13:42:25 GMT; secure; HttpOnly Strict-Transport-Security: - max-age=15724800; @@ -98,9 +98,9 @@ interactions: X-Content-Type-Options: - nosniff X-Dd-Debug: - - 2VXDwI2pcuhRZeQ6xt/fJh1koMYSfGcgQg5wAzgLqeh10Zf5/W946U7T5w6SEIhy + - jety+2H6BA1H4x31+wzy5BjqI2NDwh54fgbjSYyrLU0p2tWQPCCTKspX7sHO7u1n X-Dd-Version: - - "35.2632563" + - "35.2654998" X-Frame-Options: - SAMEORIGIN status: 200 OK @@ -115,15 +115,15 @@ interactions: Dd-Operation-Id: - GetDashboard User-Agent: - - datadog-api-client-go/1.0.0-beta.4 (go go1.13; os darwin; arch amd64) - url: https://api.datadoghq.com/api/v1/dashboard/p7d-faj-gwv + - datadog-api-client-go/1.0.0-beta.6 (go go1.13; os darwin; arch amd64) + url: https://api.datadoghq.com/api/v1/dashboard/whr-wtr-cb9 method: GET response: body: '{"notify_list":[],"description":"Created using the Datadog provider in - Terraform","author_name":"Nicholas Muesch","template_variable_presets":[],"template_variables":[],"is_read_only":true,"id":"p7d-faj-gwv","title":"Acceptance - Test Heatmap Widget Dashboard","url":"/dashboard/p7d-faj-gwv/acceptance-test-heatmap-widget-dashboard","created_at":"2020-06-17T16:51:35.585437+00:00","modified_at":"2020-06-17T16:51:35.585437+00:00","author_handle":"nicholas.muesch@datadoghq.com","widgets":[{"definition":{"title_size":"16","title":"Avg - of system.cpu.user over account:prod by app","title_align":"center","yaxis":{"include_zero":false,"max":"100"},"time":{"live_span":"1mo"},"requests":[{"q":"avg:system.cpu.user{account:prod} - by {app}","style":{"palette":"blue"}}],"type":"heatmap"},"id":1386073392813399}],"layout_type":"ordered"}' + Terraform","author_name":"Nicholas Muesch","template_variable_presets":[],"template_variables":[],"is_read_only":true,"id":"whr-wtr-cb9","title":"Acceptance + Test Heatmap Widget Dashboard","url":"/dashboard/whr-wtr-cb9/acceptance-test-heatmap-widget-dashboard","created_at":"2020-06-23T13:42:25.549684+00:00","modified_at":"2020-06-23T13:42:25.549684+00:00","author_handle":"nicholas.muesch@datadoghq.com","widgets":[{"definition":{"title_size":"16","yaxis":{"include_zero":false,"max":"100"},"title_align":"center","events":[{"q":"env:prod","tags_execution":"and"}],"show_legend":true,"time":{"live_span":"1mo"},"title":"Avg + of system.cpu.user over account:prod by app","legend_size":"2","type":"heatmap","requests":[{"q":"avg:system.cpu.user{account:prod} + by {app}","style":{"palette":"blue"}}]},"id":5794412483082441}],"layout_type":"ordered"}' headers: Cache-Control: - no-cache @@ -134,13 +134,13 @@ interactions: Content-Type: - application/json Date: - - Wed, 17 Jun 2020 16:51:36 GMT + - Tue, 23 Jun 2020 13:42:26 GMT Dd-Pool: - dogweb Pragma: - no-cache Set-Cookie: - - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Wed, 24-Jun-2020 16:51:36 GMT; + - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Tue, 30-Jun-2020 13:42:26 GMT; secure; HttpOnly Strict-Transport-Security: - max-age=15724800; @@ -149,9 +149,9 @@ interactions: X-Content-Type-Options: - nosniff X-Dd-Debug: - - DNJM9d0LaQZJbuEjasKEmgCwDoiLnJW9mPQJm+yWIlQRbFhX4Vzx4uuDCt38dWhb + - ldNaA6dSEPDapjFoBolZNm9KKT/3iEJM/Q1IyMe2D0P7l2S/rGI4bTGzxgP0/9Zs X-Dd-Version: - - "35.2632563" + - "35.2655011" X-Frame-Options: - SAMEORIGIN status: 200 OK @@ -166,15 +166,15 @@ interactions: Dd-Operation-Id: - GetDashboard User-Agent: - - datadog-api-client-go/1.0.0-beta.4 (go go1.13; os darwin; arch amd64) - url: https://api.datadoghq.com/api/v1/dashboard/p7d-faj-gwv + - datadog-api-client-go/1.0.0-beta.6 (go go1.13; os darwin; arch amd64) + url: https://api.datadoghq.com/api/v1/dashboard/whr-wtr-cb9 method: GET response: body: '{"notify_list":[],"description":"Created using the Datadog provider in - Terraform","author_name":"Nicholas Muesch","template_variable_presets":[],"template_variables":[],"is_read_only":true,"id":"p7d-faj-gwv","title":"Acceptance - Test Heatmap Widget Dashboard","url":"/dashboard/p7d-faj-gwv/acceptance-test-heatmap-widget-dashboard","created_at":"2020-06-17T16:51:35.585437+00:00","modified_at":"2020-06-17T16:51:35.585437+00:00","author_handle":"nicholas.muesch@datadoghq.com","widgets":[{"definition":{"title_size":"16","title":"Avg - of system.cpu.user over account:prod by app","title_align":"center","yaxis":{"include_zero":false,"max":"100"},"time":{"live_span":"1mo"},"requests":[{"q":"avg:system.cpu.user{account:prod} - by {app}","style":{"palette":"blue"}}],"type":"heatmap"},"id":1386073392813399}],"layout_type":"ordered"}' + Terraform","author_name":"Nicholas Muesch","template_variable_presets":[],"template_variables":[],"is_read_only":true,"id":"whr-wtr-cb9","title":"Acceptance + Test Heatmap Widget Dashboard","url":"/dashboard/whr-wtr-cb9/acceptance-test-heatmap-widget-dashboard","created_at":"2020-06-23T13:42:25.549684+00:00","modified_at":"2020-06-23T13:42:25.549684+00:00","author_handle":"nicholas.muesch@datadoghq.com","widgets":[{"definition":{"title_size":"16","yaxis":{"include_zero":false,"max":"100"},"title_align":"center","events":[{"q":"env:prod","tags_execution":"and"}],"show_legend":true,"time":{"live_span":"1mo"},"title":"Avg + of system.cpu.user over account:prod by app","legend_size":"2","type":"heatmap","requests":[{"q":"avg:system.cpu.user{account:prod} + by {app}","style":{"palette":"blue"}}]},"id":5794412483082441}],"layout_type":"ordered"}' headers: Cache-Control: - no-cache @@ -185,13 +185,13 @@ interactions: Content-Type: - application/json Date: - - Wed, 17 Jun 2020 16:51:37 GMT + - Tue, 23 Jun 2020 13:42:29 GMT Dd-Pool: - dogweb Pragma: - no-cache Set-Cookie: - - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Wed, 24-Jun-2020 16:51:37 GMT; + - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Tue, 30-Jun-2020 13:42:29 GMT; secure; HttpOnly Strict-Transport-Security: - max-age=15724800; @@ -200,9 +200,9 @@ interactions: X-Content-Type-Options: - nosniff X-Dd-Debug: - - cYNsy3QDuOaYo2clO/PharSNtCykS9KtUfiNevH3xDbHJlRyddWkNpuDhMgHWZ43 + - DNJM9d0LaQZJbuEjasKEmgCwDoiLnJW9mPQJm+yWIlQRbFhX4Vzx4uuDCt38dWhb X-Dd-Version: - - "35.2632563" + - "35.2654998" X-Frame-Options: - SAMEORIGIN status: 200 OK @@ -217,15 +217,15 @@ interactions: Dd-Operation-Id: - GetDashboard User-Agent: - - datadog-api-client-go/1.0.0-beta.4 (go go1.13; os darwin; arch amd64) - url: https://api.datadoghq.com/api/v1/dashboard/p7d-faj-gwv + - datadog-api-client-go/1.0.0-beta.6 (go go1.13; os darwin; arch amd64) + url: https://api.datadoghq.com/api/v1/dashboard/whr-wtr-cb9 method: GET response: body: '{"notify_list":[],"description":"Created using the Datadog provider in - Terraform","author_name":"Nicholas Muesch","template_variable_presets":[],"template_variables":[],"is_read_only":true,"id":"p7d-faj-gwv","title":"Acceptance - Test Heatmap Widget Dashboard","url":"/dashboard/p7d-faj-gwv/acceptance-test-heatmap-widget-dashboard","created_at":"2020-06-17T16:51:35.585437+00:00","modified_at":"2020-06-17T16:51:35.585437+00:00","author_handle":"nicholas.muesch@datadoghq.com","widgets":[{"definition":{"title_size":"16","title":"Avg - of system.cpu.user over account:prod by app","title_align":"center","yaxis":{"include_zero":false,"max":"100"},"time":{"live_span":"1mo"},"requests":[{"q":"avg:system.cpu.user{account:prod} - by {app}","style":{"palette":"blue"}}],"type":"heatmap"},"id":1386073392813399}],"layout_type":"ordered"}' + Terraform","author_name":"Nicholas Muesch","template_variable_presets":[],"template_variables":[],"is_read_only":true,"id":"whr-wtr-cb9","title":"Acceptance + Test Heatmap Widget Dashboard","url":"/dashboard/whr-wtr-cb9/acceptance-test-heatmap-widget-dashboard","created_at":"2020-06-23T13:42:25.549684+00:00","modified_at":"2020-06-23T13:42:25.549684+00:00","author_handle":"nicholas.muesch@datadoghq.com","widgets":[{"definition":{"title_size":"16","yaxis":{"include_zero":false,"max":"100"},"title_align":"center","events":[{"q":"env:prod","tags_execution":"and"}],"show_legend":true,"time":{"live_span":"1mo"},"title":"Avg + of system.cpu.user over account:prod by app","legend_size":"2","type":"heatmap","requests":[{"q":"avg:system.cpu.user{account:prod} + by {app}","style":{"palette":"blue"}}]},"id":5794412483082441}],"layout_type":"ordered"}' headers: Cache-Control: - no-cache @@ -236,13 +236,13 @@ interactions: Content-Type: - application/json Date: - - Wed, 17 Jun 2020 16:51:37 GMT + - Tue, 23 Jun 2020 13:42:29 GMT Dd-Pool: - dogweb Pragma: - no-cache Set-Cookie: - - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Wed, 24-Jun-2020 16:51:37 GMT; + - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Tue, 30-Jun-2020 13:42:29 GMT; secure; HttpOnly Strict-Transport-Security: - max-age=15724800; @@ -251,9 +251,9 @@ interactions: X-Content-Type-Options: - nosniff X-Dd-Debug: - - Jhz2Lh32XBCZ7PVSj7/lof8hXjgbtiexG4VIRWAEYHPFefqyYpXnVaeT62yBncrB + - kqXz3OvR7iajEJOdRFWpzJtcDHRumYwGfjdF12Vd65Xt1uV9T6lEO/K0lkxmcRvl X-Dd-Version: - - "35.2632563" + - "35.2655011" X-Frame-Options: - SAMEORIGIN status: 200 OK @@ -268,15 +268,15 @@ interactions: Dd-Operation-Id: - GetDashboard User-Agent: - - datadog-api-client-go/1.0.0-beta.4 (go go1.13; os darwin; arch amd64) - url: https://api.datadoghq.com/api/v1/dashboard/p7d-faj-gwv + - datadog-api-client-go/1.0.0-beta.6 (go go1.13; os darwin; arch amd64) + url: https://api.datadoghq.com/api/v1/dashboard/whr-wtr-cb9 method: GET response: body: '{"notify_list":[],"description":"Created using the Datadog provider in - Terraform","author_name":"Nicholas Muesch","template_variable_presets":[],"template_variables":[],"is_read_only":true,"id":"p7d-faj-gwv","title":"Acceptance - Test Heatmap Widget Dashboard","url":"/dashboard/p7d-faj-gwv/acceptance-test-heatmap-widget-dashboard","created_at":"2020-06-17T16:51:35.585437+00:00","modified_at":"2020-06-17T16:51:35.585437+00:00","author_handle":"nicholas.muesch@datadoghq.com","widgets":[{"definition":{"title_size":"16","title":"Avg - of system.cpu.user over account:prod by app","title_align":"center","yaxis":{"include_zero":false,"max":"100"},"time":{"live_span":"1mo"},"requests":[{"q":"avg:system.cpu.user{account:prod} - by {app}","style":{"palette":"blue"}}],"type":"heatmap"},"id":1386073392813399}],"layout_type":"ordered"}' + Terraform","author_name":"Nicholas Muesch","template_variable_presets":[],"template_variables":[],"is_read_only":true,"id":"whr-wtr-cb9","title":"Acceptance + Test Heatmap Widget Dashboard","url":"/dashboard/whr-wtr-cb9/acceptance-test-heatmap-widget-dashboard","created_at":"2020-06-23T13:42:25.549684+00:00","modified_at":"2020-06-23T13:42:25.549684+00:00","author_handle":"nicholas.muesch@datadoghq.com","widgets":[{"definition":{"title_size":"16","yaxis":{"include_zero":false,"max":"100"},"title_align":"center","events":[{"q":"env:prod","tags_execution":"and"}],"show_legend":true,"time":{"live_span":"1mo"},"title":"Avg + of system.cpu.user over account:prod by app","legend_size":"2","type":"heatmap","requests":[{"q":"avg:system.cpu.user{account:prod} + by {app}","style":{"palette":"blue"}}]},"id":5794412483082441}],"layout_type":"ordered"}' headers: Cache-Control: - no-cache @@ -287,13 +287,13 @@ interactions: Content-Type: - application/json Date: - - Wed, 17 Jun 2020 16:51:39 GMT + - Tue, 23 Jun 2020 13:42:32 GMT Dd-Pool: - dogweb Pragma: - no-cache Set-Cookie: - - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Wed, 24-Jun-2020 16:51:39 GMT; + - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Tue, 30-Jun-2020 13:42:32 GMT; secure; HttpOnly Strict-Transport-Security: - max-age=15724800; @@ -302,9 +302,9 @@ interactions: X-Content-Type-Options: - nosniff X-Dd-Debug: - - oQ/oy4ezTZ+/WzL4afBMlDjLd5w62e5H15hF5BJChw1Gte+Sq8B8tB7i6vlTiLL0 + - fFk0sZgwwse+ZeEmqVGZPgcNG+SDXdM7Y74n6iOGuvoZenvaYEqZOvpOSMu1XDXx X-Dd-Version: - - "35.2632563" + - "35.2655011" X-Frame-Options: - SAMEORIGIN status: 200 OK @@ -319,15 +319,15 @@ interactions: Dd-Operation-Id: - GetDashboard User-Agent: - - datadog-api-client-go/1.0.0-beta.4 (go go1.13; os darwin; arch amd64) - url: https://api.datadoghq.com/api/v1/dashboard/p7d-faj-gwv + - datadog-api-client-go/1.0.0-beta.6 (go go1.13; os darwin; arch amd64) + url: https://api.datadoghq.com/api/v1/dashboard/whr-wtr-cb9 method: GET response: body: '{"notify_list":[],"description":"Created using the Datadog provider in - Terraform","author_name":"Nicholas Muesch","template_variable_presets":[],"template_variables":[],"is_read_only":true,"id":"p7d-faj-gwv","title":"Acceptance - Test Heatmap Widget Dashboard","url":"/dashboard/p7d-faj-gwv/acceptance-test-heatmap-widget-dashboard","created_at":"2020-06-17T16:51:35.585437+00:00","modified_at":"2020-06-17T16:51:35.585437+00:00","author_handle":"nicholas.muesch@datadoghq.com","widgets":[{"definition":{"title_size":"16","title":"Avg - of system.cpu.user over account:prod by app","title_align":"center","yaxis":{"include_zero":false,"max":"100"},"time":{"live_span":"1mo"},"requests":[{"q":"avg:system.cpu.user{account:prod} - by {app}","style":{"palette":"blue"}}],"type":"heatmap"},"id":1386073392813399}],"layout_type":"ordered"}' + Terraform","author_name":"Nicholas Muesch","template_variable_presets":[],"template_variables":[],"is_read_only":true,"id":"whr-wtr-cb9","title":"Acceptance + Test Heatmap Widget Dashboard","url":"/dashboard/whr-wtr-cb9/acceptance-test-heatmap-widget-dashboard","created_at":"2020-06-23T13:42:25.549684+00:00","modified_at":"2020-06-23T13:42:25.549684+00:00","author_handle":"nicholas.muesch@datadoghq.com","widgets":[{"definition":{"title_size":"16","yaxis":{"include_zero":false,"max":"100"},"title_align":"center","events":[{"q":"env:prod","tags_execution":"and"}],"show_legend":true,"time":{"live_span":"1mo"},"title":"Avg + of system.cpu.user over account:prod by app","legend_size":"2","type":"heatmap","requests":[{"q":"avg:system.cpu.user{account:prod} + by {app}","style":{"palette":"blue"}}]},"id":5794412483082441}],"layout_type":"ordered"}' headers: Cache-Control: - no-cache @@ -338,13 +338,13 @@ interactions: Content-Type: - application/json Date: - - Wed, 17 Jun 2020 16:51:39 GMT + - Tue, 23 Jun 2020 13:42:32 GMT Dd-Pool: - dogweb Pragma: - no-cache Set-Cookie: - - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Wed, 24-Jun-2020 16:51:39 GMT; + - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Tue, 30-Jun-2020 13:42:32 GMT; secure; HttpOnly Strict-Transport-Security: - max-age=15724800; @@ -353,9 +353,9 @@ interactions: X-Content-Type-Options: - nosniff X-Dd-Debug: - - DNJM9d0LaQZJbuEjasKEmgCwDoiLnJW9mPQJm+yWIlQRbFhX4Vzx4uuDCt38dWhb + - e8t0cvW5uVKXk1zUsTcAcDpqv28dgy+lCs/R2sCfbKW6stomFiq2a4ijzxRdPBn5 X-Dd-Version: - - "35.2632563" + - "35.2655011" X-Frame-Options: - SAMEORIGIN status: 200 OK @@ -370,11 +370,11 @@ interactions: Dd-Operation-Id: - DeleteDashboard User-Agent: - - datadog-api-client-go/1.0.0-beta.4 (go go1.13; os darwin; arch amd64) - url: https://api.datadoghq.com/api/v1/dashboard/p7d-faj-gwv + - datadog-api-client-go/1.0.0-beta.6 (go go1.13; os darwin; arch amd64) + url: https://api.datadoghq.com/api/v1/dashboard/whr-wtr-cb9 method: DELETE response: - body: '{"deleted_dashboard_id":"p7d-faj-gwv"}' + body: '{"deleted_dashboard_id":"whr-wtr-cb9"}' headers: Cache-Control: - no-cache @@ -385,13 +385,13 @@ interactions: Content-Type: - application/json Date: - - Wed, 17 Jun 2020 16:51:50 GMT + - Tue, 23 Jun 2020 13:42:49 GMT Dd-Pool: - dogweb Pragma: - no-cache Set-Cookie: - - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Wed, 24-Jun-2020 16:51:40 GMT; + - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Tue, 30-Jun-2020 13:42:34 GMT; secure; HttpOnly Strict-Transport-Security: - max-age=15724800; @@ -400,9 +400,9 @@ interactions: X-Content-Type-Options: - nosniff X-Dd-Debug: - - 69kiClanS8NcBSsdd51HHifvhQSGoRbJJjhU9l40yqxQHVNrndFN9zVtFJW1OcSf + - zgs4/R8U39Dx88K274ycCG8gmotK2r1yjyecTfeITqBuGEc/zW9V1MMOyMl9URns X-Dd-Version: - - "35.2632563" + - "35.2655011" X-Frame-Options: - SAMEORIGIN status: 200 OK @@ -417,11 +417,11 @@ interactions: Dd-Operation-Id: - GetDashboard User-Agent: - - datadog-api-client-go/1.0.0-beta.4 (go go1.13; os darwin; arch amd64) - url: https://api.datadoghq.com/api/v1/dashboard/p7d-faj-gwv + - datadog-api-client-go/1.0.0-beta.6 (go go1.13; os darwin; arch amd64) + url: https://api.datadoghq.com/api/v1/dashboard/whr-wtr-cb9 method: GET response: - body: '{"errors": ["Dashboard with ID p7d-faj-gwv not found"]}' + body: '{"errors": ["Dashboard with ID whr-wtr-cb9 not found"]}' headers: Cache-Control: - no-cache @@ -432,7 +432,7 @@ interactions: Content-Type: - application/json Date: - - Wed, 17 Jun 2020 16:51:51 GMT + - Tue, 23 Jun 2020 13:42:50 GMT Dd-Pool: - dogweb Pragma: @@ -444,7 +444,7 @@ interactions: X-Content-Type-Options: - nosniff X-Dd-Version: - - "35.2632563" + - "35.2655011" X-Frame-Options: - SAMEORIGIN status: 404 Not Found diff --git a/datadog/cassettes/TestAccDatadogDashboardHeatMap_import.yaml b/datadog/cassettes/TestAccDatadogDashboardHeatMap_import.yaml index 2864896f3..6379974b7 100644 --- a/datadog/cassettes/TestAccDatadogDashboardHeatMap_import.yaml +++ b/datadog/cassettes/TestAccDatadogDashboardHeatMap_import.yaml @@ -3,7 +3,7 @@ version: 1 interactions: - request: body: | - {"description":"Created using the Datadog provider in Terraform","id":"","is_read_only":true,"layout_type":"ordered","notify_list":[],"template_variable_presets":[],"template_variables":[],"title":"Acceptance Test Heatmap Widget Dashboard","widgets":[{"definition":{"requests":[{"q":"avg:system.cpu.user{account:prod} by {app}","style":{"palette":"blue"}}],"time":{"live_span":"1mo"},"title":"Avg of system.cpu.user over account:prod by app","title_align":"center","title_size":"16","type":"heatmap","yaxis":{"include_zero":false,"max":"100"}}}]} + {"description":"Created using the Datadog provider in Terraform","id":"","is_read_only":true,"layout_type":"ordered","notify_list":[],"template_variable_presets":[],"template_variables":[],"title":"Acceptance Test Heatmap Widget Dashboard","widgets":[{"definition":{"events":[{"q":"env:prod","tags_execution":"and"}],"legend_size":"2","requests":[{"q":"avg:system.cpu.user{account:prod} by {app}","style":{"palette":"blue"}}],"show_legend":true,"time":{"live_span":"1mo"},"title":"Avg of system.cpu.user over account:prod by app","title_align":"center","title_size":"16","type":"heatmap","yaxis":{"include_zero":false,"max":"100"}}}]} form: {} headers: Accept: @@ -13,15 +13,15 @@ interactions: Dd-Operation-Id: - CreateDashboard User-Agent: - - datadog-api-client-go/1.0.0-beta.4 (go go1.13; os darwin; arch amd64) + - datadog-api-client-go/1.0.0-beta.6 (go go1.13; os darwin; arch amd64) url: https://api.datadoghq.com/api/v1/dashboard method: POST response: body: '{"notify_list":[],"description":"Created using the Datadog provider in - Terraform","author_name":"Nicholas Muesch","template_variable_presets":[],"template_variables":[],"is_read_only":true,"id":"psy-4j3-2u6","title":"Acceptance - Test Heatmap Widget Dashboard","url":"/dashboard/psy-4j3-2u6/acceptance-test-heatmap-widget-dashboard","created_at":"2020-06-17T16:51:52.896612+00:00","modified_at":"2020-06-17T16:51:52.896612+00:00","author_handle":"nicholas.muesch@datadoghq.com","widgets":[{"definition":{"title_size":"16","title":"Avg - of system.cpu.user over account:prod by app","title_align":"center","yaxis":{"include_zero":false,"max":"100"},"time":{"live_span":"1mo"},"requests":[{"q":"avg:system.cpu.user{account:prod} - by {app}","style":{"palette":"blue"}}],"type":"heatmap"},"id":6059823499574180}],"layout_type":"ordered"}' + Terraform","author_name":"Nicholas Muesch","template_variable_presets":[],"template_variables":[],"is_read_only":true,"id":"c3j-44e-95g","title":"Acceptance + Test Heatmap Widget Dashboard","url":"/dashboard/c3j-44e-95g/acceptance-test-heatmap-widget-dashboard","created_at":"2020-06-23T13:42:53.842657+00:00","modified_at":"2020-06-23T13:42:53.842657+00:00","author_handle":"nicholas.muesch@datadoghq.com","widgets":[{"definition":{"title_size":"16","yaxis":{"include_zero":false,"max":"100"},"title_align":"center","events":[{"q":"env:prod","tags_execution":"and"}],"show_legend":true,"time":{"live_span":"1mo"},"title":"Avg + of system.cpu.user over account:prod by app","legend_size":"2","type":"heatmap","requests":[{"q":"avg:system.cpu.user{account:prod} + by {app}","style":{"palette":"blue"}}]},"id":8308413282651953}],"layout_type":"ordered"}' headers: Cache-Control: - no-cache @@ -32,13 +32,13 @@ interactions: Content-Type: - application/json Date: - - Wed, 17 Jun 2020 16:51:52 GMT + - Tue, 23 Jun 2020 13:42:53 GMT Dd-Pool: - dogweb Pragma: - no-cache Set-Cookie: - - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Wed, 24-Jun-2020 16:51:52 GMT; + - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Tue, 30-Jun-2020 13:42:53 GMT; secure; HttpOnly Strict-Transport-Security: - max-age=15724800; @@ -47,9 +47,9 @@ interactions: X-Content-Type-Options: - nosniff X-Dd-Debug: - - wNaVyRyNliLxKeX4pqFHOJTBG1dRCwo1/ihrnAf0GXtGNGahc1XK8Xzj/ssA3R20 + - F11u7JCZTPrHz8VfzL5YeXThxcQSR6CdLGgk2tF52+EbYWhXciN8nv9vA8oQ9C9A X-Dd-Version: - - "35.2632563" + - "35.2655011" X-Frame-Options: - SAMEORIGIN status: 200 OK @@ -64,15 +64,15 @@ interactions: Dd-Operation-Id: - GetDashboard User-Agent: - - datadog-api-client-go/1.0.0-beta.4 (go go1.13; os darwin; arch amd64) - url: https://api.datadoghq.com/api/v1/dashboard/psy-4j3-2u6 + - datadog-api-client-go/1.0.0-beta.6 (go go1.13; os darwin; arch amd64) + url: https://api.datadoghq.com/api/v1/dashboard/c3j-44e-95g method: GET response: body: '{"notify_list":[],"description":"Created using the Datadog provider in - Terraform","author_name":"Nicholas Muesch","template_variable_presets":[],"template_variables":[],"is_read_only":true,"id":"psy-4j3-2u6","title":"Acceptance - Test Heatmap Widget Dashboard","url":"/dashboard/psy-4j3-2u6/acceptance-test-heatmap-widget-dashboard","created_at":"2020-06-17T16:51:52.896612+00:00","modified_at":"2020-06-17T16:51:52.896612+00:00","author_handle":"nicholas.muesch@datadoghq.com","widgets":[{"definition":{"title_size":"16","title":"Avg - of system.cpu.user over account:prod by app","title_align":"center","yaxis":{"include_zero":false,"max":"100"},"time":{"live_span":"1mo"},"requests":[{"q":"avg:system.cpu.user{account:prod} - by {app}","style":{"palette":"blue"}}],"type":"heatmap"},"id":6059823499574180}],"layout_type":"ordered"}' + Terraform","author_name":"Nicholas Muesch","template_variable_presets":[],"template_variables":[],"is_read_only":true,"id":"c3j-44e-95g","title":"Acceptance + Test Heatmap Widget Dashboard","url":"/dashboard/c3j-44e-95g/acceptance-test-heatmap-widget-dashboard","created_at":"2020-06-23T13:42:53.842657+00:00","modified_at":"2020-06-23T13:42:53.842657+00:00","author_handle":"nicholas.muesch@datadoghq.com","widgets":[{"definition":{"title_size":"16","yaxis":{"include_zero":false,"max":"100"},"title_align":"center","events":[{"q":"env:prod","tags_execution":"and"}],"show_legend":true,"time":{"live_span":"1mo"},"title":"Avg + of system.cpu.user over account:prod by app","legend_size":"2","type":"heatmap","requests":[{"q":"avg:system.cpu.user{account:prod} + by {app}","style":{"palette":"blue"}}]},"id":8308413282651953}],"layout_type":"ordered"}' headers: Cache-Control: - no-cache @@ -83,13 +83,13 @@ interactions: Content-Type: - application/json Date: - - Wed, 17 Jun 2020 16:51:53 GMT + - Tue, 23 Jun 2020 13:42:54 GMT Dd-Pool: - dogweb Pragma: - no-cache Set-Cookie: - - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Wed, 24-Jun-2020 16:51:53 GMT; + - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Tue, 30-Jun-2020 13:42:54 GMT; secure; HttpOnly Strict-Transport-Security: - max-age=15724800; @@ -98,9 +98,9 @@ interactions: X-Content-Type-Options: - nosniff X-Dd-Debug: - - rxkz+JB0yzarEINDeNWQGs9dk7PLNAMnAw2wV8MNkZOhKDtz+JOpGuIyyBUaWwyF + - NclXS5F5t+kukUaODU4jY2oSI1KBdPHFdFhJZNfbXLWDOThxbCLlKKmYvikjdDSg X-Dd-Version: - - "35.2632563" + - "35.2655011" X-Frame-Options: - SAMEORIGIN status: 200 OK @@ -115,15 +115,15 @@ interactions: Dd-Operation-Id: - GetDashboard User-Agent: - - datadog-api-client-go/1.0.0-beta.4 (go go1.13; os darwin; arch amd64) - url: https://api.datadoghq.com/api/v1/dashboard/psy-4j3-2u6 + - datadog-api-client-go/1.0.0-beta.6 (go go1.13; os darwin; arch amd64) + url: https://api.datadoghq.com/api/v1/dashboard/c3j-44e-95g method: GET response: body: '{"notify_list":[],"description":"Created using the Datadog provider in - Terraform","author_name":"Nicholas Muesch","template_variable_presets":[],"template_variables":[],"is_read_only":true,"id":"psy-4j3-2u6","title":"Acceptance - Test Heatmap Widget Dashboard","url":"/dashboard/psy-4j3-2u6/acceptance-test-heatmap-widget-dashboard","created_at":"2020-06-17T16:51:52.896612+00:00","modified_at":"2020-06-17T16:51:52.896612+00:00","author_handle":"nicholas.muesch@datadoghq.com","widgets":[{"definition":{"title_size":"16","title":"Avg - of system.cpu.user over account:prod by app","title_align":"center","yaxis":{"include_zero":false,"max":"100"},"time":{"live_span":"1mo"},"requests":[{"q":"avg:system.cpu.user{account:prod} - by {app}","style":{"palette":"blue"}}],"type":"heatmap"},"id":6059823499574180}],"layout_type":"ordered"}' + Terraform","author_name":"Nicholas Muesch","template_variable_presets":[],"template_variables":[],"is_read_only":true,"id":"c3j-44e-95g","title":"Acceptance + Test Heatmap Widget Dashboard","url":"/dashboard/c3j-44e-95g/acceptance-test-heatmap-widget-dashboard","created_at":"2020-06-23T13:42:53.842657+00:00","modified_at":"2020-06-23T13:42:53.842657+00:00","author_handle":"nicholas.muesch@datadoghq.com","widgets":[{"definition":{"title_size":"16","yaxis":{"include_zero":false,"max":"100"},"title_align":"center","events":[{"q":"env:prod","tags_execution":"and"}],"show_legend":true,"time":{"live_span":"1mo"},"title":"Avg + of system.cpu.user over account:prod by app","legend_size":"2","type":"heatmap","requests":[{"q":"avg:system.cpu.user{account:prod} + by {app}","style":{"palette":"blue"}}]},"id":8308413282651953}],"layout_type":"ordered"}' headers: Cache-Control: - no-cache @@ -134,13 +134,13 @@ interactions: Content-Type: - application/json Date: - - Wed, 17 Jun 2020 16:51:54 GMT + - Tue, 23 Jun 2020 13:42:58 GMT Dd-Pool: - dogweb Pragma: - no-cache Set-Cookie: - - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Wed, 24-Jun-2020 16:51:54 GMT; + - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Tue, 30-Jun-2020 13:42:58 GMT; secure; HttpOnly Strict-Transport-Security: - max-age=15724800; @@ -149,9 +149,9 @@ interactions: X-Content-Type-Options: - nosniff X-Dd-Debug: - - EE74ncTR989SomsonUvABJWdGDkXBs7Emqj3HVDpp6NYddpvHp95kXsnHux1Es9E + - ztq+F8HwxRthTKNo0l2MCEDK5uwvgQzF00nWu49lHsBM51hGZBm/pPILDqupy+Xd X-Dd-Version: - - "35.2632563" + - "35.2655011" X-Frame-Options: - SAMEORIGIN status: 200 OK @@ -166,15 +166,15 @@ interactions: Dd-Operation-Id: - GetDashboard User-Agent: - - datadog-api-client-go/1.0.0-beta.4 (go go1.13; os darwin; arch amd64) - url: https://api.datadoghq.com/api/v1/dashboard/psy-4j3-2u6 + - datadog-api-client-go/1.0.0-beta.6 (go go1.13; os darwin; arch amd64) + url: https://api.datadoghq.com/api/v1/dashboard/c3j-44e-95g method: GET response: body: '{"notify_list":[],"description":"Created using the Datadog provider in - Terraform","author_name":"Nicholas Muesch","template_variable_presets":[],"template_variables":[],"is_read_only":true,"id":"psy-4j3-2u6","title":"Acceptance - Test Heatmap Widget Dashboard","url":"/dashboard/psy-4j3-2u6/acceptance-test-heatmap-widget-dashboard","created_at":"2020-06-17T16:51:52.896612+00:00","modified_at":"2020-06-17T16:51:52.896612+00:00","author_handle":"nicholas.muesch@datadoghq.com","widgets":[{"definition":{"title_size":"16","title":"Avg - of system.cpu.user over account:prod by app","title_align":"center","yaxis":{"include_zero":false,"max":"100"},"time":{"live_span":"1mo"},"requests":[{"q":"avg:system.cpu.user{account:prod} - by {app}","style":{"palette":"blue"}}],"type":"heatmap"},"id":6059823499574180}],"layout_type":"ordered"}' + Terraform","author_name":"Nicholas Muesch","template_variable_presets":[],"template_variables":[],"is_read_only":true,"id":"c3j-44e-95g","title":"Acceptance + Test Heatmap Widget Dashboard","url":"/dashboard/c3j-44e-95g/acceptance-test-heatmap-widget-dashboard","created_at":"2020-06-23T13:42:53.842657+00:00","modified_at":"2020-06-23T13:42:53.842657+00:00","author_handle":"nicholas.muesch@datadoghq.com","widgets":[{"definition":{"title_size":"16","yaxis":{"include_zero":false,"max":"100"},"title_align":"center","events":[{"q":"env:prod","tags_execution":"and"}],"show_legend":true,"time":{"live_span":"1mo"},"title":"Avg + of system.cpu.user over account:prod by app","legend_size":"2","type":"heatmap","requests":[{"q":"avg:system.cpu.user{account:prod} + by {app}","style":{"palette":"blue"}}]},"id":8308413282651953}],"layout_type":"ordered"}' headers: Cache-Control: - no-cache @@ -185,13 +185,13 @@ interactions: Content-Type: - application/json Date: - - Wed, 17 Jun 2020 16:51:54 GMT + - Tue, 23 Jun 2020 13:42:58 GMT Dd-Pool: - dogweb Pragma: - no-cache Set-Cookie: - - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Wed, 24-Jun-2020 16:51:54 GMT; + - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Tue, 30-Jun-2020 13:42:58 GMT; secure; HttpOnly Strict-Transport-Security: - max-age=15724800; @@ -200,9 +200,9 @@ interactions: X-Content-Type-Options: - nosniff X-Dd-Debug: - - 0pa1dtuadfHOUeVqLiK3mljtwHC7xKOrqXlG1EXfeExc1YyvZm51+jZLEiJ3YUs6 + - vQYgH+orCqhRbQG/mSd6IeQSqyYBCkFVCv4Bj6PXMALQcvTK5EvxQuH7fIz3d52m X-Dd-Version: - - "35.2632563" + - "35.2655011" X-Frame-Options: - SAMEORIGIN status: 200 OK @@ -217,15 +217,15 @@ interactions: Dd-Operation-Id: - GetDashboard User-Agent: - - datadog-api-client-go/1.0.0-beta.4 (go go1.13; os darwin; arch amd64) - url: https://api.datadoghq.com/api/v1/dashboard/psy-4j3-2u6 + - datadog-api-client-go/1.0.0-beta.6 (go go1.13; os darwin; arch amd64) + url: https://api.datadoghq.com/api/v1/dashboard/c3j-44e-95g method: GET response: body: '{"notify_list":[],"description":"Created using the Datadog provider in - Terraform","author_name":"Nicholas Muesch","template_variable_presets":[],"template_variables":[],"is_read_only":true,"id":"psy-4j3-2u6","title":"Acceptance - Test Heatmap Widget Dashboard","url":"/dashboard/psy-4j3-2u6/acceptance-test-heatmap-widget-dashboard","created_at":"2020-06-17T16:51:52.896612+00:00","modified_at":"2020-06-17T16:51:52.896612+00:00","author_handle":"nicholas.muesch@datadoghq.com","widgets":[{"definition":{"title_size":"16","title":"Avg - of system.cpu.user over account:prod by app","title_align":"center","yaxis":{"include_zero":false,"max":"100"},"time":{"live_span":"1mo"},"requests":[{"q":"avg:system.cpu.user{account:prod} - by {app}","style":{"palette":"blue"}}],"type":"heatmap"},"id":6059823499574180}],"layout_type":"ordered"}' + Terraform","author_name":"Nicholas Muesch","template_variable_presets":[],"template_variables":[],"is_read_only":true,"id":"c3j-44e-95g","title":"Acceptance + Test Heatmap Widget Dashboard","url":"/dashboard/c3j-44e-95g/acceptance-test-heatmap-widget-dashboard","created_at":"2020-06-23T13:42:53.842657+00:00","modified_at":"2020-06-23T13:42:53.842657+00:00","author_handle":"nicholas.muesch@datadoghq.com","widgets":[{"definition":{"title_size":"16","yaxis":{"include_zero":false,"max":"100"},"title_align":"center","events":[{"q":"env:prod","tags_execution":"and"}],"show_legend":true,"time":{"live_span":"1mo"},"title":"Avg + of system.cpu.user over account:prod by app","legend_size":"2","type":"heatmap","requests":[{"q":"avg:system.cpu.user{account:prod} + by {app}","style":{"palette":"blue"}}]},"id":8308413282651953}],"layout_type":"ordered"}' headers: Cache-Control: - no-cache @@ -236,13 +236,13 @@ interactions: Content-Type: - application/json Date: - - Wed, 17 Jun 2020 16:51:55 GMT + - Tue, 23 Jun 2020 13:43:00 GMT Dd-Pool: - dogweb Pragma: - no-cache Set-Cookie: - - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Wed, 24-Jun-2020 16:51:55 GMT; + - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Tue, 30-Jun-2020 13:43:00 GMT; secure; HttpOnly Strict-Transport-Security: - max-age=15724800; @@ -251,9 +251,9 @@ interactions: X-Content-Type-Options: - nosniff X-Dd-Debug: - - /Lq4EjXKMzRKp9qa/TaJTTVqSY3uTwQpdi8SFIU3firYrLG0qdPC+ksTJBROerQS + - GG9N5JNk6zUo5YQ1gmfpF0kYcSj/kjDOsFItaODUS7qQCwsMrhI3QWJVQns7uvtI X-Dd-Version: - - "35.2632563" + - "35.2655011" X-Frame-Options: - SAMEORIGIN status: 200 OK @@ -268,15 +268,15 @@ interactions: Dd-Operation-Id: - GetDashboard User-Agent: - - datadog-api-client-go/1.0.0-beta.4 (go go1.13; os darwin; arch amd64) - url: https://api.datadoghq.com/api/v1/dashboard/psy-4j3-2u6 + - datadog-api-client-go/1.0.0-beta.6 (go go1.13; os darwin; arch amd64) + url: https://api.datadoghq.com/api/v1/dashboard/c3j-44e-95g method: GET response: body: '{"notify_list":[],"description":"Created using the Datadog provider in - Terraform","author_name":"Nicholas Muesch","template_variable_presets":[],"template_variables":[],"is_read_only":true,"id":"psy-4j3-2u6","title":"Acceptance - Test Heatmap Widget Dashboard","url":"/dashboard/psy-4j3-2u6/acceptance-test-heatmap-widget-dashboard","created_at":"2020-06-17T16:51:52.896612+00:00","modified_at":"2020-06-17T16:51:52.896612+00:00","author_handle":"nicholas.muesch@datadoghq.com","widgets":[{"definition":{"title_size":"16","title":"Avg - of system.cpu.user over account:prod by app","title_align":"center","yaxis":{"include_zero":false,"max":"100"},"time":{"live_span":"1mo"},"requests":[{"q":"avg:system.cpu.user{account:prod} - by {app}","style":{"palette":"blue"}}],"type":"heatmap"},"id":6059823499574180}],"layout_type":"ordered"}' + Terraform","author_name":"Nicholas Muesch","template_variable_presets":[],"template_variables":[],"is_read_only":true,"id":"c3j-44e-95g","title":"Acceptance + Test Heatmap Widget Dashboard","url":"/dashboard/c3j-44e-95g/acceptance-test-heatmap-widget-dashboard","created_at":"2020-06-23T13:42:53.842657+00:00","modified_at":"2020-06-23T13:42:53.842657+00:00","author_handle":"nicholas.muesch@datadoghq.com","widgets":[{"definition":{"title_size":"16","yaxis":{"include_zero":false,"max":"100"},"title_align":"center","events":[{"q":"env:prod","tags_execution":"and"}],"show_legend":true,"time":{"live_span":"1mo"},"title":"Avg + of system.cpu.user over account:prod by app","legend_size":"2","type":"heatmap","requests":[{"q":"avg:system.cpu.user{account:prod} + by {app}","style":{"palette":"blue"}}]},"id":8308413282651953}],"layout_type":"ordered"}' headers: Cache-Control: - no-cache @@ -287,13 +287,13 @@ interactions: Content-Type: - application/json Date: - - Wed, 17 Jun 2020 16:51:56 GMT + - Tue, 23 Jun 2020 13:43:01 GMT Dd-Pool: - dogweb Pragma: - no-cache Set-Cookie: - - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Wed, 24-Jun-2020 16:51:56 GMT; + - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Tue, 30-Jun-2020 13:43:01 GMT; secure; HttpOnly Strict-Transport-Security: - max-age=15724800; @@ -302,9 +302,9 @@ interactions: X-Content-Type-Options: - nosniff X-Dd-Debug: - - 0pa1dtuadfHOUeVqLiK3mljtwHC7xKOrqXlG1EXfeExc1YyvZm51+jZLEiJ3YUs6 + - 0pmBjL5vG2A5IkxC4OBtwgn929khTZGgUquRW20JC77zchR4jTrHgra/pB22jP66 X-Dd-Version: - - "35.2632563" + - "35.2655011" X-Frame-Options: - SAMEORIGIN status: 200 OK @@ -319,15 +319,15 @@ interactions: Dd-Operation-Id: - GetDashboard User-Agent: - - datadog-api-client-go/1.0.0-beta.4 (go go1.13; os darwin; arch amd64) - url: https://api.datadoghq.com/api/v1/dashboard/psy-4j3-2u6 + - datadog-api-client-go/1.0.0-beta.6 (go go1.13; os darwin; arch amd64) + url: https://api.datadoghq.com/api/v1/dashboard/c3j-44e-95g method: GET response: body: '{"notify_list":[],"description":"Created using the Datadog provider in - Terraform","author_name":"Nicholas Muesch","template_variable_presets":[],"template_variables":[],"is_read_only":true,"id":"psy-4j3-2u6","title":"Acceptance - Test Heatmap Widget Dashboard","url":"/dashboard/psy-4j3-2u6/acceptance-test-heatmap-widget-dashboard","created_at":"2020-06-17T16:51:52.896612+00:00","modified_at":"2020-06-17T16:51:52.896612+00:00","author_handle":"nicholas.muesch@datadoghq.com","widgets":[{"definition":{"title_size":"16","title":"Avg - of system.cpu.user over account:prod by app","title_align":"center","yaxis":{"include_zero":false,"max":"100"},"time":{"live_span":"1mo"},"requests":[{"q":"avg:system.cpu.user{account:prod} - by {app}","style":{"palette":"blue"}}],"type":"heatmap"},"id":6059823499574180}],"layout_type":"ordered"}' + Terraform","author_name":"Nicholas Muesch","template_variable_presets":[],"template_variables":[],"is_read_only":true,"id":"c3j-44e-95g","title":"Acceptance + Test Heatmap Widget Dashboard","url":"/dashboard/c3j-44e-95g/acceptance-test-heatmap-widget-dashboard","created_at":"2020-06-23T13:42:53.842657+00:00","modified_at":"2020-06-23T13:42:53.842657+00:00","author_handle":"nicholas.muesch@datadoghq.com","widgets":[{"definition":{"title_size":"16","yaxis":{"include_zero":false,"max":"100"},"title_align":"center","events":[{"q":"env:prod","tags_execution":"and"}],"show_legend":true,"time":{"live_span":"1mo"},"title":"Avg + of system.cpu.user over account:prod by app","legend_size":"2","type":"heatmap","requests":[{"q":"avg:system.cpu.user{account:prod} + by {app}","style":{"palette":"blue"}}]},"id":8308413282651953}],"layout_type":"ordered"}' headers: Cache-Control: - no-cache @@ -338,13 +338,13 @@ interactions: Content-Type: - application/json Date: - - Wed, 17 Jun 2020 16:51:56 GMT + - Tue, 23 Jun 2020 13:43:01 GMT Dd-Pool: - dogweb Pragma: - no-cache Set-Cookie: - - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Wed, 24-Jun-2020 16:51:56 GMT; + - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Tue, 30-Jun-2020 13:43:01 GMT; secure; HttpOnly Strict-Transport-Security: - max-age=15724800; @@ -353,9 +353,9 @@ interactions: X-Content-Type-Options: - nosniff X-Dd-Debug: - - KHJbOoqp3I4BOBzIFnc/Ois3eg3Rjmudy0YalRpnXQEDXDoppykpDMDaJPIufi9t + - /Ib6MMQTHlX0/jTb6tlEMzSZs2crLqjkGjYkoQ/zb0RHtMaXT744DZRFpy23W0oi X-Dd-Version: - - "35.2632563" + - "35.2655011" X-Frame-Options: - SAMEORIGIN status: 200 OK @@ -370,15 +370,15 @@ interactions: Dd-Operation-Id: - GetDashboard User-Agent: - - datadog-api-client-go/1.0.0-beta.4 (go go1.13; os darwin; arch amd64) - url: https://api.datadoghq.com/api/v1/dashboard/psy-4j3-2u6 + - datadog-api-client-go/1.0.0-beta.6 (go go1.13; os darwin; arch amd64) + url: https://api.datadoghq.com/api/v1/dashboard/c3j-44e-95g method: GET response: body: '{"notify_list":[],"description":"Created using the Datadog provider in - Terraform","author_name":"Nicholas Muesch","template_variable_presets":[],"template_variables":[],"is_read_only":true,"id":"psy-4j3-2u6","title":"Acceptance - Test Heatmap Widget Dashboard","url":"/dashboard/psy-4j3-2u6/acceptance-test-heatmap-widget-dashboard","created_at":"2020-06-17T16:51:52.896612+00:00","modified_at":"2020-06-17T16:51:52.896612+00:00","author_handle":"nicholas.muesch@datadoghq.com","widgets":[{"definition":{"title_size":"16","title":"Avg - of system.cpu.user over account:prod by app","title_align":"center","yaxis":{"include_zero":false,"max":"100"},"time":{"live_span":"1mo"},"requests":[{"q":"avg:system.cpu.user{account:prod} - by {app}","style":{"palette":"blue"}}],"type":"heatmap"},"id":6059823499574180}],"layout_type":"ordered"}' + Terraform","author_name":"Nicholas Muesch","template_variable_presets":[],"template_variables":[],"is_read_only":true,"id":"c3j-44e-95g","title":"Acceptance + Test Heatmap Widget Dashboard","url":"/dashboard/c3j-44e-95g/acceptance-test-heatmap-widget-dashboard","created_at":"2020-06-23T13:42:53.842657+00:00","modified_at":"2020-06-23T13:42:53.842657+00:00","author_handle":"nicholas.muesch@datadoghq.com","widgets":[{"definition":{"title_size":"16","yaxis":{"include_zero":false,"max":"100"},"title_align":"center","events":[{"q":"env:prod","tags_execution":"and"}],"show_legend":true,"time":{"live_span":"1mo"},"title":"Avg + of system.cpu.user over account:prod by app","legend_size":"2","type":"heatmap","requests":[{"q":"avg:system.cpu.user{account:prod} + by {app}","style":{"palette":"blue"}}]},"id":8308413282651953}],"layout_type":"ordered"}' headers: Cache-Control: - no-cache @@ -389,13 +389,13 @@ interactions: Content-Type: - application/json Date: - - Wed, 17 Jun 2020 16:51:56 GMT + - Tue, 23 Jun 2020 13:43:02 GMT Dd-Pool: - dogweb Pragma: - no-cache Set-Cookie: - - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Wed, 24-Jun-2020 16:51:56 GMT; + - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Tue, 30-Jun-2020 13:43:02 GMT; secure; HttpOnly Strict-Transport-Security: - max-age=15724800; @@ -404,9 +404,9 @@ interactions: X-Content-Type-Options: - nosniff X-Dd-Debug: - - NueLa2zkdBcl9S7BHrRuWyjAeR9iWgPFe330KTY6Cp0/yUhjUktbxu5rG2fG6gBk + - ns395qtajdi4vImLC5PhByq3vzX3KV9r4kOaLqZ3Kb42AGxxpM06vNzB/Pdubr1b X-Dd-Version: - - "35.2632563" + - "35.2655011" X-Frame-Options: - SAMEORIGIN status: 200 OK @@ -421,15 +421,15 @@ interactions: Dd-Operation-Id: - GetDashboard User-Agent: - - datadog-api-client-go/1.0.0-beta.4 (go go1.13; os darwin; arch amd64) - url: https://api.datadoghq.com/api/v1/dashboard/psy-4j3-2u6 + - datadog-api-client-go/1.0.0-beta.6 (go go1.13; os darwin; arch amd64) + url: https://api.datadoghq.com/api/v1/dashboard/c3j-44e-95g method: GET response: body: '{"notify_list":[],"description":"Created using the Datadog provider in - Terraform","author_name":"Nicholas Muesch","template_variable_presets":[],"template_variables":[],"is_read_only":true,"id":"psy-4j3-2u6","title":"Acceptance - Test Heatmap Widget Dashboard","url":"/dashboard/psy-4j3-2u6/acceptance-test-heatmap-widget-dashboard","created_at":"2020-06-17T16:51:52.896612+00:00","modified_at":"2020-06-17T16:51:52.896612+00:00","author_handle":"nicholas.muesch@datadoghq.com","widgets":[{"definition":{"title_size":"16","title":"Avg - of system.cpu.user over account:prod by app","title_align":"center","yaxis":{"include_zero":false,"max":"100"},"time":{"live_span":"1mo"},"requests":[{"q":"avg:system.cpu.user{account:prod} - by {app}","style":{"palette":"blue"}}],"type":"heatmap"},"id":6059823499574180}],"layout_type":"ordered"}' + Terraform","author_name":"Nicholas Muesch","template_variable_presets":[],"template_variables":[],"is_read_only":true,"id":"c3j-44e-95g","title":"Acceptance + Test Heatmap Widget Dashboard","url":"/dashboard/c3j-44e-95g/acceptance-test-heatmap-widget-dashboard","created_at":"2020-06-23T13:42:53.842657+00:00","modified_at":"2020-06-23T13:42:53.842657+00:00","author_handle":"nicholas.muesch@datadoghq.com","widgets":[{"definition":{"title_size":"16","yaxis":{"include_zero":false,"max":"100"},"title_align":"center","events":[{"q":"env:prod","tags_execution":"and"}],"show_legend":true,"time":{"live_span":"1mo"},"title":"Avg + of system.cpu.user over account:prod by app","legend_size":"2","type":"heatmap","requests":[{"q":"avg:system.cpu.user{account:prod} + by {app}","style":{"palette":"blue"}}]},"id":8308413282651953}],"layout_type":"ordered"}' headers: Cache-Control: - no-cache @@ -440,13 +440,13 @@ interactions: Content-Type: - application/json Date: - - Wed, 17 Jun 2020 16:51:57 GMT + - Tue, 23 Jun 2020 13:43:02 GMT Dd-Pool: - dogweb Pragma: - no-cache Set-Cookie: - - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Wed, 24-Jun-2020 16:51:57 GMT; + - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Tue, 30-Jun-2020 13:43:02 GMT; secure; HttpOnly Strict-Transport-Security: - max-age=15724800; @@ -455,9 +455,9 @@ interactions: X-Content-Type-Options: - nosniff X-Dd-Debug: - - BsieYxalcMaIS+cTbK9YL1FxnAIiDF/6CFe3/lefzTTUruWB5XaSb08KP3lTATlu + - fqgAnnBv1js3TBerHAS1jOASlx3n1xB+hOOrFOLO2ZaBfZ3rktA3gzUaBetB5haL X-Dd-Version: - - "35.2632563" + - "35.2655011" X-Frame-Options: - SAMEORIGIN status: 200 OK @@ -472,11 +472,11 @@ interactions: Dd-Operation-Id: - DeleteDashboard User-Agent: - - datadog-api-client-go/1.0.0-beta.4 (go go1.13; os darwin; arch amd64) - url: https://api.datadoghq.com/api/v1/dashboard/psy-4j3-2u6 + - datadog-api-client-go/1.0.0-beta.6 (go go1.13; os darwin; arch amd64) + url: https://api.datadoghq.com/api/v1/dashboard/c3j-44e-95g method: DELETE response: - body: '{"deleted_dashboard_id":"psy-4j3-2u6"}' + body: '{"deleted_dashboard_id":"c3j-44e-95g"}' headers: Cache-Control: - no-cache @@ -487,13 +487,13 @@ interactions: Content-Type: - application/json Date: - - Wed, 17 Jun 2020 16:52:10 GMT + - Tue, 23 Jun 2020 13:43:19 GMT Dd-Pool: - dogweb Pragma: - no-cache Set-Cookie: - - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Wed, 24-Jun-2020 16:51:57 GMT; + - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Tue, 30-Jun-2020 13:43:04 GMT; secure; HttpOnly Strict-Transport-Security: - max-age=15724800; @@ -502,9 +502,9 @@ interactions: X-Content-Type-Options: - nosniff X-Dd-Debug: - - KKQq2SiaDLpychKSp47ffvU6SRxUV+VzBWr187ESkULBuGOI+kREfb/2NCy8DAWC + - KKdI9UAf8fC5q7osIllxNui0A1CUm45w7mZBz+tu6Vlp/ga+Q6ZXvY0JoJlUBVi+ X-Dd-Version: - - "35.2632563" + - "35.2655011" X-Frame-Options: - SAMEORIGIN status: 200 OK @@ -519,11 +519,11 @@ interactions: Dd-Operation-Id: - GetDashboard User-Agent: - - datadog-api-client-go/1.0.0-beta.4 (go go1.13; os darwin; arch amd64) - url: https://api.datadoghq.com/api/v1/dashboard/psy-4j3-2u6 + - datadog-api-client-go/1.0.0-beta.6 (go go1.13; os darwin; arch amd64) + url: https://api.datadoghq.com/api/v1/dashboard/c3j-44e-95g method: GET response: - body: '{"errors": ["Dashboard with ID psy-4j3-2u6 not found"]}' + body: '{"errors": ["Dashboard with ID c3j-44e-95g not found"]}' headers: Cache-Control: - no-cache @@ -534,7 +534,7 @@ interactions: Content-Type: - application/json Date: - - Wed, 17 Jun 2020 16:52:10 GMT + - Tue, 23 Jun 2020 13:43:20 GMT Dd-Pool: - dogweb Pragma: @@ -546,7 +546,7 @@ interactions: X-Content-Type-Options: - nosniff X-Dd-Version: - - "35.2632563" + - "35.2655011" X-Frame-Options: - SAMEORIGIN status: 404 Not Found diff --git a/datadog/resource_datadog_dashboard.go b/datadog/resource_datadog_dashboard.go index 6bc729ba8..7b71cbd16 100644 --- a/datadog/resource_datadog_dashboard.go +++ b/datadog/resource_datadog_dashboard.go @@ -1932,6 +1932,22 @@ func getHeatmapDefinitionSchema() map[string]*schema.Schema { Type: schema.TypeString, Optional: true, }, + "event": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Resource{ + Schema: getWidgetEventSchema(), + }, + }, + "show_legend": { + Type: schema.TypeBool, + Optional: true, + }, + "legend_size": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validateTimeseriesWidgetLegendSize, + }, "time": { Type: schema.TypeMap, Optional: true, @@ -1952,6 +1968,15 @@ func buildDatadogHeatmapDefinition(terraformDefinition map[string]interface{}) * datadogDefinition.Yaxis = buildDatadogWidgetAxis(v) } } + if v, ok := terraformDefinition["event"].([]interface{}); ok && len(v) > 0 { + datadogDefinition.Events = buildDatadogWidgetEvents(&v) + } + if v, ok := terraformDefinition["show_legend"].(bool); ok { + datadogDefinition.SetShowLegend(v) + } + if v, ok := terraformDefinition["legend_size"].(string); ok && len(v) != 0 { + datadogDefinition.SetLegendSize(datadogV1.WidgetLegendSize(v)) + } if v, ok := terraformDefinition["title"].(string); ok && len(v) != 0 { datadogDefinition.SetTitle(v) } @@ -1975,6 +2000,9 @@ func buildTerraformHeatmapDefinition(datadogDefinition datadogV1.HeatMapWidgetDe axis := buildTerraformWidgetAxis(*v) terraformDefinition["yaxis"] = []map[string]interface{}{axis} } + if v, ok := datadogDefinition.GetEventsOk(); ok { + terraformDefinition["event"] = buildTerraformWidgetEvents(v) + } if v, ok := datadogDefinition.GetTitleOk(); ok { terraformDefinition["title"] = *v } @@ -1984,6 +2012,12 @@ func buildTerraformHeatmapDefinition(datadogDefinition datadogV1.HeatMapWidgetDe if v, ok := datadogDefinition.GetTitleAlignOk(); ok { terraformDefinition["title_align"] = *v } + if v, ok := datadogDefinition.GetShowLegendOk(); ok { + terraformDefinition["show_legend"] = *v + } + if v, ok := datadogDefinition.GetLegendSizeOk(); ok { + terraformDefinition["legend_size"] = *v + } if v, ok := datadogDefinition.GetTimeOk(); ok { terraformDefinition["time"] = buildTerraformWidgetTime(*v) } @@ -3778,9 +3812,7 @@ func buildTerraformTimeseriesDefinition(datadogDefinition datadogV1.TimeseriesWi if v, ok := datadogDefinition.GetLegendSizeOk(); ok { terraformDefinition["legend_size"] = *v } - if datadogDefinition.LegendSize != nil { - terraformDefinition["legend_size"] = *datadogDefinition.LegendSize - } + return terraformDefinition } diff --git a/datadog/resource_datadog_dashboard_heatmap_test.go b/datadog/resource_datadog_dashboard_heatmap_test.go index f71aebdf8..234b343a8 100644 --- a/datadog/resource_datadog_dashboard_heatmap_test.go +++ b/datadog/resource_datadog_dashboard_heatmap_test.go @@ -38,6 +38,7 @@ import ( // }, // "title": "Avg of system.cpu.user over account:prod by app", // "legend_size": "2", +// "show_legend": true, // "type": "heatmap", // "events": [ // { @@ -83,11 +84,12 @@ resource "datadog_dashboard" "heatmap_dashboard" { time = { live_span = "1mo" } - //event { - // q = "env:prod" - // tags_execution = "and" - //} - //legend_size = "2" + event { + q = "env:prod" + tags_execution = "and" + } + show_legend = true + legend_size = "2" } } } @@ -109,6 +111,10 @@ var datadogDashboardHeatMapAsserts = []string{ "widget.0.heatmap_definition.0.yaxis.0.scale =", "widget.0.heatmap_definition.0.yaxis.0.min =", "widget.0.heatmap_definition.0.time.live_span = 1mo", + "widget.0.heatmap_definition.0.event.0.q = env:prod", + "widget.0.heatmap_definition.0.event.0.tags_execution = and", + "widget.0.heatmap_definition.0.show_legend = true", + "widget.0.heatmap_definition.0.legend_size = 2", } func TestAccDatadogDashboardHeatMap(t *testing.T) { diff --git a/website/docs/r/dashboard.html.markdown b/website/docs/r/dashboard.html.markdown index ac188a181..81b98de0a 100644 --- a/website/docs/r/dashboard.html.markdown +++ b/website/docs/r/dashboard.html.markdown @@ -702,6 +702,11 @@ Nested `widget` blocks have the following structure: - `style` - (Optional) Style of the widget graph. One nested block is allowed with the following structure: - `palette` - (Optional) Color palette to apply to the widget. The available options are available here: https://docs.datadoghq.com/graphing/widgets/timeseries/#appearance. - `yaxis`: (Optional) Nested block describing the Y-Axis Controls. The structure of this block is described [below](dashboard.html#nested-widget-axis-blocks) + - `show_legend`: (Optional) Whether or not to show the legend on this widget. + - `legend_size`: (Optional) The size of the legend displayed in the widget. + - `event`: (Optional) The definition of the event to overlay on the graph. Includes the following structure: + - `q`: (Required) The event query to use in the widget. + - `tags_execution`: (Optional) The execution method for multi-value filters. - `title`: (Optional) The title of the widget. - `title_size`: (Optional) The size of the widget's title. Default is 16. - `title_align`: (Optional) The alignment of the widget's title. One of "left", "center", or "right".