Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Dmitriynj/kibana into fix…
Browse files Browse the repository at this point in the history 
…-data-grid-time-column
  • Loading branch information
@dimaanj
dimaanj committed Oct 26, 2021
2 parents 146e687 + 0b2d3b7 commit 052fe29
Show file tree
Hide file tree
Showing 634 changed files with 7,218 additions and 6,110 deletions.
12 changes: 6 additions & 6 deletions .buildkite/scripts/pipelines/pull_request/pipeline.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,12 @@ const uploadPipeline = (pipelineContent) => {
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/security_solution.yml'));
}

// if (
// (await doAnyChangesMatch([/^x-pack\/plugins\/apm/])) ||
// process.env.GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
// ) {
// pipeline.push(getPipeline('.buildkite/pipelines/pull_request/apm_cypress.yml'));
// }
if (
(await doAnyChangesMatch([/^x-pack\/plugins\/apm/])) ||
process.env.GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
) {
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/apm_cypress.yml'));
}

if (await doAnyChangesMatch([/^x-pack\/plugins\/uptime/])) {
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/uptime.yml'));
Expand Down
8 changes: 6 additions & 2 deletions .buildkite/scripts/steps/functional/apm_cypress.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@

set -euo pipefail

source .buildkite/scripts/steps/functional/common.sh
source .buildkite/scripts/common/util.sh

.buildkite/scripts/bootstrap.sh
.buildkite/scripts/download_build_artifacts.sh

export JOB=kibana-apm-cypress

Expand All @@ -11,4 +14,5 @@ echo "--- APM Cypress Tests"
cd "$XPACK_DIR"

checks-reporter-with-killswitch "APM Cypress Tests" \
node plugins/apm/scripts/test/e2e.js
node plugins/apm/scripts/test/e2e.js \
--kibana-install-dir "$KIBANA_BUILD_LOCATION"
18 changes: 9 additions & 9 deletions .github/CODEOWNERS
View file
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,15 @@
# Observability Shared
/x-pack/plugins/observability/ @elastic/observability-ui

# Logs and Metrics (Infra)
/x-pack/plugins/infra/ @elastic/logs-metrics-ui
/x-pack/plugins/infra/server/routes/log* @elastic/logs-metrics-ui @elastic/logs-ui
/x-pack/plugins/infra/public/pages/logs/ @elastic/logs-metrics-ui @elastic/logs-ui
/x-pack/plugins/infra/server/routes/metrics* @elastic/logs-metrics-ui @elastic/metrics-ui
/x-pack/plugins/infra/public/pages/metrics/ @elastic/logs-metrics-ui @elastic/metrics-ui

# Stack Monitoring
/x-pack/plugins/monitoring/ @elastic/stack-monitoring-ui @elastic/logs-metrics-ui @elastic/metrics-ui
# Infra Monitoring
/x-pack/plugins/infra/ @elastic/infra-monitoring-ui
/x-pack/test/functional/apps/infra @elastic/infra-monitoring-ui
/x-pack/test/api_integration/apis/infra @elastic/infra-monitoring-ui

# Elastic Stack Monitoring
/x-pack/plugins/monitoring/ @elastic/infra-monitoring-ui
/x-pack/test/functional/apps/monitoring @elastic/infra-monitoring-ui
/x-pack/test/api_integration/apis/monitoring @elastic/infra-monitoring-ui

# Fleet
/x-pack/plugins/fleet/ @elastic/fleet
Expand Down
36 changes: 18 additions & 18 deletions api_docs/deprecations_by_api.mdx
View file

Large diffs are not rendered by default.

101 changes: 49 additions & 52 deletions api_docs/deprecations_by_plugin.mdx
View file

Large diffs are not rendered by default.

288 changes: 0 additions & 288 deletions api_docs/elastic_apm_generator.json
View file

This file was deleted.

321 changes: 321 additions & 0 deletions api_docs/elastic_apm_synthtrace.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,321 @@
{
"id": "@elastic/apm-synthtrace",
"client": {
"classes": [],
"functions": [],
"interfaces": [],
"enums": [],
"misc": [],
"objects": []
},
"server": {
"classes": [],
"functions": [
{
"parentPluginId": "@elastic/apm-synthtrace",
"id": "def-server.getBreakdownMetrics",
"type": "Function",
"tags": [],
"label": "getBreakdownMetrics",
"description": [],
"signature": [
"(events: ",
"Fields",
"[]) => ",
"Fields",
"[]"
],
"path": "packages/elastic-apm-synthtrace/src/lib/utils/get_breakdown_metrics.ts",
"deprecated": false,
"children": [
{
"parentPluginId": "@elastic/apm-synthtrace",
"id": "def-server.getBreakdownMetrics.$1",
"type": "Array",
"tags": [],
"label": "events",
"description": [],
"signature": [
"Fields",
"[]"
],
"path": "packages/elastic-apm-synthtrace/src/lib/utils/get_breakdown_metrics.ts",
"deprecated": false,
"isRequired": true
}
],
"returnComment": [],
"initialIsOpen": false
},
{
"parentPluginId": "@elastic/apm-synthtrace",
"id": "def-server.getObserverDefaults",
"type": "Function",
"tags": [],
"label": "getObserverDefaults",
"description": [],
"signature": [
"() => ",
"Fields"
],
"path": "packages/elastic-apm-synthtrace/src/lib/defaults/get_observer_defaults.ts",
"deprecated": false,
"children": [],
"returnComment": [],
"initialIsOpen": false
},
{
"parentPluginId": "@elastic/apm-synthtrace",
"id": "def-server.getSpanDestinationMetrics",
"type": "Function",
"tags": [],
"label": "getSpanDestinationMetrics",
"description": [],
"signature": [
"(events: ",
"Fields",
"[]) => { \"metricset.name\": string; 'span.destination.service.response_time.sum.us': number; 'span.destination.service.response_time.count': number; '@timestamp'?: number | undefined; 'agent.name'?: string | undefined; 'agent.version'?: string | undefined; 'container.id'?: string | undefined; 'ecs.version'?: string | undefined; 'event.outcome'?: string | undefined; 'event.ingested'?: number | undefined; 'error.id'?: string | undefined; 'error.exception'?: ",
"Exception",
"[] | undefined; 'error.grouping_name'?: string | undefined; 'error.grouping_key'?: string | undefined; 'host.name'?: string | undefined; 'observer.version'?: string | undefined; 'observer.version_major'?: number | undefined; 'parent.id'?: string | undefined; 'processor.event'?: string | undefined; 'processor.name'?: string | undefined; 'trace.id'?: string | undefined; 'transaction.name'?: string | undefined; 'transaction.type'?: string | undefined; 'transaction.id'?: string | undefined; 'transaction.duration.us'?: number | undefined; 'transaction.duration.histogram'?: { values: number[]; counts: number[]; } | undefined; 'transaction.sampled'?: true | undefined; 'service.name'?: string | undefined; 'service.environment'?: string | undefined; 'service.node.name'?: string | undefined; 'span.id'?: string | undefined; 'span.name'?: string | undefined; 'span.type'?: string | undefined; 'span.subtype'?: string | undefined; 'span.duration.us'?: number | undefined; 'span.destination.service.name'?: string | undefined; 'span.destination.service.resource'?: string | undefined; 'span.destination.service.type'?: string | undefined; 'span.self_time.count'?: number | undefined; 'span.self_time.sum.us'?: number | undefined; 'system.process.memory.size'?: number | undefined; 'system.memory.actual.free'?: number | undefined; 'system.memory.total'?: number | undefined; 'system.cpu.total.norm.pct'?: number | undefined; 'system.process.memory.rss.bytes'?: number | undefined; 'system.process.cpu.total.norm.pct'?: number | undefined; }[]"
],
"path": "packages/elastic-apm-synthtrace/src/lib/utils/get_span_destination_metrics.ts",
"deprecated": false,
"children": [
{
"parentPluginId": "@elastic/apm-synthtrace",
"id": "def-server.getSpanDestinationMetrics.$1",
"type": "Array",
"tags": [],
"label": "events",
"description": [],
"signature": [
"Fields",
"[]"
],
"path": "packages/elastic-apm-synthtrace/src/lib/utils/get_span_destination_metrics.ts",
"deprecated": false,
"isRequired": true
}
],
"returnComment": [],
"initialIsOpen": false
},
{
"parentPluginId": "@elastic/apm-synthtrace",
"id": "def-server.getTransactionMetrics",
"type": "Function",
"tags": [],
"label": "getTransactionMetrics",
"description": [],
"signature": [
"(events: ",
"Fields",
"[]) => { 'transaction.duration.histogram': { values: number[]; counts: number[]; }; _doc_count: number; '@timestamp'?: number | undefined; 'agent.name'?: string | undefined; 'agent.version'?: string | undefined; 'container.id'?: string | undefined; 'ecs.version'?: string | undefined; 'event.outcome'?: string | undefined; 'event.ingested'?: number | undefined; 'error.id'?: string | undefined; 'error.exception'?: ",
"Exception",
"[] | undefined; 'error.grouping_name'?: string | undefined; 'error.grouping_key'?: string | undefined; 'host.name'?: string | undefined; 'metricset.name'?: string | undefined; 'observer.version'?: string | undefined; 'observer.version_major'?: number | undefined; 'parent.id'?: string | undefined; 'processor.event'?: string | undefined; 'processor.name'?: string | undefined; 'trace.id'?: string | undefined; 'transaction.name'?: string | undefined; 'transaction.type'?: string | undefined; 'transaction.id'?: string | undefined; 'transaction.duration.us'?: number | undefined; 'transaction.sampled'?: true | undefined; 'service.name'?: string | undefined; 'service.environment'?: string | undefined; 'service.node.name'?: string | undefined; 'span.id'?: string | undefined; 'span.name'?: string | undefined; 'span.type'?: string | undefined; 'span.subtype'?: string | undefined; 'span.duration.us'?: number | undefined; 'span.destination.service.name'?: string | undefined; 'span.destination.service.resource'?: string | undefined; 'span.destination.service.type'?: string | undefined; 'span.destination.service.response_time.sum.us'?: number | undefined; 'span.destination.service.response_time.count'?: number | undefined; 'span.self_time.count'?: number | undefined; 'span.self_time.sum.us'?: number | undefined; 'system.process.memory.size'?: number | undefined; 'system.memory.actual.free'?: number | undefined; 'system.memory.total'?: number | undefined; 'system.cpu.total.norm.pct'?: number | undefined; 'system.process.memory.rss.bytes'?: number | undefined; 'system.process.cpu.total.norm.pct'?: number | undefined; }[]"
],
"path": "packages/elastic-apm-synthtrace/src/lib/utils/get_transaction_metrics.ts",
"deprecated": false,
"children": [
{
"parentPluginId": "@elastic/apm-synthtrace",
"id": "def-server.getTransactionMetrics.$1",
"type": "Array",
"tags": [],
"label": "events",
"description": [],
"signature": [
"Fields",
"[]"
],
"path": "packages/elastic-apm-synthtrace/src/lib/utils/get_transaction_metrics.ts",
"deprecated": false,
"isRequired": true
}
],
"returnComment": [],
"initialIsOpen": false
},
{
"parentPluginId": "@elastic/apm-synthtrace",
"id": "def-server.service",
"type": "Function",
"tags": [],
"label": "service",
"description": [],
"signature": [
"(name: string, environment: string, agentName: string) => ",
"Service"
],
"path": "packages/elastic-apm-synthtrace/src/lib/service.ts",
"deprecated": false,
"children": [
{
"parentPluginId": "@elastic/apm-synthtrace",
"id": "def-server.service.$1",
"type": "string",
"tags": [],
"label": "name",
"description": [],
"signature": [
"string"
],
"path": "packages/elastic-apm-synthtrace/src/lib/service.ts",
"deprecated": false,
"isRequired": true
},
{
"parentPluginId": "@elastic/apm-synthtrace",
"id": "def-server.service.$2",
"type": "string",
"tags": [],
"label": "environment",
"description": [],
"signature": [
"string"
],
"path": "packages/elastic-apm-synthtrace/src/lib/service.ts",
"deprecated": false,
"isRequired": true
},
{
"parentPluginId": "@elastic/apm-synthtrace",
"id": "def-server.service.$3",
"type": "string",
"tags": [],
"label": "agentName",
"description": [],
"signature": [
"string"
],
"path": "packages/elastic-apm-synthtrace/src/lib/service.ts",
"deprecated": false,
"isRequired": true
}
],
"returnComment": [],
"initialIsOpen": false
},
{
"parentPluginId": "@elastic/apm-synthtrace",
"id": "def-server.timerange",
"type": "Function",
"tags": [],
"label": "timerange",
"description": [],
"signature": [
"(from: number, to: number) => ",
"Timerange"
],
"path": "packages/elastic-apm-synthtrace/src/lib/timerange.ts",
"deprecated": false,
"children": [
{
"parentPluginId": "@elastic/apm-synthtrace",
"id": "def-server.timerange.$1",
"type": "number",
"tags": [],
"label": "from",
"description": [],
"signature": [
"number"
],
"path": "packages/elastic-apm-synthtrace/src/lib/timerange.ts",
"deprecated": false,
"isRequired": true
},
{
"parentPluginId": "@elastic/apm-synthtrace",
"id": "def-server.timerange.$2",
"type": "number",
"tags": [],
"label": "to",
"description": [],
"signature": [
"number"
],
"path": "packages/elastic-apm-synthtrace/src/lib/timerange.ts",
"deprecated": false,
"isRequired": true
}
],
"returnComment": [],
"initialIsOpen": false
},
{
"parentPluginId": "@elastic/apm-synthtrace",
"id": "def-server.toElasticsearchOutput",
"type": "Function",
"tags": [],
"label": "toElasticsearchOutput",
"description": [],
"signature": [
"({\n events,\n writeTargets,\n}: { events: ",
"Fields",
"[]; writeTargets: ",
"ElasticsearchOutputWriteTargets",
"; }) => ",
"ElasticsearchOutput",
"[]"
],
"path": "packages/elastic-apm-synthtrace/src/lib/output/to_elasticsearch_output.ts",
"deprecated": false,
"children": [
{
"parentPluginId": "@elastic/apm-synthtrace",
"id": "def-server.toElasticsearchOutput.$1",
"type": "Object",
"tags": [],
"label": "{\n events,\n writeTargets,\n}",
"description": [],
"path": "packages/elastic-apm-synthtrace/src/lib/output/to_elasticsearch_output.ts",
"deprecated": false,
"children": [
{
"parentPluginId": "@elastic/apm-synthtrace",
"id": "def-server.toElasticsearchOutput.$1.events",
"type": "Array",
"tags": [],
"label": "events",
"description": [],
"signature": [
"Fields",
"[]"
],
"path": "packages/elastic-apm-synthtrace/src/lib/output/to_elasticsearch_output.ts",
"deprecated": false
},
{
"parentPluginId": "@elastic/apm-synthtrace",
"id": "def-server.toElasticsearchOutput.$1.writeTargets",
"type": "Object",
"tags": [],
"label": "writeTargets",
"description": [],
"signature": [
"ElasticsearchOutputWriteTargets"
],
"path": "packages/elastic-apm-synthtrace/src/lib/output/to_elasticsearch_output.ts",
"deprecated": false
}
]
}
],
"returnComment": [],
"initialIsOpen": false
}
],
"interfaces": [],
"enums": [],
"misc": [],
"objects": []
},
"common": {
"classes": [],
"functions": [],
"interfaces": [],
"enums": [],
"misc": [],
"objects": []
}
}
Loading

0 comments on commit 052fe29

Please sign in to comment.