Skip to content

Upgrade kubernetes-mixin #226

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
Duologic merged 2 commits into from
Mar 31, 2020
Merged

Upgrade kubernetes-mixin #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5eccf05
Use kubernetes-mixin master
Duologic Mar 6, 2020
bb607df
Remove obsolete dashboard overrides
Duologic Mar 18, 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
2 changes: 1 addition & 1 deletion prometheus-ksonnet/jsonnetfile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"subdir": ""
}
},
"version": "release-0.1"
"version": "master"
Copy link
Contributor

@mplzik mplzik Mar 27, 2020

Choose a reason for hiding this comment

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

nit: this sounds like a floating label that might change quite a lot -- is that ok?

Copy link
Contributor Author

@Duologic Duologic Mar 27, 2020

Choose a reason for hiding this comment

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

The point is not a nit. As @malcolmholmes also pointed out to me, we should not force a new version just because we upgraded. Fortunately, this is not much of a problem because of how jb (0.2.0 at least) works: it doesn't by default install/vendor dependencies of dependencies, because of this it is likely a conscious decision of downstream to vendor it in or not.

Copy link
Contributor Author

@Duologic Duologic Mar 27, 2020

Choose a reason for hiding this comment

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

As to justify the changes specific to our environment, the overrides and the version 'release-0.1' here were originally because we didn't upgrade. This PR should set things right.

Copy link
Contributor

@malcolmholmes malcolmholmes Mar 31, 2020

Choose a reason for hiding this comment

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

Yep, this was a locking back for Grafana Labs. This sets this right.

},
{
"name": "prometheus-mixin",
Expand Down
17 changes: 1 addition & 16 deletions prometheus-ksonnet/prometheus-ksonnet.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,4 @@
(import 'prometheus-mixin/mixin.libsonnet') +
(import 'alertmanager-mixin/mixin.libsonnet') +
(import 'node-mixin/mixin.libsonnet') +
(import 'lib/config.libsonnet') +
{
// Mark obsolete node-related dashboards from the k8s mixin as
// hidden.
// Once we can use the current version of the k8s mixin, those
// overrides can be removed.
// (Note: In jsonnet, you cannot easily remove a field from
// a tuple. Marking it as hidden is a hack suggested by
// @sparkprime himself. See https://github.com/google/jsonnet/issues/312
// for details.)
grafanaDashboards+:: {
'k8s-cluster-rsrc-use.json':: super['k8s-cluster-rsrc-use.json'],
'k8s-node-rsrc-use.json':: super['k8s-node-rsrc-use.json'],
'k8s-multicluster-rsrc-use.json':: super['k8s-multicluster-rsrc-use.json'],
},
}
(import 'lib/config.libsonnet')