Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add HTTP client to elasticsearch interpreter

Browse source
This commit is contained in:
Bruno Bonnin 2017-01-15 11:47:36 +01:00
parent f4c5ac39fe
commit 549db396ee
3 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
docs/interpreter/elasticsearch.md
View file

@ -46,7 +46,22 @@ limitations under the License.
<tr>
<td>elasticsearch.port</td>
<td>9300</td>
<td>Connection port <b>( Important: this is not the HTTP port, but the transport port )</b></td>
<td>Connection port <b>( Important: it depends on the client type, transport or http)</b></td>
</tr>
<tr>
<td>elasticsearch.client.type</td>
<td>transport</td>
<td>The type of client for Elasticsearch (transport or http)<b>( Important: the port depends on this value)</b></td>
</tr>
<tr>
<td>elasticsearch.basicauth.username</td>
<td></td>
<td>Username for a basic authentication (http)</b></td>
</tr>
<tr>
<td>elasticsearch.basicauth.password</td>
<td></td>
<td>Password for a basic authentication (http)</b></td>
</tr>
<tr>
<td>elasticsearch.result.size</td>

3
elasticsearch/src/main/java/org/apache/zeppelin/elasticsearch/client/HttpBasedClient.java
View file

@ -56,9 +56,6 @@ public class HttpBasedClient implements ElasticsearchClient {
private final String password;
private final Gson gson = new GsonBuilder().setPrettyPrinting().create();
// private HttpHost elasticHost;
// private HttpClientContext context;
// private CredentialsProvider credsProvider;
public HttpBasedClient(Properties props) {
this.host = props.getProperty(ElasticsearchInterpreter.ELASTICSEARCH_HOST);

2
zeppelin-distribution/src/bin_license/LICENSE
View file

@ -13,6 +13,7 @@ The following components are provided under Apache License.
(Apache 2.0) Apache Commons Exec (commons-exec:commons-exec:1.3 - http://commons.apache.org/exec/)
(Apache 2.0) Http Components (org.apache.httpcomponents:httpcore:4.3.3 - https://github.com/apache/httpclient)
(Apache 2.0) Http Components (org.apache.httpcomponents:httpclient:4.3.6 - https://github.com/apache/httpclient)
(Apache 2.0) Http Components (org.apache.httpcomponents:httpasyncclient:4.0.2 - https://github.com/apache/httpclient)
(Apache 2.0) Apache Commons Lang (org.apache.commons:commons-lang:2.5 - http://commons.apache.org/proper/commons-lang/)
(Apache 2.0) Apache Commons Lang 3 (org.apache.commons:commons-lang3:3.4 - http://commons.apache.org/proper/commons-lang/)
(Apache 2.0) Apache Commons Math 3 (org.apache.commons:commons-math3:3.6.1 - http://commons.apache.org/proper/commons-math/)
@ -266,6 +267,7 @@ The text of each license is also included at licenses/LICENSE-[project]-[version
(The MIT License) Java String Similarity 0.12 (info.debatty:java-string-similarity:0.12 - https://github.com/tdebatty/java-string-similarity)
(The MIT License) Java LSH 0.10 (info.debatty:java-lsh:0.10 - https://github.com/tdebatty/java-LSH)
(The MIT License) JSoup 1.6.1 (org.jsoup:jsoup:1.6.1 - https://github.com/jhy/jsoup/)
(The MIT License) Unirest 1.4.9 (com.mashape.unirest:unirest-java:1.4.9 - https://github.com/Mashape/unirest-java)
========================================================================
BSD-style licenses