Upgrade prometheus library #28716

ChrsMark · 2021-10-29T09:17:30Z

What does this PR do?

This PR updates the github.com/prometheus/prometheus and makes the proper LICENCE overrides for the dependencies:

go get github.com/prometheus/[email protected]
make notice

This is a prerequisite for #27269

~~Detailed licence checks for libs:~~
~~1. github.com/ajstarks/svgo -> CC-BY-4.0~~
~~2. github.com/bmizerany/pat -> from README.md~~
~~3. github.com/cactus/go-statsd-client/statsd -> MIT~~
~~4. github.com/dnaeon/go-vcr -> BSD-2-Clause~~
~~5. github.com/golang/freetype -> GPL-2.0~~
~~6. github.com/hudl/fargo -> [MIT] from README.md~~
~~7. github.com/influxdata/line-protocol -> MIT~~
~~8. github.com/lightstep/lightstep-tracer-common/golang/gogo -> MIT~~
~~9. github.com/pascaldekloe/goe -> CC0-1.0~~
~~10. github.com/streadway/handy -> [BSD 2-Clause ] from README.md~~
~~11. gonum.org/v1/plot -> BSD-3-Clause~~

Signed-off-by: chrismark <[email protected]>

mergify · 2021-10-29T09:17:37Z

This pull request does not have a backport label. Could you fix it @ChrsMark? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

backport-v./d./d./d is the label to automatically backport to the 7./d branch. /d is the digit

NOTE: backport-skip has been added to this pull request.

elasticmachine · 2021-10-29T09:17:51Z

Pinging @elastic/integrations (Team:Integrations)

mergify · 2021-10-29T09:17:55Z

This pull request does not have a backport label. Could you fix it @ChrsMark? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

backport-v./d./d./d is the label to automatically backport to the 7./d branch. /d is the digit

NOTE: backport-skip has been added to this pull request.

ChrsMark · 2021-10-29T09:21:08Z

@ruflin @jsoriano it seems that even with the partial updates of the related libraries this upgrade brings a lot of changes by itself. So I'm not sure if we can avoid having a PR with a lot of changes in order to upgrade the prometheus library.

jsoriano · 2021-10-29T09:30:38Z

@ruflin @jsoriano it seems that even with the partial updates of the related libraries this upgrade brings a lot of changes by itself. So I'm not sure if we can avoid having a PR with a lot of changes in order to upgrade the prometheus library.

Ok, let's go with it.

jsoriano

LGTM if jenkins agrees.

jsoriano · 2021-10-29T09:32:49Z

go.mod

 	github.com/devigned/tab v0.1.2-0.20190607222403-0c15cf42f9a2 // indirect
 	github.com/dgraph-io/badger/v3 v3.2103.1
 	github.com/digitalocean/go-libvirt v0.0.0-20180301200012-6075ea3c39a1
 	github.com/dlclark/regexp2 v1.1.7-0.20171009020623-7632a260cbaf // indirect
-	github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7
+	github.com/docker/docker v20.10.7+incompatible


