Skip to content

Commit

Permalink
Merge branch 'master' of github.com:elastic/kibana into refactor/save…
Browse files Browse the repository at this point in the history
…d_objects
  • Loading branch information
streamich committed Aug 27, 2019
2 parents 5a62319 + 77e95ea commit 55129d1
Show file tree
Hide file tree
Showing 428 changed files with 23,189 additions and 7,544 deletions.
25 changes: 25 additions & 0 deletions docs/uptime-guide/deployment-arch.asciidoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
[role="xpack"]
[[uptime-deployment-arch]]
== Deployment Architecture

There are multiple ways to deploy Uptime and Heartbeat.
Use the information in this section to determine the best deployment for you.
A guiding principle is that an outage that takes down the service being monitored should not also take down Heartbeat.
You want Heartbeat to be functioning even when your service is not, so the guidelines here help you maximise this possibility.

Heartbeat is generally run as a centralized service within a data center.
While it is possible to run it as a separate "sidecar" process paired with each process/container, we recommend against it.
Running Heartbeat centrally ensures you will still be able to see monitoring data in the event of an overloaded, disconnected, or otherwise malfunctioning server.

For further redundancy, you may want to deploy multiple Heartbeats across geographic and/or network boundaries to provide more data.
Specify Heartbeat's observer {heartbeat-ref}/configuration-observer-options.html[geo options] to do so. Some examples might be:

* **A site served from a content delivery network (CDN) with points of presence (POPs) around the globe:**
In this case you may want to have multiple Heartbeat instances at different data centers around the world checking to see if your site is reachable via local CDN POPs.
* **A service within a single data center that is accessed across multiple VPNs:**
Set up one Heartbeat instance within the VPN the service operates from, and another within an additional VPN that users access the service from.
Having both instances will help pinpoint network errors in the event of an outage.
* **A single service running primarily in a US east coast data center, with a hot failover located in a US west coast data center:**
In each data center, run a Heartbeat instance that checks both the local copy of the service and its counterpart across the country.
Set up two monitors in each region, one for the local service and one for the remote service.
In the event of a data center failure it will be immediately obvious if the service had a connectivity issue to the outside world or if the failure was only internal.
2 changes: 2 additions & 0 deletions docs/uptime-guide/index.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,6 @@ include::overview.asciidoc[]

include::install.asciidoc[]

include::deployment-arch.asciidoc[]

include::security.asciidoc[]
42 changes: 22 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
"test:browser": "grunt test:browser",
"test:jest": "node scripts/jest",
"test:mocha": "node scripts/mocha",
"test:mocha:coverage": "grunt test:mochaCoverage",
"test:ui": "node scripts/functional_tests",
"test:ui:server": "node scripts/functional_tests_server",
"test:ui:runner": "node scripts/functional_test_runner",
Expand Down Expand Up @@ -101,7 +102,7 @@
"dependencies": {
"@babel/core": "^7.5.5",
"@babel/register": "^7.5.5",
"@elastic/charts": "^10.0.1",
"@elastic/charts": "^10.2.0",
"@elastic/datemath": "5.0.2",
"@elastic/eui": "13.3.0",
"@elastic/filesaver": "1.1.2",
Expand Down Expand Up @@ -136,12 +137,12 @@
"bluebird": "3.5.5",
"boom": "^7.2.0",
"brace": "0.11.1",
"cache-loader": "^4.0.1",
"cache-loader": "^4.1.0",
"chalk": "^2.4.1",
"check-disk-space": "^2.1.0",
"color": "1.0.3",
"commander": "3.0.0",
"compare-versions": "3.4.0",
"compare-versions": "3.5.1",
"core-js": "^3.2.1",
"css-loader": "2.1.1",
"custom-event-polyfill": "^0.3.0",
Expand All @@ -153,7 +154,7 @@
"encode-uri-query": "1.0.1",
"execa": "^1.0.0",
"expiry-js": "0.1.7",
"file-loader": "4.0.0",
"file-loader": "4.2.0",
"font-awesome": "4.7.0",
"getos": "^3.1.0",
"glob": "^7.1.2",
Expand Down Expand Up @@ -187,7 +188,7 @@
"lodash.clonedeep": "^4.5.0",
"lru-cache": "4.1.5",
"markdown-it": "^8.4.1",
"mini-css-extract-plugin": "0.7.0",
"mini-css-extract-plugin": "0.8.0",
"minimatch": "^3.0.4",
"mkdirp": "0.5.1",
"moment": "^2.20.1",
Expand All @@ -203,7 +204,7 @@
"proxy-from-env": "1.0.0",
"pug": "^2.0.3",
"querystring-browser": "1.0.4",
"raw-loader": "3.0.0",
"raw-loader": "3.1.0",
"react": "^16.8.0",
"react-addons-shallow-compare": "15.6.2",
"react-color": "^2.13.8",
Expand Down Expand Up @@ -234,8 +235,8 @@
"style-loader": "0.23.1",
"symbol-observable": "^1.2.0",
"tar": "4.4.10",
"terser-webpack-plugin": "^1.1.0",
"thread-loader": "^2.1.2",
"terser-webpack-plugin": "^1.4.1",
"thread-loader": "^2.1.3",
"tinygradient": "0.4.3",
"tinymath": "1.2.1",
"topojson-client": "3.0.0",
Expand All @@ -244,7 +245,7 @@
"tslib": "^1.9.3",
"type-detect": "^4.0.8",
"ui-select": "0.19.8",
"url-loader": "2.0.0",
"url-loader": "2.1.0",
"uuid": "3.3.2",
"val-loader": "^1.1.1",
"validate-npm-package-name": "2.2.2",
Expand All @@ -253,7 +254,7 @@
"vega-schema-url-parser": "1.0.0",
"vega-tooltip": "^0.9.14",
"vision": "^5.3.3",
"webpack": "4.33.0",
"webpack": "4.39.2",
"webpack-merge": "4.2.1",
"whatwg-fetch": "^3.0.0",
"yauzl": "2.10.0"
Expand Down Expand Up @@ -292,7 +293,7 @@
"@types/delete-empty": "^2.0.0",
"@types/elasticsearch": "^5.0.33",
"@types/enzyme": "^3.9.0",
"@types/eslint": "^4.16.6",
"@types/eslint": "^4.16.8",
"@types/execa": "^0.9.0",
"@types/fetch-mock": "^7.3.1",
"@types/getopts": "^2.0.1",
Expand Down Expand Up @@ -329,19 +330,19 @@
"@types/react-virtualized": "^9.18.7",
"@types/redux": "^3.6.31",
"@types/redux-actions": "^2.2.1",
"@types/request": "^2.48.1",
"@types/request": "^2.48.2",
"@types/rimraf": "^2.0.2",
"@types/selenium-webdriver": "^3.0.15",
"@types/selenium-webdriver": "^3.0.16",
"@types/semver": "^5.5.0",
"@types/sinon": "^7.0.0",
"@types/strip-ansi": "^3.0.0",
"@types/styled-components": "^3.0.1",
"@types/styled-components": "^3.0.2",
"@types/supertest": "^2.0.5",
"@types/type-detect": "^4.0.1",
"@types/uuid": "^3.4.4",
"@types/zen-observable": "^0.8.0",
"@typescript-eslint/eslint-plugin": "1.11.0",
"@typescript-eslint/parser": "1.11.0",
"@typescript-eslint/eslint-plugin": "1.13.0",
"@typescript-eslint/parser": "1.13.0",
"angular-mocks": "1.4.7",
"archiver": "^3.0.0",
"babel-eslint": "^10.0.2",
Expand All @@ -351,7 +352,7 @@
"chai": "3.5.0",
"chance": "1.0.18",
"cheerio": "0.22.0",
"chokidar": "3.0.1",
"chokidar": "3.0.2",
"chromedriver": "^76.0.0",
"classnames": "2.2.6",
"dedent": "^0.7.0",
Expand All @@ -361,12 +362,12 @@
"enzyme-adapter-utils": "^1.12.0",
"enzyme-to-json": "^3.3.4",
"eslint": "5.16.0",
"eslint-config-prettier": "6.0.0",
"eslint-config-prettier": "6.1.0",
"eslint-plugin-babel": "^5.3.0",
"eslint-plugin-ban": "1.2.0",
"eslint-plugin-import": "2.18.0",
"eslint-plugin-import": "2.18.2",
"eslint-plugin-jest": "22.7.1",
"eslint-plugin-jsx-a11y": "6.2.1",
"eslint-plugin-jsx-a11y": "6.2.3",
"eslint-plugin-mocha": "5.3.0",
"eslint-plugin-no-unsanitized": "3.0.2",
"eslint-plugin-node": "9.1.0",
Expand Down Expand Up @@ -416,6 +417,7 @@
"nock": "10.0.6",
"node-sass": "^4.9.4",
"normalize-path": "^3.0.0",
"nyc": "^14.1.1",
"pixelmatch": "4.0.2",
"pkg-up": "^2.0.0",
"pngjs": "^3.4.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/eslint-config-kibana/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
},
"homepage": "https://github.com/elastic/eslint-config-kibana#readme",
"peerDependencies": {
"@typescript-eslint/eslint-plugin": "1.12.0",
"@typescript-eslint/parser": "1.12.0",
"@typescript-eslint/eslint-plugin": "1.13.0",
"@typescript-eslint/parser": "1.13.0",
"babel-eslint": "^10.0.2",
"eslint": "5.16.0",
"eslint-plugin-babel": "^5.3.0",
"eslint-plugin-ban": "1.2.0",
"eslint-plugin-jsx-a11y": "6.2.1",
"eslint-plugin-import": "2.18.0",
"eslint-plugin-jsx-a11y": "6.2.3",
"eslint-plugin-import": "2.18.2",
"eslint-plugin-jest": "^22.4.1",
"eslint-plugin-mocha": "^5.3.0",
"eslint-plugin-no-unsanitized": "3.0.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/kbn-es/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "Apache-2.0",
"private": true,
"dependencies": {
"@elastic/elasticsearch": "^7.0.0-rc.2",
"@elastic/elasticsearch": "^7.3.0",
"@kbn/dev-utils": "1.0.0",
"abort-controller": "^2.0.3",
"chalk": "^2.4.1",
Expand All @@ -15,7 +15,7 @@
"getopts": "^2.2.4",
"glob": "^7.1.2",
"mkdirp": "^0.5.1",
"node-fetch": "^2.0.0",
"node-fetch": "^2.6.0",
"simple-git": "^1.91.0",
"tar-fs": "^1.16.3",
"tree-kill": "^1.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-eslint-import-resolver-kibana/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
"glob-all": "^3.1.0",
"lru-cache": "^4.1.3",
"resolve": "^1.7.1",
"webpack": "^4.23.1"
"webpack": "^4.39.2"
}
}
2 changes: 1 addition & 1 deletion packages/kbn-eslint-plugin-eslint/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
"dependencies": {
"micromatch": "3.1.10",
"dedent": "^0.7.0",
"eslint-module-utils": "2.4.0"
"eslint-module-utils": "2.4.1"
}
}
10 changes: 5 additions & 5 deletions packages/kbn-interpreter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@
"@kbn/babel-preset": "1.0.0",
"@kbn/dev-utils": "1.0.0",
"babel-loader": "^8.0.6",
"copy-webpack-plugin": "^5.0.0",
"copy-webpack-plugin": "^5.0.4",
"css-loader": "2.1.1",
"del": "^4.0.0",
"getopts": "^2.2.4",
"pegjs": "0.10.0",
"sass-loader": "^7.1.0",
"sass-loader": "^7.3.1",
"style-loader": "0.23.1",
"supports-color": "^7.0.0",
"url-loader": "2.0.0",
"webpack": "4.33.0",
"webpack-cli": "^3.1.2"
"url-loader": "2.1.0",
"webpack": "4.39.2",
"webpack-cli": "^3.3.7"
}
}
Loading

0 comments on commit 55129d1

Please sign in to comment.