diff options
| author | Zohar Galor <zgalor@redhat.com> | 2017-11-19 15:22:08 +0200 |
|---|---|---|
| committer | Zohar Galor <zgalor@redhat.com> | 2017-11-19 15:22:08 +0200 |
| commit | 84427fb69f2b96f97d733f150c9840f78439786b (patch) | |
| tree | cb0a45a8a984fba25f65b437595c53dbba4735fd | |
| parent | 71ac647d479768a1e3097a3dde02b9707d175a38 (diff) | |
| download | openshift-84427fb69f2b96f97d733f150c9840f78439786b.tar.gz openshift-84427fb69f2b96f97d733f150c9840f78439786b.tar.bz2 openshift-84427fb69f2b96f97d733f150c9840f78439786b.tar.xz openshift-84427fb69f2b96f97d733f150c9840f78439786b.zip | |
Allow modifying and adding prometheus application arguments
config.file and web.listen-address remain unconfigurable (Changing those will break deployment)
Storage defaults moved to a list parameter `openshift_prometheus_args` that can be modified and extended.
| -rw-r--r-- | roles/openshift_prometheus/README.md | 7 | ||||
| -rw-r--r-- | roles/openshift_prometheus/defaults/main.yaml | 3 | ||||
| -rw-r--r-- | roles/openshift_prometheus/templates/prometheus.j2 | 5 |
3 files changed, 13 insertions, 2 deletions
diff --git a/roles/openshift_prometheus/README.md b/roles/openshift_prometheus/README.md index 92f74928c..5bf6e7d77 100644 --- a/roles/openshift_prometheus/README.md +++ b/roles/openshift_prometheus/README.md @@ -23,6 +23,13 @@ For default values, see [`defaults/main.yaml`](defaults/main.yaml). - `openshift_prometheus_<COMPONENT>_image_version`: specify image version for the component +- `openshift_prometheus_args`: Modify or add arguments for prometheus application + +e.g +``` +openshift_prometheus_args=['--storage.tsdb.retention=6h', '--storage.tsdb.min-block-duration=5s', '--storage.tsdb.max-block-duration=6m'] +``` + ## PVC related variables Each prometheus component (prometheus, alertmanager, alertbuffer) can set pv claim by setting corresponding role variable: ``` diff --git a/roles/openshift_prometheus/defaults/main.yaml b/roles/openshift_prometheus/defaults/main.yaml index 4e2cea0b9..1b4a12cac 100644 --- a/roles/openshift_prometheus/defaults/main.yaml +++ b/roles/openshift_prometheus/defaults/main.yaml @@ -9,6 +9,9 @@ openshift_prometheus_node_selector: {"region":"infra"} # additional prometheus rules file openshift_prometheus_additional_rules_file: null +#prometheus application arguments +openshift_prometheus_args: ['--storage.tsdb.retention=6h', '--storage.tsdb.min-block-duration=2m'] + # storage # One of ['emptydir', 'pvc'] openshift_prometheus_storage_type: "emptydir" diff --git a/roles/openshift_prometheus/templates/prometheus.j2 b/roles/openshift_prometheus/templates/prometheus.j2 index 456db3a57..e73a94eee 100644 --- a/roles/openshift_prometheus/templates/prometheus.j2 +++ b/roles/openshift_prometheus/templates/prometheus.j2 @@ -75,8 +75,9 @@ spec: - name: prometheus args: - - --storage.tsdb.retention=6h - - --storage.tsdb.min-block-duration=2m +{% for arg in openshift_prometheus_args %} + - {{ arg }} +{% endfor %} - --config.file=/etc/prometheus/prometheus.yml - --web.listen-address=localhost:9090 image: "{{ l_openshift_prometheus_image_prefix }}prometheus:{{ l_openshift_prometheus_image_version }}" |