From b50c19835f86193d46347c8dde23a70d7b503b9f Mon Sep 17 00:00:00 2001 From: nikitadugar Date: Tue, 14 Jan 2020 14:49:34 +0530 Subject: [PATCH 1/3] add some environment variables --- defaults/main.yml | 3 +++ templates/redis_exporter | 2 ++ 2 files changed, 5 insertions(+) diff --git a/defaults/main.yml b/defaults/main.yml index e3183f6..2b2fa4e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -10,3 +10,6 @@ redis_exporter_server_bind: 0.0.0.0 redis_exporter_server_password: false redis_exporter_version: v1.3.5 + +redis_server_port: 6379 +redis_server_password: '' \ No newline at end of file diff --git a/templates/redis_exporter b/templates/redis_exporter index 3819f59..e16378b 100755 --- a/templates/redis_exporter +++ b/templates/redis_exporter @@ -9,4 +9,6 @@ docker rm -f -v redis_exporter || : docker run -u root --rm --name=redis_exporter \ -p 9121:"{{ redis_exporter_server_port }}" \ + -e REDIS_ADDR='redis://{{ PublicIp }}:{{ redis_server_port }}' \ + -e REDIS_PASSWORD='{{ redis_server_password }}' \ oliver006/redis_exporter:"{{ redis_exporter_version }}-alpine" From 24e75a6bca18203bd2cf3e3896e2dadbb0e7d5b3 Mon Sep 17 00:00:00 2001 From: nikitadugar Date: Tue, 14 Jan 2020 15:12:59 +0530 Subject: [PATCH 2/3] change environment variables --- defaults/main.yml | 3 ++- templates/redis_exporter | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 2b2fa4e..22e10a1 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -12,4 +12,5 @@ redis_exporter_server_password: false redis_exporter_version: v1.3.5 redis_server_port: 6379 -redis_server_password: '' \ No newline at end of file +redis_server_password: '' +redis_server_addr: "redis://{{ PublicIp }}:{{ redis_server_port }}" \ No newline at end of file diff --git a/templates/redis_exporter b/templates/redis_exporter index e16378b..1740def 100755 --- a/templates/redis_exporter +++ b/templates/redis_exporter @@ -9,6 +9,6 @@ docker rm -f -v redis_exporter || : docker run -u root --rm --name=redis_exporter \ -p 9121:"{{ redis_exporter_server_port }}" \ - -e REDIS_ADDR='redis://{{ PublicIp }}:{{ redis_server_port }}' \ + -e REDIS_ADDR='{{ redis_server_addr }}' \ -e REDIS_PASSWORD='{{ redis_server_password }}' \ oliver006/redis_exporter:"{{ redis_exporter_version }}-alpine" From 4f36a560b95cca462de8cd7a88fa4688de034806 Mon Sep 17 00:00:00 2001 From: nikitadugar Date: Tue, 14 Jan 2020 16:46:32 +0530 Subject: [PATCH 3/3] update readme --- README.md | 12 ++++++++---- README.yaml | 12 ++++++++---- defaults/main.yml | 3 --- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index ede2b42..cd6ebb0 100644 --- a/README.md +++ b/README.md @@ -94,12 +94,16 @@ Followiing things includes in this role: ## Variables ```yaml - redis_exporter_user: redis_exporter - redis_exporter_group: redis_exporter - mount_path: /data redis_exporter_server_port: 9121 + redis_exporter_server_bind: 0.0.0.0 + redis_exporter_server_password: false - redis_exporter_version: latest + + redis_exporter_version: v1.3.5 + + redis_server_port: 6379 + redis_server_password: '' + redis_server_addr: "redis://{{ PublicIp }}:{{ redis_server_port }}" ``` diff --git a/README.yaml b/README.yaml index 3386aa4..1fd1dbe 100644 --- a/README.yaml +++ b/README.yaml @@ -61,12 +61,16 @@ usage: |- # Variables use in the project variables: |- ```yaml - redis_exporter_user: redis_exporter - redis_exporter_group: redis_exporter - mount_path: /data redis_exporter_server_port: 9121 + redis_exporter_server_bind: 0.0.0.0 + redis_exporter_server_password: false - redis_exporter_version: latest + + redis_exporter_version: v1.3.5 + + redis_server_port: 6379 + redis_server_password: '' + redis_server_addr: "redis://{{ PublicIp }}:{{ redis_server_port }}" ``` # How to install project diff --git a/defaults/main.yml b/defaults/main.yml index 22e10a1..5612b86 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,8 +1,5 @@ --- -# Configurations -mount_path: /data - # Networking/connection options redis_exporter_server_port: 9121 redis_exporter_server_bind: 0.0.0.0