PMM-9374 external victoria metrics #1916

BupycHuk · 2023-03-28T18:52:50Z

Link to the Feature Build: SUBMODULES-3331

If this PR adds or removes or alters one or more API endpoints, please review and add or update the relevant API documents as well:

API Docs updated

If this PR is related to some other PRs in this or other repositories, please provide links to those PRs:

Links to related pull requests (optional).

…toria-metrics # Conflicts: # managed/cmd/pmm-managed/main.go # managed/services/agents/vmagent.go

codecov · 2023-03-28T19:16:46Z

Codecov Report

Merging #1916 (adddb85) into main (04c35d3) will increase coverage by 0.02%.
Report is 6 commits behind head on main.
The diff coverage is 42.95%.

@@            Coverage Diff             @@
##             main    #1916      +/-   ##
==========================================
+ Coverage   42.71%   42.73%   +0.02%     
==========================================
  Files         384      384              
  Lines       48188    48273      +85     
==========================================
+ Hits        20582    20631      +49     
- Misses      25668    25700      +32     
- Partials     1938     1942       +4

Flag	Coverage Δ
admin	`10.41% <ø> (-0.05%)`	⬇️
agent	`53.27% <ø> (+0.15%)`	⬆️
managed	`43.73% <42.64%> (-0.01%)`	⬇️
vmproxy	`68.57% <50.00%> (-1.13%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Changed	Coverage Δ
managed/cmd/pmm-managed/main.go	`0.00% <0.00%> (ø)`
managed/services/agents/registry.go	`0.00% <0.00%> (ø)`
managed/services/agents/state.go	`0.00% <0.00%> (ø)`
managed/services/supervisord/pmm_config.go	`7.69% <ø> (ø)`
managed/utils/envvars/parser.go	`60.40% <0.00%> (-2.23%)`	⬇️
...anaged/services/victoriametrics/victoriametrics.go	`46.35% <37.50%> (-4.96%)`	⬇️
vmproxy/proxy/proxy.go	`84.93% <50.00%> (-3.13%)`	⬇️
managed/models/victoriametrics_params.go	`64.70% <66.66%> (ø)`
managed/services/supervisord/logs.go	`49.54% <66.66%> (+0.16%)`	⬆️
managed/services/agents/vmagent.go	`100.00% <100.00%> (ø)`
... and 1 more

... and 3 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

…toria-metrics

github-actions · 2023-03-29T12:29:34Z

managed/models/victoriametrics_params_test.go

@@ -23,11 +23,11 @@ import (

 func TestVictoriaMetricsParams(t *testing.T) {
 	t.Run("read non exist baseConfigFile", func(t *testing.T) {
-		_, err := NewVictoriaMetricsParams("nonExistConfigFile.yml")
+		_, err := NewVictoriaMetricsParams("nonExistConfigFile.yml", "", "", "")


🚫 [golangci] _{reported by reviewdog 🐶}
too many arguments in call to NewVictoriaMetricsParams

github-actions · 2023-03-29T12:29:34Z

managed/models/victoriametrics_params_test.go

 		require.NoError(t, err)
 	})
 	t.Run("check params for VMAlert", func(t *testing.T) {
-		vmp, err := NewVictoriaMetricsParams("../testdata/victoriametrics/prometheus.external.alerts.yml")
+		vmp, err := NewVictoriaMetricsParams("../testdata/victoriametrics/prometheus.external.alerts.yml", "", "", "")


🚫 [golangci] _{reported by reviewdog 🐶}
too many arguments in call to NewVictoriaMetricsParams

github-actions · 2023-03-29T12:29:34Z

managed/models/victoriametrics_params_test.go

@@ -23,11 +23,11 @@

 func TestVictoriaMetricsParams(t *testing.T) {
 	t.Run("read non exist baseConfigFile", func(t *testing.T) {
-		_, err := NewVictoriaMetricsParams("nonExistConfigFile.yml")
+		_, err := NewVictoriaMetricsParams("nonExistConfigFile.yml", "", "", "")


🚫 [golangci] _{reported by reviewdog 🐶}
too many arguments in call to NewVictoriaMetricsParams

github-actions · 2023-03-29T12:29:34Z

managed/models/victoriametrics_params_test.go

 		require.NoError(t, err)
 	})
 	t.Run("check params for VMAlert", func(t *testing.T) {
-		vmp, err := NewVictoriaMetricsParams("../testdata/victoriametrics/prometheus.external.alerts.yml")
+		vmp, err := NewVictoriaMetricsParams("../testdata/victoriametrics/prometheus.external.alerts.yml", "", "", "")


🚫 [golangci] _{reported by reviewdog 🐶}
too many arguments in call to NewVictoriaMetricsParams

rishat-ishbulatov · 2023-04-04T12:43:00Z

managed/services/supervisord/logs.go

-func NewLogs(pmmVersion string, pmmUpdateChecker *PMMUpdateChecker) *Logs {
+func NewLogs(pmmVersion string, pmmUpdateChecker *PMMUpdateChecker, vmParams *models.VictoriaMetricsParams) *Logs {
 	return &Logs{


Maybe we could do it in a more abstract manner? For example vmParams getter? Than if in future we change mechanism that gets us a new vmParams we wont rewrite this place? )

managed/models/victoriametrics_params.go

rishat-ishbulatov · 2023-04-04T12:52:56Z

managed/services/agents/state.go

-func NewStateUpdater(db *reform.DB, r *Registry, vmdb prometheusService) *StateUpdater {
+func NewStateUpdater(db *reform.DB, r *Registry, vmdb prometheusService, vmParams *models.VictoriaMetricsParams) *StateUpdater {
 	return &StateUpdater{
-		db:   db,


Can we change concrete implementation with abstract one?

rishat-ishbulatov

cool )

github-actions · 2023-04-04T22:14:58Z

managed/services/victoriametrics/victoriametrics.go

+	}
+}
+
+func relativePath(baseURL string, path string) (*url.URL, error) {


🚫 [golangci] _{reported by reviewdog 🐶}
func relativePath is unused (unused)

…toria-metrics

…toria-metrics # Conflicts: # docker-compose.yml # managed/cmd/pmm-managed/main.go # managed/services/supervisord/devcontainer_test.go # managed/services/supervisord/supervisord_test.go # managed/testdata/supervisord.d/pmm-db_enabled.ini

github-actions · 2023-07-04T12:45:50Z

managed/models/victoriametrics_params.go

-func NewVictoriaMetricsParams(basePath string) (*VictoriaMetricsParams, error) {
+func NewVictoriaMetricsParams(basePath string, vmURL string) (*VictoriaMetricsParams, error) {
+	if !strings.HasSuffix(vmURL, "/") {
+		vmURL = vmURL + "/"


🚫 [golangci] _{reported by reviewdog 🐶}
assignOp: replace vmURL = vmURL + "/" with vmURL += "/" (gocritic)

github-actions · 2023-08-30T21:39:34Z

managed/utils/envvars/parser.go

+		case "PMM_VM_URL":
+			_, err := url.Parse(v)
+			if err != nil {
+				err = fmt.Errorf("invalid value %q for environment variable %q", v, k)


🚫 [golangci] _{reported by reviewdog 🐶}
ineffectual assignment to err (ineffassign)

BupycHuk added 4 commits March 2, 2023 01:00

PMM-9374 support of external victoria metrics.

d5fe25c

PMM-9374 update version number of victoria metrics.

8400da1

PMM-9374 vmalert.

c1ceff0

PMM-9374 use pmm-clients vmagent instead of a separate one.

ed017ba

BupycHuk requested review from talhabinrizwan and a team as code owners March 28, 2023 18:52

BupycHuk requested review from idoqo and rishat-ishbulatov and removed request for a team March 28, 2023 18:52

Merge remote-tracking branch 'origin/main' into PMM-9374-external-vic…

c1ded19

…toria-metrics # Conflicts: # managed/cmd/pmm-managed/main.go # managed/services/agents/vmagent.go

JNKPercona mentioned this pull request Mar 29, 2023

PMM-9374-external-victoria-metrics (FB) Percona-Lab/pmm-submodules#3097

Closed

BupycHuk added 2 commits March 29, 2023 14:37

Merge remote-tracking branch 'origin/main' into PMM-9374-external-vic…

9854b08

…toria-metrics

PMM-9374 Fix linters.

36182b4

github-actions bot reviewed Mar 29, 2023

View reviewed changes

BupycHuk added 8 commits March 29, 2023 16:02

PMM-9374 Fix tests.

b46395a

PMM-9374 Improve work with VM Proxy.

7fe77aa

PMM-9374 Fix tests.

2ec6403

PMM-9374 Fix tests.

91c83c4

PMM-9374 Fix tests.

64b3739

Merge branch 'main' into PMM-9374-external-victoria-metrics

3be78bc

PMM-9374 Fix linters.

71ce812

PMM-9374 Add new tests.

abe1dd7

idoqo approved these changes Mar 31, 2023

View reviewed changes

rishat-ishbulatov reviewed Apr 4, 2023

View reviewed changes

managed/models/victoriametrics_params.go Outdated Show resolved Hide resolved

rishat-ishbulatov reviewed Apr 4, 2023

View reviewed changes

rishat-ishbulatov suggested changes Apr 4, 2023

View reviewed changes

rishat-ishbulatov approved these changes Apr 4, 2023

View reviewed changes

PMM-9374 use interfaces instead of real object.

c5d6afe

github-actions bot reviewed Apr 4, 2023

View reviewed changes

BupycHuk and others added 11 commits April 5, 2023 13:11

PMM-9374 Fix the test.

f9b458a

PMM-9374 Fix the linter.

0d2b497

PMM-9374 Fix the linter.

9866663

Merge branch 'main' into PMM-9374-external-victoria-metrics

ff0ac00

Merge remote-tracking branch 'origin/main' into PMM-9374-external-vic…

436c644

…toria-metrics

Merge branch 'main' into PMM-9374-external-victoria-metrics

32cf780

Update pmm_config.go

a456c0c

Update pmm-db_disabled.ini

e2323e2

Merge branch 'main' into PMM-9374-external-victoria-metrics

aa94ad8

Merge branch 'main' into PMM-9374-external-victoria-metrics

8b448c0

github-actions bot reviewed Jul 4, 2023

View reviewed changes

Merge branch 'main' into PMM-9374-external-victoria-metrics

4e9043b

JNKPercona mentioned this pull request Aug 11, 2023

PMM-9374-external-victoria-metrics (FB) Percona-Lab/pmm-submodules#3331

Closed

BupycHuk and others added 3 commits August 25, 2023 18:01

Merge branch 'main' into PMM-9374-external-victoria-metrics

a38645d

PMM-9374 fix supervisord for external VM.

2f8fc85

Merge branch 'main' into PMM-9374-external-victoria-metrics

429e7e5

github-actions bot reviewed Aug 30, 2023

View reviewed changes

BupycHuk and others added 4 commits September 5, 2023 11:59

PMM-9374 Fix linters.

a79a4fa

Merge branch 'main' into PMM-9374-external-victoria-metrics

cf1c1cb

PMM-9374 Don't run victoria metrics if it's external.

5a6a5a2

Merge branch 'main' into PMM-9374-external-victoria-metrics

adddb85

BupycHuk merged commit ffc66f0 into main Sep 18, 2023
30 of 32 checks passed

BupycHuk deleted the PMM-9374-external-victoria-metrics branch September 18, 2023 10:01

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

PMM-9374 external victoria metrics #1916

PMM-9374 external victoria metrics #1916

BupycHuk commented Mar 28, 2023 •

edited

Loading

codecov bot commented Mar 28, 2023 •

edited

Loading

github-actions bot Mar 29, 2023

github-actions bot Mar 29, 2023

github-actions bot Mar 29, 2023

github-actions bot Mar 29, 2023

rishat-ishbulatov Apr 4, 2023 •

edited

Loading

rishat-ishbulatov Apr 4, 2023 •

edited

Loading

rishat-ishbulatov left a comment

github-actions bot Apr 4, 2023

github-actions bot Jul 4, 2023

github-actions bot Aug 30, 2023

PMM-9374 external victoria metrics #1916

PMM-9374 external victoria metrics #1916

Conversation

BupycHuk commented Mar 28, 2023 • edited Loading

codecov bot commented Mar 28, 2023 • edited Loading

Codecov Report

github-actions bot Mar 29, 2023

Choose a reason for hiding this comment

github-actions bot Mar 29, 2023

Choose a reason for hiding this comment

github-actions bot Mar 29, 2023

Choose a reason for hiding this comment

github-actions bot Mar 29, 2023

Choose a reason for hiding this comment

rishat-ishbulatov Apr 4, 2023 • edited Loading

Choose a reason for hiding this comment

rishat-ishbulatov Apr 4, 2023 • edited Loading

Choose a reason for hiding this comment

rishat-ishbulatov left a comment

Choose a reason for hiding this comment

github-actions bot Apr 4, 2023

Choose a reason for hiding this comment

github-actions bot Jul 4, 2023

Choose a reason for hiding this comment

github-actions bot Aug 30, 2023

Choose a reason for hiding this comment

BupycHuk commented Mar 28, 2023 •

edited

Loading

codecov bot commented Mar 28, 2023 •

edited

Loading

rishat-ishbulatov Apr 4, 2023 •

edited

Loading

rishat-ishbulatov Apr 4, 2023 •

edited

Loading