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.

Sign up for GitHub

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

Jump to bottom

[ML] Fixing module datafeed overrides #78925

Merged
merged 1 commit into from
Sep 30, 2020
Merged

[ML] Fixing module datafeed overrides #78925

merged 1 commit into from
Sep 30, 2020

Conversation

jgowdyelastic
Copy link
Member

When supplying a query, aggregationsor script_fields as override options for the datafeed for a module, they should replaced entirely and not merged.

Also fixes indentation and formatting of a few of the module JSON files.

Fixes #78846

@jgowdyelastic jgowdyelastic added bug Fixes for quality problems that affect the customer experience review :ml Feature:Anomaly Detection ML anomaly detection v8.0.0 v7.10.0 labels Sep 30, 2020
@jgowdyelastic jgowdyelastic requested a review from a team as a code owner September 30, 2020 10:13
@jgowdyelastic jgowdyelastic self-assigned this Sep 30, 2020
@elasticmachine
Copy link
Contributor

Pinging @elastic/ml-ui (:ml)

peteharverson
peteharverson approved these changes Sep 30, 2020
View reviewed changes
Copy link
Contributor

@peteharverson peteharverson left a comment

Choose a reason for hiding this comment

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

LGTM

@phillipb
Copy link
Contributor

👍 Tested this on metrics integration, and this appears to have fixed the issue.

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

✅ unchanged

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

alvarezmelissa87
alvarezmelissa87 approved these changes Sep 30, 2020
View reviewed changes
Copy link
Contributor

@alvarezmelissa87 alvarezmelissa87 left a comment

Choose a reason for hiding this comment

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

LGTM ⚡

@jgowdyelastic jgowdyelastic added the release_note:skip Skip the PR/issue when compiling release notes label Sep 30, 2020
@jgowdyelastic jgowdyelastic merged commit c4f05c4 into elastic:master Sep 30, 2020
@jgowdyelastic jgowdyelastic deleted the fix-module-datafeed-overrides branch September 30, 2020 17:27
@jgowdyelastic jgowdyelastic mentioned this pull request Sep 30, 2020
Merged
jgowdyelastic added a commit to jgowdyelastic/kibana that referenced this pull request Sep 30, 2020
@jgowdyelastic
[ML] Fixing module datafeed overrides (elastic#78925)
c80c143
gmmorris added a commit to gmmorris/kibana that referenced this pull request Sep 30, 2020
@gmmorris
Merge branch 'master' into actions/preconfigured-connector-error-on-edit
73b710b 
* master: (97 commits)
  [Actions] Adds a "Test Connector" button on the Connectors List to make discovery of the Test tab easier (elastic#78746)
  [Discover] Fix functional time picker test permissions (elastic#78564)
  [ML] Fixing module datafeed overrides (elastic#78925)
  Adds some missing licenses to the CSV export (elastic#78719)
  [dev/cli] ensure plugins/ and all watch source dirs exist (elastic#78973)
  [Lens] Stop using scripted metric to collect telemetry (elastic#78687)
  [Lens] fix wrong message in fields accordion (elastic#78924)
  [Enterprise Search][App Search] Credentials Logic updates (elastic#78644)
  [Monitoring] Disk usage alerting (elastic#75419)
  [SECURITY_SOLUTION] Trusted apps list expand/collapse details (elastic#78601)
  Update content on interstitial page (elastic#78881)
  chore(NA): include hjson as a prod dependency (elastic#78941)
  Fix empty meta fields input in Advanced Settings  (elastic#78576)
  [Lens] Maintain order of operations in dimension panel (elastic#78864)
  Fix plugin doc title (elastic#78880)
  load apm-rum agent lazily (elastic#78760)
  [ML] Skip full ML access permission test
  Optimize charts plugin (elastic#78922)
  ui_actions service initial docs (elastic#78902)
  skip failing suite (elastic#78942)
  ...
phillipb added a commit to phillipb/kibana that referenced this pull request Sep 30, 2020
@phillipb
Merge branch 'master' of github.com:elastic/kibana into override-anom…
1587918 
…aly-detection-partition-field

* 'master' of github.com:elastic/kibana: (37 commits)
  Fixes for the Ticket 78375 (elastic#79004)
  [Security] Alert Telemetry for the Security app (elastic#77200)
  [Search bar] Remove duplicate `popoverProps` (elastic#79025)
  [Security Solution][Detections] Add rule overrides for single event EQL rules (elastic#78876)
  [SECURITY_SOLUTION][ENDPOINT] Improve Endpoint Host data generator to also integrate with Ingest (elastic#74305)
  remove file accidentally checked in (elastic#79005)
  [ML] DF Analytics creation wizard: replace select input with job type cards with icons (elastic#78872)
  [Design] A couple fixes for 7.10 (elastic#78801)
  Fix KQL autocomplete value suggestions (elastic#78676)
  [Security Solution][Resolver] New mock with cursor (elastic#78863)
  Embeddables: basic documentation (elastic#78900)
  [security solution] only import beat_schema when needed (elastic#78708)
  [Reporting] API Integration tests: fix flaky tests for Spaces CSV formatting (elastic#78849)
  [Actions] Adds a "Test Connector" button on the Connectors List to make discovery of the Test tab easier (elastic#78746)
  [Discover] Fix functional time picker test permissions (elastic#78564)
  [ML] Fixing module datafeed overrides (elastic#78925)
  Adds some missing licenses to the CSV export (elastic#78719)
  [dev/cli] ensure plugins/ and all watch source dirs exist (elastic#78973)
  [Lens] Stop using scripted metric to collect telemetry (elastic#78687)
  [Lens] fix wrong message in fields accordion (elastic#78924)
  ...
jgowdyelastic added a commit that referenced this pull request Oct 1, 2020
@jgowdyelastic
[ML] Fixing module datafeed overrides (#78925) (#78999)
ea018b3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@peteharverson peteharverson peteharverson approved these changes

@alvarezmelissa87 alvarezmelissa87 alvarezmelissa87 approved these changes

@darnautov darnautov Awaiting requested review from darnautov

Assignees

@jgowdyelastic jgowdyelastic

Labels
bug Fixes for quality problems that affect the customer experience Feature:Anomaly Detection ML anomaly detection :ml release_note:skip Skip the PR/issue when compiling release notes review v7.10.0 v8.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[ML] Datafeed overrides generating incorrect datafeed config
6 participants
@jgowdyelastic @elasticmachine @phillipb @kibanamachine @alvarezmelissa87 @peteharverson