Merge "Support customizing prometheus.cfg files"
This commit is contained in:
commit
e17cf01f82
@ -56,14 +56,27 @@
|
||||
notify:
|
||||
- Restart prometheus-server container
|
||||
|
||||
- name: Find prometheus config overrides
|
||||
find:
|
||||
# NOTE(wszumski): Non-existent paths don't produce a failure
|
||||
paths:
|
||||
- "{{ node_custom_config }}/prometheus/prometheus.yml.d"
|
||||
- "{{ node_custom_config }}/prometheus/{{ inventory_hostname }}/prometheus.yml.d"
|
||||
patterns: "*.yml"
|
||||
delegate_to: localhost
|
||||
register: prometheus_config_overrides_result
|
||||
run_once: true
|
||||
|
||||
- name: Copying over prometheus config file
|
||||
become: true
|
||||
vars:
|
||||
service: "{{ prometheus_services['prometheus-server'] }}"
|
||||
template:
|
||||
src: "{{ item }}"
|
||||
overrides: "{{ prometheus_config_overrides_result.files | map(attribute='path') | list }}"
|
||||
merge_yaml:
|
||||
sources: "{{ [prometheus_config_file] + overrides }}"
|
||||
dest: "{{ node_config_directory }}/prometheus-server/prometheus.yml"
|
||||
mode: "0660"
|
||||
extend_lists: true
|
||||
when:
|
||||
- inventory_hostname in groups[service.group]
|
||||
- service.enabled | bool
|
||||
|
@ -30,3 +30,39 @@ and data retention period to 2 days:
|
||||
.. code-block:: yaml
|
||||
|
||||
prometheus_cmdline_extras: "-storage.remote.timeout 30s -storage.local.retention 48h"
|
||||
|
||||
Extending prometheus.cfg
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
If you want to add extra targets to scrape, you can extend the default
|
||||
``prometheus.yml`` config file by placing additional configs in
|
||||
``{{ node_custom_config }}/prometheus/prometheus.yml.d``. These should have the
|
||||
same format as ``prometheus.yml``. These additional configs are merged so
|
||||
that any list items are extended. For example, if using the default value for
|
||||
``node_custom_config``, you could add additional targets to scape by defining
|
||||
``/etc/kolla/config/prometheus/prometheus.yml.d/10-custom.yml`` containing the
|
||||
following:
|
||||
|
||||
.. code-block:: jinja
|
||||
|
||||
scrape_configs:
|
||||
- job_name: custom
|
||||
static_configs:
|
||||
- targets:
|
||||
- '10.0.0.111:1234'
|
||||
- job_name: custom-template
|
||||
static_configs:
|
||||
- targets:
|
||||
{% for host in groups['prometheus'] %}
|
||||
- '{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ 3456 }}'
|
||||
{% endfor %}
|
||||
|
||||
The jobs, ``custom``, and ``custom_template`` would be appended to the default
|
||||
list of ``scrape_configs`` in the final ``prometheus.yml``. To customize on a per
|
||||
host basis, files can also be placed in
|
||||
``{{ node_custom_config }}/prometheus/<inventory_hostname>/prometheus.yml.d``
|
||||
where, ``inventory_hostname`` is one of the hosts in your inventory. These
|
||||
will be merged with any files in ``{{ node_custom_config }}/prometheus/prometheus.yml.d``,
|
||||
so in order to override a list value instead of extending it, you will need to make
|
||||
sure that no files in ``{{ node_custom_config }}/prometheus/prometheus.yml.d``
|
||||
set a key with an equivalent hierarchical path.
|
||||
|
@ -0,0 +1,6 @@
|
||||
---
|
||||
features:
|
||||
- |
|
||||
Added a mechanism to customize ``prometheus.yml``. Please read the the
|
||||
`documentation <https://docs.openstack.org/kolla-ansible/latest/reference/logging-and-monitoring/prometheus-guide.html>`__.
|
||||
for more details.
|
Loading…
Reference in New Issue
Block a user