diff --git a/plays/prome-grafana.yml b/plays/prome-grafana.yml index 7890778..7aee534 100644 --- a/plays/prome-grafana.yml +++ b/plays/prome-grafana.yml @@ -6,5 +6,5 @@ grafana_version: "latest" cadvisor_version: "0.46.0" roles: - # - role: roles/docker + - role: roles/docker - role: roles/prometheus-grafana diff --git a/roles/elasticsearch/tasks/elasticsearch.yml b/roles/elasticsearch/tasks/elasticsearch.yml index bc1514e..92120c9 100644 --- a/roles/elasticsearch/tasks/elasticsearch.yml +++ b/roles/elasticsearch/tasks/elasticsearch.yml @@ -1,9 +1,4 @@ --- -- name: Create a Docker network for Elasticsearch - docker_network: - name: elk_network - state: present - - name: Pull Elasticsearch Docker image docker_image: name: docker.elastic.co/elasticsearch/elasticsearch-wolfi:{{ elk_version }} diff --git a/roles/elasticsearch/tasks/elk-network.yml b/roles/elasticsearch/tasks/elk-network.yml new file mode 100644 index 0000000..d9c581b --- /dev/null +++ b/roles/elasticsearch/tasks/elk-network.yml @@ -0,0 +1,11 @@ +--- +- name: Create a Docker network for Elasticsearch + docker_network: + name: elk_network + state: present + driver: bridge + ipam_config: + - subnet: "172.19.0.0/16" + gateway: "172.19.0.1" + iprange: "172.19.0.0/24" + diff --git a/roles/elasticsearch/tasks/main.yml b/roles/elasticsearch/tasks/main.yml index 806487e..48bd97c 100644 --- a/roles/elasticsearch/tasks/main.yml +++ b/roles/elasticsearch/tasks/main.yml @@ -2,6 +2,7 @@ # ensure we have variables from .env files - include_tasks: ../roles/env/tasks/main.yml +- include_tasks: elk-network.yml - include_tasks: elasticsearch.yml - include_tasks: kibana.yml - include_tasks: logstash.yml diff --git a/roles/prometheus-grafana/tasks/grafana.yml b/roles/prometheus-grafana/tasks/grafana.yml index ee62435..a88f1e2 100644 --- a/roles/prometheus-grafana/tasks/grafana.yml +++ b/roles/prometheus-grafana/tasks/grafana.yml @@ -1,9 +1,4 @@ --- -- name: Create a Docker network for Grafana - docker_network: - name: monitoring_network - state: present - - name: Create grafana datasources directory on host file: path: /etc/grafana/datasources @@ -87,7 +82,7 @@ - /etc/grafana/datasources:/etc/grafana/provisioning/datasources - /etc/grafana/dashboards:/etc/grafana/provisioning/dashboards networks: - - name: monitoring_network + - name: monitoring env: GF_SECURITY_ADMIN_PASSWORD: "{{ env_vars.GRAFANA_PASSWORD }}" # Customize the password diff --git a/roles/prometheus-grafana/tasks/loki.yml b/roles/prometheus-grafana/tasks/loki.yml index 26341d2..46434e9 100644 --- a/roles/prometheus-grafana/tasks/loki.yml +++ b/roles/prometheus-grafana/tasks/loki.yml @@ -1,9 +1,4 @@ --- -- name: Create a Docker network for loki - docker_network: - name: monitoring_network - state: present - - name: Pull loki Docker image docker_image: name: grafana/loki:latest @@ -33,4 +28,4 @@ volumes: - /etc/loki/config.yml:/etc/loki/config.yml networks: - - name: monitoring_network + - name: monitoring diff --git a/roles/prometheus-grafana/tasks/main.yml b/roles/prometheus-grafana/tasks/main.yml index d220fa1..040f5e4 100644 --- a/roles/prometheus-grafana/tasks/main.yml +++ b/roles/prometheus-grafana/tasks/main.yml @@ -2,6 +2,7 @@ # ensure we have variables from .env files - include_tasks: ../roles/env/tasks/main.yml +- include_tasks: monitoring-network.yml - include_tasks: prometheus.yml - include_tasks: grafana.yml diff --git a/roles/prometheus-grafana/tasks/monitoring-network.yml b/roles/prometheus-grafana/tasks/monitoring-network.yml new file mode 100644 index 0000000..32b2211 --- /dev/null +++ b/roles/prometheus-grafana/tasks/monitoring-network.yml @@ -0,0 +1,5 @@ +--- +- name: Create a Docker network for Monitoring + docker_network: + name: monitoring + state: present diff --git a/roles/prometheus-grafana/tasks/prometheus.yml b/roles/prometheus-grafana/tasks/prometheus.yml index fa6136f..54d93e4 100644 --- a/roles/prometheus-grafana/tasks/prometheus.yml +++ b/roles/prometheus-grafana/tasks/prometheus.yml @@ -1,9 +1,4 @@ --- -- name: Create a Docker network for Prometheus - docker_network: - name: monitoring_network - state: present - - name: Pull Prometheus Docker image docker_image: name: prom/prometheus @@ -32,5 +27,5 @@ volumes: - /etc/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml networks: - - name: monitoring_network + - name: monitoring