Merge pull request #36 from FlorianLautenschlager/master

Changes for v0.5-beta

Author: Florian Lautenschlager

_includes/quickstart.html

@@ -36,9 +36,9 @@ <h4>Download and Run</h4>
                 <div class="console">
                     <span class="type-text teletype-prefix">chronix@chronixDB:~$ </span><span class="teletype-text">mkdir chronixShowcase</span><br>
                     <span class="type-text teletype-prefix">chronix@chronixDB:~$ </span><span class="teletype-text">cd chronixShowcase</span><br>
-                    <span class="type-text teletype-prefix">chronix@chronixDB:~$ </span><span class="teletype-text">wget https://github.com/ChronixDB/chronix.server/releases/download/v0.4/chronix-0.4.zip</span><br>
-                    <span class="type-text teletype-prefix">chronix@chronixDB:~$ </span><span class="teletype-text">unzip chronix-0.4.zip</span><br>
-                    <span class="type-text teletype-prefix">chronix@chronixDB:~$ </span><span class="teletype-text">cd chronix-solr-6.3.0/</span><br>
+                    <span class="type-text teletype-prefix">chronix@chronixDB:~$ </span><span class="teletype-text">wget https://github.com/ChronixDB/chronix.server/releases/download/v0.5-beta/chronix-0.5-beta.zip</span><br>
+                    <span class="type-text teletype-prefix">chronix@chronixDB:~$ </span><span class="teletype-text">unzip chronix-0.5-beta.zip</span><br>
+                    <span class="type-text teletype-prefix">chronix@chronixDB:~$ </span><span class="teletype-text">cd chronix-solr-6.4.2/</span><br>
                     <span class="type-text teletype-prefix">chronix@chronixDB:~$ </span><span class="teletype-text">chmod +x bin/solr</span><br>
                     <span class="type-text teletype-prefix">chronix@chronixDB:~$ </span><span class="teletype-text">export JAVA_HOME=/usr/lib/jvm/java-8-oracle/</span><br>
                     <span class="type-text teletype-prefix">chronix@chronixDB:~$ </span><span class="teletype-text">./bin/solr start</span><br>
@@ -56,8 +56,8 @@ <h4>Download and Run</h4>
 
                 <div class="console">
                     <span class="type-text teletype-prefix">chronix@chronixDB:~$ </span><span class="teletype-text">cd chronixShowcase</span><br>
-                    <span class="type-text teletype-prefix">chronix@chronixDB:~$ </span><span class="teletype-text">wget https://github.com/ChronixDB/chronix.examples/releases/download/0.3/chronix-timeseries-exploration-0.3.jar</span><br>
-                    <span class="type-text teletype-prefix">chronix@chronixDB:~$ </span><span class="teletype-text">java -jar chronix-timeseries-exploration-0.3.jar</span><br>
+                    <span class="type-text teletype-prefix">chronix@chronixDB:~$ </span><span class="teletype-text">wget https://github.com/ChronixDB/chronix.examples/releases/download/v0.5-beta/chronix-timeseries-exploration-0.5-beta.jar</span><br>
+                    <span class="type-text teletype-prefix">chronix@chronixDB:~$ </span><span class="teletype-text">java -jar chronix-timeseries-exploration-0.5-beta.jar</span><br>
                     <span class="teletype-text">Setting up Chronix with a remote solr to URL http://localhost:8983/solr/chronix/</span><br>
                     <span class="teletype-text">Checking connection to solr. Result true.</span><br>
                     <span class="type-text teletype-prefix">chronix@chronixDB:~$ </span> <span class="teletype-cursor"
@@ -66,18 +66,18 @@ <h4>Download and Run</h4>
 
                 <p>
                     With the running JavaFX application, you can query Chronix for time series data.
-                    For example, a simple query that delivers all time series data whose metric name contains
+                    For example, a simple query that delivers all time series data whose name contains
                     <span style="font-family: Courier">Load</span> is
-                    <span style="font-family: Courier">metric:*Load*</span>.
+                    <span style="font-family: Courier">name:*Load*</span>.
                     Just enter the query term into the text box at the top and hit Shift + Enter to retrieve the result.
                     To compute the maximum, minimum, average of that result you add a filter query
-                    <span style="font-family: Courier">function= max;min;avg</span> in the second text box and press
+                    <span style="font-family: Courier">metric{max;min;avg}</span> in the second text box and press
                     again Shift +
                     Enter.
                     To check if the average load
-                    (<span style="font-family: Courier">metric:*Load*avg</span>)
+                    (<span style="font-family: Courier">name:*Load*avg</span>)
                     has a positive trend you can use
-                    <span style="font-family: Courier">function=trend</span> in the filter query text box.
+                    <span style="font-family: Courier">metric{trend}</span> in the filter query text box.
                     You start the analysis by pressing Shift + Enter.
                     The queries described and shown in the screencast represent only a few simple queries, check out
                     our <a