Document whisper settings

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

diff --git a/ansible/README.md b/ansible/README.md
index 329a37bfc3c9f632ce4db629dffc181e74761c5c..40a79300a3703ea275578b1b447377f695a4d8f5 100644 (file)
--- a/ansible/README.md
+++ b/ansible/README.md
@@ -52,6 +52,14 @@ You may override certain variables by creating a `vars.yml` file:
 - `cluster`: The name of the Ceph cluster. Default: ceph
 - `firewalld_zone`: The `firewalld` zone to use when opening ports for Grafana and Carbon. Default: public
 - `devel_mode`: Whether to perform a development-mode deployment vs. a production deployment. Default: true
+- `whisper`: May be used to configure [whisper retention](http://graphite.readthedocs.io/en/latest/config-carbon.html#storage-schemas-conf) settings. Default:
+    ```
+    whisper:
+      retention:
+        - ['10s', '7d']
+        - ['1m', '30d']
+        - ['15m', '5y']
+    ```
 
 These variables are only relevent when `devel_mode` is true:
 - `use_epel`: Whether or not to use EPEL and grafana.com instead of ceph.com-sourced packages for dependencies. Default: false

diff --git a/ansible/roles/ceph-grafana/tasks/configure_carbon.yml b/ansible/roles/ceph-grafana/tasks/configure_carbon.yml
index 1f361857aa8abca144d3f4df9507e0645f22ca87..bc37ccba7ee7c1ebb9e27fc23fee2b0517865c54 100644 (file)
--- a/ansible/roles/ceph-grafana/tasks/configure_carbon.yml
+++ b/ansible/roles/ceph-grafana/tasks/configure_carbon.yml
@@ -10,7 +10,7 @@
 
 - name: Fail when the the first whisper retention value is not 10s
   fail:
-    msg: "The first whisper retention value must be '10s', not '{{ whisper.retention[0][0] }}'"
+    msg: "The first whisper retention value must be '10s', not '{{ whisper.retention[0][0] }}' in order to match collectd's interval"
   failed_when: whisper.retention[0][0] != '10s'
   any_errors_fatal: true