Skip to content

Commit

Permalink
Merge branch 'master' into implement/restrict-theme-options
Browse files Browse the repository at this point in the history
  • Loading branch information
kibanamachine authored Mar 22, 2021
2 parents 039956c + 04e4661 commit 28093ef
Show file tree
Hide file tree
Showing 432 changed files with 1,296 additions and 18,075 deletions.
35 changes: 35 additions & 0 deletions docs/settings/banners-settings.asciidoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[role="xpack"]
[[banners-settings-kb]]
=== Banner settings in {kib}
++++
<titleabbrev>Banners settings</titleabbrev>
++++

Banners are disabled by default. You need to manually configure them in order to use the feature.

You can configure the `xpack.banners` settings in your `kibana.yml` file.

[[general-banners-settings-kb]]
==== General banner settings

[cols="2*<"]
|===

| `xpack.banners.placement`
| Set to `header` to enable the header banner. Defaults to `disabled`.

| `xpack.banners.textContent`
| The text to display inside the banner, either plain text or Markdown.

| `xpack.banners.textColor`
| The color for the banner text. Defaults to `#8A6A0A`.

| `xpack.banners.backgroundColor`
| The color of the banner background. Defaults to `#FFF9E8`.

|===

[NOTE]
====
The `banners` plugin is a https://www.elastic.co/subscriptions[subscription feature]
====
1 change: 1 addition & 0 deletions docs/settings/settings-xkb.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ For more {kib} configuration settings, see <<settings>>.

