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 Manager] Prompt only when agent is already enrolled #21473

Merged
merged 2 commits into from
Oct 5, 2020

Conversation

michalpristas
Copy link
Contributor

What does this PR do?

Currently when you install Elastic Agent for the first time and then issue the enroll command it prompts the user "This will replace your current settings. Do you want to continue? [Y/n]" However, there are no current settings so it should not show this prompt. It should only be shown when overwriting existing settings.

Why is it important?

Fixes #20068

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.

@michalpristas michalpristas added bug Team:Ingest Management Ingest Management:beta2 Group issues for ingest management beta2 labels Oct 2, 2020
@michalpristas michalpristas self-assigned this Oct 2, 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 Oct 2, 2020
@elasticmachine
Copy link
Collaborator

elasticmachine commented Oct 2, 2020

💔 Build Failed

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #21473 updated]

  • Start Time: 2020-10-02T13:45:02.303+0000

  • Duration: 32 min 41 sec

Test stats 🧪

Test Results
Failed 0
Passed 691
Skipped 2
Total 693

Steps errors

Expand to view the steps failures

  • Name: Extract

    • Description: tar -xpf source.tgz

    • Duration: 1 min 34 sec

    • Start Time: 2020-10-02T14:12:09.106+0000

    • log

  • Name: Error signal

    • Description: untar: step failed with error script returned exit code 1

    • Duration: 0 min 0 sec

    • Start Time: 2020-10-02T14:12:43.480+0000

    • log

Log output

Expand to view the last 100 lines of log output

[2020-10-02T14:15:51.693Z]  docker-init:
[2020-10-02T14:15:51.693Z]   Version:          0.18.0
[2020-10-02T14:15:51.693Z]   GitCommit:        fec3683
[2020-10-02T14:15:51.694Z] Unable to find image 'alpine:3.4' locally
[2020-10-02T14:15:52.264Z] 3.4: Pulling from library/alpine
[2020-10-02T14:15:52.524Z] c1e54eec4b57: Pulling fs layer
[2020-10-02T14:15:52.785Z] c1e54eec4b57: Verifying Checksum
[2020-10-02T14:15:52.785Z] c1e54eec4b57: Download complete
[2020-10-02T14:15:53.046Z] c1e54eec4b57: Pull complete
[2020-10-02T14:15:53.046Z] Digest: sha256:b733d4a32c4da6a00a84df2ca32791bb03df95400243648d8c539e7b4cce329c
[2020-10-02T14:15:53.046Z] Status: Downloaded newer image for alpine:3.4
[2020-10-02T14:15:54.729Z] + python .ci/scripts/pre_archive_test.py
[2020-10-02T14:15:54.729Z] Copy ./x-pack/elastic-agent/build into build/x-pack/elastic-agent/build
[2020-10-02T14:15:54.739Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21473/src/github.com/elastic/beats/build
[2020-10-02T14:15:54.752Z] WARNING: Unknown parameter(s) found for class type 'hudson.tasks.junit.pipeline.JUnitResultsStep': id,stashedTestReports
[2020-10-02T14:15:54.754Z] Recording test results
[2020-10-02T14:15:55.536Z] Stashed 1 file(s)
[2020-10-02T14:15:55.545Z] Archiving artifacts
[2020-10-02T14:15:55.897Z] + python .ci/scripts/search_system_tests.py
[2020-10-02T14:15:55.950Z] [INFO] system-tests=''. If no empty then let's create a tarball
[2020-10-02T14:15:56.298Z] Client: Docker Engine - Community
[2020-10-02T14:15:56.299Z]  Version:           19.03.13
[2020-10-02T14:15:56.299Z]  API version:       1.40
[2020-10-02T14:15:56.299Z]  Go version:        go1.13.15
[2020-10-02T14:15:56.299Z]  Git commit:        4484c46d9d
[2020-10-02T14:15:56.299Z]  Built:             Wed Sep 16 17:02:36 2020
[2020-10-02T14:15:56.299Z]  OS/Arch:           linux/amd64
[2020-10-02T14:15:56.299Z]  Experimental:      false
[2020-10-02T14:15:56.299Z] 
[2020-10-02T14:15:56.299Z] Server: Docker Engine - Community
[2020-10-02T14:15:56.299Z]  Engine:
[2020-10-02T14:15:56.299Z]   Version:          19.03.13
[2020-10-02T14:15:56.299Z]   API version:      1.40 (minimum version 1.12)
[2020-10-02T14:15:56.299Z]   Go version:       go1.13.15
[2020-10-02T14:15:56.299Z]   Git commit:       4484c46d9d
[2020-10-02T14:15:56.299Z]   Built:            Wed Sep 16 17:01:06 2020
[2020-10-02T14:15:56.299Z]   OS/Arch:          linux/amd64
[2020-10-02T14:15:56.299Z]   Experimental:     false
[2020-10-02T14:15:56.299Z]  containerd:
[2020-10-02T14:15:56.299Z]   Version:          1.3.7
[2020-10-02T14:15:56.299Z]   GitCommit:        8fba4e9a7d01810a393d5d25a3621dc101981175
[2020-10-02T14:15:56.299Z]  runc:
[2020-10-02T14:15:56.299Z]   Version:          1.0.0-rc10
[2020-10-02T14:15:56.299Z]   GitCommit:        dc9208a3303feef5b3839f4323d9beb36df0a9dd
[2020-10-02T14:15:56.299Z]  docker-init:
[2020-10-02T14:15:56.299Z]   Version:          0.18.0
[2020-10-02T14:15:56.299Z]   GitCommit:        fec3683
[2020-10-02T14:16:04.795Z] [INFO] unstashV2: JOB_GCS_BUCKET is set. bucket param got precedency instead.
[2020-10-02T14:16:04.805Z] [INFO] unstashV2: JOB_GCS_CREDENTIALS is set. credentialsId param got precedency instead.
[2020-10-02T14:16:04.871Z] [Google Cloud Storage Plugin] Found 1 files to download from pattern: gs://beats-ci-temp/Beats/beats/PR-21473-2/source/source.tgz
[2020-10-02T14:16:04.888Z] [Google Cloud Storage Plugin] Downloading: Beats/beats/PR-21473-2/source/source.tgz to local path: /var/lib/jenkins/workspace/Beats_beats_PR-21473/source.tgz
[2020-10-02T14:16:13.080Z] + tar --version
[2020-10-02T14:16:13.378Z] + tar -xpf source.tgz
[2020-10-02T14:16:23.657Z] + rm source.tgz
[2020-10-02T14:16:23.755Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21473/src/github.com/elastic/beats
[2020-10-02T14:16:23.764Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21473/src/github.com/elastic/beats/uncategorized-1601647609369
[2020-10-02T14:16:23.816Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21473/src/github.com/elastic/beats/x-pack-elastic-agent-build-1601648155393
[2020-10-02T14:16:24.149Z] + cat
[2020-10-02T14:16:24.149Z] + /usr/local/bin/runbld ./runbld-test-reports --job-name elastic+beats+pull-request
[2020-10-02T14:16:24.149Z] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8
[2020-10-02T14:16:30.751Z] runbld>>> runbld started
[2020-10-02T14:16:30.751Z] runbld>>> 1.6.12/f45d832f2ba0aa2722ab4ec1fda8ad140f027f8b
[2020-10-02T14:16:31.687Z] runbld>>> The following profiles matched the job 'elastic+beats+pull-request' in order of occurrence in the config (last value wins).
[2020-10-02T14:16:31.687Z] runbld>>> Matches in the system config:
[2020-10-02T14:16:31.687Z] runbld>>> - Matched ^elastic\+beats
[2020-10-02T14:16:31.687Z] runbld>>> - Matched ^elastic\+beats\+pull-request
[2020-10-02T14:16:32.622Z] runbld>>> Debug logging enabled.
[2020-10-02T14:16:32.622Z] runbld>>> Storing result
[2020-10-02T14:16:32.881Z] runbld>>> Store result: created {:total 2, :successful 2, :failed 0} 1
[2020-10-02T14:16:32.882Z] runbld>>> BUILD: https://c150076387b5421f9154dfbf536e5c60.us-west1.gcp.cloud.es.io:9243/build-1597739501209/t/20201002141632-459F0A0C
[2020-10-02T14:16:32.882Z] runbld>>> Adding system facts.
[2020-10-02T14:16:33.821Z] runbld>>> Adding vcs info for the latest commit:  4fb43fac4e09ae56554b9ba59131d6d0f673e469
[2020-10-02T14:16:33.821Z] runbld>>> >>>>>>>>>>>> SCRIPT EXECUTION BEGIN >>>>>>>>>>>>
[2020-10-02T14:16:33.821Z] runbld>>> Adding /usr/lib/jvm/java-8-openjdk-amd64/bin to the path.
[2020-10-02T14:16:33.821Z] Processing JUnit reports with runbld...
[2020-10-02T14:16:33.821Z] + echo 'Processing JUnit reports with runbld...'
[2020-10-02T14:16:34.390Z] runbld>>> <<<<<<<<<<<< SCRIPT EXECUTION END <<<<<<<<<<<<
[2020-10-02T14:16:34.390Z] runbld>>> DURATION: 26ms
[2020-10-02T14:16:34.390Z] runbld>>> STDOUT: 40 bytes
[2020-10-02T14:16:34.390Z] runbld>>> STDERR: 49 bytes
[2020-10-02T14:16:34.390Z] runbld>>> WRAPPED PROCESS: SUCCESS (0)
[2020-10-02T14:16:34.390Z] runbld>>> Searching for build metadata in /var/lib/jenkins/workspace/Beats_beats_PR-21473
[2020-10-02T14:16:35.353Z] runbld>>> Storing build metadata: 
[2020-10-02T14:16:35.353Z] runbld>>> Adding test report.
[2020-10-02T14:16:35.353Z] runbld>>> Searching for junit test output files with the pattern: TEST-.*\.xml$ in: /var/lib/jenkins/workspace/Beats_beats_PR-21473/src/github.com/elastic/beats
[2020-10-02T14:16:35.921Z] runbld>>> Found 1 test output files
[2020-10-02T14:16:36.488Z] runbld>>> Test output logs contained: Errors: 0 Failures: 0 Tests: 693 Skipped: 0
[2020-10-02T14:16:36.488Z] runbld>>> Storing result
[2020-10-02T14:16:36.488Z] runbld>>> FAILURES: 0
[2020-10-02T14:16:36.748Z] runbld>>> Store result: updated {:total 2, :successful 2, :failed 0} 2
[2020-10-02T14:16:36.749Z] runbld>>> BUILD: https://c150076387b5421f9154dfbf536e5c60.us-west1.gcp.cloud.es.io:9243/build-1597739501209/t/20201002141632-459F0A0C
[2020-10-02T14:16:36.749Z] runbld>>> Email notification disabled by environment variable.
[2020-10-02T14:16:36.749Z] runbld>>> Slack notification disabled by environment variable.
[2020-10-02T14:16:42.361Z] Running on Jenkins in /var/lib/jenkins/workspace/Beats_beats_PR-21473
[2020-10-02T14:16:42.442Z] [INFO] getVaultSecret: Getting secrets
[2020-10-02T14:16:42.534Z] Masking supported pattern matches of $VAULT_ADDR or $VAULT_ROLE_ID or $VAULT_SECRET_ID
[2020-10-02T14:16:43.151Z] + chmod 755 generate-build-data.sh
[2020-10-02T14:16:43.151Z] + ./generate-build-data.sh https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-21473/ https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-21473/runs/2 FAILURE 1900589
[2020-10-02T14:16:43.151Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-21473/runs/2/steps/?limit=10000 -o steps-info.json
[2020-10-02T14:16:43.702Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-21473/runs/2/tests/?status=FAILED -o tests-errors.json

Copy link
Contributor

@ph ph left a comment

Choose a reason for hiding this comment

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

Changes LGTM, I haven't tested it.

@michalpristas michalpristas merged commit b9569ff into elastic:master Oct 5, 2020
michalpristas added a commit to michalpristas/beats that referenced this pull request Oct 5, 2020
v1v added a commit to v1v/beats that referenced this pull request Oct 5, 2020
…-matches-found

* upstream/master: (21 commits)
  Skip filestream flaky tests (elastic#21490)
  Ignore unsupported metrics in the azure module (elastic#21486)
  Do not run symlink tests on Windows (elastic#21472)
  Map `cloud.account.id` to azure sub id (elastic#21483)
  Add support for app_state metricset (elastic#20639)
  Include original error when metricbeat fails to connect with Kafka (elastic#21484)
  Prompt only when agent is already enrolled (elastic#21473)
  Fix leftover delpoyment example (elastic#21474)
  Bump version to ECS 1.6 in modules without ECS updates (elastic#21455)
  Clarify input type configuration options (elastic#19284)
  Increase index pattern size check to 10MiB (elastic#21487)
  Migrate S3 Input to Filebeat Input V2 (elastic#20005)
  [libbeat] Add configurable exponential backoff for disk queue write errors (elastic#21493)
  Revert "Revert "[JJBB] Set shallow cloning to 10 (elastic#21409)" (elastic#21447)" (elastic#21467)
  Fix format of debug messages in tlscommon (elastic#21482)
  [CI] Change x-pack/auditbeat build events (comments, labels) (elastic#21463)
  [CI] changeset from elastic#20603 was not added to CI2.0 (elastic#21464)
  Add new log file reader for filestream input (elastic#21450)
  [CI] Send slack message with build status (elastic#21428)
  Remove duplicated sources url in dependencies report (elastic#21462)
  ...
michalpristas added a commit that referenced this pull request Oct 5, 2020
Prompt only when agent is already enrolled (#21473)
v1v added a commit to v1v/beats that referenced this pull request Oct 5, 2020
* upstream/master: (26 commits)
  [Ingest Manager] Send updating state (elastic#21461)
  [Filebeat][New Fileset] Cisco Umbrella support (elastic#21504)
  [Ingest Manager] Download asc from artifact store specified in spec (elastic#21488)
  Implementation of fileProspector (elastic#21479)
  [Metricbeat] Add latency config option into aws module (elastic#20875)
  Skip filestream flaky tests (elastic#21490)
  Ignore unsupported metrics in the azure module (elastic#21486)
  Do not run symlink tests on Windows (elastic#21472)
  Map `cloud.account.id` to azure sub id (elastic#21483)
  Add support for app_state metricset (elastic#20639)
  Include original error when metricbeat fails to connect with Kafka (elastic#21484)
  Prompt only when agent is already enrolled (elastic#21473)
  Fix leftover delpoyment example (elastic#21474)
  Bump version to ECS 1.6 in modules without ECS updates (elastic#21455)
  Clarify input type configuration options (elastic#19284)
  Increase index pattern size check to 10MiB (elastic#21487)
  Migrate S3 Input to Filebeat Input V2 (elastic#20005)
  [libbeat] Add configurable exponential backoff for disk queue write errors (elastic#21493)
  Revert "Revert "[JJBB] Set shallow cloning to 10 (elastic#21409)" (elastic#21447)" (elastic#21467)
  Fix format of debug messages in tlscommon (elastic#21482)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Ingest Management:beta2 Group issues for ingest management beta2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Elastic Agent] Remove prompt on first enrollment
3 participants