In case this version is needed for something, take into account that there is a replace for docker that we cannot easily remove without breaking community beats (see #28621 (comment)).

elasticmachine · 2021-10-29T09:43:29Z

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS

Expand to view the summary

Build stats

Start Time: 2021-11-03T12:36:40.138+0000
Duration: 217 min 25 sec
Commit: 43d28d9

Test stats 🧪

Test	Results
Failed	0
Passed	53588
Skipped	5234
Total	58822

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

/test : Re-trigger the build.
/package : Generate the packages and run the E2E tests.
/beats-tester : Run the installation tests with beats-tester.

ruflin · 2021-11-02T15:15:29Z

go.mod

@@ -30,7 +30,7 @@ require (
 	github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77 // indirect
 	github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
 	github.com/aws/aws-lambda-go v1.13.3
-	github.com/aws/aws-sdk-go v1.19.48
+	github.com/aws/aws-sdk-go v1.38.60


@kaiyan-sheng As a follow up, would be good to figure out why we have 2 aws sdk ..

ruflin

I'm good moving forward with this. Somehow CI has a complaint.

Signed-off-by: chrismark <[email protected]>

ChrsMark · 2021-11-03T11:54:11Z

Update here. No need for the overrides in overrides.json, this was an issue that I had locally because of the GOFLAGS="-mod=mod" that was set on my end. It was resolved under other scope discussing with @jsoriano :).

Also I remove the replace for docker since this PR will hit 8.0.

jsoriano

👍

Signed-off-by: chrismark <[email protected]>

mergify · 2021-11-03T12:34:46Z

This pull request is now in conflicts. Could you fix it? 🙏
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 test_prom_upgrade upstream/test_prom_upgrade
git merge upstream/master
git push upstream test_prom_upgrade

jsoriano · 2021-11-03T12:35:16Z

CHANGELOG.next.asciidoc

@@ -27,6 +27,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Enable IMDSv2 support for `add_cloud_metadata` processor on AWS. {issue}22101[22101] {pull}28285[28285]
 - Update kubernetes.namespace from keyword to group field and add name, labels, annotations, uuid as its fields {pull}27917[27917]
 - Previously, RE2 and thus Golang had a bug where `(|a)*` matched more characters than `(|a)+`. To stay consistent with PCRE, the bug was fixed. Configurations that rely on the old, buggy behaviour has to be adjusted. See more about Golang bug: https://github.com/golang/go/issues/46123 {pull}27543[27543]
+- Remove replace for docker library. {pull}28716[28716]


This is not a user facing change 🙂 In any case we could say something as Update docker client.

Signed-off-by: chrismark <[email protected]>

jsoriano · 2021-12-08T13:16:18Z

@ChrsMark it seems this change is not in 8.0 branch, can you please backport it if needed?

jsoriano · 2021-12-08T13:39:08Z

Ok, seen in an email thread that this is not needed in 8.0 branch.

Upgrade prometheus library

d6efe96

Signed-off-by: chrismark <[email protected]>

botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 29, 2021

ChrsMark self-assigned this Oct 29, 2021

mergify bot added the backport-skip Skip notification from the automated backport with mergify label Oct 29, 2021

ChrsMark added Team:Integrations Label for the Integrations team and removed backport-skip Skip notification from the automated backport with mergify labels Oct 29, 2021

botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Oct 29, 2021

mergify bot added the backport-skip Skip notification from the automated backport with mergify label Oct 29, 2021

ChrsMark mentioned this pull request Oct 29, 2021

Upgrade prometheus library #28023

Closed

jsoriano approved these changes Oct 29, 2021

View reviewed changes

ruflin reviewed Nov 2, 2021

View reviewed changes

ruflin approved these changes Nov 2, 2021

View reviewed changes

Fix NOTICE file

50fff72

Signed-off-by: chrismark <[email protected]>

ChrsMark force-pushed the test_prom_upgrade branch from 452f63f to 50fff72 Compare November 2, 2021 16:00

ChrsMark added 3 commits November 3, 2021 08:28

Remove docker replacement

331efff

Signed-off-by: chrismark <[email protected]>

Fixes and remove overrides

1e7c28c

Signed-off-by: chrismark <[email protected]>

Fix rules

a8a54b8

Signed-off-by: chrismark <[email protected]>

ChrsMark requested review from jsoriano and ruflin November 3, 2021 11:54

jsoriano approved these changes Nov 3, 2021

View reviewed changes

Add changelogs

98d4060

Signed-off-by: chrismark <[email protected]>

Merge remote-tracking branch 'upstream/master' into test_prom_upgrade

0a04919

jsoriano reviewed Nov 3, 2021

View reviewed changes

Fix changelong message

43d28d9

Signed-off-by: chrismark <[email protected]>

ChrsMark merged commit dc02c08 into elastic:master Nov 3, 2021

ChrsMark mentioned this pull request Nov 3, 2021

Openmetrics support using textparser #27269

Merged

6 tasks

ruflin added the v8.1.0 label Dec 9, 2021

ph mentioned this pull request Mar 29, 2022

Update Go dependencies elastic/fleet-server#1270

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade prometheus library #28716

Upgrade prometheus library #28716

ChrsMark commented Oct 29, 2021 •

edited

Loading

mergify bot commented Oct 29, 2021

elasticmachine commented Oct 29, 2021

mergify bot commented Oct 29, 2021

ChrsMark commented Oct 29, 2021

jsoriano commented Oct 29, 2021

jsoriano left a comment

jsoriano Oct 29, 2021

elasticmachine commented Oct 29, 2021 •

edited by jenkins-beats-ci bot

Loading

Build stats

Test stats 🧪

ruflin Nov 2, 2021

ruflin left a comment

ChrsMark commented Nov 3, 2021

jsoriano left a comment

mergify bot commented Nov 3, 2021

jsoriano Nov 3, 2021

jsoriano commented Dec 8, 2021

jsoriano commented Dec 8, 2021

Upgrade prometheus library #28716

Upgrade prometheus library #28716

Conversation

ChrsMark commented Oct 29, 2021 • edited Loading

What does this PR do?

mergify bot commented Oct 29, 2021

elasticmachine commented Oct 29, 2021

mergify bot commented Oct 29, 2021

ChrsMark commented Oct 29, 2021

jsoriano commented Oct 29, 2021

jsoriano left a comment

Choose a reason for hiding this comment

jsoriano Oct 29, 2021

Choose a reason for hiding this comment

elasticmachine commented Oct 29, 2021 • edited by jenkins-beats-ci bot Loading

💚 Build Succeeded

Build stats

Test stats 🧪

💚 Flaky test report

🤖 GitHub comments

ruflin Nov 2, 2021

Choose a reason for hiding this comment

ruflin left a comment

Choose a reason for hiding this comment

ChrsMark commented Nov 3, 2021

jsoriano left a comment

Choose a reason for hiding this comment

mergify bot commented Nov 3, 2021

jsoriano Nov 3, 2021

Choose a reason for hiding this comment

jsoriano commented Dec 8, 2021

jsoriano commented Dec 8, 2021

ChrsMark commented Oct 29, 2021 •

edited

Loading

elasticmachine commented Oct 29, 2021 •

edited by jenkins-beats-ci bot

Loading