From e1e6dfb1f460731f726c242fde17c0b1619ff36e Mon Sep 17 00:00:00 2001 From: Duologic Date: Fri, 24 May 2024 11:30:02 +0200 Subject: [PATCH] fix: generate from v11.0.x branch --- Makefile | 20 ---------------- docs/API/panel/candlestick/index.md | 4 ++-- docs/API/panel/dashboardList/index.md | 13 ---------- docs/API/panel/table/index.md | 24 ------------------- docs/API/panel/timeSeries/index.md | 4 ++-- docs/API/panel/trend/index.md | 4 ++-- docs/API/query/tempo/index.md | 2 +- .../docs/panel/candlestick/index.md | 4 ++-- .../docs/panel/dashboardList/index.md | 13 ---------- .../docs/panel/table/index.md | 24 ------------------- .../docs/panel/timeSeries/index.md | 4 ++-- .../docs/panel/trend/index.md | 4 ++-- .../docs/query/tempo/index.md | 2 +- .../panel/candlestick.libsonnet | 4 ++-- .../panel/dashboardList.libsonnet | 6 ----- gen/grafonnet-v11.0.0/panel/table.libsonnet | 24 ------------------- .../panel/timeSeries.libsonnet | 4 ++-- gen/grafonnet-v11.0.0/panel/trend.libsonnet | 4 ++-- gen/grafonnet-v11.0.0/query/tempo.libsonnet | 2 +- scripts/generate.sh | 3 ++- 20 files changed, 23 insertions(+), 146 deletions(-) diff --git a/Makefile b/Makefile index d7caa233..feffad2f 100644 --- a/Makefile +++ b/Makefile @@ -8,26 +8,6 @@ gen/grafonnet-latest: ./scripts/generate.sh ${LATEST} && \ ./scripts/generate_latest.sh ${LATEST} -regenerate: gen/grafonnet-v* - -gen/grafonnet-v10.3.0: - ./scripts/generate.sh v10.3.0 - -gen/grafonnet-v10.2.0: - ./scripts/generate.sh v10.2.0 - -gen/grafonnet-v10.1.0: - ./scripts/generate.sh v10.1.0 - -gen/grafonnet-v10.0.0: - ./scripts/generate.sh v10.0.0 - -gen/grafonnet-v9.5.0: - ./scripts/generate.sh v9.5.0 - -gen/grafonnet-v9.4.0: - ./scripts/generate.sh v9.4.0 - localmkdocs: python -m venv .mkdocs/.venv; \ source .mkdocs/.venv/bin/activate; \ diff --git a/docs/API/panel/candlestick/index.md b/docs/API/panel/candlestick/index.md index 260c1250..9ad9263a 100644 --- a/docs/API/panel/candlestick/index.md +++ b/docs/API/panel/candlestick/index.md @@ -405,7 +405,7 @@ fieldConfig.defaults.custom.withInsertNulls(value) PARAMETERS: -* **value** (`boolean`,`number`) +* **value** (`boolean`,`integer`) ###### fn fieldConfig.defaults.custom.withInsertNullsMixin @@ -416,7 +416,7 @@ fieldConfig.defaults.custom.withInsertNullsMixin(value) PARAMETERS: -* **value** (`boolean`,`number`) +* **value** (`boolean`,`integer`) ###### fn fieldConfig.defaults.custom.withLineColor diff --git a/docs/API/panel/dashboardList/index.md b/docs/API/panel/dashboardList/index.md index 0f6501f0..a5139210 100644 --- a/docs/API/panel/dashboardList/index.md +++ b/docs/API/panel/dashboardList/index.md @@ -23,7 +23,6 @@ grafonnet.panel.dashboardList * [`fn withKeepTime(value=true)`](#fn-optionswithkeeptime) * [`fn withMaxItems(value=10)`](#fn-optionswithmaxitems) * [`fn withQuery(value="")`](#fn-optionswithquery) - * [`fn withShowFolderNames(value=true)`](#fn-optionswithshowfoldernames) * [`fn withShowHeadings(value=true)`](#fn-optionswithshowheadings) * [`fn withShowRecentlyViewed(value=true)`](#fn-optionswithshowrecentlyviewed) * [`fn withShowSearch(value=true)`](#fn-optionswithshowsearch) @@ -185,18 +184,6 @@ PARAMETERS: - default value: `""` -#### fn options.withShowFolderNames - -```jsonnet -options.withShowFolderNames(value=true) -``` - -PARAMETERS: - -* **value** (`boolean`) - - default value: `true` - - #### fn options.withShowHeadings ```jsonnet diff --git a/docs/API/panel/table/index.md b/docs/API/panel/table/index.md index e8d83f0f..d5c25b8b 100644 --- a/docs/API/panel/table/index.md +++ b/docs/API/panel/table/index.md @@ -83,8 +83,6 @@ grafonnet.panel.table * [`fn withHideFrom(value)`](#fn-fieldconfigdefaultscustomcelloptionstablesparklinecelloptionswithhidefrom) * [`fn withHideFromMixin(value)`](#fn-fieldconfigdefaultscustomcelloptionstablesparklinecelloptionswithhidefrommixin) * [`fn withHideValue(value=true)`](#fn-fieldconfigdefaultscustomcelloptionstablesparklinecelloptionswithhidevalue) - * [`fn withInsertNulls(value)`](#fn-fieldconfigdefaultscustomcelloptionstablesparklinecelloptionswithinsertnulls) - * [`fn withInsertNullsMixin(value)`](#fn-fieldconfigdefaultscustomcelloptionstablesparklinecelloptionswithinsertnullsmixin) * [`fn withLineColor(value)`](#fn-fieldconfigdefaultscustomcelloptionstablesparklinecelloptionswithlinecolor) * [`fn withLineInterpolation(value)`](#fn-fieldconfigdefaultscustomcelloptionstablesparklinecelloptionswithlineinterpolation) * [`fn withLineStyle(value)`](#fn-fieldconfigdefaultscustomcelloptionstablesparklinecelloptionswithlinestyle) @@ -868,28 +866,6 @@ PARAMETERS: - default value: `true` -######## fn fieldConfig.defaults.custom.cellOptions.TableSparklineCellOptions.withInsertNulls - -```jsonnet -fieldConfig.defaults.custom.cellOptions.TableSparklineCellOptions.withInsertNulls(value) -``` - -PARAMETERS: - -* **value** (`boolean`,`number`) - - -######## fn fieldConfig.defaults.custom.cellOptions.TableSparklineCellOptions.withInsertNullsMixin - -```jsonnet -fieldConfig.defaults.custom.cellOptions.TableSparklineCellOptions.withInsertNullsMixin(value) -``` - -PARAMETERS: - -* **value** (`boolean`,`number`) - - ######## fn fieldConfig.defaults.custom.cellOptions.TableSparklineCellOptions.withLineColor ```jsonnet diff --git a/docs/API/panel/timeSeries/index.md b/docs/API/panel/timeSeries/index.md index 0b30e977..fd6c263b 100644 --- a/docs/API/panel/timeSeries/index.md +++ b/docs/API/panel/timeSeries/index.md @@ -393,7 +393,7 @@ fieldConfig.defaults.custom.withInsertNulls(value) PARAMETERS: -* **value** (`boolean`,`number`) +* **value** (`boolean`,`integer`) ###### fn fieldConfig.defaults.custom.withInsertNullsMixin @@ -404,7 +404,7 @@ fieldConfig.defaults.custom.withInsertNullsMixin(value) PARAMETERS: -* **value** (`boolean`,`number`) +* **value** (`boolean`,`integer`) ###### fn fieldConfig.defaults.custom.withLineColor diff --git a/docs/API/panel/trend/index.md b/docs/API/panel/trend/index.md index c0f4ff29..f5e75a2a 100644 --- a/docs/API/panel/trend/index.md +++ b/docs/API/panel/trend/index.md @@ -388,7 +388,7 @@ fieldConfig.defaults.custom.withInsertNulls(value) PARAMETERS: -* **value** (`boolean`,`number`) +* **value** (`boolean`,`integer`) ###### fn fieldConfig.defaults.custom.withInsertNullsMixin @@ -399,7 +399,7 @@ fieldConfig.defaults.custom.withInsertNullsMixin(value) PARAMETERS: -* **value** (`boolean`,`number`) +* **value** (`boolean`,`integer`) ###### fn fieldConfig.defaults.custom.withLineColor diff --git a/docs/API/query/tempo/index.md b/docs/API/query/tempo/index.md index c3d9877b..485ab220 100644 --- a/docs/API/query/tempo/index.md +++ b/docs/API/query/tempo/index.md @@ -269,6 +269,6 @@ withTableType(value) PARAMETERS: * **value** (`string`) - - valid values: `"traces"`, `"spans"`, `"raw"` + - valid values: `"traces"`, `"spans"` The type of the table that is used to display the search results \ No newline at end of file diff --git a/gen/grafonnet-v11.0.0/docs/panel/candlestick/index.md b/gen/grafonnet-v11.0.0/docs/panel/candlestick/index.md index 260c1250..9ad9263a 100644 --- a/gen/grafonnet-v11.0.0/docs/panel/candlestick/index.md +++ b/gen/grafonnet-v11.0.0/docs/panel/candlestick/index.md @@ -405,7 +405,7 @@ fieldConfig.defaults.custom.withInsertNulls(value) PARAMETERS: -* **value** (`boolean`,`number`) +* **value** (`boolean`,`integer`) ###### fn fieldConfig.defaults.custom.withInsertNullsMixin @@ -416,7 +416,7 @@ fieldConfig.defaults.custom.withInsertNullsMixin(value) PARAMETERS: -* **value** (`boolean`,`number`) +* **value** (`boolean`,`integer`) ###### fn fieldConfig.defaults.custom.withLineColor diff --git a/gen/grafonnet-v11.0.0/docs/panel/dashboardList/index.md b/gen/grafonnet-v11.0.0/docs/panel/dashboardList/index.md index 0f6501f0..a5139210 100644 --- a/gen/grafonnet-v11.0.0/docs/panel/dashboardList/index.md +++ b/gen/grafonnet-v11.0.0/docs/panel/dashboardList/index.md @@ -23,7 +23,6 @@ grafonnet.panel.dashboardList * [`fn withKeepTime(value=true)`](#fn-optionswithkeeptime) * [`fn withMaxItems(value=10)`](#fn-optionswithmaxitems) * [`fn withQuery(value="")`](#fn-optionswithquery) - * [`fn withShowFolderNames(value=true)`](#fn-optionswithshowfoldernames) * [`fn withShowHeadings(value=true)`](#fn-optionswithshowheadings) * [`fn withShowRecentlyViewed(value=true)`](#fn-optionswithshowrecentlyviewed) * [`fn withShowSearch(value=true)`](#fn-optionswithshowsearch) @@ -185,18 +184,6 @@ PARAMETERS: - default value: `""` -#### fn options.withShowFolderNames - -```jsonnet -options.withShowFolderNames(value=true) -``` - -PARAMETERS: - -* **value** (`boolean`) - - default value: `true` - - #### fn options.withShowHeadings ```jsonnet diff --git a/gen/grafonnet-v11.0.0/docs/panel/table/index.md b/gen/grafonnet-v11.0.0/docs/panel/table/index.md index e8d83f0f..d5c25b8b 100644 --- a/gen/grafonnet-v11.0.0/docs/panel/table/index.md +++ b/gen/grafonnet-v11.0.0/docs/panel/table/index.md @@ -83,8 +83,6 @@ grafonnet.panel.table * [`fn withHideFrom(value)`](#fn-fieldconfigdefaultscustomcelloptionstablesparklinecelloptionswithhidefrom) * [`fn withHideFromMixin(value)`](#fn-fieldconfigdefaultscustomcelloptionstablesparklinecelloptionswithhidefrommixin) * [`fn withHideValue(value=true)`](#fn-fieldconfigdefaultscustomcelloptionstablesparklinecelloptionswithhidevalue) - * [`fn withInsertNulls(value)`](#fn-fieldconfigdefaultscustomcelloptionstablesparklinecelloptionswithinsertnulls) - * [`fn withInsertNullsMixin(value)`](#fn-fieldconfigdefaultscustomcelloptionstablesparklinecelloptionswithinsertnullsmixin) * [`fn withLineColor(value)`](#fn-fieldconfigdefaultscustomcelloptionstablesparklinecelloptionswithlinecolor) * [`fn withLineInterpolation(value)`](#fn-fieldconfigdefaultscustomcelloptionstablesparklinecelloptionswithlineinterpolation) * [`fn withLineStyle(value)`](#fn-fieldconfigdefaultscustomcelloptionstablesparklinecelloptionswithlinestyle) @@ -868,28 +866,6 @@ PARAMETERS: - default value: `true` -######## fn fieldConfig.defaults.custom.cellOptions.TableSparklineCellOptions.withInsertNulls - -```jsonnet -fieldConfig.defaults.custom.cellOptions.TableSparklineCellOptions.withInsertNulls(value) -``` - -PARAMETERS: - -* **value** (`boolean`,`number`) - - -######## fn fieldConfig.defaults.custom.cellOptions.TableSparklineCellOptions.withInsertNullsMixin - -```jsonnet -fieldConfig.defaults.custom.cellOptions.TableSparklineCellOptions.withInsertNullsMixin(value) -``` - -PARAMETERS: - -* **value** (`boolean`,`number`) - - ######## fn fieldConfig.defaults.custom.cellOptions.TableSparklineCellOptions.withLineColor ```jsonnet diff --git a/gen/grafonnet-v11.0.0/docs/panel/timeSeries/index.md b/gen/grafonnet-v11.0.0/docs/panel/timeSeries/index.md index 0b30e977..fd6c263b 100644 --- a/gen/grafonnet-v11.0.0/docs/panel/timeSeries/index.md +++ b/gen/grafonnet-v11.0.0/docs/panel/timeSeries/index.md @@ -393,7 +393,7 @@ fieldConfig.defaults.custom.withInsertNulls(value) PARAMETERS: -* **value** (`boolean`,`number`) +* **value** (`boolean`,`integer`) ###### fn fieldConfig.defaults.custom.withInsertNullsMixin @@ -404,7 +404,7 @@ fieldConfig.defaults.custom.withInsertNullsMixin(value) PARAMETERS: -* **value** (`boolean`,`number`) +* **value** (`boolean`,`integer`) ###### fn fieldConfig.defaults.custom.withLineColor diff --git a/gen/grafonnet-v11.0.0/docs/panel/trend/index.md b/gen/grafonnet-v11.0.0/docs/panel/trend/index.md index c0f4ff29..f5e75a2a 100644 --- a/gen/grafonnet-v11.0.0/docs/panel/trend/index.md +++ b/gen/grafonnet-v11.0.0/docs/panel/trend/index.md @@ -388,7 +388,7 @@ fieldConfig.defaults.custom.withInsertNulls(value) PARAMETERS: -* **value** (`boolean`,`number`) +* **value** (`boolean`,`integer`) ###### fn fieldConfig.defaults.custom.withInsertNullsMixin @@ -399,7 +399,7 @@ fieldConfig.defaults.custom.withInsertNullsMixin(value) PARAMETERS: -* **value** (`boolean`,`number`) +* **value** (`boolean`,`integer`) ###### fn fieldConfig.defaults.custom.withLineColor diff --git a/gen/grafonnet-v11.0.0/docs/query/tempo/index.md b/gen/grafonnet-v11.0.0/docs/query/tempo/index.md index c3d9877b..485ab220 100644 --- a/gen/grafonnet-v11.0.0/docs/query/tempo/index.md +++ b/gen/grafonnet-v11.0.0/docs/query/tempo/index.md @@ -269,6 +269,6 @@ withTableType(value) PARAMETERS: * **value** (`string`) - - valid values: `"traces"`, `"spans"`, `"raw"` + - valid values: `"traces"`, `"spans"` The type of the table that is used to display the search results \ No newline at end of file diff --git a/gen/grafonnet-v11.0.0/panel/candlestick.libsonnet b/gen/grafonnet-v11.0.0/panel/candlestick.libsonnet index dc3026d2..feb03c7c 100644 --- a/gen/grafonnet-v11.0.0/panel/candlestick.libsonnet +++ b/gen/grafonnet-v11.0.0/panel/candlestick.libsonnet @@ -242,7 +242,7 @@ }, }, }, - '#withInsertNulls': { 'function': { args: [{ default: null, enums: null, name: 'value', type: ['boolean', 'number'] }], help: '' } }, + '#withInsertNulls': { 'function': { args: [{ default: null, enums: null, name: 'value', type: ['boolean', 'integer'] }], help: '' } }, withInsertNulls(value): { fieldConfig+: { defaults+: { @@ -252,7 +252,7 @@ }, }, }, - '#withInsertNullsMixin': { 'function': { args: [{ default: null, enums: null, name: 'value', type: ['boolean', 'number'] }], help: '' } }, + '#withInsertNullsMixin': { 'function': { args: [{ default: null, enums: null, name: 'value', type: ['boolean', 'integer'] }], help: '' } }, withInsertNullsMixin(value): { fieldConfig+: { defaults+: { diff --git a/gen/grafonnet-v11.0.0/panel/dashboardList.libsonnet b/gen/grafonnet-v11.0.0/panel/dashboardList.libsonnet index 48d9cdd2..94a0e471 100644 --- a/gen/grafonnet-v11.0.0/panel/dashboardList.libsonnet +++ b/gen/grafonnet-v11.0.0/panel/dashboardList.libsonnet @@ -47,12 +47,6 @@ query: value, }, }, - '#withShowFolderNames': { 'function': { args: [{ default: true, enums: null, name: 'value', type: ['boolean'] }], help: '' } }, - withShowFolderNames(value=true): { - options+: { - showFolderNames: value, - }, - }, '#withShowHeadings': { 'function': { args: [{ default: true, enums: null, name: 'value', type: ['boolean'] }], help: '' } }, withShowHeadings(value=true): { options+: { diff --git a/gen/grafonnet-v11.0.0/panel/table.libsonnet b/gen/grafonnet-v11.0.0/panel/table.libsonnet index a2535c48..2e081638 100644 --- a/gen/grafonnet-v11.0.0/panel/table.libsonnet +++ b/gen/grafonnet-v11.0.0/panel/table.libsonnet @@ -395,30 +395,6 @@ }, }, }, - '#withInsertNulls': { 'function': { args: [{ default: null, enums: null, name: 'value', type: ['boolean', 'number'] }], help: '' } }, - withInsertNulls(value): { - fieldConfig+: { - defaults+: { - custom+: { - cellOptions+: { - insertNulls: value, - }, - }, - }, - }, - }, - '#withInsertNullsMixin': { 'function': { args: [{ default: null, enums: null, name: 'value', type: ['boolean', 'number'] }], help: '' } }, - withInsertNullsMixin(value): { - fieldConfig+: { - defaults+: { - custom+: { - cellOptions+: { - insertNulls+: value, - }, - }, - }, - }, - }, '#withLineColor': { 'function': { args: [{ default: null, enums: null, name: 'value', type: ['string'] }], help: '' } }, withLineColor(value): { fieldConfig+: { diff --git a/gen/grafonnet-v11.0.0/panel/timeSeries.libsonnet b/gen/grafonnet-v11.0.0/panel/timeSeries.libsonnet index ff275f6c..f9bf740d 100644 --- a/gen/grafonnet-v11.0.0/panel/timeSeries.libsonnet +++ b/gen/grafonnet-v11.0.0/panel/timeSeries.libsonnet @@ -242,7 +242,7 @@ }, }, }, - '#withInsertNulls': { 'function': { args: [{ default: null, enums: null, name: 'value', type: ['boolean', 'number'] }], help: '' } }, + '#withInsertNulls': { 'function': { args: [{ default: null, enums: null, name: 'value', type: ['boolean', 'integer'] }], help: '' } }, withInsertNulls(value): { fieldConfig+: { defaults+: { @@ -252,7 +252,7 @@ }, }, }, - '#withInsertNullsMixin': { 'function': { args: [{ default: null, enums: null, name: 'value', type: ['boolean', 'number'] }], help: '' } }, + '#withInsertNullsMixin': { 'function': { args: [{ default: null, enums: null, name: 'value', type: ['boolean', 'integer'] }], help: '' } }, withInsertNullsMixin(value): { fieldConfig+: { defaults+: { diff --git a/gen/grafonnet-v11.0.0/panel/trend.libsonnet b/gen/grafonnet-v11.0.0/panel/trend.libsonnet index 294cf2c1..929422f2 100644 --- a/gen/grafonnet-v11.0.0/panel/trend.libsonnet +++ b/gen/grafonnet-v11.0.0/panel/trend.libsonnet @@ -242,7 +242,7 @@ }, }, }, - '#withInsertNulls': { 'function': { args: [{ default: null, enums: null, name: 'value', type: ['boolean', 'number'] }], help: '' } }, + '#withInsertNulls': { 'function': { args: [{ default: null, enums: null, name: 'value', type: ['boolean', 'integer'] }], help: '' } }, withInsertNulls(value): { fieldConfig+: { defaults+: { @@ -252,7 +252,7 @@ }, }, }, - '#withInsertNullsMixin': { 'function': { args: [{ default: null, enums: null, name: 'value', type: ['boolean', 'number'] }], help: '' } }, + '#withInsertNullsMixin': { 'function': { args: [{ default: null, enums: null, name: 'value', type: ['boolean', 'integer'] }], help: '' } }, withInsertNullsMixin(value): { fieldConfig+: { defaults+: { diff --git a/gen/grafonnet-v11.0.0/query/tempo.libsonnet b/gen/grafonnet-v11.0.0/query/tempo.libsonnet index 1fe9d98e..61ed2901 100644 --- a/gen/grafonnet-v11.0.0/query/tempo.libsonnet +++ b/gen/grafonnet-v11.0.0/query/tempo.libsonnet @@ -157,7 +157,7 @@ withSpss(value): { spss: value, }, - '#withTableType': { 'function': { args: [{ default: null, enums: ['traces', 'spans', 'raw'], name: 'value', type: ['string'] }], help: 'The type of the table that is used to display the search results' } }, + '#withTableType': { 'function': { args: [{ default: null, enums: ['traces', 'spans'], name: 'value', type: ['string'] }], help: 'The type of the table that is used to display the search results' } }, withTableType(value): { tableType: value, }, diff --git a/scripts/generate.sh b/scripts/generate.sh index 90058f96..d6a77398 100755 --- a/scripts/generate.sh +++ b/scripts/generate.sh @@ -3,6 +3,7 @@ set -euo pipefail set -x VERSION="${1}" +COG_VERSION="${VERSION%?}x" DIRNAME0="$(dirname "$0")" SCRIPT_DIR=$(cd "$DIRNAME0" && pwd) @@ -19,7 +20,7 @@ jb init cp -r "${REPO_DIR}/generator" generator cp -r "${REPO_DIR}/generator/jsonnetfile.lock.json" . jb install -jb install "github.com/grafana/grafana-foundation-sdk/openapi@next+cog-v0.0.x" +jb install "github.com/grafana/grafana-foundation-sdk/openapi@${COG_VERSION}+cog-v0.0.x" jb install "github.com/grafana/grafana/public@${VERSION}-preview" jb install ./generator