This repository has been archived by the owner on Sep 17, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 42
feat: support flavours in services, specially in the elastic-agent #1162
Merged
Merged
Changes from all commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
7a46fca
chore: move compose to deploy package
mdelapenya 41db6b0
feat: use a ServiceRequest when adding services
mdelapenya 6879808
feat: add service flavour support
mdelapenya 590b31e
chore: remove unused centos/debian services
mdelapenya 463ff9c
fixup: add service flavour
mdelapenya 9c9768d
chore: move docker client to the deploy package
mdelapenya fd1542b
chore: use ServiceRequest everywhere
mdelapenya 0fe7826
chore: run agent commands with a ServiceRequest
mdelapenya 1922901
chore: use ServiceRequest in metricbeat test suite
mdelapenya 64ac3b1
chore: pass flavours to installers
mdelapenya 79ad38d
chore: add a step to install the agent for the underlying OS
mdelapenya c34a4e0
chore: always add flavour
mdelapenya 50054f7
Merge branch 'master' into 1160-service-flavours
mdelapenya c47bf82
fix: use installer for fleet_mode when removing services at the end o…
mdelapenya 8dd9fd9
fix: update broken references in metricbeat test suite
mdelapenya 423d28a
fix: update broken references in helm test suite
mdelapenya eaa88c3
fix: standalone does not have an installer
mdelapenya e23947f
fix: use service instead of image to get a service request for the agent
mdelapenya 5b011e0
feat: support for scaling services in compose
mdelapenya 18a8114
fix: run second agent using compose scale option
mdelapenya ebd5ea9
fix: update kibana's default Docker namespace
mdelapenya File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -29,7 +29,7 @@ services: | |
test: "curl -f http://localhost:5601/login | grep kbn-injected-metadata 2>&1 >/dev/null" | ||
retries: 600 | ||
interval: 1s | ||
image: "docker.elastic.co/${kibanaDockerNamespace:-beats}/kibana:${kibanaVersion:-8.0.0-SNAPSHOT}" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I always wondered about this one :) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Wrong copy&paste on my side for sure 🤦 I think I'm gonna merge it after the CI passes |
||
image: "docker.elastic.co/${kibanaDockerNamespace:-kibana}/kibana:${kibanaVersion:-8.0.0-SNAPSHOT}" | ||
ports: | ||
- "5601:5601" | ||
volumes: | ||
|
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
...ervices/centos-systemd/docker-compose.yml → ...s/elastic-agent/centos/docker-compose.yml
This file contains 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
File renamed without changes.
2 changes: 1 addition & 1 deletion
2
...ervices/debian-systemd/docker-compose.yml → ...s/elastic-agent/debian/docker-compose.yml
This file contains 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
This file contains 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
This file contains 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
This file contains 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Rather than calling
deploy.NewServiceManager
we could initialize it like we do in the fleet tests that way you just usedeployer.Add
instead and it'll do the right thing no matter the provider (docker or k8s)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we do that we will be introducing a bug in the CLI side, as we have coupled the Bootstrap method with the Fleet profile. Maybe we can fix that in a separate PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well, indeed the bug is there if we decide to migrate the metricbeat test suite 😄