forked from prometheus-operator/prometheus-operator
-
Notifications
You must be signed in to change notification settings - Fork 0
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
sync main with upstream #18
Open
cruizen
wants to merge
1,770
commits into
platform9:main
Choose a base branch
from
prometheus-operator:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--------- Signed-off-by: dongjiang1989 <dongjiang1989@126.com>
Fixes #6993 Signed-off-by: Jayapriya Pai <slashpai9@gmail.com>
* scrapeconfig crd: add proposal for extending surface and graduating to beta --------- Signed-off-by: mviswanathsai <mviswanath.sai.met21@itbhu.ac.in> Co-authored-by: Simon Pasquier <spasquie@redhat.com>
chore: add github comment PR action
--------- Signed-off-by: dongjiang1989 <dongjiang1989@126.com>
Signed-off-by: dongjiang1989 <dongjiang1989@126.com>
Fix: fix e2e case
Bumps [thollander/actions-comment-pull-request](https://github.com/thollander/actions-comment-pull-request) from 2 to 3. - [Release notes](https://github.com/thollander/actions-comment-pull-request/releases) - [Commits](thollander/actions-comment-pull-request@v2...v3) --- updated-dependencies: - dependency-name: thollander/actions-comment-pull-request dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
…ctions/thollander/actions-comment-pull-request-3 build(deps): bump thollander/actions-comment-pull-request from 2 to 3
Signed-off-by: Jayapriya Pai <slashpai9@gmail.com>
Signed-off-by: dongjiang1989 <dongjiang1989@126.com>
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
Signed-off-by: dongjiang1989 <dongjiang1989@126.com>
…ls-version chore: update controller-tools version to v0.16.4
chore: add v3.0.0-beta.1 to experimental versions
chore: add simonpasquier as v0.78 shepherd
Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.20.4 to 1.20.5. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/v1.20.5/CHANGELOG.md) - [Commits](prometheus/client_golang@v1.20.4...v1.20.5) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
…es/github.com/prometheus/client_golang-1.20.5 build(deps): bump github.com/prometheus/client_golang from 1.20.4 to 1.20.5
chore: update CHANGELOG.md
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
feat: add proxy_url to alertmanagerendpoints
…-pod-monitor [CHORE] Add support for role selectors on PodMonitor.
Signed-off-by: Jayapriya Pai <slashpai9@gmail.com>
chore: cut v0.79.0
Bumps [helm/kind-action](https://github.com/helm/kind-action) from 1.10.0 to 1.11.0. - [Release notes](https://github.com/helm/kind-action/releases) - [Commits](helm/kind-action@v1.10.0...v1.11.0) --- updated-dependencies: - dependency-name: helm/kind-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
* move common scrapeFallbackProtocol Signed-off-by: dongjiang <dongjiang1989@126.com>
…ctions/helm/kind-action-1.11.0 build(deps): bump helm/kind-action from 1.10.0 to 1.11.0
This reverts commit 66da769.
While reviewing #7197 noticed that Prometheus is using `fallback_scrape_protocol` for the field hence updating to match similar naming to avoid confusion among users. This is a newly introduced field in this release v0.79 so we want to update it in patch release before users use this field. Signed-off-by: Jayapriya Pai <slashpai9@gmail.com>
CHANGE/BugFix: Rename scrapeFallbackProtocol to fallbackScrapeProtocol
* chore: cut v0.79.1 Signed-off-by: Jayapriya Pai <slashpai9@gmail.com> Co-authored-by: Simon Pasquier <spasquie@redhat.com>
Bumps google.golang.org/protobuf from 1.35.2 to 1.36.0. --- updated-dependencies: - dependency-name: google.golang.org/protobuf dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Jayapriya Pai <slashpai9@gmail.com>
…es/google.golang.org/protobuf-1.36.0 build(deps): bump google.golang.org/protobuf from 1.35.2 to 1.36.0
Merge release 0.79.1
chore: update Kind version to v0.26.0
* [BUGFIX] Fixing pod and service monitor selector validation Signed-off-by: Nicolas Takashi <nicolas.tcs@hotmail.com> Co-authored-by: Simon Pasquier <spasquie@redhat.com>
Signed-off-by: Jayapriya Pai <slashpai9@gmail.com>
chore: cut v0.79.2
Merge v0.79.2 back to main
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.32.0 to 0.33.0. - [Commits](golang/net@v0.32.0...v0.33.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
…es/golang.org/x/net-0.33.0 build(deps): bump golang.org/x/net from 0.32.0 to 0.33.0
* add unit testcases for oauth2 in scrapeconfig CRD
Fix Broken Links to Ingress Guide and Add Prometheus & Alertmanager Exposure Guide
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
sync main with upstream
Type of change
What type of changes does your code introduce to the Prometheus operator? Put an
x
in the box that apply.CHANGE
(fix or feature that would cause existing functionality to not work as expected)FEATURE
(non-breaking change which adds functionality)BUGFIX
(non-breaking change which fixes an issue)ENHANCEMENT
(non-breaking change which improves existing functionality)NONE
(if none of the other choices apply. Example, tooling, build system, CI, docs, etc.)Changelog entry
Please put a one-line changelog entry below. This will be copied to the changelog file during the release process.