diff --git a/roles/promtail/README.md b/roles/promtail/README.md index ee40a4f..7dac0b4 100644 --- a/roles/promtail/README.md +++ b/roles/promtail/README.md @@ -11,8 +11,8 @@ Role Variables (all optional) `promtail_version`: version to install -`loki_server`: set loki server -`loki_port`: set loki port +`promtail_loki_server`: set loki server +`promtail_loki_port`: set loki port `custom_server_config`: path to custom config witch replace all config with your own `custom_scrape_configs`: path to custom scrape configs diff --git a/roles/promtail/defaults/main.yml b/roles/promtail/defaults/main.yml index 5a64778..8a8fa39 100644 --- a/roles/promtail/defaults/main.yml +++ b/roles/promtail/defaults/main.yml @@ -2,6 +2,6 @@ promtail_version: 2.7.3 promtail_positions_path: /home/promtail/positions.yaml promtail_http_port: 9080 -loki_server: localhost -loki_port: 3100 -add_var_logs: true +promtail_loki_server: localhost +promtail_loki_port: 3100 +promtail_add_var_logs: true diff --git a/roles/promtail/molecule/default/verify.yml b/roles/promtail/molecule/default/verify.yml index c9ef143..e1e0984 100644 --- a/roles/promtail/molecule/default/verify.yml +++ b/roles/promtail/molecule/default/verify.yml @@ -7,13 +7,13 @@ - name: "Include default vars" ansible.builtin.include_vars: dir: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/defaults/" - extensions: [ 'yml' ] + extensions: ['yml'] - name: "Sanity check the Promtail daemon" retries: 3 delay: 1 - register: this - failed_when: "this.content != 'Ready'" + register: promtail_this + failed_when: "promtail_this.content != 'Ready'" ansible.builtin.uri: url: "http://localhost:{{ promtail_http_port }}/ready" return_content: true diff --git a/roles/promtail/tasks/main.yml b/roles/promtail/tasks/main.yml index ca1458b..127c10c 100644 --- a/roles/promtail/tasks/main.yml +++ b/roles/promtail/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: "Install packages" ansible.builtin.apt: - name: [ acl, unzip ] + name: [acl, unzip] state: present update_cache: true cache_valid_time: 3600 diff --git a/roles/promtail/templates/promtail.yml.j2 b/roles/promtail/templates/promtail.yml.j2 index 2435643..21dea49 100644 --- a/roles/promtail/templates/promtail.yml.j2 +++ b/roles/promtail/templates/promtail.yml.j2 @@ -9,10 +9,10 @@ positions: filename: {{ promtail_positions_path }} clients: - - url: "http://{{ loki_server }}:{{ loki_port }}/loki/api/v1/push" + - url: "http://{{ promtail_loki_server }}:{{ promtail_loki_port }}/loki/api/v1/push" scrape_configs: -{% if add_var_logs %} +{% if promtail_add_var_logs %} - job_name: system static_configs: - targets: