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

add configurable 'job_selectors' and 'cluster_selectors' #935

Merged
merged 1 commit into from
Sep 7, 2021

Conversation

kevinschoonover
Copy link
Contributor

@kevinschoonover kevinschoonover commented Sep 6, 2021

What this PR does:
Similiar to grafana/cortex-jsonnet#319 in cortex, Replaces hard-coded usage of [namespace, job] or [namespace, cluster] in alerts and recording rules to support different configurations of cluster and job unique identifier labels.

I generated the existing alerts/rules in yamls/ folder and the only differences I see are recent changes to yamls/alerts.yml that haven't been synced

Which issue(s) this PR fixes:
N/A

Checklist
- [ ] Tests updated
- [ ] Documentation added

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

@CLAassistant
Copy link

CLAassistant commented Sep 6, 2021

CLA assistant check
All committers have signed the CLA.

Copy link
Contributor

@annanay25 annanay25 left a comment

Choose a reason for hiding this comment

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

Thanks for the contribution @kevinschoonover. Long overdue refactoring of the jsonnet. This is mostly good to go, just have some minor comments.

operations/tempo-mixin/config.libsonnet Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
Replaces hard-coded usage of [namespace, job] or [namespace,
cluster] in alerts and recording rules to support different
configurations of cluster and job unique identifier labels
@kevinschoonover kevinschoonover changed the title add configurable 'job_labels' and 'cluster_labels' add configurable 'job_selectors' and 'cluster_selectors' Sep 6, 2021
@kevinschoonover
Copy link
Contributor Author

@annanay25 Thanks for the fast review! All the comments should be addressed. Let me know if I missed something or you have any other changes.

Copy link
Contributor

@annanay25 annanay25 left a comment

Choose a reason for hiding this comment

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

Thanks!

@annanay25 annanay25 merged commit e815416 into grafana:main Sep 7, 2021
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