1 files changed, 1 insertions, 41 deletions
diff --git a/roles/monitoring/prometheus/exporter/register/tasks/main.yml b/roles/monitoring/prometheus/exporter/register/tasks/main.yml
index 5627add2..519975d6 100644
--- a/roles/monitoring/prometheus/exporter/register/tasks/main.yml
+++ b/roles/monitoring/prometheus/exporter/register/tasks/main.yml
@@ -1,48 +1,8 @@
 ---
-# - name: register simple targets
-#   loop: "{{ prometheus_server_jobs | select('in', prometheus_exporters_default+prometheus_exporters_extra) }}"
-#   delegate_to: "{{ prometheus_server }}"
-#   template:
-#     src: "{{ lookup('first_found', {'paths': ['templates'], 'files': [item + '.yml.j2', 'generic.yml.j2']}) }}"
-#     dest: "/etc/prometheus/targets/{{ item }}/{{ inventory_hostname }}.yml"
-#   notify: reload prometheus
-
-
-
-
-
-
-# result = []
-# for job in jobs:
-#     multitarget_config_varname = 'prometheus_job_multitarget_' + job.replace('-', '_').replace('/', '__')
-#     if multitarget_config_varname in vars:
-#         for exporter_hostname, configs in vars[multitarget_config_varname].items():
-#             for config in configs:
-#                 result.append({'job': job, 'instance': config['instance'], 'enabled': True,
-#                                'exporter_hostname': exporter_hostname, 'config': config})
-#
-#     else:
-#         enabled = job in vars['prometheus_exporters_default'] or job in vars['prometheus_exporters_extra']
-#         result.append({'job': job, 'instance': vars['inventory_hostname'], 'enabled': enabled})
-# return result
-
-# - loop: "{{ prometheus_server_jobs | replace('-', '_') | replace('/', '__') }}"
-#   when: "('prometheus_job_multitarget_' + item) in vars"
-#   vars:
-#     blub: "{{ vars[item] }}"
-#   debug:
-#     var: blub
-
-
-#  set_fact:
-#    "prometheus_job_multitarget_{{ item }}": "{{ vars[item] }}"
-#    prometheus_job_multitarget_blackbox__probe: "{{ prometheus_job_multitarget_blackbox__probe }}"
-#    prometheus_job_multitarget_ssl__probe: "{{ prometheus_job_multitarget_ssl__probe }}"
-
-
 - name: enable/disable job targets
   vars:
     job_targets: "{{ prometheus_server_jobs | prometheus_job_targets(hostvars[inventory_hostname]) }}"
+    prometheus_target_labels: "{{ prometheus_target_labels_default | combine(prometheus_target_labels_extra) }}"
   block:
   - name: install files for enabled targets
     loop: "{{ job_targets | selectattr('enabled') }}"