Skip to content
This repository has been archived by the owner on Sep 17, 2024. It is now read-only.

feat: support flavours in services, specially in the elastic-agent #1162

Merged
merged 21 commits into from
May 13, 2021
Merged

feat: support flavours in services, specially in the elastic-agent #1162

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
7a46fca
chore: move compose to deploy package
mdelapenya May 11, 2021
41db6b0
feat: use a ServiceRequest when adding services
mdelapenya May 11, 2021
6879808
feat: add service flavour support
mdelapenya May 11, 2021
590b31e
chore: remove unused centos/debian services
mdelapenya May 11, 2021
463ff9c
fixup: add service flavour
mdelapenya May 12, 2021
9c9768d
chore: move docker client to the deploy package
mdelapenya May 12, 2021
fd1542b
chore: use ServiceRequest everywhere
mdelapenya May 12, 2021
0fe7826
chore: run agent commands with a ServiceRequest
mdelapenya May 12, 2021
1922901
chore: use ServiceRequest in metricbeat test suite
mdelapenya May 12, 2021
64ac3b1
chore: pass flavours to installers
mdelapenya May 12, 2021
79ad38d
chore: add a step to install the agent for the underlying OS
mdelapenya May 12, 2021
c34a4e0
chore: always add flavour
mdelapenya May 12, 2021
50054f7
Merge branch 'master' into 1160-service-flavours
mdelapenya May 12, 2021
c47bf82
fix: use installer for fleet_mode when removing services at the end o…
mdelapenya May 13, 2021
8dd9fd9
fix: update broken references in metricbeat test suite
mdelapenya May 13, 2021
423d28a
fix: update broken references in helm test suite
mdelapenya May 13, 2021
eaa88c3
fix: standalone does not have an installer
mdelapenya May 13, 2021
e23947f
fix: use service instead of image to get a service request for the agent
mdelapenya May 13, 2021
5b011e0
feat: support for scaling services in compose
mdelapenya May 13, 2021
18a8114
fix: run second agent using compose scale option
mdelapenya May 13, 2021
ebd5ea9
fix: update kibana's default Docker namespace
mdelapenya May 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cli/config/compose/profiles/fleet/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Copy link
Contributor

Choose a reason for hiding this comment

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

I always wondered about this one :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The 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:
Expand Down