-
Notifications
You must be signed in to change notification settings - Fork 253
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
Alloy-Mixin: allow k8s cluster and alloy cluster disable, add logs dashboard #808
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks! This is a bit hard to review for concrete differences at the moment given how many things changed, but I left a few comments to help reduce the number of differences so I can give a more thoughtful second pass.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the changes!
|
||
local labels = if $._config.enableK8sCluster then ['cluster', 'namespace', 'job', 'instance', 'level'] else ['job', 'instance', 'level'], | ||
|
||
grafanaDashboards+: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This doesn't seem to follow the pattern that other dashboards do; this is the only one with a grafanaDashboards
top-level key. Can we change this to be consistent with the other dashboards?
That would also mean moving the logic for whether to enable the dashboard outside of the definition of the dashboard itself, which would be more consistent with how the clustering dashboards are made optional.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That is because the library I am using expects a grafanaDashboards
variable.
I also don't like how it looks different, but since this is a totally different library which is synced with the latest version of grafonnet, I believe it is an acceptable trade off.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No other comments from me, nice work making this configurable!
grafana#808 introduced dependencies for the mixin, which accidentally broke the example environment; as the mixin originally didn't have dependencies, the example environment didn't install them before provisioning dashboards. This commit runs jb to locally install dependencies before provisioning dashboards.
#808 introduced dependencies for the mixin, which accidentally broke the example environment; as the mixin originally didn't have dependencies, the example environment didn't install them before provisioning dashboards. This commit runs jb to locally install dependencies before provisioning dashboards.
PR Description
Introducing the following changes:
job
label everywhere as a grouper whencluster
andnamespace
are disabled, to avoid metric conflicts - likeup
metricWhich issue(s) this PR fixes
Notes to the Reviewer
Let me know if this needs changelog updates or if there are any docs.
PR Checklist