deps: use new grafonnet library

DifferentialOrange · DifferentialOrange · commit 15d7639ef3ce · 2023-06-23T13:25:21.000+03:00
grafana/grafonnet-lib is deprecated now in favor of grafana/grafonnet. Part of #215
diff --git a/dashboard/build/dashboard.libsonnet b/dashboard/build/dashboard.libsonnet
@@ -1,4 +1,4 @@
-local grafana = import 'grafonnet/grafana.libsonnet';
+local grafana = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';
 
 local dashboard = import 'dashboard/dashboard.libsonnet';
 local panels_common = import 'dashboard/panels/common.libsonnet';
diff --git a/dashboard/panels/cluster.libsonnet b/dashboard/panels/cluster.libsonnet
@@ -1,4 +1,4 @@
-local grafana = import 'grafonnet/grafana.libsonnet';
+local grafana = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';
 
 local timeseries = import 'dashboard/grafana/timeseries.libsonnet';
 local common = import 'dashboard/panels/common.libsonnet';
diff --git a/dashboard/panels/common.libsonnet b/dashboard/panels/common.libsonnet
@@ -1,4 +1,4 @@
-local grafana = import 'grafonnet/grafana.libsonnet';
+local grafana = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';
 
 local variable = import 'dashboard/variable.libsonnet';
 
diff --git a/dashboard/panels/cpu.libsonnet b/dashboard/panels/cpu.libsonnet
@@ -1,4 +1,4 @@
-local grafana = import 'grafonnet/grafana.libsonnet';
+local grafana = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';
 
 local common = import 'dashboard/panels/common.libsonnet';
 local variable = import 'dashboard/variable.libsonnet';
diff --git a/dashboard/panels/crud.libsonnet b/dashboard/panels/crud.libsonnet
@@ -1,4 +1,4 @@
-local grafana = import 'grafonnet/grafana.libsonnet';
+local grafana = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';
 
 local common = import 'dashboard/panels/common.libsonnet';
 local variable = import 'dashboard/variable.libsonnet';
diff --git a/dashboard/panels/expirationd.libsonnet b/dashboard/panels/expirationd.libsonnet
@@ -1,4 +1,4 @@
-local grafana = import 'grafonnet/grafana.libsonnet';
+local grafana = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';
 
 local common = import 'dashboard/panels/common.libsonnet';
 local variable = import 'dashboard/variable.libsonnet';
diff --git a/dashboard/panels/http.libsonnet b/dashboard/panels/http.libsonnet
@@ -1,4 +1,4 @@
-local grafana = import 'grafonnet/grafana.libsonnet';
+local grafana = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';
 
 local common = import 'dashboard/panels/common.libsonnet';
 local variable = import 'dashboard/variable.libsonnet';
diff --git a/dashboard/panels/mvcc.libsonnet b/dashboard/panels/mvcc.libsonnet
@@ -1,4 +1,4 @@
-local grafana = import 'grafonnet/grafana.libsonnet';
+local grafana = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';
 
 local common = import 'dashboard/panels/common.libsonnet';
 local variable = import 'dashboard/variable.libsonnet';
diff --git a/dashboard/panels/net.libsonnet b/dashboard/panels/net.libsonnet
@@ -1,4 +1,4 @@
-local grafana = import 'grafonnet/grafana.libsonnet';
+local grafana = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';
 
 local common = import 'dashboard/panels/common.libsonnet';
 local variable = import 'dashboard/variable.libsonnet';
diff --git a/dashboard/panels/operations.libsonnet b/dashboard/panels/operations.libsonnet
@@ -1,4 +1,4 @@
-local grafana = import 'grafonnet/grafana.libsonnet';
+local grafana = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';
 
 local common = import 'dashboard/panels/common.libsonnet';
 local variable = import 'dashboard/variable.libsonnet';
diff --git a/dashboard/panels/replication.libsonnet b/dashboard/panels/replication.libsonnet
@@ -1,4 +1,4 @@
-local grafana = import 'grafonnet/grafana.libsonnet';
+local grafana = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';
 
 local timeseries = import 'dashboard/grafana/timeseries.libsonnet';
 local common = import 'dashboard/panels/common.libsonnet';
diff --git a/dashboard/panels/slab.libsonnet b/dashboard/panels/slab.libsonnet
@@ -1,4 +1,4 @@
-local grafana = import 'grafonnet/grafana.libsonnet';
+local grafana = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';
 
 local common = import 'dashboard/panels/common.libsonnet';
 
diff --git a/dashboard/panels/space.libsonnet b/dashboard/panels/space.libsonnet
@@ -1,4 +1,4 @@
-local grafana = import 'grafonnet/grafana.libsonnet';
+local grafana = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';
 
 local common = import 'dashboard/panels/common.libsonnet';
 local variable = import 'dashboard/variable.libsonnet';
diff --git a/dashboard/panels/tdg/file_connectors.libsonnet b/dashboard/panels/tdg/file_connectors.libsonnet
@@ -1,4 +1,4 @@
-local grafana = import 'grafonnet/grafana.libsonnet';
+local grafana = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';
 
 local common_utils = import 'dashboard/panels/common.libsonnet';
 local variable = import 'dashboard/variable.libsonnet';
diff --git a/dashboard/panels/tdg/graphql.libsonnet b/dashboard/panels/tdg/graphql.libsonnet
@@ -1,4 +1,4 @@
-local grafana = import 'grafonnet/grafana.libsonnet';
+local grafana = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';
 
 local common_utils = import 'dashboard/panels/common.libsonnet';
 local variable = import 'dashboard/variable.libsonnet';
diff --git a/dashboard/panels/tdg/iproto.libsonnet b/dashboard/panels/tdg/iproto.libsonnet
@@ -1,4 +1,4 @@
-local grafana = import 'grafonnet/grafana.libsonnet';
+local grafana = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';
 
 local common_utils = import 'dashboard/panels/common.libsonnet';
 local variable = import 'dashboard/variable.libsonnet';
diff --git a/dashboard/panels/tdg/kafka/brokers.libsonnet b/dashboard/panels/tdg/kafka/brokers.libsonnet
@@ -1,4 +1,4 @@
-local grafana = import 'grafonnet/grafana.libsonnet';
+local grafana = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';
 
 local common_utils = import 'dashboard/panels/common.libsonnet';
 local variable = import 'dashboard/variable.libsonnet';
diff --git a/dashboard/panels/tdg/kafka/topics.libsonnet b/dashboard/panels/tdg/kafka/topics.libsonnet
@@ -1,4 +1,4 @@
-local grafana = import 'grafonnet/grafana.libsonnet';
+local grafana = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';
 
 local common_utils = import 'dashboard/panels/common.libsonnet';
 local variable = import 'dashboard/variable.libsonnet';
diff --git a/dashboard/panels/tdg/kafka/utils.libsonnet b/dashboard/panels/tdg/kafka/utils.libsonnet
@@ -1,4 +1,4 @@
-local grafana = import 'grafonnet/grafana.libsonnet';
+local grafana = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';
 
 local common_utils = import 'dashboard/panels/common.libsonnet';
 local variable = import 'dashboard/variable.libsonnet';
diff --git a/dashboard/panels/tdg/rest_api.libsonnet b/dashboard/panels/tdg/rest_api.libsonnet
@@ -1,4 +1,4 @@
-local grafana = import 'grafonnet/grafana.libsonnet';
+local grafana = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';
 
 local common_utils = import 'dashboard/panels/common.libsonnet';
 local variable = import 'dashboard/variable.libsonnet';
diff --git a/dashboard/panels/tdg/tasks.libsonnet b/dashboard/panels/tdg/tasks.libsonnet
@@ -1,4 +1,4 @@
-local grafana = import 'grafonnet/grafana.libsonnet';
+local grafana = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';
 
 local common_utils = import 'dashboard/panels/common.libsonnet';
 local variable = import 'dashboard/variable.libsonnet';
diff --git a/dashboard/panels/tdg/tuples.libsonnet b/dashboard/panels/tdg/tuples.libsonnet
@@ -1,4 +1,4 @@
-local grafana = import 'grafonnet/grafana.libsonnet';
+local grafana = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';
 
 local common_utils = import 'dashboard/panels/common.libsonnet';
 local variable = import 'dashboard/variable.libsonnet';
diff --git a/dashboard/panels/vinyl.libsonnet b/dashboard/panels/vinyl.libsonnet
@@ -1,4 +1,4 @@
-local grafana = import 'grafonnet/grafana.libsonnet';
+local grafana = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';
 
 local common = import 'dashboard/panels/common.libsonnet';
 local variable = import 'dashboard/variable.libsonnet';
