From 325fe2ccab8066d7afae646ae46c51132e9a5397 Mon Sep 17 00:00:00 2001 From: Don Tregonning Date: Mon, 17 Dec 2018 15:41:02 -0800 Subject: [PATCH] fix time issue and metric name adding double . --- lib/fluent/plugin/in_kubernetes_metrics.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/fluent/plugin/in_kubernetes_metrics.rb b/lib/fluent/plugin/in_kubernetes_metrics.rb index eae14db..02fc33e 100644 --- a/lib/fluent/plugin/in_kubernetes_metrics.rb +++ b/lib/fluent/plugin/in_kubernetes_metrics.rb @@ -325,9 +325,8 @@ def emit_system_container_metrics(node_name, container) def emit_stats_breakdown(stats) stats_latest = stats[-1] - tag = 'stats' - stats_timestamp = stats_latest['timestamp'] - labels = { 'stats' => 'stats' } + tag = 'node' + stats_timestamp = parse_time stats_latest['timestamp'] unless stats_latest['cpu'].nil? emit_cpu_metrics_stats tag: tag, metrics: stats_latest['cpu'], labels: labels, time: stats_timestamp end @@ -450,7 +449,7 @@ def emit_filesystem_metrics_stats(tag:, metrics:, labels:, time:) type = file_system['type'] file_system.each do | file_metric | file_key , file_value = file_metric - router.emit generate_tag("#{tag}.filesystem.".concat(".").concat(file_key)), time, labels.merge('device' => device, 'type' => type, 'value' => file_value) + router.emit generate_tag("#{tag}.filesystem.".concat(file_key)), time, labels.merge('device' => device, 'type' => type, 'value' => file_value) end end end