diff --git a/docker-compose.yml b/docker-compose.yml index 9a8dbd2e..d4d36092 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -53,6 +53,8 @@ services: volumes: - "./logstash:/config-dir" - "./data:/usr/local/share/data" + environment: + XPACK_MONITORING_ELASTICSEARCH_URL: "http://elastic1:9200" command: ["logstash", "-f", "/config-dir/logstash.conf"] ports: - "3333:3333" diff --git a/download-sample-files.sh b/download-sample-files.sh index 57abbb79..5365bf2c 100755 --- a/download-sample-files.sh +++ b/download-sample-files.sh @@ -8,7 +8,7 @@ __dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" GZ_URLS="\ https://s3.amazonaws.com/elasticsearch-sample-data/enron_messages.jsonl.gz \ - http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz \ + http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz \ " NORMAL_URLS="\ diff --git a/logstash/logstash.conf b/logstash/logstash.conf index 574193c1..447099c9 100644 --- a/logstash/logstash.conf +++ b/logstash/logstash.conf @@ -44,7 +44,7 @@ filter { geoip { source => "remote_addr" target => "geoip" - database =>"/usr/local/share/data/GeoLiteCity.dat" + database =>"/usr/local/share/data/GeoLite2-City.mmdb" add_field => [ "[geoip][coordinates]", "%{[geoip][longitude]}" ] add_field => [ "[geoip][coordinates]", "%{[geoip][latitude]}" ] } diff --git a/slides/Gruntfile.coffee b/slides/Gruntfile.coffee index 7547b22c..c0312b36 100644 --- a/slides/Gruntfile.coffee +++ b/slides/Gruntfile.coffee @@ -120,6 +120,7 @@ module.exports = (grunt) -> kibanaUrl: process.env.KIBANA_URL || 'http://localhost:5601' inquisitorUrl: process.env.INQUISITOR_URL || 'http://localhost:9400' exercisesUrl: process.env.EXERCISES_URL || 'http://localhost:9500' + cerebroUrl: process.env.CEREBRO_URL || 'http://localhost:9000' slides: slides section: (slide) -> diff --git a/slides/images/screenshots/cerebro-node-failure.png b/slides/images/screenshots/cerebro-node-failure.png new file mode 100644 index 00000000..16b72ae5 Binary files /dev/null and b/slides/images/screenshots/cerebro-node-failure.png differ diff --git a/slides/images/screenshots/cerebro-screenshot.png b/slides/images/screenshots/cerebro-screenshot.png new file mode 100644 index 00000000..fd89e097 Binary files /dev/null and b/slides/images/screenshots/cerebro-screenshot.png differ diff --git a/slides/images/screenshots/kopf-node-failure.png b/slides/images/screenshots/kopf-node-failure.png deleted file mode 100644 index 393b9b68..00000000 Binary files a/slides/images/screenshots/kopf-node-failure.png and /dev/null differ diff --git a/slides/images/screenshots/kopf-screenshot.png b/slides/images/screenshots/kopf-screenshot.png deleted file mode 100644 index fa6b8e00..00000000 Binary files a/slides/images/screenshots/kopf-screenshot.png and /dev/null differ diff --git a/slides/slides/advanced-querying.md b/slides/slides/advanced-querying.md index 5f1d16f4..af132422 100644 --- a/slides/slides/advanced-querying.md +++ b/slides/slides/advanced-querying.md @@ -5,10 +5,10 @@ ### Pagination * Most cases use `size` and `from` -* [Simple Paging](sense://paging-and-sorting.sense#L4) +* [Simple Paging](console://paging-and-sorting.sense#L4) * Option of using a cursor -* [Paging with a Scroll ID](sense://paging-and-sorting.sense#L41) +* [Paging with a Scroll ID](console://paging-and-sorting.sense#L41) --- @@ -16,7 +16,7 @@ * Sort most fields by ascending or descending -[Basic Sorting](sense://paging-and-sorting.sense#L72) +[Basic Sorting](console://paging-and-sorting.sense#L72) --- @@ -25,4 +25,4 @@ * Tokenizers affect sorting as well * Need to make sure you are sorting on the right field -[Sorting String Fields](sense://paging-and-sorting.sense#L131) +[Sorting String Fields](console://paging-and-sorting.sense#L131) diff --git a/slides/slides/es-is.md b/slides/slides/es-is.md index 01720f2a..ca380312 100644 --- a/slides/slides/es-is.md +++ b/slides/slides/es-is.md @@ -10,7 +10,7 @@ ### Highly Configurable -![Kopf Screenshot](images/screenshots/kopf-screenshot.png#screenshot) +![Cerebro Screenshot](images/screenshots/cerebro-screenshot.png#screenshot) --- @@ -28,7 +28,7 @@ ### Distributed and Fault Tolerant -![Node Failure](images/screenshots/kopf-node-failure.png#screenshot) +![Node Failure](images/screenshots/cerebro-node-failure.png#screenshot) --- diff --git a/slides/slides/indexing.md b/slides/slides/indexing.md index 461c79a0..963efe9c 100644 --- a/slides/slides/indexing.md +++ b/slides/slides/indexing.md @@ -13,7 +13,7 @@ curl -XPUT 'http://localhost:9200/wikipedia/location/1' -d '{ }' ``` -[Basic Indexing](sense://indexing.sense) +[Basic Indexing](console://indexing.sense) --- @@ -21,7 +21,7 @@ curl -XPUT 'http://localhost:9200/wikipedia/location/1' -d '{ Elasticsearch will guess the mappings for new fields it hasn't seen before -[Automatic Mappings in Action](sense://indexing.sense#L15) +[Automatic Mappings in Action](console://indexing.sense#L15) --- @@ -29,7 +29,7 @@ Elasticsearch will guess the mappings for new fields it hasn't seen before You can also update a document via script or "upsert" -[Update Examples](sense://indexing.sense#L31) +[Update Examples](console://indexing.sense#L31) --- @@ -37,7 +37,7 @@ You can also update a document via script or "upsert" You can also add/remove/update documents in bulk using the Bulk API. This is recommended for batch updates -[Bulk API Examples](sense://indexing.sense#L66) +[Bulk API Examples](console://indexing.sense#L66) --- diff --git a/slides/slides/intro.md b/slides/slides/intro.md index fc956493..23a5b08f 100644 --- a/slides/slides/intro.md +++ b/slides/slides/intro.md @@ -63,6 +63,6 @@ This tutorial is free and open source. -http://github.com/Spantree/elasticsearch-talk +http://github.com/Spantree/elasticsearch-talk/tree/v5.5 We will jump out of the slide deck quite often. diff --git a/slides/slides/querying.md b/slides/slides/querying.md index 4c33b0b9..f2cd9356 100644 --- a/slides/slides/querying.md +++ b/slides/slides/querying.md @@ -132,7 +132,7 @@ curl -XPOST "http://localhost:9200/wikipedia/_search" -d '{ ### Search Demos -[API Examples](sense://searching.sense) +[API Examples](console://searching.sense) --- @@ -256,4 +256,4 @@ $s = coord \times \sum_{t} (qn \times boost \times idf) \times (tf \times idf \t ### Filtering Demos -[Filtering Examples](sense://searching.sense#L244) +[Filtering Examples](console://searching.sense#L244) diff --git a/slides/slides/tools.md b/slides/slides/tools.md index 53f0367a..02d67e7b 100644 --- a/slides/slides/tools.md +++ b/slides/slides/tools.md @@ -11,30 +11,29 @@ --- -### Kopf +### Cerebro -* A simple web administration tool written in AngularJS. -* [Kopf](elasticsearch://_plugin/kopf/) +* A simple web administration tool written using Scala, Play Framework, AngularJS and Bootstrap. +* [Cerebro](cerebro://) --- -### Sense +### Console * An IDE (with autocomplete) for running Elasticsearch queries against the REST API. -[Sense](sense://) +[Console](console://indexing.sense) --- ### More -* [Inquisitor](inquisitor://#/analyzers) - Explore how Elasticsearch processes strings -* [Marvel](kibana://app/marvel) - Monitor the health of your cluster -* [Kibana](kibana://app/kibana) - Visualize your logs +* [Monitoring](kibana://app/monitoring) - Monitor the health of your cluster +* [LogTrail](kibana://app/logtrail) - Visualize your logs --- ### API Examples -* Executed with Sense -* [Get Started with Sense](sense://getting-started.sense#L2) +* Executed with Console +* [Get Started with Console](console://getting-started.sense#L2) diff --git a/slides/templates/_index.html b/slides/templates/_index.html index 0e3fdfad..efd3270a 100644 --- a/slides/templates/_index.html +++ b/slides/templates/_index.html @@ -75,10 +75,10 @@