You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2017/07/13 05:51:05 UTC
karaf-decanter git commit: Add decanter meta-feature
Repository: karaf-decanter
Updated Branches:
refs/heads/master 3a241d7f4 -> 5c9104f3f
Add decanter meta-feature
Project: http://git-wip-us.apache.org/repos/asf/karaf-decanter/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-decanter/commit/5c9104f3
Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/5c9104f3
Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/5c9104f3
Branch: refs/heads/master
Commit: 5c9104f3f0a67a3b8b4fe9ceba137eb94fba65d9
Parents: 3a241d7
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Thu Jul 13 07:50:52 2017 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Thu Jul 13 07:50:52 2017 +0200
----------------------------------------------------------------------
appender/elasticsearch-native-2.x/pom.xml | 2 +-
assembly/src/main/feature/feature.xml | 14 +++++++++++---
elasticsearch-2.x/pom.xml | 2 +-
manual/src/main/asciidoc/user-guide/introduction.adoc | 7 +++++++
pom.xml | 4 ++--
5 files changed, 22 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/5c9104f3/appender/elasticsearch-native-2.x/pom.xml
----------------------------------------------------------------------
diff --git a/appender/elasticsearch-native-2.x/pom.xml b/appender/elasticsearch-native-2.x/pom.xml
index b27bab3..c1f3c6b 100644
--- a/appender/elasticsearch-native-2.x/pom.xml
+++ b/appender/elasticsearch-native-2.x/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
- <version>${elasticsearch2.version}</version>
+ <version>${elasticsearch22.version}</version>
</dependency>
<dependency>
<groupId>org.apache.karaf.decanter</groupId>
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/5c9104f3/assembly/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/feature/feature.xml b/assembly/src/main/feature/feature.xml
index b8ee349..217c77d 100644
--- a/assembly/src/main/feature/feature.xml
+++ b/assembly/src/main/feature/feature.xml
@@ -18,6 +18,14 @@
-->
<features name="karaf-decanter-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.0.0 http://karaf.apache.org/xmlns/features/v1.0.0">
+ <feature name="decanter" version="${project.version}" description="Meta feature installing elasticsearch, kibana, jmx collector, log collector Decanter features">
+ <feature version="${elasticsearch22.version}">elasticsearch</feature>
+ <feature version="${kibana4.version}">kibana</feature>
+ <feature version="${project.version}">decanter-appender-elasticsearch</feature>
+ <feature version="${project.version}">decanter-collector-log</feature>
+ <feature version="${project.version}">decanter-collector-jmx</feature>
+ </feature>
+
<feature name="decanter-common" version="${project.version}" description="Karaf Decanter API">
<feature>eventadmin</feature>
<feature>scr</feature>
@@ -361,7 +369,7 @@
<bundle>mvn:org.apache.karaf.decanter/org.apache.karaf.decanter.elasticsearch-1.x/${project.version}</bundle>
</feature>
- <feature name="elasticsearch" version="${elasticsearch2.version}" description="Embedded Elasticsearch 2.x node">
+ <feature name="elasticsearch" version="${elasticsearch22.version}" description="Embedded Elasticsearch 2.2.x node">
<feature>scr</feature>
<feature>war</feature>
<configfile finalname="/etc/elasticsearch.yml">mvn:org.apache.karaf.decanter/org.apache.karaf.decanter.elasticsearch-2.x/${project.version}/yml</configfile>
@@ -382,7 +390,7 @@
<bundle>mvn:org.apache.karaf.decanter/org.apache.karaf.decanter.elasticsearch-head-1.x/${project.version}</bundle>
</feature>
- <feature name="elasticsearch-head" version="${elasticsearch2.version}" description="Elasticsearch Head web frontend">
+ <feature name="elasticsearch-head" version="${elasticsearch22.version}" description="Elasticsearch Head web frontend">
<feature>war</feature>
<bundle>mvn:org.apache.karaf.decanter/org.apache.karaf.decanter.elasticsearch-head-2.x/${project.version}</bundle>
</feature>
@@ -395,7 +403,7 @@
<feature name="kibana" version="${kibana4.version}" description="Embedded Kibana 4.x dashboard">
<feature>war</feature>
- <feature version="[${elasticsearch2.version},3.0)">elasticsearch</feature>
+ <feature version="[${elasticsearch22.version},3.0)">elasticsearch</feature>
<bundle>mvn:org.apache.karaf.decanter/org.apache.karaf.decanter.kibana-4.x/${project.version}</bundle>
</feature>
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/5c9104f3/elasticsearch-2.x/pom.xml
----------------------------------------------------------------------
diff --git a/elasticsearch-2.x/pom.xml b/elasticsearch-2.x/pom.xml
index ee86fec..38ed30b 100644
--- a/elasticsearch-2.x/pom.xml
+++ b/elasticsearch-2.x/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
- <version>${elasticsearch2.version}</version>
+ <version>${elasticsearch22.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/5c9104f3/manual/src/main/asciidoc/user-guide/introduction.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/user-guide/introduction.adoc b/manual/src/main/asciidoc/user-guide/introduction.adoc
index 24bdf87..1682e9b 100644
--- a/manual/src/main/asciidoc/user-guide/introduction.adoc
+++ b/manual/src/main/asciidoc/user-guide/introduction.adoc
@@ -43,3 +43,10 @@ karaf@root()> feature:repo-add decanter 1.1.0
----
Now, you have to install the collectors, appenders, and eventually SLA alerters feature to match your need.
+
+For convenience the `decanter` feature installs a quick "ready to go" set of components:
+
+- elasticsearch
+- kibana
+- the elasticsearch appender
+- the JMX and log collectors
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/5c9104f3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b1b2bd1..ab91837 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,8 +37,8 @@
<cassandra.driver.version>2.2.0-rc1</cassandra.driver.version>
<elasticsearch1.version>1.7.4</elasticsearch1.version>
<elasticsearch1.bundle.version>1.7.4_1</elasticsearch1.bundle.version>
- <elasticsearch2.version>2.2.0</elasticsearch2.version>
- <elasticsearch2.bundle.version>2.2.0_1</elasticsearch2.bundle.version>
+ <elasticsearch22.version>2.2.0</elasticsearch22.version>
+ <elasticsearch22.bundle.version>2.2.0_1</elasticsearch22.bundle.version>
<glassfish-json.version>1.0.4</glassfish-json.version>
<json-api.version>1.0</json-api.version>
<kafka.version>0.11.0.0</kafka.version>