Skip to content

Commit

Permalink
[audit logs] update dashboard resource with audit logs data source (#…
Browse files Browse the repository at this point in the history 
…1152)

* add audit to dashboard fns

* docs

* timeseries cassettes

* dashboard cassettes

* dashboard update cassette

* change wording in docs

* update function name

* update docs

* dashboard import cassette

* dashboard update cassette

* dashboard timeseries cassettes

* change wording in docs

* formatting fixes

* doc updates to dashboard schema

* update docs

Co-authored-by: Ruth Naebeck <[email protected]>
  • Loading branch information
@retsguj @ruthnaebeck
retsguj and ruthnaebeck authored Jul 26, 2021
1 parent 93639ff commit f3d26b1
Show file tree
Hide file tree
Showing 12 changed files with 2,525 additions and 2,069 deletions.
440 changes: 232 additions & 208 deletions datadog/resource_datadog_dashboard.go
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion datadog/tests/cassettes/TestAccDatadogDashboardTimeseries.freeze
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2021-06-07T15:23:28.12816-04:00
2021-07-23T10:37:42.598881-04:00
70 changes: 24 additions & 46 deletions datadog/tests/cassettes/TestAccDatadogDashboardTimeseries.yaml
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion datadog/tests/cassettes/TestAccDatadogDashboardTimeseries_import.freeze
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2021-06-07T15:23:28.127955-04:00
2021-07-23T10:37:42.598932-04:00
70 changes: 24 additions & 46 deletions datadog/tests/cassettes/TestAccDatadogDashboardTimeseries_import.yaml
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion datadog/tests/cassettes/TestAccDatadogDashboard_import.freeze
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2021-07-12T11:19:09.388085+02:00
2021-07-23T10:31:54.404452-04:00
96 changes: 48 additions & 48 deletions datadog/tests/cassettes/TestAccDatadogDashboard_import.yaml
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion datadog/tests/cassettes/TestAccDatadogDashboard_update.freeze
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2021-07-12T11:09:56.907863+02:00
2021-07-23T10:34:18.548873-04:00
48 changes: 24 additions & 24 deletions datadog/tests/cassettes/TestAccDatadogDashboard_update.yaml
View file

Large diffs are not rendered by default.

26 changes: 26 additions & 0 deletions datadog/tests/resource_datadog_dashboard_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,24 @@ resource "datadog_dashboard" "ordered_dashboard" {
}
display_type = "bars"
}
request {
audit_query {
index = "*"
search_query = ""
group_by {
facet = "@metadata.api_key.id"
sort_query {
aggregation = "count"
order = "desc"
}
limit = "10"
}
compute_query {
aggregation = "count"
}
}
display_type = "line"
}
marker {
display_type = "error dashed"
label = " z=6 "
Expand Down Expand Up @@ -946,6 +964,14 @@ var datadogOrderedDashboardAsserts = []string{
"widget.10.timeseries_definition.0.request.5.rum_query.0.search_query = status:info",
"widget.10.timeseries_definition.0.request.5.rum_query.0.group_by.0.facet = service",
"widget.10.timeseries_definition.0.request.5.display_type = bars",
"widget.10.timeseries_definition.0.request.6.audit_query.0.index = *",
"widget.10.timeseries_definition.0.request.6.audit_query.0.compute_query.0.aggregation = count",
"widget.10.timeseries_definition.0.request.6.audit_query.0.search_query =",
"widget.10.timeseries_definition.0.request.6.audit_query.0.group_by.0.facet = @metadata.api_key.id",
"widget.10.timeseries_definition.0.request.6.audit_query.0.group_by.0.sort_query.0.aggregation = count",
"widget.10.timeseries_definition.0.request.6.audit_query.0.group_by.0.sort_query.0.order = desc",
"widget.10.timeseries_definition.0.request.6.audit_query.0.group_by.0.limit = 10",
"widget.10.timeseries_definition.0.request.6.display_type = line",
"widget.10.timeseries_definition.0.marker.# = 2",
"widget.10.timeseries_definition.0.marker.0.display_type = error dashed",
"widget.10.timeseries_definition.0.marker.0.label = z=6 ",
Expand Down
62 changes: 61 additions & 1 deletion datadog/tests/resource_datadog_dashboard_timeseries_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,30 @@ resource "datadog_dashboard" "timeseries_dashboard" {
display_type = "area"
on_right_yaxis = "true"
}
request {
style {
line_width = "normal"
palette = "green"
line_type = "solid"
}
audit_query {
index = "*"
search_query = ""
group_by {
facet = "@metadata.api_key.id"
sort_query {
aggregation = "count"
order = "desc"
}
limit = "10"
}
compute_query {
aggregation = "count"
}
}
display_type = "line"
on_right_yaxis = "true"
}
custom_link {
link = "https://app.datadoghq.com/dashboard/lists"
label = "Test Custom Link label"
Expand Down Expand Up @@ -364,6 +388,30 @@ resource "datadog_dashboard" "timeseries_dashboard" {
display_type = "area"
on_right_yaxis = "true"
}
request {
style {
line_width = "normal"
palette = "green"
line_type = "solid"
}
audit_query {
index = "*"
search_query = ""
group_by {
facet = "@metadata.api_key.id"
sort_query {
aggregation = "count"
order = "desc"
}
limit = "10"
}
compute_query {
aggregation = "count"
}
}
display_type = "line"
on_right_yaxis = "true"
}
custom_link {
link = "https://app.datadoghq.com/dashboard/lists"
label = "Test Custom Link label"
Expand Down Expand Up @@ -499,7 +547,7 @@ var datadogDashboardTimeseriesAsserts = []string{
"widget.0.timeseries_definition.0.marker.1.label = y=400000",
"widget.0.timeseries_definition.0.marker.1.display_type = warning dashed",
"widget.0.timeseries_definition.0.marker.1.value = y=400000",
"widget.0.timeseries_definition.0.request.# = 6",
"widget.0.timeseries_definition.0.request.# = 7",
"widget.0.timeseries_definition.0.request.0.style.0.line_width = thin",
"widget.0.timeseries_definition.0.request.0.style.0.line_type = solid",
"widget.0.timeseries_definition.0.request.0.process_query.# = 0",
Expand Down Expand Up @@ -612,6 +660,18 @@ var datadogDashboardTimeseriesAsserts = []string{
"widget.0.timeseries_definition.0.request.5.rum_query.0.group_by.0.sort_query.0.order = desc",
"widget.0.timeseries_definition.0.request.5.rum_query.0.search_query =",
"widget.0.timeseries_definition.0.request.5.on_right_yaxis = true",
"widget.0.timeseries_definition.0.request.6.audit_query.0.index = *",
"widget.0.timeseries_definition.0.request.6.audit_query.0.compute_query.0.aggregation = count",
"widget.0.timeseries_definition.0.request.6.audit_query.0.search_query =",
"widget.0.timeseries_definition.0.request.6.audit_query.0.group_by.0.facet = @metadata.api_key.id",
"widget.0.timeseries_definition.0.request.6.audit_query.0.group_by.0.sort_query.0.aggregation = count",
"widget.0.timeseries_definition.0.request.6.audit_query.0.group_by.0.sort_query.0.order = desc",
"widget.0.timeseries_definition.0.request.6.audit_query.0.group_by.0.limit = 10",
"widget.0.timeseries_definition.0.request.6.display_type = line",
"widget.0.timeseries_definition.0.request.6.on_right_yaxis = true",
"widget.0.timeseries_definition.0.request.6.style.0.palette = green",
"widget.0.timeseries_definition.0.request.6.style.0.line_width = normal",
"widget.0.timeseries_definition.0.request.6.style.0.line_type = solid",
"widget.0.timeseries_definition.0.legend_layout = horizontal",
"widget.0.timeseries_definition.0.legend_columns.# = 3",
"widget.0.timeseries_definition.0.legend_columns.TypeSet = value",
Expand Down
Loading

0 comments on commit f3d26b1

Please sign in to comment.