From 95f1c300294a805fbf2260833ea16393dac05913 Mon Sep 17 00:00:00 2001 From: Vasili Karaev Date: Wed, 29 Jul 2020 16:01:07 +0300 Subject: [PATCH 1/2] nginx-exporter: initial commit --- monitoring.nginx-exporter/defaults/main.yml | 3 ++ monitoring.nginx-exporter/tasks/main.yml | 30 +++++++++++++++++++ .../templates/docker-compose.yml.j2 | 20 +++++++++++++ 3 files changed, 53 insertions(+) create mode 100644 monitoring.nginx-exporter/defaults/main.yml create mode 100644 monitoring.nginx-exporter/tasks/main.yml create mode 100644 monitoring.nginx-exporter/templates/docker-compose.yml.j2 diff --git a/monitoring.nginx-exporter/defaults/main.yml b/monitoring.nginx-exporter/defaults/main.yml new file mode 100644 index 0000000..421741c --- /dev/null +++ b/monitoring.nginx-exporter/defaults/main.yml @@ -0,0 +1,3 @@ +nginx_exporter__image_name: "nginx/nginx-prometheus-exporter" +nginx_exporter__image_tag: "0.8.0" +nginx_exporter__image: "{{ nginx_exporter__image_name }}:{{ nginx_exporter__image_tag }}" diff --git a/monitoring.nginx-exporter/tasks/main.yml b/monitoring.nginx-exporter/tasks/main.yml new file mode 100644 index 0000000..32fa5fe --- /dev/null +++ b/monitoring.nginx-exporter/tasks/main.yml @@ -0,0 +1,30 @@ +--- +- name: MONITORING.NGINX-EXPORTER | Prepare deployment + import_role: + name: docker.deployment.prepare + vars: + deployment_name: nginx + tags: + - nginx-exporter + +- name: MONITORING.NGINX-EXPORTER | Copy templates + template: + src: templates/{{ item }}.j2 + dest: "{{ docker_deployment__deploy_path }}/{{ item }}" + loop: + - docker-compose.yml + become_user: "{{ docker_deployment__deploy_user_name }}" + become: yes + tags: + - files + - nginx-exporter + +- name: MONITORING.NGINX-EXPORTER | Run deployment + docker_service: + restarted: "yes" + project_src: "{{ docker_deployment__deploy_path }}" + become: yes + become_user: "{{ docker_deployment__deploy_user_name }}" + tags: + - run + - nginx-exporter diff --git a/monitoring.nginx-exporter/templates/docker-compose.yml.j2 b/monitoring.nginx-exporter/templates/docker-compose.yml.j2 new file mode 100644 index 0000000..2d74900 --- /dev/null +++ b/monitoring.nginx-exporter/templates/docker-compose.yml.j2 @@ -0,0 +1,20 @@ +version: "3.7" + +services: + nginx-exporter: + container_name: nginx-exporter + image: "{{ nginx_exporter__image }}" + restart: unless-stopped + ports: + - "{{ nginx_exporter__port }}:9113" +{% if nginx_exporter is defined and nginx_exporter.docker is defined %} + extra_hosts: {{ nginx_exporter.docker.extra_hosts | default([]) | to_json }} +{% endif %} +{% if nginx_exporter is defined and nginx_exporter.docker is defined %} + environment: {{ nginx_exporter.docker.environment | default([]) | to_json }} +{% endif %} + logging: + driver: json-file + options: + max-file: "1" + max-size: "50m" From 3d2d26abfd4586310046f1372efc7a532287a9b0 Mon Sep 17 00:00:00 2001 From: Vasili Karaev Date: Wed, 29 Jul 2020 16:03:45 +0300 Subject: [PATCH 2/2] nginx-exporter: remove duplicate if --- monitoring.nginx-exporter/templates/docker-compose.yml.j2 | 2 -- 1 file changed, 2 deletions(-) diff --git a/monitoring.nginx-exporter/templates/docker-compose.yml.j2 b/monitoring.nginx-exporter/templates/docker-compose.yml.j2 index 2d74900..058b19f 100644 --- a/monitoring.nginx-exporter/templates/docker-compose.yml.j2 +++ b/monitoring.nginx-exporter/templates/docker-compose.yml.j2 @@ -9,8 +9,6 @@ services: - "{{ nginx_exporter__port }}:9113" {% if nginx_exporter is defined and nginx_exporter.docker is defined %} extra_hosts: {{ nginx_exporter.docker.extra_hosts | default([]) | to_json }} -{% endif %} -{% if nginx_exporter is defined and nginx_exporter.docker is defined %} environment: {{ nginx_exporter.docker.environment | default([]) | to_json }} {% endif %} logging: