chainguard-dev · imjasonh · May 2, 2024 · May 9, 2024
diff --git a/modules/bucket-events/README.md b/modules/bucket-events/README.md
@@ -85,6 +85,8 @@ No requirements.
 | <a name="module_http"></a> [http](#module\_http) | ../dashboard/sections/http | n/a |
 | <a name="module_layout"></a> [layout](#module\_layout) | ../dashboard/sections/layout | n/a |
 | <a name="module_logs"></a> [logs](#module\_logs) | ../dashboard/sections/logs | n/a |
+| <a name="module_logurl"></a> [logurl](#module\_logurl) | ../logurl | n/a |
+| <a name="module_markdown"></a> [markdown](#module\_markdown) | ../sections/markdown | n/a |
 | <a name="module_resources"></a> [resources](#module\_resources) | ../dashboard/sections/resources | n/a |
 | <a name="module_this"></a> [this](#module\_this) | ../regional-go-service | n/a |
 | <a name="module_topic"></a> [topic](#module\_topic) | ../dashboard/sections/topic | n/a |

diff --git a/modules/bucket-events/dashboard.tf b/modules/bucket-events/dashboard.tf
@@ -1,3 +1,22 @@
+module "logurl" {
+  source = "../logurl"
+
+  text    = "Logs Explorer"
+  project = var.project_id
+  params = {
+    "resource.type"                = "cloud_run_revision"
+    "resource.labels.service_name" = var.name
+  }
+}
+
+module "markdown" {
+  source  = "../sections/markdown"
+  title   = "Overview"
+  content = <<EOM
+  # ${module.logurl.markdown}
+  EOM
+}
+
 module "topic" {
   source       = "../dashboard/sections/topic"
   title        = "Notification Topic"
@@ -31,6 +50,7 @@ module "width" { source = "../dashboard/sections/width" }
 module "layout" {
   source = "../dashboard/sections/layout"
   sections = [
+    module.markdown.section,
     module.topic.section,
     module.logs.section,
     module.http.section,

diff --git a/modules/cloudevent-broker/README.md b/modules/cloudevent-broker/README.md
@@ -88,6 +88,8 @@ No requirements.
 | <a name="module_http"></a> [http](#module\_http) | ../dashboard/sections/http | n/a |
 | <a name="module_layout"></a> [layout](#module\_layout) | ../dashboard/sections/layout | n/a |
 | <a name="module_logs"></a> [logs](#module\_logs) | ../dashboard/sections/logs | n/a |
+| <a name="module_logurl"></a> [logurl](#module\_logurl) | ../logurl | n/a |
+| <a name="module_markdown"></a> [markdown](#module\_markdown) | ../sections/markdown | n/a |
 | <a name="module_resources"></a> [resources](#module\_resources) | ../dashboard/sections/resources | n/a |
 | <a name="module_this"></a> [this](#module\_this) | ../regional-go-service | n/a |
 | <a name="module_topic"></a> [topic](#module\_topic) | ../dashboard/sections/topic | n/a |

diff --git a/modules/cloudevent-broker/ingress.tf b/modules/cloudevent-broker/ingress.tf
@@ -51,6 +51,25 @@ module "this" {
   notification_channels = var.notification_channels
 }
 
+module "logurl" {
+  source = "../logurl"
+
+  text    = "Logs Explorer"
+  project = var.project_id
+  params = {
+    "resource.type"                = "cloud_run_revision"
+    "resource.labels.service_name" = var.name
+  }
+}
+
+module "markdown" {
+  source  = "../sections/markdown"
+  title   = "Overview"
+  content = <<EOM
+  # ${module.logurl.markdown}
+  EOM
+}
+
 module "topic" {
   source       = "../dashboard/sections/topic"
   title        = "Broker Events"
@@ -84,6 +103,7 @@ module "width" { source = "../dashboard/sections/width" }
 module "layout" {
   source = "../dashboard/sections/layout"
   sections = [
+    module.markdown.section,
     module.topic.section,
     module.logs.section,
     module.http.section,

diff --git a/modules/dashboard/cloudevent-receiver/dashboard.tf b/modules/dashboard/cloudevent-receiver/dashboard.tf
@@ -1,3 +1,22 @@
+module "logurl" {
+  source = "../logurl"
+
+  text    = "Logs Explorer"
+  project = var.project_id
+  params = {
+    "resource.type"                = "cloud_run_revision"
+    "resource.labels.service_name" = var.service_name
+  }
+}
+
+module "markdown" {
+  source  = "../sections/markdown"
+  title   = "Overview"
+  content = <<EOM
+  # ${module.logurl.markdown}
+  EOM
+}
+
 module "subscription" {
   for_each = var.triggers
 
@@ -56,6 +75,7 @@ module "width" { source = "../sections/width" }
 module "layout" {
   source = "../sections/layout"
   sections = concat(
+    [module.markdown.section],
     [for key in sort(keys(var.triggers)) : module.subscription[key].section],
     [
       module.errgrp.section,

diff --git a/modules/dashboard/job/README.md b/modules/dashboard/job/README.md
@@ -46,6 +46,8 @@ No requirements.
 | <a name="module_errgrp"></a> [errgrp](#module\_errgrp) | ../sections/errgrp | n/a |
 | <a name="module_layout"></a> [layout](#module\_layout) | ../sections/layout | n/a |
 | <a name="module_logs"></a> [logs](#module\_logs) | ../sections/logs | n/a |
+| <a name="module_logurl"></a> [logurl](#module\_logurl) | ../logurl | n/a |
+| <a name="module_markdown"></a> [markdown](#module\_markdown) | ../sections/markdown | n/a |
 | <a name="module_resources"></a> [resources](#module\_resources) | ../sections/resources | n/a |
 | <a name="module_width"></a> [width](#module\_width) | ../sections/width | n/a |
 

diff --git a/modules/dashboard/job/dashboard.tf b/modules/dashboard/job/dashboard.tf
@@ -1,3 +1,22 @@
+module "logurl" {
+  source = "../logurl"
+
+  text    = "Logs Explorer"
+  project = var.project_id
+  params = {
+    "resource.type"                = "cloud_run_job"
+    "resource.labels.service_name" = var.job_name
+  }
+}
+
+module "markdown" {
+  source  = "../sections/markdown"
+  title   = "Overview"
+  content = <<EOM
+  # ${module.logurl.markdown}
+  EOM
+}
+
 module "errgrp" {
   source       = "../sections/errgrp"
   title        = "Job Error Reporting"
@@ -24,6 +43,7 @@ module "width" { source = "../sections/width" }
 module "layout" {
   source = "../sections/layout"
   sections = [
+    module.markdown.section,
     module.errgrp.section,
     module.logs.section,
     module.resources.section,

diff --git a/modules/dashboard/logurl/README.md b/modules/dashboard/logurl/README.md
@@ -0,0 +1,31 @@
+<!-- BEGIN_TF_DOCS -->
+## Requirements
+
+No requirements.
+
+## Providers
+
+No providers.
+
+## Modules
+
+No modules.
+
+## Resources
+
+No resources.
+
+## Inputs
+
+| Name | Description | Type | Default | Required |
+|------|-------------|------|---------|:--------:|
+| <a name="input_params"></a> [params](#input\_params) | n/a | `map(string)` | n/a | yes |
+| <a name="input_project"></a> [project](#input\_project) | n/a | `string` | n/a | yes |
+| <a name="input_text"></a> [text](#input\_text) | n/a | `string` | `"Logs Explorer"` | no |
+
+## Outputs
+
+| Name | Description |
+|------|-------------|
+| <a name="output_markdown"></a> [markdown](#output\_markdown) | n/a |
+<!-- END_TF_DOCS -->
diff --git a/modules/dashboard/logurl/main.tf b/modules/dashboard/logurl/main.tf
@@ -0,0 +1,12 @@
+variable "text" { default = "Logs Explorer" }
+variable "project" { type = string }
+variable "params" { type = map(string) }
+
+locals {
+  params = urlencode(join("\n", [for key, value in var.params : "${key}=\"${value}\""]))
+  link   = "https://console.cloud.google.com/logs/query;query=${local.params}?project=${var.project}"
+}
+
+output "markdown" {
+  value = "[${var.text}](${local.link})"
+}
diff --git a/modules/dashboard/widgets/markdown/README.md → ...les/dashboard/sections/markdown/README.md b/modules/dashboard/widgets/markdown/README.md → ...les/dashboard/sections/markdown/README.md
@@ -9,7 +9,9 @@
 
 ## Modules
 
-No modules.
+| Name | Source | Version |
+|------|--------|---------|
+| <a name="module_width"></a> [width](#module\_width) | ../width | n/a |
 
 ## Resources
 
@@ -26,5 +28,5 @@
 
 | Name | Description |
 |------|-------------|
-| <a name="output_widget"></a> [widget](#output\_widget) | https://cloud.google.com/monitoring/api/ref_v3/rest/v1/projects.dashboards#Text |
-<!-- END_TF_DOCS -->
+| <a name="output_section"></a> [section](#output\_section) | n/a |
+<!-- END_TF_DOCS -->
diff --git a/modules/dashboard/sections/markdown/main.tf b/modules/dashboard/sections/markdown/main.tf
@@ -0,0 +1,20 @@
+variable "title" { type = string }
+variable "content" { type = string }
+
+module "width" { source = "../width" }
+
+output "section" {
+  value = [{
+    yPos   = 0
+    xPos   = 0
+    height = 3
+    width  = module.width.size,
+    widget = {
+      title = var.title
+      text = {
+        format  = "MARKDOWN"
+        content = var.content
+      }
+    }
+  }]
+}
diff --git a/modules/dashboard/service/dashboard.tf b/modules/dashboard/service/dashboard.tf
@@ -1,3 +1,22 @@
+module "logurl" {
+  source = "../logurl"
+
+  text    = "Logs Explorer"
+  project = var.project_id
+  params = {
+    "resource.type"                = "cloud_run_revision"
+    "resource.labels.service_name" = var.service_name
+  }
+}
+
+module "markdown" {
+  source  = "../sections/markdown"
+  title   = "Overview"
+  content = <<EOM
+  # ${module.logurl.markdown}
+  EOM
+}
+
 module "errgrp" {
   source       = "../sections/errgrp"
   title        = "Service Error Reporting"
@@ -59,6 +78,7 @@ module "width" { source = "../sections/width" }
 module "layout" {
   source = "../sections/layout"
   sections = concat(
+    module.markdown.section,
     [for x in keys(var.alerts) : module.alerts[x].section],
     [
       module.errgrp.section,

diff --git a/modules/dashboard/widgets/markdown/main.tf b/modules/dashboard/widgets/markdown/main.tf
diff --git a/modules/github-events/README.md b/modules/github-events/README.md
@@ -137,6 +137,8 @@ No requirements.
 | <a name="module_http"></a> [http](#module\_http) | ../dashboard/sections/http | n/a |
 | <a name="module_layout"></a> [layout](#module\_layout) | ../dashboard/sections/layout | n/a |
 | <a name="module_logs"></a> [logs](#module\_logs) | ../dashboard/sections/logs | n/a |
+| <a name="module_logurl"></a> [logurl](#module\_logurl) | ../logurl | n/a |
+| <a name="module_markdown"></a> [markdown](#module\_markdown) | ../sections/markdown | n/a |
 | <a name="module_resources"></a> [resources](#module\_resources) | ../dashboard/sections/resources | n/a |
 | <a name="module_this"></a> [this](#module\_this) | ../regional-go-service | n/a |
 | <a name="module_trampoline-emits-events"></a> [trampoline-emits-events](#module\_trampoline-emits-events) | ../authorize-private-service | n/a |

diff --git a/modules/github-events/dashboard.tf b/modules/github-events/dashboard.tf
@@ -1,3 +1,22 @@
+module "logurl" {
+  source = "../logurl"
+
+  text    = "Logs Explorer"
+  project = var.project_id
+  params = {
+    "resource.type"                = "cloud_run_revision"
+    "resource.labels.service_name" = var.name
+  }
+}
+
+module "markdown" {
+  source  = "../sections/markdown"
+  title   = "Overview"
+  content = <<EOM
+  # ${module.logurl.markdown}
+  EOM
+}
+
 module "logs" {
   source = "../dashboard/sections/logs"
   title  = "Service Logs"
@@ -25,6 +44,7 @@ module "width" { source = "../dashboard/sections/width" }
 module "layout" {
   source = "../dashboard/sections/layout"
   sections = [
+    module.markdown.section,
     module.logs.section,
     module.http.section,
     module.resources.section,