Skip to content

Conversation

@grobinson-grafana
Copy link
Collaborator

@grobinson-grafana grobinson-grafana commented Mar 7, 2025

evkuzin and others added 27 commits November 13, 2024 09:21
…me.Now() to 1 per iteration

Signed-off-by: Evgeny Kuzin <evgeny.kuzin@outlook.com>
…0 and use `version.ComponentUserAgent`

Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
chore(deps): use `version.ComponentUserAgent`
Fixed a formatting error that made the <slack_config> section unavailable from the menu in the web documentation

Signed-off-by: Oleg Nikachev <oleg.a.nikachev@ringcentral.com>
Update to current Node/Debian Docker image.
* Bump elm-format to current release.

Signed-off-by: SuperQ <superq@gmail.com>
Signed-off-by: Alex Weaver <weaver.alex.d@gmail.com>
Signed-off-by: George Robinson <george.robinson@grafana.com>
Signed-off-by: Reto Kupferschmid <kupferschmid@puzzle.ch>
* Add wrap to content of adapter card to avoid truancating long text

Signed-off-by: Dima Xu <dima.xu@orionhealth.com>
Co-authored-by: Dima Xu <dima.xu@orionhealth.com>
Signed-off-by: Anastasios_Dados <tdados@hotmail.com>
…on (#4258)

The update addresses failing GitHub Actions caused by the deprecation of
v3 actions/upload-artifact and actions/download-artifact APIs.

This change:
- Updates promci from previous version to v0.4.6
- I hope resolves CI failures in artifact upload/download steps

Signed-off-by: Raúl Naveiras <me@raulnaveiras.com>
…on (#4259)

Same as #4258

The update addresses failing GitHub Actions caused by the deprecation of
v3 actions/upload-artifact and actions/download-artifact APIs.

This change:
- Updates promci from previous version to v0.4.6
- I hope resolves CI failures in artifact upload/download steps

https://github.com/prometheus/promci/releases/tag/v0.4.6
https://github.blog/changelog/2024-04-16-deprecation-notice-v3-of-the-artifact-actions/

Signed-off-by: Raúl Naveiras <me@raulnaveiras.com>
This commit fixes a subtle bug introduced in #4177 where external
code that imports config.InhibitRule for the purpose of JSON/YAML
encoding can encode an inhibition rule with missing equals labels.
This bug will happen if someone updates their Go modules, writes
labels to the Equal field, and does not also write the same labels
to the EqualStr field.

To fix this, I propose removing EqualStr and changing Equal from
model.LabelNames to []string. This will cause an intentional
breaking change, and require the maintainer of downstream code to
use []string instead of model.LabelNames. I consider this a better
option to the subtle bug explained earlier.

This still keeps the fix for #4177, but does so with an explicit
breaking change to downstream users.

Signed-off-by: George Robinson <george.robinson@grafana.com>
…breaking-change-4177

Fix subtle bug in JSON/YAML encoding of inhibition rules
* render jira project when searching existing issues

Signed-off-by: Walther Lee <walther.lee@reddit.com>

* golangci-lint run --fix

Signed-off-by: Walther Lee <walther.lee@reddit.com>

---------

Signed-off-by: Walther Lee <walther.lee@reddit.com>
Co-authored-by: Walther Lee <walther.lee@reddit.com>
* opsgenie : trim space for api key file

Signed-off-by: zoov-xavier <xavier.jeanneney@fifteen.eu>

* fix lint checking error

Signed-off-by: gotjosh <josue.abreu@gmail.com>

---------

Signed-off-by: zoov-xavier <xavier.jeanneney@fifteen.eu>
Signed-off-by: gotjosh <josue.abreu@gmail.com>
Co-authored-by: gotjosh <josue.abreu@gmail.com>
* Fix descriptions for --enable-feature

Signed-off-by: Andrés Maldonado <maldonado@codelutin.com>

* Apply suggested changes

Co-authored-by: George Robinson <george.robinson@grafana.com>
Signed-off-by: am97 <amaldona@tutanota.com>

---------

Signed-off-by: Andrés Maldonado <maldonado@codelutin.com>
Signed-off-by: am97 <amaldona@tutanota.com>
Co-authored-by: George Robinson <george.robinson@grafana.com>
Co-authored-by: gotjosh <josue.abreu@gmail.com>
Signed-off-by: Reto Kupferschmid <kupferschmid@puzzle.ch>
Co-authored-by: gotjosh <josue.abreu@gmail.com>
replace Resolved with ResolvedAt to reduce amount call to time.Now()
Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
amtool: fix panic if --verbose is in used.
@grobinson-grafana
Copy link
Collaborator Author

I've asked @gotjosh about the DCO check failing, as I can't understand what is wrong. It started to fail with 4462331, but the DCO check for that PR passed, and the DCO failure isn't even related to that PR.

@gotjosh
Copy link
Member

gotjosh commented Mar 7, 2025

I'm not sure what's wrong but apparently there are 4 commits that are expected to be sign-off in a slightly different format:

https://github.com/prometheus/alertmanager/pull/4299/checks?check_run_id=38364172971

I'm going to set the DCO to pass manually as all the commits have been sign off one way or the other.

@SuperQ
Copy link
Member

SuperQ commented Mar 7, 2025

Yea, sometimes merging branches / cherry-pick in confuses the DCO checker.

@gotjosh gotjosh closed this Mar 7, 2025
@gotjosh gotjosh reopened this Mar 7, 2025
Signed-off-by: George Robinson <george.robinson@grafana.com>
@grobinson-grafana grobinson-grafana merged commit c5f20b8 into release-0.28 Mar 7, 2025
11 checks passed
@grobinson-grafana grobinson-grafana deleted the grobinson/v0.28.1 branch March 7, 2025 11:36
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.