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

Upgrade Prom fork to 2.24 #378

Merged
merged 1 commit into from
Feb 1, 2021
Merged

Upgrade Prom fork to 2.24 #378

merged 1 commit into from
Feb 1, 2021

Conversation

jacksontj
Copy link
Owner

Very much a draft PR; likely will have some force pushes here and in the fork branch. Unfortunately upstream has made a LOT of API changes to things; so I've been working on this for a couple of weeks :). If anyone is interested in giving this a whirl feel free. Initial builds with tests seems everything is working, I'll have to make a few changes to the build scripts etc. to work with the new prometheus UI stuff.

@jacksontj
Copy link
Owner Author

=== RUN   TestUpstreamEvaluations
=== RUN   TestUpstreamEvaluations/0../vendor/github.com/prometheus/prometheus/promql/testdata/aggregators.test
=== RUN   TestUpstreamEvaluations/0../vendor/github.com/prometheus/prometheus/promql/testdata/collision.test
=== RUN   TestUpstreamEvaluations/0../vendor/github.com/prometheus/prometheus/promql/testdata/functions.test
=== RUN   TestUpstreamEvaluations/0../vendor/github.com/prometheus/prometheus/promql/testdata/histograms.test
=== RUN   TestUpstreamEvaluations/0../vendor/github.com/prometheus/prometheus/promql/testdata/literals.test
=== RUN   TestUpstreamEvaluations/0../vendor/github.com/prometheus/prometheus/promql/testdata/operators.test
=== RUN   TestUpstreamEvaluations/0../vendor/github.com/prometheus/prometheus/promql/testdata/selectors.test
=== RUN   TestUpstreamEvaluations/0../vendor/github.com/prometheus/prometheus/promql/testdata/subquery.test
=== RUN   TestUpstreamEvaluations/1../vendor/github.com/prometheus/prometheus/promql/testdata/aggregators.test
=== RUN   TestUpstreamEvaluations/1../vendor/github.com/prometheus/prometheus/promql/testdata/collision.test
=== RUN   TestUpstreamEvaluations/1../vendor/github.com/prometheus/prometheus/promql/testdata/functions.test
=== RUN   TestUpstreamEvaluations/1../vendor/github.com/prometheus/prometheus/promql/testdata/histograms.test
=== RUN   TestUpstreamEvaluations/1../vendor/github.com/prometheus/prometheus/promql/testdata/literals.test
=== RUN   TestUpstreamEvaluations/1../vendor/github.com/prometheus/prometheus/promql/testdata/operators.test
=== RUN   TestUpstreamEvaluations/1../vendor/github.com/prometheus/prometheus/promql/testdata/selectors.test
=== RUN   TestUpstreamEvaluations/1../vendor/github.com/prometheus/prometheus/promql/testdata/staleness.test
=== RUN   TestUpstreamEvaluations/1../vendor/github.com/prometheus/prometheus/promql/testdata/subquery.test
--- PASS: TestUpstreamEvaluations (88.20s)
    --- PASS: TestUpstreamEvaluations/0../vendor/github.com/prometheus/prometheus/promql/testdata/aggregators.test (5.35s)
    --- PASS: TestUpstreamEvaluations/0../vendor/github.com/prometheus/prometheus/promql/testdata/collision.test (5.06s)
    --- PASS: TestUpstreamEvaluations/0../vendor/github.com/prometheus/prometheus/promql/testdata/functions.test (5.47s)
    --- PASS: TestUpstreamEvaluations/0../vendor/github.com/prometheus/prometheus/promql/testdata/histograms.test (5.14s)
    --- PASS: TestUpstreamEvaluations/0../vendor/github.com/prometheus/prometheus/promql/testdata/literals.test (5.01s)
    --- PASS: TestUpstreamEvaluations/0../vendor/github.com/prometheus/prometheus/promql/testdata/operators.test (5.31s)
    --- PASS: TestUpstreamEvaluations/0../vendor/github.com/prometheus/prometheus/promql/testdata/selectors.test (5.17s)
    --- PASS: TestUpstreamEvaluations/0../vendor/github.com/prometheus/prometheus/promql/testdata/subquery.test (5.10s)
    --- PASS: TestUpstreamEvaluations/1../vendor/github.com/prometheus/prometheus/promql/testdata/aggregators.test (5.26s)
    --- PASS: TestUpstreamEvaluations/1../vendor/github.com/prometheus/prometheus/promql/testdata/collision.test (5.05s)
    --- PASS: TestUpstreamEvaluations/1../vendor/github.com/prometheus/prometheus/promql/testdata/functions.test (5.41s)
    --- PASS: TestUpstreamEvaluations/1../vendor/github.com/prometheus/prometheus/promql/testdata/histograms.test (5.15s)
    --- PASS: TestUpstreamEvaluations/1../vendor/github.com/prometheus/prometheus/promql/testdata/literals.test (5.01s)
    --- PASS: TestUpstreamEvaluations/1../vendor/github.com/prometheus/prometheus/promql/testdata/operators.test (5.39s)
    --- PASS: TestUpstreamEvaluations/1../vendor/github.com/prometheus/prometheus/promql/testdata/selectors.test (5.17s)
    --- PASS: TestUpstreamEvaluations/1../vendor/github.com/prometheus/prometheus/promql/testdata/staleness.test (5.06s)
    --- PASS: TestUpstreamEvaluations/1../vendor/github.com/prometheus/prometheus/promql/testdata/subquery.test (5.10s)
=== RUN   TestEvaluations
=== RUN   TestEvaluations/0testdata/aggregators.test
=== RUN   TestEvaluations/0testdata/issue_274.test
=== RUN   TestEvaluations/0testdata/literals.test
=== RUN   TestEvaluations/0testdata/selectors.test
=== RUN   TestEvaluations/1testdata/aggregators.test
=== RUN   TestEvaluations/1testdata/issue_274.test
=== RUN   TestEvaluations/1testdata/literals.test
=== RUN   TestEvaluations/1testdata/selectors.test
--- PASS: TestEvaluations (40.62s)
    --- PASS: TestEvaluations/0testdata/aggregators.test (5.16s)
    --- PASS: TestEvaluations/0testdata/issue_274.test (5.04s)
    --- PASS: TestEvaluations/0testdata/literals.test (5.02s)
    --- PASS: TestEvaluations/0testdata/selectors.test (5.07s)
    --- PASS: TestEvaluations/1testdata/aggregators.test (5.17s)
    --- PASS: TestEvaluations/1testdata/issue_274.test (5.03s)
    --- PASS: TestEvaluations/1testdata/literals.test (5.01s)
    --- PASS: TestEvaluations/1testdata/selectors.test (5.11s)
PASS
ok  	github.com/jacksontj/promxy/test	128.883s

@jacksontj jacksontj marked this pull request as ready for review February 1, 2021 22:48
@jacksontj jacksontj merged commit 964696e into master Feb 1, 2021
@jacksontj jacksontj deleted the prom_2.24 branch February 1, 2021 22:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant