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

[EPM] Use higher priority than default templates #70640

Merged
merged 2 commits into from
Jul 2, 2020
Merged

[EPM] Use higher priority than default templates #70640

merged 2 commits into from
Jul 2, 2020

Conversation

jonathan-buttner
Copy link
Contributor

Summary

This PR sets the templates that the ingest manager creates to be higher priority than the default ES logs and metrics templates (100)

elastic/elasticsearch#57629 (comment)

image

@jonathan-buttner jonathan-buttner added v8.0.0 release_note:skip Skip the PR/issue when compiling release notes Feature:EPM Fleet team's Elastic Package Manager (aka Integrations) project v7.9.0 Team:Fleet Team label for Observability Data Collection Fleet team Feature:Ingest Management labels Jul 2, 2020
@jonathan-buttner jonathan-buttner requested review from jfsiii, skh, ruflin, nchaulet, neptunian and a team July 2, 2020 19:40
@elasticmachine
Copy link
Contributor

Pinging @elastic/ingest-management (Feature:EPM)

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Build metrics

✅ unchanged

History

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

@jonathan-buttner jonathan-buttner merged commit 20237b8 into elastic:master Jul 2, 2020
@jonathan-buttner jonathan-buttner deleted the increase-template-priority branch July 2, 2020 22:40
jonathan-buttner added a commit to jonathan-buttner/kibana that referenced this pull request Jul 2, 2020
@jonathan-buttner
[EPM] Use higher priority than default templates (elastic#70640)
5e61873 
* Use higher priority than default templates

* Fixing the jest tests
@jonathan-buttner jonathan-buttner mentioned this pull request Jul 2, 2020
Merged
@jonathan-buttner
Copy link
Contributor Author

@ph does this need to be backported to 7.8? I'm not sure what we had as the priority for the logs-*-* and metrics-*-* in 7.8 but it may be taking precedence over what the packages install 🤷

jonathan-buttner added a commit that referenced this pull request Jul 3, 2020
@jonathan-buttner
[EPM] Use higher priority than default templates (#70640) (#70674)
3fd55b2 
* Use higher priority than default templates

* Fixing the jest tests
@ruflin
Copy link
Contributor

ruflin commented Jul 3, 2020

@jonathan-buttner I don't think this needs backporting as the assets from Elasticsearch were not in 7.8. Or was it also a problem with just the base package?

gmmorris added a commit to gmmorris/kibana that referenced this pull request Jul 3, 2020
@gmmorris
Merge branch 'master' into alerting/consumer-based-rbac
e4a16c7 
* master: (32 commits)
  [Ingest Pipelines] Load from json (elastic#70297)
  [Rum Dashbaord] Rum selected service view (elastic#70579)
  [Uptime] Prevent duplicate requests on load for index status (elastic#70585)
  [ML] Changing shared module setup function parameters (elastic#70589)
  [Ingest Manager] Add ability to sort to agent configs and package configs (elastic#70676)
  [Alerting] document requirements for developing new action types (elastic#69164)
  Fixed adding an extra space character on selecting alert variable in action text fields (elastic#70028)
  [Maps] show vector tile labels on top (elastic#69444)
  chore(NA): upgrade to lodash@4 (elastic#69868)
  Add Snapshot Restore README with quick-testing steps. (elastic#70494)
  [EPM] Use higher priority than default templates (elastic#70640)
  [Maps] Fix cannot select Solid fill-color when removing fields (elastic#70621)
  [kbn/optimizer] only build specified themes (elastic#70389)
  Fix saved query modal overlay (elastic#68826)
  Update component templates list to render empty prompt inside of content container. Show detail panel when deep-linked, even if there are no component templates. (elastic#70633)
  [Security Solution] Renames the `Investigate in Resolver` Timeline action (elastic#70634)
  fix 400 error on initial signals search (elastic#70618)
  [Maps] fix unable to edit heatmap metric (elastic#70606)
  Update network idle timeout (elastic#70629)
  [APM] Disable flaky useFetcher test (elastic#70638)
  ...
gmmorris added a commit to gmmorris/kibana that referenced this pull request Jul 3, 2020
@gmmorris
Merge branch 'master' into actions/feature
f56574f 
* master: (199 commits)
  [Telemetry] Add documentation about Application Usage (elastic#70624)
  [Ingest Manager] Improve agent unenrollment with unenroll action (elastic#70031)
  Handle timeouts on creating templates (elastic#70635)
  [Lens] Add ability to set colors for y-axis series (elastic#70311)
  [Uptime] Use elastic charts donut (elastic#70364)
  [Ingest Manager] Update registry URL to point to snapshot registry (elastic#70687)
  [Composable template] Create / Edit wizard (elastic#70220)
  [APM] Optimize services overview (elastic#69648)
  [Ingest Pipelines] Load from json (elastic#70297)
  [Rum Dashbaord] Rum selected service view (elastic#70579)
  [Uptime] Prevent duplicate requests on load for index status (elastic#70585)
  [ML] Changing shared module setup function parameters (elastic#70589)
  [Ingest Manager] Add ability to sort to agent configs and package configs (elastic#70676)
  [Alerting] document requirements for developing new action types (elastic#69164)
  Fixed adding an extra space character on selecting alert variable in action text fields (elastic#70028)
  [Maps] show vector tile labels on top (elastic#69444)
  chore(NA): upgrade to lodash@4 (elastic#69868)
  Add Snapshot Restore README with quick-testing steps. (elastic#70494)
  [EPM] Use higher priority than default templates (elastic#70640)
  [Maps] Fix cannot select Solid fill-color when removing fields (elastic#70621)
  ...
@jonathan-buttner
Copy link
Contributor Author

@jonathan-buttner I don't think this needs backporting as the assets from Elasticsearch were not in 7.8. Or was it also a problem with just the base package?

Oh you're right, the base package had priority 0: https://github.com/elastic/package-storage/blob/aad322ea1229c2205624ea2ca6c4ce2da0157b8b/packages/base/0.4.0/elasticsearch/index_template/metrics.json#L5

So we don't need to backport to 7.8 👍

@ph
Copy link
Contributor

ph commented Jul 8, 2020

no need for 7.8, they don't ship assert by default with ES.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nchaulet nchaulet nchaulet approved these changes

@ruflin ruflin ruflin approved these changes

@ph ph ph approved these changes

@jfsiii jfsiii Awaiting requested review from jfsiii

@skh skh Awaiting requested review from skh

@neptunian neptunian Awaiting requested review from neptunian

@jen-huang jen-huang Awaiting requested review from jen-huang

Assignees
No one assigned
Labels
Feature:EPM Fleet team's Elastic Package Manager (aka Integrations) project release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team v7.9.0 v8.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@jonathan-buttner @elasticmachine @kibanamachine @ruflin @ph @nchaulet