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 2015/11/17 14:54:33 UTC
karaf-decanter git commit: [KARAF-4113] Add elasticsearch kibana
parameter support to be able to use remote elasticsearch instance
Repository: karaf-decanter
Updated Branches:
refs/heads/master d4c5c109d -> 6f9148b22
[KARAF-4113] Add elasticsearch kibana parameter support to be able to use remote elasticsearch instance
Project: http://git-wip-us.apache.org/repos/asf/karaf-decanter/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-decanter/commit/6f9148b2
Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/6f9148b2
Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/6f9148b2
Branch: refs/heads/master
Commit: 6f9148b22e45e376f4831f5e50e6cc1ec8410d76
Parents: d4c5c10
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Tue Nov 17 14:53:54 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Tue Nov 17 14:53:54 2015 +0100
----------------------------------------------------------------------
kibana/src/main/resources/config.js | 12 +++++++++++-
manual/src/main/asciidoc/user-guide/appenders.adoc | 7 +++++++
2 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/6f9148b2/kibana/src/main/resources/config.js
----------------------------------------------------------------------
diff --git a/kibana/src/main/resources/config.js b/kibana/src/main/resources/config.js
index bab7947..5d97470 100644
--- a/kibana/src/main/resources/config.js
+++ b/kibana/src/main/resources/config.js
@@ -8,6 +8,16 @@ define(['settings'],
function (Settings) {
"use strict";
+ var es = "http://" + window.location.hostname + ":9200";
+ var query = window.location.search.substring(1);
+ var vars = query.split("&");
+ for (var i = 0; i < vars.length; i++) {
+ var pair = vars[i].split("=");
+ if (pair[0] == "elasticsearch") {
+ es = pair[1];
+ }
+ }
+
/** @scratch /configuration/config.js/2
*
* === Parameters
@@ -24,7 +34,7 @@ function (Settings) {
* kibana installed on. You probably want to set it to the FQDN of your
* elasticsearch host
*/
- elasticsearch: "http://"+window.location.hostname+":9200",
+ elasticsearch: es,
/** @scratch /configuration/config.js/5
*
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/6f9148b2/manual/src/main/asciidoc/user-guide/appenders.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/user-guide/appenders.adoc b/manual/src/main/asciidoc/user-guide/appenders.adoc
index 64f735a..b8955aa 100644
--- a/manual/src/main/asciidoc/user-guide/appenders.adoc
+++ b/manual/src/main/asciidoc/user-guide/appenders.adoc
@@ -506,6 +506,13 @@ You can change these dashboards to add new panels, change the existing panels, e
Of course, you can create your own dashboards, starting from blank or simple dashboards.
+By default, Decanter Kibana uses embedded elasticsearch instance. However, it's possible to use a remote elasticsearch
+instance by providing the elasticsearch parameter on the URL like this for instance:
+
+----
+http://localhost:8181/kibana?elasticsearch=http://localhost:9400
+----
+
==== Elasticsearch Head console
In addition of the embedded elasticsearch instance, Decanter also provides a web console allowing you to monitor and