From fabf273d306b1bbfb1300304437158c39ac55f39 Mon Sep 17 00:00:00 2001
From: Frederic Branczyk <fbranczyk@gmail.com>
Date: Thu, 30 Jan 2020 09:56:19 +0100
Subject: [PATCH] *: Fix jsonnet-bundler files
---
jsonnetfile.json | 4 +-
jsonnetfile.lock.json | 101 +++++++++++++++++++++++-------------------
2 files changed, 57 insertions(+), 48 deletions(-)
diff --git a/jsonnetfile.json b/jsonnetfile.json
index 67939804..ad5fe5bc 100644
--- a/jsonnetfile.json
+++ b/jsonnetfile.json
@@ -1,6 +1,7 @@
{
"dependencies": [
{
+ "name": "kube-prometheus",
"source": {
"local": {
"directory": "jsonnet/kube-prometheus"
@@ -8,6 +9,5 @@
},
"version": ""
}
- ],
- "legacyImports": true
+ ]
}
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index bbc16400..9cd28966 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -1,67 +1,71 @@
{
"dependencies": [
{
+ "name": "etcd-mixin",
"source": {
"git": {
- "remote": "https://github.com/brancz/kubernetes-grafana",
- "subdir": "grafana"
+ "remote": "https://github.com/coreos/etcd",
+ "subdir": "Documentation/etcd-mixin"
}
},
- "version": "539a90dbf63c812ad0194d8078dd776868a11c81",
- "sum": "b8faWX1qqLGyN67sA36oRqYZ5HX+tHBRMPtrWRqIysE="
+ "version": "53f15caf73b9285d6043009fa64c925d5a8f573c",
+ "sum": "Ko3qhNfC2vN/houLh6C0Ryacjv70gl0DVPGU/PQ4OD0="
},
{
+ "name": "grafana",
"source": {
"git": {
- "remote": "https://github.com/coreos/etcd",
- "subdir": "Documentation/etcd-mixin"
+ "remote": "https://github.com/brancz/kubernetes-grafana",
+ "subdir": "grafana"
}
},
- "version": "798c073b894a41a5296ef0266923fa54f61c36ae",
- "sum": "Ko3qhNfC2vN/houLh6C0Ryacjv70gl0DVPGU/PQ4OD0="
+ "version": "539a90dbf63c812ad0194d8078dd776868a11c81",
+ "sum": "b8faWX1qqLGyN67sA36oRqYZ5HX+tHBRMPtrWRqIysE="
},
{
+ "name": "grafana-builder",
"source": {
"git": {
- "remote": "https://github.com/coreos/prometheus-operator",
- "subdir": "jsonnet/prometheus-operator"
+ "remote": "https://github.com/grafana/jsonnet-libs",
+ "subdir": "grafana-builder"
}
},
- "version": "8d44e0990230144177f97cf62ae4f43b1c4e3168",
- "sum": "5U7/8MD3pF9O0YDTtUhg4vctkUBRVFxZxWUyhtNiBM8="
+ "version": "e92000a708ded5bde1dd332a8e7457d0b39b7928",
+ "sum": "slxrtftVDiTlQK22ertdfrg4Epnq97gdrLI63ftUfaE="
},
{
+ "name": "grafonnet",
"source": {
"git": {
"remote": "https://github.com/grafana/grafonnet-lib",
"subdir": "grafonnet"
}
},
- "version": "f3ee1d810858cf556d25f045b53cb0f1fd10b94e",
- "sum": "14YBZUP/cl8qi9u86xiuUS4eXQrEAam+4GSg6i9n9Ys="
+ "version": "c459106d2d2b583dd3a83f6c75eb52abee3af764",
+ "sum": "CeM3LRgUCUJTolTdMnerfMPGYmhClx7gX5ajrQVEY2Y="
},
{
+ "name": "ksonnet",
"source": {
"git": {
- "remote": "https://github.com/grafana/jsonnet-libs",
- "subdir": "grafana-builder"
+ "remote": "https://github.com/ksonnet/ksonnet-lib",
+ "subdir": ""
}
},
- "version": "e92000a708ded5bde1dd332a8e7457d0b39b7928",
- "sum": "slxrtftVDiTlQK22ertdfrg4Epnq97gdrLI63ftUfaE="
+ "version": "0d2f82676817bbf9e4acf6495b2090205f323b9f",
+ "sum": "h28BXZ7+vczxYJ2sCt8JuR9+yznRtU/iA6DCpQUrtEg="
},
{
+ "name": "kube-prometheus",
"source": {
- "git": {
- "remote": "https://github.com/ksonnet/ksonnet-lib",
- "subdir": ""
+ "local": {
+ "directory": "jsonnet/kube-prometheus"
}
},
- "version": "0d2f82676817bbf9e4acf6495b2090205f323b9f",
- "sum": "h28BXZ7+vczxYJ2sCt8JuR9+yznRtU/iA6DCpQUrtEg=",
- "name": "ksonnet"
+ "version": ""
},
{
+ "name": "kubernetes-mixin",
"source": {
"git": {
"remote": "https://github.com/kubernetes-monitoring/kubernetes-mixin",
@@ -72,54 +76,59 @@
"sum": "rMy/F8MHwyKuyud73q9vY8PrX6BEODTU9ela03iv9UY="
},
{
+ "name": "node-mixin",
"source": {
"git": {
- "remote": "https://github.com/kubernetes-monitoring/kubernetes-mixin",
- "subdir": "lib/promgrafonnet"
+ "remote": "https://github.com/prometheus/node_exporter",
+ "subdir": "docs/node-mixin"
}
},
- "version": "003c3e8db3aee2699b9e31fe8fd0cb906354a48f",
- "sum": "VhgBM39yv0f4bKv8VfGg4FXkg573evGDRalip9ypKbc="
+ "version": "9bb37873a8757508853b14e6048a9c3418f3d667",
+ "sum": "7vEamDTP9AApeiF4Zu9ZyXzDIs3rYHzwf9k7g8X+wsg="
},
{
+ "name": "prometheus",
"source": {
"git": {
- "remote": "https://github.com/metalmatze/slo-libsonnet",
- "subdir": "slo-libsonnet"
+ "remote": "https://github.com/prometheus/prometheus",
+ "subdir": "documentation/prometheus-mixin"
}
},
- "version": "437c402c5f3ad86c3c16db8471f1649284fef0ee",
- "sum": "2Zcyku1f558VrUpMaJnI78fahDksPLcS1idmxxwcQ7Q="
+ "version": "ddd49b743c1c03527064d38f4830258b4a6ccb27",
+ "sum": "u1YS9CVuBTcw2vks0PZbLb1gtlI/7bVGDVBZsjWFLTw="
},
{
+ "name": "prometheus-operator",
"source": {
"git": {
- "remote": "https://github.com/prometheus/node_exporter",
- "subdir": "docs/node-mixin"
+ "remote": "https://github.com/coreos/prometheus-operator",
+ "subdir": "jsonnet/prometheus-operator"
}
},
- "version": "04ad4b351058bc89e83702d149f2961efa989bf4",
- "sum": "7vEamDTP9AApeiF4Zu9ZyXzDIs3rYHzwf9k7g8X+wsg="
+ "version": "8d44e0990230144177f97cf62ae4f43b1c4e3168",
+ "sum": "5U7/8MD3pF9O0YDTtUhg4vctkUBRVFxZxWUyhtNiBM8="
},
{
+ "name": "promgrafonnet",
"source": {
"git": {
- "remote": "https://github.com/prometheus/prometheus",
- "subdir": "documentation/prometheus-mixin"
+ "remote": "https://github.com/kubernetes-monitoring/kubernetes-mixin",
+ "subdir": "lib/promgrafonnet"
}
},
- "version": "ddd49b743c1c03527064d38f4830258b4a6ccb27",
- "sum": "u1YS9CVuBTcw2vks0PZbLb1gtlI/7bVGDVBZsjWFLTw=",
- "name": "prometheus"
+ "version": "003c3e8db3aee2699b9e31fe8fd0cb906354a48f",
+ "sum": "VhgBM39yv0f4bKv8VfGg4FXkg573evGDRalip9ypKbc="
},
{
+ "name": "slo-libsonnet",
"source": {
- "local": {
- "directory": "jsonnet/kube-prometheus"
+ "git": {
+ "remote": "https://github.com/metalmatze/slo-libsonnet",
+ "subdir": "slo-libsonnet"
}
},
- "version": ""
+ "version": "437c402c5f3ad86c3c16db8471f1649284fef0ee",
+ "sum": "2Zcyku1f558VrUpMaJnI78fahDksPLcS1idmxxwcQ7Q="
}
- ],
- "legacyImports": false
+ ]
}
--
GitLab