Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Version update and FW parameter #1

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Version update and FW parameter #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a6a082
Added a parameter for whether to manage the firewall
chriscowley Oct 26, 2017
0beeb29
Fixed service template syntax
chriscowley Oct 26, 2017
3973b88
Update default to 0.15.0
chriscowley Oct 26, 2017
d66c324
MAde some changes as to the way directories are parameterised
Nov 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 9 additions & 2 deletions defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
# defaults file for ansible-prometheus-node-exporter

PROMETHEUS_NODE_EXPORTER_VERSION: '0.14.0'
PROMETHEUS_NODE_EXPORTER_PACKAGE_CHECKSUM: 'd5980bf5d0dc7214741b65d3771f08e6f8311c86531ae21c6ffec1d643549b2e'
PROMETHEUS_NODE_EXPORTER_VERSION: '0.15.0'
PROMETHEUS_NODE_EXPORTER_PACKAGE_CHECKSUM: '9413b3c94dbe9d4341ce85ea7e3f0e20abb8804135b8c236c4440c2c841551d7'
PROMETHEUS_NODE_EXPORTER_OS: 'linux'
PROMETHEUS_NODE_EXPORTER_ARCH: 'amd64'

Expand All @@ -17,6 +17,11 @@ PROMETHEUS_NODE_EXPORTER_DIRS:
PROMETHEUS_LOGS_DIR: '/var/log/prometheus'
PROMETHEUS_TEXTFILE_COLLECTOR_DIR: '/var/lib/prometheus/node_exporter/textfile_collector'

PROMETHEUS_NODE_EXPORTER_DIR: '/opt/node_exporter'
PROMETHEUS_NODE_EXPORTER_CONF_DIR: '/etc/node_exporter'
PROMETHEUS_NODE_EXPORTER_LOG_DIR: '/var/log/node_exporter'
PROMETHEUS_TEXTFILE_COLLECTOR_DIR: '/var/lib/prometheus/node_exporter/textfile_collector'

PROMETHEUS_NODE_EXPORTER_DIR_NAME: 'node_exporter-{{ PROMETHEUS_NODE_EXPORTER_VERSION }}.{{ PROMETHEUS_NODE_EXPORTER_OS }}-{{ PROMETHEUS_NODE_EXPORTER_ARCH }}'

PROMETHEUS_CONFIG_FILE_NAME: 'prometheus.yml'
Expand All @@ -29,3 +34,5 @@ PROMETHEUS_NODE_EXPORTER_MONITOR_STORCLI: false
# The mv commands ensure atomicity
PROMETHEUS_NODE_EXPORTER_STORCLI_STAT_COLLECTION_COMMAND: >
{{ PROMETHEUS_NODE_EXPORTER_DIRS.PROMETHEUS_BINARIES_DIR }}/storcli.py > {{ PROMETHEUS_NODE_EXPORTER_DIRS.PROMETHEUS_TEXTFILE_COLLECTOR_DIR }}/storcli.prom.$$ && mv {{ PROMETHEUS_NODE_EXPORTER_DIRS.PROMETHEUS_TEXTFILE_COLLECTOR_DIR }}/storcli.prom.$$ {{ PROMETHEUS_NODE_EXPORTER_DIRS.PROMETHEUS_TEXTFILE_COLLECTOR_DIR }}/storcli.prom && echo storcli_collection_time $(date +\%s) > {{ PROMETHEUS_NODE_EXPORTER_DIRS.PROMETHEUS_TEXTFILE_COLLECTOR_DIR }}/storcli_collection_time.prom.$$ && mv {{ PROMETHEUS_NODE_EXPORTER_DIRS.PROMETHEUS_TEXTFILE_COLLECTOR_DIR }}/storcli_collection_time.prom.$$ {{ PROMETHEUS_NODE_EXPORTER_DIRS.PROMETHEUS_TEXTFILE_COLLECTOR_DIR }}/storcli_collection_time.prom

PROMETHEUS_NODE_EXPORTER_MANAGE_FW: true
33 changes: 28 additions & 5 deletions tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,37 @@
shell: '/sbin/nologin'
state: 'present'

- name: Prometheus Node Exporter directories created
- name: Prometheus Node Exporter basedir
file:
path: '{{ item }}'
path: '{{ PROMETHEUS_NODE_EXPORTER_DIR }}'
state: 'directory'
owner: '{{ PROMETHEUS_NODE_EXPORTER_USER }}'
group: '{{ PROMETHEUS_NODE_EXPORTER_GROUP }}'
mode: 'u=rwx,g=rx,o='

