Skip to content

Commit

Permalink
use ARM for elastic and kibana
Browse files Browse the repository at this point in the history
 mn/#87-support-elastic-7
  • Loading branch information
codekiln committed Jul 7, 2023
1 parent 67f923a commit ba56d51
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 18 deletions.
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,8 @@ selfcheck: ## check that the Makefile is well-formed

pylintrc: ## check that the Makefile is well-formed
edx_lint write pylintrc

nuke:
@echo "Removing containers, networks, and data... 🧨"
@echo
docker compose down -v
10 changes: 9 additions & 1 deletion README_TESTS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Running Tests
# Running Tests and experimenting locally

## Running Tests Locally with one version of python on mac

Expand All @@ -24,4 +24,12 @@
* `make test` to run tests

## Running Tests Locally with multiple versions of python on mac
TBD

## Running Elasticsearch and Kibana locally
* `docker compose up` should bring up kibana as long as it's uncommented
* It will take a while to start up
* run `make test` to run tests, which should create the schema in elasticsearch
* run `./manage.py es_update all` to update all the indexes
* At some point you'll see `"message":"Server running at http://0:5601"}` in kibana service logs
* When kibana is ready, you should see `test_movies-1` schema at http://0.0.0.0:5601/ in kibana under `discover`
42 changes: 25 additions & 17 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,13 @@ services:
interval: 10s
timeout: 10s
retries: 10
# commented out because right now we're not using postgres for tests
volumes:
# for normal elasticsearch:
# - elasticsearch:/usr/share/elasticsearch/data
# for webhippie/elasticsearch:
- elasticsearch:/var/lib/elasticsearch

# commented out because right now we're not using postgres for tests
# comment back in if we need it for multiprocessing tests
# db:
# image: postgres
Expand All @@ -38,19 +44,21 @@ services:

# uncomment to get kibana, which can be useful for analyzing index contents
# this is currently not a required part of testing infrastructure, just left here for convenience
# kibana:
# image: docker.elastic.co/kibana/kibana:6.0.1
# depends_on:
# elastic:
# condition: service_healthy
# links:
# - elastic
# ports:
# - 5601:5601
# environment:
# - "ELASTICSEARCH_URL=http://elastic:9200"
# healthcheck:
# test: ["CMD", "curl", "-f", "http://localhost:5601"]
# interval: 10s
# timeout: 10s
# retries: 10
kibana:
image: docker.elastic.co/kibana/kibana:6.4.3
depends_on:
elastic:
condition: service_healthy
links:
- elastic
ports:
- 5601:5601
environment:
- "ELASTICSEARCH_URL=http://elastic:9200"
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:5601"]
interval: 10s
timeout: 10s
retries: 10
volumes:
elasticsearch:

0 comments on commit ba56d51

Please sign in to comment.