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/04/11 21:44:05 UTC
[1/2] karaf-decanter git commit: Include karaf name as logged
attribute to help identify originating instances.
Repository: karaf-decanter
Updated Branches:
refs/heads/master b439fc3ea -> 3831aed25
Include karaf name as logged attribute to help identify originating instances.
Project: http://git-wip-us.apache.org/repos/asf/karaf-decanter/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-decanter/commit/65f5889c
Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/65f5889c
Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/65f5889c
Branch: refs/heads/master
Commit: 65f5889c2da16162648a1121ecc2dff112bfbe81
Parents: b439fc3
Author: Gary Hodgson <co...@garyhodgson.com>
Authored: Sat Apr 11 21:03:47 2015 +0200
Committer: Gary Hodgson <co...@garyhodgson.com>
Committed: Sat Apr 11 21:17:56 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/karaf/decanter/collector/log/LogAppender.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/65f5889c/collector/log/src/main/java/org/apache/karaf/decanter/collector/log/LogAppender.java
----------------------------------------------------------------------
diff --git a/collector/log/src/main/java/org/apache/karaf/decanter/collector/log/LogAppender.java b/collector/log/src/main/java/org/apache/karaf/decanter/collector/log/LogAppender.java
index b1235a9..2df1235 100644
--- a/collector/log/src/main/java/org/apache/karaf/decanter/collector/log/LogAppender.java
+++ b/collector/log/src/main/java/org/apache/karaf/decanter/collector/log/LogAppender.java
@@ -61,6 +61,7 @@ public class LogAppender implements PaxAppender {
Map<String, Object> data = new HashMap<>();
data.put("type", "log");
+ data.put("karafName", System.getProperty("karaf.name"));
data.put("timeStamp", event.getTimeStamp());
data.put("loggerClass", event.getFQNOfLoggerClass());
data.put("loggerName", event.getLoggerName());
[2/2] karaf-decanter git commit: Elasticsearch 1.4 required a CORS
entry in order to accept requests from, e.g., Kibana.
Posted by an...@apache.org.
Elasticsearch 1.4 required a CORS entry in order to accept requests from, e.g., Kibana.
Project: http://git-wip-us.apache.org/repos/asf/karaf-decanter/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-decanter/commit/3831aed2
Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/3831aed2
Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/3831aed2
Branch: refs/heads/master
Commit: 3831aed25b83edcd0d9d45f9f70dc04f438607e2
Parents: 65f5889
Author: Gary Hodgson <co...@garyhodgson.com>
Authored: Sat Apr 11 21:04:31 2015 +0200
Committer: Gary Hodgson <co...@garyhodgson.com>
Committed: Sat Apr 11 21:18:11 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/karaf/decanter/elasticsearch/EmbeddedNode.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/3831aed2/elasticsearch/src/main/java/org/apache/karaf/decanter/elasticsearch/EmbeddedNode.java
----------------------------------------------------------------------
diff --git a/elasticsearch/src/main/java/org/apache/karaf/decanter/elasticsearch/EmbeddedNode.java b/elasticsearch/src/main/java/org/apache/karaf/decanter/elasticsearch/EmbeddedNode.java
index 82041af..761b13a 100644
--- a/elasticsearch/src/main/java/org/apache/karaf/decanter/elasticsearch/EmbeddedNode.java
+++ b/elasticsearch/src/main/java/org/apache/karaf/decanter/elasticsearch/EmbeddedNode.java
@@ -57,6 +57,8 @@ public class EmbeddedNode {
.put("gateway.type", "local")
.put("cluster.routing.schedule", "50ms")
.put("path.plugins", pluginsFile.getAbsolutePath())
+ .put("http.cors.enabled", true)
+ .put("http.cors.allow-origin", "/.*/")
.build();
LOGGER.debug("Creating the elasticsearch node");