Merge pull request #463 from rashidkpc/fix/target-directory-versioning

Fix/target directory versioning

README.md

@@ -55,7 +55,7 @@ By default Kibana shows the last 15 minutes of data. You might want to expand th
 
 ### Document list
 
-Once you see some documents, you can begin to explore Discover. In the document list, Kibana will show you the localized version of the time field you specified in your index pattern, as well as the `_source` of the elasticsearch document.
+Once you see some documents, you can begin to explore Discover. In the document list, Kibana will show you the localized version of the time field you specified in your index pattern, as well as the `_source` of the Elasticsearch document.
 
 **Tip:** By default the table contains 500 of the most recent documents. You can increase the number of documents in the table from the advanced settings screen. See the [Setting section](#advanced) of the documentation.
 
@@ -314,4 +314,4 @@ Clicking on the *View* action loads that item in the associated applications. Re
 Clicking *Edit* will allow you to change the title, description and other settings of the saved object. You can also edit the schema of the stored object.
 
 *Note:* this operation is for advanced users only - making changes here can break large portions of the application.
-<!-- /include -->
+<!-- /include -->

docs/discover.md

@@ -17,7 +17,7 @@ By default Kibana shows the last 15 minutes of data. You might want to expand th
 
 ### Document list
 
-Once you see some documents, you can begin to explore Discover. In the document list, Kibana will show you the localized version of the time field you specified in your index pattern, as well as the `_source` of the elasticsearch document.
+Once you see some documents, you can begin to explore Discover. In the document list, Kibana will show you the localized version of the time field you specified in your index pattern, as well as the `_source` of the Elasticsearch document.
 
 **Tip:** By default the table contains 500 of the most recent documents. You can increase the number of documents in the table from the advanced settings screen. See the [Setting section](#advanced) of the documentation.
 
@@ -90,4 +90,4 @@ Or HTML
 status:[400 TO 499] AND (extension:php OR extension:html)
 ```
 
-While lucene query syntax is simple and very powerful, Kibana also supports the full elasticsearch, JSON based, query DSL. See the [Elasticsearch documentation](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-string-syntax) for usage and examples.
+While Lucene query syntax is simple and very powerful, Kibana also supports the full Elasticsearch, JSON based, Query DSL. See the [Elasticsearch documentation](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-string-syntax) for usage and examples.

docs/quick_start.md

@@ -2,7 +2,7 @@
 
 You're up and running! Fantastic! Kibana is now running on port 5601, so point your browser at http://YOURDOMAIN.com:5601.
 
-The first screen you arrive at will ask you to configure an **index pattern**. An index pattern describes to kibana how to access your data. We make the guess that you're working with log data, and we hope (because it's awesome) that you're working with Logstash. By default, we fill in `logstash-*` as your index pattern, thus the only thing you need to do is select which field contains the timestamp you'd like to use. Kibana reads your Elasticsearch mapping to find your time fields - select one from the list and hit *Create*.
+The first screen you arrive at will ask you to configure an **index pattern**. An index pattern describes to Kibana how to access your data. We make the guess that you're working with log data, and we hope (because it's awesome) that you're working with Logstash. By default, we fill in `logstash-*` as your index pattern, thus the only thing you need to do is select which field contains the timestamp you'd like to use. Kibana reads your Elasticsearch mapping to find your time fields - select one from the list and hit *Create*.
 
 **Tip:** there's an optimization in the way of the *Use event times to create index names* option. Since Logstash creates an index every day, Kibana uses that fact to only search indices that could possibly contain data in your selected time range.
 

docs/visualize.md

@@ -30,7 +30,7 @@ To the right of the search box there are a row of icons for creating new visuali
 
 #### Aggregation Builder
 
-The aggregation builder on the left of the screen is used for configuring the [metric](http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/search-aggregations.html#_metrics_aggregations) and [bucket](http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/search-aggregations.html#_bucket_aggregations) aggregations used to create a visualization. (If you are coming from the SQL world, buckets are similar to group-bys. Check out the [elasticsearch docs](http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/search-aggregations.html) for more info) For a bar chart or line chart the *metric* is used for the y-axis and the *buckets* are used for the x-axis, segment bar colors, and row/column splits. For pie charts the "metric" is used for the size of the slice and the *bucket* is used for the number of slices. Other visualizations may use these in new and different ways.
+The aggregation builder on the left of the screen is used for configuring the [metric](http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/search-aggregations.html#_metrics_aggregations) and [bucket](http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/search-aggregations.html#_bucket_aggregations) aggregations used to create a visualization. (If you are coming from the SQL world, buckets are similar to group-bys. Check out the [Elasticsearch docs](http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/search-aggregations.html) for more info) For a bar chart or line chart the *metric* is used for the y-axis and the *buckets* are used for the x-axis, segment bar colors, and row/column splits. For pie charts the "metric" is used for the size of the slice and the *bucket* is used for the number of slices. Other visualizations may use these in new and different ways.
 
 For the remainder of this documentation we are going to use the bar chart as our example when discussing the features of the aggregation panel. The same concepts apply to the other visualizations but the bar chart is the workhorse of the visualization world.
 

tasks/build.js

@@ -16,6 +16,7 @@ module.exports = function (grunt) {
     'copy:dist',
     'compile_dist_readme',
     'chmod_kibana',
+    'copy:versioned_dist',
     'create_packages'
   ]);
 };

tasks/config/copy.js

@@ -1,4 +1,5 @@
 module.exports = function (grunt) {
+  var version = grunt.config.get('pkg.version');
   var config = {
 
     kibana_src: {
@@ -59,6 +60,18 @@ module.exports = function (grunt) {
           dest: '<%= build %>/dist/kibana/config/'
         }
       ]
+    },
+
+    versioned_dist: {
+      options: { mode: true },
+      files: [
+        {
+          expand: true,
+          cwd: '<%= build %>/dist/kibana',
+          src: '**',
+          dest: '<%= build %>/dist/kibana-' + version
+        }
+      ]
     }
 
   };

tasks/create_packages.js

@@ -13,8 +13,8 @@ module.exports = function (grunt) {
     var archiveName = join(target, packageName + '-' + version);
     var distPath = join(grunt.config.get('build'), 'dist');
 
-    var tgzCmd = 'tar -zcvf ' + archiveName + '.tar.gz kibana';
-    var zipCmd = 'zip -r ' + archiveName + '.zip kibana';
+    var tgzCmd = 'tar -zcvf ' + archiveName + '.tar.gz kibana-' + version;
+    var zipCmd = 'zip -r ' + archiveName + '.zip kibana-' + version;
 
     var options = { cwd: distPath };