RMS Stack Release (Version 0007) (#80)

Improve Stack UI, add OKE private support, custom Helm chart, & misc updates
oracle-quickstart · Nov 13, 2024 · 1a40393 · 1a40393
1 parent 18d927a
commit 1a40393
Show file tree

Hide file tree

Showing 119 changed files with 2,277 additions and 953 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,4 +1,4 @@
-# # # # Copyright (c) 2023, Oracle and/or its affiliates.
+# # # # Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # # # # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 name: Release Charts
 

diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 .DS_Store
@@ -32,7 +32,9 @@ crash.*.log
 # control as they are data points which are potentially sensitive and subject
 # to change depending on the environment.
 *.tfvars
+!*.auto.tfvars
 *.tfvars.json
+!*.auto.tfvars.json
 
 # Include sample tfvars
 !terraform-sample.tfvars
@@ -69,4 +71,7 @@ meta-schema.yaml
 releases/
 
 # vscode
-.vscode
+.vscode
+
+# debug files
+tf-debug/
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 repos:

diff --git a/charts/common/Chart.yaml b/charts/common/Chart.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 apiVersion: v2

diff --git a/charts/common/templates/_helpers.tpl b/charts/common/templates/_helpers.tpl
@@ -1,5 +1,5 @@
 
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 # tpl render function

diff --git a/charts/common/templates/clusterrole.yaml b/charts/common/templates/clusterrole.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 {{- if eq (include "common.createServiceAccount" .) "true" }}

diff --git a/charts/common/templates/clusterrolebinding.yaml b/charts/common/templates/clusterrolebinding.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 {{- if eq (include "common.createServiceAccount" .) "true" }}

diff --git a/charts/common/templates/namespace.yaml b/charts/common/templates/namespace.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 {{- if eq (include "common.createNamespace" .) "true" }}

diff --git a/charts/common/templates/role.yaml b/charts/common/templates/role.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 {{- if eq (include "common.createServiceAccount" .) "true" }}

diff --git a/charts/common/templates/rolebinding.yaml b/charts/common/templates/rolebinding.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 {{- if eq (include "common.createServiceAccount" .) "true" }}

diff --git a/charts/common/templates/serviceAccount.yaml b/charts/common/templates/serviceAccount.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 {{- if eq (include "common.createServiceAccount" .) "true" }}

diff --git a/charts/common/values.yaml b/charts/common/values.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 # -- Automatically create, a readonly cluster role, cluster role binding and

diff --git a/charts/logan/Chart.yaml b/charts/logan/Chart.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 apiVersion: v2

diff --git a/charts/logan/templates/_helpers.tpl b/charts/logan/templates/_helpers.tpl
@@ -1,5 +1,5 @@
 
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 # tpl render function

diff --git a/charts/logan/templates/ekscp-logs-configmap.yaml b/charts/logan/templates/ekscp-logs-configmap.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 {{- if .Values.enableEKSControlPlaneLogs }}
 {{- $kubernetesClusterName := (include "logan.kubernetesClusterName" .) }}

diff --git a/charts/logan/templates/fluentd-daemonset.yaml b/charts/logan/templates/fluentd-daemonset.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 ---

diff --git a/charts/logan/templates/fluentd-deployment.yaml b/charts/logan/templates/fluentd-deployment.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 ---

diff --git a/charts/logan/templates/logs-configmap.yaml b/charts/logan/templates/logs-configmap.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 {{- $kubernetesClusterName := (include "logan.kubernetesClusterName" .) }}

diff --git a/charts/logan/templates/oci-config-secret.yaml b/charts/logan/templates/oci-config-secret.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 {{- $authtype := .Values.authtype | lower }}

diff --git a/charts/logan/values.yaml b/charts/logan/values.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 global:

diff --git a/charts/mgmt-agent/.helmignore b/charts/mgmt-agent/.helmignore
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 # Patterns to ignore when building packages.

diff --git a/charts/mgmt-agent/Chart.yaml b/charts/mgmt-agent/Chart.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 apiVersion: v2

diff --git a/charts/mgmt-agent/resources/input.rsp b/charts/mgmt-agent/resources/input.rsp
@@ -1,2 +1,2 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
diff --git a/charts/mgmt-agent/resources/mgmtagent_kubernetes_dashboard.json b/charts/mgmt-agent/resources/mgmtagent_kubernetes_dashboard.json
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 {

diff --git a/charts/mgmt-agent/templates/_helpers.tpl b/charts/mgmt-agent/templates/_helpers.tpl
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 # tpl render function

diff --git a/charts/mgmt-agent/templates/metric_server.yaml b/charts/mgmt-agent/templates/metric_server.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 {{- if .Values.deployMetricServer }}

diff --git a/charts/mgmt-agent/templates/metrics-configmap.yaml b/charts/mgmt-agent/templates/metrics-configmap.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 apiVersion: v1

diff --git a/charts/mgmt-agent/templates/mgmt-agent-headless-service.yaml b/charts/mgmt-agent/templates/mgmt-agent-headless-service.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 apiVersion: v1

diff --git a/charts/mgmt-agent/templates/mgmt-agent-secrets.yaml b/charts/mgmt-agent/templates/mgmt-agent-secrets.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 apiVersion: v1

diff --git a/charts/mgmt-agent/templates/mgmt-agent-statefulset.yaml b/charts/mgmt-agent/templates/mgmt-agent-statefulset.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 apiVersion: apps/v1

diff --git a/charts/mgmt-agent/values.yaml b/charts/mgmt-agent/values.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 global:

diff --git a/charts/oci-onm/Chart.yaml b/charts/oci-onm/Chart.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 apiVersion: v2

diff --git a/charts/oci-onm/templates/_helpers.tpl b/charts/oci-onm/templates/_helpers.tpl
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 # tpl render function

diff --git a/charts/oci-onm/values.yaml b/charts/oci-onm/values.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 global:

diff --git a/logan/docker-images/v1.0/debian-deprecated/Dockerfile b/logan/docker-images/v1.0/debian-deprecated/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 ### Referred version from fluentd-kubernetes-daemonset gitgub repo ###

diff --git a/logan/docker-images/v1.0/debian-deprecated/Gemfile b/logan/docker-images/v1.0/debian-deprecated/Gemfile
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 source "https://rubygems.org"

diff --git a/logan/docker-images/v1.0/debian-deprecated/entrypoint.sh b/logan/docker-images/v1.0/debian-deprecated/entrypoint.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 exec fluentd -c ${FLUENTD_CONF} -p /fluentd/plugins --gemfile /fluentd/Gemfile ${FLUENTD_OPT}
diff --git a/logan/docker-images/v1.0/oraclelinux/8-deprecated/Dockerfile b/logan/docker-images/v1.0/oraclelinux/8-deprecated/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 ## To build/install all the dependencies

diff --git a/logan/docker-images/v1.0/oraclelinux/8-deprecated/Gemfile b/logan/docker-images/v1.0/oraclelinux/8-deprecated/Gemfile
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 source "https://rubygems.org"

diff --git a/logan/docker-images/v1.0/oraclelinux/8-deprecated/entrypoint.sh b/logan/docker-images/v1.0/oraclelinux/8-deprecated/entrypoint.sh
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 #!/usr/bin/env sh

diff --git a/logan/docker-images/v1.0/oraclelinux/8-slim/Dockerfile b/logan/docker-images/v1.0/oraclelinux/8-slim/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 ### Build the docker image using multi-stage build

diff --git a/logan/docker-images/v1.0/oraclelinux/8-slim/Gemfile b/logan/docker-images/v1.0/oraclelinux/8-slim/Gemfile
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 source "https://rubygems.org"

diff --git a/logan/docker-images/v1.0/oraclelinux/8-slim/entrypoint.sh b/logan/docker-images/v1.0/oraclelinux/8-slim/entrypoint.sh
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 #!/usr/bin/env sh

diff --git a/logan/kubernetes-resources/logs-collection/configmap-cri.yaml b/logan/kubernetes-resources/logs-collection/configmap-cri.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 apiVersion: v1

diff --git a/logan/kubernetes-resources/logs-collection/configmap-docker.yaml b/logan/kubernetes-resources/logs-collection/configmap-docker.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 apiVersion: v1

diff --git a/logan/kubernetes-resources/logs-collection/fluentd-daemonset.yaml b/logan/kubernetes-resources/logs-collection/fluentd-daemonset.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 ---

diff --git a/logan/kubernetes-resources/logs-collection/secrets.yaml b/logan/kubernetes-resources/logs-collection/secrets.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 apiVersion: v1

diff --git a/logan/kubernetes-resources/objects-collection/configmap-objects.yaml b/logan/kubernetes-resources/objects-collection/configmap-objects.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 apiVersion: v1

diff --git a/logan/kubernetes-resources/objects-collection/fluentd-deployment.yaml b/logan/kubernetes-resources/objects-collection/fluentd-deployment.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 ---

diff --git a/logan/kubernetes-resources/objects-collection/secrets.yaml b/logan/kubernetes-resources/objects-collection/secrets.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 apiVersion: v1

diff --git a/terraform/modules/dashboards/dashboard-inputs.tf b/terraform/modules/dashboards/dashboard-inputs.tf
@@ -0,0 +1,17 @@
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+# Compartment for creating dashboards and it's associated saved-searches
+variable "compartment_ocid" {
+  type = string
+}
+
+variable "debug" {
+  type    = bool
+  default = false
+}
+
+variable "tags" {
+  type    = object({ freeformTags = map(string), definedTags = map(string) })
+  default = { "freeformTags" = {}, "definedTags" = {} }
+}
diff --git a/terraform/modules/dashboards/dashboard.tf b/terraform/modules/dashboards/dashboard.tf
@@ -1,11 +1,39 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 locals {
   dashboards = ["cluster.json", "node.json", "pod.json", "workload.json", "service-type-lb.json"]
+
+  #tags
+  defined_tags  = module.format_tags.defined_tags_string
+  freeform_tags = module.format_tags.freeform_tags_string
+
+  template_values = {
+    "compartment_ocid" = "${var.compartment_ocid}"
+
+    # Expected format of tags: https://docs.oracle.com/en-us/iaas/api/#/en/managementdashboard/20200901/ManagementDashboardImportDetails/
+    "defined_tags"  = local.defined_tags
+    "freeform_tags" = local.freeform_tags
+  }
+}
+
+# format tags; as required in dashboard JSON files
+module "format_tags" {
+  source = "./format_tags"
+  tags   = var.tags
 }
 
 resource "oci_management_dashboard_management_dashboards_import" "multi_management_dashboards_import" {
   for_each       = toset(local.dashboards)
-  import_details = templatefile(format("%s/%s/%s", "${path.module}", "dashboards_json", each.value), { "compartment_ocid" : "${var.compartment_ocid}" })
+  import_details = templatefile(format("%s/%s/%s", "${path.module}", "dashboards_json", each.value), local.template_values)
+
+  lifecycle {
+    ignore_changes = [import_details]
+  }
 }
+
+resource "local_file" "dashboard_template" {
+  for_each = var.debug ? toset(local.dashboards) : []
+  content  = templatefile(format("%s/%s/%s", "${path.module}", "dashboards_json", each.value), local.template_values)
+  filename = "${path.module}/tf-debug/${each.value}"
+}