Merge pull request #8 from weakcamel/add_compactor_settings

add compactor settings to loki config

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

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)

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'

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) }}