Skip to content

Don't merge mixins in the global namespace anymore. #234

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.

Sign up for GitHub

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

Merged
tomwilkie merged 6 commits into from
Apr 7, 2020
Merged

Don't merge mixins in the global namespace anymore. #234

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
479097a
Don't merge mixins in the global namespace anymore.
tomwilkie Apr 7, 2020
bb31466
make fmt
tomwilkie Apr 7, 2020
5b13029
Put mixins + overrides in separate file.
tomwilkie Apr 7, 2020
6cc735e
Review feedback.
tomwilkie Apr 7, 2020
6831505
make fmt
tomwilkie Apr 7, 2020
5a61339
Clarify comment.
tomwilkie Apr 7, 2020
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
make fmt 
Signed-off-by: Tom Wilkie <[email protected]>
  • Loading branch information
@tomwilkie
tomwilkie committed Apr 7, 2020
commit 683150533c59c294c08b0fa923e9e24bc59156b6
4 changes: 2 additions & 2 deletions prometheus-ksonnet/lib/prometheus-config.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,8 +420,8 @@
} +
std.foldr(
function(mixinName, acc)
local mixin = $.mixins[mixinName] + emptyMixin;
acc + mixin.prometheusAlerts,
local mixin = $.mixins[mixinName] + emptyMixin;
acc + mixin.prometheusAlerts,
std.objectFields($.mixins),
{}
),
Expand Down