mirror of
https://github.com/prometheus-community/ansible
synced 2025-02-16 12:48:26 +00:00
feat: Support Prometheus 3.0 (#462)
Update prometheus role for 3.0.0. * Update argument_specs.yml to reflect support of 3.x. * Skip console templates on 3.x. Fixes: https://github.com/prometheus-community/ansible/issues/460 Signed-off-by: SuperQ <superq@gmail.com>
This commit is contained in:
parent
ef4eb15644
commit
818d67cd2e
6 changed files with 11 additions and 6 deletions
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
prometheus_version: 2.54.1
|
prometheus_version: 3.0.0
|
||||||
prometheus_binary_url: "https://github.com/{{ _prometheus_repo }}/releases/download/v{{ prometheus_version }}/\
|
prometheus_binary_url: "https://github.com/{{ _prometheus_repo }}/releases/download/v{{ prometheus_version }}/\
|
||||||
prometheus-{{ prometheus_version }}.{{ ansible_system | lower }}-{{ _prometheus_go_ansible_arch }}.tar.gz"
|
prometheus-{{ prometheus_version }}.{{ ansible_system | lower }}-{{ _prometheus_go_ansible_arch }}.tar.gz"
|
||||||
prometheus_checksums_url: "https://github.com/{{ _prometheus_repo }}/releases/download/v{{ prometheus_version }}/sha256sums.txt"
|
prometheus_checksums_url: "https://github.com/{{ _prometheus_repo }}/releases/download/v{{ prometheus_version }}/sha256sums.txt"
|
||||||
|
|
|
@ -11,8 +11,8 @@ argument_specs:
|
||||||
prometheus_version:
|
prometheus_version:
|
||||||
description:
|
description:
|
||||||
- "Prometheus package version. Also accepts C(latest) as parameter."
|
- "Prometheus package version. Also accepts C(latest) as parameter."
|
||||||
- "Only prometheus 2.x is supported"
|
- "Prometheus >= 2.x is supported"
|
||||||
default: "2.54.1"
|
default: "3.0.0"
|
||||||
prometheus_binary_url:
|
prometheus_binary_url:
|
||||||
description: "URL of the prometheus binaries .tar.gz file"
|
description: "URL of the prometheus binaries .tar.gz file"
|
||||||
default: "https://github.com/{{ _prometheus_repo }}/releases/download/v{{ prometheus_version }}/prometheus-{{ prometheus_version }}.{{ ansible_system | lower }}-{{ _prometheus_go_ansible_arch }}.tar.gz"
|
default: "https://github.com/{{ _prometheus_repo }}/releases/download/v{{ prometheus_version }}/prometheus-{{ prometheus_version }}.{{ ansible_system | lower }}-{{ _prometheus_go_ansible_arch }}.tar.gz"
|
||||||
|
|
|
@ -18,7 +18,7 @@ def AnsibleDefaults():
|
||||||
("/etc/systemd/system/prometheus.service",
|
("/etc/systemd/system/prometheus.service",
|
||||||
"storage.agent.path=/var/lib/prometheus"),
|
"storage.agent.path=/var/lib/prometheus"),
|
||||||
("/etc/systemd/system/prometheus.service",
|
("/etc/systemd/system/prometheus.service",
|
||||||
"enable-feature=agent"),
|
"agent"),
|
||||||
])
|
])
|
||||||
def test_file_contents(host, file, content):
|
def test_file_contents(host, file, content):
|
||||||
f = host.file(file)
|
f = host.file(file)
|
||||||
|
|
|
@ -37,8 +37,6 @@ def test_directories(host, dirs):
|
||||||
"files",
|
"files",
|
||||||
[
|
[
|
||||||
"/etc/prometheus/prometheus.yml",
|
"/etc/prometheus/prometheus.yml",
|
||||||
"/etc/prometheus/console_libraries/prom.lib",
|
|
||||||
"/etc/prometheus/consoles/prometheus.html",
|
|
||||||
"/etc/prometheus/scrape_configs/empty_scrapes.yml",
|
"/etc/prometheus/scrape_configs/empty_scrapes.yml",
|
||||||
"/etc/systemd/system/prometheus.service",
|
"/etc/systemd/system/prometheus.service",
|
||||||
"/usr/local/bin/prometheus",
|
"/usr/local/bin/prometheus",
|
||||||
|
|
|
@ -36,6 +36,8 @@
|
||||||
group: "{{ prometheus_system_group }}"
|
group: "{{ prometheus_system_group }}"
|
||||||
mode: 0775
|
mode: 0775
|
||||||
loop:
|
loop:
|
||||||
|
- "{{ prometheus_config_dir }}/consoles"
|
||||||
|
- "{{ prometheus_config_dir }}/console_libraries"
|
||||||
- "{{ prometheus_config_dir }}/rules"
|
- "{{ prometheus_config_dir }}/rules"
|
||||||
- "{{ prometheus_config_dir }}/file_sd"
|
- "{{ prometheus_config_dir }}/file_sd"
|
||||||
- "{{ prometheus_config_dir }}/scrape_configs"
|
- "{{ prometheus_config_dir }}/scrape_configs"
|
||||||
|
@ -58,6 +60,7 @@
|
||||||
notify:
|
notify:
|
||||||
- restart prometheus
|
- restart prometheus
|
||||||
become: true
|
become: true
|
||||||
|
when: prometheus_version is version('3.0.0', '<')
|
||||||
tags:
|
tags:
|
||||||
- prometheus
|
- prometheus
|
||||||
- configure
|
- configure
|
||||||
|
|
|
@ -21,8 +21,12 @@ ExecStart={{ prometheus_binary_install_dir }}/prometheus \
|
||||||
{% else %}
|
{% else %}
|
||||||
--storage.tsdb.retention={{ prometheus_storage_retention }} \
|
--storage.tsdb.retention={{ prometheus_storage_retention }} \
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
{% else %}
|
||||||
|
{% if prometheus_version is version('3.0.0', '>=') %}
|
||||||
|
--agent \
|
||||||
{% else %}
|
{% else %}
|
||||||
--enable-feature=agent \
|
--enable-feature=agent \
|
||||||
|
{% endif %}
|
||||||
--storage.agent.path={{ prometheus_db_dir }} \
|
--storage.agent.path={{ prometheus_db_dir }} \
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if (prometheus_version is version('2.24.0', '>=')) and (prometheus_web_config.values() | map('length') | select('gt', 0) | list is any) %}
|
{% if (prometheus_version is version('2.24.0', '>=')) and (prometheus_web_config.values() | map('length') | select('gt', 0) | list is any) %}
|
||||||
|
|
Loading…
Add table
Reference in a new issue