mirror of
https://github.com/optim-enterprises-bv/vault.git
synced 2025-10-30 18:17:55 +00:00
Add Vault log level support (#19083)
Signed-off-by: Jaymala Sinha <jaymala@hashicorp.com>
This commit is contained in:
@@ -140,6 +140,9 @@ scenario "agent" {
|
|||||||
vault_artifactory_release = local.install_artifactory_artifact ? step.build_vault.vault_artifactory_release : null
|
vault_artifactory_release = local.install_artifactory_artifact ? step.build_vault.vault_artifactory_release : null
|
||||||
vault_license = matrix.edition != "oss" ? step.read_license.license : null
|
vault_license = matrix.edition != "oss" ? step.read_license.license : null
|
||||||
vpc_id = step.create_vpc.vpc_id
|
vpc_id = step.create_vpc.vpc_id
|
||||||
|
vault_environment = {
|
||||||
|
VAULT_LOG_LEVEL = var.vault_log_level
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -132,6 +132,9 @@ scenario "autopilot" {
|
|||||||
vault_release = var.vault_autopilot_initial_release
|
vault_release = var.vault_autopilot_initial_release
|
||||||
vault_license = step.read_license.license
|
vault_license = step.read_license.license
|
||||||
vpc_id = step.create_vpc.vpc_id
|
vpc_id = step.create_vpc.vpc_id
|
||||||
|
vault_environment = {
|
||||||
|
VAULT_LOG_LEVEL = var.vault_log_level
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -219,7 +222,7 @@ scenario "autopilot" {
|
|||||||
vault_unseal_keys = matrix.seal == "shamir" ? step.create_vault_cluster.vault_unseal_keys_hex : null
|
vault_unseal_keys = matrix.seal == "shamir" ? step.create_vault_cluster.vault_unseal_keys_hex : null
|
||||||
vpc_id = step.create_vpc.vpc_id
|
vpc_id = step.create_vpc.vpc_id
|
||||||
vault_environment = {
|
vault_environment = {
|
||||||
"VAULT_LOG_LEVEL" : "debug"
|
VAULT_LOG_LEVEL = var.vault_log_level
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -159,6 +159,9 @@ scenario "replication" {
|
|||||||
vault_artifactory_release = matrix.artifact_source == "artifactory" ? step.build_vault.vault_artifactory_release : null
|
vault_artifactory_release = matrix.artifact_source == "artifactory" ? step.build_vault.vault_artifactory_release : null
|
||||||
vault_license = step.read_license.license
|
vault_license = step.read_license.license
|
||||||
vpc_id = step.create_vpc.vpc_id
|
vpc_id = step.create_vpc.vpc_id
|
||||||
|
vault_environment = {
|
||||||
|
VAULT_LOG_LEVEL = var.vault_log_level
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -211,6 +214,9 @@ scenario "replication" {
|
|||||||
vault_artifactory_release = matrix.artifact_source == "artifactory" ? step.build_vault.vault_artifactory_release : null
|
vault_artifactory_release = matrix.artifact_source == "artifactory" ? step.build_vault.vault_artifactory_release : null
|
||||||
vault_license = step.read_license.license
|
vault_license = step.read_license.license
|
||||||
vpc_id = step.create_vpc.vpc_id
|
vpc_id = step.create_vpc.vpc_id
|
||||||
|
vault_environment = {
|
||||||
|
VAULT_LOG_LEVEL = var.vault_log_level
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -456,6 +462,9 @@ scenario "replication" {
|
|||||||
vault_unseal_when_no_init = matrix.primary_seal == "shamir"
|
vault_unseal_when_no_init = matrix.primary_seal == "shamir"
|
||||||
vault_unseal_keys = matrix.primary_seal == "shamir" ? step.create_vault_primary_cluster.vault_unseal_keys_hex : null
|
vault_unseal_keys = matrix.primary_seal == "shamir" ? step.create_vault_primary_cluster.vault_unseal_keys_hex : null
|
||||||
vpc_id = step.create_vpc.vpc_id
|
vpc_id = step.create_vpc.vpc_id
|
||||||
|
vault_environment = {
|
||||||
|
VAULT_LOG_LEVEL = var.vault_log_level
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -163,6 +163,9 @@ scenario "smoke" {
|
|||||||
vault_artifactory_release = matrix.artifact_source == "artifactory" ? step.build_vault.vault_artifactory_release : null
|
vault_artifactory_release = matrix.artifact_source == "artifactory" ? step.build_vault.vault_artifactory_release : null
|
||||||
vault_license = matrix.edition != "oss" ? step.read_license.license : null
|
vault_license = matrix.edition != "oss" ? step.read_license.license : null
|
||||||
vpc_id = step.create_vpc.vpc_id
|
vpc_id = step.create_vpc.vpc_id
|
||||||
|
vault_environment = {
|
||||||
|
VAULT_LOG_LEVEL = var.vault_log_level
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -133,6 +133,9 @@ scenario "ui" {
|
|||||||
vault_install_dir = local.vault_install_dir
|
vault_install_dir = local.vault_install_dir
|
||||||
vault_license = matrix.edition != "oss" ? step.read_license.license : null
|
vault_license = matrix.edition != "oss" ? step.read_license.license : null
|
||||||
vpc_id = step.create_vpc.vpc_id
|
vpc_id = step.create_vpc.vpc_id
|
||||||
|
vault_environment = {
|
||||||
|
VAULT_LOG_LEVEL = var.vault_log_level
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -165,6 +165,9 @@ scenario "upgrade" {
|
|||||||
vault_release = var.vault_upgrade_initial_release
|
vault_release = var.vault_upgrade_initial_release
|
||||||
vault_license = matrix.edition != "oss" ? step.read_license.license : null
|
vault_license = matrix.edition != "oss" ? step.read_license.license : null
|
||||||
vpc_id = step.create_vpc.vpc_id
|
vpc_id = step.create_vpc.vpc_id
|
||||||
|
vault_environment = {
|
||||||
|
VAULT_LOG_LEVEL = var.vault_log_level
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -139,6 +139,12 @@ variable "vault_local_build_tags" {
|
|||||||
default = null
|
default = null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
variable "vault_log_level" {
|
||||||
|
description = "The server log level for Vault logs. Supported values (in order of detail) are trace, debug, info, warn, and err."
|
||||||
|
type = string
|
||||||
|
default = "info"
|
||||||
|
}
|
||||||
|
|
||||||
variable "vault_build_date" {
|
variable "vault_build_date" {
|
||||||
description = "The build date for Vault artifact"
|
description = "The build date for Vault artifact"
|
||||||
type = string
|
type = string
|
||||||
|
|||||||
@@ -62,6 +62,7 @@ scenario "k8s" {
|
|||||||
image_repository = step.load_docker_image.repository
|
image_repository = step.load_docker_image.repository
|
||||||
kubeconfig_base64 = step.create_kind_cluster.kubeconfig_base64
|
kubeconfig_base64 = step.create_kind_cluster.kubeconfig_base64
|
||||||
vault_edition = matrix.edition
|
vault_edition = matrix.edition
|
||||||
|
vault_log_level = var.vault_log_level
|
||||||
ent_license = matrix.edition != "oss" ? step.read_license.license : null
|
ent_license = matrix.edition != "oss" ? step.read_license.license : null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,12 @@ variable "vault_image_repository" {
|
|||||||
default = null
|
default = null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
variable "vault_log_level" {
|
||||||
|
description = "The server log level for Vault logs. Supported values (in order of detail) are trace, debug, info, warn, and err."
|
||||||
|
type = string
|
||||||
|
default = "info"
|
||||||
|
}
|
||||||
|
|
||||||
variable "vault_product_version" {
|
variable "vault_product_version" {
|
||||||
description = "The vault product version to test"
|
description = "The vault product version to test"
|
||||||
type = string
|
type = string
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ locals {
|
|||||||
"server.limits.cpu" = "200m"
|
"server.limits.cpu" = "200m"
|
||||||
"server.ha.raft.config" = file("${abspath(path.module)}/raft-config.hcl")
|
"server.ha.raft.config" = file("${abspath(path.module)}/raft-config.hcl")
|
||||||
"server.dataStorage.size" = "100m"
|
"server.dataStorage.size" = "100m"
|
||||||
|
"server.logLevel" = var.vault_log_level
|
||||||
}
|
}
|
||||||
all_helm_chart_settings = var.ent_license == null ? local.helm_chart_settings : merge(local.helm_chart_settings, {
|
all_helm_chart_settings = var.ent_license == null ? local.helm_chart_settings : merge(local.helm_chart_settings, {
|
||||||
"server.extraEnvironmentVars.VAULT_LICENSE" = var.ent_license
|
"server.extraEnvironmentVars.VAULT_LICENSE" = var.ent_license
|
||||||
|
|||||||
@@ -32,3 +32,8 @@ variable "vault_instance_count" {
|
|||||||
type = number
|
type = number
|
||||||
description = "How many vault instances are in the cluster"
|
description = "How many vault instances are in the cluster"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
variable "vault_log_level" {
|
||||||
|
description = "The server log level for Vault logs. Supported values (in order of detail) are trace, debug, info, warn, and err."
|
||||||
|
type = string
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user