projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '20937-arv-copy-http' refs #20937
[arvados.git]
/
tools
/
salt-install
/
config_examples
/
multi_host
/
aws
/
pillars
/
prometheus_server.sls
diff --git
a/tools/salt-install/config_examples/multi_host/aws/pillars/prometheus_server.sls
b/tools/salt-install/config_examples/multi_host/aws/pillars/prometheus_server.sls
index 9952e3bbc440653f1d6c8791a12fac9f3c4a76c4..26877f35df13166769d9ee8ac841cb0d82097ac7 100644
(file)
--- a/
tools/salt-install/config_examples/multi_host/aws/pillars/prometheus_server.sls
+++ b/
tools/salt-install/config_examples/multi_host/aws/pillars/prometheus_server.sls
@@
-5,6
+5,7
@@
{%- set controller_nodes = "__CONTROLLER_NODES__".split(',') %}
{%- set enable_balancer = ("__ENABLE_BALANCER__"|to_bool) %}
{%- set controller_nodes = "__CONTROLLER_NODES__".split(',') %}
{%- set enable_balancer = ("__ENABLE_BALANCER__"|to_bool) %}
+{%- set data_retention_time = "__PROMETHEUS_DATA_RETENTION_TIME__" %}
### PROMETHEUS
prometheus:
### PROMETHEUS
prometheus:
@@
-18,6
+19,9
@@
prometheus:
use_upstream_archive: true
component:
prometheus:
use_upstream_archive: true
component:
prometheus:
+ service:
+ args:
+ storage.tsdb.retention.time: {{ data_retention_time }}
config:
global:
scrape_interval: 15s
config:
global:
scrape_interval: 15s
@@
-95,6
+99,7
@@
prometheus:
instance: arvados-dispatch-cloud.__CLUSTER__
cluster: __CLUSTER__
instance: arvados-dispatch-cloud.__CLUSTER__
cluster: __CLUSTER__
+ {%- if "__DATABASE_INT_IP__" != "" %}
# Database
- job_name: postgresql
static_configs:
# Database
- job_name: postgresql
static_configs:
@@
-105,6
+110,7
@@
prometheus:
labels:
instance: database.__CLUSTER__
cluster: __CLUSTER__
labels:
instance: database.__CLUSTER__
cluster: __CLUSTER__
+ {%- endif %}
# Nodes
{%- set node_list = "__NODELIST__".split(',') %}
# Nodes
{%- set node_list = "__NODELIST__".split(',') %}