From 77e76485c063c305f9732aa7124d9ca77bed572e Mon Sep 17 00:00:00 2001 From: Matthias Loibl Date: Tue, 20 Oct 2020 11:34:43 +0200 Subject: [PATCH] Use absolute jsonnet import paths This should be the way forward when importing libraries in jsonnet. It's closer to how Go imports look and makes it more obvious where packages live. This is not breaking anything, as the old imports were already symlinks to the now directly used directories. Signed-off-by: Matthias Loibl --- docs/node-mixin/dashboards/node.libsonnet | 4 ++-- docs/node-mixin/dashboards/use.libsonnet | 2 +- docs/node-mixin/jsonnetfile.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/node-mixin/dashboards/node.libsonnet b/docs/node-mixin/dashboards/node.libsonnet index 07dd1886..ceaa3aec 100644 --- a/docs/node-mixin/dashboards/node.libsonnet +++ b/docs/node-mixin/dashboards/node.libsonnet @@ -1,10 +1,10 @@ -local grafana = import 'grafonnet/grafana.libsonnet'; +local grafana = import 'github.com/grafana/grafonnet-lib/grafonnet/grafana.libsonnet'; local dashboard = grafana.dashboard; local row = grafana.row; local prometheus = grafana.prometheus; local template = grafana.template; local graphPanel = grafana.graphPanel; -local promgrafonnet = import 'promgrafonnet/promgrafonnet.libsonnet'; +local promgrafonnet = import 'github.com/kubernetes-monitoring/kubernetes-mixin/lib/promgrafonnet/promgrafonnet.libsonnet'; local gauge = promgrafonnet.gauge; { diff --git a/docs/node-mixin/dashboards/use.libsonnet b/docs/node-mixin/dashboards/use.libsonnet index 3c855a60..02282a56 100644 --- a/docs/node-mixin/dashboards/use.libsonnet +++ b/docs/node-mixin/dashboards/use.libsonnet @@ -1,4 +1,4 @@ -local g = import 'grafana-builder/grafana.libsonnet'; +local g = import 'github.com/grafana/jsonnet-libs/grafana-builder/grafana.libsonnet'; { grafanaDashboards+:: { diff --git a/docs/node-mixin/jsonnetfile.json b/docs/node-mixin/jsonnetfile.json index 8d343ae9..46ebffe4 100644 --- a/docs/node-mixin/jsonnetfile.json +++ b/docs/node-mixin/jsonnetfile.json @@ -29,5 +29,5 @@ "version": "master" } ], - "legacyImports": true + "legacyImports": false }