Skip to content

Commit

Permalink
Merge branch 'master' into remove_legacy_index_pattern_index
Browse files Browse the repository at this point in the history
  • Loading branch information
elasticmachine authored Apr 1, 2020
2 parents 2693176 + 12a5889 commit 3286374
Show file tree
Hide file tree
Showing 843 changed files with 21,134 additions and 6,448 deletions.
2 changes: 1 addition & 1 deletion docs/canvas/canvas-elements.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ By default, most of the elements you create use demo data until you change the d

* *{es} SQL* — Access your data in {es} using SQL syntax. For information about SQL syntax, refer to {ref}/sql-spec.html[SQL language].

* *{es} raw data* — Access your raw data in {es} without the use of aggregations. Use {es} raw data when you have low volume datasets, or to plot exact, non-aggregated values.
* *{es} documents* &mdash; Access your data in {es} without using aggregations. To use, select an index and fields, and optionally enter a query using the <<lucene-query,Lucene Query Syntax>>. Use the *{es} documents* data source when you have low volume datasets, to view raw documents, or to plot exact, non-aggregated values on a chart.

* *Timelion* &mdash; Access your time series data using <<timelion,Timelion>> queries. To use Timelion queries, you can enter a query using the <<lucene-query,Lucene Query Syntax>>.

Expand Down
Binary file modified docs/logs/images/logs-console.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/logs/using.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Log entries for the specified time appear in the middle of the page. To quickly
[[logs-customize]]
=== Customize your view
Click *Customize* to customize the view.
Here, you can set the scale to use for the minimap timeline, choose whether to wrap long lines, and choose your preferred text size.
Here, you can choose whether to wrap long lines, and choose your preferred text size.

[float]
=== Configuring the data to use for your logs
Expand Down
4 changes: 1 addition & 3 deletions examples/alerting_example/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "./target",
"skipLibCheck": true,
"resolveJsonModule": true
"outDir": "./target"
},
"include": [
"index.ts",
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
"@babel/register": "^7.9.0",
"@elastic/apm-rum": "^4.6.0",
"@elastic/charts": "^18.1.1",
"@elastic/datemath": "5.0.2",
"@elastic/datemath": "5.0.3",
"@elastic/ems-client": "7.7.1",
"@elastic/eui": "21.0.1",
"@elastic/filesaver": "1.1.2",
Expand Down Expand Up @@ -395,7 +395,7 @@
"babel-eslint": "^10.0.3",
"babel-jest": "^24.9.0",
"babel-plugin-istanbul": "^5.2.0",
"backport": "4.9.0",
"backport": "5.1.2",
"chai": "3.5.0",
"chance": "1.0.18",
"cheerio": "0.22.0",
Expand Down
2 changes: 2 additions & 0 deletions packages/elastic-datemath/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
/test
/tsconfig.json
/.babelrc
/yarn.lock
/__tests__
5 changes: 5 additions & 0 deletions packages/elastic-datemath/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# datemath

Datemath string parser used in Kibana. This is published to NPM for use in a limited number of locations outside of Kibana, but is not regularly updated and may get seriously out of date.

If you file an issue in elastic/kibana we can probably update it for you if needed, though you probably shouldn't depend on this package for anything important.
2 changes: 1 addition & 1 deletion packages/elastic-datemath/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@elastic/datemath",
"version": "5.0.2",
"version": "5.0.3",
"description": "elasticsearch datemath parser, used in kibana",
"license": "Apache-2.0",
"main": "target/index.js",
Expand Down
3 changes: 0 additions & 3 deletions packages/elastic-datemath/readme.md

This file was deleted.

3 changes: 3 additions & 0 deletions packages/kbn-optimizer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,12 @@
"@kbn/babel-preset": "1.0.0",
"@kbn/dev-utils": "1.0.0",
"@kbn/ui-shared-deps": "1.0.0",
"@types/estree": "^0.0.44",
"@types/loader-utils": "^1.1.3",
"@types/watchpack": "^1.1.5",
"@types/webpack": "^4.41.3",
"acorn": "^7.1.1",
"acorn-walk": "^7.1.1",
"autoprefixer": "^9.7.4",
"babel-loader": "^8.0.6",
"clean-webpack-plugin": "^3.0.0",
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 3286374

Please sign in to comment.