From 8016f86164450f4eda4f1488f48cf44de0d4655f Mon Sep 17 00:00:00 2001
From: Georg Pfuetzenreuter
Date: Wed, 15 Feb 2023 21:02:04 +0100
Subject: p.node_exporter->p.prometheus.node_exporter

Since the last commit introduced a new Prometheus targets profile, it
makes sense to move node_exporter underneath the Prometheus tree as
well.

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
---
 salt/common/suse.sls                      |  2 +-
 salt/profile/node_exporter/init.sls       | 36 -------------------------------
 salt/profile/prometheus/node_exporter.sls | 36 +++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 37 deletions(-)
 delete mode 100644 salt/profile/node_exporter/init.sls
 create mode 100644 salt/profile/prometheus/node_exporter.sls

diff --git a/salt/common/suse.sls b/salt/common/suse.sls
index e260c77..764517e 100644
--- a/salt/common/suse.sls
+++ b/salt/common/suse.sls
@@ -2,7 +2,7 @@ include:
   - firewalld
   - profile.seccheck
   - profile.zypp
-  - profile.node_exporter
+  - profile.prometheus.node_exporter
   - users
   - .ssh
   - postfix.config
diff --git a/salt/profile/node_exporter/init.sls b/salt/profile/node_exporter/init.sls
deleted file mode 100644
index 1e46b3d..0000000
--- a/salt/profile/node_exporter/init.sls
+++ /dev/null
@@ -1,36 +0,0 @@
-{%- set header = salt['pillar.get']('managed_header_pound') -%}
-{%- set sysconfig = '/etc/sysconfig/prometheus-node_exporter' -%}
-
-node_exporter_packages:
-  pkg.installed:
-    - pkgs:
-      - golang-github-prometheus-node_exporter
-
-node_exporter_sysconfig_header:
-  file.prepend:
-    - name: {{ sysconfig }}
-    - text: '{{ header }}'
-    - require:
-      - pkg: node_exporter_packages
-
-node_exporter_sysconfig:
-  file.replace:
-    - name: {{ sysconfig }}
-    - pattern: |
-        ^ARGS=.*$
-    - repl: |
-        ARGS="--web.listen-address=:9200 --collector.filesystem.fs-types-exclude='^(fuse.s3fs|fuse.cryfs|tmpfscgroup2?|debugfs|devpts|devtmpfs|fusectl|overlay|proc|procfs|pstore)\$' --no-collector.zfs --no-collector.thermal_zone --no-collector.powersupplyclass"
-    - require:
-      - pkg: node_exporter_packages
-      - file: node_exporter_sysconfig_header
-
-node_exporter_service:
-  service.running:
-    - name: prometheus-node_exporter.service
-    - enable: True
-    - full_restart: True
-    - require:
-      - pkg: node_exporter_packages
-      - file: node_exporter_sysconfig
-    - watch:
-      - file: node_exporter_sysconfig
diff --git a/salt/profile/prometheus/node_exporter.sls b/salt/profile/prometheus/node_exporter.sls
new file mode 100644
index 0000000..1e46b3d
--- /dev/null
+++ b/salt/profile/prometheus/node_exporter.sls
@@ -0,0 +1,36 @@
+{%- set header = salt['pillar.get']('managed_header_pound') -%}
+{%- set sysconfig = '/etc/sysconfig/prometheus-node_exporter' -%}
+
+node_exporter_packages:
+  pkg.installed:
+    - pkgs:
+      - golang-github-prometheus-node_exporter
+
+node_exporter_sysconfig_header:
+  file.prepend:
+    - name: {{ sysconfig }}
+    - text: '{{ header }}'
+    - require:
+      - pkg: node_exporter_packages
+
+node_exporter_sysconfig:
+  file.replace:
+    - name: {{ sysconfig }}
+    - pattern: |
+        ^ARGS=.*$
+    - repl: |
+        ARGS="--web.listen-address=:9200 --collector.filesystem.fs-types-exclude='^(fuse.s3fs|fuse.cryfs|tmpfscgroup2?|debugfs|devpts|devtmpfs|fusectl|overlay|proc|procfs|pstore)\$' --no-collector.zfs --no-collector.thermal_zone --no-collector.powersupplyclass"
+    - require:
+      - pkg: node_exporter_packages
+      - file: node_exporter_sysconfig_header
+
+node_exporter_service:
+  service.running:
+    - name: prometheus-node_exporter.service
+    - enable: True
+    - full_restart: True
+    - require:
+      - pkg: node_exporter_packages
+      - file: node_exporter_sysconfig
+    - watch:
+      - file: node_exporter_sysconfig
-- 
cgit v1.2.3