Skip to content

Commit

Permalink
Merge branch '195360-inventory-plugin-incorrectly-displayed-in-observ…
Browse files Browse the repository at this point in the history
…ability-navigation-without-necessary-permissions' of https://github.com/iblancof/kibana into 195360-inventory-plugin-incorrectly-displayed-in-observability-navigation-without-necessary-permissions
  • Loading branch information
iblancof committed Oct 9, 2024
2 parents 3b1d39b + f475c04 commit 084f255
Show file tree
Hide file tree
Showing 116 changed files with 1,145 additions and 807 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,5 @@ spec:
# Optionally, set schedule-specific env-vars here
env:
SCHEDULED: 'true'
tags:
- kibana
2 changes: 2 additions & 0 deletions .buildkite/pipeline-resource-definitions/kibana-api-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,5 @@ spec:
cronline: 0 0 * * * America/New_York
message: Daily build
branch: main
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,5 @@ spec:
cronline: 0 1/3 * * * Europe/Berlin
message: Capacity every 3h testing
branch: main
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,5 @@ spec:
access_level: MANAGE_BUILD_AND_READ
kibana-tech-leads:
access_level: MANAGE_BUILD_AND_READ
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,5 @@ spec:
access_level: MANAGE_BUILD_AND_READ
kibana-tech-leads:
access_level: MANAGE_BUILD_AND_READ
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,5 @@ spec:
access_level: MANAGE_BUILD_AND_READ
kibana-tech-leads:
access_level: MANAGE_BUILD_AND_READ
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,5 @@ spec:
access_level: MANAGE_BUILD_AND_READ
kibana-tech-leads:
access_level: MANAGE_BUILD_AND_READ
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,5 @@ spec:
cronline: 0 12 * * *
message: Daily Chrome Forward Testing
branch: main
tags:
- kibana
2 changes: 2 additions & 0 deletions .buildkite/pipeline-resource-definitions/kibana-codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,5 @@ spec:
access_level: MANAGE_BUILD_AND_READ
everyone:
access_level: READ_ONLY
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,5 @@ spec:
cronline: 0 5 * * *
message: Daily 6 am UTC
branch: main
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,5 @@ spec:
access_level: MANAGE_BUILD_AND_READ
everyone:
access_level: BUILD_AND_READ
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,5 @@ spec:
env:
PUBLISH_DOCKER_TAG: 'true'
branch: main
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ spec:
cronline: 0 9 * * * America/New_York
message: Daily build
branch: '7.17'
tags:
- kibana
---
# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
apiVersion: backstage.io/v1alpha1
Expand Down Expand Up @@ -108,6 +110,8 @@ spec:
access_level: MANAGE_BUILD_AND_READ
kibana-tech-leads:
access_level: MANAGE_BUILD_AND_READ
tags:
- kibana
---
# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
apiVersion: backstage.io/v1alpha1
Expand Down Expand Up @@ -156,3 +160,5 @@ spec:
access_level: MANAGE_BUILD_AND_READ
kibana-tech-leads:
access_level: MANAGE_BUILD_AND_READ
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,5 @@ spec:
cronline: 0 0 * * 1 America/New_York
message: Weekly build
branch: main
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,5 @@ spec:
access_level: MANAGE_BUILD_AND_READ
everyone:
access_level: READ_ONLY
tags:
- kibana
2 changes: 2 additions & 0 deletions .buildkite/pipeline-resource-definitions/kibana-flaky.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,5 @@ spec:
access_level: MANAGE_BUILD_AND_READ
kibana-tech-leads:
access_level: MANAGE_BUILD_AND_READ
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,5 @@ spec:
message: Single user daily test
env: {}
branch: main
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,5 @@ spec:
access_level: MANAGE_BUILD_AND_READ
everyone:
access_level: BUILD_AND_READ
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,5 @@ spec:
access_level: MANAGE_BUILD_AND_READ
kibana-tech-leads:
access_level: MANAGE_BUILD_AND_READ
tags:
- kibana
2 changes: 2 additions & 0 deletions .buildkite/pipeline-resource-definitions/kibana-on-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,5 @@ spec:
access_level: MANAGE_BUILD_AND_READ
kibana-tech-leads:
access_level: MANAGE_BUILD_AND_READ
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,5 @@ spec:
cronline: 0 */3 * * * Europe/Berlin
message: Single user daily test
branch: main
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,5 @@ spec:
cronline: 0 3/8 * * * Europe/Berlin
message: Extract APM traces
branch: main
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,5 @@ spec:
access_level: MANAGE_BUILD_AND_READ
everyone:
access_level: READ_ONLY
tags:
- kibana
2 changes: 2 additions & 0 deletions .buildkite/pipeline-resource-definitions/kibana-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,5 @@ spec:
access_level: MANAGE_BUILD_AND_READ
kibana-tech-leads:
access_level: MANAGE_BUILD_AND_READ
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,5 @@ spec:
access_level: MANAGE_BUILD_AND_READ
everyone:
access_level: BUILD_AND_READ
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ spec:
access_level: BUILD_AND_READ
everyone:
access_level: READ_ONLY
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,5 @@ spec:
access_level: BUILD_AND_READ
everyone:
access_level: READ_ONLY
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,5 @@ spec:
access_level: BUILD_AND_READ
everyone:
access_level: READ_ONLY
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,5 @@ spec:
access_level: MANAGE_BUILD_AND_READ
kibana-tech-leads:
access_level: MANAGE_BUILD_AND_READ
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,5 @@ spec:
env:
AUTO_SELECT_COMMIT: 'true'
branch: main
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,5 @@ spec:
cronline: 0 6 * * * Europe/Berlin
message: Scalability daily benchmarking
branch: main
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,6 @@ spec:
access_level: MANAGE_BUILD_AND_READ
everyone:
access_level: BUILD_AND_READ
tags:
- kibana
- security-solution
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,6 @@ spec:
access_level: MANAGE_BUILD_AND_READ
everyone:
access_level: BUILD_AND_READ
tags:
- kibana
- security-solution
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,6 @@ spec:
access_level: MANAGE_BUILD_AND_READ
everyone:
access_level: BUILD_AND_READ
tags:
- kibana
- security-solution
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,6 @@ spec:
access_level: MANAGE_BUILD_AND_READ
everyone:
access_level: BUILD_AND_READ
tags:
- kibana
- security-solution
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,6 @@ spec:
access_level: MANAGE_BUILD_AND_READ
everyone:
access_level: BUILD_AND_READ
tags:
- kibana
- security-solution
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,6 @@ spec:
access_level: MANAGE_BUILD_AND_READ
everyone:
access_level: BUILD_AND_READ
tags:
- kibana
- security-solution
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,6 @@ spec:
access_level: MANAGE_BUILD_AND_READ
everyone:
access_level: BUILD_AND_READ
tags:
- kibana
- security-solution
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,6 @@ spec:
access_level: MANAGE_BUILD_AND_READ
everyone:
access_level: BUILD_AND_READ
tags:
- kibana
- security-solution
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,5 @@ spec:
env:
TRIGGER_PIPELINE_SET: artifacts-trigger
MESSAGE: Daily build
tags:
- kibana
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ export const RuleTypeList: React.FC<RuleTypeListProps> = ({
grow={1}
style={{
paddingTop: euiTheme.size.base /* Match drop shadow padding in the right column */,
paddingRight: euiTheme.size.base,
overflowY: 'auto',
}}
>
<EuiFacetGroup>
Expand Down
1 change: 1 addition & 0 deletions packages/kbn-management/settings/setting_ids/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ export const OBSERVABILITY_LOGS_EXPLORER_ALLOWED_DATA_VIEWS_ID =
'observability:logsExplorer:allowedDataViews';
export const OBSERVABILITY_ENTITY_CENTRIC_EXPERIENCE = 'observability:entityCentricExperience';
export const OBSERVABILITY_LOGS_DATA_ACCESS_LOG_SOURCES_ID = 'observability:logSources';
export const OBSERVABILITY_ENABLE_LOGS_STREAM = 'observability:enableLogsStream';
export const OBSERVABILITY_AI_ASSISTANT_SIMULATED_FUNCTION_CALLING =
'observability:aiAssistantSimulatedFunctionCalling';
export const OBSERVABILITY_AI_ASSISTANT_SEARCH_CONNECTOR_INDEX_PATTERN =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,10 @@ export const stackManagementSchema: MakeSchemaFrom<UsageStats> = {
_meta: { description: 'Non-default value of setting.' },
},
},
'observability:enableLogsStream': {
type: 'boolean',
_meta: { description: 'Non-default value of setting.' },
},
'banners:placement': {
type: 'keyword',
_meta: { description: 'Non-default value of setting.' },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ export interface UsageStats {
'observability:apmEnableServiceInventoryTableSearchBar': boolean;
'observability:logsExplorer:allowedDataViews': string[];
'observability:logSources': string[];
'observability:enableLogsStream': boolean;
'observability:aiAssistantSimulatedFunctionCalling': boolean;
'observability:aiAssistantSearchConnectorIndexPattern': string;
'visualization:heatmap:maxBuckets': number;
Expand Down
6 changes: 6 additions & 0 deletions src/plugins/telemetry/schema/oss_plugins.json
Original file line number Diff line number Diff line change
Expand Up @@ -10486,6 +10486,12 @@
}
}
},
"observability:enableLogsStream": {
"type": "boolean",
"_meta": {
"description": "Non-default value of setting."
}
},
"banners:placement": {
"type": "keyword",
"_meta": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/

import expect from '@kbn/expect';

import { OBSERVABILITY_ENABLE_LOGS_STREAM } from '@kbn/management-settings-ids';
import { VisualizeConstants } from '@kbn/visualizations-plugin/common/constants';
import { FtrProviderContext } from '../../../ftr_provider_context';

Expand All @@ -28,6 +28,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await kibanaServer.uiSettings.replace({
defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
});
await kibanaServer.uiSettings.update({ [OBSERVABILITY_ENABLE_LOGS_STREAM]: true });
});

