[prometheus] Added support for extra options

This change introduces the way to pass extra options to prometheus.

Currently, prometheus runs with nearly default options, and when clouds
start getting bigger, you need to pass extra parameters to prometheus.

Change-Id: Ic773c0b73062cf3b2285343bafb25d5923911834
This commit is contained in:
Dincer Celik 2019-09-18 10:58:38 +03:00
parent b7bbbae981
commit 5ff7bab46b
4 changed files with 9 additions and 1 deletions

View File

@ -1066,9 +1066,11 @@ enable_prometheus_ceph_mgr_exporter: "{{ enable_ceph | bool and enable_prometheu
enable_prometheus_openstack_exporter: "{{ enable_prometheus | bool }}" enable_prometheus_openstack_exporter: "{{ enable_prometheus | bool }}"
enable_prometheus_elasticsearch_exporter: "{{ enable_prometheus | bool and enable_elasticsearch | bool }}" enable_prometheus_elasticsearch_exporter: "{{ enable_prometheus | bool and enable_elasticsearch | bool }}"
enable_prometheus_blackbox_exporter: "{{ enable_prometheus | bool }}" enable_prometheus_blackbox_exporter: "{{ enable_prometheus | bool }}"
prometheus_alertmanager_user: "admin" prometheus_alertmanager_user: "admin"
prometheus_openstack_exporter_interval: "60s" prometheus_openstack_exporter_interval: "60s"
prometheus_elasticsearch_exporter_interval: "60s" prometheus_elasticsearch_exporter_interval: "60s"
prometheus_cmdline_extras:
############ ############
# Vitrage # Vitrage

View File

@ -1,5 +1,5 @@
{ {
"command": "/opt/prometheus/prometheus -config.file /etc/prometheus/prometheus.yml -web.listen-address {{ api_interface_address }}:{{ prometheus_port }} -web.external-url={{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ prometheus_port }} -log.format logger:stdout -storage.local.path /var/lib/prometheus", "command": "/opt/prometheus/prometheus -config.file /etc/prometheus/prometheus.yml -web.listen-address {{ api_interface_address }}:{{ prometheus_port }} -web.external-url={{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ prometheus_port }} -log.format logger:stdout -storage.local.path /var/lib/prometheus{% if prometheus_cmdline_extras %} {{ prometheus_cmdline_extras }}{% endif %}",
"config_files": [ "config_files": [
{ {
"source": "{{ container_config_directory }}/prometheus.yml", "source": "{{ container_config_directory }}/prometheus.yml",

View File

@ -598,6 +598,9 @@
#enable_prometheus_elasticsearch_exporter: "{{ enable_prometheus | bool and enable_elasticsearch | bool }}" #enable_prometheus_elasticsearch_exporter: "{{ enable_prometheus | bool and enable_elasticsearch | bool }}"
#enable_prometheus_blackbox_exporter: "{{ enable_prometheus | bool }}" #enable_prometheus_blackbox_exporter: "{{ enable_prometheus | bool }}"
# List of extra parameters passed to prometheus. You can add as many to the list.
#prometheus_cmdline_extras:
######### #########
# Freezer # Freezer
######### #########

View File

@ -0,0 +1,3 @@
---
features:
- Adds support for passing extra options to Prometheus.