[prometheus.operator.probes] Add namespace label with the namespace of the probe object #1058

ToonTijtgat2 · 2024-06-17T09:21:31Z

PR Description

Add namespace label with the namespace of the probe object in the static config to align with prometheus setup.
Prometheus automatically adds the namespace label, and since this is standard practice and we rely on this label for some dashboards and rules, we'd like to align the prometheus setup and alloy setup.

Which issue(s) this PR fixes

Fixes #1049

Notes to the Reviewer

PR Checklist

CHANGELOG.md updated
Documentation added
Tests updated
Config converters updated

ToonTijtgat2 · 2024-06-18T07:57:45Z

@thampiotr Thanks for running the tests, I adapted the code a little according to the results. Can you try again?
Thanks

ToonTijtgat2 · 2024-06-18T13:18:03Z

@thampiotr Thanks for running the tests again, for the failing results on this one, I'm not sure what the issues are or how to solve them.

ToonTijtgat2 · 2024-06-18T13:36:18Z

@thampiotr Noticed that the probe config tests are not successful, so added the expectation of a label with name namespace and value default.

ToonTijtgat2 · 2024-06-19T06:17:33Z

@thampiotr I changed the labelset from an array of sets to one object.

ToonTijtgat2 · 2024-06-21T08:57:58Z

@thampiotr, Is there something else for the moment I can do? (not sure how the full PR flow works)
Thanks for checking

ToonTijtgat2 · 2024-06-21T10:35:28Z

@thampiotr Adapted the test to have one list instead of a list in a list

thampiotr · 2024-06-21T12:35:39Z

@ToonTijtgat2 you should be able to run most of the tests locally with make test, there are also some contribution docs in the repository you may find helpful. I intend to take a closer review once we have tests passing.

CLAassistant · 2024-06-27T11:04:57Z

All committers have signed the CLA.

ToonTijtgat2 · 2024-06-28T08:31:00Z

@thampiotr it seems that all tests passed now, what do we have to do now to complete this PR?

I saw that by accident I did one of the commits with an unknown user. I don't know if this is a problem about the cla?
I updated the fork a few moments ago to fetch the latest changes.
But according to me this PR seems to look good now.

Thanks for checking.

FYI, I try to run the tests locally but for a reason I get the following all the time.

Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>

…al (grafana#1062)

* otelcol.receiver.datadog: new component * update authorship list * docs: update task page --------- Co-authored-by: Robert Fratto <robertfratto@gmail.com>

* Update version file with v1.3.0 * Update changelog * Update docs version

) Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com>

…ion use (grafana#1087)

Signed-off-by: Paschalis Tsilias <paschalist0@gmail.com>

* add rsa config options, docs * update exporter, tests * reword auth requirement info * field doc tweaks * add var replace notes * fix placeholder values * rebase main, fix conflicts * style example config replacements * move require * tidy * revert Changelog formatting * remove *

Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5 to 6. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](docker/build-push-action@v5...v6) --- updated-dependencies: - dependency-name: docker/build-push-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>

…rafana#1026) Bumps [github.com/Azure/azure-sdk-for-go/sdk/azidentity](https://github.com/Azure/azure-sdk-for-go) from 1.5.1 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.1...sdk/azcore/v1.6.0) --- updated-dependencies: - dependency-name: github.com/Azure/azure-sdk-for-go/sdk/azidentity dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* remove explicit chown step that made docker image bigger * remove chmod

…rafana#1093) Bumps [github.com/Azure/azure-sdk-for-go/sdk/azidentity](https://github.com/Azure/azure-sdk-for-go) from 1.5.1 to 1.7.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.1...sdk/azcore/v1.7.0) --- updated-dependencies: - dependency-name: github.com/Azure/azure-sdk-for-go/sdk/azidentity dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…vements (grafana#1081) * add severity and description to alerts * fix alert lib * reset config change * job not multi template, including filter on metric queries * revert config change * changing running instances count query to alloy_component_controller_running_components * group by instance * fallback to use by() * refrain from using instance label