after(async () => {
await kibanaServer.savedObjects.cleanStandardList();
await kibanaServer.uiSettings.update({ [OBSERVABILITY_ENABLE_LOGS_STREAM]: false });
});

it('ensure toolbar popover closes on add', async () => {
Expand All @@ -39,10 +45,6 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await dashboardAddPanel.expectEditorMenuClosed();
});

after(async () => {
await kibanaServer.savedObjects.cleanStandardList();
});

describe('add new visualization link', () => {
before(async () => {
await dashboard.navigateToApp();
Expand Down
1 change: 1 addition & 0 deletions test/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,6 @@
"@kbn/default-nav-management",
"@kbn/default-nav-devtools",
"@kbn/core-saved-objects-import-export-server-internal",
"@kbn/management-settings-ids",
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,10 @@ export const ELASTIC_MODEL_DEFINITIONS: Record<
license: 'MIT',
licenseUrl: 'https://huggingface.co/elastic/multilingual-e5-small',
type: ['pytorch', 'text_embedding'],
disclaimer: i18n.translate('xpack.ml.trainedModels.modelsList.e5v1Disclaimer', {
defaultMessage:
'This E5 model, as defined, hosted, integrated and used in conjunction with our other Elastic Software is covered by our standard warranty.',
}),
},
[E5_LINUX_OPTIMIZED_MODEL_ID]: {
modelName: 'e5',
Expand All @@ -138,6 +142,10 @@ export const ELASTIC_MODEL_DEFINITIONS: Record<
license: 'MIT',
licenseUrl: 'https://huggingface.co/elastic/multilingual-e5-small_linux-x86_64',
type: ['pytorch', 'text_embedding'],
disclaimer: i18n.translate('xpack.ml.trainedModels.modelsList.e5v1Disclaimer', {
defaultMessage:
'This E5 model, as defined, hosted, integrated and used in conjunction with our other Elastic Software is covered by our standard warranty.',
}),
},
} as const);

Expand Down Expand Up @@ -167,6 +175,7 @@ export interface ModelDefinition {
/** Link to the external license/documentation page */
licenseUrl?: string;
type?: readonly string[];
disclaimer?: string;
}

export type ModelDefinitionResponse = ModelDefinition & {
Expand Down
Loading

0 comments on commit 084f255

Please sign in to comment.