include::alert-action-settings.asciidoc[]
include::apm-settings.asciidoc[]
include::banners-settings.asciidoc[]
include::dev-settings.asciidoc[]
include::graph-settings.asciidoc[]
include::infrastructure-ui-settings.asciidoc[]
Expand Down
3 changes: 2 additions & 1 deletion docs/setup/settings.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ running behind a proxy. Use the <<server-rewriteBasePath, `server.rewriteBasePat
if it should remove the basePath from requests it receives, and to prevent a
deprecation warning at startup. This setting cannot end in a slash (`/`).

|[[server-publicBaseUrl]] `server.publicBaseUrl:`
|[[server-publicBaseUrl]] `server.publicBaseUrl:` {ess-icon}
| The publicly available URL that end-users access Kibana at. Must include the protocol, hostname, port
(if different than the defaults for `http` and `https`, 80 and 443 respectively), and the
<<server-basePath, `server.basePath`>> (if configured). This setting cannot end in a slash (`/`).
Expand Down Expand Up @@ -685,6 +685,7 @@ Valid locales are: `en`, `zh-CN`, `ja-JP`. *Default: `en`*

include::{kib-repo-dir}/settings/alert-action-settings.asciidoc[]
include::{kib-repo-dir}/settings/apm-settings.asciidoc[]
include::{kib-repo-dir}/settings/banners-settings.asciidoc[]
include::{kib-repo-dir}/settings/dev-settings.asciidoc[]
include::{kib-repo-dir}/settings/graph-settings.asciidoc[]
include::{kib-repo-dir}/settings/fleet-settings.asciidoc[]
Expand Down
1 change: 0 additions & 1 deletion packages/kbn-optimizer/limits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,3 @@ pageLoadAssetSize:
fileUpload: 25664
banners: 17946
mapsEms: 26072
cases: 102558

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,25 @@ function setDocsourcePayload(id: string | null, providedPayload: any) {
object = defaults(providedPayload || {}, stubbedSavedObjectIndexPattern(id));
}

const savedObject = {
id: 'id',
version: 'version',
attributes: {
title: 'kibana-*',
timeFieldName: '@timestamp',
fields: '[]',
sourceFilters: '[{"value":"item1"},{"value":"item2"}]',
fieldFormatMap: '{"field":{}}',
typeMeta: '{}',
type: '',
runtimeFieldMap:
'{"aRuntimeField": { "type": "keyword", "script": {"source": "emit(\'hello\')"}}}',
fieldAttrs: '{"aRuntimeField": { "count": 5, "customLabel": "A Runtime Field"}}',
},
type: 'index-pattern',
references: [],
};

describe('IndexPatterns', () => {
let indexPatterns: IndexPatternsService;
let savedObjectsClient: SavedObjectsClientCommon;
Expand Down Expand Up @@ -219,23 +238,14 @@ describe('IndexPatterns', () => {
});

test('savedObjectToSpec', () => {
const savedObject = {
id: 'id',
version: 'version',
attributes: {
title: 'kibana-*',
timeFieldName: '@timestamp',
fields: '[]',
sourceFilters: '[{"value":"item1"},{"value":"item2"}]',
fieldFormatMap: '{"field":{}}',
typeMeta: '{}',
type: '',
},
type: 'index-pattern',
references: [],
};
const spec = indexPatterns.savedObjectToSpec(savedObject);
expect(spec).toMatchSnapshot();
});

expect(indexPatterns.savedObjectToSpec(savedObject)).toMatchSnapshot();
test('correctly composes runtime field', async () => {
setDocsourcePayload('id', savedObject);
const indexPattern = await indexPatterns.get('id');
expect(indexPattern.fields).toMatchSnapshot();
});

test('failed requests are not cached', async () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -425,8 +425,9 @@ export class IndexPatternsService {
runtimeField: value,
aggregatable: true,
searchable: true,
count: 0,
readFromDocValues: false,
customLabel: spec.fieldAttrs?.[key]?.customLabel,
count: spec.fieldAttrs?.[key]?.count,
};
}
}
Expand Down
3 changes: 2 additions & 1 deletion test/api_integration/apis/telemetry/telemetry_local.ts
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,8 @@ export default function ({ getService }: FtrProviderContext) {
});
});

it("should only use the first 10k docs for the application_usage data (they'll be rolled up in a later process)", async () => {
// flaky https://github.com/elastic/kibana/issues/94513
it.skip("should only use the first 10k docs for the application_usage data (they'll be rolled up in a later process)", async () => {
const { body } = await supertest
.post('/api/telemetry/v2/clusters/_stats')
.set('kbn-xsrf', 'xxx')
Expand Down
3 changes: 2 additions & 1 deletion test/functional/apps/discover/_data_grid_doc_table.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await PageObjects.timePicker.setDefaultAbsoluteRange();
});

it('should show popover with expanded cell content by click on expand button', async () => {
// flaky https://github.com/elastic/kibana/issues/94889
it.skip('should show popover with expanded cell content by click on expand button', async () => {
log.debug('open popover with expanded cell content to get json from the editor');
const documentCell = await dataGrid.getCellElement(1, 3);
await documentCell.click();
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/cases/common/api/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

export * from './cases';
export * from './connectors';
export * from './helpers';
export * from './runtime_types';
export * from './saved_object';
export * from './user';
5 changes: 2 additions & 3 deletions x-pack/plugins/cases/common/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
* 2.0.
*/

// The DEFAULT_MAX_SIGNALS value should match the one in `x-pack/plugins/security_solution/common/constants.ts`
// If either changes, engineer should ensure both values are updated
const DEFAULT_MAX_SIGNALS = 100;
import { DEFAULT_MAX_SIGNALS } from '../../security_solution/common/constants';

export const APP_ID = 'cases';

/**
Expand Down
9 changes: 0 additions & 9 deletions x-pack/plugins/cases/common/index.ts

This file was deleted.

5 changes: 2 additions & 3 deletions x-pack/plugins/cases/kibana.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@
"configPath": ["xpack", "cases"],
"id": "cases",
"kibanaVersion": "kibana",
"extraPublicDirs": ["common"],
"requiredPlugins": ["actions", "esUiShared", "kibanaReact", "triggersActionsUi"],
"requiredPlugins": ["actions", "securitySolution"],
"optionalPlugins": [
"spaces",
"security"
],
"server": true,
"ui": true,
"ui": false,
"version": "8.0.0"
}
39 changes: 0 additions & 39 deletions x-pack/plugins/cases/public/common/errors.ts

This file was deleted.

30 changes: 0 additions & 30 deletions x-pack/plugins/cases/public/common/lib/kibana/__mocks__/index.ts

This file was deleted.

9 changes: 0 additions & 9 deletions x-pack/plugins/cases/public/common/lib/kibana/index.ts

This file was deleted.

35 changes: 0 additions & 35 deletions x-pack/plugins/cases/public/common/lib/kibana/kibana_react.mock.ts

This file was deleted.

16 changes: 0 additions & 16 deletions x-pack/plugins/cases/public/common/lib/kibana/kibana_react.ts

This file was deleted.

Loading

0 comments on commit 28093ef

Please sign in to comment.