-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of github.com:elastic/kibana into dev/state-man…
…agment/hashed-item-store
- Loading branch information
Showing
318 changed files
with
10,131 additions
and
3,145 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| /* | ||
| * Licensed to Elasticsearch B.V. under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch B.V. licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| /** | ||
| * DO NOT EDIT THIS FILE! | ||
| * | ||
| * This file contains the configuration for the Elastic APM instrumentaion of | ||
| * Kibana itself and is only intented to be used during development of Kibana. | ||
| * | ||
| * Instrumentation is turned off by default. Once activated it will send APM | ||
| * data to an Elasticsearch cluster accessible by Elastic employees. | ||
| * | ||
| * To modify the configuration, either use environment variables, or create a | ||
| * file named `config/apm.dev.js`, which exports a config object as described | ||
| * in the docs. | ||
| * | ||
| * For an overview over the available configuration files, see: | ||
| * https://www.elastic.co/guide/en/apm/agent/nodejs/current/configuration.html | ||
| * | ||
| * For general information about Elastic APM, see: | ||
| * https://www.elastic.co/guide/en/apm/get-started/current/index.html | ||
| */ | ||
|
|
||
| const { readFileSync } = require('fs'); | ||
| const { join } = require('path'); | ||
| const { execSync } = require('child_process'); | ||
| const merge = require('lodash.merge'); | ||
|
|
||
| module.exports = merge({ | ||
| active: false, | ||
| serverUrl: 'https://f1542b814f674090afd914960583265f.apm.us-central1.gcp.cloud.es.io:443', | ||
| // The secretToken below is intended to be hardcoded in this file even though | ||
| // it makes it public. This is not a security/privacy issue. Normally we'd | ||
| // instead disable the need for a secretToken in the APM Server config where | ||
| // the data is transmitted to, but due to how it's being hosted, it's easier, | ||
| // for now, to simply leave it in. | ||
| secretToken: 'R0Gjg46pE9K9wGestd', | ||
| globalLabels: {}, | ||
| centralConfig: false, | ||
| logUncaughtExceptions: true | ||
| }, devConfig()); | ||
|
|
||
| const rev = gitRev(); | ||
| if (rev !== null) module.exports.globalLabels.git_rev = rev; | ||
|
|
||
| try { | ||
| const filename = join(__dirname, '..', 'data', 'uuid'); | ||
| module.exports.globalLabels.kibana_uuid = readFileSync(filename, 'utf-8'); | ||
| } catch (e) {} // eslint-disable-line no-empty | ||
|
|
||
| function gitRev() { | ||
| try { | ||
| return execSync('git rev-parse --short HEAD', { encoding: 'utf-8' }).trim(); | ||
| } catch (e) { | ||
| return null; | ||
| } | ||
| } | ||
|
|
||
| function devConfig() { | ||
| try { | ||
| return require('./apm.dev'); // eslint-disable-line import/no-unresolved | ||
| } catch (e) { | ||
| return {}; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| /* | ||
| * Licensed to Elasticsearch B.V. under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch B.V. licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| const { existsSync } = require('fs'); | ||
| const { join } = require('path'); | ||
| const { name, version } = require('../package.json'); | ||
|
|
||
| module.exports = function (serviceName = name) { | ||
| if (process.env.kbnWorkerType === 'optmzr') return; | ||
|
|
||
| const conf = { | ||
| serviceName: `${serviceName}-${version.replace(/\./g, '_')}` | ||
| }; | ||
|
|
||
| if (configFileExists()) conf.configFile = 'config/apm.js'; | ||
| else conf.active = false; | ||
|
|
||
| require('elastic-apm-node').start(conf); | ||
| }; | ||
|
|
||
| function configFileExists() { | ||
| return existsSync(join(__dirname, '..', 'config', 'apm.js')); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,5 +17,6 @@ | |
| * under the License. | ||
| */ | ||
|
|
||
| require('../apm')(); | ||
| require('../setup_node_env'); | ||
| require('./cli'); | ||
Oops, something went wrong.