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

[Ingest Manager] Do not compare err with custom type #19980

Merged
merged 3 commits into from
Jul 16, 2020
Merged

[Ingest Manager] Do not compare err with custom type #19980

merged 3 commits into from
Jul 16, 2020

Conversation

michalpristas
Copy link
Contributor

@michalpristas michalpristas commented Jul 16, 2020 •
edited
Loading

What does this PR do?

Fixes #19976 by using comparison from errors package instead of comparing custom types

Why is it important?

Avoid panics

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

cc @ph

@michalpristas michalpristas added bug review needs_backport PR is waiting to be backported to other branches. Team:Ingest Management Ingest Management:beta1 Group issues for ingest management beta1 labels Jul 16, 2020
@michalpristas michalpristas self-assigned this Jul 16, 2020
@elasticmachine
Copy link
Collaborator

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

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Jul 16, 2020
@michalpristas michalpristas changed the title Agent revoked token [Ingest Manager] Do not compare err with custom type Jul 16, 2020
@michalpristas michalpristas merged commit 7d8522f into elastic:master Jul 16, 2020
michalpristas added a commit to michalpristas/beats that referenced this pull request Jul 16, 2020
@michalpristas
[Ingest Manager] Do not compare err with custom type (elastic#19980)
24707d9 
* fix error comparison in enroll
michalpristas added a commit to michalpristas/beats that referenced this pull request Jul 16, 2020
@michalpristas
[Ingest Manager] Do not compare err with custom type (elastic#19980)
e8c0261 
* fix error comparison in enroll
This was referenced Jul 16, 2020
Merged
Merged
@mdelapenya
Copy link
Contributor

Thanks for the fix! Do we have an ETA about when the 8.0.0-snapshot binary will be pushed to https://artifacts-api.elastic.co/v1/search/8.0.0-SNAPSHOT/elastic-agent?

It currently returns https://snapshots.elastic.co/8.0.0-6a0038f5/downloads/beats/elastic-agent/elastic-agent-8.0.0-SNAPSHOT-linux-x86_64.tar.gz, but not sure if this is included.

michalpristas added a commit that referenced this pull request Jul 16, 2020
@michalpristas
[Ingest Manager] Do not compare err with custom type (#19980) (#19982)
67f4d61 
* fix error comparison in enroll
michalpristas added a commit that referenced this pull request Jul 16, 2020
@michalpristas
[Ingest Manager] Do not compare err with custom type (#19980) (#19983)
03b5b60 
* fix error comparison in enroll
@ph
Copy link
Contributor

ph commented Jul 16, 2020

@mdelapenya they are usually built once a day, but there other jobs on beats-ci that build packages on every commits we should probably uses that instead of the snapshot created by the release manager?

@mdelapenya
Copy link
Contributor

@ph I think this is a good idea, because it will bring more flexibility to the e2e tests. Otherwise we will depend on the release team for fixing stuff (which is also good in the sense that we could enhance it providing our feedback)

@ph
Copy link
Contributor

ph commented Jul 16, 2020

@mdelapenya Since our project it really linked to the ingest manager, we should use more up to date artifact from Kibana too?

@mdelapenya
Copy link
Contributor

If we are able to consume es, kibana and agent artifacts with more frequency, the best. I know we store docker images under the observability-ci namespace, not sure how they are created. @kuisathaverat I summon you! :)

@kuisathaverat
Copy link
Contributor

AFAIK Kibans only push docker images with the Unified Release Snapshot job (URS) so only once a day. However, we are working on some kind of hot build and deploy of a Kibana PR, that could cover this need https://github.com/elastic/observability-robots/issues/7 If you need it, I could put it in my top priority

@ph
Copy link
Contributor

ph commented Jul 17, 2020

@kuisathaverat I think this would be great because without recent new build I think we would have a lot of false positive. cc @EricDavisX @KseniaElastic

v1v added a commit to v1v/beats that referenced this pull request Jul 20, 2020
@v1v
Merge remote-tracking branch 'upstream/master' into feature/fix-warni…
cf807c2 
…ngs-archive

* upstream/master: (274 commits)
  Test export commands in all Beats (elastic#20016)
  [Ingest Manager] Allow using drop path for agent build (elastic#20019)
  [DOCS] Remove include for deleted file in monitoring docs (elastic#20038)
  Removing xpack.monitoring.* settings (elastic#18608)
  [Heartbeat] Add service_name option for APM integration (elastic#19932)
  [Elastic Agent] Fix merging of fleet.yml. Add --staging to enroll cmd. (elastic#20026)
  Stricter stalebot configuration for PRs (elastic#20004)
  [ci] Favor direct mage invocation on CI (elastic#19960)
  Add cloudwatch input into Filebeat configure inputs documentation (elastic#19973)
  [Filebeat] remove delimiter \n from log line in s3 input (elastic#19972)
  [Metricbeat] Update MySQL dashboard (elastic#19913)
  Packetbeat process monitor: Ignore missing /proc/net/tcp6 (elastic#19945)
  [CI] fix MODULE variable cornercases (elastic#19985)
  Ignore timestamp in fortinet/clientendpoint and netscout/sightline (elastic#19998)
  add 7.9 to .backportrc.json (elastic#19952)
  Update internal links to external (elastic#19947)
  Remove Dynamic Script Compilations warning in Cisco module (elastic#19840)
  [Elastic Agent] Fix RPM and DEB packaging for Elastic Agent (elastic#19959)
  [Ingest Manager] Do not compare err with custom type (elastic#19980)
  Fix nanocore sum for non default intervals on Kubernetes Overview Dashboard (elastic#19675)
  ...
v1v added a commit to v1v/beats that referenced this pull request Jul 20, 2020
@v1v
Merge remote-tracking branch 'upstream/master' into feature/ci-read-o…
a6c5555 
…nly-mod

* upstream/master: (75 commits)
  Test export commands in all Beats (elastic#20016)
  [Ingest Manager] Allow using drop path for agent build (elastic#20019)
  [DOCS] Remove include for deleted file in monitoring docs (elastic#20038)
  Removing xpack.monitoring.* settings (elastic#18608)
  [Heartbeat] Add service_name option for APM integration (elastic#19932)
  [Elastic Agent] Fix merging of fleet.yml. Add --staging to enroll cmd. (elastic#20026)
  Stricter stalebot configuration for PRs (elastic#20004)
  [ci] Favor direct mage invocation on CI (elastic#19960)
  Add cloudwatch input into Filebeat configure inputs documentation (elastic#19973)
  [Filebeat] remove delimiter \n from log line in s3 input (elastic#19972)
  [Metricbeat] Update MySQL dashboard (elastic#19913)
  Packetbeat process monitor: Ignore missing /proc/net/tcp6 (elastic#19945)
  [CI] fix MODULE variable cornercases (elastic#19985)
  Ignore timestamp in fortinet/clientendpoint and netscout/sightline (elastic#19998)
  add 7.9 to .backportrc.json (elastic#19952)
  Update internal links to external (elastic#19947)
  Remove Dynamic Script Compilations warning in Cisco module (elastic#19840)
  [Elastic Agent] Fix RPM and DEB packaging for Elastic Agent (elastic#19959)
  [Ingest Manager] Do not compare err with custom type (elastic#19980)
  Fix nanocore sum for non default intervals on Kubernetes Overview Dashboard (elastic#19675)
  ...
melchiormoulin pushed a commit to melchiormoulin/beats that referenced this pull request Oct 14, 2020
@michalpristas @melchiormoulin
[Ingest Manager] Do not compare err with custom type (elastic#19980)
968c1d8 
* fix error comparison in enroll
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
@michalpristas
[Ingest Manager] Do not compare err with custom type (elastic#19980) (e…
6d7e2d3 
…lastic#19983)

* fix error comparison in enroll
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kvch kvch kvch approved these changes

Assignees

@michalpristas michalpristas

Labels
bug Ingest Management:beta1 Group issues for ingest management beta1 needs_backport PR is waiting to be backported to other branches. review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Elastic Agent] Panic error while enrolling an agent with a revoked token
6 participants
@michalpristas @elasticmachine @mdelapenya @ph @kuisathaverat @kvch