Skip to content

Commit 8d52e06

Browse files
committed
add more parameters for prom values file
1 parent 31551d7 commit 8d52e06

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

locals.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ locals {
1919
prometheus_alertmanager_nodeselector = var.prometheus_alertmanager_nodeselector
2020
prometheus_nodeselector = var.prometheus_nodeselector
2121

22-
prometheus_remote_write = jsonencode(var.prometheus_remote_write)
22+
prometheus_remote_write = jsonencode(var.prometheus_remote_write)
23+
prometheus_external_labels = jsonencode(var.prometheus_external_labels)
24+
prometheus_metric_labels_allowlist = var.prometheus_metric_labels_allowlist
2325
}
2426

2527
grafana_values = {

templates/values.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1480,6 +1480,7 @@ kubeStateMetrics:
14801480
## Configuration for kube-state-metrics subchart
14811481
##
14821482
kube-state-metrics:
1483+
metricLabelsAllowlist: ${prometheus_metric_labels_allowlist}
14831484
namespaceOverride: ""
14841485
rbac:
14851486
create: true
@@ -2402,7 +2403,7 @@ prometheus:
24022403

24032404
## External labels to add to any time series or alerts when communicating with external systems
24042405
##
2405-
externalLabels: {}
2406+
externalLabels: ${prometheus_external_labels}
24062407

24072408
## enable --web.enable-remote-write-receiver flag on prometheus-server
24082409
##

variables.tf

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,18 @@ variable "prometheus_remote_write" {
157157
default = []
158158
}
159159

160+
variable "prometheus_external_labels" {
161+
description = "External Labels for Ops Out More Information"
162+
type = map(any)
163+
default = {}
164+
}
165+
166+
variable "prometheus_metric_labels_allowlist" {
167+
description = "Comma-separated list of additional Kubernetes label keys that will be used (Example: '=namespaces=[k8s-label-1,k8s-label-n,...],pods=[app],...)'"
168+
type = string
169+
default = ""
170+
}
171+
160172
###########################################
161173
######## Grafana Chart Values ########
162174
###########################################

0 commit comments

Comments
 (0)