Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions grafana/input.tf
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ variable "database" {
default = { type : "", host : "", port : 0, name : "", user : "", password : "", ssl_mode : "" }
}

variable "domain" {
description = "Domain used for serving the application"
variable "url" {
description = "URL used for serving the application"
type = string
default = ""
}
2 changes: 1 addition & 1 deletion grafana/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ resource "nomad_job" "grafana" {
anonymous_org = ""
anonymous_role = "Viewer"
database = jsonencode(var.database)
domain = var.domain
url = var.url
}
}
}
6 changes: 3 additions & 3 deletions grafana/nomad/grafana.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ variable "database" {
default = { type : "", host : "", port : 0, name : "", user : "", password : "", ssl_mode : "" }
}

variable "domain" {
description = "Domain used for serving the application"
variable "url" {
description = "URL used for serving the application"
type = string
default = ""
}
Expand Down Expand Up @@ -214,7 +214,7 @@ job "grafana" {
GF_DATABASE_USER = var.database.user
GF_DATABASE_PASSWORD = var.database.password
GF_DATABASE_SSL_MODE = var.database.ssl_mode
GF_SERVER_DOMAIN = var.domain
GF_SERVER_ROOT_URL = var.url
}

config {
Expand Down