…afana#1069) Bumps [go.opentelemetry.io/collector/config/confighttp](https://github.com/open-telemetry/opentelemetry-collector) from 0.100.1-0.20240509190532-c555005fcc80 to 0.102.0. - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/commits/v0.102.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/collector/config/confighttp dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…afana#1111) Bumps [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) from 0.22.0 to 0.23.0. - [Release notes](https://github.com/aquasecurity/trivy-action/releases) - [Commits](aquasecurity/trivy-action@595be6a...7c2007b) --- updated-dependencies: - dependency-name: aquasecurity/trivy-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…#1018) * Docs: add 'Tuning max_shards' section in Prometheus remote write doc Signed-off-by: Marco Pracucci <marco@pracucci.com> * Link section Signed-off-by: Marco Pracucci <marco@pracucci.com> * Link section Signed-off-by: Marco Pracucci <marco@pracucci.com> * Remove test label selector from query Signed-off-by: Marco Pracucci <marco@pracucci.com> * Apply suggestions from code review Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com> Co-authored-by: Jennifer Villa <jvilla2013@gmail.com> * Re-iterate based on feedback Signed-off-by: Marco Pracucci <marco@pracucci.com> * Renamed 'replica' to 'instance' Signed-off-by: Marco Pracucci <marco@pracucci.com> * Explain why there's a max_shards cap Signed-off-by: Marco Pracucci <marco@pracucci.com> * Apply suggestions from code review Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com> --------- Signed-off-by: Marco Pracucci <marco@pracucci.com> Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com> Co-authored-by: Jennifer Villa <jvilla2013@gmail.com>

Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>

Bumps [github.com/hashicorp/go-retryablehttp](https://github.com/hashicorp/go-retryablehttp) from 0.7.4 to 0.7.7. - [Changelog](https://github.com/hashicorp/go-retryablehttp/blob/main/CHANGELOG.md) - [Commits](hashicorp/go-retryablehttp@v0.7.4...v0.7.7) --- updated-dependencies: - dependency-name: github.com/hashicorp/go-retryablehttp dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

ckit v0.0.0-20240624165704-36f3407a8eaa uses the atomic Uint64 wrappers which align better in 32b systems, like armv7hf. Tested to work on a armv7hf instance, when compiled from source. Co-authored-by: Robert Fratto <robertfratto@gmail.com>

Co-authored-by: Mischa Thompson <mischabear@gmail.com> Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>

…1150) Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>

…ometheus metrics task (grafana#1152)

ToonTijtgat2 · 2024-07-03T07:10:08Z

Opened a new PR since this one is going all wrong. #1186

ToonTijtgat2 added 2 commits June 17, 2024 11:16

Add namespace label with the namespace of the probe object

ab7a526

typo

2dbdc2a

ToonTijtgat2 mentioned this pull request Jun 17, 2024

[loki.rules.kubernetes] add support for clustered mode #976

Open

use model.LabelValue and set namespace as a string

622f383

adapt the test to expect a namespace label

0cdd848

no array for of labelsets

d82b33b

ToonTijtgat2 mentioned this pull request Jun 21, 2024

loki.rules.kubernetes: Add support for clustered mode #1057

Open

4 tasks

set a list of labels instead of a list of lists.

e99ff62

ToonTijtgat2 and others added 13 commits July 3, 2024 08:49

set the missing comma

a31e0e3

Add documentation for OTLP Endpoint (grafana#1060)

8c310cf

Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>

[Docs] Add reference link to shortcode body in getting-started tutori…

6e8a6aa

…al (grafana#1062)

Add an otelcol.receiver.datadog component (grafana#1067)

ca282dc

* otelcol.receiver.datadog: new component * update authorship list * docs: update task page --------- Co-authored-by: Robert Fratto <robertfratto@gmail.com>

Copy datadogreceiver go mod files for integration tests (grafana#1070)

ae9e82b

Update DD receiver doc (grafana#1071)

af630ba

Update version file with v1.3.0 (grafana#1073)

7236ff1

* Update version file with v1.3.0 * Update changelog * Update docs version

Clean up Vale errors in task topics (grafana#922)

5ef16ce

Feat: Add Catchpoint Exporter (grafana#1027)

bf3d9e3

update remotecfg argument name from metadata to attributes (grafana#1090

a06b433

) Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com>

Clean up word use, reduce passive voice, fix spelling and capitalisat…

24e17f0

…ion use (grafana#1087)

Fix issues with DD doc. (grafana#1092)

dfafc4a

remotecfg: add jitter to polling frequency (grafana#961)

cb95c48

Signed-off-by: Paschalis Tsilias <paschalist0@gmail.com>

Caleb-Hurshman and others added 24 commits July 3, 2024 08:50

mixin: Add SR to remote_write dashboard (grafana#1100)

8478cdc

remove explicit chown step that made docker image bigger (grafana#1101)

c81192f

* remove explicit chown step that made docker image bigger * remove chmod

fix: extend k8s event informer timeout (grafana#1088)

7a39bca

[DOC] Update migrate static for tracing (grafana#1091)

6a37c47

Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>

Updated Typo in MSSQL Block Docs (grafana#1112)

ab60ccd

Docs/add filter logs section (grafana#1098)

d8333a8

Co-authored-by: Mischa Thompson <mischabear@gmail.com> Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>

Update changelog with v1.2.0 (grafana#1144)

a56d8ce

Update Helm with Alloy v1.2.0 (grafana#1146)

9cc5bac

General cleanup of the Get Started tutorial content (grafana#1138)

5d55e6f

docs: warn in task page that live debugging must be enabled (grafana#…

2f51c7e

…1150) Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>

Correct typo for data stream field (grafana#1141)

7de8654

Fix URL in livedebugging doc (grafana#1158)

96a948a

Add link to the run command documentation (grafana#1165)

ff6449b

Add more Prometheus compatible endpoint information to the Collect Pr…

d801051

…ometheus metrics task (grafana#1152)

ToonTijtgat2 force-pushed the feature/namespacelabelprobes branch from 84e7bcc to d801051 Compare July 3, 2024 06:53

ToonTijtgat2 requested a review from clayton-cornell as a code owner July 3, 2024 06:53

ToonTijtgat2 closed this Jul 3, 2024

github-actions bot added the frozen-due-to-age label Aug 4, 2024

github-actions bot locked as resolved and limited conversation to collaborators Aug 4, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[prometheus.operator.probes] Add namespace label with the namespace of the probe object #1058

[prometheus.operator.probes] Add namespace label with the namespace of the probe object #1058

ToonTijtgat2 commented Jun 17, 2024 •

edited

Loading

ToonTijtgat2 commented Jun 18, 2024

ToonTijtgat2 commented Jun 18, 2024

ToonTijtgat2 commented Jun 18, 2024

ToonTijtgat2 commented Jun 19, 2024

ToonTijtgat2 commented Jun 21, 2024

ToonTijtgat2 commented Jun 21, 2024

thampiotr commented Jun 21, 2024

CLAassistant commented Jun 27, 2024 •

edited

Loading

ToonTijtgat2 commented Jun 28, 2024

ToonTijtgat2 commented Jul 3, 2024

[prometheus.operator.probes] Add namespace label with the namespace of the probe object #1058

[prometheus.operator.probes] Add namespace label with the namespace of the probe object #1058

Conversation

ToonTijtgat2 commented Jun 17, 2024 • edited Loading

PR Description

Which issue(s) this PR fixes

Notes to the Reviewer

PR Checklist

ToonTijtgat2 commented Jun 18, 2024

ToonTijtgat2 commented Jun 18, 2024

ToonTijtgat2 commented Jun 18, 2024

ToonTijtgat2 commented Jun 19, 2024

ToonTijtgat2 commented Jun 21, 2024

ToonTijtgat2 commented Jun 21, 2024

thampiotr commented Jun 21, 2024

CLAassistant commented Jun 27, 2024 • edited Loading

ToonTijtgat2 commented Jun 28, 2024

ToonTijtgat2 commented Jul 3, 2024

ToonTijtgat2 commented Jun 17, 2024 •

edited

Loading

CLAassistant commented Jun 27, 2024 •

edited

Loading