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

feat: mixin, allow overriding of some labels by parameterizing mixin recording/alert rules #11495

Merged
merged 23 commits into from
Oct 2, 2024
Merged
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
638a1ea
parameterize alert rules
alex5517 Dec 15, 2023
7d1297a
parameterize recording rules
alex5517 Dec 15, 2023
d24862d
Merge branch 'main' into feat/parameterize-mixin
alex5517 Dec 15, 2023
943abab
Use group_prefix_jobs var for metric name
alex5517 Dec 18, 2023
a7b55bd
Merge branch 'feat/parameterize-mixin' of github.com:neticdk/loki int…
alex5517 Dec 18, 2023
8a23765
Merge branch 'grafana:main' into feat/parameterize-mixin
alex5517 Jan 9, 2024
696f716
Merge branch 'grafana:main' into feat/parameterize-mixin
alex5517 Feb 21, 2024
2e43670
Remove config.libsonnet import from dashboards since imported in mixi…
alex5517 Feb 21, 2024
3aacecc
Merge branch 'main' into feat/parameterize-mixin
alex5517 Feb 22, 2024
77a6f15
Merge branch 'main' into feat/parameterize-mixin
alex5517 Feb 22, 2024
ea13e6f
Merge branch 'grafana:main' into feat/parameterize-mixin
alex5517 Feb 26, 2024
7754cf3
Lint error - remove 2 spaces
alex5517 Feb 26, 2024
7ebdd9d
Merge branch 'main' into feat/parameterize-mixin
alex5517 Feb 29, 2024
3a61421
Run make loki-mixin
alex5517 Feb 29, 2024
105ec09
Merge branch 'feat/parameterize-mixin' of github.com:neticdk/loki int…
alex5517 Feb 29, 2024
6571838
Merge branch 'main' into feat/parameterize-mixin
alex5517 Mar 6, 2024
de90f70
Pull from main
alex5517 Apr 18, 2024
8e183e7
Fix merge conflict
alex5517 Apr 18, 2024
88e5d73
Run make loki-mixin
alex5517 Apr 18, 2024
ed0c9d8
Merge branch 'main' of github.com:neticdk/loki into feat/parameterize…
alex5517 May 29, 2024
fdfa18c
Build mixin
alex5517 May 29, 2024
9b3c5df
fix merge conflict
alex5517 Sep 30, 2024
859636f
Merge branch 'main' into feat/parameterize-mixin
alex5517 Oct 2, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix merge conflict
Signed-off-by: Alexander Soelberg Heidarsson <[email protected]>
alex5517 committed Sep 30, 2024
commit 9b3c5dfee03fdf0992ef398f4b2b9264f97aef7a
6 changes: 3 additions & 3 deletions production/loki-mixin/recording_rules.libsonnet
Original file line number Diff line number Diff line change
@@ -5,9 +5,9 @@ local utils = import 'mixin-utils/utils.libsonnet';
groups+: [{
name: 'loki_rules',
rules:
utils.histogramRules('loki_request_duration_seconds', [$._config.per_cluster_label, 'job']) +
utils.histogramRules('loki_request_duration_seconds', [$._config.per_cluster_label, 'job', 'route']) +
utils.histogramRules('loki_request_duration_seconds', $._config.job_labels + ['route']),
utils.histogramRules('loki_request_duration_seconds', [$._config.per_cluster_label, 'job'], $._config.recording_rules_range_interval) +
utils.histogramRules('loki_request_duration_seconds', [$._config.per_cluster_label, 'job', 'route'], $._config.recording_rules_range_interval) +
utils.histogramRules('loki_request_duration_seconds', [$._config.per_cluster_label, 'namespace', 'job', 'route'], $._config.recording_rules_range_interval),
}],
},
}
You are viewing a condensed version of this merge commit. You can view the full changes here.