From 5fa9113d9bd1c442c9eaf92a875dc49c855206c9 Mon Sep 17 00:00:00 2001
From: Nathan Slaughter <28688390+nslaughter@users.noreply.github.com>
Date: Thu, 2 Mar 2023 16:51:07 -0600
Subject: [PATCH 01/10] [kinesis-dashboard] Updated query style

---
 modules/kinesis-dashboard/main.tf    | 179 +++++++--------------------
 modules/kinesis-dashboard/outputs.tf |   2 +-
 2 files changed, 47 insertions(+), 134 deletions(-)

diff --git a/modules/kinesis-dashboard/main.tf b/modules/kinesis-dashboard/main.tf
index d3c45b1..9709a9e 100644
--- a/modules/kinesis-dashboard/main.tf
+++ b/modules/kinesis-dashboard/main.tf
@@ -8,9 +8,11 @@ terraform {
   required_version = ">= v1.0.11"
 }
 
-resource "lightstep_metric_dashboard" "aws_kinesis_dashboard" {
-  project_name   = var.lightstep_project
-  dashboard_name = "AWS Kinesis"
+
+resource "lightstep_dashboard" "aws_kinesis_dashboard" {
+  project_name          = var.lightstep_project
+  dashboard_name        = "AWS Kinesis"
+  dashboard_description = ""
 
   chart {
     name = "Incoming Records / Incoming Bytes"
@@ -18,35 +20,17 @@ resource "lightstep_metric_dashboard" "aws_kinesis_dashboard" {
     type = "timeseries"
 
     query {
-      query_name = "a"
-      display    = "line"
-      hidden     = false
-
-      metric              = "aws.kinesis.incoming_records_sum"
-      timeseries_operator = "delta"
-
-
-      group_by {
-        aggregation_method = "sum"
-        keys               = []
-      }
-
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = "metric aws.kinesis.incoming_records_sum | delta | group_by [], sum"
     }
 
     query {
-      query_name = "b"
-      display    = "line"
-      hidden     = false
-
-      metric              = "aws.kinesis.incoming_bytes_sum"
-      timeseries_operator = "delta"
-
-
-      group_by {
-        aggregation_method = "sum"
-        keys               = []
-      }
-
+      query_name   = "b"
+      display      = "line"
+      hidden       = false
+      query_string = "metric aws.kinesis.incoming_bytes_sum | delta | group_by [], sum"
     }
 
   }
@@ -57,35 +41,17 @@ resource "lightstep_metric_dashboard" "aws_kinesis_dashboard" {
     type = "timeseries"
 
     query {
-      query_name = "a"
-      display    = "line"
-      hidden     = false
-
-      metric              = "aws.kinesis.get_records_records_count"
-      timeseries_operator = "delta"
-
-
-      group_by {
-        aggregation_method = "sum"
-        keys               = []
-      }
-
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = "metric aws.kinesis.get_records_records_count | delta | group_by [], sum"
     }
 
     query {
-      query_name = "b"
-      display    = "line"
-      hidden     = false
-
-      metric              = "aws.kinesis.get_records_latency_max"
-      timeseries_operator = "last"
-
-
-      group_by {
-        aggregation_method = "sum"
-        keys               = []
-      }
-
+      query_name   = "b"
+      display      = "line"
+      hidden       = false
+      query_string = "metric aws.kinesis.get_records_latency_max | latest | group_by [], sum"
     }
 
   }
@@ -96,19 +62,10 @@ resource "lightstep_metric_dashboard" "aws_kinesis_dashboard" {
     type = "timeseries"
 
     query {
-      query_name = "a"
-      display    = "line"
-      hidden     = false
-
-      metric              = "aws.kinesis.get_records_success_count"
-      timeseries_operator = "delta"
-
-
-      group_by {
-        aggregation_method = "sum"
-        keys               = []
-      }
-
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = "metric aws.kinesis.get_records_success_count | delta | group_by [], sum"
     }
 
   }
@@ -119,35 +76,17 @@ resource "lightstep_metric_dashboard" "aws_kinesis_dashboard" {
     type = "timeseries"
 
     query {
-      query_name = "a"
-      display    = "line"
-      hidden     = false
-
-      metric              = "aws.kinesis.write_provisioned_throughput_exceeded_max"
-      timeseries_operator = "last"
-
-
-      group_by {
-        aggregation_method = "sum"
-        keys               = []
-      }
-
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = "metric aws.kinesis.write_provisioned_throughput_exceeded_max | latest | group_by [], sum"
     }
 
     query {
-      query_name = "b"
-      display    = "line"
-      hidden     = false
-
-      metric              = "aws.kinesis.read_provisioned_throughput_exceeded_max"
-      timeseries_operator = "last"
-
-
-      group_by {
-        aggregation_method = "sum"
-        keys               = []
-      }
-
+      query_name   = "b"
+      display      = "line"
+      hidden       = false
+      query_string = "metric aws.kinesis.read_provisioned_throughput_exceeded_max | latest | group_by [], sum"
     }
 
   }
@@ -158,35 +97,17 @@ resource "lightstep_metric_dashboard" "aws_kinesis_dashboard" {
     type = "timeseries"
 
     query {
-      query_name = "a"
-      display    = "line"
-      hidden     = false
-
-      metric              = "aws.kinesis.put_records_total_records_count"
-      timeseries_operator = "delta"
-
-
-      group_by {
-        aggregation_method = "sum"
-        keys               = []
-      }
-
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = "metric aws.kinesis.put_records_total_records_count | delta | group_by [], sum"
     }
 
     query {
-      query_name = "b"
-      display    = "line"
-      hidden     = false
-
-      metric              = "aws.kinesis.put_record_latency_max"
-      timeseries_operator = "last"
-
-
-      group_by {
-        aggregation_method = "sum"
-        keys               = []
-      }
-
+      query_name   = "b"
+      display      = "line"
+      hidden       = false
+      query_string = "metric aws.kinesis.put_record_latency_max | latest | group_by [], sum"
     }
 
   }
@@ -197,21 +118,13 @@ resource "lightstep_metric_dashboard" "aws_kinesis_dashboard" {
     type = "timeseries"
 
     query {
-      query_name = "a"
-      display    = "line"
-      hidden     = false
-
-      metric              = "aws.kinesis.put_record_success_count"
-      timeseries_operator = "delta"
-
-
-      group_by {
-        aggregation_method = "sum"
-        keys               = []
-      }
-
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = "metric aws.kinesis.put_record_success_count | delta | group_by [], sum"
     }
 
   }
 
 }
+
diff --git a/modules/kinesis-dashboard/outputs.tf b/modules/kinesis-dashboard/outputs.tf
index fa3ab1e..6df5e3d 100644
--- a/modules/kinesis-dashboard/outputs.tf
+++ b/modules/kinesis-dashboard/outputs.tf
@@ -1,4 +1,4 @@
 output "dashboard_url" {
-  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_metric_dashboard.aws_kinesis_dashboard.id}"
+  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.aws_kinesis_dashboard.id}"
   description = "Kinesis Dashboard URL"
 }
\ No newline at end of file

From 2a5f4c586d9999b136dbecd1310187a118729063 Mon Sep 17 00:00:00 2001
From: Heber Silva <heber.silva@lightstep.com>
Date: Fri, 3 Mar 2023 19:06:40 -0500
Subject: [PATCH 02/10] added multiline <<EOT

---
 modules/kinesis-dashboard/main.tf | 40 +++++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/modules/kinesis-dashboard/main.tf b/modules/kinesis-dashboard/main.tf
index 9709a9e..c713b21 100644
--- a/modules/kinesis-dashboard/main.tf
+++ b/modules/kinesis-dashboard/main.tf
@@ -23,14 +23,18 @@ resource "lightstep_dashboard" "aws_kinesis_dashboard" {
       query_name   = "a"
       display      = "line"
       hidden       = false
-      query_string = "metric aws.kinesis.incoming_records_sum | delta | group_by [], sum"
+      query_string = <<EOT
+metric aws.kinesis.incoming_records_sum | delta | group_by [], sum
+EOT
     }
 
     query {
       query_name   = "b"
       display      = "line"
       hidden       = false
-      query_string = "metric aws.kinesis.incoming_bytes_sum | delta | group_by [], sum"
+      query_string = <<EOT
+metric aws.kinesis.incoming_bytes_sum | delta | group_by [], sum
+EOT
     }
 
   }
@@ -44,14 +48,18 @@ resource "lightstep_dashboard" "aws_kinesis_dashboard" {
       query_name   = "a"
       display      = "line"
       hidden       = false
-      query_string = "metric aws.kinesis.get_records_records_count | delta | group_by [], sum"
+      query_string = <<EOT
+metric aws.kinesis.get_records_records_count | delta | group_by [], sum
+EOT
     }
 
     query {
       query_name   = "b"
       display      = "line"
       hidden       = false
-      query_string = "metric aws.kinesis.get_records_latency_max | latest | group_by [], sum"
+      query_string = <<EOT
+metric aws.kinesis.get_records_latency_max | latest | group_by [], sum
+EOT
     }
 
   }
@@ -65,7 +73,9 @@ resource "lightstep_dashboard" "aws_kinesis_dashboard" {
       query_name   = "a"
       display      = "line"
       hidden       = false
-      query_string = "metric aws.kinesis.get_records_success_count | delta | group_by [], sum"
+      query_string = <<EOT
+metric aws.kinesis.get_records_success_count | delta | group_by [], sum
+EOT
     }
 
   }
@@ -79,14 +89,18 @@ resource "lightstep_dashboard" "aws_kinesis_dashboard" {
       query_name   = "a"
       display      = "line"
       hidden       = false
-      query_string = "metric aws.kinesis.write_provisioned_throughput_exceeded_max | latest | group_by [], sum"
+      query_string = <<EOT
+metric aws.kinesis.write_provisioned_throughput_exceeded_max | latest | group_by [], sum
+EOT
     }
 
     query {
       query_name   = "b"
       display      = "line"
       hidden       = false
-      query_string = "metric aws.kinesis.read_provisioned_throughput_exceeded_max | latest | group_by [], sum"
+      query_string = <<EOT
+metric aws.kinesis.read_provisioned_throughput_exceeded_max | latest | group_by [], sum
+EOT
     }
 
   }
@@ -100,14 +114,18 @@ resource "lightstep_dashboard" "aws_kinesis_dashboard" {
       query_name   = "a"
       display      = "line"
       hidden       = false
-      query_string = "metric aws.kinesis.put_records_total_records_count | delta | group_by [], sum"
+      query_string = <<EOT
+metric aws.kinesis.put_records_total_records_count | delta | group_by [], sum
+EOT
     }
 
     query {
       query_name   = "b"
       display      = "line"
       hidden       = false
-      query_string = "metric aws.kinesis.put_record_latency_max | latest | group_by [], sum"
+      query_string = <<EOT
+metric aws.kinesis.put_record_latency_max | latest | group_by [], sum
+EOT
     }
 
   }
@@ -121,7 +139,9 @@ resource "lightstep_dashboard" "aws_kinesis_dashboard" {
       query_name   = "a"
       display      = "line"
       hidden       = false
-      query_string = "metric aws.kinesis.put_record_success_count | delta | group_by [], sum"
+      query_string = <<EOT
+metric aws.kinesis.put_record_success_count | delta | group_by [], sum
+EOT
     }
 
   }

From 7b35af75f79b877b38a67b26d667f171d54579fa Mon Sep 17 00:00:00 2001
From: Nathan Slaughter <28688390+nslaughter@users.noreply.github.com>
Date: Thu, 2 Mar 2023 16:24:39 -0600
Subject: [PATCH 03/10] Update dynamo dashboard (#62)

* [dynamo] Update dashboard

* [dynamodb] Group table metrics by TableName
---
 modules/dynamodb-dashboard/main.tf    | 200 +++++++++-----------------
 modules/dynamodb-dashboard/outputs.tf |   2 +-
 2 files changed, 67 insertions(+), 135 deletions(-)

diff --git a/modules/dynamodb-dashboard/main.tf b/modules/dynamodb-dashboard/main.tf
index 828cb43..83907f3 100644
--- a/modules/dynamodb-dashboard/main.tf
+++ b/modules/dynamodb-dashboard/main.tf
@@ -8,9 +8,11 @@ terraform {
   required_version = ">= v1.0.11"
 }
 
-resource "lightstep_metric_dashboard" "aws_dynamodb_dashboard" {
-  project_name   = var.lightstep_project
-  dashboard_name = "AWS DynamoDB"
+
+resource "lightstep_dashboard" "aws_dynamodb_dashboard" {
+  project_name          = var.lightstep_project
+  dashboard_name        = "AWS DynamoDB"
+  dashboard_description = "Monitor DynamoDB with this overview dashboard."
 
   chart {
     name = "Request Latency Per Table"
@@ -18,19 +20,12 @@ resource "lightstep_metric_dashboard" "aws_dynamodb_dashboard" {
     type = "timeseries"
 
     query {
-      query_name = "a"
-      display    = "line"
-      hidden     = false
-
-      metric              = "aws.dynamo_db.successful_request_latency_max"
-      timeseries_operator = "last"
-
-
-      group_by {
-        aggregation_method = "max"
-        keys               = ["TableName", ]
-      }
-
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric aws.dynamo_db.successful_request_latency_max | latest | group_by ["TableName"], max
+EOT
     }
 
   }
@@ -41,19 +36,12 @@ resource "lightstep_metric_dashboard" "aws_dynamodb_dashboard" {
     type = "timeseries"
 
     query {
-      query_name = "a"
-      display    = "bar"
-      hidden     = false
-
-      metric              = "aws.dynamo_db.provisioned_read_capacity_units_count"
-      timeseries_operator = "delta"
-
-
-      group_by {
-        aggregation_method = "max"
-        keys               = ["TableName", ]
-      }
-
+      query_name   = "a"
+      display      = "bar"
+      hidden       = false
+      query_string = <<EOT
+metric aws.dynamo_db.provisioned_read_capacity_units_count | delta | group_by ["TableName"], max
+EOT
     }
 
   }
@@ -64,19 +52,12 @@ resource "lightstep_metric_dashboard" "aws_dynamodb_dashboard" {
     type = "timeseries"
 
     query {
-      query_name = "a"
-      display    = "bar"
-      hidden     = false
-
-      metric              = "aws.dynamo_db.provisioned_write_capacity_units_count"
-      timeseries_operator = "delta"
-
-
-      group_by {
-        aggregation_method = "sum"
-        keys               = []
-      }
-
+      query_name   = "a"
+      display      = "bar"
+      hidden       = false
+      query_string = <<EOT
+metric aws.dynamo_db.provisioned_write_capacity_units_count | delta | group_by ["TableName"], sum
+EOT
     }
 
   }
@@ -87,35 +68,21 @@ resource "lightstep_metric_dashboard" "aws_dynamodb_dashboard" {
     type = "timeseries"
 
     query {
-      query_name = "a"
-      display    = "line"
-      hidden     = false
-
-      metric              = "aws.dynamo_db.account_provisioned_read_capacity_utilization_max"
-      timeseries_operator = "last"
-
-
-      group_by {
-        aggregation_method = "sum"
-        keys               = []
-      }
-
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric aws.dynamo_db.account_provisioned_read_capacity_utilization_max | latest | group_by ["TableName"], sum
+EOT
     }
 
     query {
-      query_name = "b"
-      display    = "line"
-      hidden     = false
-
-      metric              = "aws.dynamo_db.max_provisioned_table_write_capacity_utilization_max"
-      timeseries_operator = "last"
-
-
-      group_by {
-        aggregation_method = "sum"
-        keys               = []
-      }
-
+      query_name   = "b"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric aws.dynamo_db.max_provisioned_table_write_capacity_utilization_max | latest | group_by ["TableName"], sum
+EOT
     }
 
   }
@@ -126,19 +93,12 @@ resource "lightstep_metric_dashboard" "aws_dynamodb_dashboard" {
     type = "timeseries"
 
     query {
-      query_name = "a"
-      display    = "line"
-      hidden     = false
-
-      metric              = "aws.dynamo_db.returned_item_count_count"
-      timeseries_operator = "delta"
-
-
-      group_by {
-        aggregation_method = "sum"
-        keys               = ["TableName", ]
-      }
-
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric aws.dynamo_db.returned_item_count_count | delta | group_by ["TableName"], sum
+EOT
     }
 
   }
@@ -149,35 +109,21 @@ resource "lightstep_metric_dashboard" "aws_dynamodb_dashboard" {
     type = "timeseries"
 
     query {
-      query_name = "a"
-      display    = "line"
-      hidden     = false
-
-      metric              = "aws.dynamo_db.account_max_table_level_reads_count"
-      timeseries_operator = "delta"
-
-
-      group_by {
-        aggregation_method = "sum"
-        keys               = []
-      }
-
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric aws.dynamo_db.account_max_table_level_reads_count | delta | group_by ["TableName"], sum
+EOT
     }
 
     query {
-      query_name = "b"
-      display    = "line"
-      hidden     = false
-
-      metric              = "aws.dynamo_db.account_max_table_level_writes_count"
-      timeseries_operator = "delta"
-
-
-      group_by {
-        aggregation_method = "sum"
-        keys               = []
-      }
-
+      query_name   = "b"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric aws.dynamo_db.account_max_table_level_writes_count | delta | group_by ["TableName"], sum
+EOT
     }
 
   }
@@ -188,37 +134,23 @@ resource "lightstep_metric_dashboard" "aws_dynamodb_dashboard" {
     type = "timeseries"
 
     query {
-      query_name = "a"
-      display    = "line"
-      hidden     = false
-
-      metric              = "aws.dynamo_db.account_max_reads_count"
-      timeseries_operator = "delta"
-
-
-      group_by {
-        aggregation_method = "sum"
-        keys               = []
-      }
-
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric aws.dynamo_db.account_max_reads_count | delta | group_by [], sum
+EOT
     }
 
     query {
-      query_name = "b"
-      display    = "line"
-      hidden     = false
-
-      metric              = "aws.dynamo_db.account_max_writes_count"
-      timeseries_operator = "delta"
-
-
-      group_by {
-        aggregation_method = "sum"
-        keys               = []
-      }
-
+      query_name   = "b"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric aws.dynamo_db.account_max_writes_count | delta | group_by [], sum
+EOT
     }
 
   }
 
-}
\ No newline at end of file
+}
diff --git a/modules/dynamodb-dashboard/outputs.tf b/modules/dynamodb-dashboard/outputs.tf
index dbfea27..5199571 100644
--- a/modules/dynamodb-dashboard/outputs.tf
+++ b/modules/dynamodb-dashboard/outputs.tf
@@ -1,4 +1,4 @@
 output "dashboard_url" {
-  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_metric_dashboard.aws_dynamodb_dashboard.id}"
+  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.aws_dynamodb_dashboard.id}"
   description = "DynamoDB Dashboard URL"
 }
\ No newline at end of file

