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

mixin: configurable namespace label, job label, and job prefix #3482

Merged

Conversation

sysedwinistrator
Copy link
Contributor

@sysedwinistrator sysedwinistrator commented Nov 21, 2022

What this PR does

Makes labels used for namespace and job selection, and the prefix used in the job selection configurable

Which issue(s) this PR fixes or relates to

Fixes #

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

@pracucci pracucci self-requested a review November 21, 2022 17:01
Copy link
Collaborator

@pracucci pracucci left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👋 Hi, and thanks for your contribution! I'm open to this change and overall LGTM (good job!). I left few minor comments.

Could you also add a CHANGELOG entry under the "mixin" section, please?

operations/mimir-mixin/alerts/alerts.libsonnet Outdated Show resolved Hide resolved
operations/mimir-mixin/alerts/alerts.libsonnet Outdated Show resolved Hide resolved
operations/mimir-mixin/config.libsonnet Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
@pracucci pracucci marked this pull request as ready for review November 24, 2022 09:16
@pracucci pracucci requested review from a team as code owners November 24, 2022 09:16
Copy link
Collaborator

@pracucci pracucci left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great job, LGTM! I will let @osg-grafana follow up with doc review. I've also marked the PR "ready for review" since it was still a draft.

Copy link
Contributor

@osg-grafana osg-grafana left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes involve: fix punctuation, conform to style, and simply phrase structures.

@osg-grafana osg-grafana added the type/docs Improvements or additions to documentation label Nov 24, 2022
sysedwinistrator and others added 6 commits November 24, 2022 10:54
Co-authored-by: Ursula Kallio <ursula.kallio@grafana.com>
Co-authored-by: Ursula Kallio <ursula.kallio@grafana.com>
Co-authored-by: Ursula Kallio <ursula.kallio@grafana.com>
Co-authored-by: Ursula Kallio <ursula.kallio@grafana.com>
Co-authored-by: Ursula Kallio <ursula.kallio@grafana.com>
Co-authored-by: Ursula Kallio <ursula.kallio@grafana.com>
sysedwinistrator and others added 2 commits November 24, 2022 10:56
Co-authored-by: Ursula Kallio <ursula.kallio@grafana.com>
Co-authored-by: Ursula Kallio <ursula.kallio@grafana.com>
@sysedwinistrator
Copy link
Contributor Author

Thanks @osg-grafana and @pracucci for your help to get this merged!

Copy link
Contributor

@osg-grafana osg-grafana left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you! :)

Signed-off-by: Marco Pracucci <marco@pracucci.com>
@pracucci pracucci enabled auto-merge (squash) November 24, 2022 13:14
@pracucci pracucci merged commit 1e2877d into grafana:main Nov 24, 2022
masonmei pushed a commit to udmire/mimir that referenced this pull request Dec 16, 2022
…na#3482)

* mixin: add option for custom namespace label name

* mixin: add option for custom job prefix

* mixin: add option for custom job label

* mimir-mixin: use named placeholder

Co-authored-by: Marco Pracucci <marco@pracucci.com>

* mimir-mixin: use named placeholder

Co-authored-by: Marco Pracucci <marco@pracucci.com>

* mimir-mixin: update documentation

* mixin: update CHANGELOG.md

* mimir-mixin: improve documentation

Co-authored-by: Ursula Kallio <ursula.kallio@grafana.com>

* mimir-mixin: improve documentation

Co-authored-by: Ursula Kallio <ursula.kallio@grafana.com>

* mimir-mixin: improve documentation

Co-authored-by: Ursula Kallio <ursula.kallio@grafana.com>

* mimir-mixin: improve documentation

Co-authored-by: Ursula Kallio <ursula.kallio@grafana.com>

* mimir-mixin: improve documentation

Co-authored-by: Ursula Kallio <ursula.kallio@grafana.com>

* mimir-mixin: improve documentation

Co-authored-by: Ursula Kallio <ursula.kallio@grafana.com>

* mimir-mixin: improve documentation

Co-authored-by: Ursula Kallio <ursula.kallio@grafana.com>

* mimir-mixin: improve documentation

Co-authored-by: Ursula Kallio <ursula.kallio@grafana.com>

* Run 'make doc' to format markdown

Signed-off-by: Marco Pracucci <marco@pracucci.com>

Signed-off-by: Marco Pracucci <marco@pracucci.com>
Co-authored-by: Marco Pracucci <marco@pracucci.com>
Co-authored-by: Ursula Kallio <ursula.kallio@grafana.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type/docs Improvements or additions to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants