Skip to content

Commit

Permalink
Merge pull request #48 from ernestas-poskus/features/include_extra_va…
Browse files Browse the repository at this point in the history
…rs_for_each_install_task

Include extra vars for each install task
  • Loading branch information
ernestas-poskus authored Dec 12, 2017
2 parents 732a642 + 3edd59b commit 434bf84
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 6 deletions.
2 changes: 2 additions & 0 deletions tasks/install-alert_manager.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
- include_vars: 'alertmanager.yml'

- name: Download and extract Prometheus alertmanager tarball
unarchive:
src: "{{ prometheus_alert_manager_tarball_url }}"
Expand Down
2 changes: 2 additions & 0 deletions tasks/install-node_exporter.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
- include_vars: 'nodeexporter.yml'

- name: Download and extract Prometheus node exporter tarball
unarchive:
src: "{{ prometheus_node_exporter_tarball_url }}"
Expand Down
2 changes: 2 additions & 0 deletions tasks/install-prometheus.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
- include_vars: 'prometheus.yml'

- name: Download and extract Prometheus tarball
unarchive:
src: "{{ prometheus_tarball_url }}"
Expand Down
2 changes: 2 additions & 0 deletions tasks/install-push_gateway.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
- include_vars: 'pushgateway.yml'

- name: Download and extract Prometheus push gateway tarball
unarchive:
src: "{{ prometheus_push_gateway_tarball_url }}"
Expand Down
2 changes: 2 additions & 0 deletions tasks/install-snmp_exporter.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
- include_vars: 'snmpexporter.yml'

- name: Download and extract Prometheus snmp_exporter tarball
unarchive:
src: "{{ prometheus_snmp_exporter_tarball_url }}"
Expand Down
6 changes: 0 additions & 6 deletions tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
---
# tasks file for ansible-prometheus
- include_vars: 'nodeexporter.yml'
- include_vars: 'prometheus.yml'
- include_vars: 'alertmanager.yml'
- include_vars: 'pushgateway.yml'
- include_vars: 'snmpexporter.yml'

- name: Create Prometheus group
group:
name: "{{ prometheus_group }}"
Expand Down

0 comments on commit 434bf84

Please sign in to comment.