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

[Ingest] Allow to enable monitoring of elastic agent #63598

Merged
merged 10 commits into from
Apr 29, 2020

Conversation

nchaulet
Copy link
Member

@nchaulet nchaulet commented Apr 15, 2020

Summary

Resolve #62141

This PR allow to enable monitoring for elastic agent:

  • the user can choose to enable agent monitoring when creating or editing an agent config
  • if the monitoring is enabled the agent config send to the agent contains the relevant information (settings.monitoring)

Monitoring is enabled by default.

UI changes

Screen Shot 2020-04-21 at 11 44 28 AM

Config change

id: 6d7a4780-7f21-11ea-b609-3923382c3c4a
revision: 1
outputs:
  default:
    type: elasticsearch
    hosts:
      - 'http://localhost:9200'
    api_key: ''
datasources: []
settings.monitoring:
  use_output: default
  enabled: true
  metrics: true
  logs: true

How to test this: enroll an agent with a config with monitoring enabled you should see new indices
Screen Shot 2020-04-29 at 10 11 41 AM

@nchaulet nchaulet added v8.0.0 release_note:skip Skip the PR/issue when compiling release notes v7.8.0 Team:Fleet Team label for Observability Data Collection Fleet team labels Apr 15, 2020
@nchaulet nchaulet requested a review from a team April 15, 2020 14:39
@nchaulet nchaulet self-assigned this Apr 15, 2020
@elasticmachine
Copy link
Contributor

Pinging @elastic/ingest-management (Team:Ingest Management)

@nchaulet nchaulet force-pushed the feature-fleet-agent-monitoring branch from 1dcd9e9 to 5d030c3 Compare April 15, 2020 17:29
@nchaulet
Copy link
Member Author

Waiting on @michalpristas tests to figure why the agent is not sending monitoring

@michalpristas
Copy link

tested with mock and agent generates monitoring config. need kbn to test more

@nchaulet nchaulet force-pushed the feature-fleet-agent-monitoring branch from 6df0cef to 3c3464d Compare April 21, 2020 18:22
@nchaulet
Copy link
Member Author

@michalpristas Did you tested it with kbn?

@michalpristas
Copy link

@nchaulet yes i created a basic system configuration with monitoring enabled, enrolled to this config and checked indices and data. pr is not in yet waiting for CI

Copy link
Contributor

@jen-huang jen-huang left a comment

Choose a reason for hiding this comment

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

Code LGTM, didn't test locally

Comment on lines +337 to +338
logs: config.monitoring_enabled.indexOf('logs') >= 0,
metrics: config.monitoring_enabled.indexOf('metrics') >= 0,
Copy link
Contributor

Choose a reason for hiding this comment

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

Can use .includes instead of .indexOf

…er/sections/agent_config/components/config_form.tsx

Co-Authored-By: Jen Huang <its.jenetic@gmail.com>
@kibanamachine
Copy link
Contributor

💚 Build Succeeded

History

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

@nchaulet nchaulet merged commit 6338cef into elastic:master Apr 29, 2020
@nchaulet nchaulet deleted the feature-fleet-agent-monitoring branch April 29, 2020 20:42
nchaulet added a commit to nchaulet/kibana that referenced this pull request Apr 29, 2020
gmmorris added a commit to gmmorris/kibana that referenced this pull request Apr 30, 2020
* master: (42 commits)
  [Ingest] Allow aggent to send metadata compliant with ECS (elastic#64452)
  [Endpoint] Remove todos, urls to issues (elastic#64833)
  [Uptime] Remove hard coded value for monitor states histograms (elastic#64396)
  Feature/send feedback link (elastic#64845)
  [ML] Moving get filters capability to admin (elastic#64879)
  Remove edit alert button from alerts list (elastic#64643)
  [EPM] Handle constant_keyword type in KB index patterns and ES index templates (elastic#64876)
  [ML] Disable data frame anaylics clone button based on permission (elastic#64830)
  Dashboard url generator to preserve saved filters from destination dashboard (elastic#64767)
  add generic typings for SavedObjectMigrationFn (elastic#63943)
  Allow to define and update a defaultPath for applications (elastic#64498)
  [Event Log] add rel=primary to saved objects for query targets (elastic#64615)
  [Lens] Use a size of 5 for first string field in visualization (elastic#64726)
  [SIEM][Lists] Removes plugin dependencies, adds more unit tests, fixes more TypeScript types
  [Ingest] Edit datasource UI (elastic#64727)
  [Lens] Bind all time fields to the time picker (elastic#63874)
  [Lens] Use suggestion system in chart switcher for subtypes (elastic#64613)
  Improve alpha messaging (elastic#64692)
  [Ingest] Allow to enable monitoring of elastic agent (elastic#63598)
  [Metrics UI] Fix alerting when a filter query is present (elastic#64575)
  ...
jloleysens added a commit to jloleysens/kibana that referenced this pull request May 4, 2020
…bana into pipeline-editor-part-mvp-2

* 'feature/ingest-node-pipelines' of github.com:elastic/kibana: (90 commits)
  remove unused import
  address review feedback
  [Ingest pipelines] Cleanup (elastic#64794)
  [Ingest] Edit datasource UI (elastic#64727)
  [Lens] Bind all time fields to the time picker (elastic#63874)
  [Lens] Use suggestion system in chart switcher for subtypes (elastic#64613)
  Improve alpha messaging (elastic#64692)
  [Ingest] Allow to enable monitoring of elastic agent (elastic#63598)
  [Metrics UI] Fix alerting when a filter query is present (elastic#64575)
  skip flaky suite (elastic#64812) (elastic#64723)
  [Maps] do not display EMS or kibana layer wizards when not configured (elastic#64554)
  [Reporting/Test] Convert functional test code to Typescript (elastic#64601)
  make inserting timestamp with navigate methods optional with default true (elastic#64655)
  [EPM] Update UI to handle package versions and updates (elastic#64689)
  Minimize dependencies required by our telemetry middleware (elastic#64665)
  [Telemetry] oss api tests (elastic#64602)
  [ML] Adding endpoint capability checks (elastic#64662)
  Update jest config for coverage (elastic#64648)
  [SIEM][NP] Fixes bug in ML signals promotion (elastic#64720)
  share single data plugin bundle (elastic#64549)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team v7.8.0 v8.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Ingest] Fleet should allow to enable elastic-agent monitoring
5 participants