Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[core.logging] Uses host timezone as default #90368

Merged

Conversation

TinaHeiligers
Copy link
Contributor

@TinaHeiligers TinaHeiligers commented Feb 5, 2021

Summary

Elasticsearch uses the host timezone as a logging default, whereas logging from the Kibana platform uses UTC as the default.

This PR aligns Kibana's logging settings in the Kibana platform with Elasticsearch, defaulting to the host timezone when the timezone for an appender is not explicitly set.

Addresses #89689

Checklist

Delete any items that are not applicable to this PR.

For maintainers

@TinaHeiligers TinaHeiligers added Team:Core Core services & architecture: plugins, logging, config, saved objects, http, ES client, i18n, etc v8.0.0 release_note:skip Skip the PR/issue when compiling release notes Feature:Logging v7.12.0 labels Feb 5, 2021
@TinaHeiligers TinaHeiligers changed the title Use host timezone as default, updates tests and snapshots [core.logging] Use host timezone as default, updates tests and snapshots Feb 5, 2021
@TinaHeiligers TinaHeiligers changed the title [core.logging] Use host timezone as default, updates tests and snapshots [core.logging] Use host timezone as default Feb 5, 2021
@@ -306,10 +306,10 @@ the `polling` method could be used enabling that option. *Default: `false`*
suppress all logging output. *Default: `false`*

| `logging.timezone`
| Set to the canonical time zone ID
| Optional. Set to the canonical time zone ID
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The legacy logging timezone default was changed from UTC to the host timezone in #22696. It appears that the documentation wasn't updated to reflect the change. As it stands right now, logging.timezone is actually optional (internally falling back to the local timezone of the host) and we needed to update the docs to reflect that.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As it stands right now, logging.timezone is actually optional (internally falling back to the local timezone of the host)

Are we certain that this is the current behavior?

I see that the changes made in #22696 are no longer present in the legacy logging config schema: https://github.com/elastic/kibana/blob/master/packages/kbn-legacy-logging/src/schema.ts#L61

It seems to me that the current setup docs on master are accurate based on how the system works, but that's a little confusing because this update to the migration doc which was added in #22696 is no longer correct: https://github.com/elastic/kibana/blob/master/docs/migration/migrate_8_0.asciidoc

Copy link
Contributor Author

@TinaHeiligers TinaHeiligers Feb 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lukeelmers The global logging.timezone is only applied to the legacy logging system. In the KP, this setting is ignored. This PR doesn't make any changes to the legacy logging behavior, it changes the default timezone used in the KP logging system to match the behavior of the legacy logger.

Copy link
Contributor Author

@TinaHeiligers TinaHeiligers Feb 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update: I removed Optional and replaced *Default: 'UTC'* with "When not set, log events use the host timezone"

