Feat: Add `relabel_configs` field to AlertmanagerEndpoints by mviswanathsai · Pull Request #6467 · prometheus-operator/prometheus-operator

mviswanathsai · 2024-04-03T11:38:16Z

Description

We don't support the relabel_configs per AM, along with ProxyConfig, FollowRedirects among other fields. We would like to extend support to these missing fields.

Partially closes: #6461

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)
[x ] 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.)

Verification

Please check the Prometheus-Operator testing guidelines for recommendations about automated tests.
Unit tests.

Changelog entry

Please put a one-line changelog entry below. This will be copied to the changelog file during the release process.

mviswanathsai · 2024-04-04T13:57:37Z

Should I also include proxy url configs in this PR? and maybe also FollowRedirects ? @simonpasquier

simonpasquier · 2024-04-05T14:13:54Z

no let's tackle one issue at a time.

simonpasquier · 2024-04-05T14:44:32Z

+	// List of alertmanager relabel configs
+	//
+	// +optional
+	RelabelConfigs []*RelabelConfig `json:"relabelConfigs,omitempty"`


Suggested change

RelabelConfigs []*RelabelConfig `json:"relabelConfigs,omitempty"`

RelabelConfigs []RelabelConfig `json:"relabelings,omitempty"`

Can we change the type after we merge #6479?

ArthurSens · 2024-04-12T19:28:26Z

I'm not sure if I'm missing something, but are we adding two different relabeling options under alertmanager endpoints? I was almost sure there was only one relabeling option for alertmanagers

mviswanathsai · 2024-04-13T06:38:04Z

Yes, as of v2.51.0, we have the ability to have relabeling rules for alerts per alertmanager: alert_relabel_configs in addition to the existing relabel_configs for alertmanager discovery.

change the signature of ValidateAlertmanagerEndpoints to include pointer to monv1.Prometheus

simonpasquier · 2024-05-14T13:36:33Z

Thanks!

* fix: ScrapeClass TLSConfig nil pointer exception (prometheus-operator#6507) Signed-off-by: Simon Pasquier <spasquie@redhat.com> * Update .github/workflows/stale.yaml Co-authored-by: Jayapriya Pai <slashpai9@gmail.com> * build(deps): bump github.com/prometheus/common from 0.52.3 to 0.53.0 Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.52.3 to 0.53.0. - [Release notes](https://github.com/prometheus/common/releases) - [Commits](prometheus/common@v0.52.3...v0.53.0) --- updated-dependencies: - dependency-name: github.com/prometheus/common dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * build(deps): bump golang.org/x/net from 0.21.0 to 0.23.0 in /scripts Bumps [golang.org/x/net](https://github.com/golang/net) from 0.21.0 to 0.23.0. - [Commits](golang/net@v0.21.0...v0.23.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> * build(deps): bump golang.org/x/net from 0.22.0 to 0.23.0 in /pkg/client Bumps [golang.org/x/net](https://github.com/golang/net) from 0.22.0 to 0.23.0. - [Commits](golang/net@v0.22.0...v0.23.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> * chore:cut v0.73.2 Signed-off-by: Jayapriya Pai <slashpai9@gmail.com> Co-authored-by: Simon Pasquier <spasquie@redhat.com> * chore: update RELEASE.md instructions (prometheus-operator#6539) * chore: update RELEASE.md instructions Signed-off-by: Jayapriya Pai <slashpai9@gmail.com> * Update RELEASE.md Co-authored-by: Arthur Silva Sens <arthursens2005@gmail.com> --------- Signed-off-by: Jayapriya Pai <slashpai9@gmail.com> Co-authored-by: Arthur Silva Sens <arthursens2005@gmail.com> * update golangci-lint version (prometheus-operator#6543) Signed-off-by: dongjiang1989 <dongjiang1989@126.com> * feat(xds): Add support nomad service discovery to the ScrapeConfig CRD (prometheus-operator#6485) * add support for nomad sd Signed-off-by: dongjiang1989 <dongjiang1989@126.com> * fix generate checks Signed-off-by: Jayapriya Pai <slashpai9@gmail.com> * build(deps): bump golangci/golangci-lint-action from 4.0.0 to 5.0.0 (prometheus-operator#6547) Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 4.0.0 to 5.0.0. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](golangci/golangci-lint-action@v4.0.0...v5.0.0) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump helm/kind-action from 1.9.0 to 1.10.0 Bumps [helm/kind-action](https://github.com/helm/kind-action) from 1.9.0 to 1.10.0. - [Release notes](https://github.com/helm/kind-action/releases) - [Commits](helm/kind-action@v1.9.0...v1.10.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> * chore: bump k8s libs to v0.30.0 Signed-off-by: Simon Pasquier <spasquie@redhat.com> * chore: refactor the assets package This commit simplifies the API of the assets package. To limit the impact, it tackles only Basic Auth secrets for now. Previous API: ``` // storing the credentials from function A err = store.AddBasicAuth(ctx, namespace, httpConfig.BasicAuth, "some key") // retrieving the credentials from function B basicAuth := store.BasicAuthAssets["some key"] ``` New API: ``` // storing the credentials from function A err = store.AddBasicAuth(ctx, namespace, httpConfig.BasicAuth) // retrieving the credentials from function B s := store.ForNamespace(namespace) username, err := s.GetSecretKey(basicAuth.Username) password, err := s.GetSecretKey(basicAuth.Password) ``` The main simplification is that function B doesn't need to know how function A built the key value. It also makes testing more decoupled and reduces the risk of leaking data across namespaces. Signed-off-by: Simon Pasquier <spasquie@redhat.com> * build(deps): bump sigs.k8s.io/controller-runtime from 0.17.3 to 0.18.0 Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.17.3 to 0.18.0. - [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases) - [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md) - [Commits](kubernetes-sigs/controller-runtime@v0.17.3...v0.18.0) --- updated-dependencies: - dependency-name: sigs.k8s.io/controller-runtime dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Chore: Change *RelabelConfigs to values instead of Pointers (prometheus-operator#6479) Signed-off-by: Simon Pasquier <spasquie@redhat.com> --------- Signed-off-by: Simon Pasquier <spasquie@redhat.com> Co-authored-by: Simon Pasquier <spasquie@redhat.com> * doc: fix sample port name used * build(deps): bump golangci/golangci-lint-action from 5.0.0 to 5.1.0 Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 5.0.0 to 5.1.0. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](golangci/golangci-lint-action@v5.0.0...v5.1.0) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * build(deps): bump google.golang.org/protobuf from 1.33.0 to 1.34.0 Bumps google.golang.org/protobuf from 1.33.0 to 1.34.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> * chore: refactor OAuth2 in the assets package This is the follow-up of prometheus-operator#6537 for OAuth2 credentials. Signed-off-by: Simon Pasquier <spasquie@redhat.com> * build(deps): bump sigs.k8s.io/controller-runtime from 0.18.0 to 0.18.1 Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.18.0 to 0.18.1. - [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases) - [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md) - [Commits](kubernetes-sigs/controller-runtime@v0.18.0...v0.18.1) --- updated-dependencies: - dependency-name: sigs.k8s.io/controller-runtime dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * build(deps): bump github.com/thanos-io/thanos from 0.34.1 to 0.35.0 Bumps [github.com/thanos-io/thanos](https://github.com/thanos-io/thanos) from 0.34.1 to 0.35.0. - [Release notes](https://github.com/thanos-io/thanos/releases) - [Changelog](https://github.com/thanos-io/thanos/blob/main/CHANGELOG.md) - [Commits](thanos-io/thanos@v0.34.1...v0.35.0) --- updated-dependencies: - dependency-name: github.com/thanos-io/thanos dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * feat: add Go runtime scheduler metrics Signed-off-by: Simon Pasquier <spasquie@redhat.com> * chore: add link to public calendar (prometheus-operator#6564) Signed-off-by: Simon Pasquier <spasquie@redhat.com> * Add testing steps for podman with kind (prometheus-operator#6509) * chore: Add testing instructions for using Podman with Kind * chore: fixing typos * Update formatting according to the failing checks. * Removed whitespace to match the standard. * Updating according to the suggestions from review. * update prometheus version Signed-off-by: dongjiang1989 <dongjiang1989@126.com> * build(deps): bump golangci/golangci-lint-action from 5.1.0 to 5.3.0 Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 5.1.0 to 5.3.0. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](golangci/golangci-lint-action@v5.1.0...v5.3.0) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * chore: make TLSConfig fields optional This commit changes the `serverName` and `insecureSkipVerify` fields of TLS configuration to pointers instead of values. Signed-off-by: Simon Pasquier <spasquie@redhat.com> * build(deps): bump sigs.k8s.io/controller-runtime from 0.18.1 to 0.18.2 Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.18.1 to 0.18.2. - [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases) - [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md) - [Commits](kubernetes-sigs/controller-runtime@v0.18.1...v0.18.2) --- updated-dependencies: - dependency-name: sigs.k8s.io/controller-runtime dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * build(deps): bump golang.org/x/net from 0.24.0 to 0.25.0 Bumps [golang.org/x/net](https://github.com/golang/net) from 0.24.0 to 0.25.0. - [Commits](golang/net@v0.24.0...v0.25.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> * fix: apply TLS scrape class to all objects Before this change, the TLS configuration from the scrape class wasn't applied to the generated configuration for PodMonitor, ScrapeConfig and Probe objects. Closes prometheus-operator#6556 Signed-off-by: Simon Pasquier <spasquie@redhat.com> * build(deps): bump google.golang.org/protobuf from 1.34.0 to 1.34.1 Bumps google.golang.org/protobuf from 1.34.0 to 1.34.1. --- updated-dependencies: - dependency-name: google.golang.org/protobuf dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * update thanos version Signed-off-by: dongjiang1989 <dongjiang1989@126.com> * fix mistake by make generate Signed-off-by: dongjiang1989 <dongjiang1989@126.com> * build(deps): bump golangci/golangci-lint-action from 5.3.0 to 6.0.1 Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 5.3.0 to 6.0.1. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](golangci/golangci-lint-action@v5.3.0...v6.0.1) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * build(deps): bump github.com/prometheus/prometheus from 0.51.2 to 0.52.0 Bumps [github.com/prometheus/prometheus](https://github.com/prometheus/prometheus) from 0.51.2 to 0.52.0. - [Release notes](https://github.com/prometheus/prometheus/releases) - [Changelog](https://github.com/prometheus/prometheus/blob/main/CHANGELOG.md) - [Commits](prometheus/prometheus@v0.51.2...v0.52.0) --- updated-dependencies: - dependency-name: github.com/prometheus/prometheus dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * build(deps): bump github.com/prometheus/client_golang Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.19.0 to 1.19.1. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](prometheus/client_golang@v1.19.0...v1.19.1) --- 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> * fix: deref nil pointer on WebexConfig Signed-off-by: Yoan Blanc <yoan.blanc@chuv.ch> * feat: add `go_sync_mutex_wait_total_seconds_total` metric Signed-off-by: Simon Pasquier <spasquie@redhat.com> * chore: update golangci-lint configuration Signed-off-by: Simon Pasquier <spasquie@redhat.com> * chore: update kind version to v0.23.0 Signed-off-by: Simon Pasquier <spasquie@redhat.com> * chore: update Prometheus to v2.52.0 Signed-off-by: Simon Pasquier <spasquie@redhat.com> * feat(ProxyConfig): Update CRD for ProxyConnectHeader type (prometheus-operator#6541) * update CRD for ProxyConnectHeader --------- Signed-off-by: dongjiang1989 <dongjiang1989@126.com> * Feat: Add `relabel_configs` field to AlertmanagerEndpoints (prometheus-operator#6467) * Add RelabelConfigs to AlertmanagerEndpoints * chore: Update vulnerable dependency golang.org/x/net Signed-off-by: Arthur Silva Sens <arthursens2005@gmail.com> * chore: bump k8s libraries Signed-off-by: Simon Pasquier <spasquie@redhat.com> * feat(env): auto set GOMAXPROCS by go.uber.org/automaxprocs (prometheus-operator#6576) --------- Signed-off-by: dongjiang1989 <dongjiang1989@126.com> * feat: support SDK auth in AzureSD Related-to prometheus-operator#6584 Signed-off-by: Jayapriya Pai <slashpai9@gmail.com> * feat: support SDK auth in AzureAD RemoteWrite Related-to prometheus-operator#6584 Signed-off-by: Jayapriya Pai <slashpai9@gmail.com> * Update promcfg.go Co-authored-by: Simon Pasquier <spasquie@redhat.com> * Add structure for feature flags Signed-off-by: Arthur Silva Sens <arthur.sens@coralogix.com> * [WIP] Feat: Add `alert_relabel_configs` to the Prometheus and PrometheusAgent CRD's (prometheus-operator#6450) * AlertmanagerEndpoints: add alertRelabelingConfigs field to AlertmanagerEndpoints * alertmanagerEndpoints: wrap errors and fix naming for tests * fix: attempt to manually revert mistakenly commited code * chore: cut v0.74.0 Signed-off-by: Simon Pasquier <spasquie@redhat.com> * Corrected Documentation for xxxMonitorNamespaceSelector (prometheus-operator#6605) Chore: Clarify that null is the default value for Service/PodMonitor selectors * Reload alert manager when notification templates change (prometheus-operator#6607) * Reload alert manager when notification templates change * feat: add automatic GOMAXPROCS to admission webhook Signed-off-by: Simon Pasquier <spasquie@redhat.com> * crd: add support for source pagerduty_config option in AlertMananger CRD (prometheus-operator#6427) * crd: add support for source pagerduty_config option in AlertMananger CRD The AlertManager CRD was expected to have 1:1 fields mapped from https://prometheus.io/docs/alerting/latest/configuration/#pagerduty_config . Currently source was missing so it is added. --------- Co-authored-by: Jayapriya Pai <slashpai9@gmail.com> * AlertmanagerEndpoints: Move AlertmanagerEndpoints validation to pkg/prometheus/server * chore: remove WebTLSConfigError Signed-off-by: Simon Pasquier <spasquie@redhat.com> * chore: rework webconfig package Signed-off-by: Simon Pasquier <spasquie@redhat.com> * Add extra metric relabelings to scrape classes Signed-off-by: Mathieu Parent <math.parent@gmail.com> * bugfix: Fix bug created from race conditions during merge Signed-off-by: Arthur Silva Sens <arthursens2005@gmail.com> * [CHORE] considering global limits over enforced Signed-off-by: Nicolas Takashi <nicolas.tcs@hotmail.com> * build(deps): bump sigs.k8s.io/controller-runtime from 0.18.2 to 0.18.3 Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.18.2 to 0.18.3. - [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases) - [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md) - [Commits](kubernetes-sigs/controller-runtime@v0.18.2...v0.18.3) --- updated-dependencies: - dependency-name: sigs.k8s.io/controller-runtime dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * e2e/framework: Allow setting feature-gates when creating Prometheus-Operator Signed-off-by: Arthur Silva Sens <arthursens2005@gmail.com> * chore: add slashpai as release shepherd for v0.75 Signed-off-by: Jayapriya Pai <slashpai9@gmail.com> * Make a cluster of 2 worker nodes for e2e * [BUGFIX] Fix PrometheusAgent reconciliation for the statefulset changes (prometheus-operator#6615) * [BUGFIX] Fix PrometheusAgent reconciliation for the statefulset changes Signed-off-by: junotx <junotxiang@kubesphere.io> --------- Signed-off-by: junotx <junotxiang@kubesphere.io> * chore: add test for AlertmanagerConfig with subroutes Signed-off-by: Simon Pasquier <spasquie@redhat.com> * Use functional options pattern for Prometheus Controller Signed-off-by: Arthur Silva Sens <arthursens2005@gmail.com> * ScrapeConfig: Add `JobName` field to the CRD Co-authored-by: M Viswanath Sai <mviswanath.sai.met21@itbhu.ac.in> * chore: fix testScrapeConfigKubernetesNodeRole() Signed-off-by: Simon Pasquier <spasquie@redhat.com> * chore: bump k8s dependencies for api regenerate assets Fixes prometheus-operator#6617 Signed-off-by: Jayapriya Pai <slashpai9@gmail.com> * [CHORE] allowing kubeconfig as parameter (prometheus-operator#6623) Signed-off-by: Nicolas Takashi <nicolas.tcs@hotmail.com> * Add feature gate for Prometheus Agent's DaemonSet deployment (prometheus-operator#6626) * Add feature gate for Prometheus Agent's DaemonSet deployment * Update pkg/prometheus/promcfg.go Co-authored-by: Simon Pasquier <spasquie@redhat.com> * feat(env): Add automatic memory limit handling (prometheus-operator#6591) * add auto GOMEMLIMIT Signed-off-by: dongjiang1989 <dongjiang1989@126.com> --------- Signed-off-by: dongjiang1989 <dongjiang1989@126.com> Co-authored-by: Simon Pasquier <spasquie@redhat.com> * build(deps): bump github.com/KimMachineGun/automemlimit Bumps [github.com/KimMachineGun/automemlimit](https://github.com/KimMachineGun/automemlimit) from 0.6.0 to 0.6.1. - [Release notes](https://github.com/KimMachineGun/automemlimit/releases) - [Commits](KimMachineGun/automemlimit@v0.6.0...v0.6.1) --- updated-dependencies: - dependency-name: github.com/KimMachineGun/automemlimit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * fix: use a separate port number for init container The Kubernetes API starting from v1.30 will return a warning when a pod template contains 2 containers exposing the same port number, even across init and regular containers. [1] kubernetes/kubernetes#113245 Signed-off-by: Simon Pasquier <spasquie@redhat.com> * Update pkg/prometheus/promcfg.go Co-authored-by: Simon Pasquier <spasquie@redhat.com> * build(deps): bump github.com/prometheus/prometheus from 0.52.0 to 0.52.1 Bumps [github.com/prometheus/prometheus](https://github.com/prometheus/prometheus) from 0.52.0 to 0.52.1. - [Release notes](https://github.com/prometheus/prometheus/releases) - [Changelog](https://github.com/prometheus/prometheus/blob/main/CHANGELOG.md) - [Commits](prometheus/prometheus@v0.52.0...v0.52.1) --- updated-dependencies: - dependency-name: github.com/prometheus/prometheus dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * build(deps): bump github.com/thanos-io/thanos from 0.35.0 to 0.35.1 Bumps [github.com/thanos-io/thanos](https://github.com/thanos-io/thanos) from 0.35.0 to 0.35.1. - [Release notes](https://github.com/thanos-io/thanos/releases) - [Changelog](https://github.com/thanos-io/thanos/blob/v0.35.1/CHANGELOG.md) - [Commits](thanos-io/thanos@v0.35.0...v0.35.1) --- updated-dependencies: - dependency-name: github.com/thanos-io/thanos dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Update pkg/prometheus/promcfg.go Co-authored-by: Simon Pasquier <spasquie@redhat.com> * Update pkg/prometheus/promcfg.go Co-authored-by: Simon Pasquier <spasquie@redhat.com> * Update pkg/prometheus/promcfg.go Co-authored-by: Simon Pasquier <spasquie@redhat.com> * Update pkg/prometheus/promcfg.go Co-authored-by: Simon Pasquier <spasquie@redhat.com> * Update pkg/prometheus/promcfg.go Co-authored-by: Simon Pasquier <spasquie@redhat.com> * Update pkg/prometheus/promcfg.go Co-authored-by: Simon Pasquier <spasquie@redhat.com> * chore: refactor tokens management in the assets package This is a follow-up of prometheus-operator#6537 and prometheus-operator#6557. Signed-off-by: Simon Pasquier <spasquie@redhat.com> * chore: add test-e2e-image target to Makefile This change also simplifies the end-to-end testing instructions. Signed-off-by: Simon Pasquier <spasquie@redhat.com> * Add `mode` field in PrometheusAgent CRD (prometheus-operator#6640) * Add mode field in PrometheusAgent CRD * build(deps): bump github.com/prometheus/common from 0.53.0 to 0.54.0 Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.53.0 to 0.54.0. - [Release notes](https://github.com/prometheus/common/releases) - [Changelog](https://github.com/prometheus/common/blob/main/RELEASE.md) - [Commits](prometheus/common@v0.53.0...v0.54.0) --- updated-dependencies: - dependency-name: github.com/prometheus/common dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * chore: refactor sigv4 management in the assets package This is a follow-up of prometheus-operator#6537 and prometheus-operator#6557 and prometheus-operator#6641. Signed-off-by: Simon Pasquier <spasquie@redhat.com> * Update pkg/prometheus/promcfg.go Co-authored-by: Simon Pasquier <spasquie@redhat.com> * chore: refactor AzureAD management in the assets package This is a follow-up of prometheus-operator#6537 and prometheus-operator#6557, prometheus-operator#6641 and prometheus-operator#6644. Signed-off-by: Simon Pasquier <spasquie@redhat.com> * build(deps): bump github.com/prometheus-community/prom-label-proxy Bumps [github.com/prometheus-community/prom-label-proxy](https://github.com/prometheus-community/prom-label-proxy) from 0.8.1 to 0.9.0. - [Release notes](https://github.com/prometheus-community/prom-label-proxy/releases) - [Changelog](https://github.com/prometheus-community/prom-label-proxy/blob/main/CHANGELOG.md) - [Commits](prometheus-community/prom-label-proxy@v0.8.1...v0.9.0) --- updated-dependencies: - dependency-name: github.com/prometheus-community/prom-label-proxy dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * build(deps): bump golang.org/x/net from 0.25.0 to 0.26.0 Bumps [golang.org/x/net](https://github.com/golang/net) from 0.25.0 to 0.26.0. - [Commits](golang/net@v0.25.0...v0.26.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> * ScrapeConfig CRD: Add DockerswarmSDConfigs to the ScrapeConfig CRD * ScrapeConfig: Add LinodeSDConfigs To The ScrapeConfig CRD * ScrapeConfig CRD: Add PuppetDB Service Discovery Configurations * build(deps): bump sigs.k8s.io/controller-runtime from 0.18.3 to 0.18.4 Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.18.3 to 0.18.4. - [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases) - [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md) - [Commits](kubernetes-sigs/controller-runtime@v0.18.3...v0.18.4) --- updated-dependencies: - dependency-name: sigs.k8s.io/controller-runtime dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Add NODE_NAME env in config reloader (prometheus-operator#6636) * Add NODE_NAME env in config reloader * feat: add `prometheus_operator_feature_gate_info` metric This change also moves the feature gates to the operator config struct. It means that after a feature gate is enabled/disabled, the operator will reconcile the managed Prometheus resources which should be the right thing to do. Signed-off-by: Simon Pasquier <spasquie@redhat.com> * chore: bump code-generator to v0.30.1 The gen tools arguments have changed a bit, the Makefile commands have been adjusted accordingly. Signed-off-by: Simon Pasquier <spasquie@redhat.com> * Changed the description for ```overrideHonorLabels``` field (prometheus-operator#6653) * Changed the decription for overrideHonorLabels * Update pkg/prometheus/promcfg.go Co-authored-by: Simon Pasquier <spasquie@redhat.com> * build(deps): bump google.golang.org/protobuf from 1.34.1 to 1.34.2 Bumps google.golang.org/protobuf from 1.34.1 to 1.34.2. --- updated-dependencies: - dependency-name: google.golang.org/protobuf dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * build(deps): bump github.com/Azure/azure-sdk-for-go/sdk/azidentity Bumps [github.com/Azure/azure-sdk-for-go/sdk/azidentity](https://github.com/Azure/azure-sdk-for-go) from 1.5.2 to 1.6.0. - [Release notes](https://github.com/Azure/azure-sdk-for-go/releases) - [Changelog](https://github.com/Azure/azure-sdk-for-go/blob/main/documentation/release.md) - [Commits](Azure/azure-sdk-for-go@sdk/internal/v1.5.2...sdk/azcore/v1.6.0) --- updated-dependencies: - dependency-name: github.com/Azure/azure-sdk-for-go/sdk/azidentity dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> * build(deps): bump imjasonh/setup-crane from 0.3 to 0.4 Bumps [imjasonh/setup-crane](https://github.com/imjasonh/setup-crane) from 0.3 to 0.4. - [Release notes](https://github.com/imjasonh/setup-crane/releases) - [Commits](imjasonh/setup-crane@v0.3...v0.4) --- updated-dependencies: - dependency-name: imjasonh/setup-crane dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * [Enhancement] Replacing t.Fatal with testify/require package (prometheus-operator#6659) chore: pkg/operator: Replace t.Fatal with require.testify * chore: Add feature-gated tests to CI Signed-off-by: Arthur Silva Sens <arthursens2005@gmail.com> * ScrapeConfig CRD: Add LightSail Service Discovery Config Options * chore: bump to k8s.io libs v0.30.2 Signed-off-by: Simon Pasquier <spasquie@redhat.com> * build(deps): bump github.com/prometheus-community/prom-label-proxy Bumps [github.com/prometheus-community/prom-label-proxy](https://github.com/prometheus-community/prom-label-proxy) from 0.9.0 to 0.10.0. - [Release notes](https://github.com/prometheus-community/prom-label-proxy/releases) - [Changelog](https://github.com/prometheus-community/prom-label-proxy/blob/main/CHANGELOG.md) - [Commits](prometheus-community/prom-label-proxy@v0.9.0...v0.10.0) --- updated-dependencies: - dependency-name: github.com/prometheus-community/prom-label-proxy dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Alertmanager pkg,t.Fatal->require pkg * chore: fix build after prom-label-proxy bump Signed-off-by: Simon Pasquier <spasquie@redhat.com> * Replacing t.fatal with require Package (prometheus-operator#6680) chore: Replace t.Fatal with require package * feat(remote): add support prometheus remote write/read ProxyConfig (prometheus-operator#6512) * update prometheus remote write/read proxy config Signed-off-by: dongjiang1989 <dongjiang1989@126.com> --------- Signed-off-by: dongjiang1989 <dongjiang1989@126.com> * WIP: Refactor common test code between Prometheus Agent's StatefulSet and DaemonSet modes (prometheus-operator#6688) * Refactor test code between Prometheus Agent's StatefulSet and DaemonSet modes * update default thanos version Signed-off-by: dongjiang1989 <dongjiang1989@126.com> * build(deps): bump github.com/prometheus/prometheus from 0.52.1 to 0.53.0 Bumps [github.com/prometheus/prometheus](https://github.com/prometheus/prometheus) from 0.52.1 to 0.53.0. - [Release notes](https://github.com/prometheus/prometheus/releases) - [Changelog](https://github.com/prometheus/prometheus/blob/main/CHANGELOG.md) - [Commits](prometheus/prometheus@v0.52.1...v0.53.0) --- updated-dependencies: - dependency-name: github.com/prometheus/prometheus dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * update prometheus version Signed-off-by: dongjiang1989 <dongjiang1989@126.com> * config-reloader: create correct probes when `listenLocal` is set to `true` When the prometheus operator is started with `--enable-config-reloader-probes` it will now create `exec` probes that run curl/wget in the config-reloader container against localhost to check the /healthz endpoint if `listenLocal` is set to `true`. Otherwise, it creates `httpGet` probes as before. Fixes prometheus-operator#6682 * Nit: Check if EnableFeatures already contains agent mode's features (prometheus-operator#6701) * Check if EnableFeatures already contains ageent mode's features * [CHORE] Nicolas as release volunteer Signed-off-by: Nicolas Takashi <nicolas.tcs@hotmail.com> * Add `ttl` obj to alertmanagercfgs resource (prometheus-operator#6515) * add ttl obj into alertmanagerConfig rsc --------- Co-authored-by: Nicolas Takashi <nicolas.tcs@hotmail.com> Co-authored-by: Simon Pasquier <spasquie@redhat.com> * chore: factorize prober code This is a quick follow-up of prometheus-operator#6698. Signed-off-by: Simon Pasquier <spasquie@redhat.com> * chore: Replace StringPtrValOrDefault with ptr.Deref Signed-off-by: Arthur Silva Sens <arthursens2005@gmail.com> * Proposal for DaemonSet deployment of Prometheus Agent (prometheus-operator#6600) chore: Add Proposal for Daemonset deployment of Prometheus Agent * chore: refactor TLS management in the assets package This is a follow-up of prometheus-operator#6537, prometheus-operator#6557, prometheus-operator#6641, prometheus-operator#6644 and prometheus-operator#6645. Signed-off-by: Simon Pasquier <spasquie@redhat.com> * Refactor the common implementation code (not including tests) between Prometheus's modes (prometheus-operator#6686) * Refactor the common implementation code (not including tests) between Prometheus's modes * Continue prometheus-operator#6688: Refactor common test code between Prometheus modes (prometheus-operator#6694) * chore: optimize get secret key from store (prometheus-operator#6700) * optimize code Signed-off-by: dongjiang1989 <dongjiang1989@126.com> --------- Signed-off-by: dongjiang1989 <dongjiang1989@126.com> * build(deps): bump github.com/go-test/deep from 1.1.0 to 1.1.1 Bumps [github.com/go-test/deep](https://github.com/go-test/deep) from 1.1.0 to 1.1.1. - [Release notes](https://github.com/go-test/deep/releases) - [Changelog](https://github.com/go-test/deep/blob/master/CHANGES.md) - [Commits](go-test/deep@v1.1.0...v1.1.1) --- updated-dependencies: - dependency-name: github.com/go-test/deep dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * chore: bump go dependencies before release Signed-off-by: Jayapriya Pai <slashpai9@gmail.com> * feat(xds): Add OVHcloud service discovery to the ScrapeConfig CRD (prometheus-operator#6689) * add service discovery for ovhcloud Signed-off-by: dongjiang1989 <dongjiang1989@126.com> --------- Signed-off-by: dongjiang1989 <dongjiang1989@126.com> * chore: cut 0.75.0 Signed-off-by: Jayapriya Pai <slashpai9@gmail.com> * cherry-pick 6722 Signed-off-by: dongjiang1989 <dongjiang1989@126.com> * chore: cut 0.75.1 Signed-off-by: Jayapriya Pai <slashpai9@gmail.com> * fix: avoid invalid alerting config with TLS Signed-off-by: Simon Pasquier <spasquie@redhat.com> * chore: cut 0.75.2 Signed-off-by: Jayapriya Pai <slashpai9@gmail.com> * conflict fix Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com> * conflict Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com> * conflict files Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com> * conflict files Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com> * conflict files Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com> --------- Signed-off-by: Simon Pasquier <spasquie@redhat.com> Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Jayapriya Pai <slashpai9@gmail.com> Signed-off-by: dongjiang1989 <dongjiang1989@126.com> Signed-off-by: Yoan Blanc <yoan.blanc@chuv.ch> Signed-off-by: Arthur Silva Sens <arthursens2005@gmail.com> Signed-off-by: Arthur Silva Sens <arthur.sens@coralogix.com> Signed-off-by: Mathieu Parent <math.parent@gmail.com> Signed-off-by: Nicolas Takashi <nicolas.tcs@hotmail.com> Signed-off-by: junotx <junotxiang@kubesphere.io> Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com> Co-authored-by: Kemal Akkoyun <kakkoyun@users.noreply.github.com> Co-authored-by: Simon Pasquier <spasquie@redhat.com> Co-authored-by: Jayapriya Pai <slashpai9@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Arthur Silva Sens <arthursens2005@gmail.com> Co-authored-by: dongjiang <dongjiang1989@126.com> Co-authored-by: M Viswanath Sai <110663831+mviswanathsai@users.noreply.github.com> Co-authored-by: Horaci Macias <hmacias@avaya.com> Co-authored-by: Kapil Ramwani <50957624+codeknight03@users.noreply.github.com> Co-authored-by: Nicolas Takashi <nicolas.tcs@hotmail.com> Co-authored-by: Yoan Blanc <yoan.blanc@chuv.ch> Co-authored-by: Arthur Silva Sens <arthur.sens@coralogix.com> Co-authored-by: Ashwin Sriram <116557116+AshwinSriram11@users.noreply.github.com> Co-authored-by: Muhammad Hamza Zaib <hamzazaib3202@gmail.com> Co-authored-by: mviswanathsai <mviswanath.sai.met21@itbhu.ac.in> Co-authored-by: Mathieu Parent <mathieu.parent@insee.fr> Co-authored-by: haanhvu <haanh6594@gmail.com> Co-authored-by: junot <49136171+junotx@users.noreply.github.com> Co-authored-by: janluak <_> Co-authored-by: Ha Anh Vu <75315486+haanhvu@users.noreply.github.com> Co-authored-by: Ashwin <ashwinsriram11@gmail.com> Co-authored-by: Simon Dickhoven <sdickhoven@everquote.com> Co-authored-by: Afzal Ansari <afzal442@gmail.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

mviswanathsai requested a review from a team as a code owner April 3, 2024 11:38

pull-request-size Bot added the size/L label Apr 3, 2024

mviswanathsai marked this pull request as draft April 3, 2024 11:39

mviswanathsai marked this pull request as ready for review April 5, 2024 12:06

simonpasquier reviewed Apr 5, 2024

View reviewed changes

mviswanathsai mentioned this pull request Apr 5, 2024

chore: Move AlertmanagerEndpoints validation to pkg/prometheus/server #6480

Merged

4 tasks

mviswanathsai added 13 commits May 14, 2024 15:32

Add RelabelConfigs to AlertmanagerEndpoints

2459b48

Generate Code and docs for RelabelConfigs field

c38d81c

Add relabelConfigs to promcfg generation

bb015ef

Add validation for RelabelConfigs

e2ec65d

Add testcase for RelabelConfigs

bfb3182

Update comment

c3f489d

Format and generate

17ecc2a

Remove unnecessary sprintf

d584011

Address comments

538141a

move alertmanagerEndpoint validation from AddToStore func

64b1dc0

change the signature of ValidateAlertmanagerEndpoints to include pointer to monv1.Prometheus

AlertmanagerEndpoint: update the ...addToStore function

d4947c8

Gen: generate docs and code for []*RelabelConfig --> []RelabelConfig

b69b5f8

Promcfg Tests: update wrong RelabelConfig references

a769d76

mviswanathsai force-pushed the alertmanager-missing-fields branch from 1214647 to a769d76 Compare May 14, 2024 10:22

simonpasquier reviewed May 14, 2024

View reviewed changes

Comment thread pkg/prometheus/promcfg.go

Comment thread pkg/prometheus/promcfg_test.go

Comment thread pkg/apis/monitoring/v1/prometheus_types.go

simonpasquier approved these changes May 14, 2024

View reviewed changes

simonpasquier merged commit 48e9858 into prometheus-operator:main May 14, 2024

simonpasquier mentioned this pull request May 14, 2024

[WIP] Feat: Add alert_relabel_configs to the Prometheus and PrometheusAgent CRD's #6450

Merged

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feat: Add `relabel_configs` field to AlertmanagerEndpoints #6467

Feat: Add `relabel_configs` field to AlertmanagerEndpoints #6467
simonpasquier merged 13 commits intoprometheus-operator:mainfrom
mviswanathsai:alertmanager-missing-fields

mviswanathsai commented Apr 3, 2024

Uh oh!

mviswanathsai commented Apr 4, 2024

Uh oh!

simonpasquier commented Apr 5, 2024

Uh oh!

simonpasquier Apr 5, 2024

Uh oh!

mviswanathsai Apr 5, 2024 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ArthurSens commented Apr 12, 2024

Uh oh!

mviswanathsai commented Apr 13, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

simonpasquier commented May 14, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

	RelabelConfigs []*RelabelConfig `json:"relabelConfigs,omitempty"`
	RelabelConfigs []RelabelConfig `json:"relabelings,omitempty"`

Conversation

mviswanathsai commented Apr 3, 2024

Description

Type of change

Verification

Changelog entry

Uh oh!

mviswanathsai commented Apr 4, 2024

Uh oh!

simonpasquier commented Apr 5, 2024

Uh oh!

simonpasquier Apr 5, 2024

Choose a reason for hiding this comment

Uh oh!

mviswanathsai Apr 5, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ArthurSens commented Apr 12, 2024

Uh oh!

mviswanathsai commented Apr 13, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

simonpasquier commented May 14, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

mviswanathsai Apr 5, 2024 •

edited

Loading