Skip to content

Commit

Permalink
Merge branch 'main' of github.com:elastic/kibana into feature-add-fle…
Browse files Browse the repository at this point in the history
…et-server-policy
  • Loading branch information
nchaulet committed Oct 28, 2022
2 parents 35668fc + f676295 commit 3a9059a
Show file tree
Hide file tree
Showing 125 changed files with 5,232 additions and 1,718 deletions.
4 changes: 3 additions & 1 deletion .buildkite/ftr_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,8 @@ enabled:
- x-pack/test/functional/apps/lens/group1/config.ts
- x-pack/test/functional/apps/lens/group2/config.ts
- x-pack/test/functional/apps/lens/group3/config.ts
- x-pack/test/functional/apps/lens/open_in_lens/config.ts
- x-pack/test/functional/apps/lens/open_in_lens/tsvb/config.ts
- x-pack/test/functional/apps/lens/open_in_lens/agg_based/config.ts
- x-pack/test/functional/apps/license_management/config.ts
- x-pack/test/functional/apps/logstash/config.ts
- x-pack/test/functional/apps/management/config.ts
Expand Down Expand Up @@ -271,6 +272,7 @@ enabled:
- x-pack/test/upgrade_assistant_integration/config.js
- x-pack/test/usage_collection/config.ts
- x-pack/performance/journeys/ecommerce_dashboard.ts
- x-pack/performance/journeys/ecommerce_dashboard_map_only.ts
- x-pack/performance/journeys/flight_dashboard.ts
- x-pack/performance/journeys/login.ts
- x-pack/performance/journeys/many_fields_discover.ts
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/add-fleet-issues-to-ingest-project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
project_id: ${{ env.INGEST_PROJECT_ID }}
content_id: ${{ github.event.issue.node_id }}
env:
GITHUB_TOKEN: ${{ secrets.FLEET_TECH_KIBANA_USER_TOKEN }}
GITHUB_TOKEN: ${{ secrets.FLEET_PROJECT_TOKEN }}
- uses: octokit/[email protected]
id: set_fleet_ui_area
if: github.event.label.name == env.FLEET_LABEL
Expand All @@ -48,4 +48,4 @@ jobs:
area_field_id: ${{ env.AREA_FIELD_ID }}
area_id: ${{ env.FLEET_UI_OPTION_ID }}
env:
GITHUB_TOKEN: ${{ secrets.FLEET_TECH_KIBANA_USER_TOKEN }}
GITHUB_TOKEN: ${{ secrets.FLEET_PROJECT_TOKEN }}
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ RUNTIME_DEPS = [
"@npm//classnames",
"@npm//react-use",
"@npm//@elastic/eui",
"//packages/kbn-i18n:npm_module_types",
"//packages/kbn-i18n",
"//packages/kbn-i18n-react",
"//packages/core/mount-utils/core-mount-utils-browser-internal",
]
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-ebt-tools/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ ts_project(
js_library(
name = PKG_DIRNAME,
srcs = NPM_MODULE_EXTRA_FILES,
deps = RUNTIME_DEPS + [":target_node", ":tsc_types"],
deps = RUNTIME_DEPS + [":target_node"],
package_name = PKG_REQUIRE_NAME,
visibility = ["//visibility:public"],
)
Expand Down
3 changes: 2 additions & 1 deletion packages/kbn-failed-test-reporter-cli/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ jsts_transpiler(
srcs = SRCS,
build_pkg_name = package_name(),
additional_args = [
"--copy-files"
"--copy-files",
"--quiet"
],
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ jsts_transpiler(
srcs = SRCS,
build_pkg_name = package_name(),
additional_args = [
"--copy-files"
"--copy-files",
"--quiet"
],
)

Expand All @@ -103,7 +104,8 @@ jsts_transpiler(
build_pkg_name = package_name(),
web = True,
additional_args = [
"--copy-files"
"--copy-files",
"--quiet"
],
)

Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-utils/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ ts_project(
js_library(
name = PKG_DIRNAME,
srcs = NPM_MODULE_EXTRA_FILES,
deps = RUNTIME_DEPS + [":target_node", ":tsc_types"],
deps = RUNTIME_DEPS + [":target_node"],
package_name = PKG_REQUIRE_NAME,
visibility = ["//visibility:public"],
)
Expand Down
23 changes: 16 additions & 7 deletions test/functional/apps/discover/classic/_doc_table.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
const PageObjects = getPageObjects(['common', 'discover', 'header', 'timePicker']);
const defaultSettings = {
defaultIndex: 'logstash-*',
hideAnnouncements: true,
};
const testSubjects = getService('testSubjects');

// FLAKY Chrome 103+ https://github.com/elastic/kibana/issues/138652
describe.skip('discover doc table', function describeIndexTests() {
describe('discover doc table', function describeIndexTests() {
const rowsHardLimit = 500;

before(async function () {
log.debug('load kibana index with default index pattern');
await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
await kibanaServer.savedObjects.cleanStandardList();
await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover.json');

// and load a set of makelogs data
Expand All @@ -42,6 +42,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
});

after(async function () {
await kibanaServer.importExport.unload('test/functional/fixtures/kbn_archiver/discover.json');
await kibanaServer.savedObjects.cleanStandardList();
await kibanaServer.uiSettings.replace({});
});

Expand Down Expand Up @@ -140,7 +142,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
expect(skipButtonText === activeElementText).to.be(true);
});

describe('expand a document row', function () {
describe('expand a document row', async function () {
const rowToInspect = 1;
beforeEach(async function () {
// close the toggle if open
Expand Down Expand Up @@ -194,16 +196,17 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
expect(defaultMessageElResubmit).to.be.ok();
});
});

it('should show allow toggling columns from the expanded document', async function () {
await PageObjects.discover.clickNewSearchButton();
await testSubjects.click('dscExplorerCalloutClose');
await retry.try(async function () {
await docTable.clickRowToggle({ isAnchorRow: false, rowIndex: rowToInspect - 1 });

// add columns
const fields = ['_id', '_index', 'agent'];
for (const field of fields) {
await testSubjects.click(`toggleColumnButton-${field}`);
await testSubjects.click(`tableDocViewRow-${field}`); // to suppress the appeared tooltip
}

const headerWithFields = await docTable.getHeaderFields();
Expand All @@ -212,6 +215,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
// remove columns
for (const field of fields) {
await testSubjects.click(`toggleColumnButton-${field}`);
await testSubjects.click(`tableDocViewRow-${field}`);
}

const headerWithoutFields = await docTable.getHeaderFields();
Expand All @@ -220,7 +224,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
});
});

describe('add and remove columns', function () {
describe('add and remove columns', async function () {
const extraColumns = ['phpmemory', 'ip'];

afterEach(async function () {
Expand All @@ -234,6 +238,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
for (const column of extraColumns) {
await PageObjects.discover.clearFieldSearchInput();
await PageObjects.discover.findFieldByName(column);
await retry.waitFor('field to appear', async function () {
return await testSubjects.exists(`field-${column}`);
});
await PageObjects.discover.clickFieldListItemAdd(column);
await PageObjects.header.waitUntilLoadingHasFinished();
// test the header now
Expand All @@ -247,7 +254,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
for (const column of extraColumns) {
await PageObjects.discover.clearFieldSearchInput();
await PageObjects.discover.findFieldByName(column);
log.debug(`add a ${column} column`);
await retry.waitFor('field to appear', async function () {
return await testSubjects.exists(`field-${column}`);
});
await PageObjects.discover.clickFieldListItemAdd(column);
await PageObjects.header.waitUntilLoadingHasFinished();
}
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
100 changes: 100 additions & 0 deletions x-pack/performance/es_archives/sample_data_flights/mappings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
{
"type": "index",
"value": {
"aliases": {
},
"index": "kibana_sample_data_flights",
"mappings": {
"properties": {
"AvgTicketPrice": {
"type": "float"
},
"Cancelled": {
"type": "boolean"
},
"Carrier": {
"type": "keyword"
},
"Dest": {
"type": "keyword"
},
"DestAirportID": {
"type": "keyword"
},
"DestCityName": {
"type": "keyword"
},
"DestCountry": {
"type": "keyword"
},
"DestLocation": {
"type": "geo_point"
},
"DestRegion": {
"type": "keyword"
},
"DestWeather": {
"type": "keyword"
},
"DistanceKilometers": {
"type": "float"
},
"DistanceMiles": {
"type": "float"
},
"FlightDelay": {
"type": "boolean"
},
"FlightDelayMin": {
"type": "integer"
},
"FlightDelayType": {
"type": "keyword"
},
"FlightNum": {
"type": "keyword"
},
"FlightTimeHour": {
"type": "keyword"
},
"FlightTimeMin": {
"type": "float"
},
"Origin": {
"type": "keyword"
},
"OriginAirportID": {
"type": "keyword"
},
"OriginCityName": {
"type": "keyword"
},
"OriginCountry": {
"type": "keyword"
},
"OriginLocation": {
"type": "geo_point"
},
"OriginRegion": {
"type": "keyword"
},
"OriginWeather": {
"type": "keyword"
},
"dayOfWeek": {
"type": "integer"
},
"timestamp": {
"type": "date"
}
}
},
"settings": {
"index": {
"auto_expand_replicas": "0-1",
"number_of_replicas": "0",
"number_of_shards": "1"
}
}
}
}
Binary file not shown.
Loading

0 comments on commit 3a9059a

Please sign in to comment.