Skip to content

[ZEPPELIN-1821] Add HTTP client to elasticsearch interpreter #1902

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bbonnin wants to merge 12 commits into from
Closed

[ZEPPELIN-1821] Add HTTP client to elasticsearch interpreter #1902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f4c5ac3
HTTP-based Elasticsearch client
bbonnin Jan 2, 2017
549db39
Add HTTP client to elasticsearch interpreter
Jan 15, 2017
28b9805
Update img
Jan 15, 2017
e2365fb
Update elasticsearch/pom.xml
Jan 16, 2017
5a96ae0
Merge branch 'master' into master
bbonnin Jan 16, 2017
4e9812e
Merge elasticsearch/pom.xml
bbonnin Jan 19, 2017
6bcf369
Fix issue with id containing special chars (/, #)
bbonnin Jan 19, 2017
523d155
Replace Java 8 methods
bbonnin Jan 19, 2017
19e888e
Remove bad code in test
bbonnin Jan 19, 2017
2e1bbbd
Merge remote-tracking branch 'upstream/master'
bbonnin Jan 23, 2017
86153a8
Merge remote-tracking branch 'upstream/master'
bbonnin Jan 28, 2017
f5a539e
Remove commented code lines
bbonnin Jan 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified docs/assets/themes/zeppelin/img/docs-img/elasticsearch-config.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 16 additions & 1 deletion docs/interpreter/elasticsearch.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
15 changes: 14 additions & 1 deletion elasticsearch/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,17 @@
<relativePath>..</relativePath>
</parent>

<groupId>org.apache.zeppelin</groupId>
<artifactId>zeppelin-elasticsearch</artifactId>
<packaging>jar</packaging>
<version>0.8.0-SNAPSHOT</version>
<name>Zeppelin: Elasticsearch interpreter</name>

<properties>
<elasticsearch.version>2.4.3</elasticsearch.version>
<httpasyncclient.version>4.0.2</httpasyncclient.version>
<guava.version>18.0</guava.version>
<json-flattener.version>0.1.6</json-flattener.version>
<unirest.version>1.4.9</unirest.version>
</properties>

<dependencies>
Expand All @@ -51,6 +52,12 @@
<artifactId>elasticsearch</artifactId>
<version>${elasticsearch.version}</version>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpasyncclient</artifactId>
<version>${httpasyncclient.version}</version>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
Expand All @@ -64,6 +71,12 @@
<version>${json-flattener.version}</version>
</dependency>

<dependency>
<groupId>com.mashape.unirest</groupId>
<artifactId>unirest-java</artifactId>
<version>${unirest.version}</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Expand Down
Loading