From 38cdd7a454500d5c836d3aebd1da6cc426e3664e Mon Sep 17 00:00:00 2001
From: Nathan Slaughter <28688390+nslaughter@users.noreply.github.com>
Date: Thu, 2 Mar 2023 16:55:35 -0600
Subject: [PATCH 04/10] Add Athena (#55)

---
 modules/athena-dashboard/LICENSE      | 201 ++++++++++++++++++++++++++
 modules/athena-dashboard/README.md    |   3 +
 modules/athena-dashboard/main.tf      | 129 +++++++++++++++++
 modules/athena-dashboard/outputs.tf   |   4 +
 modules/athena-dashboard/variables.tf |   4 +
 5 files changed, 341 insertions(+)
 create mode 100644 modules/athena-dashboard/LICENSE
 create mode 100644 modules/athena-dashboard/README.md
 create mode 100644 modules/athena-dashboard/main.tf
 create mode 100644 modules/athena-dashboard/outputs.tf
 create mode 100644 modules/athena-dashboard/variables.tf

diff --git a/modules/athena-dashboard/LICENSE b/modules/athena-dashboard/LICENSE
new file mode 100644
index 0000000..c15e236
--- /dev/null
+++ b/modules/athena-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/athena-dashboard/README.md b/modules/athena-dashboard/README.md
new file mode 100644
index 0000000..0af9eb6
--- /dev/null
+++ b/modules/athena-dashboard/README.md
@@ -0,0 +1,3 @@
+# Lightstep AWS Athena Dashboard
+
+This module provisions a Lightstep dashboard for AWS Athena.
diff --git a/modules/athena-dashboard/main.tf b/modules/athena-dashboard/main.tf
new file mode 100644
index 0000000..8ac2b7e
--- /dev/null
+++ b/modules/athena-dashboard/main.tf
@@ -0,0 +1,129 @@
+terraform {
+  required_providers {
+    lightstep = {
+      source  = "lightstep/lightstep"
+      version = "~> 1.70.9"
+    }
+  }
+  required_version = ">= v1.0.11"
+}
+
+resource "lightstep_dashboard" "aws_athena_dashboard" {
+  project_name   = var.lightstep_project
+  dashboard_name = "Amazon Athena"
+
+  chart {
+    name = "Total Execution Time"
+    rank = "0"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "bar"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.athena.total_execution_time_sum | delta | group_by [], sum;
+  b = metric aws.athena.total_execution_time_count | delta | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
+    }
+
+  }
+
+  chart {
+    name = "Processed Bytes"
+    rank = "1"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "bar"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.athena.processed_bytes_sum | delta | group_by [], sum;
+  b = metric aws.athena.processed_bytes_count | delta | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
+    }
+
+  }
+
+  chart {
+    name = "Engine Execution Time"
+    rank = "2"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "bar"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.athena.engine_execution_time_sum | delta | group_by [], sum;
+  b = metric aws.athena.engine_execution_time_count | delta | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
+    }
+
+  }
+
+  chart {
+    name = "Query Queue Time"
+    rank = "3"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "bar"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.athena.query_queue_time_sum | delta | group_by [], sum;
+  b = metric aws.athena.query_queue_time_count | delta | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
+    }
+
+  }
+
+  chart {
+    name = "Query Planning Time"
+    rank = "4"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "bar"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.athena.query_planning_time_sum | delta | group_by [], sum;
+  b = metric aws.athena.query_planning_time_count | delta | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
+    }
+
+  }
+
+  chart {
+    name = "Service Processing Time"
+    rank = "5"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "bar"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.athena.service_processing_time_sum | delta | group_by [], sum;
+  b = metric aws.athena.service_processing_time_count | delta | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
+    }
+
+  }
+
+}
diff --git a/modules/athena-dashboard/outputs.tf b/modules/athena-dashboard/outputs.tf
new file mode 100644
index 0000000..76be633
--- /dev/null
+++ b/modules/athena-dashboard/outputs.tf
@@ -0,0 +1,4 @@
+output "dashboard_url" {
+  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.aws_athena_dashboard.id}"
+  description = "Athena Dashboard URL"
+}
diff --git a/modules/athena-dashboard/variables.tf b/modules/athena-dashboard/variables.tf
new file mode 100644
index 0000000..21ee69f
--- /dev/null
+++ b/modules/athena-dashboard/variables.tf
@@ -0,0 +1,4 @@
+variable "lightstep_project" {
+  description = "Name of Lightstep project"
+  type        = string
+}

From 4a79286f8147d3bbd0cb22258d10c0d7cdab379e Mon Sep 17 00:00:00 2001
From: Heber Silva <heber.silva@lightstep.com>
Date: Thu, 2 Mar 2023 17:56:26 -0500
Subject: [PATCH 05/10] AWS eks terraform dashboard (#60)

* added aws eks terraform dashboard

* resolved fmt

* resolved fmt

* resolved fmt

* modified readme

* added lisc and readme

* Splitted eks-dashboard to eks-pod-* and eks-node-*

* resolved

* modified eks node and pod

* resolved fmt
---
 README.md                               |   2 +
 main.tf                                 |  10 ++
 modules/eks-node-dashboard/LICENSE      | 201 ++++++++++++++++++++++++
 modules/eks-node-dashboard/README.md    |   3 +
 modules/eks-node-dashboard/main.tf      | 148 +++++++++++++++++
 modules/eks-node-dashboard/outputs.tf   |   4 +
 modules/eks-node-dashboard/variables.tf |   4 +
 modules/eks-pod-dashboard/LICENSE       | 201 ++++++++++++++++++++++++
 modules/eks-pod-dashboard/README.md     |   3 +
 modules/eks-pod-dashboard/main.tf       |  92 +++++++++++
 modules/eks-pod-dashboard/outputs.tf    |   4 +
 modules/eks-pod-dashboard/variables.tf  |   4 +
 outputs.tf                              |  10 ++
 13 files changed, 686 insertions(+)
 create mode 100644 modules/eks-node-dashboard/LICENSE
 create mode 100644 modules/eks-node-dashboard/README.md
 create mode 100644 modules/eks-node-dashboard/main.tf
 create mode 100644 modules/eks-node-dashboard/outputs.tf
 create mode 100644 modules/eks-node-dashboard/variables.tf
 create mode 100644 modules/eks-pod-dashboard/LICENSE
 create mode 100644 modules/eks-pod-dashboard/README.md
 create mode 100644 modules/eks-pod-dashboard/main.tf
 create mode 100644 modules/eks-pod-dashboard/outputs.tf
 create mode 100644 modules/eks-pod-dashboard/variables.tf

diff --git a/README.md b/README.md
index f93cf6c..5dc4510 100644
--- a/README.md
+++ b/README.md
@@ -38,6 +38,8 @@ Each AWS resource has an associated module that will create Lightstep dashboards
 * __Chatbot__ (module: [`chatbot-dashboard`](https://github.com/lightstep/terraform-lightstep-aws-dashboards/tree/master/modules/chatbot-dashboard))
 * __CloudHSM__ (module: [`cloudhsm-dashboard`](https://github.com/lightstep/terraform-lightstep-aws-dashboards/tree/master/modules/cloudhsm-dashboard))
 * __Chime__ (module: [`chime-dashboard`](https://github.com/lightstep/terraform-lightstep-aws-dashboards/tree/master/modules/chime-dashboard))
+* __EKS_NODE__ (module: [`eks-node-dashboard`](https://github.com/lightstep/terraform-lightstep-aws-dashboards/tree/master/modules/eks-node-dashboard))
+* __EKS_POD__ (module: [`eks-pod-dashboard`](https://github.com/lightstep/terraform-lightstep-aws-dashboards/tree/master/modules/eks-pod-dashboard))
 
 ## How to Use This Module
 
diff --git a/main.tf b/main.tf
index 79087c1..423dd9a 100644
--- a/main.tf
+++ b/main.tf
@@ -134,3 +134,13 @@ module "lightstep_chime_dashboard" {
   source            = "./modules/chime-dashboard"
   lightstep_project = var.lightstep_project
 }
+
+module "lightstep_eks_node_dashboard" {
+  source            = "./modules/eks-node-dashboard"
+  lightstep_project = var.lightstep_project
+}
+
+module "lightstep_eks_pod_dashboard" {
+  source            = "./modules/eks-pod-dashboard"
+  lightstep_project = var.lightstep_project
+}
diff --git a/modules/eks-node-dashboard/LICENSE b/modules/eks-node-dashboard/LICENSE
new file mode 100644
index 0000000..c15e236
--- /dev/null
+++ b/modules/eks-node-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/eks-node-dashboard/README.md b/modules/eks-node-dashboard/README.md
new file mode 100644
index 0000000..60fd101
--- /dev/null
+++ b/modules/eks-node-dashboard/README.md
@@ -0,0 +1,3 @@
+# Lightstep AWS EKS Dashboard
+
+This module provisions a Lightstep dashboard for AWS EKS.
diff --git a/modules/eks-node-dashboard/main.tf b/modules/eks-node-dashboard/main.tf
new file mode 100644
index 0000000..1f6d6a6
--- /dev/null
+++ b/modules/eks-node-dashboard/main.tf
@@ -0,0 +1,148 @@
+terraform {
+  required_providers {
+    lightstep = {
+      source  = "lightstep/lightstep"
+      version = "~> 1.70.9"
+    }
+  }
+  required_version = ">= v1.0.11"
+}
+
+resource "lightstep_dashboard" "aws_eks_node_dashboard" {
+  project_name   = var.lightstep_project
+  dashboard_name = "AWS EKS Node"
+
+  chart {
+    name = "Cluster Node"
+    rank = "0"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "bar"
+      hidden       = false
+      query_string = "metric aws.eks.cluster_failed_node_count | delta | group_by [], sum"
+    }
+
+    query {
+      query_name   = "a"
+      display      = "bar"
+      hidden       = false
+      query_string = "metric aws.eks.cluster_node_count | delta | group_by [], sum"
+    }
+
+  }
+
+  chart {
+    name = "CPU"
+    rank = "1"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "bar"
+      hidden       = false
+      query_string = "metric aws.eks.node_cpu_limit_sum | delta | group_by [], sum"
+    }
+
+    query {
+      query_name   = "a"
+      display      = "bar"
+      hidden       = false
+      query_string = "metric aws.eks.node_cpu_reserved_capacity_sum | delta | group_by [], sum"
+    }
+
+  }
+
+  chart {
+    name = "CPU Usage Total"
+    rank = "2"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "bar"
+      hidden       = false
+      query_string = "metric aws.eks.node_cpu_usage_total_sum | delta | group_by [], sum"
+    }
+
+  }
+
+  chart {
+    name = "CPU Utilization"
+    rank = "3"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "bar"
+      hidden       = false
+      query_string = "metric aws.eks.node_cpu_utilization_sum | delta | group_by [], sum"
+    }
+
+  }
+
+  chart {
+    name = "Filesystem Utilization"
+    rank = "4"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "bar"
+      hidden       = false
+      query_string = "metric aws.eks.node_filesystem_utilization_sum | delta | group_by [], sum"
+    }
+
+  }
+
+  chart {
+    name = "Memory"
+    rank = "5"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "bar"
+      hidden       = false
+      query_string = "metric aws.eks.node_memory_utilization_sum | delta | group_by [], sum"
+    }
+
+    query {
+      query_name   = "a"
+      display      = "bar"
+      hidden       = false
+      query_string = "metric aws.eks.node_memory_reserved_capacity_sum | delta | group_by [], sum"
+    }
+
+  }
+
+  chart {
+    name = "Number of Running Containers"
+    rank = "6"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "bar"
+      hidden       = false
+      query_string = "metric aws.eks.node_number_of_running_containers_sum | delta | group_by [], sum"
+    }
+
+  }
+
+  chart {
+    name = "Number of Running PODS"
+    rank = "7"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "bar"
+      hidden       = false
+      query_string = "metric aws.eks.node_number_of_running_pods_sum | delta | group_by [], sum"
+    }
+
+  }
+
+}
diff --git a/modules/eks-node-dashboard/outputs.tf b/modules/eks-node-dashboard/outputs.tf
new file mode 100644
index 0000000..8ec9f9f
--- /dev/null
+++ b/modules/eks-node-dashboard/outputs.tf
@@ -0,0 +1,4 @@
+output "dashboard_url" {
+  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.aws_eks_node_dashboard.id}"
+  description = "EKS NODE Dashboard URL"
+}
diff --git a/modules/eks-node-dashboard/variables.tf b/modules/eks-node-dashboard/variables.tf
new file mode 100644
index 0000000..21ee69f
--- /dev/null
+++ b/modules/eks-node-dashboard/variables.tf
@@ -0,0 +1,4 @@
+variable "lightstep_project" {
+  description = "Name of Lightstep project"
+  type        = string
+}
diff --git a/modules/eks-pod-dashboard/LICENSE b/modules/eks-pod-dashboard/LICENSE
new file mode 100644
index 0000000..c15e236
--- /dev/null
+++ b/modules/eks-pod-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/eks-pod-dashboard/README.md b/modules/eks-pod-dashboard/README.md
new file mode 100644
index 0000000..60fd101
--- /dev/null
+++ b/modules/eks-pod-dashboard/README.md
@@ -0,0 +1,3 @@
+# Lightstep AWS EKS Dashboard
+
+This module provisions a Lightstep dashboard for AWS EKS.
diff --git a/modules/eks-pod-dashboard/main.tf b/modules/eks-pod-dashboard/main.tf
new file mode 100644
index 0000000..49ecac0
--- /dev/null
+++ b/modules/eks-pod-dashboard/main.tf
@@ -0,0 +1,92 @@
+terraform {
+  required_providers {
+    lightstep = {
+      source  = "lightstep/lightstep"
+      version = "~> 1.70.9"
+    }
+  }
+  required_version = ">= v1.0.11"
+}
+
+resource "lightstep_dashboard" "aws_eks_pod_dashboard" {
+  project_name   = var.lightstep_project
+  dashboard_name = "AWS EKS Pod"
+
+  chart {
+    name = "Number of Running Pods"
+    rank = "0"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "bar"
+      hidden       = false
+      query_string = "metric aws.eks.namespace_number_of_running_pods_sum | delta | group_by [], sum"
+    }
+
+  }
+
+  chart {
+    name = "Number of Container Restarts"
+    rank = "1"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "bar"
+      hidden       = false
+      query_string = "metric aws.eks.pod_number_of_container_restarts_sum | delta | group_by [], sum"
+    }
+
+  }
+
+  chart {
+    name = "CPU"
+    rank = "2"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "bar"
+      hidden       = false
+      query_string = "metric aws.eks.pod_cpu_reserved_capacity_sum | delta | group_by [], sum"
+    }
+
+    query {
+      query_name   = "a"
+      display      = "bar"
+      hidden       = false
+      query_string = "metric aws.eks.pod_cpu_utilization_over_pod_limit_sum | delta | group_by [], sum"
+    }
+
+    query {
+      query_name   = "a"
+      display      = "bar"
+      hidden       = false
+      query_string = "metric aws.eks.pod_cpu_utilization_sum | delta | group_by [], sum"
+    }
+
+  }
+
+  chart {
+    name = "Memory"
+    rank = "3"
+    type = "timeseries"
+
+    query {
+      query_name   = "a"
+      display      = "bar"
+      hidden       = false
+      query_string = "metric aws.eks.pod_memory_utilization_sum | delta | group_by [], sum"
+    }
+
+    query {
+      query_name   = "a"
+      display      = "bar"
+      hidden       = false
+      query_string = "metric aws.eks.pod_memory_utilization_over_pod_limit_sum | delta | group_by [], sum"
+    }
+
+  }
+
+}
diff --git a/modules/eks-pod-dashboard/outputs.tf b/modules/eks-pod-dashboard/outputs.tf
new file mode 100644
index 0000000..24ae10d
--- /dev/null
+++ b/modules/eks-pod-dashboard/outputs.tf
@@ -0,0 +1,4 @@
+output "dashboard_url" {
+  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.aws_eks_pod_dashboard.id}"
+  description = "EKS POD Dashboard URL"
+}
diff --git a/modules/eks-pod-dashboard/variables.tf b/modules/eks-pod-dashboard/variables.tf
new file mode 100644
index 0000000..21ee69f
--- /dev/null
+++ b/modules/eks-pod-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 6755dfe..c995ca0 100644
--- a/outputs.tf
+++ b/outputs.tf
@@ -123,3 +123,13 @@ output "lightstep_chime_dashboard_url" {
   value       = module.lightstep_chime_dashboard.dashboard_url
   description = "Lightstep AWS Chime Dashboard URL"
 }
+
+output "lightstep_eks_node_dashboard_url" {
+  value       = module.lightstep_eks_node_dashboard.dashboard_url
+  description = "Lightstep AWS EKS Node Dashboard URL"
+}
+
+output "lightstep_eks_pod_dashboard_url" {
+  value       = module.lightstep_eks_pod_dashboard.dashboard_url
+  description = "Lightstep AWS EKS Pods Dashboard URL"
+}

From 5a5591795a0871bdb033721d610701ec92a20679 Mon Sep 17 00:00:00 2001
From: Nathan Slaughter <28688390+nslaughter@users.noreply.github.com>
Date: Thu, 2 Mar 2023 16:57:42 -0600
Subject: [PATCH 06/10] Update CloudFront dashboard (#45)

Co-authored-by: githubsands <26752232+githubsands@users.noreply.github.com>
---
 modules/cloudfront-dashboard/LICENSE    |   0
 modules/cloudfront-dashboard/README.md  |   3 +
 modules/cloudfront-dashboard/main.tf    | 116 ++++++++++--------------
 modules/cloudfront-dashboard/outputs.tf |   2 +-
 4 files changed, 51 insertions(+), 70 deletions(-)
 create mode 100644 modules/cloudfront-dashboard/LICENSE
 create mode 100644 modules/cloudfront-dashboard/README.md

diff --git a/modules/cloudfront-dashboard/LICENSE b/modules/cloudfront-dashboard/LICENSE
new file mode 100644
index 0000000..e69de29
diff --git a/modules/cloudfront-dashboard/README.md b/modules/cloudfront-dashboard/README.md
new file mode 100644
index 0000000..bac33e3
--- /dev/null
+++ b/modules/cloudfront-dashboard/README.md
@@ -0,0 +1,3 @@
+# Lightstep AWS CloudFront Dashboard
+
+This module provisions a Lightstep dashboard for AWS CloudFront.
diff --git a/modules/cloudfront-dashboard/main.tf b/modules/cloudfront-dashboard/main.tf
index c305f8b..83e13a8 100644
--- a/modules/cloudfront-dashboard/main.tf
+++ b/modules/cloudfront-dashboard/main.tf
@@ -2,115 +2,93 @@ terraform {
   required_providers {
     lightstep = {
       source  = "lightstep/lightstep"
-      version = "~> 1.70.10"
+      version = "~> 1.70.9"
     }
   }
   required_version = ">= v1.0.11"
 }
 
-resource "lightstep_metric_dashboard" "aws_cloudfront_dashboard" {
+resource "lightstep_dashboard" "aws_cloudfront_dashboard" {
   project_name   = var.lightstep_project
   dashboard_name = "AWS CloudFront"
 
   chart {
-    name = "Requests"
+    name = "Requests / TotalErrorRate"
     rank = "0"
     type = "timeseries"
 
     query {
-      query_name = "a"
-      display    = "bar"
-      hidden     = false
-
-      metric              = "aws.cloudfront.requests_count"
-      timeseries_operator = "delta"
-
-
-      group_by {
-        aggregation_method = "sum"
-        keys               = ["DistributionId", ]
-      }
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = "metric aws.cloudfront.requests_sum | delta | group_by [], sum"
+    }
 
+    query {
+      query_name   = "b"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.cloudfront.total_error_rate_sum | reduce sum | group_by [], sum;
+  b = metric aws.cloudfront.total_error_rate_count | reduce sum | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
     }
 
   }
 
   chart {
-    name = "4xx Error Rate"
+    name = "4xxErrorRate / 5xxErrorRate"
     rank = "1"
     type = "timeseries"
 
     query {
-      query_name = "a"
-      display    = "bar"
-      hidden     = false
-
-      metric              = "aws.cloudfront.4_xx_error_rate_count"
-      timeseries_operator = "delta"
-
-
-      group_by {
-        aggregation_method = "sum"
-        keys               = ["DistributionId", ]
-      }
-
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.cloudfront.4xx_error_rate_sum | reduce sum | group_by [], sum;
+  b = metric aws.cloudfront.4xx_error_rate_count | reduce sum | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
     }
 
     query {
-      query_name = "b"
-      display    = "bar"
-      hidden     = false
-
-      metric              = "aws.cloudfront.5xx_error_rate_count"
-      timeseries_operator = "delta"
-
-
-      group_by {
-        aggregation_method = "sum"
-        keys               = ["DistributionId", ]
-      }
-
+      query_name   = "b"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.cloudfront.5xx_error_rate_sum | reduce sum | group_by [], sum;
+  b = metric aws.cloudfront.5xx_error_rate_count | reduce sum | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
     }
 
   }
 
   chart {
-    name = "Bytes Downloaded"
+    name = "BytesDownloaded / BytesUploaded"
     rank = "2"
     type = "timeseries"
 
     query {
-      query_name = "a"
-      display    = "bar"
-      hidden     = false
-
-      metric              = "aws.cloudfront.bytes_downloaded_count"
-      timeseries_operator = "delta"
-
-
-      group_by {
-        aggregation_method = "sum"
-        keys               = ["DistributionId", ]
-      }
-
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = "metric aws.cloudfront.bytes_downloaded_sum | delta | group_by [], sum"
     }
 
     query {
-      query_name = "b"
-      display    = "bar"
-      hidden     = false
-
-      metric              = "aws.cloudfront.bytes_uploaded_count"
-      timeseries_operator = "delta"
-
-
-      group_by {
-        aggregation_method = "sum"
-        keys               = ["DistributionId", ]
-      }
-
+      query_name   = "b"
+      display      = "line"
+      hidden       = false
+      query_string = "metric aws.cloudfront.bytes_uploaded_sum | delta | group_by [], sum"
     }
 
   }
 
 }
+
diff --git a/modules/cloudfront-dashboard/outputs.tf b/modules/cloudfront-dashboard/outputs.tf
index 69eef36..2a37afa 100644
--- a/modules/cloudfront-dashboard/outputs.tf
+++ b/modules/cloudfront-dashboard/outputs.tf
@@ -1,4 +1,4 @@
 output "dashboard_url" {
-  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_metric_dashboard.aws_cloudfront_dashboard.id}"
+  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.aws_cloudfront_dashboard.id}"
   description = "CLOUDFRONT Dashboard URL"
 }

From 590302f73f2604438e34911bdbd9ae68eef1bf64 Mon Sep 17 00:00:00 2001
From: Nathan Slaughter <28688390+nslaughter@users.noreply.github.com>
Date: Thu, 2 Mar 2023 16:58:25 -0600
Subject: [PATCH 07/10] Updates Application ELB dashboard (#43)

Checked to validate that we can upload the dashboard to Lightstep and
get back the same.

Co-authored-by: githubsands <26752232+githubsands@users.noreply.github.com>
---
 modules/applicationelb-dashboard/main.tf    | 311 +++++++++++++++-----
 modules/applicationelb-dashboard/outputs.tf |   2 +-
 2 files changed, 234 insertions(+), 79 deletions(-)

diff --git a/modules/applicationelb-dashboard/main.tf b/modules/applicationelb-dashboard/main.tf
index 2869025..5b6b907 100644
--- a/modules/applicationelb-dashboard/main.tf
+++ b/modules/applicationelb-dashboard/main.tf
@@ -2,151 +2,306 @@ terraform {
   required_providers {
     lightstep = {
       source  = "lightstep/lightstep"
-      version = "~> 1.70.10"
+      version = "~> 1.70.9"
     }
   }
   required_version = ">= v1.0.11"
 }
 
-resource "lightstep_metric_dashboard" "aws_app_elb_dashboard" {
+resource "lightstep_dashboard" "aws_app_elb_dashboard" {
   project_name   = var.lightstep_project
-  dashboard_name = "AWS Application ELB"
+  dashboard_name = "AWS ELB Application Load Balancer"
 
   chart {
-    name = "Request Count"
-    rank = "1"
+    name = "RequestCount / TargetResponseTime"
+    rank = "0"
     type = "timeseries"
 
     query {
-      query_name = "a"
-      display    = "bar"
-      hidden     = false
-
-      metric              = "aws.applicationelb.request_count_count"
-      timeseries_operator = "delta"
-
-
-      group_by {
-        aggregation_method = "max"
-        keys               = ["LoadBalancer", ]
-      }
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = "metric aws.applicationelb.request_count_sum | delta | group_by [], sum"
+    }
 
+    query {
+      query_name   = "b"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.applicationelb.target_response_time_sum | reduce sum | group_by [], sum;
+  b = metric aws.applicationelb.target_response_time_count | reduce sum | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
     }
 
   }
 
   chart {
-    name = "HTTP Code"
-    rank = "2"
+    name = "HTTPCode_Target"
+    rank = "1"
     type = "timeseries"
 
     query {
-      query_name = "a"
-      display    = "line"
-      hidden     = false
-
-      metric              = "aws.applicationelb.http_code_elb_5xx_count_count"
-      timeseries_operator = "rate"
-
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = "metric aws.applicationelb.http_code_target_5xx_count_sum | delta | group_by [], sum"
+    }
 
-      group_by {
-        aggregation_method = "max"
-        keys               = ["LoadBalancer", ]
-      }
+    query {
+      query_name   = "b"
+      display      = "line"
+      hidden       = false
+      query_string = "metric aws.applicationelb.http_code_target_4xx_count_sum | delta | group_by [], sum"
+    }
 
+    query {
+      query_name   = "c"
+      display      = "line"
+      hidden       = false
+      query_string = "metric aws.applicationelb.http_code_target_3xx_count_sum | delta | group_by [], sum"
     }
 
     query {
-      query_name = "b"
-      display    = "line"
-      hidden     = false
+      query_name   = "d"
+      display      = "line"
+      hidden       = false
+      query_string = "metric aws.applicationelb.http_code_target_2xx_count_sum | delta | group_by [], sum"
+    }
+
+  }
 
-      metric              = "aws.applicationelb.http_code_elb_4xx_count_count"
-      timeseries_operator = "rate"
+  chart {
+    name = "HTTPCode_ELB"
+    rank = "2"
+    type = "timeseries"
 
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = "metric aws.applicationelb.http_code_elb_3xx_count_sum | delta | group_by [], sum"
+    }
 
-      group_by {
-        aggregation_method = "max"
-        keys               = ["LoadBalancer", ]
-      }
+    query {
+      query_name   = "b"
+      display      = "line"
+      hidden       = false
+      query_string = "metric aws.applicationelb.http_code_elb_4xx_count_sum | delta | group_by [], sum"
+    }
 
+    query {
+      query_name   = "c"
+      display      = "line"
+      hidden       = false
+      query_string = "metric aws.applicationelb.http_code_elb_5xx_count_sum | delta | group_by [], sum"
     }
 
   }
 
   chart {
-    name = "Connection Count"
+    name = "ConnectionCount"
     rank = "3"
     type = "timeseries"
 
     query {
-      query_name = "a"
-      display    = "bar"
-      hidden     = false
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.applicationelb.active_connection_count_sum | reduce sum | group_by [], sum;
+  b = metric aws.applicationelb.active_connection_count_count | reduce sum | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
+    }
 
-      metric              = "aws.applicationelb.active_connection_count_count"
-      timeseries_operator = "delta"
+    query {
+      query_name   = "b"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.applicationelb.new_connection_count_sum | reduce sum | group_by [], sum;
+  b = metric aws.applicationelb.new_connection_count_count | reduce sum | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
+    }
 
-      group_by {
-        aggregation_method = "max"
-        keys               = ["LoadBalancer", ]
-      }
+    query {
+      query_name   = "c"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.applicationelb.rejected_connection_count_sum | reduce sum | group_by [], sum;
+  b = metric aws.applicationelb.rejected_connection_count_count | reduce sum | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
+    }
 
+    query {
+      query_name   = "d"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.applicationelb.target_connection_error_count_sum | reduce sum | group_by [], sum;
+  b = metric aws.applicationelb.target_connection_error_count_count | reduce sum | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
     }
 
+  }
+
+  chart {
+    name = "ConsumedLBCapacityUnits / ConsumedLCUs / ProcessedBytes"
+    rank = "4"
+    type = "timeseries"
+
     query {
-      query_name = "b"
-      display    = "bar"
-      hidden     = false
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.applicationelb.consumed_lb_capacity_units_sum | reduce sum | group_by [], sum;
+  b = metric aws.applicationelb.consumed_lb_capacity_units_count | reduce sum | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
+    }
 
-      metric              = "aws.applicationelb.new_connection_count_count"
-      timeseries_operator = "delta"
+    query {
+      query_name   = "b"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.applicationelb.processed_bytes_sum | reduce sum | group_by [], sum;
+  b = metric aws.applicationelb.processed_bytes_count | reduce sum | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
+    }
+    query {
+      query_name   = "c"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.applicationelb.consumed_lc_us_sum | reduce sum | group_by [], sum;
+  b = metric aws.applicationelb.consumed_lc_us_count | reduce sum | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
+    }
 
+  }
 
-      group_by {
-        aggregation_method = "max"
-        keys               = ["LoadBalancer", ]
-      }
+  chart {
+    name = "TLSNegotiationErrorCount"
+    rank = "5"
+    type = "timeseries"
 
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = "metric aws.applicationelb.target_tls_negotiation_error_count_sum | delta | group_by [], sum"
     }
 
+    query {
+      query_name   = "b"
+      display      = "line"
+      hidden       = false
+      query_string = "metric aws.applicationelb.client_tls_negotiation_error_count_sum | delta | group_by [], sum"
+    }
   }
 
   chart {
-    name = "Consumed LB Capacity Units / Processed Bytes"
-    rank = "4"
+    name = "IPv6"
+    rank = "6"
     type = "timeseries"
 
     query {
-      query_name = "a"
-      display    = "line"
-      hidden     = false
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = "metric aws.applicationelb.i_pv_6_request_count_sum | delta | group_by [], sum"
+    }
 
-      metric              = "aws.applicationelb.consumed_lcus_max"
-      timeseries_operator = "last"
+    query {
+      query_name   = "b"
+      display      = "line"
+      hidden       = false
+      query_string = "metric aws.applicationelb.i_pv_6_processed_bytes_sum | delta | group_by [], sum"
+    }
 
+  }
 
-      group_by {
-        aggregation_method = "max"
-        keys               = ["LoadBalancer", ]
-      }
+  chart {
+    name = "RuleEvaluations"
+    rank = "7"
+    type = "timeseries"
 
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = "metric aws.applicationelb.rule_evaluations_sum | delta | group_by [], sum"
     }
+  }
+
+  chart {
+    name = "Auth"
+    rank = "8"
+    type = "timeseries"
 
     query {
-      query_name = "b"
-      display    = "line"
-      hidden     = false
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = "metric aws.applicationelb.elb_auth_error_sum | delta | group_by [], sum"
+    }
 
-      metric              = "aws.applicationelb.processed_bytes_max"
-      timeseries_operator = "last"
+    query {
+      query_name   = "b"
+      display      = "line"
+      hidden       = false
+      query_string = "metric aws.applicationelb.elb_auth_failure_sum | delta | group_by [], sum"
+    }
 
+    query {
+      query_name   = "c"
+      display      = "line"
+      hidden       = false
+      query_string = "metric aws.applicationelb.elb_auth_success_sum | delta | group_by [], sum"
+    }
+
+    query {
+      query_name   = "d"
+      display      = "line"
+      hidden       = false
+      query_string = "metric aws.applicationelb.elb_auth_refresh_token_success_sum | delta | group_by [], sum"
+    }
 
-      group_by {
-        aggregation_method = "max"
-        keys               = ["LoadBalancer", ]
-      }
+    query {
+      query_name   = "e"
+      display      = "line"
+      hidden       = false
+      query_string = "metric aws.applicationelb.elb_auth_user_claims_size_exceeded_sum | delta | group_by [], sum"
+    }
 
+    query {
+      query_name   = "f"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.applicationelb.elb_auth_latency_sum | reduce sum | group_by [], sum;
+  b = metric aws.applicationelb.elb_auth_latency_count | reduce sum | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
     }
 
   }
