Add support for labeling dashboards. (#24)

chainguard-dev · Dec 21, 2023 · e3d0224 · e3d0224
1 parent 0280d33
commit e3d0224
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 0 deletions.
diff --git a/cloudevent-broker/ingress.tf b/cloudevent-broker/ingress.tf
@@ -120,6 +120,10 @@ module "layout" {
 resource "google_monitoring_dashboard" "dashboard" {
   dashboard_json = jsonencode({
     displayName = "Cloud Events Broker Ingress: ${var.name}"
+    labels = {
+      "service" : ""
+      "eventing" : ""
+    }
     dashboardFilters = [{
       filterType  = "RESOURCE_LABEL"
       stringValue = var.name

diff --git a/dashboard/cloudevent-receiver/README.md b/dashboard/cloudevent-receiver/README.md
@@ -90,6 +90,7 @@ No requirements.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
+| <a name="input_labels"></a> [labels](#input\_labels) | Additional labels to apply to the dashboard. | `map` | `{}` | no |
 | <a name="input_service_name"></a> [service\_name](#input\_service\_name) | Name of the service(s) to monitor | `string` | n/a | yes |
 | <a name="input_triggers"></a> [triggers](#input\_triggers) | A mapping from a descriptive name to a subscription name prefix. | `map(string)` | n/a | yes |
 

diff --git a/dashboard/cloudevent-receiver/dashboard.tf b/dashboard/cloudevent-receiver/dashboard.tf
@@ -42,6 +42,10 @@ module "layout" {
 resource "google_monitoring_dashboard" "dashboard" {
   dashboard_json = jsonencode({
     displayName = "Cloud Event Receiver: ${var.service_name}"
+    labels = merge({
+      "service" : ""
+      "eventing" : ""
+    }, var.labels)
     dashboardFilters = [{
       filterType  = "RESOURCE_LABEL"
       stringValue = var.service_name

diff --git a/dashboard/cloudevent-receiver/variables.tf b/dashboard/cloudevent-receiver/variables.tf
@@ -3,6 +3,11 @@ variable "service_name" {
   type        = string
 }
 
+variable "labels" {
+  description = "Additional labels to apply to the dashboard."
+  default     = {}
+}
+
 variable "triggers" {
   description = "A mapping from a descriptive name to a subscription name prefix."
   type        = map(string)

diff --git a/dashboard/job/README.md b/dashboard/job/README.md
@@ -58,6 +58,7 @@ No requirements.
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
 | <a name="input_job_name"></a> [job\_name](#input\_job\_name) | Name of the job(s) to monitor | `string` | n/a | yes |
+| <a name="input_labels"></a> [labels](#input\_labels) | Additional labels to apply to the dashboard. | `map` | `{}` | no |
 
 ## Outputs
 

diff --git a/dashboard/job/dashboard.tf b/dashboard/job/dashboard.tf
@@ -23,6 +23,9 @@ module "layout" {
 resource "google_monitoring_dashboard" "dashboard" {
   dashboard_json = jsonencode({
     displayName = "Cloud Run Job: ${var.job_name}"
+    labels = merge({
+      "job" : ""
+    }, var.labels)
     dashboardFilters = [{
       filterType  = "RESOURCE_LABEL"
       stringValue = var.job_name

diff --git a/dashboard/job/variables.tf b/dashboard/job/variables.tf
@@ -3,3 +3,7 @@ variable "job_name" {
   type        = string
 }
 
+variable "labels" {
+  description = "Additional labels to apply to the dashboard."
+  default     = {}
+}
diff --git a/dashboard/service/README.md b/dashboard/service/README.md
@@ -68,6 +68,7 @@ No requirements.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
+| <a name="input_labels"></a> [labels](#input\_labels) | Additional labels to apply to the dashboard. | `map` | `{}` | no |
 | <a name="input_service_name"></a> [service\_name](#input\_service\_name) | Name of the service(s) to monitor | `string` | n/a | yes |
 
 ## Outputs

diff --git a/dashboard/service/dashboard.tf b/dashboard/service/dashboard.tf
@@ -30,6 +30,9 @@ module "layout" {
 resource "google_monitoring_dashboard" "dashboard" {
   dashboard_json = jsonencode({
     displayName = "Cloud Run Service: ${var.service_name}"
+    labels = merge({
+      "service" : ""
+    }, var.labels)
     dashboardFilters = [{
       filterType  = "RESOURCE_LABEL"
       stringValue = var.service_name

diff --git a/dashboard/service/variables.tf b/dashboard/service/variables.tf
@@ -2,3 +2,8 @@ variable "service_name" {
   description = "Name of the service(s) to monitor"
   type        = string
 }
+
+variable "labels" {
+  description = "Additional labels to apply to the dashboard."
+  default     = {}
+}