Skip to content

Commit a017eb9

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into lens/kql-error-handling
2 parents 59a5db9 + 564e91f commit a017eb9

122 files changed

Lines changed: 2878 additions & 711 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.ci/end2end.groovy‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ pipeline {
1414
HOME = "${env.WORKSPACE}"
1515
E2E_DIR = 'x-pack/plugins/apm/e2e'
1616
PIPELINE_LOG_LEVEL = 'DEBUG'
17+
KBN_OPTIMIZER_THEMES = 'v7light'
1718
}
1819
options {
1920
timeout(time: 1, unit: 'HOURS')

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
"@babel/plugin-transform-modules-commonjs": "^7.10.1",
124124
"@babel/register": "^7.10.1",
125125
"@elastic/apm-rum": "^5.2.0",
126-
"@elastic/charts": "19.6.3",
126+
"@elastic/charts": "19.7.0",
127127
"@elastic/datemath": "5.0.3",
128128
"@elastic/ems-client": "7.9.3",
129129
"@elastic/eui": "24.1.0",

‎packages/kbn-optimizer/src/integration_tests/basic_optimization.test.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ afterAll(async () => {
6363
await del(TMP_DIR);
6464
});
6565

66-
it('builds expected bundles, saves bundle counts to metadata', async () => {
66+
// FLAKY: https://github.com/elastic/kibana/issues/70762
67+
it.skip('builds expected bundles, saves bundle counts to metadata', async () => {
6768
const config = OptimizerConfig.create({
6869
repoRoot: MOCK_REPO_DIR,
6970
pluginScanDirs: [Path.resolve(MOCK_REPO_DIR, 'plugins')],
@@ -167,7 +168,8 @@ it('builds expected bundles, saves bundle counts to metadata', async () => {
167168
`);
168169
});
169170

170-
it('uses cache on second run and exist cleanly', async () => {
171+
// FLAKY: https://github.com/elastic/kibana/issues/70764
172+
it.skip('uses cache on second run and exist cleanly', async () => {
171173
const config = OptimizerConfig.create({
172174
repoRoot: MOCK_REPO_DIR,
173175
pluginScanDirs: [Path.resolve(MOCK_REPO_DIR, 'plugins')],

‎packages/kbn-ui-shared-deps/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"kbn:watch": "node scripts/build --dev --watch"
1010
},
1111
"dependencies": {
12-
"@elastic/charts": "19.6.3",
12+
"@elastic/charts": "19.7.0",
1313
"@elastic/eui": "24.1.0",
1414
"@elastic/numeral": "^2.5.0",
1515
"@kbn/i18n": "1.0.0",

‎src/plugins/home/public/assets/googlecloud_metrics/screenshot.png‎

2.71 MB
Loading

‎src/plugins/home/server/services/tutorials/lib/tutorials_registry_types.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ export interface TutorialSchema {
8282
name: string;
8383
isBeta?: boolean;
8484
shortDescription: string;
85-
euiIconType?: IconType; // EUI icon type string, one of https://elastic.github.io/eui/#/icon;
85+
euiIconType?: IconType; // EUI icon type string, one of https://elastic.github.io/eui/#/display/icons;
8686
longDescription: string;
8787
completionTimeMinutes?: number;
8888
previewImagePath?: string;

‎src/plugins/home/server/tutorials/googlecloud_metrics/index.ts‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
/*
2+
* Licensed to Elasticsearch B.V. under one or more contributor
3+
* license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright
5+
* ownership. Elasticsearch B.V. licenses this file to you under
6+
* the Apache License, Version 2.0 (the "License"); you may
7+
* not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
import { i18n } from '@kbn/i18n';
21+
import { TutorialsCategory } from '../../services/tutorials';
22+
import {
23+
onPremInstructions,
24+
cloudInstructions,
25+
onPremCloudInstructions,
26+
} from '../instructions/metricbeat_instructions';
27+
import {
28+
TutorialContext,
29+
TutorialSchema,
30+
} from '../../services/tutorials/lib/tutorials_registry_types';
31+
32+
export function googlecloudMetricsSpecProvider(context: TutorialContext): TutorialSchema {
33+
const moduleName = 'googlecloud';
34+
return {
35+
id: 'googlecloudMetrics',
36+
name: i18n.translate('home.tutorials.googlecloudMetrics.nameTitle', {
37+
defaultMessage: 'Google Cloud metrics',
38+
}),
39+
category: TutorialsCategory.METRICS,
40+
shortDescription: i18n.translate('home.tutorials.googlecloudMetrics.shortDescription', {
41+
defaultMessage:
42+
'Fetch monitoring metrics from Google Cloud Platform using Stackdriver Monitoring API.',
43+
}),
44+
longDescription: i18n.translate('home.tutorials.googlecloudMetrics.longDescription', {
45+
defaultMessage:
46+
'The `googlecloud` Metricbeat module fetches monitoring metrics from Google Cloud Platform using Stackdriver Monitoring API. \
47+
[Learn more]({learnMoreLink}).',
48+
values: {
49+
learnMoreLink: '{config.docs.beats.metricbeat}/metricbeat-module-googlecloud.html',
50+
},
51+
}),
52+
euiIconType: 'logoGCP',
53+
isBeta: false,
54+
artifacts: {
55+
dashboards: [
56+
{
57+
id: 'f40ee870-5e4a-11ea-a4f6-717338406083',
58+
linkLabel: i18n.translate(
59+
'home.tutorials.googlecloudMetrics.artifacts.dashboards.linkLabel',
60+
{
61+
defaultMessage: 'Google Cloud metrics dashboard',
62+
}
63+
),
64+
isOverview: true,
65+
},
66+
],
67+
exportedFields: {
68+
documentationUrl: '{config.docs.beats.metricbeat}/exported-fields-googlecloud.html',
69+
},
70+
},
71+
completionTimeMinutes: 10,
72+
previewImagePath: '/plugins/home/assets/googlecloud_metrics/screenshot.png',
73+
onPrem: onPremInstructions(moduleName, context),
74+
elasticCloud: cloudInstructions(moduleName),
75+
onPremElasticCloud: onPremCloudInstructions(moduleName),
76+
};
77+
}

‎src/plugins/home/server/tutorials/register.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ import { openmetricsMetricsSpecProvider } from './openmetrics_metrics';
9191
import { oracleMetricsSpecProvider } from './oracle_metrics';
9292
import { iisMetricsSpecProvider } from './iis_metrics';
9393
import { azureLogsSpecProvider } from './azure_logs';
94+
import { googlecloudMetricsSpecProvider } from './googlecloud_metrics';
9495

9596
export const builtInTutorials = [
9697
systemLogsSpecProvider,
@@ -168,4 +169,5 @@ export const builtInTutorials = [
168169
oracleMetricsSpecProvider,
169170
iisMetricsSpecProvider,
170171
azureLogsSpecProvider,
172+
googlecloudMetricsSpecProvider,
171173
];

‎src/plugins/kibana_usage_collection/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
This plugin registers the basic usage collectors from Kibana:
44

5-
- Application Usage
5+
- [Application Usage](./server/collectors/application_usage/README.md)
66
- UI Metrics
77
- Ops stats
88
- Number of Saved Objects per type

‎src/plugins/kibana_usage_collection/server/collectors/application_usage/README.md‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Application Usage
2+
3+
This collector reports the number of general clicks and minutes on screen for each registered application in Kibana.
4+
5+
The final payload matches the following contract:
6+
7+
```JSON
8+
{
9+
"application_usage": {
10+
"application_ID": {
11+
"clicks_7_days": 10,
12+
"clicks_30_days": 100,
13+
"clicks_90_days": 300,
14+
"clicks_total": 600,
15+
"minutes_on_screen_7_days": 10.40,
16+
"minutes_on_screen_30_days": 20.0,
17+
"minutes_on_screen_90_days": 110.1,
18+
"minutes_on_screen_total": 112.5
19+
}
20+
}
21+
}
22+
```
23+
24+
Where `application_ID` matches the `id` registered when calling the method `core.application.register`.
25+
This collection occurs by default for every application registered via the mentioned method and there is no need to do anything else to enable it or _opt-in_ for your plugin.
26+
27+
**Note to maintainers in the Kibana repo:** At the moment of writing, the `usageCollector.schema` is not updated automatically ([#70622](https://github.com/elastic/kibana/issues/70622)) so, if you are adding a new app to Kibana, you'll need to give the Kibana Telemetry team a heads up to update the mappings in the Telemetry Cluster accordingly.
28+
29+
## Developer notes
30+
31+
In order to keep the count of the events, this collector uses 2 Saved Objects:
32+
33+
1. `application_usage_transactional`: It stores each individually reported event (up to 90 days old). Grouped by `timestamp` and `appId`.
34+
2. `application_usage_totals`: It stores the sum of all the events older than 90 days old per `appId`.
35+
36+
Both of them use the shared fields `appId: 'keyword'`, `numberOfClicks: 'long'` and `minutesOnScreen: 'float'`. `application_usage_transactional` also stores `timestamp: { type: 'date' }`.
37+
but they are currently not added in the mappings because we don't use them for search purposes, and we need to be thoughtful with the number of mapped fields in the SavedObjects index ([#43673](https://github.com/elastic/kibana/issues/43673)).

0 commit comments

Comments
 (0)