Make pmlogmerge_reduce configurable

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/roles/pcp/README.rst b/roles/pcp/README.rst
index 98202552d59819432b30e61e59014a39a5eb85cb..6bcac56f8d5e8d0a40dd2d661a6122fe8ded88ad 100644 (file)
--- a/roles/pcp/README.rst
+++ b/roles/pcp/README.rst
@@ -58,6 +58,11 @@ To tell a ``pcp_manager`` host to retain full-resolution archives for a year
 
     pmlogmerge_retain: "365days"
 
+To tell a ``pcp_manager`` host to delete reduced archives after two years
+(format is a `PCP time window`_)::
+
+    pmlogmerge_reduce: "730days"
+
 To tell a ``pcp_manager`` host to run PCP's various web UIs::
 
     pcp_web: true

diff --git a/roles/pcp/defaults/main.yml b/roles/pcp/defaults/main.yml
index 7bf7644dc5b299dda471cf0a2735ed5248b9ef6c..0cd4091922c919dc02beb4b7b989a9d2ce8f3e1c 100644 (file)
--- a/roles/pcp/defaults/main.yml
+++ b/roles/pcp/defaults/main.yml
@@ -17,6 +17,8 @@ pcp_probe: false
 pmcd_connect_timeout: "0.1"
 # How long to keep full-resolution archives before reducing to save space
 pmlogmerge_retain: "90days"
+# How long before deleting reduced archives
+pmlogmerge_reduce: "99999weeks"
 
 ## PCP Web UI options
 # Set up the web UI

diff --git a/roles/pcp/tasks/manager.yml b/roles/pcp/tasks/manager.yml
index 0ecc06b4e33d2d1d3973e4cd2d83ee7d4df5eebf..b1b9bbcf547c84c021a35223875d722bf5e8add2 100644 (file)
--- a/roles/pcp/tasks/manager.yml
+++ b/roles/pcp/tasks/manager.yml
@@ -91,6 +91,15 @@
     mode: 0644
   register: update_pmlogmerge_retain
 
+- name: Set /etc/pcp/pmmgr/pmlogmerge-reduce
+  copy:
+    dest: /etc/pcp/pmmgr/pmlogmerge-reduce
+    content: "{{ pmlogmerge_reduce }}"
+    owner: root
+    group: root
+    mode: 0644
+  register: update_pmlogmerge_reduce
+
 - name: Restart pmmgr
   service:
     name: "{{ pmmgr_service }}"
@@ -102,4 +111,5 @@
     target_host|changed or
     target_discovery|changed or
     pmmgr_options|changed or
-    update_pmlogmerge_retain|changed
+    update_pmlogmerge_retain|changed or
+    update_pmlogmerge_reduce|changed