diff --git a/defaults/main.yml b/defaults/main.yml index dd602ee..66a9380 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -65,6 +65,8 @@ loki_schema_config: period: 168h row_shards: 16 +loki_compactor_config: {} + loki_limits_config: enforce_metric_name: false reject_old_samples: true diff --git a/tasks/configure.yml b/tasks/configure.yml index 3dec91c..1ab52af 100644 --- a/tasks/configure.yml +++ b/tasks/configure.yml @@ -6,7 +6,8 @@ force: true owner: root group: "{{ loki_user }}" - mode: 0640 + mode: "0640" + backup: true notify: - Reload loki when: ('loki' in loki_bins) @@ -18,7 +19,7 @@ force: true owner: root group: "{{ loki_user }}" - mode: 0640 + mode: "0640" notify: - Reload promtail when: ('promtail' in loki_bins) diff --git a/tasks/install.yml b/tasks/install.yml index f9bd75d..bfa82be 100644 --- a/tasks/install.yml +++ b/tasks/install.yml @@ -20,7 +20,7 @@ state: directory owner: loki group: loki - mode: 0755 + mode: "0755" with_items: - "{{ loki_storage_dir }}" - "{{ loki_storage_dir }}/index" @@ -33,7 +33,7 @@ state: directory owner: root group: "{{ loki_group }}" - mode: 0770 + mode: "0770" with_items: - "{{ loki_config_dir }}" @@ -49,7 +49,7 @@ url: "https://github.com/grafana/loki/releases/download/v{{ loki_version }}/{{ item }}-linux-{{ go_arch }}.zip" dest: "/tmp/{{ item }}-{{ loki_version }}-linux-{{ go_arch }}.zip" checksum: "sha256:{{ __loki_bins_checksum[item] }}" - mode: 0644 + mode: "0644" register: _download_archive until: _download_archive is succeeded retries: 5 @@ -71,7 +71,7 @@ ansible.builtin.copy: src: "/tmp/{{ item }}-linux-{{ go_arch }}" dest: "/usr/local/bin/{{ item }}" - mode: 0755 + mode: "0755" owner: root group: root remote_src: true @@ -85,7 +85,7 @@ dest: "/etc/systemd/system/{{ item }}.service" owner: root group: root - mode: 0644 + mode: "0644" notify: "Restart {{ item }}" loop: "{{ loki_bins }}" when: item == 'loki' or item == 'promtail' diff --git a/templates/loki.yml.j2 b/templates/loki.yml.j2 index 5a077ac..81f55d5 100644 --- a/templates/loki.yml.j2 +++ b/templates/loki.yml.j2 @@ -53,6 +53,10 @@ frontend_worker_config: table_manager: {{ loki_table_manager_config | to_nice_yaml(indent=2) | indent(2, False) }} {% endif %} +{% if loki_compactor_config %} +compactor: + {{ loki_compactor_config | to_nice_yaml(indent=2) | indent(2, False) }} +{% endif %} {% if loki_runtime_config != [] %} runtime_config: {{ loki_runtime_config | to_nice_yaml(indent=2) | indent(2, False) }}