diff --git a/modules/applicationelb-dashboard/outputs.tf b/modules/applicationelb-dashboard/outputs.tf
index 0875b47..31819de 100644
--- a/modules/applicationelb-dashboard/outputs.tf
+++ b/modules/applicationelb-dashboard/outputs.tf
@@ -1,4 +1,4 @@
 output "dashboard_url" {
-  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_metric_dashboard.aws_app_elb_dashboard.id}"
+  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.aws_app_elb_dashboard.id}"
   description = "RDS Dashboard URL"
 }

From 94b6548d755de40ef3cea89654b5e6b80469e822 Mon Sep 17 00:00:00 2001
From: Nathan Slaughter <28688390+nslaughter@users.noreply.github.com>
Date: Thu, 2 Mar 2023 16:59:07 -0600
Subject: [PATCH 08/10] Updates RDS dashboards (#42)

* Updates RDS dashboards

NOTE: we may have to revisit with expanded names

The previous syntax was to add spaces in titles between lowercase and
capitals.

Checked this dashboard against output in the API to confirm we can
upload and download the result.

* terraform fmt

---------

Co-authored-by: githubsands <26752232+githubsands@users.noreply.github.com>
---
 modules/rds-dashboard/main.tf      | 525 ++++++++++++++---------------
 modules/rds-dashboard/outputs.tf   |   4 +-
 modules/rds-dashboard/variables.tf |   2 +-
 3 files changed, 260 insertions(+), 271 deletions(-)

diff --git a/modules/rds-dashboard/main.tf b/modules/rds-dashboard/main.tf
index c93513c..de9dd86 100644
--- a/modules/rds-dashboard/main.tf
+++ b/modules/rds-dashboard/main.tf
@@ -2,404 +2,393 @@ terraform {
   required_providers {
     lightstep = {
       source  = "lightstep/lightstep"
-      version = "~> 1.70.10"
+      version = "~> 1.70.9"
     }
   }
   required_version = ">= v1.0.11"
 }
 
-resource "lightstep_metric_dashboard" "aws_rds_dashboard" {
+resource "lightstep_dashboard" "aws_rds_dashboard" {
   project_name   = var.lightstep_project
   dashboard_name = "AWS RDS"
 
   chart {
-    name = "CPU Utilization"
-    rank = "1"
+    name = "CPUUtilization/FailedSQLServerAgentJobsCount"
+    rank = "0"
     type = "timeseries"
 
     query {
-      query_name = "a"
-      display    = "line"
-      hidden     = false
-
-      metric              = "aws.rds.cpu_utilization_max"
-      timeseries_operator = "last"
-
-
-      group_by {
-        aggregation_method = "max"
-        keys               = ["DBInstanceIdentifier", ]
-      }
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.rds.cpu_utilization_sum | reduce sum | group_by [], sum;
+  b = metric aws.rds.cpu_utilization_count | reduce sum | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
+    }
 
+    query {
+      query_name   = "b"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.rds.failed_sql_server_agent_jobs_count_sum | reduce sum | group_by [], sum;
+  b = metric aws.rds.failed_sql_server_agent_jobs_count_count | reduce sum | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
     }
 
   }
 
   chart {
-    name = "Database Connections / Disk Queue Depth"
-    rank = "2"
+    name = "DatabaseConnections/DiskQueueDepth"
+    rank = "1"
     type = "timeseries"
 
     query {
-      query_name = "a"
-      display    = "line"
-      hidden     = false
-
-      metric              = "aws.rds.database_connections_count"
-      timeseries_operator = "delta"
-
-
-      group_by {
-        aggregation_method = "count"
-        keys               = ["DBInstanceIdentifier", ]
-      }
-
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = "metric aws.rds.database_connections_max | reduce max | group_by [], max"
     }
 
     query {
-      query_name = "b"
-      display    = "line"
-      hidden     = false
-
-      metric              = "aws.rds.disk_queue_depth_count"
-      timeseries_operator = "delta"
-
-
-      group_by {
-        aggregation_method = "max"
-        keys               = ["DBInstanceIdentifier", ]
-      }
-
+      query_name   = "b"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.rds.disk_queue_depth_sum | reduce sum | group_by [], sum;
+  b = metric aws.rds.disk_queue_depth_count | reduce sum | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
     }
 
   }
 
   chart {
-    name = "Freeable Memory / Freeable Storage Space"
-    rank = "3"
+    name = "FreeableMemory/FreeStorageSpace"
+    rank = "2"
     type = "timeseries"
 
     query {
-      query_name = "a"
-      display    = "line"
-      hidden     = false
-
-      metric              = "aws.rds.freeable_memory_max"
-      timeseries_operator = "last"
-
-
-      group_by {
-        aggregation_method = "max"
-        keys               = ["DBInstanceIdentifier", ]
-      }
-
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.rds.freeable_memory_sum | reduce sum | group_by [], sum;
+  b = metric aws.rds.freeable_memory_count | reduce sum | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
     }
 
     query {
-      query_name = "b"
-      display    = "line"
-      hidden     = false
-
-      metric              = "aws.rds.free_storage_space_max"
-      timeseries_operator = "last"
-
-
-      group_by {
-        aggregation_method = "max"
-        keys               = ["DBInstanceIdentifier", ]
-      }
-
+      query_name   = "b"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.rds.free_storage_space_sum | reduce sum | group_by [], sum;
+  b = metric aws.rds.free_storage_space_count | reduce sum | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
     }
 
   }
 
   chart {
-    name = "Read IOPS / Write IOPS / Burst Balance"
-    rank = "4"
+    name = "ReadIOPS/WriteIOPS/BurstBalance"
+    rank = "3"
     type = "timeseries"
 
     query {
-      query_name = "a"
-      display    = "line"
-      hidden     = false
-
-      metric              = "aws.rds.read_iops_max"
-      timeseries_operator = "last"
-
-
-      group_by {
-        aggregation_method = "max"
-        keys               = ["DBInstanceIdentifier", ]
-      }
-
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.rds.read_iops_sum | reduce sum | group_by [], sum;
+  b = metric aws.rds.read_iops_count | reduce sum | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
     }
 
     query {
-      query_name = "b"
-      display    = "line"
-      hidden     = false
-
-      metric              = "aws.rds.write_iops_max"
-      timeseries_operator = "last"
-
-
-      group_by {
-        aggregation_method = "max"
-        keys               = ["DBInstanceIdentifier", ]
-      }
-
+      query_name   = "b"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.rds.write_iops_sum | reduce sum | group_by [], sum;
+  b = metric aws.rds.write_iops_count | reduce sum | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
     }
 
     query {
-      query_name = "c"
-      display    = "line"
-      hidden     = false
+      query_name   = "c"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.rds.burst_balance_sum | reduce sum | group_by [], sum;
+  b = metric aws.rds.burst_balance_count | reduce sum | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
+    }
 
-      metric              = "aws.rds.burst_balance_max"
-      timeseries_operator = "last"
+  }
 
+  chart {
+    name = "ReadLatency/WriteLatency"
+    rank = "4"
+    type = "timeseries"
 
-      group_by {
-        aggregation_method = "max"
-        keys               = ["DBInstanceIdentifier", ]
-      }
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.rds.read_latency_sum | reduce sum | group_by [], sum;
+  b = metric aws.rds.read_latency_count | reduce sum | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
+    }
 
+    query {
+      query_name   = "b"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.rds.write_latency_sum | reduce sum | group_by [], sum;
+  b = metric aws.rds.write_latency_count | reduce sum | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
     }
 
   }
 
   chart {
-    name = "Read Latency / Write Latency"
+    name = "ReadThroughput/WriteThroughput"
     rank = "5"
     type = "timeseries"
 
     query {
-      query_name = "a"
-      display    = "line"
-      hidden     = false
-
-      metric              = "aws.rds.read_latency_max"
-      timeseries_operator = "last"
-
-
-      group_by {
-        aggregation_method = "max"
-        keys               = ["DBInstanceIdentifier", ]
-      }
-
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.rds.read_throughput_sum | reduce sum | group_by [], sum;
+  b = metric aws.rds.read_throughput_count | reduce sum | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
     }
 
     query {
-      query_name = "b"
-      display    = "line"
-      hidden     = false
-
-      metric              = "aws.rds.write_latency_max"
-      timeseries_operator = "last"
-
-
-      group_by {
-        aggregation_method = "max"
-        keys               = ["DBInstanceIdentifier", ]
-      }
-
+      query_name   = "b"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.rds.write_throughput_sum | reduce sum | group_by [], sum;
+  b = metric aws.rds.write_throughput_count | reduce sum | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
     }
 
   }
 
   chart {
-    name = "Read Throughput / Write Throughput"
+    name = "NetworkReceiveThroughput/NetworkTransmitThroughput"
     rank = "6"
     type = "timeseries"
 
     query {
-      query_name = "a"
-      display    = "line"
-      hidden     = false
-
-      metric              = "aws.rds.read_throughput_count"
-      timeseries_operator = "delta"
-
-
-      group_by {
-        aggregation_method = "max"
-        keys               = ["dbinstanceidentifer", ]
-      }
-
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.rds.network_receive_throughput_sum | reduce sum | group_by [], sum;
+  b = metric aws.rds.network_receive_throughput_count | reduce sum | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
     }
 
     query {
-      query_name = "b"
-      display    = "line"
-      hidden     = false
-
-      metric              = "aws.rds.write_throughput_count"
-      timeseries_operator = "rate"
-
-
-      group_by {
-        aggregation_method = "max"
-        keys               = ["dbinstanceidentifer", ]
-      }
-
+      query_name   = "b"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.rds.network_transmit_throughput_sum | reduce sum | group_by [], sum;
+  b = metric aws.rds.network_transmit_throughput_count | reduce sum | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
     }
 
   }
 
   chart {
-    name = "Network Receive Throughput / Network Transmit Throughput"
+    name = "SwapUsage/BinLogDiskUsage"
     rank = "7"
     type = "timeseries"
 
     query {
-      query_name = "a"
-      display    = "line"
-      hidden     = false
-
-      metric              = "aws.rds.network_receive_throughput_max"
-      timeseries_operator = "last"
-
-
-      group_by {
-        aggregation_method = "max"
-        keys               = ["DBInstanceIdentifier", ]
-      }
-
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.rds.swap_usage_sum | reduce sum | group_by [], sum;
+  b = metric aws.rds.swap_usage_count | reduce sum | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
     }
 
     query {
-      query_name = "b"
-      display    = "line"
-      hidden     = false
-
-      metric              = "aws.rds.network_transmit_throughput_max"
-      timeseries_operator = "last"
-
-
-      group_by {
-        aggregation_method = "max"
-        keys               = ["DBInstanceIdentifier", ]
-      }
-
+      query_name   = "b"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.rds.bin_log_disk_usage_sum | reduce sum | group_by [], sum;
+  b = metric aws.rds.bin_log_disk_usage_count | reduce sum | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
     }
 
   }
 
   chart {
-    name = "Swap Usage / Bin Log Disk Usage"
+    name = "CPUCreditUsage/CPUCreditBalance"
     rank = "8"
     type = "timeseries"
 
     query {
-      query_name = "a"
-      display    = "line"
-      hidden     = false
-
-      metric              = "aws.rds.swap_usage_max"
-      timeseries_operator = "last"
-
-
-      group_by {
-        aggregation_method = "max"
-        keys               = ["DBInstanceIdentifier", ]
-      }
-
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.rds.cpu_credit_usage_sum | reduce sum | group_by [], sum;
+  b = metric aws.rds.cpu_credit_usage_count | reduce sum | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
     }
 
     query {
-      query_name = "b"
-      display    = "line"
-      hidden     = false
-
-      metric              = "aws.rds.bin_log_disk_usage_max"
-      timeseries_operator = "last"
-
-
-      group_by {
-        aggregation_method = "max"
-        keys               = ["DBInstanceIdentifier", ]
-      }
-
+      query_name   = "b"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.rds.cpu_credit_balance_sum | reduce sum | group_by [], sum;
+  b = metric aws.rds.cpu_credit_balance_count | reduce sum | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
     }
 
   }
 
   chart {
-    name = "CPU Credit Usage / CPU Credit Balance"
+    name = "OldestReplicationSlotLag/ReplicaLag"
     rank = "9"
     type = "timeseries"
 
     query {
-      query_name = "a"
-      display    = "line"
-      hidden     = false
-
-      metric              = "aws.rds.cpu_credit_usage_max"
-      timeseries_operator = "last"
-
-
-      group_by {
-        aggregation_method = "max"
-        keys               = ["DBInstanceIdentifier", ]
-      }
-
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.rds.oldest_replication_slot_lag_sum | reduce sum | group_by [], sum;
+  b = metric aws.rds.oldest_replication_slot_lag_count | reduce sum | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
     }
 
     query {
-      query_name = "b"
-      display    = "line"
-      hidden     = false
-
-      metric              = "aws.rds.cpu_credit_balance_max"
-      timeseries_operator = "last"
-
-
-      group_by {
-        aggregation_method = "max"
-        keys               = ["DBInstanceIdentifier", ]
-      }
-
+      query_name   = "b"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.rds.replica_lag_sum | reduce sum | group_by [], sum;
+  b = metric aws.rds.replica_lag_count | reduce sum | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
     }
 
   }
 
   chart {
-    name = "CPU Credit Usage / CPU Credit Balance"
+    name = "ReplicationSlotDiskUsage/TransactionLogsDiskUsage"
     rank = "10"
     type = "timeseries"
 
     query {
-      query_name = "a"
-      display    = "line"
-      hidden     = false
-
-      metric              = "aws.rds.cpu_credit_usage_max"
-      timeseries_operator = "last"
-
-
-      group_by {
-        aggregation_method = "max"
-        keys               = ["DBInstanceIdentifier", ]
-      }
-
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.rds.oldest_replication_slot_lag_sum | reduce sum | group_by [], sum;
+  b = metric aws.rds.oldest_replication_slot_lag_count | reduce sum | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
     }
 
     query {
-      query_name = "b"
-      display    = "line"
-      hidden     = false
+      query_name   = "b"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.rds.replica_lag_sum | reduce sum | group_by [], sum;
+  b = metric aws.rds.replica_lag_count | reduce sum | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
+    }
 
-      metric              = "aws.rds.cpu_credit_balance_max"
-      timeseries_operator = "last"
+  }
 
+  chart {
+    name = "MaximumUsedTransactionIDs/TransactionLogsGeneration"
+    rank = "11"
+    type = "timeseries"
 
-      group_by {
-        aggregation_method = "max"
-        keys               = ["DBInstanceIdentifier", ]
-      }
+    query {
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.rds.maximum_used_transaction_i_ds_sum | reduce sum | group_by [], sum;
+  b = metric aws.rds.maximum_used_transaction_i_ds_count | reduce sum | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
+    }
 
+    query {
+      query_name   = "b"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+with
+  a = metric aws.rds.transaction_logs_generation_sum | reduce sum | group_by [], sum;
+  b = metric aws.rds.transaction_logs_generation_count | reduce sum | group_by [], sum;
+join (a / b), a = 0, b = 0
+EOT
     }
 
   }
 
-}
\ No newline at end of file
+}
diff --git a/modules/rds-dashboard/outputs.tf b/modules/rds-dashboard/outputs.tf
index 4ccc0ca..fbc6d48 100644
--- a/modules/rds-dashboard/outputs.tf
+++ b/modules/rds-dashboard/outputs.tf
@@ -1,4 +1,4 @@
 output "dashboard_url" {
-  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_metric_dashboard.aws_rds_dashboard.id}"
+  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.aws_rds_dashboard.id}"
   description = "RDS Dashboard URL"
