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

[Fleet] Pass policy namespace to agent monitoring settings #100500

Merged
merged 2 commits into from
May 24, 2021
Merged

[Fleet] Pass policy namespace to agent monitoring settings #100500

merged 2 commits into from
May 24, 2021

Conversation

jen-huang
Copy link
Contributor

Summary

Resolves #98542. This PR passes the agent policy namespace to the agent.monitoring settings in generated agent YAML. Note that this needs corresponding changes on agent side before it actually affects where the monitoring data goes (elastic/beats#25350) but this PR can go in first.

image

@jen-huang jen-huang added release_note:enhancement v8.0.0 Team:Fleet Team label for Observability Data Collection Fleet team v7.14.0 labels May 24, 2021
@jen-huang jen-huang self-assigned this May 24, 2021
@jen-huang jen-huang requested a review from a team as a code owner May 24, 2021 20:18
@elasticmachine
Copy link
Contributor

Pinging @elastic/fleet (Team:Fleet)

@jen-huang jen-huang added the auto-backport Deprecated - use backport:version if exact versions are needed label May 24, 2021
@jen-huang jen-huang enabled auto-merge (squash) May 24, 2021 20:19
kpollich
kpollich approved these changes May 24, 2021
View reviewed changes
Copy link
Member

@kpollich kpollich left a comment

Choose a reason for hiding this comment

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

Seems small enough to approve 👍

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id before after diff
fleet 731.3KB 731.4KB +74.0B
Unknown metric groups

References to deprecated APIs

id before after diff
canvas 29 25 -4
crossClusterReplication 8 6 -2
fleet 22 20 -2
globalSearch 4 2 -2
indexManagement 12 7 -5
infra 261 149 -112
lens 67 45 -22
licensing 18 15 -3
lists 239 236 -3
maps 286 208 -78
ml 121 115 -6
monitoring 109 56 -53
securitySolution 386 342 -44
stackAlerts 101 95 -6
total -342

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

cc @jen-huang

@jen-huang jen-huang merged commit cc9c5be into elastic:master May 24, 2021
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request May 24, 2021
@jen-huang @kibanamachine
[Fleet] Pass policy namespace to agent monitoring settings (elastic#1…
c55d3bf 
…00500)

* Pass agent policy namespace to agent monitoring settings

* Adjust copy
@kibanamachine kibanamachine mentioned this pull request May 24, 2021
Merged
@kibanamachine
Copy link
Contributor

💚 Backport successful

Status Branch Result
✅ 7.x

This backport PR will be merged automatically after passing CI.

ecezalp pushed a commit to ecezalp/kibana that referenced this pull request May 26, 2021
@jen-huang @ecezalp
[Fleet] Pass policy namespace to agent monitoring settings (elastic#1…
6fa4d6f 
…00500)

* Pass agent policy namespace to agent monitoring settings

* Adjust copy
ecezalp pushed a commit to ecezalp/kibana that referenced this pull request May 26, 2021
@jen-huang @ecezalp
[Fleet] Pass policy namespace to agent monitoring settings (elastic#1…
4f31080 
…00500)

* Pass agent policy namespace to agent monitoring settings

* Adjust copy
@kibanamachine kibanamachine added the backport missing Added to PRs automatically when the are determined to be missing a backport. label May 26, 2021
@kibanamachine
Copy link
Contributor

Looks like this PR has a backport PR but it still hasn't been merged. Please merge it ASAP to keep the branches relatively in sync.

@jen-huang jen-huang deleted the fix/monitoring-namespace branch May 27, 2021 01:06
kibanamachine added a commit that referenced this pull request May 27, 2021
@kibanamachine @jen-huang
[Fleet] Pass policy namespace to agent monitoring settings (#100500) (#…
41944db 
…100511)

* Pass agent policy namespace to agent monitoring settings

* Adjust copy

Co-authored-by: Jen Huang <its.jenetic@gmail.com>
@kibanamachine kibanamachine removed the backport missing Added to PRs automatically when the are determined to be missing a backport. label May 27, 2021
@dikshachauhan-qasource
Copy link

Hi @EricDavisX @michalpristas

We have validated this PR #100500 on 7.14 snapshot cloud-qa build and found that working fine.

  • user defined namespace is now visible on view policy fly-out.
  • Updated namespace also reflects properly on without agent restart.

Screenshot for reference:
image

Build Details:

BUILD 42091
COMMIT fe3ea8ed1fc80caa3acd805d24a1e9ea882aa30f

Please let us know if we are missing anything.

Thanks
QAS

@EricDavisX EricDavisX mentioned this pull request Jun 29, 2021
Merged
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kpollich kpollich kpollich approved these changes

Assignees

@jen-huang jen-huang

Labels
auto-backport Deprecated - use backport:version if exact versions are needed release_note:enhancement Team:Fleet Team label for Observability Data Collection Fleet team v7.14.0 v8.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Fleet] Pass namespace to agent.monitoring settings (namespace, monitoring)
5 participants
@jen-huang @elasticmachine @kibanamachine @dikshachauhan-qasource @kpollich