From f3031053088efa34ebbb21a22cf00c03722a0143 Mon Sep 17 00:00:00 2001 From: Jordan Sissel Date: Sat, 24 Aug 2013 21:39:35 -0700 Subject: [PATCH] - exclude @timestamp and @version if 'fields_are_metrics' is set. --- lib/logstash/outputs/graphite.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/logstash/outputs/graphite.rb b/lib/logstash/outputs/graphite.rb index 4a3c5b536..c1f9f9c9e 100644 --- a/lib/logstash/outputs/graphite.rb +++ b/lib/logstash/outputs/graphite.rb @@ -12,6 +12,8 @@ class LogStash::Outputs::Graphite < LogStash::Outputs::Base config_name "graphite" milestone 2 + EXCLUDE_ALWAYS = [ "@timestamp", "@version" ] + DEFAULT_METRICS_FORMAT = "*" METRIC_PLACEHOLDER = "*" @@ -102,6 +104,7 @@ class LogStash::Outputs::Graphite < LogStash::Outputs::Base if @fields_are_metrics @logger.debug("got metrics event", :metrics => event.to_hash) event.to_hash.each do |metric,value| + next if EXCLUDE_ALWAYS.include?(metric) next unless @include_metrics.empty? || @include_metrics.any? { |regexp| metric.match(regexp) } next if @exclude_metrics.any? {|regexp| metric.match(regexp)} messages << "#{construct_metric_name(metric)} #{event.sprintf(value.to_s).to_f} #{timestamp}"