commit 15dd7c7b4fdf04ff6e9b38286b01d8b76ec54ae7
author mcp-jenkins <mcp-jenkins@mirantis.com> Wed Dec 27 13:07:52 2017 +0000
committer Gerrit Code Review <gerrit2@e9aa877068d1> Wed Dec 27 13:07:52 2017 +0000
tree 573599f2ccde927b08813f5cddb3538127022335
parent b17ae4205f9e11227d3dc5390f2a75a3f0832f96
parent 2ebbf952538d6275a292f6214252ddeb179f8325

Merge "Switch count_scalar to count for prometheus"

ceph/meta/telegraf.yml

diff --git a/ceph/meta/telegraf.yml b/ceph/meta/telegraf.yml
index 75072f8..b7628d0 100644
--- a/ceph/meta/telegraf.yml
+++ b/ceph/meta/telegraf.yml
@@ -29,6 +29,7 @@
       ceph_user: client.admin
       gather_admin_socket_stats: false
       gather_cluster_stats: true
+      gather_pool_loads: true
 {%- endif %}
 agent:
   input:
@@ -58,6 +59,7 @@
       ceph_user: client.admin
       gather_admin_socket_stats: true
       gather_cluster_stats: false
+      gather_pool_loads: false
 {%- endif %}
 
 {%- endif %}
@@ -70,6 +72,7 @@
 {%- if monitoring.node_stats is defined %}
       gather_admin_socket_stats: {{ monitoring.node_stats.gather_admin_socket_stats|default('true') }}
       gather_cluster_stats: {{ monitoring.node_stats.gather_cluster_stats|default('false') }}
+      gather_pool_loads: {{ monitoring.cluster_stats.gather_pool_loads|default('false') }}
 {%- if monitoring.node_stats.socket_dir is defined %}
       socket_dir: {{ monitoring.node_stats.socket_dir }}
 {%- endif %}
@@ -85,5 +88,6 @@
 {%- else %}
       gather_admin_socket_stats: true
       gather_cluster_stats: false
+      gather_pool_loads: false
 {%- endif %}
 {%- endif %}