Skip to content

Commit

Permalink
Merge branch 'main' into 7382_dqd-data-stream
Browse files Browse the repository at this point in the history
  • Loading branch information
kibanamachine committed Jan 24, 2024
2 parents 4edfbd0 + 5bd32e6 commit fac328a
Show file tree
Hide file tree
Showing 251 changed files with 4,443 additions and 3,874 deletions.
1 change: 1 addition & 0 deletions .buildkite/ftr_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,7 @@ enabled:
- x-pack/test/functional/apps/lens/open_in_lens/dashboard/config.ts
- x-pack/test/functional/apps/license_management/config.ts
- x-pack/test/functional/apps/logstash/config.ts
- x-pack/test/functional/apps/managed_content/config.ts
- x-pack/test/functional/apps/management/config.ts
- x-pack/test/functional/apps/maps/group1/config.ts
- x-pack/test/functional/apps/maps/group2/config.ts
Expand Down
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,7 @@ packages/kbn-logging @elastic/kibana-core
packages/kbn-logging-mocks @elastic/kibana-core
x-pack/plugins/logs_shared @elastic/obs-ux-logs-team
x-pack/plugins/logstash @elastic/logstash
packages/kbn-managed-content-badge @elastic/kibana-visualizations
packages/kbn-managed-vscode-config @elastic/kibana-operations
packages/kbn-managed-vscode-config-cli @elastic/kibana-operations
packages/kbn-management/cards_navigation @elastic/platform-deployment-management
Expand Down
3 changes: 2 additions & 1 deletion .i18nrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,8 @@
"unifiedFieldList": "packages/kbn-unified-field-list",
"unifiedHistogram": "src/plugins/unified_histogram",
"unifiedDataTable": "packages/kbn-unified-data-table",
"unsavedChangesBadge": "packages/kbn-unsaved-changes-badge"
"unsavedChangesBadge": "packages/kbn-unsaved-changes-badge",
"managedContentBadge": "packages/kbn-managed-content-badge"
},
"translations": []
}
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,7 @@
"@kbn/logging-mocks": "link:packages/kbn-logging-mocks",
"@kbn/logs-shared-plugin": "link:x-pack/plugins/logs_shared",
"@kbn/logstash-plugin": "link:x-pack/plugins/logstash",
"@kbn/managed-content-badge": "link:packages/kbn-managed-content-badge",
"@kbn/management-cards-navigation": "link:packages/kbn-management/cards_navigation",
"@kbn/management-plugin": "link:src/plugins/management",
"@kbn/management-settings-application": "link:packages/kbn-management/settings/application",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -402,8 +402,13 @@ export class TestSubjects extends FtrService {
}
}

public async isEuiSwitchChecked(selector: string) {
const euiSwitch = await this.find(selector);
public async isEuiSwitchChecked(selector: string | WebElementWrapper) {
let euiSwitch: WebElementWrapper;
if (typeof selector === 'string') {
euiSwitch = await this.find(selector);
} else {
euiSwitch = selector;
}
const isChecked = await euiSwitch.getAttribute('aria-checked');
return isChecked === 'true';
}
Expand Down
3 changes: 3 additions & 0 deletions packages/kbn-managed-content-badge/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# @kbn/managed-content-badge

Empty package generated by @kbn/generate
28 changes: 28 additions & 0 deletions packages/kbn-managed-content-badge/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0 and the Server Side Public License, v 1; you may not use this file except
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/
import { i18n } from '@kbn/i18n';
import type { EuiToolTipProps } from '@elastic/eui';
import type { TopNavMenuBadgeProps } from '@kbn/navigation-plugin/public';

export const getManagedContentBadge: (tooltipText: string) => TopNavMenuBadgeProps = (
tooltipText
) => ({
'data-test-subj': 'managedContentBadge',
badgeText: i18n.translate('managedContentBadge.text', {
defaultMessage: 'Managed',
}),
title: i18n.translate('managedContentBadge.text', {
defaultMessage: 'Managed',
}),
color: 'primary',
iconType: 'glasses',
toolTipProps: {
content: tooltipText,
position: 'bottom',
} as EuiToolTipProps,
});
13 changes: 13 additions & 0 deletions packages/kbn-managed-content-badge/jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0 and the Server Side Public License, v 1; you may not use this file except
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/

module.exports = {
preset: '@kbn/test/jest_node',
rootDir: '../..',
roots: ['<rootDir>/packages/kbn-managed-content-badge'],
};
5 changes: 5 additions & 0 deletions packages/kbn-managed-content-badge/kibana.jsonc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"type": "shared-browser",
"id": "@kbn/managed-content-badge",
"owner": "@elastic/kibana-visualizations"
}
6 changes: 6 additions & 0 deletions packages/kbn-managed-content-badge/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "@kbn/managed-content-badge",
"private": true,
"version": "1.0.0",
"license": "SSPL-1.0 OR Elastic License 2.0"
}
20 changes: 20 additions & 0 deletions packages/kbn-managed-content-badge/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"outDir": "target/types",
"types": [
"jest",
"node"
]
},
"include": [
"**/*.ts",
],
"exclude": [
"target/**/*"
],
"kbn_references": [
"@kbn/i18n",
"@kbn/navigation-plugin",
]
}
8 changes: 2 additions & 6 deletions packages/kbn-monaco/src/esql/antlr/esql_parser.g4
Original file line number Diff line number Diff line change
Expand Up @@ -111,15 +111,11 @@ evalCommand
;

statsCommand
: STATS fields? (BY grouping)?
: STATS stats=fields? (BY grouping=fields)?
;

inlinestatsCommand
: INLINESTATS fields (BY grouping)?
;

grouping
: qualifiedName (COMMA qualifiedName)*
: INLINESTATS stats=fields (BY grouping=fields)?
;

fromIdentifier
Expand Down
3 changes: 1 addition & 2 deletions packages/kbn-monaco/src/esql/antlr/esql_parser.interp

Large diffs are not rendered by default.

Loading

0 comments on commit fac328a

Please sign in to comment.