V5.5 update slides

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"

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="\

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]}"  ]
     }

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) ->

slides/slides/advanced-querying.md

@@ -5,18 +5,18 @@
 ### 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)
 
 ---
 
 ### Sorting - What you expect
 
 * 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)

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)
 
 ---
 

slides/slides/indexing.md

@@ -13,31 +13,31 @@ curl -XPUT 'http://localhost:9200/wikipedia/location/1' -d '{
 }'
 ```
 
-[Basic Indexing](sense://indexing.sense)
+[Basic Indexing](console://indexing.sense)
 
 ---
 
 ### Automatic Mappings
 
 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)
 
 ---
 
 ### Update API
 
 You can also update a document via script or "upsert"
 
-[Update Examples](sense://indexing.sense#L31)
+[Update Examples](console://indexing.sense#L31)
 
 ---
 
 ### Bulk API
 
 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)
 
 ---
 

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.

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)

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)

slides/templates/_index.html

@@ -75,10 +75,10 @@
         <script>
           // Override links with these protocols to point to the appropriate services
           window.mdProtocols = {
-            "sense://": "<%= kibanaUrl %>/app/sense?load_from=<%= exercisesUrl %>/",
+            "console://": "<%= kibanaUrl %>/app/kibana#/dev_tools/console?load_from=<%= exercisesUrl %>/",
             "elasticsearch://": "<%= elasticsearchUrl %>/",
             "kibana://": "<%= kibanaUrl %>/",
-            "inquisitor://": "<%= inquisitorUrl %>/"
+            "cerebro://": "<%= cerebroUrl %>/"
           }
 
           Reveal.initialize({