[Ingest Management] Fix reloading of log level for services#24055
Merged
michalpristas merged 5 commits intoelastic:masterfrom Feb 16, 2021
Merged
[Ingest Management] Fix reloading of log level for services#24055michalpristas merged 5 commits intoelastic:masterfrom
michalpristas merged 5 commits intoelastic:masterfrom
Conversation
Contributor
|
Pinging @elastic/agent (Team:Agent) |
Contributor
|
Pinging @elastic/ingest-management (Team:Ingest Management) |
6192e39 to
b99169d
Compare
blakerouse
approved these changes
Feb 16, 2021
| // we're modifying object | ||
| for k, v := range skippedKeys { | ||
| data[k] = v | ||
| } |
Contributor
There was a problem hiding this comment.
I see, because the code removed it from above they needed to be added back in.
I think maybe making the comment a little clearer and with some reference to the delete(...) about would be better.
| // force config reload | ||
| if observedConfigStateIdx > 0 { | ||
| appState.expectedConfigIdx = observedConfigStateIdx + 1 | ||
| } |
Contributor
There was a problem hiding this comment.
Because it is a service, this makes perfect sense. Good catch!
Contributor
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
Trends 🧪💚 Flaky test reportTests succeeded. Expand to view the summary
Test stats 🧪
|
michalpristas
added a commit
to michalpristas/beats
that referenced
this pull request
Feb 16, 2021
…24055) [Ingest Management] Fix reloading of log level for services (elastic#24055)
michalpristas
added a commit
to michalpristas/beats
that referenced
this pull request
Feb 16, 2021
…24055) [Ingest Management] Fix reloading of log level for services (elastic#24055)
This was referenced Feb 16, 2021
michalpristas
added a commit
that referenced
this pull request
Feb 16, 2021
michalpristas
added a commit
that referenced
this pull request
Feb 16, 2021
v1v
added a commit
to v1v/beats
that referenced
this pull request
Feb 17, 2021
…-arm * upstream/master: [CI] install docker-compose with retry (elastic#24069) Add nodes to filebeat-kubernetes.yaml ClusterRole - fixes elastic#24051 (elastic#24052) updating manifest files for filebeat threatintel module (elastic#24074) Add Zeek Signatures (elastic#23772) Update Beats to ECS 1.8.0 (elastic#23465) Support running Docker logging plugin on ARM64 (elastic#24034) Fix ec2 metricset fields.yml and add integration test (elastic#23726) Only build targz and zip versions of Beats if PACKAGES is set in agent (elastic#24060) [Filebeat] Add field definitions for known Netflow/IPFIX vendor fields (elastic#23773) [Elastic Agent] Enroll with Fleet Server (elastic#23865) [Filebeat] Convert logstash logEvent.action objects to strings (elastic#23944) [Ingest Management] Fix reloading of log level for services (elastic#24055) Add Agent standalone k8s manifest (elastic#23679)
v1v
added a commit
to v1v/beats
that referenced
this pull request
Feb 17, 2021
…dows-7 * upstream/master: (332 commits) Use ECS v1.8.0 (elastic#24086) Add support for postgresql csv logs (elastic#23334) [Heartbeat] Refactor config system (elastic#23467) [CI] install docker-compose with retry (elastic#24069) Add nodes to filebeat-kubernetes.yaml ClusterRole - fixes elastic#24051 (elastic#24052) updating manifest files for filebeat threatintel module (elastic#24074) Add Zeek Signatures (elastic#23772) Update Beats to ECS 1.8.0 (elastic#23465) Support running Docker logging plugin on ARM64 (elastic#24034) Fix ec2 metricset fields.yml and add integration test (elastic#23726) Only build targz and zip versions of Beats if PACKAGES is set in agent (elastic#24060) [Filebeat] Add field definitions for known Netflow/IPFIX vendor fields (elastic#23773) [Elastic Agent] Enroll with Fleet Server (elastic#23865) [Filebeat] Convert logstash logEvent.action objects to strings (elastic#23944) [Ingest Management] Fix reloading of log level for services (elastic#24055) Add Agent standalone k8s manifest (elastic#23679) [Metricbeat][Kubernetes] Extend state_node with more conditions (elastic#23905) [CI] googleStorageUploadExt step (elastic#24048) Check fields are documented for aws metricsets (elastic#23887) Update go-concert to 0.1.0 (elastic#23770) ...
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
This PR fixes 2 things.
First one is an issue introduced in #23886, this caused that
VarSkipKeyremoved key from Action which was then stored using Ack and Store. This action wasinput-less so after restart agent was not running anything and it thought it;s ok because preserved state id is same as the one from fleet.This one I discovered without filing an issue
Second one is bug described in #23720. The issue here is that agent creates a server with own counter, set to 1. But service already has a config with state counter. So if we change log level and restart an agent counter is 1 which == to the counter in a service and agent thinks everything is up to date.
Fix is that we take counter from a service and if it's > 0, which means services already retrieved some configuration we force reload of config by incrementing our local counter to
what_service_has + 1Why is it important?
Fixes bugs
Checklist
CHANGELOG.next.asciidocorCHANGELOG-developer.next.asciidoc.