Skip to content

Commit

Permalink
feat(collector): added support for @elastic/elasticsearch v8 (#707)
Browse files Browse the repository at this point in the history
* build(deps-dev): bump @elastic/elasticsearch from 7.17.0 to 8.6.0

Bumps [@elastic/elasticsearch](https://github.com/elastic/elasticsearch-js) from 7.17.0 to 8.6.0.
- [Release notes](https://github.com/elastic/elasticsearch-js/releases)
- [Changelog](https://github.com/elastic/elasticsearch-js/blob/main/docs/changelog.asciidoc)
- [Commits](elastic/elasticsearch-js@v7.17.0...v8.6.0)

---
updated-dependencies:
- dependency-name: "@elastic/elasticsearch"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: kirrg001 <[email protected]>
  • Loading branch information
dependabot[bot] and kirrg001 authored Feb 24, 2023
1 parent 12da231 commit dae00bb
Show file tree
Hide file tree
Showing 7 changed files with 464 additions and 109 deletions.
3 changes: 2 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -272,10 +272,11 @@ shared: &shared
key: v{{ .Environment.CACHE_VERSION }}-prisma-app-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/collector/test/tracing/database/prisma/package-lock.json" }}

elasticsearch: &elasticsearch
- image: docker.elastic.co/elasticsearch/elasticsearch:7.6.2
- image: docker.elastic.co/elasticsearch/elasticsearch:8.6.1
environment:
- discovery.type=single-node
- "ES_JAVA_OPTS=-Xms500m -Xmx500m"
- xpack.security.enabled=false

kafka: &kafka
- image: wurstmeister/kafka:2.12-2.2.1
Expand Down
14 changes: 12 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,24 @@ services:
# discovery.type: single-node
# ES_JAVA_OPTS: "-Xms500m -Xmx500m"

# Elasticsearch 7.6
# Elasticsearch 7 compatible with client v7
# elasticsearch:
# image: docker.elastic.co/elasticsearch/elasticsearch:7.6.2
# ports:
# - 9200:9200
# environment:
# discovery.type: single-node
# ES_JAVA_OPTS: "-Xms500m -Xmx500m"

# Elasticsearch 8 compatible with client v7 & v8
elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:7.6.2
image: docker.elastic.co/elasticsearch/elasticsearch:8.6.1
ports:
- 9200:9200
environment:
discovery.type: single-node
ES_JAVA_OPTS: "-Xms500m -Xmx500m"
xpack.security.enabled: 'false'

# Kafka test will sometimes fail because Zookeeper won't start due to
# java.io.IOException: Unable to create data directory /opt/zookeeper-3.4.9/data/version-2, which seems to be a known issue:
Expand Down
246 changes: 228 additions & 18 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@
"@aws-sdk/client-sqs2": "npm:@aws-sdk/[email protected]",
"@commitlint/cli": "^14.1.0",
"@commitlint/config-conventional": "^14.1.0",
"@elastic/elasticsearch": "^7.16.0",
"@elastic/elasticsearch": "^8.6.0",
"@elastic/elasticsearch-v7.17.0": "npm:@elastic/[email protected]",
"@elastic/elasticsearch-v7.9.0": "npm:@elastic/[email protected]",
"@google-cloud/pubsub": "3.3.0",
"@google-cloud/storage": "^5.16.1",
Expand Down
Loading

0 comments on commit dae00bb

Please sign in to comment.