Skip to content

Upstream fixes for silence limits#87

Merged
santihernandezc merged 3 commits intografana:mainfrom
grobinson-grafana:grobinson/update-silence-limits
Jun 21, 2024
Merged

Upstream fixes for silence limits#87
santihernandezc merged 3 commits intografana:mainfrom
grobinson-grafana:grobinson/update-silence-limits

Conversation

@grobinson-grafana
Copy link
Copy Markdown

@grobinson-grafana grobinson-grafana commented Jun 20, 2024

This pull request brings a number of upstream fixes for silence limits into our fork. The main change is fixing per-tenant silence limits not being updated at runtime.

https://github.com/grafana/alerting-squad/issues/825

* Silence limits as functions

This commit changes silence limits from a struct of ints to a struct
of functions that return individual limits. This allows limits
to be lazy-loaded and updated without having to call silences.New().

Signed-off-by: George Robinson <george.robinson@grafana.com>

* Add explicit test for no limits

Signed-off-by: George Robinson <george.robinson@grafana.com>

* Fix run()

Signed-off-by: George Robinson <george.robinson@grafana.com>

---------

Signed-off-by: George Robinson <george.robinson@grafana.com>
* Rename silence limit to max-silence-size-bytes

This commit renames an existing (unreleased) limit from
max-per-silence-bytes to max-silence-size-bytes.

Signed-off-by: George Robinson <george.robinson@grafana.com>

* Update help

Signed-off-by: George Robinson <george.robinson@grafana.com>

---------

Signed-off-by: George Robinson <george.robinson@grafana.com>
@santihernandezc santihernandezc merged commit d75ea57 into grafana:main Jun 21, 2024
@grobinson-grafana grobinson-grafana deleted the grobinson/update-silence-limits branch June 25, 2024 15:59
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.

3 participants