Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ftr/docker-services] Use docker services in epm_api_integration suite #68172

Closed
wants to merge 5 commits into from
Closed

[ftr/docker-services] Use docker services in epm_api_integration suite #68172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7341cc3
[ftr/docker-services] Use docker services in epm_api_integration suite
spalger Jun 3, 2020
a9d6d2f
fix port env var name and run config on CI, disable when port not def…
spalger Jun 17, 2020
986badc
skip tests by optionally using describe.skip
spalger Jun 18, 2020
a1494fc
move to ciGroup1
spalger Jun 18, 2020
4426ead
set suite.pending to disable the suite, rather than calling describe.…
spalger Jun 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .eslintignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ target
/x-pack/legacy/plugins/infra/public/graphql/types.ts
/x-pack/legacy/plugins/infra/server/graphql/types.ts
/x-pack/legacy/plugins/maps/public/vendor/**

/x-pack/test/epm_api_integration/apis/fixtures/**
# package overrides
/packages/eslint-config-kibana
/packages/kbn-interpreter/src/common/lib/grammar.js
Expand Down
4 changes: 4 additions & 0 deletions src/dev/precommit_hook/casing_check_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ export const IGNORE_FILE_GLOBS = [
// filename required by api-extractor
'api-documenter.json',

// test cases come from elastic/package-storage repo, which uses
// nameing conventions from elastic/beats modules
'x-pack/test/epm_api_integration/apis/fixtures/**',

// TODO fix file names in APM to remove these
'x-pack/plugins/apm/public/**/*',
'x-pack/plugins/apm/scripts/**/*',
Expand Down
2 changes: 2 additions & 0 deletions vars/kibanaPipeline.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ def functionalTestProcess(String name, Closure closure) {
def kibanaPort = "61${processNumber}1"
def esPort = "61${processNumber}2"
def esTransportPort = "61${processNumber}3"
def ingestPort = "61${processNumber}4"

withEnv([
"CI_PARALLEL_PROCESS_NUMBER=${processNumber}",
Expand All @@ -29,6 +30,7 @@ def functionalTestProcess(String name, Closure closure) {
"TEST_KIBANA_URL=http://elastic:changeme@localhost:${kibanaPort}",
"TEST_ES_URL=http://elastic:changeme@localhost:${esPort}",
"TEST_ES_TRANSPORT_PORT=${esTransportPort}",
"INGEST_MANAGEMENT_PACKAGE_REGISTRY_PORT=${ingestPort}",
"IS_PIPELINE_JOB=1",
"JOB=${name}",
"KBN_NP_PLUGINS_BUILT=true",
Expand Down
1 change: 1 addition & 0 deletions x-pack/scripts/functional_tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ const onlyNotInCoverageTests = [
require.resolve('../test/endpoint_api_integration_no_ingest/config.ts'),
require.resolve('../test/reporting_api_integration/config.js'),
require.resolve('../test/functional_embedded/config.ts'),
require.resolve('../test/epm_api_integration/config.ts'),
];

require('@kbn/plugin-helpers').babelRegister();
Expand Down
Binary file removed x-pack/test/epm_api_integration/apis/fixtures/packages/epr/yamlpipeline_1.0.0.tar.gz
View file
Open in desktop
Binary file not shown.
32 changes: 0 additions & 32 deletions x-pack/test/epm_api_integration/apis/fixtures/packages/package/yamlpipeline_1.0.0
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions ...api_integration/apis/fixtures/registry/public/package/base/0.1.0/docs/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Base package

This is installed in the background by EPM to setup the Elastic Stack.
148 changes: 148 additions & 0 deletions .../registry/public/package/base/0.1.0/elasticsearch/component-template/events-mappings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,148 @@
{
"template": {
"mappings": {
"_meta": {
},
"dynamic_templates": [
{
"strings_as_keyword": {
"mapping": {
"ignore_above": 1024,
"type": "keyword"
},
"match_mapping_type": "string"
}
}
],
"date_detection": false,
"properties": {
"@timestamp": {
"type": "date"
},
"stream": {
"properties": {
"type": {
"type": "constant_keyword"
},
"dataset": {
"type": "constant_keyword"
},
"namespace": {
"type": "constant_keyword"
}
}
},
"agent": {
"properties": {
"hostname": {
"ignore_above": 1024,
"type": "keyword"
},
"name": {
"ignore_above": 1024,
"type": "keyword"
},
"id": {
"ignore_above": 1024,
"type": "keyword"
},
"ephemeral_id": {
"ignore_above": 1024,
"type": "keyword"
},
"type": {
"ignore_above": 1024,
"type": "keyword"
},
"version": {
"ignore_above": 1024,
"type": "keyword"
}
}
},
"ecs": {
"properties": {
"version": {
"ignore_above": 1024,
"type": "keyword"
}
}
},
"host": {
"properties": {
"hostname": {
"ignore_above": 1024,
"type": "keyword"
},
"os": {
"properties": {
"build": {
"ignore_above": 1024,
"type": "keyword"
},
"kernel": {
"ignore_above": 1024,
"type": "keyword"
},
"codename": {
"ignore_above": 1024,
"type": "keyword"
},
"name": {
"ignore_above": 1024,
"type": "keyword"
},
"family": {
"ignore_above": 1024,
"type": "keyword"
},
"version": {
"ignore_above": 1024,
"type": "keyword"
},
"platform": {
"ignore_above": 1024,
"type": "keyword"
},
"full": {
"ignore_above": 1024,
"type": "keyword"
}
}
},
"ip": {
"type": "ip"
},
"containerized": {
"type": "boolean"
},
"name": {
"ignore_above": 1024,
"type": "keyword"
},
"id": {
"ignore_above": 1024,
"type": "keyword"
},
"type": {
"ignore_above": 1024,
"type": "keyword"
},
"mac": {
"ignore_above": 1024,
"type": "keyword"
},
"architecture": {
"ignore_above": 1024,
"type": "keyword"
}
}
},
"message": {
"type": "text"
}
}
},
"aliases": {}
}
}
21 changes: 21 additions & 0 deletions .../registry/public/package/base/0.1.0/elasticsearch/component-template/events-settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"template": {
"settings": {
"index": {
"lifecycle": {
"name": "events-default"
},
"codec": "best_compression",
"refresh_interval": "5s",
"number_of_shards": "1",
"query": {
"default_field": [
"message"
]
},
"number_of_routing_shards": "30"
}
},
"aliases": {}
}
}
Loading