dashboard: support prometheus storage.tsdb.retention.time parameter

This commit adds the parameter `--storage.tsdb.retention.time` to the
prometheus systemd unit template.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1928000

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit b60c61ce45)
pull/6426/head
Guillaume Abrioux 2021-03-30 09:49:10 +02:00
parent 5fd299e358
commit b2cf677b71
4 changed files with 15 additions and 0 deletions

View File

@ -800,6 +800,10 @@ dummy:
#prometheus_conf_dir: /etc/prometheus #prometheus_conf_dir: /etc/prometheus
#prometheus_user_id: '65534' # This is the UID used by the prom/prometheus container image #prometheus_user_id: '65534' # This is the UID used by the prom/prometheus container image
#prometheus_port: 9092 #prometheus_port: 9092
#prometheus_conf_overrides: {}
# Uncomment out this variable if you need to customize the retention period for prometheus storage.
# set it to '30d' if you want to retain 30 days of data.
#prometheus_storage_tsdb_retention_time: 15d
#alertmanager_container_image: "prom/alertmanager:v0.16.2" #alertmanager_container_image: "prom/alertmanager:v0.16.2"
#alertmanager_container_cpu_period: 100000 #alertmanager_container_cpu_period: 100000
#alertmanager_container_cpu_cores: 2 #alertmanager_container_cpu_cores: 2

View File

@ -800,6 +800,10 @@ prometheus_container_image: registry.redhat.io/openshift4/ose-prometheus:v4.6
#prometheus_conf_dir: /etc/prometheus #prometheus_conf_dir: /etc/prometheus
#prometheus_user_id: '65534' # This is the UID used by the prom/prometheus container image #prometheus_user_id: '65534' # This is the UID used by the prom/prometheus container image
#prometheus_port: 9092 #prometheus_port: 9092
#prometheus_conf_overrides: {}
# Uncomment out this variable if you need to customize the retention period for prometheus storage.
# set it to '30d' if you want to retain 30 days of data.
#prometheus_storage_tsdb_retention_time: 15d
alertmanager_container_image: registry.redhat.io/openshift4/ose-prometheus-alertmanager:v4.6 alertmanager_container_image: registry.redhat.io/openshift4/ose-prometheus-alertmanager:v4.6
#alertmanager_container_cpu_period: 100000 #alertmanager_container_cpu_period: 100000
#alertmanager_container_cpu_cores: 2 #alertmanager_container_cpu_cores: 2

View File

@ -792,6 +792,10 @@ prometheus_data_dir: /var/lib/prometheus
prometheus_conf_dir: /etc/prometheus prometheus_conf_dir: /etc/prometheus
prometheus_user_id: '65534' # This is the UID used by the prom/prometheus container image prometheus_user_id: '65534' # This is the UID used by the prom/prometheus container image
prometheus_port: 9092 prometheus_port: 9092
prometheus_conf_overrides: {}
# Uncomment out this variable if you need to customize the retention period for prometheus storage.
# set it to '30d' if you want to retain 30 days of data.
#prometheus_storage_tsdb_retention_time: 15d
alertmanager_container_image: "prom/alertmanager:v0.16.2" alertmanager_container_image: "prom/alertmanager:v0.16.2"
alertmanager_container_cpu_period: 100000 alertmanager_container_cpu_period: 100000
alertmanager_container_cpu_cores: 2 alertmanager_container_cpu_cores: 2

View File

@ -31,6 +31,9 @@ ExecStart=/usr/bin/{{ container_binary }} run --rm --name=prometheus \
{{ prometheus_container_image }} \ {{ prometheus_container_image }} \
--config.file=/etc/prometheus/prometheus.yml \ --config.file=/etc/prometheus/prometheus.yml \
--storage.tsdb.path=/prometheus \ --storage.tsdb.path=/prometheus \
{% if prometheus_storage_tsdb_retention_time is defined %}
--storage.tsdb.retention.time={{ prometheus_storage_tsdb_retention_time }} \
{% endif %}
--web.external-url=http://{{ ansible_facts['fqdn'] }}:{{ prometheus_port }}/ \ --web.external-url=http://{{ ansible_facts['fqdn'] }}:{{ prometheus_port }}/ \
--web.listen-address={{ grafana_server_addr }}:{{ prometheus_port }} --web.listen-address={{ grafana_server_addr }}:{{ prometheus_port }}
{% if container_binary == 'podman' %} {% if container_binary == 'podman' %}