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] Add fleet server telemetry #101400

Merged
merged 7 commits into from
Jun 8, 2021
Merged

[Fleet] Add fleet server telemetry #101400

merged 7 commits into from
Jun 8, 2021

Conversation

nchaulet
Copy link
Member

@nchaulet nchaulet commented Jun 4, 2021 •
edited
Loading

Summary

Resolve #95424
Add Fleet Server telemetry

While working on this I also added the number of updating agent to the agent collector.

New key added

"fleet" : {
  "fleet_server": {
        total_all_statuses: 3,
        total_enrolled: 3,
        healthy: 2,
        unhealthy: 1,
        offline: 0,
        updating: 0,
        num_host_urls: 2,
  }
}

Todo

  • add tests

@nchaulet nchaulet added v8.0.0 release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team v7.14.0 auto-backport Deprecated - use backport:version if exact versions are needed labels Jun 4, 2021
@nchaulet nchaulet self-assigned this Jun 4, 2021
@nchaulet nchaulet marked this pull request as ready for review June 7, 2021 19:22
@nchaulet nchaulet requested review from a team as code owners June 7, 2021 19:22
@elasticmachine
Copy link
Contributor

Pinging @elastic/fleet (Team:Fleet)

kpollich
kpollich approved these changes Jun 8, 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.

One super minor comment otherwise LGTM 🚀

x-pack/plugins/fleet/server/collectors/fleet_server_collector.ts Outdated
soClient,
esClient,
undefined,
[...policyIds].map((policyId) => `(policy_id:"${policyId}")`).join(' or ')
Copy link
Member

Choose a reason for hiding this comment

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

Does this need the [...policyIds]? .map won't mutate the array, so this could maybe be policyIds.map directly w/o the copy.

Copy link
Member Author

Choose a reason for hiding this comment

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

policyIds is not an array it's a set (I want uniq values) so I think we need the spread operator here.

Copy link
Member

Choose a reason for hiding this comment

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

Ah I understand. Array.from might convey the intent more explicitly in that case: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/from

@nchaulet nchaulet enabled auto-merge (squash) June 8, 2021 20:59
@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

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

cc @nchaulet

@nchaulet nchaulet merged commit 8c2c83c into elastic:master Jun 8, 2021
@kibanamachine kibanamachine mentioned this pull request Jun 8, 2021
Merged
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Jun 8, 2021
@nchaulet @kibanamachine
[Fleet] Add fleet server telemetry (elastic#101400)
214e275
@kibanamachine
Copy link
Contributor

💚 Backport successful

Status Branch Result
✅ 7.x

This backport PR will be merged automatically after passing CI.

kibanamachine added a commit that referenced this pull request Jun 9, 2021
@kibanamachine @nchaulet
[Fleet] Add fleet server telemetry (#101400) (#101684)
7b6c599 
Co-authored-by: Nicolas Chaulet <nicolas.chaulet@elastic.co>
gmmorris added a commit to gmmorris/kibana that referenced this pull request Jun 9, 2021
@gmmorris
Merge branch 'master' into task-manager/capacity-estimation
0270133 
* master: (54 commits)
  Implement "select all" rules feature (elastic#100554)
  [ML] Remove script fields from the Anomaly detection alerting rule executor  (elastic#101607)
  [Security solutions][Endpoint] Update event filtering texts (elastic#101563)
  [Enterprise Search] Mocks/tests tech debt - avoid hungry mocking (elastic#101107)
  [FTR] Updates esArchive paths
  [FTR] Updates esArchive paths
  [Security Solution][Detection Engine] Adds runtime field tests (elastic#101664)
  Added APM PHP agent to the list of agent names (elastic#101062)
  [CI] Restore old version_info behavior when .git directory is present (elastic#101642)
  [Fleet] Add fleet server telemetry (elastic#101400)
  [APM] Syncs agent config settings to APM Fleet policies (elastic#100744)
  [esArchiver] drop support for --dir, use repo-relative paths instead (elastic#101345)
  Revert "[xpack/test] restore incremental: false in ts project"
  [Security Solution] Remove Host Isolation feature flag (elastic#101655)
  [xpack/test] restore incremental: false in ts project
  [DOCS] Adds link to video landing page (elastic#101413)
  [ML] Move Index Data Visualizer into separate plugin (Part 1) (elastic#100922)
  Improve security plugin return types (elastic#101492)
  [ts] migrate `x-pack/test` to composite ts project (elastic#101441)
  [App Search] Updated Search UI to new URL (elastic#101320)
  ...
@nchaulet nchaulet mentioned this pull request Jun 9, 2021
Merged
@amolnater-qasource
Copy link

Hi @EricDavisX
We have created 02 testcases for this ticket under Ingest Manager Test Suite:

Thanks
QAS

@dikshachauhan-qasource
Copy link

Hi @EricDavisX

We have validated features on 7.14BC1 and found them working fine. Please find test cases execution under below mentioned test run.

Thanks
QAS

@amolnater-qasource amolnater-qasource mentioned this pull request Jul 19, 2021
Closed
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

@pgayvallet pgayvallet pgayvallet approved these changes

@mostlyjason mostlyjason Awaiting requested review from mostlyjason

@Zacqary Zacqary Awaiting requested review from Zacqary

Assignees

@nchaulet nchaulet

Labels
auto-backport Deprecated - use backport:version if exact versions are needed release_note:skip Skip the PR/issue when compiling release notes 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] Telemetry for Fleet Server
7 participants
@nchaulet @elasticmachine @kibanamachine @amolnater-qasource @dikshachauhan-qasource @pgayvallet @kpollich