You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by an...@apache.org on 2015/02/26 10:17:35 UTC

karaf-decanter git commit: [KARAF-3568] - DECANTER: The Elasticsearch Appender should use @timestamp

Repository: karaf-decanter
Updated Branches:
  refs/heads/master 08fefefcc -> ff34fdd9c


[KARAF-3568] - DECANTER: The Elasticsearch Appender should use
@timestamp

Project: http://git-wip-us.apache.org/repos/asf/karaf-decanter/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-decanter/commit/ff34fdd9
Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/ff34fdd9
Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/ff34fdd9

Branch: refs/heads/master
Commit: ff34fdd9cf9b3eb99ca679ab7124f9446d96e4b5
Parents: 08fefef
Author: anierbeck <bc...@googlemail.com>
Authored: Thu Feb 26 10:17:18 2015 +0100
Committer: anierbeck <bc...@googlemail.com>
Committed: Thu Feb 26 10:17:18 2015 +0100

----------------------------------------------------------------------
 .../decanter/appender/elasticsearch/ElasticsearchAppender.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/ff34fdd9/appender/elasticsearch/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/ElasticsearchAppender.java
----------------------------------------------------------------------
diff --git a/appender/elasticsearch/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/ElasticsearchAppender.java b/appender/elasticsearch/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/ElasticsearchAppender.java
index 04f1785..9e8754e 100644
--- a/appender/elasticsearch/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/ElasticsearchAppender.java
+++ b/appender/elasticsearch/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/ElasticsearchAppender.java
@@ -25,6 +25,8 @@ import org.elasticsearch.common.transport.InetSocketTransportAddress;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Map;
 
 /**
@@ -33,6 +35,8 @@ import java.util.Map;
 public class ElasticsearchAppender implements Appender {
 
     private final static Logger LOGGER = LoggerFactory.getLogger(ElasticsearchAppender.class);
+    
+    private final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
 
     public void append(Map<Long, Map<String, Object>> data) throws Exception {
         LOGGER.debug("Appending into Elasticsearch");
@@ -44,7 +48,7 @@ public class ElasticsearchAppender implements Appender {
             Settings settings = ImmutableSettings.settingsBuilder().classLoader(Settings.class.getClassLoader()).build();
             client = new TransportClient(settings).addTransportAddress(new InetSocketTransportAddress("localhost", 9300));
             for (Long unit : data.keySet()) {
-                client.prepareIndex("timestamp", unit.toString()).setSource(data.get(unit)).execute().actionGet();
+                client.prepareIndex("@timestamp", dateFormat.format(new Date(unit))).setSource(data.get(unit)).execute().actionGet();
             }
             LOGGER.debug("Apppending done");
         } catch (Exception e) {