Skip to content

Commit 07b43a8

Browse files
Merge branch 'master' into monitoring/setup_mode_permissions
2 parents b3455a0 + fce5213 commit 07b43a8

File tree

554 files changed

+11115
-3998
lines changed

Some content is hidden

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

554 files changed

+11115
-3998
lines changed

.i18nrc.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"kibana_react": "src/legacy/core_plugins/kibana_react",
2121
"kibana-react": "src/plugins/kibana_react",
2222
"navigation": "src/legacy/core_plugins/navigation",
23+
"newsfeed": "src/plugins/newsfeed",
2324
"regionMap": "src/legacy/core_plugins/region_map",
2425
"server": "src/legacy/server",
2526
"statusPage": "src/legacy/core_plugins/status_page",

docs/development/core/server/kibana-plugin-server.basepath.get.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ returns `basePath` value, specific for an incoming request.
99
<b>Signature:</b>
1010

1111
```typescript
12-
get: (request: LegacyRequest | KibanaRequest<unknown, unknown, unknown>) => string;
12+
get: (request: KibanaRequest<unknown, unknown, unknown> | LegacyRequest) => string;
1313
```

docs/development/core/server/kibana-plugin-server.basepath.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ export declare class BasePath
1616

1717
| Property | Modifiers | Type | Description |
1818
| --- | --- | --- | --- |
19-
| [get](./kibana-plugin-server.basepath.get.md) | | <code>(request: LegacyRequest &#124; KibanaRequest&lt;unknown, unknown, unknown&gt;) =&gt; string</code> | returns <code>basePath</code> value, specific for an incoming request. |
19+
| [get](./kibana-plugin-server.basepath.get.md) | | <code>(request: KibanaRequest&lt;unknown, unknown, unknown&gt; &#124; LegacyRequest) =&gt; string</code> | returns <code>basePath</code> value, specific for an incoming request. |
2020
| [prepend](./kibana-plugin-server.basepath.prepend.md) | | <code>(path: string) =&gt; string</code> | Prepends <code>path</code> with the basePath. |
2121
| [remove](./kibana-plugin-server.basepath.remove.md) | | <code>(path: string) =&gt; string</code> | Removes the prepended basePath from the <code>path</code>. |
2222
| [serverBasePath](./kibana-plugin-server.basepath.serverbasepath.md) | | <code>string</code> | returns the server's basePath<!-- -->See [BasePath.get](./kibana-plugin-server.basepath.get.md) for getting the basePath value for a specific request |
23-
| [set](./kibana-plugin-server.basepath.set.md) | | <code>(request: LegacyRequest &#124; KibanaRequest&lt;unknown, unknown, unknown&gt;, requestSpecificBasePath: string) =&gt; void</code> | sets <code>basePath</code> value, specific for an incoming request. |
23+
| [set](./kibana-plugin-server.basepath.set.md) | | <code>(request: KibanaRequest&lt;unknown, unknown, unknown&gt; &#124; LegacyRequest, requestSpecificBasePath: string) =&gt; void</code> | sets <code>basePath</code> value, specific for an incoming request. |
2424

2525
## Remarks
2626

docs/development/core/server/kibana-plugin-server.basepath.set.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ sets `basePath` value, specific for an incoming request.
99
<b>Signature:</b>
1010

1111
```typescript
12-
set: (request: LegacyRequest | KibanaRequest<unknown, unknown, unknown>, requestSpecificBasePath: string) => void;
12+
set: (request: KibanaRequest<unknown, unknown, unknown> | LegacyRequest, requestSpecificBasePath: string) => void;
1313
```

docs/settings/apm-settings.asciidoc

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ xpack.apm.ui.transactionGroupBucketSize:: Number of top transaction groups displ
2323

2424
xpack.apm.ui.maxTraceItems:: Max number of child items displayed when viewing trace details. Defaults to `1000`.
2525

26-
apm_oss.apmAgentConfigurationIndex:: Index containing agent configuration settings. Defaults to `.apm-agent-configuration`.
27-
2826
apm_oss.indexPattern:: Index pattern is used for integrations with Machine Learning and Kuery Bar. It must match all apm indices. Defaults to `apm-*`.
2927

3028
apm_oss.errorIndices:: Matcher for indices containing error documents. Defaults to `apm-*`.
@@ -34,3 +32,8 @@ apm_oss.onboardingIndices:: Matcher for indices containing onboarding documents.
3432
apm_oss.spanIndices:: Matcher for indices containing span documents. Defaults to `apm-*`.
3533

3634
apm_oss.transactionIndices:: Matcher for indices containing transaction documents. Defaults to `apm-*`.
35+
36+
apm_oss.metricsIndices:: Matcher for indices containing metric documents. Defaults to `apm-*`.
37+
38+
apm_oss.sourcemapIndices:: Matcher for indices containing sourcemap documents. Defaults to `apm-*`.
39+

docs/setup/settings.asciidoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,10 @@ Kibana reads this url from an external metadata service, but users can still
240240
override this parameter to use their own Tile Map Service. For example:
241241
`"https://tiles.elastic.co/v2/default/{z}/{x}/{y}.png?elastic_tile_service_tos=agree&my_app_name=kibana"`
242242

243+
`newsfeed.enabled:` :: *Default: `true`* Controls whether to enable the newsfeed
244+
system for the Kibana UI notification center. Set to `false` to disable the
245+
newsfeed system.
246+
243247
`path.data:`:: *Default: `data`* The path where Kibana stores persistent data
244248
not saved in Elasticsearch.
245249

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@
360360
"chance": "1.0.18",
361361
"cheerio": "0.22.0",
362362
"chokidar": "3.2.1",
363-
"chromedriver": "^78.0.1",
363+
"chromedriver": "^77.0.0",
364364
"classnames": "2.2.6",
365365
"dedent": "^0.7.0",
366366
"delete-empty": "^2.0.0",
@@ -433,7 +433,7 @@
433433
"pngjs": "^3.4.0",
434434
"postcss": "^7.0.5",
435435
"postcss-url": "^8.0.0",
436-
"prettier": "^1.18.2",
436+
"prettier": "^1.19.1",
437437
"proxyquire": "1.8.0",
438438
"regenerate": "^1.4.0",
439439
"sass-lint": "^1.12.1",

packages/kbn-analytics/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
"@babel/cli": "7.5.5",
1818
"@kbn/dev-utils": "1.0.0",
1919
"@kbn/babel-preset": "1.0.0",
20-
"typescript": "3.5.1"
20+
"typescript": "3.5.3"
2121
}
2222
}

packages/kbn-analytics/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
* under the License.
1818
*/
1919

20-
export { createReporter, ReportHTTP, Reporter, ReporterConfig } from './reporter';
20+
export { ReportHTTP, Reporter, ReporterConfig } from './reporter';
2121
export { UiStatsMetricType, METRIC_TYPE } from './metrics';
2222
export { Report, ReportManager } from './report';

packages/kbn-analytics/src/metrics/index.ts

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,17 @@
1717
* under the License.
1818
*/
1919

20-
import { UiStatsMetric, UiStatsMetricType } from './ui_stats';
20+
import { UiStatsMetric } from './ui_stats';
21+
import { UserAgentMetric } from './user_agent';
2122

22-
export {
23-
UiStatsMetric,
24-
createUiStatsMetric,
25-
UiStatsMetricReport,
26-
UiStatsMetricType,
27-
} from './ui_stats';
23+
export { UiStatsMetric, createUiStatsMetric, UiStatsMetricType } from './ui_stats';
2824
export { Stats } from './stats';
25+
export { trackUsageAgent } from './user_agent';
2926

30-
export type Metric = UiStatsMetric<UiStatsMetricType>;
31-
export type MetricType = keyof typeof METRIC_TYPE;
32-
27+
export type Metric = UiStatsMetric | UserAgentMetric;
3328
export enum METRIC_TYPE {
3429
COUNT = 'count',
3530
LOADED = 'loaded',
3631
CLICK = 'click',
32+
USER_AGENT = 'user_agent',
3733
}

0 commit comments

Comments
 (0)