promtail cosmetic changes

Author: Jetman80

promtail/init.sls

@@ -1,22 +1,17 @@
 {% if pillar['promtail'] is defined and pillar['promtail'] is not none %}
-
-  {% if "acme_domain" in pillar["promtail"] %}
-
-    {% from "acme/macros.jinja" import verify_and_issue %}
-
-    {% set acme = pillar["acme"].keys() | first %}
-
+  {%- if "acme_domain" in pillar["promtail"] %}
+    {%- from "acme/macros.jinja" import verify_and_issue %}
+    {%- set acme = pillar["acme"].keys() | first %}
     {{ verify_and_issue(acme, "promtail", pillar["promtail"]["acme_domain"]) }}
-    
-  {% endif %}
+  {%- endif %}
 
-  {% if pillar["promtail"]["scrape_configs"] is defined and pillar["promtail"]["config"] is defined %}
+  {%- if pillar["promtail"]["scrape_configs"] is defined and pillar["promtail"]["config"] is defined %}
 
 pillar must contain either "promtail.config" or "promtail.scrape_configs" block:
   test.fail_without_changes:
     - name: Pillar must contain either "promtail.config" or "promtail.scrape_configs" block.
 
-  {% else %}
+  {%- else %}
 
 promtail_data_dirs:
   file.directory:
@@ -37,15 +32,15 @@ promtail_data_dirs:
          own key and they all end up here.
          If config_scrape_parts is empty or absent, a warning is issued and Promtail will not be deployed.
        ================================================================ #}
-    {% set config_deployed = { 'is_ready': false } %}
-    {% if "config_global_part" in pillar["promtail"] %}
-      {% set scrape_fragments = [] %}
-      {% if "config_scrape_parts" in pillar["promtail"] %}
-        {% for part_name in pillar["promtail"]["config_scrape_parts"].keys() | sort %}
-          {% set _ = scrape_fragments.append(pillar["promtail"]["config_scrape_parts"][part_name]) %}
-        {% endfor %}
-      {% endif %}
-      {% if scrape_fragments | length == 0 %}
+    {%- set config_deployed = { 'is_ready': false } %}
+    {%- if "config_global_part" in pillar["promtail"] %}
+      {%- set scrape_fragments = [] %}
+      {%- if "config_scrape_parts" in pillar["promtail"] %}
+        {%- for part_name in pillar["promtail"]["config_scrape_parts"].keys() | sort %}
+          {%- set _ = scrape_fragments.append(pillar["promtail"]["config_scrape_parts"][part_name]) %}
+        {%- endfor %}
+      {%- endif %}
+      {%- if scrape_fragments | length == 0 %}
 
 promtail_no_scrape_jobs:
   test.configurable_test_state:
@@ -56,9 +51,9 @@ promtail_no_scrape_jobs:
         promtail: config_global_part is set but no config_scrape_parts jobs are attached.
         Promtail config will NOT be deployed until at least one job pillar is connected via top_sls.
 
-      {% else %}
-      {% set merged_scrape_text = scrape_fragments | join('\n') %}
-      {% set _ = config_deployed.update({'is_ready': true}) %}
+      {%- else %}
+      {%- set merged_scrape_text = scrape_fragments | join('\n') %}
+      {%- set _ = config_deployed.update({'is_ready': true}) %}
 
 promtail_config:
   file.managed:
@@ -70,13 +65,13 @@ promtail_config:
         {{ pillar['promtail']['config_global_part'] | indent(8) }}
         scrape_configs:
         {{ merged_scrape_text | indent(8) }}