-}
\ No newline at end of file
+}
diff --git a/modules/rds-dashboard/variables.tf b/modules/rds-dashboard/variables.tf
index fb5c029..21ee69f 100644
--- a/modules/rds-dashboard/variables.tf
+++ b/modules/rds-dashboard/variables.tf
@@ -1,4 +1,4 @@
 variable "lightstep_project" {
   description = "Name of Lightstep project"
   type        = string
-}
\ No newline at end of file
+}

From 0caa1f1557464320adb85ccff79aba3633822359 Mon Sep 17 00:00:00 2001
From: Heber Silva <heber.silva@lightstep.com>
Date: Thu, 2 Mar 2023 18:00:30 -0500
Subject: [PATCH 09/10] bug/aws aurora  mismatch (#41)

* Demo lightstep aws rds (#16)

* Testing aws rds terraform gen

* /adds aurora-dashboard

---------

Co-authored-by: Ryan Vacek <ryanvacek@Ryans-MacBook-Pro.local>
---
 modules/aurora-dashboard/LICENSE      | 201 +++++++++++++++++
 modules/aurora-dashboard/README.md    |   3 +
 modules/aurora-dashboard/main.tf      | 299 ++++++++++++++++++++++++++
 modules/aurora-dashboard/outputs.tf   |   4 +
 modules/aurora-dashboard/variables.tf |   4 +
 5 files changed, 511 insertions(+)
 create mode 100644 modules/aurora-dashboard/LICENSE
 create mode 100644 modules/aurora-dashboard/README.md
 create mode 100644 modules/aurora-dashboard/main.tf
 create mode 100644 modules/aurora-dashboard/outputs.tf
 create mode 100644 modules/aurora-dashboard/variables.tf

diff --git a/modules/aurora-dashboard/LICENSE b/modules/aurora-dashboard/LICENSE
new file mode 100644
index 0000000..c15e236
--- /dev/null
+++ b/modules/aurora-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/aurora-dashboard/README.md b/modules/aurora-dashboard/README.md
new file mode 100644
index 0000000..1e3595e
--- /dev/null
+++ b/modules/aurora-dashboard/README.md
@@ -0,0 +1,3 @@
+# Lightstep AWS RDS Dashboard
+
+This module provisions a Lightstep dashboard for AWS Aurora.
diff --git a/modules/aurora-dashboard/main.tf b/modules/aurora-dashboard/main.tf
new file mode 100644
index 0000000..f90dd77
--- /dev/null
+++ b/modules/aurora-dashboard/main.tf
@@ -0,0 +1,299 @@
+terraform {
+  required_providers {
+    lightstep = {
+      source  = "lightstep/lightstep"
+      version = "~> 1.70.1"
+    }
+  }
+  required_version = ">= v1.0.11"
+}
+
+resource "lightstep_metric_dashboard" "aws_aurora_dashboard" {
+  project_name   = var.lightstep_project
+  dashboard_name = "AWS AURORA"
+
+  chart {
+    name = "Binary lag replica DB cluster"
+    rank = "0"
+    type = "timeseries"
+
+    query {
+      query_name = "a"
+      display    = "bar"
+      hidden     = false
+
+      metric              = "aws.rds.aurora_binlog_replica_lag_count"
+      timeseries_operator = "delta"
+
+
+      group_by {
+        aggregation_method = "sum"
+        keys               = ["DBClusterIdentifier"]
+      }
+
+    }
+
+    query {
+      query_name = "a"
+      display    = "bar"
+      hidden     = false
+
+      metric              = "aws.rds.aurora_binlog_replica_lag_max"
+      timeseries_operator = "delta"
+
+
+      group_by {
+        aggregation_method = "sum"
+        keys               = ["DBClusterIdentifier"]
+      }
+
+    }
+
+    query {
+      query_name = "a"
+      display    = "bar"
+      hidden     = false
+
+      metric              = "aws.rds.aurora_binlog_replica_lag_min"
+      timeseries_operator = "delta"
+
+
+      group_by {
+        aggregation_method = "sum"
+        keys               = ["DBClusterIdentifier"]
+      }
+
+    }
+
+    query {
+      query_name = "a"
+      display    = "bar"
+      hidden     = false
+
+      metric              = "aws.rds.aurora_binlog_replica_lag_sum"
+      timeseries_operator = "delta"
+
+
+      group_by {
+        aggregation_method = "sum"
+        keys               = ["DBClusterIdentifier"]
+      }
+
+    }
+
+  }
+
+  chart {
+    name = "DML Throughput"
+    rank = "1"
+    type = "timeseries"
+
+    query {
+      query_name = "a"
+      display    = "bar"
+      hidden     = false
+
+      metric              = "aws.rds.aurora_dml_rejected_master_full_count"
+      timeseries_operator = "delta"
+
+
+      group_by {
+        aggregation_method = "sum"
+        keys               = ["DBClusterIdentifier"]
+      }
+
+    }
+
+    query {
+      query_name = "a"
+      display    = "bar"
+      hidden     = false
+
+      metric              = "aws.rds.aurora_dml_rejected_master_full_max"
+      timeseries_operator = "delta"
+
+
+      group_by {
+        aggregation_method = "sum"
+        keys               = ["DBClusterIdentifier"]
+      }
+
+    }
+
+    query {
+      query_name = "a"
+      display    = "bar"
+      hidden     = false
+
+      metric              = "aws.rds.aurora_dml_rejected_master_full_min"
+      timeseries_operator = "delta"
+
+
+      group_by {
+        aggregation_method = "sum"
+        keys               = ["DBClusterIdentifier"]
+      }
+
+    }
+
+    query {
+      query_name = "a"
+      display    = "bar"
+      hidden     = false
+
+      metric              = "aws.rds.aurora_dml_rejected_master_full_sum"
+      timeseries_operator = "delta"
+
+
+      group_by {
+        aggregation_method = "sum"
+        keys               = ["DBClusterIdentifier"]
+      }
+
+    }
+
+  }
+
+  chart {
+    name = "Parallel Query Attempted"
+    rank = "2"
+    type = "timeseries"
+
+    query {
+      query_name = "a"
+      display    = "bar"
+      hidden     = false
+
+      metric              = "aws.rds.aurora_pq_request_attempted_count"
+      timeseries_operator = "delta"
+
+
+      group_by {
+        aggregation_method = "sum"
+        keys               = ["DBClusterIdentifier"]
+      }
+
+    }
+
+    query {
+      query_name = "a"
+      display    = "bar"
+      hidden     = false
+
+      metric              = "aws.rds.aurora_pq_request_attempted_max"
+      timeseries_operator = "delta"
+
+
+      group_by {
+        aggregation_method = "sum"
+        keys               = ["DBClusterIdentifier"]
+      }
+
+    }
+
+    query {
+      query_name = "a"
+      display    = "bar"
+      hidden     = false
+
+      metric              = "aws.rds.aurora_pq_request_attempted_min"
+      timeseries_operator = "delta"
+
+
+      group_by {
+        aggregation_method = "sum"
+        keys               = ["DBClusterIdentifier"]
+      }
+
+    }
+
+    query {
+      query_name = "a"
+      display    = "bar"
+      hidden     = false
+
+      metric              = "aws.rds.aurora_pq_request_attempted_sum"
+      timeseries_operator = "delta"
+
+
+      group_by {
+        aggregation_method = "sum"
+        keys               = ["DBClusterIdentifier"]
+      }
+
+    }
+
+  }
+
+  chart {
+    name = "Parallel Query Executed"
+    rank = "3"
+    type = "timeseries"
+
+    query {
+      query_name = "a"
+      display    = "bar"
+      hidden     = false
+
+      metric              = "aws.rds.aurora_pq_request_executed_count"
+      timeseries_operator = "delta"
+
+
+      group_by {
+        aggregation_method = "sum"
+        keys               = ["DBClusterIdentifier"]
+      }
+
+    }
+
+    query {
+      query_name = "a"
+      display    = "bar"
+      hidden     = false
+
+      metric              = "aws.rds.aurora_pq_request_executed_max"
+      timeseries_operator = "delta"
+
+
+      group_by {
+        aggregation_method = "sum"
+        keys               = ["DBClusterIdentifier"]
+      }
+
+    }
+
+    query {
+      query_name = "a"
+      display    = "bar"
+      hidden     = false
+
+      metric              = "aws.rds.aurora_pq_request_executed_min"
+      timeseries_operator = "delta"
+
+
+      group_by {
+        aggregation_method = "sum"
+        keys               = ["DBClusterIdentifier"]
+      }
+
+    }
+
+    query {
+      query_name = "a"
+      display    = "bar"
+      hidden     = false
+
+      metric              = "aws.rds.aurora_pq_request_attempted_sum"
+      timeseries_operator = "delta"
+
+
+      group_by {
+        aggregation_method = "sum"
+        keys               = ["DBClusterIdentifier"]
+      }
+
+    }
+
+  }
+
+}
diff --git a/modules/aurora-dashboard/outputs.tf b/modules/aurora-dashboard/outputs.tf
new file mode 100644
index 0000000..3bb023b
--- /dev/null
+++ b/modules/aurora-dashboard/outputs.tf
@@ -0,0 +1,4 @@
+output "dashboard_url" {
+  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_metric_dashboard.aws_aurora_dashboard.id}"
+  description = "Aurora Dashboard URL"
+}
\ No newline at end of file
diff --git a/modules/aurora-dashboard/variables.tf b/modules/aurora-dashboard/variables.tf
new file mode 100644
index 0000000..fb5c029
--- /dev/null
+++ b/modules/aurora-dashboard/variables.tf
@@ -0,0 +1,4 @@
+variable "lightstep_project" {
+  description = "Name of Lightstep project"
+  type        = string
+}
\ No newline at end of file

From bc3746187ccafae8944f7acd5e2e560dc3bfc953 Mon Sep 17 00:00:00 2001
From: Nathan Slaughter <28688390+nslaughter@users.noreply.github.com>
Date: Fri, 3 Mar 2023 18:01:46 -0600
Subject: [PATCH 10/10] [aws-step-functions] update db syntax (#65)

* [aws-step-functions] update db syntax

* [step-functions] lint

* added multiline <<EOT

---------

Co-authored-by: Heber Silva <heber.silva@lightstep.com>
---
 modules/stepfunctions-dashboard/main.tf    | 39 ++++++++++++++++------
 modules/stepfunctions-dashboard/outputs.tf |  4 +--
 2 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/modules/stepfunctions-dashboard/main.tf b/modules/stepfunctions-dashboard/main.tf
index 765db19..cf49db5 100644
--- a/modules/stepfunctions-dashboard/main.tf
+++ b/modules/stepfunctions-dashboard/main.tf
@@ -2,15 +2,17 @@ terraform {
   required_providers {
     lightstep = {
       source  = "lightstep/lightstep"
-      version = "~> 1.70.9"
+      version = "~> 1.70.10"
     }
   }
   required_version = ">= v1.0.11"
 }
 
-resource "lightstep_dashboard" "aws_stepfunctions_dashboard" {
-  project_name   = var.lightstep_project
-  dashboard_name = "AWS Step Functions"
+
+resource "lightstep_dashboard" "aws_step_functions_dashboard" {
+  project_name          = var.lightstep_project
+  dashboard_name        = "AWS Step Functions"
+  dashboard_description = "Monitor AWS Step Functions with this view of execution results."
 
   chart {
     name = "Executions Succeeded"
@@ -21,7 +23,9 @@ resource "lightstep_dashboard" "aws_stepfunctions_dashboard" {
       query_name   = "a"
       display      = "bar"
       hidden       = false
-      query_string = "metric aws.states.executions_succeeded_sum | delta | group_by [], sum"
+      query_string = <<EOT
+metric aws.states.executions_succeeded_sum | delta | group_by [], sum
+EOT
     }
 
   }
@@ -40,6 +44,7 @@ with
   a = metric aws.states.execution_time_sum | reduce sum | group_by [], sum;
   b = metric aws.states.execution_time_count | reduce sum | group_by [], sum;
 join (a / b), a = 0, b = 0
+
 EOT
     }
 
@@ -47,7 +52,9 @@ EOT
       query_name   = "b"
       display      = "bar"
       hidden       = false
-      query_string = "metric aws.states.execution_time_max | reduce max | group_by [], max"
+      query_string = <<EOT
+metric aws.states.execution_time_max | reduce max | group_by [], max
+EOT
     }
 
   }
@@ -61,7 +68,9 @@ EOT
       query_name   = "a"
       display      = "bar"
       hidden       = false
-      query_string = "metric aws.states.executions_started_sum | delta | group_by [], sum"
+      query_string = <<EOT
+metric aws.states.executions_started_sum | delta | group_by [], sum
+EOT
     }
 
   }
@@ -75,7 +84,9 @@ EOT
       query_name   = "a"
       display      = "bar"
       hidden       = false
-      query_string = "metric aws.states.executions_failed_sum | delta | group_by [], sum"
+      query_string = <<EOT
+metric aws.states.executions_failed_sum | delta | group_by [], sum
+EOT
     }
 
   }
@@ -89,7 +100,9 @@ EOT
       query_name   = "a"
       display      = "bar"
       hidden       = false
-      query_string = "metric aws.states.executions_timed_out_sum | delta | group_by [], sum"
+      query_string = <<EOT
+metric aws.states.executions_timed_out_sum | delta | group_by [], sum
+EOT
     }
 
   }
@@ -103,7 +116,9 @@ EOT
       query_name   = "a"
       display      = "bar"
       hidden       = false
-      query_string = "metric aws.states.executions_aborted_sum | delta | group_by [], sum"
+      query_string = <<EOT
+metric aws.states.executions_aborted_sum | delta | group_by [], sum
+EOT
     }
 
   }
@@ -117,7 +132,9 @@ EOT
       query_name   = "a"
       display      = "bar"
       hidden       = false
-      query_string = "metric aws.states.execution_throttled_sum | delta | group_by [], sum"
+      query_string = <<EOT
+metric aws.states.execution_throttled_sum | delta | group_by [], sum
+EOT
     }
 
   }
diff --git a/modules/stepfunctions-dashboard/outputs.tf b/modules/stepfunctions-dashboard/outputs.tf
index 7a6bfd2..3442ff1 100644
--- a/modules/stepfunctions-dashboard/outputs.tf
+++ b/modules/stepfunctions-dashboard/outputs.tf
@@ -1,4 +1,4 @@
 output "dashboard_url" {
-  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.aws_stepfunctions_dashboard.id}"
-  description = "Step Functions Dashboard URL"
+  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.aws_step_functions_dashboard.id}"
+  description = "AWS Step Functions Dashboard URL"
 }