diff --git a/docs/API/query/expr/TypeClassicConditions/index.md b/docs/API/query/expr/TypeClassicConditions/index.md
index 5678c5e5..e2b1f595 100644
--- a/docs/API/query/expr/TypeClassicConditions/index.md
+++ b/docs/API/query/expr/TypeClassicConditions/index.md
@@ -23,6 +23,7 @@ grafonnet.query.expr.TypeClassicConditions
 * [`fn withTimeRangeMixin(value)`](#fn-withtimerangemixin)
 * [`fn withType()`](#fn-withtype)
 * [`obj datasource`](#obj-datasource)
+  * [`fn withApiVersion(value)`](#fn-datasourcewithapiversion)
   * [`fn withType()`](#fn-datasourcewithtype)
   * [`fn withUid(value)`](#fn-datasourcewithuid)
 * [`obj resultAssertions`](#obj-resultassertions)
@@ -202,6 +203,17 @@ withType()
 ### obj datasource
 
 
+#### fn datasource.withApiVersion
+
+```jsonnet
+datasource.withApiVersion(value)
+```
+
+PARAMETERS:
+
+* **value** (`string`)
+
+The apiserver version
 #### fn datasource.withType
 
 ```jsonnet
@@ -220,7 +232,7 @@ PARAMETERS:
 
 * **value** (`string`)
 
-Datasource UID
+Datasource UID (NOTE: name in k8s)
 ### obj resultAssertions
 
 
diff --git a/docs/API/query/expr/TypeMath.md b/docs/API/query/expr/TypeMath.md
index 705953ec..a8b85d20 100644
--- a/docs/API/query/expr/TypeMath.md
+++ b/docs/API/query/expr/TypeMath.md
@@ -18,6 +18,7 @@ grafonnet.query.expr.TypeMath
 * [`fn withTimeRangeMixin(value)`](#fn-withtimerangemixin)
 * [`fn withType()`](#fn-withtype)
 * [`obj datasource`](#obj-datasource)
+  * [`fn withApiVersion(value)`](#fn-datasourcewithapiversion)
   * [`fn withType()`](#fn-datasourcewithtype)
   * [`fn withUid(value)`](#fn-datasourcewithuid)
 * [`obj resultAssertions`](#obj-resultassertions)
@@ -186,6 +187,17 @@ withType()
 ### obj datasource
 
 
+#### fn datasource.withApiVersion
+
+```jsonnet
+datasource.withApiVersion(value)
+```
+
+PARAMETERS:
+
+* **value** (`string`)
+
+The apiserver version
 #### fn datasource.withType
 
 ```jsonnet
@@ -204,7 +216,7 @@ PARAMETERS:
 
 * **value** (`string`)
 
-Datasource UID
+Datasource UID (NOTE: name in k8s)
 ### obj resultAssertions
 
 
diff --git a/docs/API/query/expr/TypeReduce.md b/docs/API/query/expr/TypeReduce.md
index f918e40c..6ba5d521 100644
--- a/docs/API/query/expr/TypeReduce.md
+++ b/docs/API/query/expr/TypeReduce.md
@@ -21,6 +21,7 @@ grafonnet.query.expr.TypeReduce
 * [`fn withTimeRangeMixin(value)`](#fn-withtimerangemixin)
 * [`fn withType()`](#fn-withtype)
 * [`obj datasource`](#obj-datasource)
+  * [`fn withApiVersion(value)`](#fn-datasourcewithapiversion)
   * [`fn withType()`](#fn-datasourcewithtype)
   * [`fn withUid(value)`](#fn-datasourcewithuid)
 * [`obj resultAssertions`](#obj-resultassertions)
@@ -233,6 +234,17 @@ withType()
 ### obj datasource
 
 
+#### fn datasource.withApiVersion
+
+```jsonnet
+datasource.withApiVersion(value)
+```
+
+PARAMETERS:
+
+* **value** (`string`)
+
+The apiserver version
 #### fn datasource.withType
 
 ```jsonnet
@@ -251,7 +263,7 @@ PARAMETERS:
 
 * **value** (`string`)
 
-Datasource UID
+Datasource UID (NOTE: name in k8s)
 ### obj resultAssertions
 
 
diff --git a/docs/API/query/expr/TypeResample.md b/docs/API/query/expr/TypeResample.md
index de08c47c..c1162c0a 100644
--- a/docs/API/query/expr/TypeResample.md
+++ b/docs/API/query/expr/TypeResample.md
@@ -21,6 +21,7 @@ grafonnet.query.expr.TypeResample
 * [`fn withUpsampler(value)`](#fn-withupsampler)
 * [`fn withWindow(value)`](#fn-withwindow)
 * [`obj datasource`](#obj-datasource)
+  * [`fn withApiVersion(value)`](#fn-datasourcewithapiversion)
   * [`fn withType()`](#fn-datasourcewithtype)
   * [`fn withUid(value)`](#fn-datasourcewithuid)
 * [`obj resultAssertions`](#obj-resultassertions)
@@ -235,6 +236,17 @@ The time duration
 ### obj datasource
 
 
+#### fn datasource.withApiVersion
+
+```jsonnet
+datasource.withApiVersion(value)
+```
+
+PARAMETERS:
+
+* **value** (`string`)
+
+The apiserver version
 #### fn datasource.withType
 
 ```jsonnet
@@ -253,7 +265,7 @@ PARAMETERS:
 
 * **value** (`string`)
 
-Datasource UID
+Datasource UID (NOTE: name in k8s)
 ### obj resultAssertions
 
 
diff --git a/docs/API/query/expr/TypeSql.md b/docs/API/query/expr/TypeSql.md
index 97c38517..f0a46396 100644
--- a/docs/API/query/expr/TypeSql.md
+++ b/docs/API/query/expr/TypeSql.md
@@ -18,6 +18,7 @@ grafonnet.query.expr.TypeSql
 * [`fn withTimeRangeMixin(value)`](#fn-withtimerangemixin)
 * [`fn withType()`](#fn-withtype)
 * [`obj datasource`](#obj-datasource)
+  * [`fn withApiVersion(value)`](#fn-datasourcewithapiversion)
   * [`fn withType()`](#fn-datasourcewithtype)
   * [`fn withUid(value)`](#fn-datasourcewithuid)
 * [`obj resultAssertions`](#obj-resultassertions)
@@ -186,6 +187,17 @@ withType()
 ### obj datasource
 
 
+#### fn datasource.withApiVersion
+
+```jsonnet
+datasource.withApiVersion(value)
+```
+
+PARAMETERS:
+
+* **value** (`string`)
+
+The apiserver version
 #### fn datasource.withType
 
 ```jsonnet
@@ -204,7 +216,7 @@ PARAMETERS:
 
 * **value** (`string`)
 
-Datasource UID
+Datasource UID (NOTE: name in k8s)
 ### obj resultAssertions
 
 
diff --git a/docs/API/query/expr/TypeThreshold/index.md b/docs/API/query/expr/TypeThreshold/index.md
index 9c020f81..e2e47f1d 100644
--- a/docs/API/query/expr/TypeThreshold/index.md
+++ b/docs/API/query/expr/TypeThreshold/index.md
@@ -24,6 +24,7 @@ grafonnet.query.expr.TypeThreshold
 * [`fn withTimeRangeMixin(value)`](#fn-withtimerangemixin)
 * [`fn withType()`](#fn-withtype)
 * [`obj datasource`](#obj-datasource)
+  * [`fn withApiVersion(value)`](#fn-datasourcewithapiversion)
   * [`fn withType()`](#fn-datasourcewithtype)
   * [`fn withUid(value)`](#fn-datasourcewithuid)
 * [`obj resultAssertions`](#obj-resultassertions)
@@ -214,6 +215,17 @@ withType()
 ### obj datasource
 
 
+#### fn datasource.withApiVersion
+
+```jsonnet
+datasource.withApiVersion(value)
+```
+
+PARAMETERS:
+
+* **value** (`string`)
+
+The apiserver version
 #### fn datasource.withType
 
 ```jsonnet
@@ -232,7 +244,7 @@ PARAMETERS:
 
 * **value** (`string`)
 
-Datasource UID
+Datasource UID (NOTE: name in k8s)
 ### obj resultAssertions
 
 
diff --git a/gen/grafonnet-v11.0.0/docs/query/expr/TypeClassicConditions/index.md b/gen/grafonnet-v11.0.0/docs/query/expr/TypeClassicConditions/index.md
index 5678c5e5..e2b1f595 100644
--- a/gen/grafonnet-v11.0.0/docs/query/expr/TypeClassicConditions/index.md
+++ b/gen/grafonnet-v11.0.0/docs/query/expr/TypeClassicConditions/index.md
@@ -23,6 +23,7 @@ grafonnet.query.expr.TypeClassicConditions
 * [`fn withTimeRangeMixin(value)`](#fn-withtimerangemixin)
 * [`fn withType()`](#fn-withtype)
 * [`obj datasource`](#obj-datasource)
+  * [`fn withApiVersion(value)`](#fn-datasourcewithapiversion)
   * [`fn withType()`](#fn-datasourcewithtype)
   * [`fn withUid(value)`](#fn-datasourcewithuid)
 * [`obj resultAssertions`](#obj-resultassertions)
@@ -202,6 +203,17 @@ withType()
 ### obj datasource
 
 
+#### fn datasource.withApiVersion
+
+```jsonnet
+datasource.withApiVersion(value)
+```
+
+PARAMETERS:
+
+* **value** (`string`)
+
+The apiserver version
 #### fn datasource.withType
 
 ```jsonnet
@@ -220,7 +232,7 @@ PARAMETERS:
 
 * **value** (`string`)
 
-Datasource UID
+Datasource UID (NOTE: name in k8s)
 ### obj resultAssertions
 
 
diff --git a/gen/grafonnet-v11.0.0/docs/query/expr/TypeMath.md b/gen/grafonnet-v11.0.0/docs/query/expr/TypeMath.md
index 705953ec..a8b85d20 100644
--- a/gen/grafonnet-v11.0.0/docs/query/expr/TypeMath.md
+++ b/gen/grafonnet-v11.0.0/docs/query/expr/TypeMath.md
@@ -18,6 +18,7 @@ grafonnet.query.expr.TypeMath
 * [`fn withTimeRangeMixin(value)`](#fn-withtimerangemixin)
 * [`fn withType()`](#fn-withtype)
 * [`obj datasource`](#obj-datasource)
+  * [`fn withApiVersion(value)`](#fn-datasourcewithapiversion)
   * [`fn withType()`](#fn-datasourcewithtype)
   * [`fn withUid(value)`](#fn-datasourcewithuid)
 * [`obj resultAssertions`](#obj-resultassertions)
@@ -186,6 +187,17 @@ withType()
 ### obj datasource
 
 
+#### fn datasource.withApiVersion
+
+```jsonnet
+datasource.withApiVersion(value)
+```
+
+PARAMETERS:
+
+* **value** (`string`)
+
+The apiserver version
 #### fn datasource.withType
 
 ```jsonnet
@@ -204,7 +216,7 @@ PARAMETERS:
 
 * **value** (`string`)
 
-Datasource UID
+Datasource UID (NOTE: name in k8s)
 ### obj resultAssertions
 
 
diff --git a/gen/grafonnet-v11.0.0/docs/query/expr/TypeReduce.md b/gen/grafonnet-v11.0.0/docs/query/expr/TypeReduce.md
index f918e40c..6ba5d521 100644
--- a/gen/grafonnet-v11.0.0/docs/query/expr/TypeReduce.md
+++ b/gen/grafonnet-v11.0.0/docs/query/expr/TypeReduce.md
@@ -21,6 +21,7 @@ grafonnet.query.expr.TypeReduce
 * [`fn withTimeRangeMixin(value)`](#fn-withtimerangemixin)
 * [`fn withType()`](#fn-withtype)
 * [`obj datasource`](#obj-datasource)
+  * [`fn withApiVersion(value)`](#fn-datasourcewithapiversion)
   * [`fn withType()`](#fn-datasourcewithtype)
   * [`fn withUid(value)`](#fn-datasourcewithuid)
 * [`obj resultAssertions`](#obj-resultassertions)
@@ -233,6 +234,17 @@ withType()
 ### obj datasource
 
 
+#### fn datasource.withApiVersion
+
+```jsonnet
+datasource.withApiVersion(value)
+```
+
+PARAMETERS:
+
+* **value** (`string`)
+
+The apiserver version
 #### fn datasource.withType
 
 ```jsonnet
@@ -251,7 +263,7 @@ PARAMETERS:
 
 * **value** (`string`)
 
-Datasource UID
+Datasource UID (NOTE: name in k8s)
 ### obj resultAssertions
 
 
diff --git a/gen/grafonnet-v11.0.0/docs/query/expr/TypeResample.md b/gen/grafonnet-v11.0.0/docs/query/expr/TypeResample.md
index de08c47c..c1162c0a 100644
--- a/gen/grafonnet-v11.0.0/docs/query/expr/TypeResample.md
+++ b/gen/grafonnet-v11.0.0/docs/query/expr/TypeResample.md
@@ -21,6 +21,7 @@ grafonnet.query.expr.TypeResample
 * [`fn withUpsampler(value)`](#fn-withupsampler)
 * [`fn withWindow(value)`](#fn-withwindow)
 * [`obj datasource`](#obj-datasource)
+  * [`fn withApiVersion(value)`](#fn-datasourcewithapiversion)
   * [`fn withType()`](#fn-datasourcewithtype)
   * [`fn withUid(value)`](#fn-datasourcewithuid)
 * [`obj resultAssertions`](#obj-resultassertions)
@@ -235,6 +236,17 @@ The time duration
 ### obj datasource
 
 
+#### fn datasource.withApiVersion
+
+```jsonnet
+datasource.withApiVersion(value)
+```
+
+PARAMETERS:
+
+* **value** (`string`)
+
+The apiserver version
 #### fn datasource.withType
 
 ```jsonnet
@@ -253,7 +265,7 @@ PARAMETERS:
 
 * **value** (`string`)
 
-Datasource UID
+Datasource UID (NOTE: name in k8s)
 ### obj resultAssertions
 
 
diff --git a/gen/grafonnet-v11.0.0/docs/query/expr/TypeSql.md b/gen/grafonnet-v11.0.0/docs/query/expr/TypeSql.md
index 97c38517..f0a46396 100644
--- a/gen/grafonnet-v11.0.0/docs/query/expr/TypeSql.md
+++ b/gen/grafonnet-v11.0.0/docs/query/expr/TypeSql.md
@@ -18,6 +18,7 @@ grafonnet.query.expr.TypeSql
 * [`fn withTimeRangeMixin(value)`](#fn-withtimerangemixin)
 * [`fn withType()`](#fn-withtype)
 * [`obj datasource`](#obj-datasource)
+  * [`fn withApiVersion(value)`](#fn-datasourcewithapiversion)
   * [`fn withType()`](#fn-datasourcewithtype)
   * [`fn withUid(value)`](#fn-datasourcewithuid)
 * [`obj resultAssertions`](#obj-resultassertions)
@@ -186,6 +187,17 @@ withType()
 ### obj datasource
 
 
+#### fn datasource.withApiVersion
+
+```jsonnet
+datasource.withApiVersion(value)
+```
+
+PARAMETERS:
+
+* **value** (`string`)
+
+The apiserver version
 #### fn datasource.withType
 
 ```jsonnet
@@ -204,7 +216,7 @@ PARAMETERS:
 
 * **value** (`string`)
 
-Datasource UID
+Datasource UID (NOTE: name in k8s)
 ### obj resultAssertions
 
 
diff --git a/gen/grafonnet-v11.0.0/docs/query/expr/TypeThreshold/index.md b/gen/grafonnet-v11.0.0/docs/query/expr/TypeThreshold/index.md
index 9c020f81..e2e47f1d 100644
--- a/gen/grafonnet-v11.0.0/docs/query/expr/TypeThreshold/index.md
+++ b/gen/grafonnet-v11.0.0/docs/query/expr/TypeThreshold/index.md
@@ -24,6 +24,7 @@ grafonnet.query.expr.TypeThreshold
 * [`fn withTimeRangeMixin(value)`](#fn-withtimerangemixin)
 * [`fn withType()`](#fn-withtype)
 * [`obj datasource`](#obj-datasource)
+  * [`fn withApiVersion(value)`](#fn-datasourcewithapiversion)
   * [`fn withType()`](#fn-datasourcewithtype)
   * [`fn withUid(value)`](#fn-datasourcewithuid)
 * [`obj resultAssertions`](#obj-resultassertions)
@@ -214,6 +215,17 @@ withType()
 ### obj datasource
 
 
+#### fn datasource.withApiVersion
+
+```jsonnet
+datasource.withApiVersion(value)
+```
+
+PARAMETERS:
+
+* **value** (`string`)
+
+The apiserver version
 #### fn datasource.withType
 
 ```jsonnet
@@ -232,7 +244,7 @@ PARAMETERS:
 
 * **value** (`string`)
 
-Datasource UID
+Datasource UID (NOTE: name in k8s)
 ### obj resultAssertions
 
 
diff --git a/gen/grafonnet-v11.0.0/query/expr.libsonnet b/gen/grafonnet-v11.0.0/query/expr.libsonnet
index e181b171..fa34bc8a 100644
--- a/gen/grafonnet-v11.0.0/query/expr.libsonnet
+++ b/gen/grafonnet-v11.0.0/query/expr.libsonnet
@@ -13,13 +13,19 @@
       },
       datasource+:
         {
+          '#withApiVersion': { 'function': { args: [{ default: null, enums: null, name: 'value', type: ['string'] }], help: 'The apiserver version' } },
+          withApiVersion(value): {
+            datasource+: {
+              apiVersion: value,
+            },
+          },
           '#withType': { 'function': { args: [], help: 'The datasource plugin type' } },
           withType(): {
             datasource+: {
               type: '__expr__',
             },
           },
-          '#withUid': { 'function': { args: [{ default: null, enums: null, name: 'value', type: ['string'] }], help: 'Datasource UID' } },
+          '#withUid': { 'function': { args: [{ default: null, enums: null, name: 'value', type: ['string'] }], help: 'Datasource UID (NOTE: name in k8s)' } },
           withUid(value): {
             datasource+: {
               uid: value,
@@ -131,13 +137,19 @@
       },
       datasource+:
         {
+          '#withApiVersion': { 'function': { args: [{ default: null, enums: null, name: 'value', type: ['string'] }], help: 'The apiserver version' } },
+          withApiVersion(value): {
+            datasource+: {
+              apiVersion: value,
+            },
+          },
           '#withType': { 'function': { args: [], help: 'The datasource plugin type' } },
           withType(): {
             datasource+: {
               type: '__expr__',
             },
           },
-          '#withUid': { 'function': { args: [{ default: null, enums: null, name: 'value', type: ['string'] }], help: 'Datasource UID' } },
+          '#withUid': { 'function': { args: [{ default: null, enums: null, name: 'value', type: ['string'] }], help: 'Datasource UID (NOTE: name in k8s)' } },
           withUid(value): {
             datasource+: {
               uid: value,
@@ -276,13 +288,19 @@
       },
       datasource+:
         {
+          '#withApiVersion': { 'function': { args: [{ default: null, enums: null, name: 'value', type: ['string'] }], help: 'The apiserver version' } },
+          withApiVersion(value): {
+            datasource+: {
+              apiVersion: value,
+            },
+          },
           '#withType': { 'function': { args: [], help: 'The datasource plugin type' } },
           withType(): {
             datasource+: {
               type: '__expr__',
             },
           },
-          '#withUid': { 'function': { args: [{ default: null, enums: null, name: 'value', type: ['string'] }], help: 'Datasource UID' } },
+          '#withUid': { 'function': { args: [{ default: null, enums: null, name: 'value', type: ['string'] }], help: 'Datasource UID (NOTE: name in k8s)' } },
           withUid(value): {
             datasource+: {
               uid: value,
@@ -522,13 +540,19 @@
       },
       datasource+:
         {
+          '#withApiVersion': { 'function': { args: [{ default: null, enums: null, name: 'value', type: ['string'] }], help: 'The apiserver version' } },
+          withApiVersion(value): {
+            datasource+: {
+              apiVersion: value,
+            },
+          },
           '#withType': { 'function': { args: [], help: 'The datasource plugin type' } },
           withType(): {
             datasource+: {
               type: '__expr__',
             },
           },
-          '#withUid': { 'function': { args: [{ default: null, enums: null, name: 'value', type: ['string'] }], help: 'Datasource UID' } },
+          '#withUid': { 'function': { args: [{ default: null, enums: null, name: 'value', type: ['string'] }], help: 'Datasource UID (NOTE: name in k8s)' } },
           withUid(value): {
             datasource+: {
               uid: value,
@@ -732,13 +756,19 @@
       },
       datasource+:
         {
+          '#withApiVersion': { 'function': { args: [{ default: null, enums: null, name: 'value', type: ['string'] }], help: 'The apiserver version' } },
+          withApiVersion(value): {
+            datasource+: {
+              apiVersion: value,
+            },
+          },
           '#withType': { 'function': { args: [], help: 'The datasource plugin type' } },
           withType(): {
             datasource+: {
               type: '__expr__',
             },
           },
-          '#withUid': { 'function': { args: [{ default: null, enums: null, name: 'value', type: ['string'] }], help: 'Datasource UID' } },
+          '#withUid': { 'function': { args: [{ default: null, enums: null, name: 'value', type: ['string'] }], help: 'Datasource UID (NOTE: name in k8s)' } },
           withUid(value): {
             datasource+: {
               uid: value,
@@ -850,13 +880,19 @@
       },
       datasource+:
         {
+          '#withApiVersion': { 'function': { args: [{ default: null, enums: null, name: 'value', type: ['string'] }], help: 'The apiserver version' } },
+          withApiVersion(value): {
+            datasource+: {
+              apiVersion: value,
+            },
+          },
           '#withType': { 'function': { args: [], help: 'The datasource plugin type' } },
           withType(): {
             datasource+: {
               type: '__expr__',
             },
           },
-          '#withUid': { 'function': { args: [{ default: null, enums: null, name: 'value', type: ['string'] }], help: 'Datasource UID' } },
+          '#withUid': { 'function': { args: [{ default: null, enums: null, name: 'value', type: ['string'] }], help: 'Datasource UID (NOTE: name in k8s)' } },
           withUid(value): {
             datasource+: {
               uid: value,