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

Fix $ substitution issue in relabel and metric relabel config #618

Merged
merged 4 commits into from
Oct 6, 2023

Conversation

rashmichandrashekar
Copy link
Contributor

Test prom custom config I used -
image

What I see when i do a port-forward -
image

@rashmichandrashekar rashmichandrashekar requested a review from a team as a code owner October 4, 2023 22:09
@github-actions github-actions bot added the size/S label Oct 4, 2023
@github-actions github-actions bot added size/XS and removed size/S labels Oct 4, 2023
@vishiy vishiy merged commit 83ab2ac into main Oct 6, 2023
9 of 12 checks passed
vishiy added a commit that referenced this pull request Oct 6, 2023
* Add cluster scope to alert rule groups for linking them with UX (#600)

* Removing duplicate alerts from ci recommended alerts

* Remove test branch

* Remove preview keyword from policy readme

* Add cluster id scope to rule groups for alerts to be linked to UX

* adding terraform update

* Add cicd and prod near ring cluster monitoring for managed prometheus (#602)

* Removing duplicate alerts from ci recommended alerts

* Remove test branch

* Remove preview keyword from policy readme

* Add cicd and prod near ring cluster monitoring for managed prometheus

* Make single file for alerts and update dashboard to include unit in memory

* Replace label for cluster name with clusterName property

* Add telemetry for scrape interval (#614)

* Removing duplicate alerts from ci recommended alerts

* Remove test branch

* Remove preview keyword from policy readme

* Add telemetry for scrape interval hash

* remove branch name

* Upgrade dependencies (#616)

* upgrade all dependencies but collector

* update golang

* Update CVEs

* update config

* remove branch

* make build fail when trivy fails

* fix trivy scan for image not found for PRs

* windows fix for replicaset collecting windows data (#620)

* fix: remove uneeded windows scrape config in replicaset

* .

* .

* .

* revert windows telegraf update

* missed end

* remove examplar disablement for windows

* bin place me_win configs

---------

Co-authored-by: Grace Wehner <[email protected]>
Co-authored-by: bragi92 <[email protected]>

* Bug fix- update cert thumbprint to latest ame prod cert (#615)

* Removing duplicate alerts from ci recommended alerts

* Remove test branch

* Remove preview keyword from policy readme

* Bug fix- update cert thumbprint for image signing  to latest ame prod cert

* Fix $ substitution issue in relabel and metric relabel config (#618)

* dollar fix for node name and node ip

* test $ replacement

* clean up build

* Bump @adobe/css-tools in /tools/az-prom-rules-converter/web-app-example (#577)

Bumps [@adobe/css-tools](https://github.com/adobe/css-tools) from 4.0.1 to 4.3.1.
- [Changelog](https://github.com/adobe/css-tools/blob/main/History.md)
- [Commits](https://github.com/adobe/css-tools/commits)

---
updated-dependencies:
- dependency-name: "@adobe/css-tools"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Sohamdg081992 <[email protected]>
Co-authored-by: Grace Wehner <[email protected]>
Co-authored-by: bragi92 <[email protected]>
Co-authored-by: rashmichandrashekar <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
vishiy added a commit that referenced this pull request Oct 6, 2023
…elcollector/fluent-bit/src (#608)

* Bump github.com/prometheus/client_golang

Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.16.0 to 1.17.0.
- [Release notes](https://github.com/prometheus/client_golang/releases)
- [Changelog](https://github.com/prometheus/client_golang/blob/v1.17.0/CHANGELOG.md)
- [Commits](prometheus/client_golang@v1.16.0...v1.17.0)

---
updated-dependencies:
- dependency-name: github.com/prometheus/client_golang
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* merge from main (#622)

* Add cluster scope to alert rule groups for linking them with UX (#600)

* Removing duplicate alerts from ci recommended alerts

* Remove test branch

* Remove preview keyword from policy readme

* Add cluster id scope to rule groups for alerts to be linked to UX

* adding terraform update

* Add cicd and prod near ring cluster monitoring for managed prometheus (#602)

* Removing duplicate alerts from ci recommended alerts

* Remove test branch

* Remove preview keyword from policy readme

* Add cicd and prod near ring cluster monitoring for managed prometheus

* Make single file for alerts and update dashboard to include unit in memory

* Replace label for cluster name with clusterName property

* Add telemetry for scrape interval (#614)

* Removing duplicate alerts from ci recommended alerts

* Remove test branch

* Remove preview keyword from policy readme

* Add telemetry for scrape interval hash

* remove branch name

* Upgrade dependencies (#616)

* upgrade all dependencies but collector

* update golang

* Update CVEs

* update config

* remove branch

* make build fail when trivy fails

* fix trivy scan for image not found for PRs

* windows fix for replicaset collecting windows data (#620)

* fix: remove uneeded windows scrape config in replicaset

* .

* .

* .

* revert windows telegraf update

* missed end

* remove examplar disablement for windows

* bin place me_win configs

---------

Co-authored-by: Grace Wehner <[email protected]>
Co-authored-by: bragi92 <[email protected]>

* Bug fix- update cert thumbprint to latest ame prod cert (#615)

* Removing duplicate alerts from ci recommended alerts

* Remove test branch

* Remove preview keyword from policy readme

* Bug fix- update cert thumbprint for image signing  to latest ame prod cert

* Fix $ substitution issue in relabel and metric relabel config (#618)

* dollar fix for node name and node ip

* test $ replacement

* clean up build

* Bump @adobe/css-tools in /tools/az-prom-rules-converter/web-app-example (#577)

Bumps [@adobe/css-tools](https://github.com/adobe/css-tools) from 4.0.1 to 4.3.1.
- [Changelog](https://github.com/adobe/css-tools/blob/main/History.md)
- [Commits](https://github.com/adobe/css-tools/commits)

---
updated-dependencies:
- dependency-name: "@adobe/css-tools"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Sohamdg081992 <[email protected]>
Co-authored-by: Grace Wehner <[email protected]>
Co-authored-by: bragi92 <[email protected]>
Co-authored-by: rashmichandrashekar <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* remove private branch

* Update RELEASENOTES.md

* Update VERSION

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Vishwanath <[email protected]>
Co-authored-by: Sohamdg081992 <[email protected]>
Co-authored-by: Grace Wehner <[email protected]>
Co-authored-by: bragi92 <[email protected]>
Co-authored-by: rashmichandrashekar <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants