exporter, victoriametrics: use systemctl directly, add openvpn exporter, normalize osarch (#738)

Author: djooberlee

exporter/defaults.yaml

@@ -121,3 +121,17 @@ exporter:
       dst: "{install_dir}/pagespeed_exporter"
     exec: "{install_dir}/pagespeed_exporter {args}"
     args: ""
+
+  openvpn:
+    store: github
+    version: latest
+    source: "https://github.com/natrontech/openvpn-exporter/releases/download/{tag}/openvpn-exporter_{tag}_{kernel_lower}_{osarch}.tar.gz"
+    install_dir: "/opt/exporter/{type}/{name}"
+    tar:
+      args: ''
+    move:
+      src: "{install_dir}/openvpn-exporter-{kernel_lower}-{osarch}"
+      dst: "{install_dir}/openvpn-exporter"
+    exec: "{install_dir}/openvpn-exporter {args}"
+    args: ""
+

exporter/macro.jinja

@@ -1,5 +1,9 @@
 {%- import_yaml "exporter/defaults.yaml" as defaults %}
 
+{#- Normalize osarch: x86_64 -> amd64, aarch64 -> arm64 for GitHub release URLs #}
+{%- set _osarch_map = {"x86_64": "amd64", "aarch64": "arm64"} %}
+{%- set _osarch = _osarch_map.get(grains["osarch"], grains["osarch"]) %}
+
 
 {%- macro install_dir(settings, prefix=[]) %}
 {{ "_".join(prefix) }}_install_dir:
@@ -31,7 +35,7 @@
     - shell: /bin/bash
     - cwd: {{ settings["install_dir"] }}
     - watch_in:
-      - service: {{ "_".join(prefix) }}_systemd
+      - cmd: {{ "_".join(prefix) }}_systemd
   {%- if extractor.get("clean", True) %}
   file.absent:
     - name: {{ output }}
@@ -49,7 +53,7 @@
     - group: root
     - shell: /bin/bash
     - watch_in:
-      - service: {{ "_".join(prefix) }}_systemd
+      - cmd: {{ "_".join(prefix) }}_systemd
   {%- if settings.get("version", "") %}
     - unless: 
       - "[[ $(cat {{ settings["install_dir"] }}/.salt_version_info) =~ {{ settings["version"] }} ]]"
@@ -105,7 +109,7 @@
       - "[[ ! $({{ dir }}/venv/bin/pip freeze -r {{ requirements_txt }} 2>&1) =~ WARNING ]]"
   {%- endif %}
     - watch_in:
-      - service: {{ "_".join(prefix) }}_systemd
+      - cmd: {{ "_".join(prefix) }}_systemd
 {%- endmacro %}
 
 
@@ -130,11 +134,13 @@
        type: {{ type }}
        settings: {{ settings }}
        defaults: {{ defaults["systemd"] }}
-  service.running:
-    - name: exporter_{{ name }}.service
-    - enable: True
-    - watch:
+  cmd.run:
+    - name: systemctl daemon-reload && systemctl enable exporter_{{ name }}.service && systemctl restart exporter_{{ name }}.service
+    - onchanges:
       - file: {{ "_".join(prefix) }}_systemd
+{{ "_".join(prefix) }}_systemd_running:
+  cmd.run:
+    - name: systemctl is-active exporter_{{ name }}.service || systemctl start exporter_{{ name }}.service
 {%- endmacro %}
 
 
@@ -160,7 +166,7 @@
   {# define format_source #}
   {%- set format_source = {"tag": settings.get("version",""),
                            "tag_vstrip": settings.get("version","").lstrip("v"),
-                           "osarch": grains["osarch"],
+                           "osarch": _osarch,
                            "cpuarch": grains["cpuarch"],
                            "kernel": grains["kernel"],
                            "kernel_lower": grains["kernel"].lower() } %}
@@ -177,7 +183,8 @@
   {%- set file = defaults["salt_cache_dir"] ~ "/" ~ type ~ "/" ~ file_src.split("/")[-1] %} 
 
   {# define format_base #}
-  {%- set format_base = {"name": name, "type": type, "file": file, "install_dir": settings["install_dir"]} %}
+  {%- set format_base = {"name": name, "type": type, "file": file, "install_dir": settings["install_dir"],
+                          "osarch": _osarch, "kernel_lower": grains["kernel"].lower()} %}
 
   {# format args #}
   {%- do settings.update({"args": settings["args"].format(**format_base) }) %}
@@ -240,3 +247,4 @@
   {{ service(name, type, settings, prefix) }}
 
 {%- endmacro %}
+

exporter/pillar.example

@@ -36,6 +36,15 @@ exporter:
       --collector.interrupts
 
 
+openvpn:
+  type: openvpn
+  version: v1.1.3
+  args:
+    -openvpn.listen-address :9176 
+    -openvpn.loglevel debug 
+    -openvpn.status-files /var/log/openvpn/openvpn-status.log
+
+
   bb_sites_1:
     type: blackbox
 

victoriametrics/_setup.sls

@@ -158,12 +158,16 @@
         WantedBy=multi-user.target
 
 {{ kind }}_{{ vm_name }}_systemd_daemon-reload:
-  service.running:
-    - name: {{ service_name }}.service
-    - enable: True
-    - require:
-      - cmd: {{ kind }}_{{ vm_name }}_archive_extract
-    - watch:
+  cmd.run:
+    - name: systemctl daemon-reload && systemctl enable {{ service_name }}.service && systemctl restart {{ service_name }}.service
+    - onchanges:
       - file: {{ kind }}_{{ vm_name }}_systemd_unit
       - cmd: {{ kind }}_{{ vm_name }}_archive_extract
+
+{{ kind }}_{{ vm_name }}_systemd_running:
+  cmd.run:
+    - name: systemctl is-active {{ service_name }}.service || systemctl start {{ service_name }}.service
+    - require:
+      - cmd: {{ kind }}_{{ vm_name }}_archive_extract
 {%- endif %}
+