@@ -87,7 +87,7 @@ describe('logging service', () => {
const loggedString = getPlatformLogsFromMock(mockConsoleLog);
expect(loggedString).toMatchInlineSnapshot(`
Array [
"[xxxx-xx-xxTxx:xx:xx.xxxZ][INFO ][test-file] handled by NP",
"[xxxx-xx-xxTxx:xx:xx.xxx-xx:xx][INFO ][test-file] handled by NP",
Copy link
Contributor Author

@TinaHeiligers TinaHeiligers Feb 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Default format changed from ISO8601 (UTC) to ISO8601_TZ (retains timezone offset) in the Kibana Platform.
This legacy logging test had to be updated for the setup, where we have both the legacy logging and KP logging systems configured.

Copy link
Member

@lukeelmers lukeelmers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall makes sense, added a few notes and questions.

A few other thoughts:

  • Should we still consider adding a core deprecation notice for logging.timezone in this PR, as that setting shouldn't be needed in 8.0 any more since it can be configured with the pattern layout?
  • Should we be updating JsonLayout as well? Currently it's always using UTC. Not sure if we would want to make this configurable or not

@@ -306,10 +306,10 @@ the `polling` method could be used enabling that option. *Default: `false`*
suppress all logging output. *Default: `false`*

| `logging.timezone`
| Set to the canonical time zone ID
| Optional. Set to the canonical time zone ID
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As it stands right now, logging.timezone is actually optional (internally falling back to the local timezone of the host)

Are we certain that this is the current behavior?

I see that the changes made in #22696 are no longer present in the legacy logging config schema: https://github.com/elastic/kibana/blob/master/packages/kbn-legacy-logging/src/schema.ts#L61

It seems to me that the current setup docs on master are accurate based on how the system works, but that's a little confusing because this update to the migration doc which was added in #22696 is no longer correct: https://github.com/elastic/kibana/blob/master/docs/migration/migrate_8_0.asciidoc

src/core/server/logging/layouts/conversions/date.ts Outdated Show resolved Hide resolved
Copy link
Contributor Author

@TinaHeiligers TinaHeiligers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

self review

@@ -306,10 +306,10 @@ the `polling` method could be used enabling that option. *Default: `false`*
suppress all logging output. *Default: `false`*

| `logging.timezone`
| Set to the canonical time zone ID
| Optional. Set to the canonical time zone ID
Copy link
Contributor Author

@TinaHeiligers TinaHeiligers Feb 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lukeelmers The global logging.timezone is only applied to the legacy logging system. In the KP, this setting is ignored. This PR doesn't make any changes to the legacy logging behavior, it changes the default timezone used in the KP logging system to match the behavior of the legacy logger.

@TinaHeiligers
Copy link
Contributor Author

TinaHeiligers commented Feb 5, 2021

  • Should we still consider adding a core deprecation notice for logging.timezone in this PR, as that setting shouldn't be needed in 8.0 any more since it can be configured with the pattern layout?

@lukeelmers I added one and tried to give enough detail in the deprecation notice.

My only concern is not being able to set the timezone on a more global log level. Each context that doesn't have a specified appender will inherit from the root logger, which has a default pattern of [%date][%level][%logger]%meta %message.

The root pattern isn't exposed and can't be modified. I guess one could define a custom appender and add that to the root logger, but we will end up with duplicate logs.

@TinaHeiligers
Copy link
Contributor Author

TinaHeiligers commented Feb 5, 2021

  • Should we be updating JsonLayout as well? Currently it's always using UTC. Not sure if we would want to make this configurable or not

@lukeelmers In the json layout, @timestamp is formatted as YYYY-MM-DDTHH:mm:ss.SSSZ by default and is equivalent to the pattern layout for ISO8601_TZ.

For example: With the following logging configuration:

// config/kibana.dev.yml
logging:
  events:
    log: ['debug', 'info']
    json: true
    verbose: true

  appenders:
    console:
      kind: console
      layout:
        kind: json

    customtz:
      kind: console
      layout:
        kind: pattern
        pattern: "[%date{ISO8601_TZ}] ISO8601_TZ [%level] %message"

    custommst:
      kind: console
      layout:
        kind: pattern
        pattern: "[%date{ISO8601_TZ}{America/Phoenix}] ISO8601_TZ America/Phoenix [%level] %message"

  root:
    appenders: [default]
    level: warn

  loggers:
    - context: metrics.ops
      appenders: [console, customtz, custommst]
      level: debug

We get ops.metrics logs as:

{"@timestamp":"2021-02-06T06:59:20.520-07:00","message":"memory: 416.3MB uptime: 0:00:31 load: [3.15,2.86,2.70] delay: 0.208","log":{"level":"DEBUG","logger":"metrics.ops"},"process":{"pid":38479,"uptime":31,"memory":{"heap":{"usedInBytes":436557920}},"eventLoopDelay":0.2075749635696411},"ecs":{"version":"1.7.0"},"event":{"kind":"metric","category":["process","host"],"type":"info"},"host":{"os":{"load":{"1m":3.15380859375,"5m":2.859375,"15m":2.703125}}}} --> json layout
[2021-02-06T06:59:20.520-07:00] ISO8601_TZ [DEBUG] memory: 416.3MB uptime: 0:00:31 load: [3.15,2.86,2.70] delay: 0.208
[2021-02-06T06:59:20.520-07:00] ISO8601_TZ America/Phoenix [DEBUG] memory: 416.3MB uptime: 0:00:31 load: [3.15,2.86,2.70] delay: 0.208

We could consider adding an optional modifier to the json layout for the timestamp field but at the moment, no conversions are supported.

log4j also doesn't support as many modifiers to a json layout as the pattern layout does. We can discuss how closely we want to mimic the log4j behavior but from what I can tell, we want to try and keep similar functionality in our logging implementation.

If we do feel that supporting field modifiers for json layout is needed and part of the larger logging effort, I think we need a new issue for the enhancement.

@TinaHeiligers
Copy link
Contributor Author

@elasticmachine merge upstream

@TinaHeiligers TinaHeiligers marked this pull request as ready for review February 8, 2021 21:28
@TinaHeiligers TinaHeiligers requested a review from a team as a code owner February 8, 2021 21:28
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-core (Team:Core)

Copy link
Member

@lukeelmers lukeelmers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the json layout, @timestamp is formatted as YYYY-MM-DDTHH:mm:ss.SSSZ by default and is equivalent to the pattern layout for ISO8601_TZ.

Thanks for highlighting this - I had read the code too quickly and missed the Z 😉


If we do feel that supporting field modifiers for json layout is needed and part of the larger logging effort, I think we need a new issue for the enhancement.

++ Yeah once this PR lands, this is the only case I can find related to timezones where we don't have feature parity with legacy platform, so I agree we should add it to the list for posterity, even if we don't address it soon. If I run Kibana like this:

node scripts/kibana serve --logging.dest=./kibana.log --logging.json=true --logging.timezone=EST

Then my json logs will indeed have their timezones changed, otherwise they continue to default to the host TZ. But there isn't currently a way to do this with json layout; it's always just the host TZ.


Tested and seems to be working well! I did another pass on the code too... My only nit would be to also update the migration docs which mention logging.timezone. Since we are deprecating that setting we should probably remove mention of the setting there and instead explain how to do this with pattern layout (or link to our README or whatever).

@TinaHeiligers TinaHeiligers added the auto-backport Deprecated - use backport:version if exact versions are needed label Feb 9, 2021
@TinaHeiligers TinaHeiligers changed the title [core.logging] Use host timezone as default [core.logging] Uses host timezone as default Feb 9, 2021
@TinaHeiligers TinaHeiligers enabled auto-merge (squash) February 9, 2021 22:44
@kibanamachine
Copy link
Contributor

💛 Build succeeded, but was flaky


Test Failures

Kibana Pipeline / general / Chrome X-Pack UI Functional Tests.x-pack/test/functional/apps/transform/feature_controls/transform_security·ts.transform feature controls security global all privileges (aka kibana_admin) should not render the "Stack" section

Link to Jenkins

Standard Out

Failed Tests Reporter:
  - Test has failed 5 times on tracked branches: https://github.com/elastic/kibana/issues/90576

[00:00:00]       │
[00:16:48]         └-: transform
[00:16:48]           └-> "before all" hook in "transform"
[00:16:48]           └-> "before all" hook in "transform"
[00:16:48]             │ debg creating role transform_source
[00:16:48]             │ info [o.e.x.s.a.r.TransportPutRoleAction] [kibana-ci-immutable-debian-tests-xxl-1612910678461156742] added role [transform_source]
[00:16:49]             │ debg creating role transform_dest
[00:16:49]             │ info [o.e.x.s.a.r.TransportPutRoleAction] [kibana-ci-immutable-debian-tests-xxl-1612910678461156742] added role [transform_dest]
[00:16:49]             │ debg creating role transform_dest_readonly
[00:16:49]             │ info [o.e.x.s.a.r.TransportPutRoleAction] [kibana-ci-immutable-debian-tests-xxl-1612910678461156742] added role [transform_dest_readonly]
[00:16:49]             │ debg creating role transform_ui_extras
[00:16:49]             │ info [o.e.x.s.a.r.TransportPutRoleAction] [kibana-ci-immutable-debian-tests-xxl-1612910678461156742] added role [transform_ui_extras]
[00:16:49]             │ debg creating user transform_poweruser
[00:16:49]             │ info [o.e.x.s.a.u.TransportPutUserAction] [kibana-ci-immutable-debian-tests-xxl-1612910678461156742] added user [transform_poweruser]
[00:16:49]             │ debg created user transform_poweruser
[00:16:49]             │ debg creating user transform_viewer
[00:16:49]             │ info [o.e.x.s.a.u.TransportPutUserAction] [kibana-ci-immutable-debian-tests-xxl-1612910678461156742] added user [transform_viewer]
[00:16:49]             │ debg created user transform_viewer
[00:16:49]           └-: feature controls
[00:16:49]             └-> "before all" hook in "feature controls"
[00:16:49]             └-: security
[00:16:49]               └-> "before all" hook in "security"
[00:16:49]               └-> "before all" hook in "security"
[00:16:49]                 │ info [empty_kibana] Loading "mappings.json"
[00:16:49]                 │ info [o.e.c.m.MetadataDeleteIndexService] [kibana-ci-immutable-debian-tests-xxl-1612910678461156742] [.kibana_task_manager_8.0.0_001/NsSgyL96RuuUKpznnTfRFw] deleting index
[00:16:49]                 │ info [o.e.c.m.MetadataDeleteIndexService] [kibana-ci-immutable-debian-tests-xxl-1612910678461156742] [.kibana_8.0.0_001/5aRs8HVMRYCxhxRhfm0dCg] deleting index
[00:16:49]                 │ info [o.e.c.m.MetadataDeleteIndexService] [kibana-ci-immutable-debian-tests-xxl-1612910678461156742] [.kibana_pre6.5.0_001/rNkm1CG1QXmdQaUS70jnRw] deleting index
[00:16:49]                 │ info [empty_kibana] Deleted existing index ".kibana_8.0.0_001"
[00:16:49]                 │ info [empty_kibana] Deleted existing index ".kibana_task_manager_8.0.0_001"
[00:16:49]                 │ info [empty_kibana] Deleted existing index ".kibana_pre6.5.0_001"
[00:16:49]                 │ info [o.e.c.m.MetadataCreateIndexService] [kibana-ci-immutable-debian-tests-xxl-1612910678461156742] [.kibana] creating index, cause [api], templates [], shards [1]/[1]
[00:16:49]                 │ info [empty_kibana] Created index ".kibana"
[00:16:49]                 │ debg [empty_kibana] ".kibana" settings {"index":{"number_of_replicas":"1","number_of_shards":"1"}}
[00:16:49]                 │ info [o.e.c.m.MetadataMappingService] [kibana-ci-immutable-debian-tests-xxl-1612910678461156742] [.kibana/ODPZc043RT-A2iP8EzcXkA] update_mapping [_doc]
[00:16:49]                 │ debg Migrating saved objects
[00:16:49]                 │ proc [kibana]   log   [23:36:32.787] [info][savedobjects-service] [.kibana_task_manager] INIT -> CREATE_NEW_TARGET
[00:16:49]                 │ info [o.e.c.m.MetadataCreateIndexService] [kibana-ci-immutable-debian-tests-xxl-1612910678461156742] [.kibana_task_manager_8.0.0_001] creating index, cause [api], templates [], shards [1]/[1]
[00:16:49]                 │ info [o.e.c.r.a.AllocationService] [kibana-ci-immutable-debian-tests-xxl-1612910678461156742] updating number_of_replicas to [0] for indices [.kibana_task_manager_8.0.0_001]
[00:16:49]                 │ proc [kibana]   log   [23:36:32.808] [info][savedobjects-service] [.kibana] INIT -> LEGACY_SET_WRITE_BLOCK
[00:16:49]                 │ info [o.e.c.m.MetadataIndexStateService] [kibana-ci-immutable-debian-tests-xxl-1612910678461156742] adding block write to indices [[.kibana/ODPZc043RT-A2iP8EzcXkA]]
[00:16:49]                 │ info [o.e.c.m.MetadataIndexStateService] [kibana-ci-immutable-debian-tests-xxl-1612910678461156742] completed adding block write to indices [.kibana]
[00:16:49]                 │ proc [kibana]   log   [23:36:32.845] [info][savedobjects-service] [.kibana_task_manager] CREATE_NEW_TARGET -> MARK_VERSION_INDEX_READY
[00:16:49]                 │ proc [kibana]   log   [23:36:32.857] [info][savedobjects-service] [.kibana] LEGACY_SET_WRITE_BLOCK -> LEGACY_CREATE_REINDEX_TARGET
[00:16:49]                 │ proc [kibana]   log   [23:36:32.872] [info][savedobjects-service] [.kibana_task_manager] MARK_VERSION_INDEX_READY -> DONE
[00:16:49]                 │ proc [kibana]   log   [23:36:32.873] [info][savedobjects-service] [.kibana_task_manager] Migration completed after 89ms
[00:16:49]                 │ info [o.e.c.m.MetadataCreateIndexService] [kibana-ci-immutable-debian-tests-xxl-1612910678461156742] [.kibana_pre6.5.0_001] creating index, cause [api], templates [], shards [1]/[1]
[00:16:49]                 │ info [o.e.c.r.a.AllocationService] [kibana-ci-immutable-debian-tests-xxl-1612910678461156742] updating number_of_replicas to [0] for indices [.kibana_pre6.5.0_001]
[00:16:49]                 │ proc [kibana]   log   [23:36:32.918] [info][savedobjects-service] [.kibana] LEGACY_CREATE_REINDEX_TARGET -> LEGACY_REINDEX
[00:16:49]                 │ info [o.e.t.LoggingTaskListener] [kibana-ci-immutable-debian-tests-xxl-1612910678461156742] 32259 finished with response BulkByScrollResponse[took=1.7ms,timed_out=false,sliceId=null,updated=0,created=0,deleted=0,batches=0,versionConflicts=0,noops=0,retries=0,throttledUntil=0s,bulk_failures=[],search_failures=[]]
[00:16:49]                 │ proc [kibana]   log   [23:36:32.924] [info][savedobjects-service] [.kibana] LEGACY_REINDEX -> LEGACY_REINDEX_WAIT_FOR_TASK
[00:16:49]                 │ proc [kibana]   log   [23:36:32.930] [info][savedobjects-service] [.kibana] LEGACY_REINDEX_WAIT_FOR_TASK -> LEGACY_DELETE
[00:16:49]                 │ info [o.e.c.m.MetadataDeleteIndexService] [kibana-ci-immutable-debian-tests-xxl-1612910678461156742] [.kibana/ODPZc043RT-A2iP8EzcXkA] deleting index
[00:16:49]                 │ proc [kibana]   log   [23:36:32.962] [info][savedobjects-service] [.kibana] LEGACY_DELETE -> SET_SOURCE_WRITE_BLOCK
[00:16:49]                 │ info [o.e.c.m.MetadataIndexStateService] [kibana-ci-immutable-debian-tests-xxl-1612910678461156742] adding block write to indices [[.kibana_pre6.5.0_001/OfRQddXETQ-iMYWw01pqGw]]
[00:16:49]                 │ info [o.e.c.m.MetadataIndexStateService] [kibana-ci-immutable-debian-tests-xxl-1612910678461156742] completed adding block write to indices [.kibana_pre6.5.0_001]
[00:16:49]                 │ proc [kibana]   log   [23:36:32.993] [info][savedobjects-service] [.kibana] SET_SOURCE_WRITE_BLOCK -> CREATE_REINDEX_TEMP
[00:16:49]                 │ info [o.e.c.m.MetadataCreateIndexService] [kibana-ci-immutable-debian-tests-xxl-1612910678461156742] [.kibana_8.0.0_reindex_temp] creating index, cause [api], templates [], shards [1]/[1]
[00:16:49]                 │ info [o.e.c.r.a.AllocationService] [kibana-ci-immutable-debian-tests-xxl-1612910678461156742] updating number_of_replicas to [0] for indices [.kibana_8.0.0_reindex_temp]
[00:16:49]                 │ info [o.e.c.r.a.AllocationService] [kibana-ci-immutable-debian-tests-xxl-1612910678461156742] current.health="GREEN" message="Cluster health status changed from [YELLOW] to [GREEN] (reason: [shards started [[.kibana_8.0.0_reindex_temp][0]]])." previous.health="YELLOW" reason="shards started [[.kibana_8.0.0_reindex_temp][0]]"
[00:16:49]                 │ proc [kibana]   log   [23:36:33.043] [info][savedobjects-service] [.kibana] CREATE_REINDEX_TEMP -> REINDEX_SOURCE_TO_TEMP
[00:16:49]                 │ info [o.e.t.LoggingTaskListener] [kibana-ci-immutable-debian-tests-xxl-1612910678461156742] 32288 finished with response BulkByScrollResponse[took=1.7ms,timed_out=false,sliceId=null,updated=0,created=0,deleted=0,batches=0,versionConflicts=0,noops=0,retries=0,throttledUntil=0s,bulk_failures=[],search_failures=[]]
[00:16:49]                 │ proc [kibana]   log   [23:36:33.049] [info][savedobjects-service] [.kibana] REINDEX_SOURCE_TO_TEMP -> REINDEX_SOURCE_TO_TEMP_WAIT_FOR_TASK
[00:16:49]                 │ proc [kibana]   log   [23:36:33.054] [info][savedobjects-service] [.kibana] REINDEX_SOURCE_TO_TEMP_WAIT_FOR_TASK -> SET_TEMP_WRITE_BLOCK
[00:16:49]                 │ info [o.e.c.m.MetadataIndexStateService] [kibana-ci-immutable-debian-tests-xxl-1612910678461156742] adding block write to indices [[.kibana_8.0.0_reindex_temp/RfWFt4BMRqi5IV5zaK9UhQ]]
[00:16:49]                 │ info [o.e.c.m.MetadataIndexStateService] [kibana-ci-immutable-debian-tests-xxl-1612910678461156742] completed adding block write to indices [.kibana_8.0.0_reindex_temp]
[00:16:49]                 │ proc [kibana]   log   [23:36:33.088] [info][savedobjects-service] [.kibana] SET_TEMP_WRITE_BLOCK -> CLONE_TEMP_TO_TARGET
[00:16:49]                 │ info [o.e.c.m.MetadataCreateIndexService] [kibana-ci-immutable-debian-tests-xxl-1612910678461156742] applying create index request using existing index [.kibana_8.0.0_reindex_temp] metadata
[00:16:49]                 │ info [o.e.c.m.MetadataCreateIndexService] [kibana-ci-immutable-debian-tests-xxl-1612910678461156742] [.kibana_8.0.0_001] creating index, cause [clone_index], templates [], shards [1]/[1]
[00:16:49]                 │ info [o.e.c.r.a.AllocationService] [kibana-ci-immutable-debian-tests-xxl-1612910678461156742] updating number_of_replicas to [0] for indices [.kibana_8.0.0_001]
[00:16:49]                 │ info [o.e.c.m.MetadataMappingService] [kibana-ci-immutable-debian-tests-xxl-1612910678461156742] [.kibana_8.0.0_001/3lHFyaC6SKKEYsz-Gzm-xw] create_mapping
[00:16:49]                 │ info [o.e.c.r.a.AllocationService] [kibana-ci-immutable-debian-tests-xxl-1612910678461156742] current.health="GREEN" message="Cluster health status changed from [YELLOW] to [GREEN] (reason: [shards started [[.kibana_8.0.0_001][0]]])." previous.health="YELLOW" reason="shards started [[.kibana_8.0.0_001][0]]"
[00:16:49]                 │ proc [kibana]   log   [23:36:33.169] [info][savedobjects-service] [.kibana] CLONE_TEMP_TO_TARGET -> OUTDATED_DOCUMENTS_SEARCH
[00:16:49]                 │ proc [kibana]   log   [23:36:33.176] [info][savedobjects-service] [.kibana] OUTDATED_DOCUMENTS_SEARCH -> UPDATE_TARGET_MAPPINGS
[00:16:49]                 │ info [o.e.c.m.MetadataMappingService] [kibana-ci-immutable-debian-tests-xxl-1612910678461156742] [.kibana_8.0.0_001/3lHFyaC6SKKEYsz-Gzm-xw] update_mapping [_doc]
[00:16:49]                 │ info [o.e.t.LoggingTaskListener] [kibana-ci-immutable-debian-tests-xxl-1612910678461156742] 32324 finished with response BulkByScrollResponse[took=1.1ms,timed_out=false,sliceId=null,updated=0,created=0,deleted=0,batches=0,versionConflicts=0,noops=0,retries=0,throttledUntil=0s,bulk_failures=[],search_failures=[]]
[00:16:49]                 │ proc [kibana]   log   [23:36:33.238] [info][savedobjects-service] [.kibana] UPDATE_TARGET_MAPPINGS -> UPDATE_TARGET_MAPPINGS_WAIT_FOR_TASK
[00:16:49]                 │ proc [kibana]   log   [23:36:33.242] [info][savedobjects-service] [.kibana] UPDATE_TARGET_MAPPINGS_WAIT_FOR_TASK -> MARK_VERSION_INDEX_READY
[00:16:49]                 │ info [o.e.c.m.MetadataDeleteIndexService] [kibana-ci-immutable-debian-tests-xxl-1612910678461156742] [.kibana_8.0.0_reindex_temp/RfWFt4BMRqi5IV5zaK9UhQ] deleting index
[00:16:49]                 │ proc [kibana]   log   [23:36:33.276] [info][savedobjects-service] [.kibana] MARK_VERSION_INDEX_READY -> DONE
[00:16:49]                 │ proc [kibana]   log   [23:36:33.277] [info][savedobjects-service] [.kibana] Migration completed after 494ms
[00:16:49]                 │ debg [empty_kibana] Migrated Kibana index after loading Kibana data
[00:16:49]                 │ debg [empty_kibana] Ensured that default space exists in .kibana
[00:16:49]                 │ debg applying update to kibana config: {"accessibility:disableAnimations":true,"dateFormat:tz":"UTC","visualization:visualize:legacyChartsLibrary":true}
[00:16:50]                 │ info [o.e.c.m.MetadataMappingService] [kibana-ci-immutable-debian-tests-xxl-1612910678461156742] [.kibana_8.0.0_001/3lHFyaC6SKKEYsz-Gzm-xw] update_mapping [_doc]
[00:16:51]                 │ debg SecurityPage.forceLogout
[00:16:51]                 │ debg Find.existsByDisplayedByCssSelector('.login-form') with timeout=100
[00:16:51]                 │ debg --- retry.tryForTime error: .login-form is not displayed
[00:16:52]                 │ debg Redirecting to /logout to force the logout
[00:16:52]                 │ debg Waiting on the login form to appear
[00:16:52]                 │ debg Waiting for Login Page to appear.
[00:16:52]                 │ debg Waiting up to 100000ms for login page...
[00:16:52]                 │ debg browser[INFO] http://localhost:61191/logout?_t=1612913795770 341 Refused to execute inline script because it violates the following Content Security Policy directive: "script-src 'unsafe-eval' 'self'". Either the 'unsafe-inline' keyword, a hash ('sha256-P5polb1UreUSOe5V/Pv7tc+yeZuJXiOi/3fqhGsU7BE='), or a nonce ('nonce-...') is required to enable inline execution.
[00:16:52]                 │
[00:16:52]                 │ debg browser[INFO] http://localhost:61191/bootstrap.js 42:19 "^ A single error about an inline script not firing due to content security policy is expected!"
[00:16:52]                 │ debg Find.existsByDisplayedByCssSelector('.login-form') with timeout=2500
[00:16:55]                 │ERROR browser[SEVERE] http://localhost:61191/internal/security/me - Failed to load resource: the server responded with a status of 401 (Unauthorized)
[00:16:55]                 │ debg browser[INFO] http://localhost:61191/login?msg=LOGGED_OUT 341 Refused to execute inline script because it violates the following Content Security Policy directive: "script-src 'unsafe-eval' 'self'". Either the 'unsafe-inline' keyword, a hash ('sha256-P5polb1UreUSOe5V/Pv7tc+yeZuJXiOi/3fqhGsU7BE='), or a nonce ('nonce-...') is required to enable inline execution.
[00:16:55]                 │
[00:16:55]                 │ debg browser[INFO] http://localhost:61191/bootstrap.js 42:19 "^ A single error about an inline script not firing due to content security policy is expected!"
[00:16:55]                 │ debg --- retry.tryForTime error: .login-form is not displayed
[00:16:55]                 │ERROR browser[SEVERE] http://localhost:61191/internal/spaces/_active_space - Failed to load resource: the server responded with a status of 401 (Unauthorized)
[00:16:55]                 │ERROR browser[SEVERE] http://localhost:61191/internal/security/me - Failed to load resource: the server responded with a status of 401 (Unauthorized)
[00:16:55]                 │ debg browser[INFO] http://localhost:61191/40237/bundles/core/core.entry.js 12:159412 "Detected an unhandled Promise rejection.
[00:16:55]                 │      Error: Unauthorized"
[00:16:55]                 │ERROR browser[SEVERE] http://localhost:61191/40237/bundles/core/core.entry.js 5:3002 
[00:16:55]                 │ERROR browser[SEVERE] http://localhost:61191/api/licensing/info - Failed to load resource: the server responded with a status of 401 (Unauthorized)
[00:16:56]                 │ debg Find.existsByDisplayedByCssSelector('.login-form') with timeout=2500
[00:16:56]                 │ debg navigating to home url: http://localhost:61191/app/home#/
[00:16:56]                 │ debg navigate to: http://localhost:61191/app/home#/
[00:16:56]                 │ debg browser[INFO] http://localhost:61191/login?next=%2Fapp%2Fhome%3F_t%3D1612913799774#/ 341 Refused to execute inline script because it violates the following Content Security Policy directive: "script-src 'unsafe-eval' 'self'". Either the 'unsafe-inline' keyword, a hash ('sha256-P5polb1UreUSOe5V/Pv7tc+yeZuJXiOi/3fqhGsU7BE='), or a nonce ('nonce-...') is required to enable inline execution.
[00:16:56]                 │
[00:16:56]                 │ debg browser[INFO] http://localhost:61191/bootstrap.js 42:19 "^ A single error about an inline script not firing due to content security policy is expected!"
[00:16:56]                 │ debg ... sleep(700) start
[00:16:57]                 │ERROR browser[SEVERE] http://localhost:61191/internal/spaces/_active_space - Failed to load resource: the server responded with a status of 401 (Unauthorized)
[00:16:57]                 │ debg browser[INFO] http://localhost:61191/40237/bundles/core/core.entry.js 12:159412 "Detected an unhandled Promise rejection.
[00:16:57]                 │      Error: Unauthorized"
[00:16:57]                 │ERROR browser[SEVERE] http://localhost:61191/40237/bundles/core/core.entry.js 5:3002 
[00:16:57]                 │ERROR browser[SEVERE] http://localhost:61191/api/licensing/info - Failed to load resource: the server responded with a status of 401 (Unauthorized)
[00:16:57]                 │ERROR browser[SEVERE] http://localhost:61191/internal/security/me - Failed to load resource: the server responded with a status of 401 (Unauthorized)
[00:16:57]                 │ debg ... sleep(700) end
[00:16:57]                 │ debg returned from get, calling refresh
[00:16:57]                 │ debg browser[INFO] http://localhost:61191/login?next=%2Fapp%2Fhome%3F_t%3D1612913799774#/ 341 Refused to execute inline script because it violates the following Content Security Policy directive: "script-src 'unsafe-eval' 'self'". Either the 'unsafe-inline' keyword, a hash ('sha256-P5polb1UreUSOe5V/Pv7tc+yeZuJXiOi/3fqhGsU7BE='), or a nonce ('nonce-...') is required to enable inline execution.
[00:16:57]                 │
[00:16:57]                 │ debg browser[INFO] http://localhost:61191/bootstrap.js 42:19 "^ A single error about an inline script not firing due to content security policy is expected!"
[00:16:58]                 │ debg currentUrl = http://localhost:61191/login?next=%2Fapp%2Fhome%3F_t%3D1612913799774#/
[00:16:58]                 │          appUrl = http://localhost:61191/app/home#/
[00:16:58]                 │ debg TestSubjects.find(kibanaChrome)
[00:16:58]                 │ debg Find.findByCssSelector('[data-test-subj="kibanaChrome"]') with timeout=60000
[00:16:58]                 │ debg Found login page
[00:16:58]                 │ debg TestSubjects.setValue(loginUsername, test_user)
[00:16:58]                 │ debg TestSubjects.click(loginUsername)
[00:16:58]                 │ debg Find.clickByCssSelector('[data-test-subj="loginUsername"]') with timeout=10000
[00:16:58]                 │ debg Find.findByCssSelector('[data-test-subj="loginUsername"]') with timeout=10000
[00:16:58]                 │ERROR browser[SEVERE] http://localhost:61191/internal/spaces/_active_space - Failed to load resource: the server responded with a status of 401 (Unauthorized)
[00:16:58]                 │ debg browser[INFO] http://localhost:61191/40237/bundles/core/core.entry.js 12:159412 "Detected an unhandled Promise rejection.
[00:16:58]                 │      Error: Unauthorized"
[00:16:58]                 │ERROR browser[SEVERE] http://localhost:61191/40237/bundles/core/core.entry.js 5:3002 
[00:16:58]                 │ERROR browser[SEVERE] http://localhost:61191/api/licensing/info - Failed to load resource: the server responded with a status of 401 (Unauthorized)
[00:16:58]                 │ debg TestSubjects.setValue(loginPassword, changeme)
[00:16:58]                 │ debg TestSubjects.click(loginPassword)
[00:16:58]                 │ debg Find.clickByCssSelector('[data-test-subj="loginPassword"]') with timeout=10000
[00:16:58]                 │ debg Find.findByCssSelector('[data-test-subj="loginPassword"]') with timeout=10000
[00:16:58]                 │ERROR browser[SEVERE] http://localhost:61191/internal/security/me - Failed to load resource: the server responded with a status of 401 (Unauthorized)
[00:16:58]                 │ debg TestSubjects.click(loginSubmit)
[00:16:58]                 │ debg Find.clickByCssSelector('[data-test-subj="loginSubmit"]') with timeout=10000
[00:16:58]                 │ debg Find.findByCssSelector('[data-test-subj="loginSubmit"]') with timeout=10000
[00:16:58]                 │ debg Find.waitForDeletedByCssSelector('.kibanaWelcomeLogo') with timeout=10000
[00:16:58]                 │ proc [kibana]   log   [23:36:41.944] [info][plugins][routes][security] Logging in with provider "basic" (basic)
[00:16:59]                 │ debg Find.findByCssSelector('[data-test-subj="kibanaChrome"]') with timeout=60000
[00:16:59]                 │ debg Find.findByCssSelector('[data-test-subj="kibanaChrome"] nav:not(.ng-hide)') with timeout=60000
[00:17:00]                 │ debg browser[INFO] http://localhost:61191/app/home?_t=1612913799774#/ 341 Refused to execute inline script because it violates the following Content Security Policy directive: "script-src 'unsafe-eval' 'self'". Either the 'unsafe-inline' keyword, a hash ('sha256-P5polb1UreUSOe5V/Pv7tc+yeZuJXiOi/3fqhGsU7BE='), or a nonce ('nonce-...') is required to enable inline execution.
[00:17:00]                 │
[00:17:00]                 │ debg browser[INFO] http://localhost:61191/bootstrap.js 42:19 "^ A single error about an inline script not firing due to content security policy is expected!"
[00:17:01]                 │ debg browser[INFO] http://localhost:61191/app/home?_t=1612913804001#/ 341 Refused to execute inline script because it violates the following Content Security Policy directive: "script-src 'unsafe-eval' 'self'". Either the 'unsafe-inline' keyword, a hash ('sha256-P5polb1UreUSOe5V/Pv7tc+yeZuJXiOi/3fqhGsU7BE='), or a nonce ('nonce-...') is required to enable inline execution.
[00:17:01]                 │
[00:17:01]                 │ debg browser[INFO] http://localhost:61191/bootstrap.js 42:19 "^ A single error about an inline script not firing due to content security policy is expected!"
[00:17:01]                 │ debg Finished login process currentUrl = http://localhost:61191/app/home#/
[00:17:01]                 │ debg ... sleep(501) start
[00:17:01]                 │ debg ... sleep(501) end
[00:17:01]                 │ debg in navigateTo url = http://localhost:61191/app/home#/
[00:17:01]                 │ debg TestSubjects.exists(statusPageContainer)
[00:17:01]                 │ debg Find.existsByDisplayedByCssSelector('[data-test-subj="statusPageContainer"]') with timeout=2500
[00:17:04]                 │ debg --- retry.tryForTime error: [data-test-subj="statusPageContainer"] is not displayed
[00:17:05]               └-: global all privileges (aka kibana_admin)
[00:17:05]                 └-> "before all" hook for "should show the Stack Management nav link"
[00:17:05]                 └-> "before all" hook for "should show the Stack Management nav link"
[00:17:05]                   │ debg set roles = kibana_admin
[00:17:05]                   │ debg creating user test_user
[00:17:05]                   │ info [o.e.x.s.a.u.TransportPutUserAction] [kibana-ci-immutable-debian-tests-xxl-1612910678461156742] updated user [test_user]
[00:17:05]                   │ debg created user test_user
[00:17:05]                   │ debg TestSubjects.exists(kibanaChrome)
[00:17:05]                   │ debg Find.existsByCssSelector('[data-test-subj="kibanaChrome"]') with timeout=2500
[00:17:05]                   │ debg TestSubjects.find(kibanaChrome)
[00:17:05]                   │ debg Find.findByCssSelector('[data-test-subj="kibanaChrome"]') with timeout=100000
[00:17:05]                   │ debg browser[INFO] http://localhost:61191/app/home?_t=1612913804001#/ 341 Refused to execute inline script because it violates the following Content Security Policy directive: "script-src 'unsafe-eval' 'self'". Either the 'unsafe-inline' keyword, a hash ('sha256-P5polb1UreUSOe5V/Pv7tc+yeZuJXiOi/3fqhGsU7BE='), or a nonce ('nonce-...') is required to enable inline execution.
[00:17:05]                   │
[00:17:05]                   │ debg browser[INFO] http://localhost:61191/bootstrap.js 42:19 "^ A single error about an inline script not firing due to content security policy is expected!"
[00:17:06]                 └-> should show the Stack Management nav link
[00:17:06]                   └-> "before each" hook: global before each for "should show the Stack Management nav link"
[00:17:06]                   │ debg isGlobalLoadingIndicatorVisible
[00:17:06]                   │ debg TestSubjects.exists(globalLoadingIndicator)
[00:17:06]                   │ debg Find.existsByDisplayedByCssSelector('[data-test-subj="globalLoadingIndicator"]') with timeout=1500
[00:17:07]                   │ debg --- retry.tryForTime error: [data-test-subj="globalLoadingIndicator"] is not displayed
[00:17:08]                   │ debg TestSubjects.exists(globalLoadingIndicator-hidden)
[00:17:08]                   │ debg Find.existsByCssSelector('[data-test-subj="globalLoadingIndicator-hidden"]') with timeout=100000
[00:17:08]                   │ debg TestSubjects.exists(collapsibleNav)
[00:17:08]                   │ debg Find.existsByDisplayedByCssSelector('[data-test-subj="collapsibleNav"]') with timeout=2500
[00:17:10]                   │ debg --- retry.tryForTime error: [data-test-subj="collapsibleNav"] is not displayed
[00:17:11]                   │ debg TestSubjects.click(toggleNavButton)
[00:17:11]                   │ debg Find.clickByCssSelector('[data-test-subj="toggleNavButton"]') with timeout=10000
[00:17:11]                   │ debg Find.findByCssSelector('[data-test-subj="toggleNavButton"]') with timeout=10000
[00:17:11]                   │ debg TestSubjects.find(collapsibleNav)
[00:17:11]                   │ debg Find.findByCssSelector('[data-test-subj="collapsibleNav"]') with timeout=10000
[00:17:11]                   │ debg Find.existsByCssSelector('[data-test-subj=collapsibleNav] > button') with timeout=2500
[00:17:11]                   │ debg Find.findByCssSelector('[data-test-subj=collapsibleNav] > button') with timeout=10000
[00:17:11]                   │ debg Find.clickByCssSelector('[data-test-subj=collapsibleNav] > button') with timeout=10000
[00:17:11]                   │ debg Find.findByCssSelector('[data-test-subj=collapsibleNav] > button') with timeout=10000
[00:17:11]                   └- ✓ pass  (5.5s) "transform feature controls security global all privileges (aka kibana_admin) should show the Stack Management nav link"
[00:17:11]                 └-> should not render the "Stack" section
[00:17:11]                   └-> "before each" hook: global before each for "should not render the "Stack" section"
[00:17:11]                   │ debg navigating to management url: http://localhost:61191/app/management
[00:17:11]                   │ debg navigate to: http://localhost:61191/app/management
[00:17:11]                   │ debg browser[INFO] http://localhost:61191/app/management?_t=1612913815083 341 Refused to execute inline script because it violates the following Content Security Policy directive: "script-src 'unsafe-eval' 'self'". Either the 'unsafe-inline' keyword, a hash ('sha256-P5polb1UreUSOe5V/Pv7tc+yeZuJXiOi/3fqhGsU7BE='), or a nonce ('nonce-...') is required to enable inline execution.
[00:17:11]                   │
[00:17:11]                   │ debg browser[INFO] http://localhost:61191/bootstrap.js 42:19 "^ A single error about an inline script not firing due to content security policy is expected!"
[00:17:11]                   │ debg ... sleep(700) start
[00:17:12]                   │ debg ... sleep(700) end
[00:17:12]                   │ debg returned from get, calling refresh
[00:17:12]                   │ debg browser[INFO] http://localhost:61191/app/management?_t=1612913815083 341 Refused to execute inline script because it violates the following Content Security Policy directive: "script-src 'unsafe-eval' 'self'". Either the 'unsafe-inline' keyword, a hash ('sha256-P5polb1UreUSOe5V/Pv7tc+yeZuJXiOi/3fqhGsU7BE='), or a nonce ('nonce-...') is required to enable inline execution.
[00:17:12]                   │
[00:17:12]                   │ debg browser[INFO] http://localhost:61191/bootstrap.js 42:19 "^ A single error about an inline script not firing due to content security policy is expected!"
[00:17:12]                   │ debg currentUrl = http://localhost:61191/app/management
[00:17:12]                   │          appUrl = http://localhost:61191/app/management
[00:17:12]                   │ debg TestSubjects.find(kibanaChrome)
[00:17:12]                   │ debg Find.findByCssSelector('[data-test-subj="kibanaChrome"]') with timeout=60000
[00:17:14]                   │ debg ... sleep(501) start
[00:17:14]                   │ debg ... sleep(501) end
[00:17:14]                   │ debg in navigateTo url = http://localhost:61191/app/management
[00:17:14]                   │ debg TestSubjects.exists(statusPageContainer)
[00:17:14]                   │ debg Find.existsByDisplayedByCssSelector('[data-test-subj="statusPageContainer"]') with timeout=2500
[00:17:17]                   │ debg --- retry.tryForTime error: [data-test-subj="statusPageContainer"] is not displayed
[00:17:17]                   │ debg Find.allByCssSelector('.mgtSideBarNav > .euiSideNav__content > .euiSideNavItem') with timeout=10000
[00:17:17]                   │ info Taking screenshot "/dev/shm/workspace/parallel/19/kibana/x-pack/test/functional/screenshots/failure/transform feature controls security global all privileges _aka kibana_admin_ should not render the _Stack_ section.png"
[00:17:18]                   │ info Current URL is: http://localhost:61191/app/management
[00:17:18]                   │ info Saving page source to: /dev/shm/workspace/parallel/19/kibana/x-pack/test/functional/failure_debug/html/transform feature controls security global all privileges _aka kibana_admin_ should not render the _Stack_ section.html
[00:17:18]                   └- ✖ fail: transform feature controls security global all privileges (aka kibana_admin) should not render the "Stack" section
[00:17:18]                   │       Error: expected [ 'ingest', 'insightsAndAlerting', 'kibana' ] to sort of equal [ 'insightsAndAlerting', 'kibana' ]
[00:17:18]                   │       + expected - actual
[00:17:18]                   │ 
[00:17:18]                   │        [
[00:17:18]                   │       -  "ingest"
[00:17:18]                   │          "insightsAndAlerting"
[00:17:18]                   │          "kibana"
[00:17:18]                   │        ]
[00:17:18]                   │       
[00:17:18]                   │       at Assertion.assert (/dev/shm/workspace/parallel/19/kibana/packages/kbn-expect/expect.js:100:11)
[00:17:18]                   │       at Assertion.eql (/dev/shm/workspace/parallel/19/kibana/packages/kbn-expect/expect.js:244:8)
[00:17:18]                   │       at Context.<anonymous> (test/functional/apps/transform/feature_controls/transform_security.ts:45:29)
[00:17:18]                   │       at runMicrotasks (<anonymous>)
[00:17:18]                   │       at processTicksAndRejections (internal/process/task_queues.js:93:5)
[00:17:18]                   │       at Object.apply (/dev/shm/workspace/parallel/19/kibana/packages/kbn-test/src/functional_test_runner/lib/mocha/wrap_function.js:73:16)
[00:17:18]                   │ 
[00:17:18]                   │ 

Stack Trace

Error: expected [ 'ingest', 'insightsAndAlerting', 'kibana' ] to sort of equal [ 'insightsAndAlerting', 'kibana' ]
    at Assertion.assert (/dev/shm/workspace/parallel/19/kibana/packages/kbn-expect/expect.js:100:11)
    at Assertion.eql (/dev/shm/workspace/parallel/19/kibana/packages/kbn-expect/expect.js:244:8)
    at Context.<anonymous> (test/functional/apps/transform/feature_controls/transform_security.ts:45:29)
    at runMicrotasks (<anonymous>)
    at processTicksAndRejections (internal/process/task_queues.js:93:5)
    at Object.apply (/dev/shm/workspace/parallel/19/kibana/packages/kbn-test/src/functional_test_runner/lib/mocha/wrap_function.js:73:16) {
  actual: '[\n  "ingest"\n  "insightsAndAlerting"\n  "kibana"\n]',
  expected: '[\n  "insightsAndAlerting"\n  "kibana"\n]',
  showDiff: true
}

Metrics [docs]

✅ unchanged

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@TinaHeiligers TinaHeiligers merged commit 646732f into elastic:master Feb 10, 2021
@kibanamachine
Copy link
Contributor

Backport result

{"level":"info","message":"POST https://api.github.com/graphql (status: 200)"}
{"level":"info","message":"POST https://api.github.com/graphql (status: 200)"}
{"meta":{"labels":["Feature:Logging","Team:Core","auto-backport","release_note:skip","v7.12.0","v8.0.0"],"branchLabelMapping":{"^v8.0.0$":"master","^v7.12.0$":"7.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"},"existingTargetPullRequests":[]},"level":"info","message":"Inputs when calculating target branches:"}
{"meta":["7.x"],"level":"info","message":"Target branches inferred from labels:"}
{"meta":{"killed":false,"code":2,"signal":null,"cmd":"git remote rm kibanamachine","stdout":"","stderr":"error: No such remote: 'kibanamachine'\n"},"level":"info","message":"exec error 'git remote rm kibanamachine':"}
{"meta":{"killed":false,"code":2,"signal":null,"cmd":"git remote rm elastic","stdout":"","stderr":"error: No such remote: 'elastic'\n"},"level":"info","message":"exec error 'git remote rm elastic':"}
{"level":"info","message":"Backporting [{\"sourceBranch\":\"master\",\"targetBranchesFromLabels\":[\"7.x\"],\"sha\":\"646732f96d4842bc1b66854f4a94c87bfc3959c0\",\"formattedMessage\":\"[core.logging] Uses host timezone as default (#90368)\",\"originalMessage\":\"[core.logging] Uses host timezone as default (#90368)\\n\\nCo-authored-by: Kibana Machine <[email protected]>\",\"pullNumber\":90368,\"existingTargetPullRequests\":[]}] to 7.x"}

Backporting to 7.x:
{"level":"info","message":"Backporting via filesystem"}
{"meta":{"killed":false,"code":1,"signal":null,"cmd":"git cherry-pick 646732f96d4842bc1b66854f4a94c87bfc3959c0","stdout":"Auto-merging src/core/server/config/deprecation/core_deprecations.ts\nCONFLICT (content): Merge conflict in src/core/server/config/deprecation/core_deprecations.ts\nAuto-merging src/core/server/config/deprecation/core_deprecations.test.ts\nCONFLICT (modify/delete): docs/migration/migrate_8_0.asciidoc deleted in HEAD and modified in 646732f96d4 ([core.logging] Uses host timezone as default (#90368)). Version 646732f96d4 ([core.logging] Uses host timezone as default (#90368)) of docs/migration/migrate_8_0.asciidoc left in tree.\n","stderr":"error: could not apply 646732f96d4... [core.logging] Uses host timezone as default (#90368)\nhint: after resolving the conflicts, mark the corrected paths\nhint: with 'git add <paths>' or 'git rm <paths>'\nhint: and commit the result with 'git commit'\n"},"level":"info","message":"exec error 'git cherry-pick 646732f96d4842bc1b66854f4a94c87bfc3959c0':"}
{"meta":{"killed":false,"code":2,"signal":null,"cmd":"git --no-pager diff --check","stdout":"src/core/server/config/deprecation/core_deprecations.ts:140: leftover conflict marker\nsrc/core/server/config/deprecation/core_deprecations.ts:146: leftover conflict marker\nsrc/core/server/config/deprecation/core_deprecations.ts:160: leftover conflict marker\n","stderr":""},"level":"info","message":"exec error 'git --no-pager diff --check':"}
Commit could not be cherrypicked due to conflicts

TinaHeiligers added a commit that referenced this pull request Feb 10, 2021
Co-authored-by: Kibana Machine <[email protected]>
# Conflicts:
#	docs/migration/migrate_8_0.asciidoc
#	src/core/server/config/deprecation/core_deprecations.ts
gmmorris added a commit to gmmorris/kibana that referenced this pull request Feb 10, 2021
* master: (99 commits)
  [Fleet] Use Fleet Server indices in the search bar (elastic#90835)
  [Search Sessions] added an info flyout to session management (elastic#90559)
  [ILM] Revisit searchable snapshot field after new redesign (elastic#90793)
  [Alerting] License Errors on Alert List View (elastic#89920)
  RFC Improve saved object migrations algorithm (elastic#84333)
  [Lens] (Accessibility) Fix focus on drag and drop actions (elastic#90561)
  Use new shortcut links to Fleet discuss forums. (elastic#90786)
  Do not generate an ephemeral encryption key in production. (elastic#81511)
  [Fleet] Use staging registry for snapshot builds (elastic#90327)
  Actually deleting x-pack/tsconfig.refs.json (elastic#90898)
  Add deprecation warning to all Beats CM pages. (elastic#90741)
  skip flaky suite (elastic#90136)
  Revert "Revert "[Metrics UI] Add Metrics Anomaly Alert Type (elastic#89244)"" (elastic#90889)
  remove ref to removed tsconfig file
  [core.logging] Uses host timezone as default (elastic#90368)
  [Maps] remove maps_file_upload plugin and fold public folder into file_upload plugin (elastic#90292)
  Revert "[Metrics UI] Add Metrics Anomaly Alert Type (elastic#89244)"
  [dev-utils/ci-stats] support disabling ship errors (elastic#90851)
  Prefix with / (elastic#90836)
  [Metrics UI] Add Metrics Anomaly Alert Type (elastic#89244)
  ...
@TinaHeiligers TinaHeiligers deleted the logging/host-timezone-as-default branch March 23, 2021 17:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto-backport Deprecated - use backport:version if exact versions are needed Feature:Logging release_note:skip Skip the PR/issue when compiling release notes Team:Core Core services & architecture: plugins, logging, config, saved objects, http, ES client, i18n, etc v7.12.0 v8.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants