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

Change docker image from CentOS 7 to Ubuntu 20.04 #29681

Merged
merged 9 commits into from
Jan 11, 2022
Merged

Change docker image from CentOS 7 to Ubuntu 20.04 #29681

merged 9 commits into from
Jan 11, 2022

Conversation

blakerouse
Copy link
Contributor

@blakerouse blakerouse commented Jan 4, 2022 •
edited
Loading

What does this PR do?

Change the docker image from CentOS 7 to Ubuntu 20.04.

Note: Takes over from where pull #29374 left off.

Why is it important?

Closes #29255

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.

Related issues

@blakerouse blakerouse added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Jan 4, 2022
@blakerouse blakerouse self-assigned this Jan 4, 2022
@blakerouse blakerouse requested review from a team as code owners January 4, 2022 16:49
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jan 4, 2022
@cla-checker-service
Copy link

cla-checker-service bot commented Jan 4, 2022 •
edited
Loading

💚 CLA has been signed

@botelastic botelastic bot added Team:Automation Label for the Observability productivity team and removed needs_team Indicates that the issue/PR needs a Team:* label labels Jan 4, 2022
@mergify
Copy link
Contributor

mergify bot commented Jan 4, 2022

This pull request does not have a backport label. Could you fix it @blakerouse? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v./d./d./d is the label to automatically backport to the 7./d branch. /d is the digit

NOTE: backport-skip has been added to this pull request.

@mergify mergify bot added the backport-skip Skip notification from the automated backport with mergify label Jan 4, 2022
@blakerouse blakerouse mentioned this pull request Jan 4, 2022
Closed
7 tasks
jlind23
jlind23 approved these changes Jan 4, 2022
View reviewed changes
Copy link
Collaborator

@jlind23 jlind23 left a comment

Choose a reason for hiding this comment

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

LGTM

@v1v
Copy link
Member

v1v commented Jan 4, 2022

/package

@elasticmachine
Copy link
Collaborator

elasticmachine commented Jan 4, 2022 •
edited by jenkins-beats-ci bot
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2022-01-11T14:56:48.192+0000

  • Duration: 209 min 48 sec

  • Commit: d838179

Test stats 🧪

Test Results
Failed 0
Passed 47839
Skipped 4284
Total 52123

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@blakerouse
Copy link
Contributor Author

/test

@andrewvc
Copy link
Contributor

andrewvc commented Jan 5, 2022

@blakerouse can you let us know when we can help test out synthetics / browsers to make sure they still work?

@v1v
Copy link
Member

v1v commented Jan 6, 2022

/package

@v1v
Copy link
Member

v1v commented Jan 6, 2022

/test

@v1v
Copy link
Member

v1v commented Jan 6, 2022

/package

@blakerouse
Copy link
Contributor Author

/package

@blakerouse
Copy link
Contributor Author

@andrewvc This is ready for some testing. Did you want to test before merge?

@andrewvc
Copy link
Contributor

FYI @lucasfcosta is taking on the next step of fixing this for synthetics, which is determining why, even with the added deps, synthetics is now hanging

lucasfcosta added a commit to lucasfcosta/synthetics that referenced this pull request Jan 11, 2022
@lucasfcosta
fix: stop runner from hanging indefinitely within ubuntu docker images [
aafdb49 
elastic/beats#29681]
@lucasfcosta lucasfcosta mentioned this pull request Jan 11, 2022
Merged
@blakerouse
Copy link
Contributor Author

Okay going to merge. The e2e failure is due to ansible issue, checked with the robots team.

@blakerouse blakerouse merged commit febc7dd into elastic:master Jan 11, 2022
@blakerouse blakerouse deleted the ubuntu-20.04 branch January 11, 2022 20:33
@blakerouse blakerouse added backport-v8.0.0 Automated backport with mergify and removed backport-skip Skip notification from the automated backport with mergify labels Jan 11, 2022
mergify bot pushed a commit that referenced this pull request Jan 11, 2022
@blakerouse
Change docker image from CentOS 7 to Ubuntu 20.04 (#29681)
1c07b69 
* Switch to Ubuntu 20.04.

* Fix Dockerfile.

* Change to amd64 in Dockerfile.tmpl.

* Add missing curl and ca-certificate deps. Change back to x86_64.

* Fix issues with setcap and xz extraction.

* Add changelog, fix remaining issues.

* Fix synthetics deps

* Fix apt-get. Remove todo from packages.yml.

Co-authored-by: Andrew Cholakian <andrewvc@elastic.co>
(cherry picked from commit febc7dd)
@mergify mergify bot mentioned this pull request Jan 11, 2022
Merged
@andrewvc
Copy link
Contributor

I just want to note that with this change synthetics now is broken in 8.0.0 and we should consider this a blocker

lucasfcosta added a commit to lucasfcosta/synthetics that referenced this pull request Jan 12, 2022
@lucasfcosta
fix: stop runner from hanging indefinitely within ubuntu docker images [
5c3eb68 
elastic/beats#29681]
@lucasfcosta lucasfcosta mentioned this pull request Jan 12, 2022
Closed
@blakerouse blakerouse added the backport-7.17 Automated backport to the 7.17 branch with mergify label Jan 12, 2022
mergify bot pushed a commit that referenced this pull request Jan 12, 2022
@blakerouse
Change docker image from CentOS 7 to Ubuntu 20.04 (#29681)
7d70374 
* Switch to Ubuntu 20.04.

* Fix Dockerfile.

* Change to amd64 in Dockerfile.tmpl.

* Add missing curl and ca-certificate deps. Change back to x86_64.

* Fix issues with setcap and xz extraction.

* Add changelog, fix remaining issues.

* Fix synthetics deps

* Fix apt-get. Remove todo from packages.yml.

Co-authored-by: Andrew Cholakian <andrewvc@elastic.co>
(cherry picked from commit febc7dd)

# Conflicts:
#	dev-tools/packaging/packages.yml
#	dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl
#	metricbeat/Dockerfile
@mergify mergify bot mentioned this pull request Jan 12, 2022
Merged
blakerouse added a commit that referenced this pull request Jan 12, 2022
@mergify @blakerouse
Change docker image from CentOS 7 to Ubuntu 20.04 (#29681) (#29798)
c74370a 
* Switch to Ubuntu 20.04.

* Fix Dockerfile.

* Change to amd64 in Dockerfile.tmpl.

* Add missing curl and ca-certificate deps. Change back to x86_64.

* Fix issues with setcap and xz extraction.

* Add changelog, fix remaining issues.

* Fix synthetics deps

* Fix apt-get. Remove todo from packages.yml.

Co-authored-by: Andrew Cholakian <andrewvc@elastic.co>
(cherry picked from commit febc7dd)

Co-authored-by: Blake Rouse <blake.rouse@elastic.co>
@blakerouse blakerouse restored the ubuntu-20.04 branch January 12, 2022 14:58
@blakerouse blakerouse deleted the ubuntu-20.04 branch January 12, 2022 14:58
v1v added a commit to v1v/beats that referenced this pull request Jan 12, 2022
@v1v
Merge remote-tracking branch 'upstream/master' into feature/add-githu…
0bab1d5 
…b-for-macos

* upstream/master: (172 commits)
  [Elastic Agent] Fix issue with ensureServiceToken. (elastic#29800)
  [Winlogbeat] Add provider name to Security routing pipeline check (elastic#29781)
  Add summary to journeys which don't emit journey:end (early node subprocess exits) (elastic#29606)
  Prepare 8.0.0-rc1 changelog (elastic#29795) (elastic#29806)
  Change docker image from CentOS 7 to Ubuntu 20.04 (elastic#29681)
  libbeat/processors/add_process_metadata: implement a process cache eviction policy (elastic#29717)
  [Automation] Update elastic stack version to 8.1.0-7004acda for testing (elastic#29783)
  Missing changelog entry for elastic#29773 (elastic#29791)
  Add a readme for k8s autodiscover provider (elastic#28213)
  Remove overriding of index pattern on the Kubernetes overview dashboard (elastic#29676)
  jjbb: remove obsoleted branches (<7.16) (elastic#29707)
  Add k8s metadata in state_cronjob metricset (elastic#29572)
  ibmmq: Fix timestamp parsing (elastic#29773)
  Do not add date to index if `@meta.index` is set (elastic#29775)
  ci: uses aliases for the branches (elastic#29706)
  Filebeat tests: Restore `@timestamp` field validation (elastic#29772)
  Forward port 7.16.3 changelog to master (elastic#29777)
  auditd: Store program arguments in process.args array (elastic#29601)
  System/socket: Support kernel_clone() replacement for _do_fork() (elastic#29744)
  Do not mention removal if version is not specified in `cfgwarn` messages (elastic#29727)
  ...
lucasfcosta added a commit to elastic/synthetics that referenced this pull request Jan 13, 2022
@lucasfcosta
Stop runner from hanging indefinitely within ubuntu docker images [el…
f8e3df1 
…astic/beats#29681] (#441)

* fix: stop runner from hanging indefinitely within ubuntu docker images [elastic/beats#29681]

* fix: enable --disable-gpu flag only for headless runs
blakerouse added a commit that referenced this pull request Jan 18, 2022
@mergify @blakerouse
[7.17](backport #29681) Change docker image from CentOS 7 to Ubuntu 2…
5d84131 
…0.04 (#29817)

* Change docker image from CentOS 7 to Ubuntu 20.04 (#29681)

* Switch to Ubuntu 20.04.

* Fix Dockerfile.

* Change to amd64 in Dockerfile.tmpl.

* Add missing curl and ca-certificate deps. Change back to x86_64.

* Fix issues with setcap and xz extraction.

* Add changelog, fix remaining issues.

* Fix synthetics deps

* Fix apt-get. Remove todo from packages.yml.

Co-authored-by: Andrew Cholakian <andrewvc@elastic.co>
(cherry picked from commit febc7dd)

# Conflicts:
#	dev-tools/packaging/packages.yml
#	dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl
#	metricbeat/Dockerfile

* Fix merge conflicts.

* Fix issue in Dockerfile.elastic-agent.tmpl.

Co-authored-by: Blake Rouse <blake.rouse@elastic.co>
@simitt simitt mentioned this pull request Jan 26, 2022
Closed
v1v added a commit that referenced this pull request Jan 28, 2022
@v1v
Merge remote-tracking branch 'upstream/7.17' into v1v-patch-1
c28c548 
* upstream/7.17: (30 commits)
  [7.17](backport #29966) Add the Elastic product origin header when talking to Elasticsearch or Kibana. (#30000)
  [Heartbeat] Change size of data on ICMP packet (#29948) (#29978)
  Add clarification about enableing dashboard loading (#29985) (#29989)
  Improve aws-s3 gzip file detection to avoid false negatives (#29969) (#29974)
  ci: docker login step for pulling then pushing (#29960) (#29963)
  x-pack/auditbeat/module/system/socket: get full length path and arg from /proc when not available from kprobe (#29410) (#29958)
  [Automation] Update elastic stack version to 7.17.0-ab4975a2 for testing (#29956)
  [Automation] Update elastic stack version to 7.17.0-1bd58b32 for testing (#29938)
  [7.17](backport #29913) [Metricbeat] gcp.gke: fix overview dashboard (#29914)
  [7.17](backport #29605) Fix annotation enrichment (#29834)
  [Automation] Update elastic stack version to 7.17.0-e1efbe3a for testing (#29922)
  [Automation] Update elastic stack version to 7.17.0-68da5d12 for testing (#29904)
  [7.17][Heartbeat] Defer monitor / ICMP errors to monitor runtime / ES (backport #29413) (#29896)
  Merge pull request from GHSA-rj4h-hqvq-cc6q
  [7.17](backport #29681) Change docker image from CentOS 7 to Ubuntu 20.04 (#29817)
  Fix YAML indentation in `parsers` examples (#29663) (#29894)
  [Automation] Update elastic stack version to 7.17.0-079761a0 for testing (#29864)
  Fix Filebeat dissect processor field tokenization in documentation (#29680) (#29883)
  Enable require_alias for Bulk requests for all actions when target is a write alias (#29879)
  Update Index template loading guide to use the correct endpoint (#29869) (#29877)
  ...
@jlind23 jlind23 mentioned this pull request Feb 2, 2022
Merged
@fabianonunes fabianonunes mentioned this pull request Apr 18, 2022
Closed
@Und3rf10w Und3rf10w mentioned this pull request Apr 27, 2022
Open
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
@v1v
Merge remote-tracking branch 'upstream/7.17' into v1v-patch-1
82291ab 
* upstream/7.17: (30 commits)
  [7.17](backport elastic#29966) Add the Elastic product origin header when talking to Elasticsearch or Kibana. (elastic#30000)
  [Heartbeat] Change size of data on ICMP packet (elastic#29948) (elastic#29978)
  Add clarification about enableing dashboard loading (elastic#29985) (elastic#29989)
  Improve aws-s3 gzip file detection to avoid false negatives (elastic#29969) (elastic#29974)
  ci: docker login step for pulling then pushing (elastic#29960) (elastic#29963)
  x-pack/auditbeat/module/system/socket: get full length path and arg from /proc when not available from kprobe (elastic#29410) (elastic#29958)
  [Automation] Update elastic stack version to 7.17.0-ab4975a2 for testing (elastic#29956)
  [Automation] Update elastic stack version to 7.17.0-1bd58b32 for testing (elastic#29938)
  [7.17](backport elastic#29913) [Metricbeat] gcp.gke: fix overview dashboard (elastic#29914)
  [7.17](backport elastic#29605) Fix annotation enrichment (elastic#29834)
  [Automation] Update elastic stack version to 7.17.0-e1efbe3a for testing (elastic#29922)
  [Automation] Update elastic stack version to 7.17.0-68da5d12 for testing (elastic#29904)
  [7.17][Heartbeat] Defer monitor / ICMP errors to monitor runtime / ES (backport elastic#29413) (elastic#29896)
  Merge pull request from GHSA-rj4h-hqvq-cc6q
  [7.17](backport elastic#29681) Change docker image from CentOS 7 to Ubuntu 20.04 (elastic#29817)
  Fix YAML indentation in `parsers` examples (elastic#29663) (elastic#29894)
  [Automation] Update elastic stack version to 7.17.0-079761a0 for testing (elastic#29864)
  Fix Filebeat dissect processor field tokenization in documentation (elastic#29680) (elastic#29883)
  Enable require_alias for Bulk requests for all actions when target is a write alias (elastic#29879)
  Update Index template loading guide to use the correct endpoint (elastic#29869) (elastic#29877)
  ...
@Dwordcito Dwordcito mentioned this pull request Nov 5, 2024
Closed
@NahuFigueroa97 NahuFigueroa97 mentioned this pull request Nov 11, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jsoriano jsoriano jsoriano left review comments

@jlind23 jlind23 jlind23 approved these changes

Assignees

@blakerouse blakerouse

Labels
backport-7.17 Automated backport to the 7.17 branch with mergify backport-v8.0.0 Automated backport with mergify Team:Automation Label for the Observability productivity team Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Change the base docker image to ubuntu 20.04 for Beats & Elastic Agent
7 participants
@blakerouse @elasticmachine @v1v @andrewvc @ChrsMark @jsoriano @jlind23