Fix fielddrop for ceph monitoring
We should apply this fielddrop for both cases of
{%- if monitoring.cluster_stats is defined %}
Change-Id: I9b8145fe4da88b7a67caa9a3819bc9dd690b3965
diff --git a/ceph/meta/telegraf.yml b/ceph/meta/telegraf.yml
index 2dabf02..72cfe4c 100644
--- a/ceph/meta/telegraf.yml
+++ b/ceph/meta/telegraf.yml
@@ -5,6 +5,7 @@
input:
ceph:
template: ceph/files/telegraf.conf
+ fielddrop: [ "get", "get_or_fail_fail", "get_or_fail_success", "get_sum", "max", "put", "put_sum", "take", "take_sum", "val", "wait_avgcount", "wait_sum"]
{%- if monitoring.cluster_stats is defined %}
ceph_user: client.{{ monitoring.cluster_stats.ceph_user|default('admin') }}
gather_admin_socket_stats: {{ monitoring.cluster_stats.gather_admin_socket_stats|default('false') }}
@@ -30,12 +31,12 @@
gather_admin_socket_stats: false
gather_cluster_stats: true
gather_pool_loads: true
- fielddrop: [ "get", "get_or_fail_fail", "get_or_fail_success", "get_sum", "max", "put", "put_sum", "take", "take_sum", "val", "wait_avgcount", "wait_sum"]
{%- endif %}
agent:
input:
ceph:
template: ceph/files/telegraf.conf
+ fielddrop: [ "get", "get_or_fail_fail", "get_or_fail_success", "get_sum", "max", "put", "put_sum", "take", "take_sum", "val", "wait_avgcount", "wait_sum"]
{%- if monitoring.cluster_stats is defined %}
ceph_user: client.{{ monitoring.cluster_stats.ceph_user|default('admin') }}
gather_admin_socket_stats: {{ monitoring.cluster_stats.gather_admin_socket_stats|default('true') }}
@@ -61,9 +62,7 @@
gather_admin_socket_stats: true
gather_cluster_stats: false
gather_pool_loads: false
- fielddrop: [ "get", "get_or_fail_fail", "get_or_fail_success", "get_sum", "max", "put", "put_sum", "take", "take_sum", "val", "wait_avgcount", "wait_sum"]
{%- endif %}
-
{%- endif %}
{%- if osd is defined and osd.get('enabled') %}
@@ -71,6 +70,7 @@
input:
ceph:
template: ceph/files/telegraf.conf
+ fielddrop: [ "get", "get_or_fail_fail", "get_or_fail_success", "get_sum", "max", "put", "put_sum", "take", "take_sum", "val", "wait_avgcount", "wait_sum"]
{%- 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') }}
@@ -91,6 +91,5 @@
gather_admin_socket_stats: true
gather_cluster_stats: false
gather_pool_loads: false
- fielddrop: [ "get", "get_or_fail_fail", "get_or_fail_success", "get_sum", "max", "put", "put_sum", "take", "take_sum", "val", "wait_avgcount", "wait_sum"]
{%- endif %}
{%- endif %}