Allow correct provisioning of Grafana dashboards for multiple Apiary …

…instances (#181) * rename apiary-bucket-policy.json * add encryption option * kms keys * test for_each condition * kms policy * kms client policy * fix * restrict writes to managed kms key * fix admin kms policy * restrict s3 bucket access to client roles * update readme * fix client roles * fix client_roles in template * kms alias * kms alias fix * remove client roles in bucket policy * update kms key admin policy * update changelog * cleanup * setting dashboard title * undo accidental change * formatting * case * update changelog * Update CHANGELOG.md Co-authored-by: Scott Barnhart <[email protected]> * Update to allow Terraform checks There is a need to update terraform toolkit package, older version disallow the checks due to security vulnerability https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/ * Remove explicit version for setup-terraform * Update to @v1.2.1 * Current date in the change log * Correct date in changelog * Update formatting on grafana-dashboard.tf Co-authored-by: Ken Figueiredo <[email protected]> Co-authored-by: Raj Poluri <[email protected]> Co-authored-by: Scott Barnhart <[email protected]> Co-authored-by: Ken Figueiredo <[email protected]>
ExpediaGroup · Jan 5, 2021 · 3aa0215 · 3aa0215
1 parent 2b06e16
commit 3aa0215
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -11,7 +11,7 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Setup
-      uses: hashicorp/setup-terraform@v1.1.0
+      uses: hashicorp/setup-terraform@v1.2.1
       with:
         terraform_version: 0.12.29
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [6.7.2] - 2021-01-04
+### Fixed
+- Fix colliding Grafana dashboard names for multiple Apiary instances.
+
 ## [6.7.1] - 2020-11-11
 ### Fixed
 - Fix managed bucket policy with empty_customer_accounts.

diff --git a/grafana-dashboard.tf b/grafana-dashboard.tf
@@ -17,7 +17,8 @@ data "template_file" "grafana_graphs" {
 data "template_file" "grafana_dashboard_data" {
   template = file("${path.module}/templates/grafana-dashboard.tpl")
   vars = {
-    panels = "[${join(",", data.template_file.grafana_graphs.*.rendered)}]"
+    panels         = "[${join(",", data.template_file.grafana_graphs.*.rendered)}]"
+    instance_alias = local.instance_alias
   }
 }
 

diff --git a/templates/grafana-dashboard.tpl b/templates/grafana-dashboard.tpl
@@ -44,5 +44,5 @@
     ]
   },
   "timezone": "",
-  "title": "S3 Bucket Size"
-}
+  "title": "${instance_alias} S3 Bucket Size"
+}