feat(vmagent): allow for additional CLI flags in systemd definition

meysam81 · Oct 31, 2024 · 5366058 · 5366058
1 parent 0c22d12
commit 5366058
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.5.2] - 2024-10-31
+
+### ⚙️ Miscellaneous Tasks
+
+- *(vmagent)* Add optional labels
+
 ## [1.5.1] - 2024-10-28
 
 ### 🐛 Bug Fixes

diff --git a/galaxy.yml b/galaxy.yml
@@ -1,6 +1,6 @@
 namespace: meysam81
 name: general
-version: 1.5.2
+version: 1.5.3
 readme: README.md
 authors:
   - Meysam Azad <[email protected]>

diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
@@ -6,6 +6,30 @@
   tasks:
     - name: Ping
       ansible.builtin.ping:
+    - name: Copy relabling config
+      ansible.builtin.copy:
+        content: |
+          - source_labels:
+              - exported_job
+            action: replace
+            target_label: job
+            regex: (.+)
+          - source_labels:
+              - exported_instance
+            action: replace
+            target_label: instance
+            regex: (.+)
+        dest: /etc/vmagent/relablings.yml
+        owner: vmagent
+        group: vmagent
+        mode: "0644"
+      notify: Restart vmagent service
+      tags: vmagent
+    - name: Ensure vmagent.service is running
+      command: systemctl status vmagent
+      register: vmagent_service_status
+      changed_when: false
+      tags: vmagent
   roles:
     - role: haproxy
       tags: haproxy
@@ -14,10 +38,12 @@
     - role: vmagent
       tags: vmagent
       vars:
-        vmagent_remote_write_url: "{{ lookup('env', 'VMAGENT_REMOTE_WRITE_URL') | default('http://localhost:8428/api/v1/write') }}"
+        vmagent_remote_write_url: "{{ lookup('env', 'VMAGENT_REMOTE_WRITE_URL') | default('http://localhost:8428/api/v1/write', true) }}"
+        vmagent_extra_cli_flags:
+          - -remoteWrite.urlRelabelConfig=/etc/vmagent/relablings.yml
     - role: promtail
       tags: promtail
       vars:
-        promtail_remote_write_url: "{{ lookup('env', 'PROMTAIL_REMOTE_WRITE_URL') | default('http://localhost:3100/loki/api/v1/push') }}"
+        promtail_remote_write_url: "{{ lookup('env', 'PROMTAIL_REMOTE_WRITE_URL') | default('http://localhost:3100/loki/api/v1/push', true) }}"
     - role: pushgateway
       tags: pushgateway
diff --git a/roles/vmagent/README.md b/roles/vmagent/README.md
@@ -9,6 +9,7 @@ Install vmagent from GitHub release
   - [vmagent_arch](#vmagent_arch)
   - [vmagent_bin](#vmagent_bin)
   - [vmagent_docker_enabled](#vmagent_docker_enabled)
+  - [vmagent_extra_cli_flags](#vmagent_extra_cli_flags)
   - [vmagent_extra_labels](#vmagent_extra_labels)
   - [vmagent_fail2ban_enabled](#vmagent_fail2ban_enabled)
   - [vmagent_group](#vmagent_group)
@@ -65,6 +66,14 @@ vmagent_bin: /usr/local/bin/vmagent-prod
 vmagent_docker_enabled: false
 ```
 
+### vmagent_extra_cli_flags
+
+#### Default value
+
+```YAML
+vmagent_extra_cli_flags: []
+```
+
 ### vmagent_extra_labels
 
 #### Default value

diff --git a/roles/vmagent/defaults/main.yml b/roles/vmagent/defaults/main.yml
@@ -2,6 +2,7 @@
 vmagent_arch: "{{ (ansible_architecture | default('amd64')) | replace('x86_64', 'amd64') | replace('aarch64', 'arm64') }}"
 vmagent_bin: /usr/local/bin/vmagent-prod
 vmagent_docker_enabled: false
+vmagent_extra_cli_flags: []
 vmagent_extra_labels: {}
 vmagent_fail2ban_enabled: false
 vmagent_group: vmagent

diff --git a/roles/vmagent/templates/vmagent.service.j2 b/roles/vmagent/templates/vmagent.service.j2
@@ -25,6 +25,9 @@ ExecStart={{ vmagent_bin }} \
 {% endif %}
 {% for key, value in vmagent_extra_labels.items() %}
   -remoteWrite.label={{ key }}={{ value }} \
+{% endfor %}
+{% for cli_flag in vmagent_extra_cli_flags %}
+  {{ cli_flag }} \
 {% endfor %}
   -httpListenAddr={{ vmagent_http_listen_addr }} \
   -influxListenAddr=""