-      {% endif %}
+      {%- endif %}
 
     {# ================================================================
        LEGACY PATH 1: promtail.scrape_configs (uses config.jinja template)
        ================================================================ #}
-    {% elif pillar["promtail"]["scrape_configs"] is defined %}
-      {% set _ = config_deployed.update({'is_ready': true}) %}
+    {%- elif pillar["promtail"]["scrape_configs"] is defined %}
+      {%- set _ = config_deployed.update({'is_ready': true}) %}
 promtail_config:
   file.managed:
     - name: /opt/promtail/etc/promtail.yaml
@@ -96,17 +91,17 @@ promtail_config:
     {# ================================================================
        LEGACY PATH 2: promtail.config (full config verbatim)
        ================================================================ #}
-    {% elif pillar["promtail"]["config"] is defined %}
-      {% set _ = config_deployed.update({'is_ready': true}) %}
-      {% if pillar["promtail"]["loki"] is defined or pillar["promtail"]["positions"] is defined %}
+    {%- elif pillar["promtail"]["config"] is defined %}
+      {%- set _ = config_deployed.update({'is_ready': true}) %}
+      {%- if pillar["promtail"]["loki"] is defined or pillar["promtail"]["positions"] is defined %}
 when pillar contain "pillar.config" block:
   test.configurable_test_state:
     - name: nothing_done
     - changes: False
     - result: True
     - warnings: |
         When pillar contain "promtail.config" block, the "promtail.positions", "promtail.loki" blocks are IGNORED
-      {% endif %}
+      {%- endif %}
 promtail_config:
   file.managed:
     - name: /opt/promtail/etc/promtail.yaml
@@ -115,9 +110,9 @@ promtail_config:
     - group: 0
     - contents: |
         {{ pillar['promtail']['config'] | indent(8) }}
-    {% endif %}
+    {%- endif %}
 
-    {% if config_deployed['is_ready'] and 'docker' in pillar['promtail'] %}
+    {%- if config_deployed['is_ready'] and 'docker' in pillar['promtail'] %}
 promtail_image:
   cmd.run:
     - name: docker pull {{ pillar['promtail']['docker']['image'] }}
@@ -139,7 +134,7 @@ promtail_container:
     - watch:
         - /opt/promtail/etc/promtail.yaml
     - command: -config.file=/etc/promtail/promtail.yaml
-    {% elif config_deployed['is_ready'] %}
+    {%- elif config_deployed['is_ready'] %}
 
 promtail_binary_1:
   archive.extracted:
@@ -191,7 +186,7 @@ promtail_systemd_4:
     - onchanges:
       - file: /etc/systemd/system/promtail.service
       - file: /opt/promtail/etc/promtail.yaml
-    {% endif %}
-  {% endif %}
+    {%- endif %}
+  {%- endif %}
 {% endif %}
 

promtail/pillar.example

@@ -1,59 +1,58 @@
-### NEW: config_global_part + config_scrape_parts (recommended for multi-pillar merge)
-###
-### Split promtail config into two pieces that live in SEPARATE pillar SLS files:
-###   config_global_part  — string: everything above scrape_configs (server, clients, limits…)
-###   config_scrape_parts — dict:  each key is a unique name, value is a YAML string
-###                         containing one or more `- job_name: …` blocks
-###
-### Salt deep-merges dicts, so when multiple pillar SLS files each add their own
-### key to config_scrape_parts, all keys end up in the compiled pillar.
-### The formula iterates over all values (sorted by key) and assembles them under
-### `scrape_configs:`.
-###
-### If config_scrape_parts is empty or absent, a default stub job is used (no errors).
-###
-### Targeting is done ONLY via top_sls — job pillar SLS files contain no targets.
-###
-### See pillar/promtail/examples/ for complete working examples.
+# NEW: config_global_part + config_scrape_parts (recommended for multi-pillar merge)
+#
+# Split promtail config into two pieces that live in SEPARATE pillar SLS files:
+#   config_global_part  — string: everything above scrape_configs (server, clients, limits…)
+#   config_scrape_parts — dict:  each key is a unique name, value is a YAML string
+#                         containing one or more `- job_name: …` blocks
+#
+# Salt deep-merges dicts, so when multiple pillar SLS files each add their own
+# key to config_scrape_parts, all keys end up in the compiled pillar.
+# The formula iterates over all values (sorted by key) and assembles them under
+# `scrape_configs:`.
+#
+# If config_scrape_parts is empty or absent, a default stub job is used (no errors).
+#
+# Targeting is done ONLY via top_sls — job pillar SLS files contain no targets.
+#
+# See pillar/promtail/examples/ for complete working examples.
 
 # --- Global pillar (attach to '*' in top_sls) ---
-# promtail:
-#   binary:
-#     link: https://github.com/grafana/loki/releases/download/v2.7.3/promtail-linux-amd64.zip
-#   config_global_part: |
-#     server:
-#       http_listen_port: 9080
-#       grpc_listen_port: 0
-#     positions:
-#       filename: /tmp/positions.yaml
-#     clients:
-#       - url: https://loki.example.com/loki/api/v1/push
-#     limits_config:
-#       readline_rate_enabled: true
-#       readline_rate_drop: false
+promtail:
+  binary:
+    link: https://github.com/grafana/loki/releases/download/v2.7.3/promtail-linux-amd64.zip
+  config_global_part: |
+    server:
+      http_listen_port: 9080
+      grpc_listen_port: 0
+    positions:
+      filename: /tmp/positions.yaml
+    clients:
+      - url: https://loki.example.com/loki/api/v1/push
+    limits_config:
+      readline_rate_enabled: true
+      readline_rate_drop: false
 
 # --- Job pillar (attach to matching servers in top_sls) ---
-# promtail:
-#   config_scrape_parts:
-#     nginx_access: |
-#       - job_name: nginx_access_logs
-#         static_configs:
-#         - labels:
-#             job: nginx
-#             __path__: /var/log/nginx/*access.log
+promtail:
+  config_scrape_parts:
+    nginx_access: |
+      - job_name: nginx_access_logs
+        static_configs:
+        - labels:
+            job: nginx
+            __path__: /var/log/nginx/*access.log
 
 # --- Another job pillar (same server can get both) ---
-# promtail:
-#   config_scrape_parts:
-#     mysql_slowlog: |
-#       - job_name: mysql_slowlog
-#         static_configs:
-#         - labels:
-#             job: mysql_slowlog
-#             __path__: /var/log/mysql/*slow.log
-
+promtail:
+  config_scrape_parts:
+    mysql_slowlog: |
+      - job_name: mysql_slowlog
+        static_configs:
+        - labels:
+            job: mysql_slowlog
+            __path__: /var/log/mysql/*slow.log
 
-### FULL CONFIG (single pillar, no merge)
+# FULL CONFIG pillar example (single pillar, no merge)
 
 {%- set promtail_version = "2.7.3" -%}
 {%- set host = grains['fqdn'] -%}
@@ -119,11 +118,7 @@ promtail:
        - output:
            source: message
 
-
-
-
-
-### LEGASY PILLAR
+# LEGACY pillar example (single pillar, no merge, hardcoded values)
 
 {%- set host = "server1.example.com" -%}
 promtail: