From: Zack Cerza Date: Thu, 5 May 2016 22:27:23 +0000 (-0600) Subject: Make pmlogmerge_reduce configurable X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=72c773d8467dd84de504fa1fe2d7a70071dddb93;p=ceph-cm-ansible.git Make pmlogmerge_reduce configurable Signed-off-by: Zack Cerza --- diff --git a/roles/pcp/README.rst b/roles/pcp/README.rst index 9820255..6bcac56 100644 --- 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 7bf7644..0cd4091 100644 --- 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 0ecc06b..b1b9bbc 100644 --- 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