Skip to content
This repository has been archived by the owner on Jun 21, 2022. It is now read-only.

PMM-3387 PMM-5464 Custom base Prometheus file, update code copied from Prometheus to version 2.16.0 #339

Merged
merged 17 commits into from
Feb 25, 2020
Merged

PMM-3387 PMM-5464 Custom base Prometheus file, update code copied from Prometheus to version 2.16.0 #339

merged 17 commits into from
Feb 25, 2020

Conversation

AlekSi
Copy link
Contributor

@AlekSi AlekSi commented Feb 7, 2020

No description provided.

@codecov
Copy link

codecov bot commented Feb 7, 2020 •
edited
Loading

Codecov Report

Merging #339 into PMM-2.0 will decrease coverage by 0.26%.
The diff coverage is 7.24%.

Impacted file tree graph

@@             Coverage Diff             @@
##           PMM-2.0     #339      +/-   ##
===========================================
- Coverage     45.3%   45.03%   -0.27%     
===========================================
  Files           82       82              
  Lines         9482     9543      +61     
===========================================
+ Hits          4296     4298       +2     
- Misses        4815     4873      +58     
- Partials       371      372       +1
Flag Coverage Δ
#all 44.08% <7.24%> (-0.25%) ⬇️
#cover 46.95% <0%> (-0.02%) ⬇️
#crosscover 45% <7.24%> (-0.27%) ⬇️
#update 23.97% <ø> (-0.1%) ⬇️
Impacted Files Coverage Δ
...metheus/internal/prometheus/pkg/relabel/relabel.go 6.42% <ø> (ø) ⬆️
...al/prometheus/discovery/targetgroup/targetgroup.go 51.02% <ø> (ø) ⬆️
...rometheus/internal/prometheus/pkg/labels/labels.go 0% <0%> (ø) ⬆️
...eus/internal/prometheus/discovery/config/config.go 50% <0%> (ø) ⬆️
services/server/server.go 23.79% <0%> (-0.43%) ⬇️
...es/prometheus/internal/prometheus/config/config.go 16.37% <27.77%> (+0.46%) ⬆️
services/supervisord/supervisord.go 65.13% <0%> (-0.66%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 931972b...f301c4b. Read the comment docs.

golangcibot
golangcibot reviewed Feb 22, 2020
View reviewed changes
services/prometheus/prometheus_test.go Show resolved Hide resolved
main.go Outdated Show resolved Hide resolved
@artemgavrilov artemgavrilov force-pushed the PMM-3387-custom-prometheus-base branch from 33d3b7f to a9b255a Compare February 22, 2020 10:57
@artemgavrilov
Copy link
Contributor

artemgavrilov commented Feb 22, 2020 •
edited
Loading

Linter checks failed due func TestBasePrometheusConfig is unused

Seems like a bug in linter golangci/golangci-lint#791

@artemgavrilov artemgavrilov mentioned this pull request Feb 22, 2020
Closed
1 task
@artemgavrilov artemgavrilov marked this pull request as ready for review February 22, 2020 12:52
AlekSi
AlekSi commented Feb 24, 2020
View reviewed changes
services/prometheus/prometheus.go Outdated Show resolved Hide resolved
testdata/prometheus/prometheus.base.yml Outdated Show resolved Hide resolved
@artemgavrilov artemgavrilov changed the title PMM-3387 Custom base Prometheus file. PMM-3387 PMM-5464 Custom base Prometheus file, update code copied from Prometheus Feb 24, 2020
@AlekSi
Copy link
Contributor Author

AlekSi commented Feb 25, 2020

@artemgavrilov Please resolve merge conflicts

@artemgavrilov artemgavrilov changed the title PMM-3387 PMM-5464 Custom base Prometheus file, update code copied from Prometheus PMM-3387 Custom base Prometheus file, update code copied from Prometheus to current version 2.12.0 Feb 25, 2020
@artemgavrilov artemgavrilov mentioned this pull request Feb 25, 2020
Closed
1 task
@BupycHuk
Copy link
Member

@artemgavrilov could you sync prometheus version with @vadimtk, please.
If we are going to update prometheus version to 2.15.2, it's better to update our code as well.

@BupycHuk BupycHuk self-requested a review February 25, 2020 11:58
@AlekSi
Copy link
Contributor Author

AlekSi commented Feb 25, 2020

We will use 2.16.0.

@artemgavrilov artemgavrilov changed the title PMM-3387 Custom base Prometheus file, update code copied from Prometheus to current version 2.12.0 PMM-3387 PMM-5464 Custom base Prometheus file, update code copied from Prometheus to version 2.16.0 Feb 25, 2020
@artemgavrilov
Copy link
Contributor

Updated Prometheus related code to version 2.16.0

@AlekSi AlekSi requested a review from BupycHuk February 25, 2020 14:19
@BupycHuk BupycHuk merged commit 252ec20 into PMM-2.0 Feb 25, 2020
@BupycHuk BupycHuk deleted the PMM-3387-custom-prometheus-base branch February 25, 2020 14:40
askomorokhov pushed a commit that referenced this pull request Mar 22, 2021
@AlekSi @artemgavrilov
PMM-3387 PMM-5464 Custom base Prometheus file, update code copied fro…
cf91d1e 
…m Prometheus to version 2.16.0 (#339)

* PMM-3387 Custom base Prometheus file.

* PMM-3387 Implement custom base Prometheus file loading

* PMM-3387 Sort imports

* PMM-3387 Disable function length linter checks for test files

* PMM-3387 Dummy commit to trigger build.

* PMM-3387 Refactoring

* PMM-3387 PMM-5464 Update code compied from Prometheus

* PMM-3387 PMM-5464 Update prometheus config tests

* PMM-3387 PMM-5464 Update code compied from Prometheus up to v2.15.2

* Revert "PMM-3387 PMM-5464 Update code compied from Prometheus up to v2.15.2"

This reverts commit 6366966.

* PMM-3387 Fix comment

* PMM-5464 Update code copied form Prometheus up to v2.16.0

Co-authored-by: Artem Gavrilov <[email protected]>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@artemgavrilov artemgavrilov artemgavrilov left review comments

@golangcibot golangcibot golangcibot left review comments

@BupycHuk BupycHuk BupycHuk approved these changes

Assignees

@artemgavrilov artemgavrilov

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@AlekSi @artemgavrilov @BupycHuk @golangcibot