From 08f83f8155ef00c8d652bbbf5fdef1ead637a02c Mon Sep 17 00:00:00 2001 From: Heber Silva Date: Thu, 10 Nov 2022 15:11:28 -0500 Subject: [PATCH 1/2] Added terraform lightstep aws chimesdk --- README.md | 1 + main.tf | 5 + modules/chime-dashboard/LICENSE | 201 +++++++++++++++++++++++++++ modules/chime-dashboard/README.md | 3 + modules/chime-dashboard/main.tf | 146 +++++++++++++++++++ modules/chime-dashboard/outputs.tf | 4 + modules/chime-dashboard/variables.tf | 4 + outputs.tf | 4 + 8 files changed, 368 insertions(+) create mode 100644 modules/chime-dashboard/LICENSE create mode 100644 modules/chime-dashboard/README.md create mode 100644 modules/chime-dashboard/main.tf create mode 100644 modules/chime-dashboard/outputs.tf create mode 100644 modules/chime-dashboard/variables.tf diff --git a/README.md b/README.md index 881a571..ac4f1e7 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,7 @@ Each AWS resource has an associated module that will create Lightstep dashboards * __Amplify__ (module: [`amplify-dashboard`](https://github.com/lightstep/terraform-lightstep-aws-dashboards/tree/master/modules/amplify-dashboard)) * __Backup__ (module: [`backup-dashboard`](https://github.com/lightstep/terraform-lightstep-aws-dashboards/tree/master/modules/backup-dashboard)) * __Chatbot__ (module: [`chatbot-dashboard`](https://github.com/lightstep/terraform-lightstep-aws-dashboards/tree/master/modules/chatbot-dashboard)) +* __Chime__ (module: [`chime-dashboard`](https://github.com/lightstep/terraform-lightstep-aws-dashboards/tree/master/modules/chime-dashboard)) ## How to Use This Module diff --git a/main.tf b/main.tf index 823ddc7..7df525a 100644 --- a/main.tf +++ b/main.tf @@ -124,3 +124,8 @@ module "lightstep_chatbot_dashboard" { source = "./modules/chatbot-dashboard" lightstep_project = var.lightstep_project } + +module "lightstep_chime_dashboard" { + source = "./modules/chime-dashboard" + lightstep_project = var.lightstep_project +} diff --git a/modules/chime-dashboard/LICENSE b/modules/chime-dashboard/LICENSE new file mode 100644 index 0000000..c15e236 --- /dev/null +++ b/modules/chime-dashboard/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 2022 Lightstep + + 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/chime-dashboard/README.md b/modules/chime-dashboard/README.md new file mode 100644 index 0000000..eac5512 --- /dev/null +++ b/modules/chime-dashboard/README.md @@ -0,0 +1,3 @@ +# Lightstep AWS Chime Dashboard + +This module provisions a Lightstep dashboard for AWS Chime. diff --git a/modules/chime-dashboard/main.tf b/modules/chime-dashboard/main.tf new file mode 100644 index 0000000..d3ec316 --- /dev/null +++ b/modules/chime-dashboard/main.tf @@ -0,0 +1,146 @@ +terraform { + required_providers { + lightstep = { + source = "lightstep/lightstep" + version = "~> 1.60.2" + } + } + required_version = ">= v1.0.11" +} + +resource "lightstep_metric_dashboard" "aws_chime_dashboard" { + project_name = var.lightstep_project + dashboard_name = "AWS Chime SDK" + + chart { + name = "Attendee Authorization" + rank = "0" + type = "timeseries" + + query { + query_name = "a" + display = "bar" + hidden = false + + metric = "aws.chime.attendee_authorization_success_sum" + timeseries_operator = "delta" + + + group_by { + aggregation_method = "sum" + keys = [] + } + + } + + query { + query_name = "b" + display = "bar" + hidden = false + + metric = "aws.chime.attendee_authorization_error_sum" + timeseries_operator = "delta" + + + group_by { + aggregation_method = "sum" + keys = [] + } + + } + + } + + chart { + name = "Attendee Audio" + rank = "1" + type = "timeseries" + + query { + query_name = "a" + display = "bar" + hidden = false + + metric = "aws.chime.attendee_audio_drops_sum" + timeseries_operator = "delta" + + + group_by { + aggregation_method = "sum" + keys = [] + } + + } + + } + + chart { + name = "Attendee Content" + rank = "2" + type = "timeseries" + + query { + query_name = "a" + display = "bar" + hidden = false + + metric = "aws.chime.attendee_content_drops_sum" + timeseries_operator = "delta" + + + group_by { + aggregation_method = "sum" + keys = [] + } + + } + + } + + chart { + name = "Meeting SQS" + rank = "3" + type = "timeseries" + + query { + query_name = "a" + display = "bar" + hidden = false + + metric = "aws.chime.meeting_sqs_notification_errors_sum" + timeseries_operator = "delta" + + + group_by { + aggregation_method = "sum" + keys = [] + } + + } + + } + + chart { + name = "Meeting SNS" + rank = "4" + type = "timeseries" + + query { + query_name = "a" + display = "bar" + hidden = false + + metric = "aws.chime.meeting_sns_notification_errors_sum" + timeseries_operator = "delta" + + + group_by { + aggregation_method = "sum" + keys = [] + } + + } + + } + +} diff --git a/modules/chime-dashboard/outputs.tf b/modules/chime-dashboard/outputs.tf new file mode 100644 index 0000000..e7d3539 --- /dev/null +++ b/modules/chime-dashboard/outputs.tf @@ -0,0 +1,4 @@ +output "dashboard_url" { + value = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_metric_dashboard.aws_chime_dashboard.id}" + description = "Chime Dashboard URL" +} diff --git a/modules/chime-dashboard/variables.tf b/modules/chime-dashboard/variables.tf new file mode 100644 index 0000000..21ee69f --- /dev/null +++ b/modules/chime-dashboard/variables.tf @@ -0,0 +1,4 @@ +variable "lightstep_project" { + description = "Name of Lightstep project" + type = string +} diff --git a/outputs.tf b/outputs.tf index 34ac6d4..62e8acd 100644 --- a/outputs.tf +++ b/outputs.tf @@ -107,3 +107,7 @@ output "lightstep_chatbot_dashboard_url" { value = module.lightstep_chatbot_dashboard.dashboard_url description = "Lightstep AWS Chatbot Dashboard URL" } +output "lightstep_chime_dashboard_url" { + value = module.lightstep_chime_dashboard.dashboard_url + description = "Lightstep AWS Chime Dashboard URL" +} From cc6f0b90463ddfbb32ab2f49e933e157d151b0c4 Mon Sep 17 00:00:00 2001 From: Nathan Slaughter <28688390+nslaughter@users.noreply.github.com> Date: Thu, 10 Nov 2022 14:17:47 -0600 Subject: [PATCH 2/2] tweaked chart titles to use verbose metric names --- modules/chime-dashboard/main.tf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/chime-dashboard/main.tf b/modules/chime-dashboard/main.tf index d3ec316..a7c95e6 100644 --- a/modules/chime-dashboard/main.tf +++ b/modules/chime-dashboard/main.tf @@ -52,7 +52,7 @@ resource "lightstep_metric_dashboard" "aws_chime_dashboard" { } chart { - name = "Attendee Audio" + name = "Attendee Audio Drops" rank = "1" type = "timeseries" @@ -75,7 +75,7 @@ resource "lightstep_metric_dashboard" "aws_chime_dashboard" { } chart { - name = "Attendee Content" + name = "Attendee Content Drops" rank = "2" type = "timeseries" @@ -98,7 +98,7 @@ resource "lightstep_metric_dashboard" "aws_chime_dashboard" { } chart { - name = "Meeting SQS" + name = "Meeting SQS Errors" rank = "3" type = "timeseries" @@ -121,7 +121,7 @@ resource "lightstep_metric_dashboard" "aws_chime_dashboard" { } chart { - name = "Meeting SNS" + name = "Meeting SNS Errors" rank = "4" type = "timeseries"