backport of #3370 for 4.0.2

.travis.yml

@@ -9,8 +9,8 @@ script:
 - npm test
 notifications:
   email:
-  - rashid.khan@elasticsearch.com
-  - spencer.alger@elasticsearch.com
+  - rashid.khan@elastic.co
+  - spencer.alger@elastic.co
   hipchat:
     rooms:
       secure: UKrVR+5KztHarodQruQe97UJfwftutD6RNdXlVkr+oIr2GqccisDIIN9pAzS/kxl+eAnP1uT6VHzc9YI/jgbrmiSkz3DHViw+MwDwY2aIDgI8aHEbd/4B2ihtb15+OYTVbb+lytyz4+W8A8hSmbkTR/P/uFIJ+EYcBeYZfw1elo=

CONTRIBUTING.md

@@ -6,7 +6,7 @@ The process for contributing to any of the Elasticsearch repositories is similar
 
 ### Sign the contributor license agreement
 
-Please make sure you have signed the [Contributor License Agreement](http://www.elasticsearch.org/contributor-agreement/). We are not asking you to assign copyright to us, but to give us the right to distribute your code without restriction. We ask this of all contributors in order to assure our users of the origin and continuing existence of the code. You only need to sign the CLA once.
+Please make sure you have signed the [Contributor License Agreement](http://www.elastic.co/contributor-agreement/). We are not asking you to assign copyright to us, but to give us the right to distribute your code without restriction. We ask this of all contributors in order to assure our users of the origin and continuing existence of the code. You only need to sign the CLA once.
 
 #### Development Environment Setup
 

README.md

@@ -11,7 +11,7 @@ Kibana is an open source (Apache Licensed), browser based analytics and search d
 
 ## Installation
 
-* Download: [http://www.elasticsearch.org/overview/kibana/installation/](http://www.elasticsearch.org/overview/kibana/installation/)
+* Download: [http://www.elastic.co/downloads/kibana](http://www.elastic.co/downloads/kibana)
 * Run `bin/kibana` on unix, or `bin/kibana.bat` on Windows.
 * Visit [http://localhost:5601](http://localhost:5601)
 
@@ -31,4 +31,4 @@ Now that you've configured an index pattern, you're ready to hop over to the [Di
 
 ## Documentation
 
-Visit [Elasticsearch.org](http://www.elasticsearch.org/guide/en/kibana/current/index.html) for the full Kibana documentation.
+Visit [Elastic.co](http://www.elastic.co/guide/en/kibana/current/index.html) for the full Kibana documentation.

bower.json

@@ -11,7 +11,7 @@
     "elasticsearch"
   ],
   "license": "Apache 2.0",
-  "homepage": "http://www.elasticsearch.org/overview/kibana/",
+  "homepage": "http://www.elastic.co/products/kibana",
   "ignore": [
     "**/.*",
     "node_modules",

docs/discover.asciidoc

@@ -32,7 +32,7 @@ You can use the browser Back button to undo your changes.
 [[search]]
 === Searching Your Data
 You can search the indices that match the current index pattern by submitting a search from the Discover page.
-You can enter simple query strings, use the Lucene https://lucene.apache.org/core/2_9_4/queryparsersyntax.html[query syntax], or use the full JSON-based http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl.html[Elasticsearch Query DSL]. 
+You can enter simple query strings, use the Lucene https://lucene.apache.org/core/2_9_4/queryparsersyntax.html[query syntax], or use the full JSON-based http://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html[Elasticsearch Query DSL]. 
 
 When you submit a search, the histogram, Documents table, and Fields list are updated to reflect 
 the search results. The total number of hits (matching documents) is shown in the upper right corner of the
@@ -51,7 +51,7 @@ To search your data:
 * To specify more complex search criteria, you can use the Boolean operators `AND`, `OR`, and `NOT`. For example,
 to find entries that have 4xx status codes and have an extension of `php` or `html`, you could enter `status:[400 TO 499] AND (extension:php OR extension:html)`.
 +
-NOTE: These examples use the Lucene query syntax. You can also submit queries using the Elasticsearch Query DSL. For examples, see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-string-syntax[query string syntax] in the Elasticsearch Reference.
+NOTE: These examples use the Lucene query syntax. You can also submit queries using the Elasticsearch Query DSL. For examples, see http://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-string-syntax[query string syntax] in the Elasticsearch Reference.
 +
 . Press *Enter* or click the *Search* button to submit your search query.
 

docs/index.asciidoc

@@ -1,7 +1,7 @@
 [[kibana-guide]]
 = Kibana User Guide
 
-:ref: http://www.elasticsearch.org/guide/en/elasticsearch/reference/current
+:ref: http://www.elastic.co/guide/en/elasticsearch/reference/current
 
 include::introduction.asciidoc[]
 

docs/introduction.asciidoc

@@ -15,7 +15,7 @@ Elasticsearch indices in minutes--no code, no additional infrastructure required
 
 NOTE: This guide describes how to use Kibana 4. For information about what's new
 in Kibana 4, see <<whats-new>>. For information about Kibana 3, 
-see the http://www.elasticsearch.org/guide/en/kibana/current/index.html[Kibana 3 User Guide].
+see the http://www.elastic.co/guide/en/kibana/current/index.html[Kibana 3 User Guide].
 
 [float]
 [[data-discovery]]

docs/production.asciidoc

@@ -34,7 +34,7 @@ kibana_elasticsearch_password: kibana4
 ----
 
 For information about assigning the Kibana server the necessary permissions in Shield, 
-see https://www.elasticsearch.org/guide/en/shield/current/_shield_with_kibana_4.html[Shield with Kibana 4]
+see https://www.elastic.co/guide/en/shield/current/_shield_with_kibana_4.html[Shield with Kibana 4]
 in the Shield documentation.
 
 [float]
@@ -73,15 +73,15 @@ ca: /path/to/your/ca/cacert.pem
 [float]
 [[controlling-access]]
 === Controlling access
-You can use http://www.elasticsearch.org/overview/shield/[Elasticsearch Shield] 
+You can use http://www.elastic.co/overview/shield/[Elasticsearch Shield] 
 (Shield) to control what Elasticsearch data users can access through Kibana. 
 Shield provides index-level access control. If a user isn't authorized to run 
 the query that populates a Kibana visualization, the user just sees an empty 
 visualization. 
 
 To configure access to Kibana using Shield, you create Shield roles 
 for Kibana using the `kibana4` default role as a starting point. For more 
-information, see http://www.elasticsearch.org/guide/en/shield/current/_shield_with_kibana_4.html[Using Shield with Kibana 4].
+information, see http://www.elastic.co/guide/en/shield/current/_shield_with_kibana_4.html[Using Shield with Kibana 4].
 
 [float]
 [[load-balancing]]
@@ -90,7 +90,7 @@ If you have multiple nodes in your Elasticsearch cluster, the easiest way to dis
 across the nodes is to run an Elasticsearch _client_ node on the same machine as Kibana. 
 Elasticsearch client nodes are essentially smart load balancers that are part of the cluster. They
 process incoming HTTP requests, redirect operations to the other nodes in the cluster as needed, and 
-gather and return the results. For more information, see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/modules-node.html[Node] in the Elasticsearch reference.
+gather and return the results. For more information, see http://www.elastic.co/guide/en/elasticsearch/reference/current/modules-node.html[Node] in the Elasticsearch reference.
 
 To use a local client node to load balance Kibana requests:
 

docs/settings.asciidoc

@@ -172,7 +172,7 @@ buggy, you'll get exceptions whenever you try to view the dynamically generated
 data.
 
 Scripted fields use the Lucene expression syntax. For more information, 
-see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/modules-scripting.html#_lucene_expressions_scripts[Lucene Expressions Scripts].
+see http://www.elastic.co/guide/en/elasticsearch/reference/current/modules-scripting.html#_lucene_expressions_scripts[Lucene Expressions Scripts].
 
 You can reference any single value numeric field in your expressions, for example:
 
@@ -192,7 +192,7 @@ from your index data.
 . Click *Save Scripted Field*.
 
 For more information about scripted fields in Elasticsearch, see 
-http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/modules-scripting.html[Scripting].
+http://www.elastic.co/guide/en/elasticsearch/reference/current/modules-scripting.html[Scripting].
 
 [float]
 [[update-scripted-field]]

docs/setup.asciidoc

@@ -4,19 +4,19 @@ You can set up Kibana and start exploring your Elasticsearch indices in minutes.
 All you need is:
 
 * Elasticsearch 1.4.4 or later
-* A modern web browser - http://www.elasticsearch.com/support/matrix[Supported Browsers].
+* A modern web browser - http://www.elastic.co/support/matrix[Supported Browsers].
 * Information about your Elasticsearch installation: 
 ** URL of the Elasticsearch instance you want to connect to.
 ** Which Elasticsearch indices you want to search. 
 
-NOTE: If your Elasticsearch installation is protected by http://www.elasticsearch.org/overview/shield/[Shield] see  https://www.elasticsearch.org/guide/en/shield/current/_shield_with_kibana_4.html[Shield with Kibana 4] for additional setup instructions.
+NOTE: If your Elasticsearch installation is protected by http://www.elastic.co/overview/shield/[Shield] see  https://www.elastic.co/guide/en/shield/current/_shield_with_kibana_4.html[Shield with Kibana 4] for additional setup instructions.
 
 [float]
 [[install]]
 === Install and Start Kibana
 To get Kibana up and running:
 
-. Download the http://www.elasticsearch.org/overview/kibana/installation/[Kibana 4 binary package] for your platform.
+. Download the http://www.elastic.co/overview/kibana/installation/[Kibana 4 binary package] for your platform.
 . Extract the `.zip` or `tar.gz` archive file.
 . Run Kibana from the install directory: `bin/kibana` (Linux/MacOSX) or `bin\kibana.bat` (Windows).
 

package.json

@@ -13,17 +13,20 @@
   "private": false,
   "version": "4.0.2-snapshot",
   "main": "src/server/app.js",
-  "homepage": "http://www.elasticsearch.org/overview/kibana/",
+  "homepage": "https://www.elastic.co/products/kibana",
   "bugs": {
-    "url": "https://github.com/elasticsearch/kibana/issues"
+    "url": "http://github.com/elastic/kibana/issues"
   },
   "license": "Apache 2.0",
-  "author": "Rashid Khan <rashid.khan@elasticsearch.com>",
+  "author": "Rashid Khan <rashid.khan@elastic.co>",
   "contributors": [
-    "Spencer Alger <spencer.alger@elasticsearch.com>",
-    "Chris Cowan <chris.cowan@elasticsearch.com>",
-    "Joe Fleming <joe.fleming@elasticsearch.com>",
-    "Lukas Olson <lukas.olson@elasticsearch.com>"
+    "Spencer Alger <spencer.alger@elastic.co>",
+    "Chris Cowan <chris.cowan@elastic.co>",
+    "Joe Fleming <joe.fleming@elastic.co>",
+    "Lukas Olson <lukas.olson@elastic.co>",
+    "Juan Thomassie <juan.thomassie@elastic.co>",
+    "Shleby Sturgis <shelby@elastic.co>",
+    "Khalah Jones-Golden <khalah.jones@elastic.co>"
   ],
   "scripts": {
     "test": "grunt test",
@@ -33,7 +36,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/elasticsearch/kibana.git"
+    "url": "https://github.com/elastic/kibana.git"
   },
   "dependencies": {
     "ansicolors": "^0.3.2",

src/kibana/components/agg_types/controls/field.html

@@ -9,7 +9,7 @@
   </span>
   <div class="hintbox" ng-show="showAnalyzedFieldWarning">
     <p>
-    <strong>Careful!</strong> The field selected contains analyzed strings. Values such as <i>foo-bar</i> will be broken into <i>foo</i> and <i>bar</i>. See <a href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/mapping-core-types.html" target="_blank">Mapping Core Types</a> for more information on setting this field as <i>not_analyzed</i>
+    <strong>Careful!</strong> The field selected contains analyzed strings. Values such as <i>foo-bar</i> will be broken into <i>foo</i> and <i>bar</i>. See <a href="http://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-core-types.html" target="_blank">Mapping Core Types</a> for more information on setting this field as <i>not_analyzed</i>
     </p>
 
     <p ng-show="indexedFields.byName[agg.params.field.name + '.raw'].analyzed == false">
@@ -26,4 +26,4 @@
     ng-change="aggParam.onChange(agg)">
   </select>
 
-</div>
+</div>

src/kibana/components/index_patterns/_field_formats.js

@@ -2,17 +2,17 @@
 /* markdown
 
 ### Formatting a value
-To format a response value, you need to get ahold of the field list, which is usually available at `indexPattern.fields`. Each field object has a `format` property*, which is an object detailed in [_field_formats.js](https://github.com/elasticsearch/kibana4/blob/master/src/kibana/components/index_patterns/_field_formats.js).
+To format a response value, you need to get ahold of the field list, which is usually available at `indexPattern.fields`. Each field object has a `format` property*, which is an object detailed in [_field_formats.js](https://github.com/elastic/kibana4/blob/master/src/kibana/components/index_patterns/_field_formats.js).
 
 Once you have the field that a response value came from, pass the value to `field.format.convert(value)` and a formatted string representation of the field will be returned.
 
 \* the `format` property on field object's is a non-enumerable getter, meaning that if you itterate/clone/stringify the field object the format property will not be present.
 
 ### Changing a field's format
 
-Currently only one field format exists, `"string"`, which just [flattens any value down to a string](https://github.com/elasticsearch/kibana4/blob/master/src/kibana/components/index_patterns/_field_formats.js#L18-L24).
+Currently only one field format exists, `"string"`, which just [flattens any value down to a string](https://github.com/elastic/kibana4/blob/master/src/kibana/components/index_patterns/_field_formats.js#L18-L24).
 
-To change the format for a specific field you can either change the default for a field type modify the [default format mapping here](https://github.com/elasticsearch/kibana4/blob/master/src/kibana/components/index_patterns/_field_formats.js#L37-L46).
+To change the format for a specific field you can either change the default for a field type modify the [default format mapping here](https://github.com/elastic/kibana4/blob/master/src/kibana/components/index_patterns/_field_formats.js#L37-L46).
 
 To change the format for a specific indexPattern's field, add the field and format name to `indexPattern.customFormats` object property.
 
@@ -23,7 +23,7 @@ $scope.onChangeFormat = function (field, format) {
 ```
 
 ### Passing the formats to a chart
-Currently, the [histogram formatter](https://github.com/elasticsearch/kibana4/blob/master/src/plugins/visualize/saved_visualizations/resp_converters/histogram.js) passes the formatting function as the `xAxisFormatter` and `yAxisFormatter` function.
+Currently, the [histogram formatter](https://github.com/elastic/kibana4/blob/master/src/plugins/visualize/saved_visualizations/resp_converters/histogram.js) passes the formatting function as the `xAxisFormatter` and `yAxisFormatter` function.
 
 */
 /* jshint ignore:end */

src/kibana/directives/validate_index_name.js

@@ -1,4 +1,4 @@
-// See https://github.com/elasticsearch/elasticsearch/issues/6736
+// See https://github.com/elastic/elasticsearch/issues/6736
 define(function (require) {
   var _ = require('lodash');
 
@@ -38,4 +38,4 @@ define(function (require) {
         }
       };
     });
-});
+});

src/kibana/plugins/dashboard/directives/grid.js

@@ -209,7 +209,7 @@ define(function (require) {
           g.get_widgets_from_DOM();
           // We can't call this method if the gridmap is empty. This was found
           // when the user double clicked the "New Dashboard" icon. See
-          // https://github.com/elasticsearch/kibana4/issues/390
+          // https://github.com/elastic/kibana4/issues/390
           if (gridster.gridmap.length > 0) g.set_dom_grid_height();
           g.drag_api.set_limits(COLS * g.min_widget_width);
         };

src/kibana/plugins/settings/sections/indices/_edit.html

@@ -64,4 +64,4 @@ <h1 class="title" css-truncate>
 
     </div>
   </kbn-settings-indices>
-</kbn-settings-app>
+</kbn-settings-app>

src/kibana/plugins/settings/sections/indices/scripted_fields/index.html

@@ -7,7 +7,7 @@ <h1>{{ action }} Scripted Field</h1>
       <div>
 
         <p>
-          By default, Elasticsearch scripts use <a target="_window" href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/modules-scripting.html#_lucene_expressions_scripts">Lucene Expressions <i class="fa-link fa"></i></a>, which is a lot like JavaScript, but limited to basic arithmetic, bitwise and comparison operations. We'll let you do some reading on <a target="_window" href="http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/modules-scripting.html#_lucene_expressions_scripts">Lucene Expressions<i class="fa-link fa"></i></a> To access values in the document use the following format:
+          By default, Elasticsearch scripts use <a target="_window" href="http://www.elastic.co/guide/en/elasticsearch/reference/current/modules-scripting.html#_lucene_expressions_scripts">Lucene Expressions <i class="fa-link fa"></i></a>, which is a lot like JavaScript, but limited to basic arithmetic, bitwise and comparison operations. We'll let you do some reading on <a target="_window" href="http://www.elastic.co/guide/en/elasticsearch/reference/current/modules-scripting.html#_lucene_expressions_scripts">Lucene Expressions<i class="fa-link fa"></i></a> To access values in the document use the following format:
           <h4><code>doc['some_field'].value</code></h4>
         </p>
         <p>There are a few limitations when using Lucene Expressions:

src/kibana/plugins/vis_types/vislib/_build_chart_data.js

@@ -19,7 +19,7 @@ define(function (require) {
       var converted = convertTableGroup(vis, tableGroup);
       if (!converted) {
         // mimic a row of tables that doesn't have any tables
-        // https://github.com/elasticsearch/kibana/blob/7bfb68cd24ed42b1b257682f93c50cd8d73e2520/src/kibana/components/vislib/components/zero_injection/inject_zeros.js#L32
+        // https://github.com/elastic/kibana/blob/7bfb68cd24ed42b1b257682f93c50cd8d73e2520/src/kibana/components/vislib/components/zero_injection/inject_zeros.js#L32
         converted = { rows: [] };
       }
 
@@ -65,4 +65,4 @@ define(function (require) {
       return vis.type.responseConverter(vis, table);
     }
   };
-});
+});

tasks/config/s3.js

@@ -22,7 +22,7 @@ module.exports = function (grunt) {
 
   return {
     release: {
-      bucket: 'download.elasticsearch.org',
+      bucket: 'download.elastic.co',
       access: 'private',
       // debug: true, // uncommment to prevent actual upload
       upload: upload