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

[7.16] Support multiple endpoints #965

Closed
Closed
Changes from all commits
Commits
Show all changes
245 commits
Select commit Hold shift + click to select a range
622f275
Add cherrypick_pr dev-tools helper. (#67)
blakerouse Jan 20, 2021
bea660f
Set version to 7.12.0. (#69)
blakerouse Jan 20, 2021
f6bebab
Add communication to Elastic Agent (#71) (#75)
blakerouse Jan 28, 2021
5775b05
Make fleet server components resilent if the indices do not exist
aleksmaus Jan 20, 2021
06a7d37
Address code review comments
aleksmaus Jan 21, 2021
fe4fdc5
Hide old bootstrap logic behind FLEET_ES_BOOT environment variable
aleksmaus Jan 25, 2021
3951f20
Rename action input_id to input_type
aleksmaus Jan 27, 2021
0c5d311
Merge pull request #76 from aleksmaus/cherry_pick/master_to_7.x
aleksmaus Jan 29, 2021
b16f636
Add .exe extension to fleet-server windows artifacts. (#78) (#79)
blakerouse Feb 2, 2021
f0912ad
Fix permissions on dependencies-report script (#80) (#81)
blakerouse Feb 2, 2021
dbbcd69
Reduce actions fetching interval if the full page of action documents…
aleksmaus Feb 2, 2021
d1fd092
Increase the initial agent's actions fetch size to 100
aleksmaus Feb 3, 2021
aed971c
Merge pull request #85 from aleksmaus/improve/monitor_poll_7.x
aleksmaus Feb 5, 2021
ae81889
Flatten .fleet-actions-results schema
aleksmaus Feb 7, 2021
71de64b
Merge pull request #89 from aleksmaus/flatten/fleet-actions-results-b…
aleksmaus Feb 16, 2021
5dc43dd
[Backport 7.x] Change default bind port from 8000 to 8220 (#92) (#94)
Feb 18, 2021
ce59b47
Bump version to 7.13. (#97)
blakerouse Feb 18, 2021
f5932f5
Add ssl configuration to fleet server http. (#98) (#100)
blakerouse Feb 22, 2021
9002029
Upgrade to Go 1.15
aleksmaus Feb 24, 2021
ff8ae35
Merge pull request #106 from aleksmaus/upgrade/go_1.15_backport
aleksmaus Feb 25, 2021
f0c9320
Align output key permissions with 7.12 Kibana (#103) (#107)
Feb 25, 2021
0ff4c90
Remove ES bootsrap code from Fleet Server (#105) (#109)
aleksmaus Mar 1, 2021
8c435f5
Remove saved objects code (#110) (#111)
aleksmaus Mar 1, 2021
dc11ce0
Fix global checkpoint based monitoring (#116) (#117)
aleksmaus Mar 3, 2021
0322984
Set agent active to false on unenroll ack. (#118) (#120)
blakerouse Mar 3, 2021
f2841a5
Add API key invalidation on unenroll ACK. (#124) (#125)
blakerouse Mar 5, 2021
0fdb2b1
Basic metrics framework leveraging beats logic. (#113)
Mar 4, 2021
3a2179f
Add optional hard connection limit to the server. No more than N con…
Mar 5, 2021
6595e03
Enable trace level logging (#112) (#127)
aleksmaus Mar 5, 2021
c426aa8
Add API status endpoint (#131) (#138)
blakerouse Mar 17, 2021
e0512ec
Cleanup and refactoring (#133) (#139)
ruflin Mar 18, 2021
45105f1
Handle artifact request from agent. Return from cache if available, …
Mar 8, 2021
584bcc5
Search/Cache artifact by ident/hash. Tolerate duplicate records. Va…
Mar 16, 2021
c568343
Add cache configuration option.
Mar 18, 2021
6a7c539
Support buildmode=pie on 64 bit platforms.
Mar 18, 2021
0d3c6c4
Move from camelCase to snake_case to reflect change in Kibana.
Mar 22, 2021
6babdb2
Update Event payload type. (#128)
aleksmaus Mar 9, 2021
b2c5da5
Remove darwin/arm64 support. Remove ASLR support for darwin. Both f…
Mar 23, 2021
9d8ffa1
Upgrade go compiler to 1.16.2 to support darwin/arm64 and buildmode=p…
Mar 23, 2021
b27e722
Fix incorrect buildmode for arm64/darwin
Mar 23, 2021
4d27208
Fix configuration for cache and server profiler off by default (#162)…
mergify[bot] Mar 23, 2021
f1edcf7
Fix the handling of the upgrade ack. (#177) (#179)
mergify[bot] Mar 29, 2021
0b802d6
Remove the left over systemd and rpm build items. (#170) (#181)
mergify[bot] Mar 29, 2021
b84dfc6
Fix issue with rolling out policies from the coordinator. (#180) (#183)
mergify[bot] Mar 30, 2021
338f15b
Increase the monitor throughput: increase the default fetch size, mak…
aleksmaus Mar 30, 2021
066cbb9
Increase the monitor throughput: increase the default fetch size, mak…
mergify[bot] Mar 30, 2021
f6a9db9
Change the agent.action_seq_no storage format from number to an array…
aleksmaus Mar 30, 2021
23bb5b3
Change the agent.action_seq_no storage format from number to an array…
mergify[bot] Mar 30, 2021
2729c2e
Indexing permissions as part of the Elastic Agent policy (#187) (#192)
mergify[bot] Mar 30, 2021
7a3ec91
Add user_id to .fleet-actions schema (#198) (#199)
mergify[bot] Apr 2, 2021
81d5bfc
Bport2 (#203)
Apr 5, 2021
9258e94
Normalize server API limits. (#208)
mergify[bot] Apr 7, 2021
88bc4e8
Propagate enrollment_token to agent during bootstrap. (#207) (#210)
mergify[bot] Apr 8, 2021
d3d68cc
Support basic ECS logging fields (#211)
mergify[bot] Apr 8, 2021
8ad1ef4
Structured logger outputs RFC3339 at millisecond resolution in zulu t…
mergify[bot] Apr 8, 2021
8cd2578
Preprocess policy on new revision to pre-calculate hashes and minimiz…
mergify[bot] Apr 9, 2021
6609f4e
Add route metrics. (#222)
mergify[bot] Apr 12, 2021
153b5e5
Fix issue with not sending the agents default api_key. (#224) (#225)
mergify[bot] Apr 12, 2021
51a3b0a
Wire additional bulk configuration options. (backport #221) (#228)
mergify[bot] Apr 13, 2021
a4be496
Fix coordinator goroutine tight loop on cancelled context (#229) (#230)
mergify[bot] Apr 13, 2021
c5e7d9a
Update graceful handling for missing indices to accommodate the new f…
mergify[bot] Apr 13, 2021
136ce81
Implement support for API Key metadata (#195) (#232)
mergify[bot] Apr 13, 2021
7ef2834
Bring 7.x readme up to date with master. (#233)
Apr 14, 2021
0aeb5a9
Add ability to communicate with elasticsearch using a service token (…
mergify[bot] Apr 14, 2021
d6166f9
Example configuration for minimal RAM. (#241)
mergify[bot] Apr 14, 2021
a2e547c
Ensure that the connecting Elastic Agent is a supported version. (#23…
mergify[bot] Apr 15, 2021
52495c5
Utilize new ES fleet polling API for global checkpoint monitoring (#2…
mergify[bot] Apr 15, 2021
917ffbe
Update fleet server monitor logging (#247) (#248)
mergify[bot] Apr 19, 2021
f69cbc3
Validate Elasticsearch version for compatibility (#249) (#250)
mergify[bot] Apr 19, 2021
f407332
Add script to avoid race condition on updating policy metadata in age…
mergify[bot] Apr 20, 2021
eac4e29
Move runtime configuration so that can be configured via agent. (#258)
mergify[bot] Apr 20, 2021
45e3923
Wait on index when polling global checkpoints (#254) (#259)
mergify[bot] Apr 21, 2021
5fd10c4
Bump to 7.14.0 (#262)
ph Apr 21, 2021
dbde638
Bump elastic stack version automation (#252) (#265)
mergify[bot] Apr 23, 2021
c60f832
Improve log message about degraded being okay during bootstrap. (#268…
mergify[bot] Apr 23, 2021
bc6af80
[mergify]: delete branch related to automation after it gets merged a…
mergify[bot] Apr 27, 2021
5615e97
Remove the UUID checks. (#286) (#287)
mergify[bot] Apr 27, 2021
b1dfb2c
Report failure running under Elastic Agent (#290) (#292)
mergify[bot] Apr 27, 2021
eb0e26a
[Automation] Update elastic stack version to 7.14.0-76235d63 for test…
apmmachine Apr 29, 2021
994dd6b
Reduce the monitor long poll timeout to 4 minutes by default (#306) (…
mergify[bot] Apr 30, 2021
f4d1ac2
[Automation] Update elastic stack version to 7.14.0-c9bfc196 for test…
apmmachine Apr 30, 2021
345b520
mergify: fix delete_head_branch condition (#312) (#313)
mergify[bot] Apr 30, 2021
0803a30
[Automation] Update elastic stack version to 7.14.0-83b532ee for test…
apmmachine May 3, 2021
eb23e3b
[Automation] Update elastic stack version to 7.14.0-90e98b59 for test…
apmmachine May 4, 2021
25c227c
Add error response to be JSON (#324) (#325)
mergify[bot] May 4, 2021
86a8e5f
[Automation] Update elastic stack version to 7.14.0-5b4d7537 for test…
apmmachine May 6, 2021
8554255
[Automation] Update elastic stack version to 7.14.0-8ba10577 for test…
apmmachine May 7, 2021
607b169
[Automation] Update elastic stack version to 7.14.0-7d5ea6dc for test…
apmmachine May 10, 2021
74742a3
[Automation] Update elastic stack version to 7.14.0-e8048b9e for test…
apmmachine May 11, 2021
91ef4f1
[7.x](backport #319) Refactor bulk API to minimize allocations and in…
mergify[bot] May 12, 2021
4ee3c3f
Fix the comparison between a MaxUint32 and the len of the slice (#352)
mergify[bot] May 14, 2021
f97db96
[Automation] Update elastic stack version to 7.14.0-c3a960d1 for test…
apmmachine May 17, 2021
78cdb8e
Remove the remnants of fleet indices bootstrapping for the integratio…
mergify[bot] May 17, 2021
2a99ed4
Fix issue with config reloading. (#365) (#366)
mergify[bot] May 17, 2021
6b65878
Conform error and hash fields to ECS. (#363)
mergify[bot] May 17, 2021
86f83a7
[Automation] Update elastic stack version to 7.14.0-c4ef352d for test…
apmmachine May 18, 2021
f11fc6e
[Automation] Update elastic stack version to 7.14.0-406b0128 for test…
apmmachine May 19, 2021
7701f2f
[Automation] Update elastic stack version to 7.14.0-b278d172 for test…
apmmachine May 20, 2021
34458e3
Send owner: true on API call to invalid API keys. (#381) (#382)
mergify[bot] May 20, 2021
4782323
[Automation] Update elastic stack version to 7.14.0-a9c3399b for test…
apmmachine May 21, 2021
b12d8bd
[Automation] Update elastic stack version to 7.14.0-113d5d66 for test…
apmmachine May 24, 2021
64b6589
Log version and commit at boot
May 19, 2021
7c67d18
[Automation] Update elastic stack version to 7.14.0-9eca24b7 for test…
apmmachine May 26, 2021
7c29697
Update to Go version 1.16.4 (#341) (#397)
mergify[bot] May 26, 2021
2e688f0
[Automation] Update elastic stack version to 7.14.0-f385fee6 for test…
apmmachine May 27, 2021
b364bf6
Add context to errors for better visibility in logs. Add http access …
mergify[bot] May 27, 2021
4b2b37a
[Automation] Update elastic stack version to 7.14.0-d593413f for test…
apmmachine May 28, 2021
9a507c9
[Automation] Update elastic stack version to 7.14.0-62d7f45e for test…
apmmachine May 31, 2021
c5340df
Add log message to diag auth latency. Replace with metrics on auth ro…
mergify[bot] May 31, 2021
913b0e0
[Automation] Update elastic stack version to 7.14.0-631ae8b8 for test…
apmmachine Jun 1, 2021
60b73c1
[Automation] Update elastic stack version to 7.14.0-bdd01eb6 for test…
apmmachine Jun 2, 2021
cd679a7
[Automation] Update elastic stack version to 7.14.0-8590217b for test…
apmmachine Jun 3, 2021
1a729f5
Revert elastic search client to the 7.x series. (#425)
mergify[bot] Jun 3, 2021
22bf71f
Propagate checkin status to agent record (#427)
mergify[bot] Jun 3, 2021
5a1ead0
[Automation] Update elastic stack version to 7.14.0-983e13ea for test…
apmmachine Jun 4, 2021
0efdb1d
[Automation] Update elastic stack version to 7.14.0-bb1ffc77 for test…
apmmachine Jun 7, 2021
576f9f7
Remove zap stub logger bleed through. (#433)
mergify[bot] Jun 7, 2021
ede7640
Better enroll logging (#439)
mergify[bot] Jun 8, 2021
3d504d7
[7.x](backport #437) Refactor bulk engine startup and add bulk ApiKey…
mergify[bot] Jun 8, 2021
bf2b232
Tweak server timeouts. Limit body size to defend malicious agent (#441)
mergify[bot] Jun 8, 2021
4e32e27
[7.x](backport #436) Update go-version (#447)
mergify[bot] Jun 9, 2021
9892733
[Automation] Update elastic stack version to 7.14.0-28665d9b for test…
apmmachine Jun 10, 2021
9a42db0
[7.x](backport #443) Configure cache (#450)
mergify[bot] Jun 10, 2021
21d91bc
[7.x](backport #445) Add optional jitter to long poll (#451)
mergify[bot] Jun 10, 2021
6af3e35
[7.x](backport #346) fix: use the right Go version in the CI (#460)
mergify[bot] Jun 15, 2021
74c4038
Remove indirect build dependency on go-license-detector. (#457) (#459)
mergify[bot] Jun 15, 2021
82a821e
Policy tests occasionally fail in jenkins. Force init to be determin…
mergify[bot] Jun 15, 2021
4ca031b
fix: resolve missed merge-conflicts
mdelapenya Jun 18, 2021
2975e6f
[7.x](backport #351) chore: separate unit tests from integration test…
mergify[bot] Jun 18, 2021
8cc004e
[Automation] Update elastic stack version to 7.14.0-52b7d996 for test…
apmmachine Jun 21, 2021
f438876
Merge pull request #468 from mdelapenya/fix-merge-conflicts
mdelapenya Jun 21, 2021
ee44308
[Automation] Update elastic stack version to 7.14.0-08bc11a0 for test…
apmmachine Jun 22, 2021
2f48409
Move Fleet Server specific config from elastic search section to serv…
mergify[bot] Jun 23, 2021
c968534
[Automation] Update elastic stack version to 7.14.0-df0371f0 for test…
apmmachine Jun 23, 2021
332764f
Automate the go version update (#465) (#482)
mergify[bot] Jun 23, 2021
460816d
Add unenroller based on unenroll_timeout from policy (#472) (#483)
mergify[bot] Jun 23, 2021
a54a1f8
[Automation] Update elastic stack version to 7.14.0-8f9888e1 for test…
apmmachine Jun 24, 2021
a4bee6c
[Automation] Update elastic stack version to 7.14.0-25663e85 for test…
apmmachine Jun 25, 2021
8780203
[Automation] Update elastic stack version to 7.14.0-15b00b37 for test…
apmmachine Jun 28, 2021
eb0200b
Short-circuit long poll if the auth/setup takes too long. Add servic…
mergify[bot] Jun 28, 2021
3baf011
[Automation] Update elastic stack version to 7.14.0-b3f1839d for test…
apmmachine Jun 29, 2021
7652302
[Automation] Update elastic stack version to 7.14.0-c5e16e4e for test…
apmmachine Jun 29, 2021
3b16b5d
Bump 7.x to 7.15. (#506)
blakerouse Jun 30, 2021
c95e63d
[Automation] Update elastic stack version to 7.14.0-45f71c2c for test…
apmmachine Jul 1, 2021
982aaa8
[7.x](backport #491) Streamline proxy settings with Beats/Agent (#510)
mergify[bot] Jul 1, 2021
c4020a4
Enable http2 in Fleet Server. (#511) (#512)
mergify[bot] Jul 2, 2021
1cb3251
Policy changes can be dropped during policy rollouts to large number …
mergify[bot] Jul 7, 2021
310c31b
Modify hard connection limiter to Close connection on max instead of …
mergify[bot] Jul 7, 2021
03ef494
[Automation] Update elastic stack version to 7.15.0-588e7872 for test…
apmmachine Jul 15, 2021
2522efe
[Automation] Update elastic stack version to 7.15.0-f74484b5 for test…
apmmachine Jul 16, 2021
892fe79
refactor rollout to be more deterministic (#564)
mergify[bot] Jul 17, 2021
dfb1ab7
[Automation] Update elastic stack version to 7.15.0-876ab971 for test…
apmmachine Jul 19, 2021
343889a
[Automation] Update elastic stack version to 7.15.0-af619a87 for test…
apmmachine Jul 20, 2021
20f6377
[Automation] Update elastic stack version to 7.15.0-c23a5439 for test…
apmmachine Jul 21, 2021
74db288
Add action timeout (#575) (#579)
mergify[bot] Jul 21, 2021
b7f7774
[Automation] Update elastic stack version to 7.15.0-192e1003 for test…
apmmachine Jul 22, 2021
d0bf827
[Automation] Update elastic stack version to 7.15.0-5e783247 for test…
apmmachine Jul 23, 2021
5bdc198
[Automation] Update elastic stack version to 7.15.0-514bcfaf for test…
apmmachine Jul 26, 2021
0900e1d
[Automation] Update elastic stack version to 7.15.0-6e66e5d1 for test…
apmmachine Jul 27, 2021
0c92736
[7.x](backport #592) Updates elastic agent client dependency (#593)
mergify[bot] Jul 27, 2021
ba8ae15
[Automation] Update elastic stack version to 7.15.0-bd471fd6 for test…
apmmachine Jul 28, 2021
cfd3564
[Automation] Update elastic stack version to 7.15.0-2cefb6a4 for test…
apmmachine Jul 29, 2021
4bc5091
[7.x](backport #610) Improve version checking for 8.0.0-alpha1 (#611)
mergify[bot] Aug 2, 2021
045ebad
Populate agent.id field in .fleet-agents index (#609) (#614)
mergify[bot] Aug 3, 2021
f3ce32b
Add additional diagnostic logging to trace policy assignment issues. …
mergify[bot] Aug 5, 2021
8f33cda
Additional logs to track policy change. (#625)
mergify[bot] Aug 6, 2021
d267c4d
[Automation] Update elastic stack version to 7.15.0-83f2fe8a for test…
apmmachine Aug 11, 2021
e5f361a
[Automation] Update elastic stack version to 7.15.0-af472020 for test…
apmmachine Aug 12, 2021
e487575
[Automation] Update elastic stack version to 7.15.0-ba42231a for test…
apmmachine Aug 13, 2021
aabbff6
[Automation] Update elastic stack version to 7.15.0-4b8a78a4 for test…
apmmachine Aug 18, 2021
c237057
Bump to 7.16. (#642)
blakerouse Aug 18, 2021
7e6ebb3
[Automation] Update elastic stack version to 7.16.0-ab6de48d for test…
apmmachine Aug 20, 2021
5c9f05d
[Automation] Update elastic stack version to 7.16.0-2d73c7e8 for test…
apmmachine Aug 23, 2021
1706e6d
[Automation] Update elastic stack version to 7.16.0-c3b80e7b for test…
apmmachine Aug 24, 2021
f42cecb
[Automation] Update elastic stack version to 7.16.0-13c65289 for test…
apmmachine Aug 25, 2021
4c33706
[Automation] Update elastic stack version to 7.16.0-6320ab58 for test…
apmmachine Aug 26, 2021
f88e471
[Automation] Update elastic stack version to 7.16.0-d98a671f for test…
apmmachine Aug 27, 2021
5778d04
[Automation] Update elastic stack version to 7.16.0-d17acf1e for test…
apmmachine Aug 30, 2021
6097637
Improve PR description template (#591) (#673)
mergify[bot] Aug 30, 2021
c000772
[Automation] Update elastic stack version to 7.16.0-978c8c33 for test…
apmmachine Aug 31, 2021
775660c
Add index refresh call after fetch if the list of hits has holes (#66…
mergify[bot] Aug 31, 2021
d0f52ee
Fix panic. (#683) (#684)
mergify[bot] Aug 31, 2021
61ac1f7
[Automation] Update elastic stack version to 7.16.0-8a18fe34 for test…
apmmachine Sep 1, 2021
e956b56
Encapsulate the agent new version safe check, full unit test coverage…
mergify[bot] Sep 1, 2021
c4749f2
Set User-Agent in HTTP requests (#654) (#690)
mergify[bot] Sep 1, 2021
1211811
Fix issues with config reloading (#692) (#693)
mergify[bot] Sep 7, 2021
8135e2e
[Automation] Update elastic stack version to 7.16.0-a96d8aa5 for test…
apmmachine Sep 8, 2021
2b390d4
Add "hole" detection and refresh for the agent actions fetch upon ini…
mergify[bot] Sep 8, 2021
9339ae0
[Automation] Update elastic stack version to 7.16.0-468522bc for test…
apmmachine Sep 9, 2021
b2933c8
[Automation] Update elastic stack version to 7.16.0-fbd5fab2 for test…
apmmachine Sep 13, 2021
34918a0
[Automation] Update elastic stack version to 7.16.0-f4fa0a64 for test…
apmmachine Sep 14, 2021
4693359
[Automation] Update elastic stack version to 7.16.0-b40a7e80 for test…
apmmachine Sep 15, 2021
c0342c9
[Automation] Update elastic stack version to 7.16.0-63cdb007 for test…
apmmachine Sep 16, 2021
babca29
[Automation] Update elastic stack version to 7.16.0-8df9bb12 for test…
apmmachine Sep 20, 2021
293fc0d
[Automation] Update elastic stack version to 7.16.0-3f2f8446 for test…
apmmachine Sep 21, 2021
1245f0c
[Automation] Update elastic stack version to 7.16.0-e2daa6e3 for test…
apmmachine Sep 22, 2021
eaebfda
[CI] use obltGitHubComments (#728) (#729)
mergify[bot] Sep 22, 2021
51833fb
[Automation] Update elastic stack version to 7.16.0-51a7a70c for test…
apmmachine Sep 23, 2021
3d9efb0
Do not require that the default output use the default key in the out…
mergify[bot] Sep 23, 2021
805b9dd
[Automation] Update elastic stack version to 7.16.0-70330f11 for test…
apmmachine Sep 24, 2021
044e8ef
[Automation] Update elastic stack version to 7.16.0-4cbd636a for test…
apmmachine Sep 27, 2021
930136b
[Automation] Update elastic stack version to 7.16.0-25009c74 for test…
apmmachine Sep 28, 2021
9d869fd
[Automation] Update elastic stack version to 7.16.0-f67263fd for test…
apmmachine Sep 30, 2021
06fe47b
[Automation] Update elastic stack version to 7.16.0-806be5a9 for test…
apmmachine Oct 1, 2021
165533e
[Automation] Update elastic stack version to 7.16.0-76e5f71e for test…
apmmachine Oct 4, 2021
e3bcb9f
Bump golang to 1.17.2. (#769) (#772)
mergify[bot] Oct 11, 2021
30ff1e1
Fix self monitor to report starting and wait for fleet-server input t…
mergify[bot] Oct 11, 2021
fef2d01
[Automation] Update elastic stack version to 7.16.0-86000c2d for test…
apmmachine Oct 13, 2021
4e79e98
[Automation] Update elastic stack version to 7.16.0-a907c0d5 for test…
apmmachine Oct 14, 2021
1192443
[Automation] Update elastic stack version to 7.16.0-8bf0b9b1 for test…
apmmachine Oct 18, 2021
db99c48
[7.x](backport #787) Limit const size on 32bit arch to fit int32 (#788)
mergify[bot] Oct 18, 2021
f6edadf
[Automation] Update elastic stack version to 7.16.0-72891008 for test…
apmmachine Oct 19, 2021
0d8ffe5
[Automation] Update elastic stack version to 7.16.0-738085ba for test…
apmmachine Oct 20, 2021
c3642b0
Change agentId field to a value that elastic will map.
Oct 21, 2021
aa18231
Add action_response field into .fleet-actions-results (#796) (#800)
aleksmaus Oct 22, 2021
6d167f4
[Automation] Update elastic stack version to 7.16.0-b54dfa68 for test…
apmmachine Oct 22, 2021
d9e967e
[Automation] Update elastic stack version to 7.16.0-ee63131c for test…
apmmachine Oct 26, 2021
7a5b05d
[Automation] Update elastic stack version to 7.16.0-a0af8f2a for test…
apmmachine Oct 27, 2021
9fb8526
[Automation] Update elastic stack version to 7.16.0-66ccea1a for test…
apmmachine Nov 1, 2021
d481d06
Migrate agent.id field from 7.14 to 7.15+
Nov 1, 2021
bfadd09
Handle 404 on .fleet-agent index as a noop during migration.
Nov 2, 2021
024642a
[Automation] Update elastic stack version to 7.16.0-c5c99751 for test…
apmmachine Nov 3, 2021
f73abc8
[Automation] Update elastic stack version to 7.16.0-c51d3b71 for test…
apmmachine Nov 4, 2021
3977d6b
[Automation] Update elastic stack version to 7.16.0-68781827 for test…
apmmachine Nov 5, 2021
70d50d3
[Automation] Update elastic stack version to 7.16.0-df026734 for test…
apmmachine Nov 10, 2021
765adde
Normalize logging (#859)
mergify[bot] Nov 11, 2021
093e9f0
Improve some of the log message (#844) (#862)
ruflin Nov 11, 2021
9e5245d
[Automation] Update elastic stack version to 7.16.0-20fe9209 for test…
apmmachine Nov 12, 2021
f73d0c5
[Automation] Update elastic stack version to 7.16.0-27f0a6d6 for test…
apmmachine Nov 15, 2021
fb9bddf
[Automation] Update elastic stack version to 7.16.0-1af90c36 for test…
apmmachine Nov 17, 2021
14b0b08
[Automation] Update elastic stack version to 7.16.0-705b02ff for test…
apmmachine Nov 18, 2021
3609aeb
[Automation] Update elastic stack version to 7.16.0-3a1031bc for test…
apmmachine Nov 19, 2021
7ce0a8c
[Automation] Update elastic stack version to 7.16.0-8c304116 for test…
apmmachine Nov 24, 2021
1625975
[Automation] Update elastic stack version to 7.16.0-5227689d for test…
apmmachine Nov 25, 2021
f1918b3
[Automation] Update elastic stack version to 7.16.0-58c0cae7 for test…
apmmachine Nov 26, 2021
ae84148
[Automation] Update elastic stack version to 7.16.0-19916e4d for test…
apmmachine Nov 29, 2021
3d19317
[Automation] Update elastic stack version to 7.16.0-4a83af8d for test…
apmmachine Nov 30, 2021
dd5873c
[7.16](backport #883) Retry reads when ES unavailable (#937)
mergify[bot] Nov 30, 2021
5d46931
[Automation] Update elastic stack version to 7.16.0-046aeba5 for test…
apmmachine Dec 1, 2021
42301f0
[Automation] Update elastic stack version to 7.16.0-80ab1dd0 for test…
apmmachine Dec 2, 2021
9290834
[Automation] Update elastic stack version to 7.16.0-f17274e7 for test…
apmmachine Dec 3, 2021
847e854
[Automation] Update elastic stack version to 7.16.0-ef210289 for test…
apmmachine Dec 6, 2021
ce3abb6
[Automation] Update elastic stack version to 7.16.0-f2941f42 for test…
apmmachine Dec 7, 2021
0cabcd8
Bump version to 7.16.1 (#954)
andresrc Dec 7, 2021
76ea938
merge conflicts resolver
michalpristas Nov 23, 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
39 changes: 29 additions & 10 deletions .ci/Jenkinsfile
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ pipeline {
quietPeriod(10)
}
triggers {
issueCommentTrigger('(?i)(.*(?:jenkins\\W+)?run\\W+(?:the\\W+)?tests(?:\\W+please)?.*|^\\/test$)')
issueCommentTrigger("${obltGitHubComments()}")
}
stages {
/**
@@ -38,8 +38,8 @@ pipeline {
stage('Check') {
steps {
cleanup()
withGoEnv(){
dir("${BASE_DIR}"){
dir("${BASE_DIR}"){
withGoEnv(){
sh(label: 'check',script: 'make check')
}
}
@@ -48,20 +48,39 @@ pipeline {
stage('Local') {
steps {
cleanup()
withGoEnv(){
dir("${BASE_DIR}"){
dir("${BASE_DIR}"){
withGoEnv(){
sh(label: 'local',script: 'make local')
}
}
}
}
stage('Test') {
stage('Unit Test') {
options { skipDefaultCheckout() }
steps {
cleanup()
withGoEnv(){
dir("${BASE_DIR}"){
dir("${BASE_DIR}"){
withGoEnv(){
sh(label: 'test', script: 'make test-unit')
sh(label: 'test', script: 'make junit-report')
}
}
}
post {
always {
junit(allowEmptyResults: true, keepLongStdio: true, testResults: "${BASE_DIR}/build/*.xml")
}
}
}
stage('Integration Test') {
options { skipDefaultCheckout() }
steps {
cleanup()
dir("${BASE_DIR}"){
withGoEnv(){
retryWithSleep(retries: 2, seconds: 5, backoff: true){ sh(label: "Install Docker", script: '.ci/scripts/install-docker-compose.sh') }
sh(label: 'test', script: 'make test')
sh(label: 'test', script: 'make test-int')
sh(label: 'test', script: 'make junit-report')
}
}
}
@@ -84,4 +103,4 @@ def cleanup(){
deleteDir()
}
unstash 'source'
}
}
22 changes: 22 additions & 0 deletions .ci/bump-go-release-version.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#!/usr/bin/env bash
#
# Given the Golang release version this script will bump the version.
#
# This script is executed by the automation we are putting in place
# and it requires the git add/commit commands.
#
# Parameters:
# $1 -> the Golang release version to be bumped. Mandatory.
#
set -euo pipefail
MSG="parameter missing."
GO_RELEASE_VERSION=${1:?$MSG}

echo "Update go version ${GO_RELEASE_VERSION}"
echo "${GO_RELEASE_VERSION}" > .go-version

git add .go-version
git diff --staged --quiet || git commit -m "[Automation] Update go release version to ${GO_RELEASE_VERSION}"
git --no-pager log -1

echo "You can now push and create a Pull Request"
41 changes: 41 additions & 0 deletions .ci/bump-stack-version.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
#!/usr/bin/env bash
#
# Given the stack version this script will bump the version.
#
# This script is executed by the automation we are putting in place
# and it requires the git add/commit commands.
#
# Parameters:
# $1 -> the version to be bumped. Mandatory.
# $2 -> whether to create a branch where to commit the changes to.
# this is required when reusing an existing Pull Request.
# Optional. Default true.
#
set -euo pipefail
MSG="parameter missing."
VERSION=${1:?$MSG}
CREATE_BRANCH=${2:-true}

OS=$(uname -s| tr '[:upper:]' '[:lower:]')

if [ "${OS}" == "darwin" ] ; then
SED="sed -i .bck"
else
SED="sed -i"
fi

echo "Update stack with version ${VERSION}"
${SED} -E -e "s#(ELASTICSEARCH_VERSION)=[0-9]+\.[0-9]+\.[0-9]+(-[a-f0-9]{8})?#\1=${VERSION}#g" dev-tools/integration/.env

echo "Commit changes"
if [ "$CREATE_BRANCH" = "true" ]; then
base=$(git rev-parse --abbrev-ref HEAD | sed 's#/#-#g')
git checkout -b "update-stack-version-$(date "+%Y%m%d%H%M%S")-${base}"
else
echo "Branch creation disabled."
fi
git add dev-tools/integration/.env
git diff --staged --quiet || git commit -m "[Automation] Update elastic stack version to ${VERSION} for testing"
git --no-pager log -1

echo "You can now push and create a Pull Request"
1 change: 1 addition & 0 deletions .ci/jobs/fleet-server.yml
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@
discover-pr-forks-trust: permission
discover-pr-origin: merge-current
discover-tags: true
head-filter-regex: '^(?!update-.*-version).*$'
notification-context: 'fleet-server'
repo: fleet-server
repo-owner: elastic
57 changes: 12 additions & 45 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -8,45 +8,33 @@ Please label this PR with one of the following labels, depending on the scope of
- Docs
-->

## What does this PR do?
## What is the problem this PR solves?

<!-- Mandatory
Explain here the changes you made on the PR. Please explain the WHAT: patterns used, algorithms implemented, design architecture, message processing, etc.
-->
// Please do not just reference an issue. Explain WHAT the problem this PR solves here.

## Why is it important?
## How does this PR solve the problem?

<!-- Mandatory
Explain here the WHY, or the rationale/motivation for the changes.
// Explain HOW you solved the problem in your code. It is possible that during PR reviews this changes and then this section should be updated.


## How to test this PR locally

<!-- Recommended
Explain here how this PR will be tested by the reviewer if anything special is needed for manual testing: commands, dependencies, steps, etc.
-->

## Checklist

<!-- Mandatory
Add a checklist of things that are required to be reviewed in order to have the PR approved

List here all the items you have verified BEFORE sending this PR. Please DO NOT remove any item, striking through those that do not apply. (Just in case, strikethrough uses two tildes. ~~Scratch this.~~)
This checklist is to help creators of PRs to find parts which might not be directly related to code change but still need to be addressed. Anything that does not apply to the PR should be removed from the 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`.

## Author's Checklist

<!-- Recommended
Add a checklist of things that are required to be reviewed in order to have the PR approved
-->
- [ ]

## How to test this PR locally

<!-- Recommended
Explain here how this PR will be tested by the reviewer: commands, dependencies, steps, etc.
-->

## Related issues

@@ -57,25 +45,4 @@ Link related issues below. Insert the issue link or reference after the word "Cl
- Relates #123
- Requires #123
- Superseds #123
-->
-

## Use cases

<!-- Recommended
Explain here the different behaviors that this PR introduces or modifies in this project, user roles, environment configuration, etc.

If you are familiar with Gherkin test scenarios, we recommend its usage: https://cucumber.io/docs/gherkin/reference/
-->

## Screenshots

<!-- Optional
Add here screenshots about how the project will be changed after the PR is applied. They could be related to web pages, terminal, etc, or any other image you consider important to be shared with the team.
-->

## Logs

<!-- Recommended
Paste here output logs discovered while creating this PR, such as stack traces or integration logs, or any other output you consider important to be shared with the team.
-->
-->
7 changes: 5 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -4,9 +4,12 @@
.vscode/

bin/
*.rpm
build/
/build/

fleet-server
fleet_server
fleet-server.dev.yml
*.log
*.log.*

dev-tools/integration/.env.bck
2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.14.12
1.17.2
85 changes: 85 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
pull_request_rules:
- name: ask to resolve conflict
conditions:
- conflict
actions:
comment:
message: |
This pull request is now in conflicts. Could you fix it @{{author}}? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/
```
git fetch upstream
git checkout -b {{head}} upstream/{{head}}
git merge upstream/{{base}}
git push upstream {{head}}
```
- name: backport patches to 7.x branch
conditions:
- merged
- base=master
- label=v7.14.0
actions:
backport:
assignees:
- "{{ author }}"
branches:
- "7.x"
labels:
- "backport"
- name: backport patches to 7.13 branch
conditions:
- merged
- base=master
- label=v7.13.0
actions:
backport:
assignees:
- "{{ author }}"
branches:
- "7.13"
labels:
- "backport"
- name: backport patches to 7.12 branch
conditions:
- merged
- base=master
- label=v7.12.0
actions:
backport:
assignees:
- "{{ author }}"
branches:
- "7.12"
labels:
- "backport"
- name: automatic merge for 7\. branches when CI passes
conditions:
- check-success=fleet-server/pr-merge
- check-success=CLA
- base~=^7\.
- label=backport
- author=mergify[bot]
actions:
merge:
method: squash
strict: smart+fasttrack
- name: automatic merge when CI passes and the file dev-tools/integration/.env is modified.
conditions:
- check-success=fleet-server/pr-merge
- label=automation
- files~=^dev-tools/integration/.env$
actions:
merge:
method: squash
strict: smart+fasttrack
- name: delete upstream branch with changes on dev-tools/integration/.env or .go-version after merging/closing it
conditions:
- or:
- merged
- closed
- and:
- label=automation
- head~=^update-.*-version
- files~=^(dev-tools/integration/.env|.go-version)$
actions:
delete_head_branch:
Loading