- name: Prometheus Node Exporter conf dir
file:
path: '{{ PROMETHEUS_NODE_EXPORTER_CONF_DIR }}'
state: 'directory'
owner: '{{ PROMETHEUS_NODE_EXPORTER_USER }}'
group: '{{ PROMETHEUS_NODE_EXPORTER_GROUP }}'
mode: 'u=rwx,g=rx,o='

- name: Prometheus Node Exporter log dir
file:
path: '{{ PROMETHEUS_NODE_EXPORTER_LOG_DIR }}'
state: 'directory'
owner: '{{ PROMETHEUS_NODE_EXPORTER_USER }}'
group: '{{ PROMETHEUS_NODE_EXPORTER_GROUP }}'
mode: 'u=rwx,g=rx,o='

- name: Prometheus Node Exporter textfile dir
file:
path: '{{ PROMETHEUS_TEXTFILE_COLLECTOR_DIR }}'
state: 'directory'
owner: '{{ PROMETHEUS_NODE_EXPORTER_USER }}'
group: '{{ PROMETHEUS_NODE_EXPORTER_GROUP }}'
mode: 'u=rwx,g=rx,o='
with_items: '{{ PROMETHEUS_NODE_EXPORTER_DIRS.values() }}'

- name: Configure RAID monitoring with StorCLI
include: 'monitor_raid_storcli.yml'
Expand All @@ -38,7 +61,7 @@
unarchive:
src: '/tmp/{{ PROMETHEUS_NODE_EXPORTER_DIR_NAME }}.tar.gz'
remote_src: true
dest: '{{ PROMETHEUS_NODE_EXPORTER_DIRS.PROMETHEUS_BINARIES_DIR }}'
dest: '{{ PROMETHEUS_NODE_EXPORTER_DIR }}'

- name: Prometheus Node Exporter systemd unit file templated
template:
Expand Down Expand Up @@ -77,4 +100,4 @@
rule: 'allow'
port: '{{ PROMETHEUS_NODE_EXPORTER_PORT }}'
proto: 'tcp'
when:
when: 'PROMETHEUS_NODE_EXPORTER_MANAGE_FW == true'
4 changes: 2 additions & 2 deletions templates/prometheus-node-exporter.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
start on startup

script
sudo -u {{ PROMETHEUS_NODE_EXPORTER_USER }} {{ PROMETHEUS_NODE_EXPORTER_DIRS.PROMETHEUS_BINARIES_DIR }}/{{ PROMETHEUS_NODE_EXPORTER_DIR_NAME }}/node_exporter \
-collector.textfile.directory {{ PROMETHEUS_NODE_EXPORTER_DIRS.PROMETHEUS_TEXTFILE_COLLECTOR_DIR }} {% if PROMETHEUS_NODE_EXPORTER_CUSTOM_OPTS is defined %}\
sudo -u {{ PROMETHEUS_NODE_EXPORTER_USER }} {{ PROMETHEUS_NODE_EXPORTER_DIR }}/{{ PROMETHEUS_NODE_EXPORTER_DIR_NAME }}/node_exporter \
-collector.textfile.directory {{ PROMETHEUS_TEXTFILE_COLLECTOR_DIR }} {% if PROMETHEUS_NODE_EXPORTER_CUSTOM_OPTS is defined %}\
{{ PROMETHEUS_NODE_EXPORTER_CUSTOM_OPTS }} {% endif %}

end script
4 changes: 2 additions & 2 deletions templates/prometheus-node-exporter.service.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ Restart=on-failure
User={{ PROMETHEUS_NODE_EXPORTER_USER }}
Group={{ PROMETHEUS_NODE_EXPORTER_GROUP }}

ExecStart= {{ PROMETHEUS_NODE_EXPORTER_DIRS.PROMETHEUS_BINARIES_DIR }}/{{ PROMETHEUS_NODE_EXPORTER_DIR_NAME }}/node_exporter \
-collector.textfile.directory {{ PROMETHEUS_NODE_EXPORTER_DIRS.PROMETHEUS_TEXTFILE_COLLECTOR_DIR }} {% if PROMETHEUS_NODE_EXPORTER_CUSTOM_OPTS is defined %}\
ExecStart= {{ PROMETHEUS_NODE_EXPORTER_DIR }}/{{ PROMETHEUS_NODE_EXPORTER_DIR_NAME }}/node_exporter \
--collector.textfile.directory {{ PROMETHEUS_TEXTFILE_COLLECTOR_DIR }} {% if PROMETHEUS_NODE_EXPORTER_CUSTOM_OPTS is defined %}\
{{ PROMETHEUS_NODE_EXPORTER_CUSTOM_OPTS }} {% endif %}

[Install]
Expand Down