From 05ef03cdeeafc1c7e0b449cb7a783e2da8ae94da Mon Sep 17 00:00:00 2001 From: "Karapetyan, Aram" Date: Mon, 25 Sep 2023 16:42:30 +0400 Subject: [PATCH] feat(DMVP-1232): add new widgets for different resources --- LICENSE | 201 ++++++++++++++++++ .../modules/widgets/cloudfront/base/base.tf | 17 ++ .../widgets/cloudfront/base/distribution.tf | 7 + .../modules/widgets/cloudfront/base/locals.tf | 5 + .../modules/widgets/cloudfront/base/output.tf | 3 + .../widgets/cloudfront/base/variables.tf | 23 ++ .../widgets/cloudfront/combined/base.tf | 19 ++ .../cloudfront/combined/distribution.tf | 7 + .../widgets/cloudfront/combined/locals.tf | 5 + .../widgets/cloudfront/combined/output.tf | 3 + .../widgets/cloudfront/combined/variables.tf | 19 ++ .../modules/widgets/container/cpu/base.tf | 2 +- .../modules/widgets/log-based/base.tf | 14 ++ .../modules/widgets/log-based/output.tf | 3 + .../modules/widgets/log-based/variables.tf | 39 ++++ .../tests/widgets-cloudfront/0-setup.tf | 14 ++ .../tests/widgets-cloudfront/1-example.tf | 28 +++ .../tests/widgets-cloudfront/2-assert.tf | 9 + modules/dashboard/widgets-cloudfront.tf | 74 +++++++ modules/dashboard/widgets-log-based.tf | 15 ++ modules/dashboard/widgets-rds.tf | 0 modules/dashboard/widgets-route53.tf | 0 modules/dashboard/widgets-waf.tf | 0 modules/dashboard/widgets.tf | 15 +- 24 files changed, 520 insertions(+), 2 deletions(-) create mode 100644 LICENSE create mode 100644 modules/dashboard/modules/widgets/cloudfront/base/base.tf create mode 100644 modules/dashboard/modules/widgets/cloudfront/base/distribution.tf create mode 100644 modules/dashboard/modules/widgets/cloudfront/base/locals.tf create mode 100644 modules/dashboard/modules/widgets/cloudfront/base/output.tf create mode 100644 modules/dashboard/modules/widgets/cloudfront/base/variables.tf create mode 100644 modules/dashboard/modules/widgets/cloudfront/combined/base.tf create mode 100644 modules/dashboard/modules/widgets/cloudfront/combined/distribution.tf create mode 100644 modules/dashboard/modules/widgets/cloudfront/combined/locals.tf create mode 100644 modules/dashboard/modules/widgets/cloudfront/combined/output.tf create mode 100644 modules/dashboard/modules/widgets/cloudfront/combined/variables.tf create mode 100644 modules/dashboard/modules/widgets/log-based/base.tf create mode 100644 modules/dashboard/modules/widgets/log-based/output.tf create mode 100644 modules/dashboard/modules/widgets/log-based/variables.tf create mode 100644 modules/dashboard/tests/widgets-cloudfront/0-setup.tf create mode 100644 modules/dashboard/tests/widgets-cloudfront/1-example.tf create mode 100644 modules/dashboard/tests/widgets-cloudfront/2-assert.tf create mode 100644 modules/dashboard/widgets-cloudfront.tf create mode 100644 modules/dashboard/widgets-log-based.tf create mode 100644 modules/dashboard/widgets-rds.tf create mode 100644 modules/dashboard/widgets-route53.tf create mode 100644 modules/dashboard/widgets-waf.tf diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/modules/dashboard/modules/widgets/cloudfront/base/base.tf b/modules/dashboard/modules/widgets/cloudfront/base/base.tf new file mode 100644 index 0000000..876a4e5 --- /dev/null +++ b/modules/dashboard/modules/widgets/cloudfront/base/base.tf @@ -0,0 +1,17 @@ +module "base" { + source = "../../base" + + coordinates = var.coordinates + + name = local.title + + # stats + stat = local.stat + period = var.period + + defaults = { + "DistributionId" : var.distribution + } + + metrics = var.metrics +} diff --git a/modules/dashboard/modules/widgets/cloudfront/base/distribution.tf b/modules/dashboard/modules/widgets/cloudfront/base/distribution.tf new file mode 100644 index 0000000..2f8ee95 --- /dev/null +++ b/modules/dashboard/modules/widgets/cloudfront/base/distribution.tf @@ -0,0 +1,7 @@ +data "aws_cloudfront_distribution" "test" { + id = var.distribution +} + +locals { + balancer = split("loadbalancer/", data.aws_alb.balancer.arn)[1] +} diff --git a/modules/dashboard/modules/widgets/cloudfront/base/locals.tf b/modules/dashboard/modules/widgets/cloudfront/base/locals.tf new file mode 100644 index 0000000..5db1915 --- /dev/null +++ b/modules/dashboard/modules/widgets/cloudfront/base/locals.tf @@ -0,0 +1,5 @@ +locals { + title = "Requests" + stat = "Sum" + namespace = "AWS/CloudFront" +} diff --git a/modules/dashboard/modules/widgets/cloudfront/base/output.tf b/modules/dashboard/modules/widgets/cloudfront/base/output.tf new file mode 100644 index 0000000..37309dc --- /dev/null +++ b/modules/dashboard/modules/widgets/cloudfront/base/output.tf @@ -0,0 +1,3 @@ +output "data" { + value = module.base.data +} diff --git a/modules/dashboard/modules/widgets/cloudfront/base/variables.tf b/modules/dashboard/modules/widgets/cloudfront/base/variables.tf new file mode 100644 index 0000000..90a130f --- /dev/null +++ b/modules/dashboard/modules/widgets/cloudfront/base/variables.tf @@ -0,0 +1,23 @@ +variable "distribution" { + type = string +} + +# position +variable "coordinates" { + type = object({ + x : number + y : number + width : number + height : number + }) +} + +# stats +variable "period" { + type = number + default = 300 +} + +variable "metrics" { + type = list(any) +} diff --git a/modules/dashboard/modules/widgets/cloudfront/combined/base.tf b/modules/dashboard/modules/widgets/cloudfront/combined/base.tf new file mode 100644 index 0000000..138a36b --- /dev/null +++ b/modules/dashboard/modules/widgets/cloudfront/combined/base.tf @@ -0,0 +1,19 @@ +module "base" { + source = "../../base" + + coordinates = var.coordinates + + name = local.title + + # stats + stat = local.stat + period = var.period + + defaults = { + "DistributionId" : var.distribution + } + + metrics = [ + { local.namespace : "RequestCount" } + ] +} diff --git a/modules/dashboard/modules/widgets/cloudfront/combined/distribution.tf b/modules/dashboard/modules/widgets/cloudfront/combined/distribution.tf new file mode 100644 index 0000000..2f8ee95 --- /dev/null +++ b/modules/dashboard/modules/widgets/cloudfront/combined/distribution.tf @@ -0,0 +1,7 @@ +data "aws_cloudfront_distribution" "test" { + id = var.distribution +} + +locals { + balancer = split("loadbalancer/", data.aws_alb.balancer.arn)[1] +} diff --git a/modules/dashboard/modules/widgets/cloudfront/combined/locals.tf b/modules/dashboard/modules/widgets/cloudfront/combined/locals.tf new file mode 100644 index 0000000..5db1915 --- /dev/null +++ b/modules/dashboard/modules/widgets/cloudfront/combined/locals.tf @@ -0,0 +1,5 @@ +locals { + title = "Requests" + stat = "Sum" + namespace = "AWS/CloudFront" +} diff --git a/modules/dashboard/modules/widgets/cloudfront/combined/output.tf b/modules/dashboard/modules/widgets/cloudfront/combined/output.tf new file mode 100644 index 0000000..37309dc --- /dev/null +++ b/modules/dashboard/modules/widgets/cloudfront/combined/output.tf @@ -0,0 +1,3 @@ +output "data" { + value = module.base.data +} diff --git a/modules/dashboard/modules/widgets/cloudfront/combined/variables.tf b/modules/dashboard/modules/widgets/cloudfront/combined/variables.tf new file mode 100644 index 0000000..e33d92a --- /dev/null +++ b/modules/dashboard/modules/widgets/cloudfront/combined/variables.tf @@ -0,0 +1,19 @@ +variable "distribution" { + type = string +} + +# position +variable "coordinates" { + type = object({ + x : number + y : number + width : number + height : number + }) +} + +# stats +variable "period" { + type = number + default = 300 +} diff --git a/modules/dashboard/modules/widgets/container/cpu/base.tf b/modules/dashboard/modules/widgets/container/cpu/base.tf index 940b7a4..d9ce077 100644 --- a/modules/dashboard/modules/widgets/container/cpu/base.tf +++ b/modules/dashboard/modules/widgets/container/cpu/base.tf @@ -14,7 +14,7 @@ module "base" { period = var.period metrics = [ - { "ContainerInsights" : "pod_cpu_utilization", }, + { "ContainerInsights" : "pod_cpu_utilization", "Style" : { "color" : "#d62728" } }, { "ContainerInsights" : "pod_cpu_reserved_capacity", "Style" : { "color" : "#d62728" } } ] } diff --git a/modules/dashboard/modules/widgets/log-based/base.tf b/modules/dashboard/modules/widgets/log-based/base.tf new file mode 100644 index 0000000..17c0c5b --- /dev/null +++ b/modules/dashboard/modules/widgets/log-based/base.tf @@ -0,0 +1,14 @@ +module "base" { + source = "../../base" + + coordinates = var.coordinates + + name = "Log Based / ${var.metric}" + + defaults = {} + + metrics = [ + { "ContainerInsights" : "pod_cpu_utilization", }, + { "ContainerInsights" : "pod_cpu_reserved_capacity", "Style" : { "color" : "#d62728" } } + ] +} diff --git a/modules/dashboard/modules/widgets/log-based/output.tf b/modules/dashboard/modules/widgets/log-based/output.tf new file mode 100644 index 0000000..37309dc --- /dev/null +++ b/modules/dashboard/modules/widgets/log-based/output.tf @@ -0,0 +1,3 @@ +output "data" { + value = module.base.data +} diff --git a/modules/dashboard/modules/widgets/log-based/variables.tf b/modules/dashboard/modules/widgets/log-based/variables.tf new file mode 100644 index 0000000..84adc5b --- /dev/null +++ b/modules/dashboard/modules/widgets/log-based/variables.tf @@ -0,0 +1,39 @@ +variable "container" { + type = string +} + +variable "cluster" { + type = string +} + +variable "namespace" { + type = string + default = "default" +} + +# region +variable "region" { + type = string + default = "" +} + +# position +variable "coordinates" { + type = object({ + x : number + y : number + width : number + height : number + }) +} + +# stats +variable "stat" { + type = string + default = "Average" +} + +variable "period" { + type = number + default = 300 +} diff --git a/modules/dashboard/tests/widgets-cloudfront/0-setup.tf b/modules/dashboard/tests/widgets-cloudfront/0-setup.tf new file mode 100644 index 0000000..b093055 --- /dev/null +++ b/modules/dashboard/tests/widgets-cloudfront/0-setup.tf @@ -0,0 +1,14 @@ +terraform { + required_providers { + test = { + source = "terraform.io/builtin/test" + } + + aws = { + source = "hashicorp/aws" + version = "~> 4.33" + } + } +} + +provider "aws" {} diff --git a/modules/dashboard/tests/widgets-cloudfront/1-example.tf b/modules/dashboard/tests/widgets-cloudfront/1-example.tf new file mode 100644 index 0000000..f59bcca --- /dev/null +++ b/modules/dashboard/tests/widgets-cloudfront/1-example.tf @@ -0,0 +1,28 @@ +module "dashboard-with-container-metrics" { + source = "../../" + name = "dashboard-with-cloudfront-metrics" + rows = [ + [ + { + type : "cloudfront/combined", + distribution : "test-distribution" + }, + { + type : "cloudfront/error-rate", + distribution : "test-distribution" + }, + { + type : "cloudfront/errors", + distribution : "test-distribution" + }, + { + type : "cloudfront/requests", + distribution : "test-distribution" + }, + { + type : "cloudfront/traffic-bytes", + distribution : "test-distribution" + } + ] + ] +} diff --git a/modules/dashboard/tests/widgets-cloudfront/2-assert.tf b/modules/dashboard/tests/widgets-cloudfront/2-assert.tf new file mode 100644 index 0000000..f9767d6 --- /dev/null +++ b/modules/dashboard/tests/widgets-cloudfront/2-assert.tf @@ -0,0 +1,9 @@ +resource "test_assertions" "api_url" { + component = "cloudwatch-dashboard-complex" + + equal "scheme" { + description = "As module does not have any output and data just make sure the case runs. Probably can be thrown away." + got = "all good" + want = "all good" + } +} diff --git a/modules/dashboard/widgets-cloudfront.tf b/modules/dashboard/widgets-cloudfront.tf new file mode 100644 index 0000000..55b058f --- /dev/null +++ b/modules/dashboard/widgets-cloudfront.tf @@ -0,0 +1,74 @@ +module "cloudfront_combined" { + source = "./modules/widgets/cloudfront/combined" + + count = length(local.cloudfront_combined) + + # coordinates + coordinates = local.cloudfront_combined[count.index].coordinates + + # stats + period = local.cloudfront_combined[count.index].period + + # container + distribution = local.cloudfront_combined[count.index].distribution +} + +module "cloudfront_error_rate" { + source = "./modules/widgets/cloudfront/error-rate" + + count = length(local.cloudfront_error_rate) + + # coordinates + coordinates = local.cloudfront_error_rate[count.index].coordinates + + # stats + period = local.cloudfront_error_rate[count.index].period + + # container + distribution = local.cloudfront_error_rate[count.index].distribution +} + +module "cloudfront_errors" { + source = "./modules/widgets/cloudfront/errors" + + count = length(local.cloudfront_errors) + + # coordinates + coordinates = local.cloudfront_errors[count.index].coordinates + + # stats + period = local.cloudfront_errors[count.index].period + + # container + distribution = local.cloudfront_errors[count.index].distribution +} + +module "cloudfront_requests" { + source = "./modules/widgets/cloudfront/requests" + + count = length(local.cloudfront_requests) + + # coordinates + coordinates = local.cloudfront_requests[count.index].coordinates + + # stats + period = local.cloudfront_requests[count.index].period + + # container + distribution = local.cloudfront_requests[count.index].distribution +} + +module "cloudfront_traffic_bytes" { + source = "./modules/widgets/cloudfront/traffic-bytes" + + count = length(local.cloudfront_traffic_bytes) + + # coordinates + coordinates = local.cloudfront_traffic_bytes[count.index].coordinates + + # stats + period = local.cloudfront_traffic_bytes[count.index].period + + # container + distribution = local.cloudfront_traffic_bytes[count.index].distribution +} diff --git a/modules/dashboard/widgets-log-based.tf b/modules/dashboard/widgets-log-based.tf new file mode 100644 index 0000000..a721637 --- /dev/null +++ b/modules/dashboard/widgets-log-based.tf @@ -0,0 +1,15 @@ +# Container widgets +# module "widget_log_based" { +# source = "./modules/widgets/log-based" + +# count = length(local.log_based) + +# # coordinates +# coordinates = local.log_based.coordinates + +# # stats +# period = local.log_based.period + +# # container +# metric = local.log_based.metric +# } diff --git a/modules/dashboard/widgets-rds.tf b/modules/dashboard/widgets-rds.tf new file mode 100644 index 0000000..e69de29 diff --git a/modules/dashboard/widgets-route53.tf b/modules/dashboard/widgets-route53.tf new file mode 100644 index 0000000..e69de29 diff --git a/modules/dashboard/widgets-waf.tf b/modules/dashboard/widgets-waf.tf new file mode 100644 index 0000000..e69de29 diff --git a/modules/dashboard/widgets.tf b/modules/dashboard/widgets.tf index 803207f..4f5630f 100644 --- a/modules/dashboard/widgets.tf +++ b/modules/dashboard/widgets.tf @@ -21,6 +21,7 @@ locals { "balancer/4xx" : [] "balancer/5xx" : [] "text/title" : [] + "log-based" : [] } # widget aliases @@ -35,6 +36,10 @@ locals { text_title = local.widget_config["text/title"] + log_based = local.widget_config["log-based"] + + widget_cloudfront = local.widget_config["widget_cloudfront"] + # combine results widget_result = concat( // Widget/Container @@ -49,6 +54,14 @@ locals { module.container_balancer_5xx_widget.*.data, // Widget/Text - module.text_title.*.data + module.text_title.*.data, + module.text_h2.*.data, + module.text_h3.*.data, + + # log based metrics + module.widget_log_based.*.data, + + # CloudFront + module.widget_cloudfront.*.data ) }