Code coverage

.gitignore

@@ -3,9 +3,13 @@
 .node_binaries
 node_modules
 trash
+<<<<<<< HEAD
+build
+=======
 bundles
 target
 /build
+>>>>>>> c7e08ea770e835975ecda41c96016daf798c7f6e
 .jruby
 .idea
 *.iml

.node-version

@@ -1 +1,5 @@
+<<<<<<< HEAD
+4.4.7
+=======
 4.3.0
+>>>>>>> c7e08ea770e835975ecda41c96016daf798c7f6e

Gruntfile.js

@@ -15,6 +15,15 @@ module.exports = function (grunt) {
     testUtilsDir: __dirname + '/src/testUtils',
     configFile: __dirname + '/src/config/kibana.yml',
 
+<<<<<<< HEAD
+    nodeVersion: '4.4.7',
+    platforms: ['linux-x64'],
+
+
+    unitTestDir: __dirname + '/test/unit',
+    testUtilsDir: __dirname + '/test/utils',
+    bowerComponentsDir: __dirname + '/src/kibana/bower_components',
+=======
     karmaBrowser: (function () {
       if (grunt.option('browser')) {
         return grunt.option('browser');
@@ -29,6 +38,7 @@ module.exports = function (grunt) {
           return 'Firefox';
       }
     }()),
+>>>>>>> c7e08ea770e835975ecda41c96016daf798c7f6e
 
     nodeVersion: grunt.file.read('.node-version').trim(),
 

README.md

@@ -1,4 +1,10 @@
+<<<<<<< HEAD
+# Kibana 4.1.10
+
+[![Build Status](https://travis-ci.org/elastic/kibana.svg?branch=master)](https://travis-ci.org/elastic/kibana?branch=master)
+=======
 # Kibana 5.0.0-snapshot
+>>>>>>> c7e08ea770e835975ecda41c96016daf798c7f6e
 
 Kibana is an open source ([Apache Licensed](https://github.com/elastic/kibana/blob/master/LICENSE.md)), browser based analytics and search dashboard for Elasticsearch. Kibana is a snap to setup and start using. Kibana strives to be easy to get started with, while also being flexible and powerful, just like Elasticsearch.
 
@@ -43,7 +49,14 @@ For the daring, snapshot builds are available. These builds are created after ea
 
 | platform |  |  |
 | --- | --- | --- |
+<<<<<<< HEAD
+| OSX | [tar](http://download.elastic.co/kibana/kibana/kibana-4.1.4-snapshot-darwin-x64.tar.gz) | [zip](http://download.elastic.co/kibana/kibana/kibana-4.1.4-snapshot-darwin-x64.zip) |
+| Linux x64 | [tar](http://download.elastic.co/kibana/kibana/kibana-4.1.4-snapshot-linux-x64.tar.gz) | [zip](http://download.elastic.co/kibana/kibana/kibana-4.1.4-snapshot-linux-x64.zip) |
+| Linux x86 | [tar](http://download.elastic.co/kibana/kibana/kibana-4.1.4-snapshot-linux-x86.tar.gz) | [zip](http://download.elastic.co/kibana/kibana/kibana-4.1.4-snapshot-linux-x86.zip) |
+| Windows | [tar](http://download.elastic.co/kibana/kibana/kibana-4.1.4-snapshot-windows.tar.gz) | [zip](http://download.elastic.co/kibana/kibana/kibana-4.1.4-snapshot-windows.zip) |
+=======
 | OSX | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-snapshot-darwin-x64.tar.gz) | [zip](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-snapshot-darwin-x64.zip) |
 | Linux x64 | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-snapshot-linux-x64.tar.gz) | [zip](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-snapshot-linux-x64.zip) |
 | Linux x86 | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-snapshot-linux-x86.tar.gz) | [zip](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-snapshot-linux-x86.zip) |
 | Windows | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-snapshot-windows.tar.gz) | [zip](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-snapshot-windows.zip) |
+>>>>>>> c7e08ea770e835975ecda41c96016daf798c7f6e

bower.json

@@ -0,0 +1,59 @@
+{
+  "name": "kibana",
+  "version": "0.0.0",
+  "authors": [
+    "Spencer Alger <[email protected]>"
+  ],
+  "description": "Browser based analytics and search interface to Logstash and other timestamped data sets stored in ElasticSearch",
+  "main": "src/index.html",
+  "keywords": [
+    "kibana",
+    "elasticsearch"
+  ],
+  "license": "Apache 2.0",
+  "homepage": "http://www.elastic.co/products/kibana",
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ],
+  "dependencies": {
+    "angular": "1.2.28",
+    "angular-bindonce": "0.3.3",
+    "angular-bootstrap": "0.10.0",
+    "angular-elastic": "2.4.2",
+    "angular-mocks": "1.2.28",
+    "angular-route": "1.2.28",
+    "angular-ui-ace": "0.2.3",
+    "bluebird": "~2.1.3",
+    "bootstrap": "3.3.4",
+    "d3": "3.4.13",
+    "elasticsearch": "4.1.0",
+    "Faker": "1.1.0",
+    "FileSaver": "babc6d9d8f",
+    "font-awesome": "4.2.0",
+    "gridster": "0.5.6",
+    "jquery": "2.1.4",
+    "leaflet": "0.7.3",
+    "Leaflet.heat": "Leaflet/Leaflet.heat#627ede7c11bbe43",
+    "lesshat": "3.0.2",
+    "lodash": "2.4.2",
+    "moment": "2.9.0",
+    "moment-timezone": "0.0.6",
+    "ng-clip": "0.2.6",
+    "require-css": "0.1.8",
+    "requirejs": "2.1.18",
+    "requirejs-text": "2.0.14",
+    "lodash-deep": "spenceralger/lodash-deep#1a7eca8344",
+    "marked": "0.3.3",
+    "numeral": "1.5.3",
+    "leaflet-draw": "0.2.4",
+    "semver": "~4.3.4"
+  },
+  "devDependencies": {},
+  "resolutions": {
+    "angular": "1.2.28"
+  }
+}

docs/filter-pinning.asciidoc

@@ -15,8 +15,8 @@ inclusion filters and red for exclusion filters.
 Pin Filter image:images/filter-pin.png[]:: Click this icon to _pin_ a filter. Pinned filters persist across Kibana tabs.
 You can pin filters from the _Visualize_ tab, click on the _Discover_ or _Dashboard_ tabs, and those filters remain in 
 place.
-NOTE: If you have a pinned filter and you're not seeing any query results, that your current tab's index pattern is one 
-that the filter applies to. 
+NOTE: If you have a pinned filter and you're not seeing any query results, check that your current tab's index pattern is 
+one that the filter applies to. 
 Toggle Filter image:images/filter-toggle.png[]:: Click this icon to _toggle_ a filter. By default, filters are inclusion 
 filters, and display in green. Only elements that match the filter are displayed. To change this to an exclusion 
 filters, displaying only elements that _don't_ match, toggle the filter. Exclusion filters display in red.

docs/getting-started.asciidoc

@@ -167,16 +167,53 @@ curl -XPUT http://localhost:9200/logstash-2015.05.20 -d '
 }
 ';
 
+<<<<<<< HEAD
+The logs data set requires a mapping to label the latitude/longitude pairs in the logs as geographic locations by 
+applying the `geo_point` type to those fields.
+
+Use the following command to establish `geo_point` mapping for the logs:
+
+[source,shell]
+curl -XPUT http://localhost:9200/logstash-2015.05.18 -d '
+{
+ "mappings" : {
+  "log" : {
+   "properties" : {
+    "geo" : {
+     "properties" : {
+      "coordinates" : {
+       "type" : "geo_point"
+      }
+     }
+    }
+   }
+  }
+ }
+}
+';
+
+Because the logs data set is in three indices, one for each day in a three-day period, run the mapping again two more 
+times, changing the name of the index to logstash-2015.05.19 and logstash-2015.05.20.
+
+=======
+>>>>>>> c7e08ea770e835975ecda41c96016daf798c7f6e
 The accounts data set doesn't require any mappings, so at this point we're ready to use the Elasticsearch 
 {ref}/docs-bulk.html[`bulk`] API to load the data sets with the following commands:
 
 [source,shell]
+<<<<<<< HEAD
+curl -XPOST 'localhost:9200/accounts/account/_bulk?pretty' --data-binary @accounts.json
+=======
 curl -XPOST 'localhost:9200/bank/account/_bulk?pretty' --data-binary @accounts.json
+>>>>>>> c7e08ea770e835975ecda41c96016daf798c7f6e
 curl -XPOST 'localhost:9200/shakespeare/_bulk?pretty' --data-binary @shakespeare.json
 curl -XPOST 'localhost:9200/_bulk?pretty' --data-binary @logs.jsonl
 
 These commands may take some time to execute, depending on the computing resources available.
 
+NOTE: These commands assume your Elasticsearch cluster is not using the {shield}[Shield] security plugin. If your
+Elasticsearch cluster has Shield configured, provide suitable credentials with the `-k` and `-u` options.
+
 Verify successful loading with the following command:
 
 [source,shell]
@@ -186,7 +223,7 @@ You should see output similar to the following:
 
 [source,shell]
 health status index               pri rep docs.count docs.deleted store.size pri.store.size
-yellow open   bank                  5   1       1000            0    418.2kb        418.2kb
+yellow open   accounts              5   1       1000            0    418.2kb        418.2kb
 yellow open   shakespeare           5   1     111396            0     17.6mb         17.6mb
 yellow open   logstash-2015.05.18   5   1       4631            0     15.6mb         15.6mb
 yellow open   logstash-2015.05.19   5   1       4624            0     15.7mb         15.7mb
@@ -195,14 +232,28 @@ yellow open   logstash-2015.05.20   5   1       4750            0     16.4mb
 [[tutorial-define-index]]
 === Defining Your Index Patterns
 
+<<<<<<< HEAD
+Each set of data loaded to Elasticsearch has an 
+https://www.elastic.co/guide/en/kibana/current/settings.html#settings-create-pattern[index pattern]. 
+In the previous section, the Shakespeare data set has an index named `shakespeare`, and the accounts 
+data set has an index named `accounts`. An _index pattern_ is a string with optional wildcards that can match multiple 
+indices. For example, the list of indices for this tutorial includes three different indices for Logstash data. You can
+search all three indices with the index pattern `logstash-2015.05.*`
+=======
 Each set of data loaded to Elasticsearch has an <<settings-create-pattern,index pattern>>. In the previous section, the 
 Shakespeare data set has an index named `shakespeare`, and the accounts 
 data set has an index named `bank`. An _index pattern_ is a string with optional wildcards that can match multiple 
 indices. For example, in the common logging use case, a typical index name contains the date in MM-DD-YYYY 
 format, and an index pattern for May would look something like `logstash-2015.05*`.
+>>>>>>> c7e08ea770e835975ecda41c96016daf798c7f6e
 
 For this tutorial, any pattern that matches the name of an index we've loaded will work. Open a browser and 
 navigate to `localhost:5601`. Click the *Settings* tab, then the *Indices* tab. Click *Add New* to define a new index 
+<<<<<<< HEAD
+pattern. Since these data sets don't contain time-series data, make sure the *Index contains time-based events* box is 
+unchecked. Specify `shakespeare`  as the index pattern for the Shakespeare data set and click *Create* to define the index 
+pattern, then define a second index pattern named `accounts`.
+=======
 pattern. Two of the sample data sets, the Shakespeare plays and the financial accounts, don't contain time-series data.
 Make sure the *Index contains time-based events* box is unchecked when you create index patterns for these data sets.
 Specify `shakes*`  as the index pattern for the Shakespeare data set and click *Create* to define the index pattern, then 
@@ -214,6 +265,7 @@ set, make sure the *Index contains time-based events* box is checked and select
 
 NOTE: When you define an index pattern, indices that match that pattern must exist in Elasticsearch. Those indices must 
 contain data.
+>>>>>>> c7e08ea770e835975ecda41c96016daf798c7f6e
 
 [float]
 [[tutorial-discovering]]
@@ -234,7 +286,7 @@ You can construct searches by using the field names and the values you're intere
 use comparison operators such as greater than (>), less than (<), or equals (=). You can link elements with the
 logical operators AND, OR, and NOT, all in uppercase.
 
-Try selecting the `ba*` index pattern and putting the following search into the search box:
+Try selecting the `accounts` index pattern and putting the following search into the search box:
 
 [source,text]
 account_number:<100 AND balance:>47500
@@ -261,7 +313,7 @@ Click on the *Visualize* tab to start:
 
 image::images/tutorial-visualize.png[]
 
-Click on *Pie chart*, then *From a new search*. Select the `ba*` index pattern. 
+Click on *Pie chart*, then *From a new search*. Select the `accounts` index pattern. 
 
 Visualizations depend on Elasticsearch {ref}/search-aggregations.html[aggregations] in two different types: _bucket_ 
 aggregations and _metric_ aggregations. A bucket aggregation sorts your data according to criteria you specify. For 
@@ -303,7 +355,7 @@ Save this chart by clicking the *Save Visualization* button to the right of the
 _Pie Example_.
 
 Next, we're going to make a bar chart. Click on *New Visualization*, then *Vertical bar chart*. Select *From a new 
-search* and the `shakes*` index pattern. You'll see a single big bar, since we haven't defined any buckets yet:
+search* and the `shakespeare` index pattern. You'll see a single big bar, since we haven't defined any buckets yet:
 
 image::images/tutorial-visualize-bar-1.png[]
 

docs/index.asciidoc

@@ -1,9 +1,14 @@
 [[kibana-guide]]
 = Kibana User Guide
 
+<<<<<<< HEAD
+:ref: http://www.elastic.co/guide/en/elasticsearch/reference/1.7/
+:shield: https://www.elastic.co/guide/en/shield/shield-1.3
+=======
 :ref: http://www.elastic.co/guide/en/elasticsearch/reference/current/
 :shield: https://www.elastic.co/guide/en/shield/current
 :k4issue: https://github.com/elastic/kibana/issues/
+>>>>>>> c7e08ea770e835975ecda41c96016daf798c7f6e
 :k4pull: https://github.com/elastic/kibana/pull/
 
 include::introduction.asciidoc[]

docs/production.asciidoc

@@ -5,7 +5,11 @@
 * <<controlling-access, Controlling Access>>
 * <<load-balancing, Load Balancing Across Multiple Elasticsearch Nodes>>
 
+<<<<<<< HEAD
+How you deploy Kibana largely depends on your use case. When you are the only user,
+=======
 How you deploy Kibana largely depends on your use case. If you are the only user,
+>>>>>>> c7e08ea770e835975ecda41c96016daf798c7f6e
 you can run Kibana on your local machine and configure it to point to whatever
 Elasticsearch instance you want to interact with. Conversely, if you have a large
 number of heavy Kibana users, you might need to load balance across multiple
@@ -42,7 +46,11 @@ kibana_elasticsearch_password: kibana4-password
 ----
 
 Kibana 4 users also need access to the `.kibana` index so they can save and load searches, visualizations, and dashboards.
+<<<<<<< HEAD
+For more information, see {shield}/kibana.html#kibana4-server-role[Configuring Roles for Kibana 4 Users] in
+=======
 For more information, see {shield}/kibana.html[Using Kibana with Shield] in
+>>>>>>> c7e08ea770e835975ecda41c96016daf798c7f6e
 the Shield documentation.
 
 TIP: See <<kibana-dynamic-mapping, Kibana and Elasticsearch Dynamic Mapping>> for important information on Kibana and
@@ -54,7 +62,11 @@ the dynamic mapping feature in Elasticsearch.
 Kibana supports SSL encryption for both client requests and the requests the Kibana server
 sends to Elasticsearch.
 
+<<<<<<< HEAD
+To encrypt communications between the browser and the Kibana server, you configure the `ssl_key_file `and
+=======
 To encrypt communications between the browser and the Kibana server, you configure the `ssl_key_file` and
+>>>>>>> c7e08ea770e835975ecda41c96016daf798c7f6e
 `ssl_cert_file` properties in `kibana.yml`:
 
 [source,text]
@@ -97,7 +109,11 @@ 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
+<<<<<<< HEAD
+information, see {shield}/kibana.html#using-kibana4-with-shield[Shield with Kibana 4][Using Shield with Kibana 4].
+=======
 information, see {shield}/kibana.html#using-kibana4-with-shield[Using Kibana 4 with Shield].
+>>>>>>> c7e08ea770e835975ecda41c96016daf798c7f6e
 
 [float]
 [[load-balancing]]

docs/settings.asciidoc

@@ -183,14 +183,21 @@ include::string-formatter.asciidoc[]
 
 ==== Numeric Field Formatters
 
+<<<<<<< HEAD
+Numeric fields support the `Url`, `String`, `Bytes`, `Number`, and `Percentage` formatters.
+=======
 Numeric fields support the `Url`, `String`, `Bytes`, `Number`, `Percentage`, and `Color` formatters.
+>>>>>>> c7e08ea770e835975ecda41c96016daf798c7f6e
 
 include::string-formatter.asciidoc[]
 
 include::url-formatter.asciidoc[]
 
+<<<<<<< HEAD
+=======
 include::color-formatter.asciidoc[]
 
+>>>>>>> c7e08ea770e835975ecda41c96016daf798c7f6e
 The `Bytes`, `Number`, and `Percentage` formatters enable you to choose the display formats of numbers in this field using 
 the https://adamwdraper.github.io/Numeral-js/[numeral.js] standard format definitions.
 

docs/setup.asciidoc

@@ -33,7 +33,11 @@ That's it! Kibana is now running on port 5601.
 [float]
 [[kibana-dynamic-mapping]]
 ==== Kibana and Elasticsearch Dynamic Mapping
+<<<<<<< HEAD
+By default, Elasticsearch enables {ref}mapping-dynamic-mapping.html[dynamic mapping] for fields. Kibana needs dynamic mapping
+=======
 By default, Elasticsearch enables {ref}dynamic-mapping.html[dynamic mapping] for fields. Kibana needs dynamic mapping
+>>>>>>> c7e08ea770e835975ecda41c96016daf798c7f6e
 to use fields in visualizations correctly, as well as to manage the `.kibana` index where saved searches,
 visualizations, and dashboards are stored.
 
@@ -76,16 +80,27 @@ image:images/Start-Page.png[Kibana start page]
 . Specify an index pattern that matches the name of one or more of your Elasticsearch indices. By default, Kibana
 guesses that you're working with data being fed into Elasticsearch by Logstash. If that's the case, you can use the
 default `logstash-*` as your index pattern. The asterisk (*) matches zero or more characters in an index's name. If
+<<<<<<< HEAD
+your Elasticsearch indices follow some other naming convention, enter an appropriate pattern.  The "pattern" can also
+=======
 your Elasticsearch indices follow some other naming convention, enter an appropriate pattern. The "pattern" can also
+>>>>>>> c7e08ea770e835975ecda41c96016daf798c7f6e
 simply be the name of a single index.
 . Select the index field that contains the timestamp that you want to use to perform time-based comparisons. Kibana
 reads the index mapping to list all of the fields that contain a timestamp. If your index doesn't have time-based data,
 disable the *Index contains time-based events* option.
+<<<<<<< HEAD
+. If new indices are generated periodically and have a timestamp appended to the name, select the *Use event times to
+create index names* option and select the *Index pattern interval*. This improves search performance by enabling Kibana
+to search only those indices that could contain data in the time range you specify. This is primarily applicable if you
+are using Logstash to feed data into Elasticsearch.
+=======
 +
 WARNING: Using event times to create index names is *deprecated* in this release of Kibana. Support for this functionality
 will be removed entirely in the next major Kibana release. Elasticsearch 2.1 includes sophisticated date parsing APIs that
 Kibana uses to determine date information, removing the need to specify dates in the index pattern name.
 +
+>>>>>>> c7e08ea770e835975ecda41c96016daf798c7f6e
 . Click *Create* to add the index pattern. This first pattern is automatically configured as the default.
 When you have more than one index pattern, you can designate which one to use as the default from *Settings > Indices*.