github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

[ci] Updates APM server (#114588)

Browse source 
Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
This commit is contained in:
Tyler Smalley 2021-10-12 13:58:12 -07:00 • committed by GitHub
parent d014729ae2
commit 7290b6936a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
.buildkite/scripts/common/env.sh
View file

@ -36,7 +36,12 @@ export ELASTIC_APM_ENVIRONMENT=ci
export ELASTIC_APM_TRANSACTION_SAMPLE_RATE=0.1
if is_pr; then
export ELASTIC_APM_ACTIVE=false
if [[ "${GITHUB_PR_LABELS:-}" == *"ci:collect-apm"* ]]; then
export ELASTIC_APM_ACTIVE=true
else
export ELASTIC_APM_ACTIVE=false
fi
export CHECKS_REPORTER_ACTIVE=true
# These can be removed once we're not supporting Jenkins and Buildkite at the same time

8
packages/kbn-apm-config-loader/src/config.test.ts
View file

@ -94,8 +94,8 @@ describe('ApmConfiguration', () => {
"globalLabels": Object {},
"logUncaughtExceptions": true,
"metricsInterval": "30s",
"secretToken": "ZQHYvrmXEx04ozge8F",
"serverUrl": "https://38b80fbd79fb4c91bae06b4642d4d093.apm.us-east-1.aws.cloud.es.io",
"secretToken": "7YKhoXsO4MzjhXjx2c",
"serverUrl": "https://kibana-ci-apm.apm.us-central1.gcp.cloud.es.io",
"serviceName": "serviceName",
"serviceVersion": "8.0.0",
"transactionSampleRate": 1,
@ -117,8 +117,8 @@ describe('ApmConfiguration', () => {
},
"logUncaughtExceptions": true,
"metricsInterval": "120s",
"secretToken": "ZQHYvrmXEx04ozge8F",
"serverUrl": "https://38b80fbd79fb4c91bae06b4642d4d093.apm.us-east-1.aws.cloud.es.io",
"secretToken": "7YKhoXsO4MzjhXjx2c",
"serverUrl": "https://kibana-ci-apm.apm.us-central1.gcp.cloud.es.io",
"serviceName": "serviceName",
"serviceVersion": "8.0.0",
"transactionSampleRate": 1,

4
packages/kbn-apm-config-loader/src/config.ts
View file

@ -23,14 +23,14 @@ const DEFAULT_CONFIG: AgentConfigOptions = {
};
const CENTRALIZED_SERVICE_BASE_CONFIG: AgentConfigOptions = {
serverUrl: 'https://38b80fbd79fb4c91bae06b4642d4d093.apm.us-east-1.aws.cloud.es.io',
serverUrl: 'https://kibana-ci-apm.apm.us-central1.gcp.cloud.es.io',
// 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: 'ZQHYvrmXEx04ozge8F',
secretToken: '7YKhoXsO4MzjhXjx2c',
centralConfig: false,
metricsInterval: '30s',