diff --git a/jsonnetfile.json b/jsonnetfile.json
@@ -4,11 +4,11 @@
     {
       "source": {
         "git": {
-          "remote": "https://github.com/grafana/grafonnet-lib",
-          "subdir": "grafonnet"
+          "remote": "https://github.com/grafana/grafonnet.git",
+          "subdir": "gen/grafonnet-latest"
         }
       },
-      "version": "master"
+      "version": "main"
     }
   ],
   "legacyImports": true
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
@@ -4,12 +4,72 @@
     {
       "source": {
         "git": {
-          "remote": "https://github.com/grafana/grafonnet-lib",
-          "subdir": "grafonnet"
+          "remote": "https://github.com/crdsonnet/crdsonnet.git",
+          "subdir": "crdsonnet"
         }
       },
-      "version": "cc1626a1b4dee45c99b78ddd9714dfd5f5d7816e",
-      "sum": "nkgrtMYPCq/YB4r3mKyToepaLhicwWnxDdGIodPpzz0="
+      "version": "af14e3b8e958e1e4155d67689bd9d38cb7169698",
+      "sum": "HH+GjMwZCo65Q4SBG2M2Ezz+RekZmc783vZsXvVyPOA="
+    },
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/grafana/grafonnet.git",
+          "subdir": "gen/grafonnet-latest"
+        }
+      },
+      "version": "df35a38b3f780a07a85e30b6f9a685bfd9215f09",
+      "sum": "IvPpzRwHyqJxomhjMJn13mNITiRnkaO4JvQfaSvqxXk="
+    },
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/grafana/grafonnet.git",
+          "subdir": "gen/grafonnet-v9.5.0"
+        }
+      },
+      "version": "df35a38b3f780a07a85e30b6f9a685bfd9215f09",
+      "sum": "F3Ousx+lyY9t1iIKQivcKTXcz6k+dvPaPTJUOl3BXto="
+    },
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/grafana/grafonnet.git",
+          "subdir": "grafonnet-base"
+        }
+      },
+      "version": "df35a38b3f780a07a85e30b6f9a685bfd9215f09",
+      "sum": "yEEbok/M9kkTRlw1NSZWZAiGG0PGrUJ7HXP0ang7GIU="
+    },
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/grafana/grok.git",
+          "subdir": "jsonnet/v9.5.0"
+        }
+      },
+      "version": "f6c0c4cd6fc1902eb4f920d82315767cd61deea4",
+      "sum": "gvlwq6BxVxxJwoXv2PUgLHL0/DKvfBZAQfdx72QWhXI="
+    },
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/jsonnet-libs/docsonnet.git",
+          "subdir": "doc-util"
+        }
+      },
+      "version": "ff76f6d8edde6366c6dcf81a356481b0e344566b",
+      "sum": "OxjkWDF0oHmwV52hhyoFW3bwtwgke8s/EOPNRiICPTI="
+    },
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/jsonnet-libs/xtd.git",
+          "subdir": ""
+        }
+      },
+      "version": "d1929c3c1728274424a21a617f1b82095685d640",
+      "sum": "DHqlMNfQH/eCWHbHD2Ouc/bH00AwTkCS86z6cgzQ7UI="
     }
   ],
   "legacyImports": false
diff --git a/tests/InfluxDB/dashboard_with_custom_panels.jsonnet b/tests/InfluxDB/dashboard_with_custom_panels.jsonnet
@@ -1,4 +1,4 @@
-local grafana = import 'grafonnet/grafana.libsonnet';
+local grafana = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';
 
 local config = import 'dashboard/build/config.libsonnet';
 local dashboard = import 'dashboard/build/dashboard.libsonnet';
diff --git a/tests/Prometheus/dashboard_with_custom_panels.jsonnet b/tests/Prometheus/dashboard_with_custom_panels.jsonnet
@@ -1,4 +1,4 @@
-local grafana = import 'grafonnet/grafana.libsonnet';
+local grafana = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';
 
 local config = import 'dashboard/build/config.libsonnet';
 local dashboard = import 'dashboard/build/dashboard.libsonnet';

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-local grafana = import 'grafonnet/grafana.libsonnet';`
	`1`	`+local grafana = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';`
`2`	`2`
`3`	`3`	`local dashboard = import 'dashboard/dashboard.libsonnet';`
`4`	`4`	`local panels_common = import 'dashboard/panels/common.libsonnet';`
Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,11 @@`
`4`	`4`	`{`
`5`	`5`	`"source": {`
`6`	`6`	`"git": {`
`7`		`- "remote": "https://github.com/grafana/grafonnet-lib",`
`8`		`- "subdir": "grafonnet"`
	`7`	`+ "remote": "https://github.com/grafana/grafonnet.git",`
	`8`	`+ "subdir": "gen/grafonnet-latest"`
`9`	`9`	`}`
`10`	`10`	`},`
`11`		`- "version": "master"`
	`11`	`+ "version": "main"`
`12`	`12`	`}`
`13`	`13`	`],`
`14`	`14`	`"legacyImports": true`