Make pmlogmerge_retain configurable

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

diff --git a/roles/pcp/README.rst b/roles/pcp/README.rst
index fff2e49816baca377563f053e07f0d72ff2aee13..98202552d59819432b30e61e59014a39a5eb85cb 100644 (file)
--- a/roles/pcp/README.rst
+++ b/roles/pcp/README.rst
@@ -53,6 +53,14 @@ connect to hosts that it monitors (in seconds)::
 
     pmcd_connect_timeout: 1
 
+To tell a ``pcp_manager`` host to retain full-resolution archives for a year
+(format is a `PCP time window`_)::
+
+    pmlogmerge_retain: "365days"
+
 To tell a ``pcp_manager`` host to run PCP's various web UIs::
 
     pcp_web: true
+
+
+.. _PCP time window: http://www.pcp.io/books/PCP_UAG/html/LE14729-PARENT.html

diff --git a/roles/pcp/defaults/main.yml b/roles/pcp/defaults/main.yml
index aff86a3131c9bb41b12af5ff88f7de83f1e04131..7bf7644dc5b299dda471cf0a2735ed5248b9ef6c 100644 (file)
--- a/roles/pcp/defaults/main.yml
+++ b/roles/pcp/defaults/main.yml
@@ -15,6 +15,8 @@ pcp_use_avahi: false
 pcp_probe: false
 # PMCD_CONNECT_TIMEOUT in /etc/pcp/pmmgr/pmmgr.options
 pmcd_connect_timeout: "0.1"
+# How long to keep full-resolution archives before reducing to save space
+pmlogmerge_retain: "90days"
 
 ## PCP Web UI options
 # Set up the web UI

diff --git a/roles/pcp/tasks/manager.yml b/roles/pcp/tasks/manager.yml
index dd66e2ca43ec8b80230bf493ebc8b50b9ec196c2..0ecc06b4e33d2d1d3973e4cd2d83ee7d4df5eebf 100644 (file)
--- a/roles/pcp/tasks/manager.yml
+++ b/roles/pcp/tasks/manager.yml
@@ -82,6 +82,15 @@
     line: "PMCD_CONNECT_TIMEOUT={{ pmcd_connect_timeout }}"
   register: pmmgr_options
 
+- name: Set /etc/pcp/pmmgr/pmlogmerge-retain
+  copy:
+    dest: /etc/pcp/pmmgr/pmlogmerge-retain
+    content: "{{ pmlogmerge_retain }}"
+    owner: root
+    group: root
+    mode: 0644
+  register: update_pmlogmerge_retain
+
 - name: Restart pmmgr
   service:
     name: "{{ pmmgr_service }}"
@@ -92,4 +101,5 @@
     install_pmmgr_yum|changed or
     target_host|changed or
     target_discovery|changed or
-    pmmgr_options|changed
+    pmmgr_options|changed or
+    update_pmlogmerge_retain|changed