Skip to content

Commit c971ecc

Browse files
committed
update the readme and change the remote value type to object
1 parent d6d7875 commit c971ecc

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
| Name | Version |
1414
|------|---------|
15-
| <a name="provider_helm"></a> [helm](#provider\_helm) | >= 2.5 |
15+
| <a name="provider_helm"></a> [helm](#provider\_helm) | 2.6.0 |
1616

1717
## Modules
1818

@@ -119,6 +119,7 @@ No modules.
119119
| <a name="input_prometheus_nodeselector"></a> [prometheus\_nodeselector](#input\_prometheus\_nodeselector) | prometheus Spec node selector | `any` | `""` | no |
120120
| <a name="input_prometheus_operator_image_repository"></a> [prometheus\_operator\_image\_repository](#input\_prometheus\_operator\_image\_repository) | Prometheus Operator Image repository | `string` | `"quay.io/prometheus-operator/prometheus-operator"` | no |
121121
| <a name="input_prometheus_operator_image_tag"></a> [prometheus\_operator\_image\_tag](#input\_prometheus\_operator\_image\_tag) | Prometheus Operator Image Tag | `string` | `"v0.60.1"` | no |
122+
| <a name="input_prometheus_remote_write"></a> [prometheus\_remote\_write](#input\_prometheus\_remote\_write) | Write samples from Prometheus to a remote endpoint | `any` | <pre>{<br> "queue_config": {<br> "capacity": 2500,<br> "max_samples_per_send": 1000,<br> "max_shards": 200<br> },<br> "sigv4": {<br> "region": "ap-southeast-1",<br> "role_arn": "arn:aws:iam::XXXXXXXXX:role/tenant-XXXXXXXXXXX-customerclustertrustrole45CE3A-1PKMAVG0ZXNS3"<br> },<br> "url": "https://aps-workspaces.ap-southeast-1.amazonaws.com/workspaces/ws-44e4207c-a58f-db7c91e96fba/api/v1/remote_write"<br>}</pre> | no |
122123
| <a name="input_prometheus_service_account"></a> [prometheus\_service\_account](#input\_prometheus\_service\_account) | Name of the Service Account for Grafana | `string` | `""` | no |
123124
| <a name="input_prometheus_service_account_annotations"></a> [prometheus\_service\_account\_annotations](#input\_prometheus\_service\_account\_annotations) | Annotations for service account | `map(any)` | `{}` | no |
124125
| <a name="input_promethues_operator_nodeselector"></a> [promethues\_operator\_nodeselector](#input\_promethues\_operator\_nodeselector) | Promethues Operator node selector | `any` | `""` | no |

locals.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ 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 = yamlencode(var.prometheus_remote_write)
2323
}
2424

2525
grafana_values = {

templates/values.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2629,7 +2629,8 @@ prometheus:
26292629

26302630
## The remote_write spec configuration for Prometheus.
26312631
## ref: https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#remotewritespec
2632-
remoteWrite: ${prometheus_remote_write}
2632+
remoteWrite:
2633+
- ${prometheus_remote_write}
26332634
# - url: http://remote1/push
26342635
## additionalRemoteWrite is appended to remoteWrite
26352636
additionalRemoteWrite: []

variables.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@ variable "prometheus_nodeselector" {
153153

154154
variable "prometheus_remote_write" {
155155
description = "Write samples from Prometheus to a remote endpoint"
156-
type = list(any)
157-
default = []
156+
type = any
157+
default = {}
158158
}
159159

160160
###########################################

0 commit comments

Comments
 (0)