This repository has been archived by the owner on May 28, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 338
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #342 from DivanteLtd/feature/es7
Elastic 7 Search support
- Loading branch information
Showing
76 changed files
with
7,934 additions
and
7,730 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,8 +9,7 @@ | |
"options": { | ||
"properties": { | ||
"value": { | ||
"type": "text", | ||
"index": "not_analyzed" | ||
"type": "text" | ||
} | ||
} | ||
} | ||
|
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
version: '3.0' | ||
services: | ||
es7: | ||
container_name: es7 | ||
build: docker/elasticsearch7/ | ||
ulimits: | ||
memlock: | ||
soft: -1 | ||
hard: -1 | ||
volumes: | ||
- ./docker/elasticsearch7/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml:ro | ||
ports: | ||
- '9200:9200' | ||
- '9300:9300' | ||
environment: | ||
- discovery.type=single-node | ||
- cluster.name=docker-cluster | ||
- bootstrap.memory_lock=true | ||
- "ES_JAVA_OPTS=-Xmx512m -Xms512m" | ||
|
||
redis: | ||
image: 'redis:4-alpine' | ||
ports: | ||
- '6379:6379' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
FROM docker.elastic.co/elasticsearch/elasticsearch:7.3.2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
--- | ||
## Default Elasticsearch configuration from elasticsearch-docker. | ||
## from https://github.com/elastic/elasticsearch-docker/blob/master/build/elasticsearch/elasticsearch.yml | ||
# | ||
cluster.name: "docker-cluster" | ||
network.host: 0.0.0.0 | ||
|
||
# minimum_master_nodes need to be explicitly set when bound on a public IP | ||
# set to 1 to allow single node clusters | ||
# Details: https://github.com/elastic/elasticsearch/pull/17288 | ||
discovery.zen.minimum_master_nodes: 1 | ||
|
||
## Use single node discovery in order to disable production mode and avoid bootstrap checks | ||
## see https://www.elastic.co/guide/en/elasticsearch/reference/current/bootstrap-checks.html | ||
# | ||
discovery.type: single-node |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,24 +1,9 @@ | ||
|
||
let config = require('config') | ||
let kue = require('kue') | ||
let queue = kue.createQueue(Object.assign(config.kue, { redis: config.redis })) | ||
|
||
let es = require('elasticsearch') | ||
const esConfig = { | ||
host: { | ||
host: config.elasticsearch.host, | ||
port: config.elasticsearch.port, | ||
protocol: config.elasticsearch.protocol | ||
}, | ||
log: 'debug', | ||
apiVersion: config.elasticsearch.apiVersion, | ||
requestTimeout: 1000 * 60 * 60, | ||
keepAlive: false | ||
} | ||
if (config.elasticsearch.user) { | ||
esConfig.httpAuth = config.elasticsearch.user + ':' + config.elasticsearch.password | ||
} | ||
let client = new es.Client(esConfig) | ||
const config = require('config') | ||
const kue = require('kue') | ||
const queue = kue.createQueue(Object.assign(config.kue, { redis: config.redis })) | ||
const es = require('../src/lib/elastic') | ||
const client = es.getClient(config) | ||
|
||
exports.db = client | ||
exports.queue = queue |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.