Fix custom rule/target file copy (#132)

[patch] Remove placeholder dirs as they cause Ansible to ignore local files dirs. Simplify fileglob by only copying valid filenames. Signed-off-by: Ben Kochie <[email protected]>
cloudalchemy · Jul 15, 2018 · 47c72e9 · 47c72e9
1 parent f7ca807
commit 47c72e9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/files/prometheus/rules/.placeholder b/files/prometheus/rules/.placeholder
diff --git a/files/prometheus/targets/.placeholder b/files/prometheus/targets/.placeholder
diff --git a/tasks/configure.yml b/tasks/configure.yml
@@ -16,13 +16,13 @@
 - name: copy custom alerting rule files
   copy:
     src: "{{ item }}"
-    dest: "{{ prometheus_config_dir }}/rules/{{ item | splitext | difference(['.rules']) | join('') }}.rules"
+    dest: "{{ prometheus_config_dir }}/rules/"
     owner: root
     group: prometheus
     mode: 0640
     validate: "/usr/local/bin/promtool check rules %s"
   with_fileglob:
-    - prometheus/rules/*
+    - prometheus/rules/*.rules
   notify:
     - reload prometheus
 
@@ -54,10 +54,11 @@
 - name: copy prometheus custom static targets
   copy:
     src: "{{ item }}"
-    dest: "{{ prometheus_config_dir }}/file_sd/{{ item | splitext | difference(['.yml']) | join('') }}.yml"
+    dest: "{{ prometheus_config_dir }}/file_sd/"
     force: true
     owner: root
     group: prometheus
     mode: 0640
   with_fileglob:
-    - prometheus/targets/*
+    - prometheus/targets/*.yml
+    - prometheus/targets/*.json