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

PMM-12078 HA phase 3 active active PoC #2247

Merged
merged 123 commits into from
Nov 27, 2023
Merged
Show file tree
Hide file tree
Changes from 96 commits
Commits
Show all changes
123 commits
Select commit Hold shift + click to select a range
d5fe25c
PMM-9374 support of external victoria metrics.
BupycHuk Mar 1, 2023
8400da1
PMM-9374 update version number of victoria metrics.
BupycHuk Mar 6, 2023
c1ceff0
PMM-9374 vmalert.
BupycHuk Mar 13, 2023
ed017ba
PMM-9374 use pmm-clients vmagent instead of a separate one.
BupycHuk Mar 15, 2023
c1ded19
Merge remote-tracking branch 'origin/main' into PMM-9374-external-vic…
BupycHuk Mar 28, 2023
9854b08
Merge remote-tracking branch 'origin/main' into PMM-9374-external-vic…
BupycHuk Mar 29, 2023
36182b4
PMM-9374 Fix linters.
BupycHuk Mar 29, 2023
b46395a
PMM-9374 Fix tests.
BupycHuk Mar 29, 2023
7fe77aa
PMM-9374 Improve work with VM Proxy.
BupycHuk Mar 29, 2023
2ec6403
PMM-9374 Fix tests.
BupycHuk Mar 30, 2023
91c83c4
PMM-9374 Fix tests.
BupycHuk Mar 30, 2023
64b3739
PMM-9374 Fix tests.
BupycHuk Mar 30, 2023
3be78bc
Merge branch 'main' into PMM-9374-external-victoria-metrics
BupycHuk Mar 30, 2023
71ce812
PMM-9374 Fix linters.
BupycHuk Mar 30, 2023
abe1dd7
PMM-9374 Add new tests.
BupycHuk Mar 30, 2023
c5d6afe
PMM-9374 use interfaces instead of real object.
BupycHuk Apr 4, 2023
f9b458a
PMM-9374 Fix the test.
BupycHuk Apr 5, 2023
0d2b497
PMM-9374 Fix the linter.
BupycHuk Apr 5, 2023
9866663
PMM-9374 Fix the linter.
BupycHuk Apr 5, 2023
ff0ac00
Merge branch 'main' into PMM-9374-external-victoria-metrics
BupycHuk Apr 5, 2023
436c644
Merge remote-tracking branch 'origin/main' into PMM-9374-external-vic…
BupycHuk Apr 6, 2023
1557312
Merge remote-tracking branch 'origin/main' into PMM-9374-external-vic…
BupycHuk Apr 12, 2023
661e49a
PMM-11952 docker configuration for external PostgreSQL usage.
BupycHuk Apr 7, 2023
c6390f0
PMM-11952 docker configuration for external PostgreSQL usage.
BupycHuk Apr 7, 2023
60382e0
PMM-11924 PMM HA Phase 3.
BupycHuk Apr 7, 2023
5875881
PMM-11924 PMM HA Phase 3 PoC.
BupycHuk Apr 10, 2023
1f609cb
PMM-11924 PMM HA Phase 3 PoC.
BupycHuk Apr 11, 2023
6f8c806
PMM-11924 PMM HA Phase 3 PoC.
BupycHuk Apr 7, 2023
0777b65
Merge branch 'main' into PMM-11924-HA-Phase-3-PoC-new
BupycHuk Apr 14, 2023
e521e2e
Merge branch 'main' into PMM-11924-HA-Phase-3-PoC-new
BupycHuk Apr 18, 2023
e7eb9ac
PMM-11924 Fix tests.
BupycHuk Apr 18, 2023
45288f6
PMM-11924 Fix tests and linters.
BupycHuk Apr 19, 2023
0edec82
Merge branch 'main' into PMM-11924-HA-Phase-3-PoC-new
BupycHuk Apr 19, 2023
78c59e8
PMM-11924 Fix tests.
BupycHuk Apr 19, 2023
7008fde
PMM-11924 Fix linter.
BupycHuk Apr 19, 2023
32cf780
Merge branch 'main' into PMM-9374-external-victoria-metrics
BupycHuk Apr 19, 2023
97b5561
Merge branch 'PMM-9374-external-victoria-metrics' into PMM-11924-HA-P…
BupycHuk Apr 19, 2023
a456c0c
Update pmm_config.go
BupycHuk Apr 28, 2023
e2323e2
Update pmm-db_disabled.ini
BupycHuk Apr 28, 2023
7363a01
PMM-12078 HA Phase 3 Active-Active PoC.
BupycHuk May 3, 2023
aa94ad8
Merge branch 'main' into PMM-9374-external-victoria-metrics
BupycHuk May 26, 2023
fd4bc42
PMM-12078 HA Phase 3 Active-Active PoC.
BupycHuk May 30, 2023
74e4670
PMM-12182 use interface.
BupycHuk Jun 7, 2023
7dbec9e
Merge branch 'main' into PMM-12078-HA-Phase-3-Active-Active-PoC
BupycHuk Jun 7, 2023
67ed382
PMM-12078 fix go.sum.
BupycHuk Jun 7, 2023
3396e8a
PMM-12078 fix build.
BupycHuk Jun 8, 2023
b031580
Merge remote-tracking branch 'origin/main' into PMM-12078-HA-Phase-3-…
BupycHuk Jun 22, 2023
c1b8b57
Merge branch 'main' into PMM-12078-HA-Phase-3-Active-Active-PoC
BupycHuk Jun 27, 2023
840fe50
Merge branch 'main' into PMM-12078-HA-Phase-3-Active-Active-PoC
BupycHuk Jul 4, 2023
8b448c0
Merge branch 'main' into PMM-9374-external-victoria-metrics
BupycHuk Jul 4, 2023
6d8c070
Merge remote-tracking branch 'origin/main' into PMM-12078-HA-Phase-3-…
BupycHuk Jul 5, 2023
33becb4
Merge branch 'main' into PMM-12078-HA-Phase-3-Active-Active-PoC
BupycHuk Jul 5, 2023
749ddfe
PMM-12078 Improve the code
BupycHuk Jul 6, 2023
fe61c44
PMM-12078 Fix docker-compose config
BupycHuk Jul 6, 2023
464f441
PMM-12078 HAProxy configuration
BupycHuk Jul 6, 2023
28de624
PMM-12078 Format
BupycHuk Jul 6, 2023
446f32e
PMM-12078 haproxy certificates
BupycHuk Jul 6, 2023
2980ec8
PMM-12078 fix configuration
BupycHuk Jul 7, 2023
7476475
Merge branch 'main' into PMM-12078-HA-Phase-3-Active-Active-PoC
BupycHuk Jul 7, 2023
e86414c
PMM-12078 fix configuration
BupycHuk Jul 7, 2023
d32960c
PMM-12078 fix tests
BupycHuk Jul 7, 2023
285b327
PMM-12078 fix tests
BupycHuk Jul 7, 2023
1a25b5a
PMM-12078 fix supervisord
BupycHuk Jul 7, 2023
affcfbe
PMM-12078 fix supervisord
BupycHuk Jul 7, 2023
5201502
PMM-12078 fix linters
BupycHuk Jul 7, 2023
0e7d22f
PMM-12078 fix listen port for grafana gossip protocol
BupycHuk Jul 7, 2023
1552bde
PMM-12078 Some cleanup.
BupycHuk Jul 10, 2023
ff7a305
PMM-12078 fix license headers.
BupycHuk Jul 10, 2023
eb14a8e
Merge branch 'main' into PMM-12078-HA-Phase-3-Active-Active-PoC
BupycHuk Jul 11, 2023
cea1eda
PMM-12293 fix linters.
BupycHuk Jul 11, 2023
77ae9c4
PMM-12078 go mod tidy
BupycHuk Jul 11, 2023
d7267be
PMM-12078 Fix linters
BupycHuk Jul 18, 2023
3e94486
PMM-12078 Fix linters.
BupycHuk Jul 18, 2023
1948914
PMM-12078 revert changes.
BupycHuk Jul 18, 2023
6b85ba8
Merge branch 'main' into PMM-12078-HA-Phase-3-Active-Active-PoC
BupycHuk Jul 18, 2023
4e9043b
Merge branch 'main' into PMM-9374-external-victoria-metrics
BupycHuk Jul 18, 2023
7acd78e
Merge remote-tracking branch 'origin/main' into PMM-12078-HA-Phase-3-…
BupycHuk Jul 18, 2023
d709b76
PMM-12078 don't run pmm-agent on passive nodes.
BupycHuk Jul 18, 2023
0aa45ff
PMM-12078 Fix tests and linters.
BupycHuk Jul 19, 2023
d86b64b
PMM-12078 Fix tests and linters.
BupycHuk Jul 21, 2023
13ed0d3
PMM-12078 Fix starlark test.
BupycHuk Jul 21, 2023
36f6660
Merge branch 'main' into PMM-12078-HA-Phase-3-Active-Active-PoC
BupycHuk Jul 21, 2023
16d3fc2
Merge branch 'main' into PMM-12078-HA-Phase-3-Active-Active-PoC
BupycHuk Aug 10, 2023
a38645d
Merge branch 'main' into PMM-9374-external-victoria-metrics
BupycHuk Aug 25, 2023
2f8fc85
PMM-9374 fix supervisord for external VM.
BupycHuk Aug 30, 2023
429e7e5
Merge branch 'main' into PMM-9374-external-victoria-metrics
BupycHuk Aug 30, 2023
a79a4fa
PMM-9374 Fix linters.
BupycHuk Sep 5, 2023
cf1c1cb
Merge branch 'main' into PMM-9374-external-victoria-metrics
BupycHuk Sep 5, 2023
5a6a5a2
PMM-9374 Don't run victoria metrics if it's external.
BupycHuk Sep 8, 2023
adddb85
Merge branch 'main' into PMM-9374-external-victoria-metrics
BupycHuk Sep 12, 2023
c6ce8e3
Merge branch 'PMM-9374-external-victoria-metrics' into PMM-12078-HA-P…
BupycHuk Sep 12, 2023
7fd5123
Merge remote-tracking branch 'origin/main' into PMM-12078-HA-Phase-3-…
BupycHuk Sep 18, 2023
5481cb5
PMM-12078 revert changes made for active-active connection.
BupycHuk Sep 18, 2023
9f98df5
PMM-12078 fix linter.
BupycHuk Sep 18, 2023
993e4d5
Update log_level.go
BupycHuk Sep 18, 2023
10f541a
Merge branch 'main' into PMM-12078-HA-Phase-3-Active-Active-PoC
BupycHuk Sep 18, 2023
f61f016
Update managed/services/highavailability/highavailability.go
BupycHuk Oct 3, 2023
6f7ae1d
Update managed/services/highavailability/leaderservice.go
BupycHuk Oct 3, 2023
8bf58db
PMM-12078 address comments.
BupycHuk Oct 3, 2023
aeeacee
Merge branch 'main' into PMM-12078-HA-Phase-3-Active-Active-PoC
BupycHuk Oct 3, 2023
a8b3ca1
PMM-12078 fix linter.
BupycHuk Oct 4, 2023
d3f45c8
PMM-12078 fix license headers.
BupycHuk Oct 9, 2023
59bf32f
Merge branch 'main' into PMM-12078-HA-Phase-3-Active-Active-PoC
BupycHuk Oct 9, 2023
2964b32
Merge branch 'main' into PMM-12078-HA-Phase-3-Active-Active-PoC
BupycHuk Oct 12, 2023
9c9e744
Merge branch 'main' into PMM-12078-HA-Phase-3-Active-Active-PoC
BupycHuk Oct 17, 2023
c7937fd
PMM-12078 Some improvements regarding env variables.
BupycHuk Oct 18, 2023
717f9a0
PMM-12078 Some improvements regarding env variables.
BupycHuk Oct 19, 2023
2a3df44
PMM-12078 Some improvements regarding env variables.
BupycHuk Oct 19, 2023
656d1e1
Merge branch 'main' into PMM-12078-HA-Phase-3-Active-Active-PoC
BupycHuk Oct 19, 2023
225f228
PMM-12078 Don't create grafana DB for external DB.
BupycHuk Oct 19, 2023
3794438
PMM-12078 Update db versions.
BupycHuk Oct 20, 2023
5a88f09
Merge branch 'main' into PMM-12078-HA-Phase-3-Active-Active-PoC
BupycHuk Oct 21, 2023
c831303
Merge branch 'main' into PMM-12078-HA-Phase-3-Active-Active-PoC
BupycHuk Oct 24, 2023
e5ffdbf
Merge branch 'main' into PMM-12078-HA-Phase-3-Active-Active-PoC
BupycHuk Oct 30, 2023
ec8472c
Merge branch 'main' into PMM-12078-HA-Phase-3-Active-Active-PoC
BupycHuk Oct 31, 2023
6aa7009
Merge branch 'main' into PMM-12078-HA-Phase-3-Active-Active-PoC
BupycHuk Oct 31, 2023
007033b
PMM-12078 fix go mod.
BupycHuk Oct 31, 2023
b6ffda1
Merge branch 'main' into PMM-12078-HA-Phase-3-Active-Active-PoC
BupycHuk Nov 9, 2023
670bc09
Merge branch 'main' into PMM-12078-HA-Phase-3-Active-Active-PoC
BupycHuk Nov 27, 2023
2828945
PMM-12078 fix linter
BupycHuk Nov 27, 2023
f4e4faa
Merge branch 'main' into PMM-12078-HA-Phase-3-Active-Active-PoC
BupycHuk Nov 27, 2023
9363230
PMM-12078 fix linter
BupycHuk Nov 27, 2023
82c8fb4
PMM-12078 fix linter
BupycHuk Nov 27, 2023
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
4 changes: 2 additions & 2 deletions agent/cmd/pmm-agent-entrypoint/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,15 @@ var (
var pmmAgentProcessID = 0

func runPmmAgent(ctx context.Context, commandLineArgs []string, restartPolicy restartPolicy, l *logrus.Entry, pmmAgentSidecarSleep int) int {
pmmAgentFullCommand := "pmm-admin " + strings.Join(commandLineArgs, " ")
BupycHuk marked this conversation as resolved.
Show resolved Hide resolved
pmmAgentFullCommand := "pmm-agent " + strings.Join(commandLineArgs, " ")
BupycHuk marked this conversation as resolved.
Show resolved Hide resolved
for {
select {
case <-ctx.Done():
return 1
default:
}
var exitCode int
l.Infof("Starting 'pmm-admin %s'...", strings.Join(commandLineArgs, " "))
l.Infof("Starting 'pmm-agent %s'...", strings.Join(commandLineArgs, " "))
cmd := commandPmmAgent(commandLineArgs)
if err := cmd.Start(); err != nil {
l.Errorf("Can't run: '%s', Error: %s", commandLineArgs, err)
Expand Down
146 changes: 146 additions & 0 deletions api/serverpb/json/client/server/leader_health_check_parameters.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading