summaryrefslogtreecommitdiff
path: root/roles/monitoring
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2021-04-04 17:53:35 +0200
committerChristian Pointner <equinox@spreadspace.org>2021-04-04 17:53:35 +0200
commitb02f20dcc646f27d6efa426297efebd3c652a14c (patch)
tree5f32a857717da909f5910e5545102457dec776c2 /roles/monitoring
parentport elevate/emc-stats role to new storage volume roles (diff)
port monitoring roles to new storage volume roles
Diffstat (limited to 'roles/monitoring')
-rw-r--r--roles/monitoring/graphite/carbon/defaults/main.yml5
-rw-r--r--roles/monitoring/graphite/carbon/tasks/main.yml7
-rw-r--r--roles/monitoring/prometheus/server/defaults/main.yml5
-rw-r--r--roles/monitoring/prometheus/server/tasks/main.yml7
4 files changed, 18 insertions, 6 deletions
diff --git a/roles/monitoring/graphite/carbon/defaults/main.yml b/roles/monitoring/graphite/carbon/defaults/main.yml
index 80553b72..d7e4dc14 100644
--- a/roles/monitoring/graphite/carbon/defaults/main.yml
+++ b/roles/monitoring/graphite/carbon/defaults/main.yml
@@ -1,6 +1,7 @@
---
-# graphite_carbon_zfs:
-# graphite_carbon_lvm:
+# graphite_carbon_cache_storage:
+# type: (zfs|lvm)
+# ...
graphite_carbon_cache_receivers:
line:
diff --git a/roles/monitoring/graphite/carbon/tasks/main.yml b/roles/monitoring/graphite/carbon/tasks/main.yml
index 6c9fb8c1..174b2f7a 100644
--- a/roles/monitoring/graphite/carbon/tasks/main.yml
+++ b/roles/monitoring/graphite/carbon/tasks/main.yml
@@ -1,5 +1,10 @@
---
-## TODO: create zfs or lvm volume depending on graphite_carbon_(zfs|lvm) being defined
+- name: prepare storage volume for /var/lib/graphite
+ when: graphite_carbon_cache_storage is defined
+ vars:
+ storage_volume: "{{ graphite_carbon_cache_storage | combine({'dest': '/var/lib/graphite'}) }}"
+ include_role:
+ name: "storage/{{ graphite_carbon_cache_storage.type }}/volume"
- name: instsall apt packages
apt:
diff --git a/roles/monitoring/prometheus/server/defaults/main.yml b/roles/monitoring/prometheus/server/defaults/main.yml
index c2826059..b5d13b5d 100644
--- a/roles/monitoring/prometheus/server/defaults/main.yml
+++ b/roles/monitoring/prometheus/server/defaults/main.yml
@@ -1,5 +1,6 @@
---
-# prometheus_server_zfs:
-# promethues_server_lvm:
+# prometheus_server_storage:
+# type: (zfs|lvm)
+# ...
prometheus_server_retention: "15d"
diff --git a/roles/monitoring/prometheus/server/tasks/main.yml b/roles/monitoring/prometheus/server/tasks/main.yml
index ec6b14d9..784e872a 100644
--- a/roles/monitoring/prometheus/server/tasks/main.yml
+++ b/roles/monitoring/prometheus/server/tasks/main.yml
@@ -1,5 +1,10 @@
---
-## TODO: create zfs or lvm volume depending on prometheus_server_(zfs|lvm) being defined
+- name: prepare storage volume for /var/lib/prometheus
+ when: prometheus_server_storage is defined
+ vars:
+ storage_volume: "{{ prometheus_server_storage | combine({'dest': '/var/lib/prometheus'}) }}"
+ include_role:
+ name: "storage/{{ prometheus_server_storage.type }}/volume"
- name: install apt packages
apt: