From e3267663082cd0a9e0dcb461c30dedeb1597b052 Mon Sep 17 00:00:00 2001 From: adinhodovic Date: Thu, 11 Jul 2024 14:06:29 +0200 Subject: [PATCH] fix(mixin): Fix v11 grafana dashboard fields --- .../dashboards/celery-tasks-by-task.libsonnet | 4 +-- .../celery-tasks-overview.libsonnet | 6 ++--- .../dashboards_out/celery-tasks-by-task.json | 12 ++++----- .../dashboards_out/celery-tasks-overview.json | 26 +++++++++---------- celery-mixin/jsonnetfile.json | 9 ------- 5 files changed, 24 insertions(+), 33 deletions(-) diff --git a/celery-mixin/dashboards/celery-tasks-by-task.libsonnet b/celery-mixin/dashboards/celery-tasks-by-task.libsonnet index 0a9144a..fb6b6d3 100644 --- a/celery-mixin/dashboards/celery-tasks-by-task.libsonnet +++ b/celery-mixin/dashboards/celery-tasks-by-task.libsonnet @@ -120,7 +120,7 @@ local tbOverride = tbStandardOptions.override; tbOptions.sortBy.withDisplayName('Value') + tbOptions.sortBy.withDesc(true) ) + - tbOptions.footer.TableFooterOptions.withEnablePagination(true) + + tbOptions.footer.withEnablePagination(true) + tbQueryOptions.withTargets( prometheus.new( '$datasource', @@ -190,7 +190,7 @@ local tbOverride = tbStandardOptions.override; tbOptions.sortBy.withDisplayName('Succeeded') + tbOptions.sortBy.withDesc(true) ) + - tbOptions.footer.TableFooterOptions.withEnablePagination(true) + + tbOptions.footer.withEnablePagination(true) + tbQueryOptions.withTargets( [ prometheus.new( diff --git a/celery-mixin/dashboards/celery-tasks-overview.libsonnet b/celery-mixin/dashboards/celery-tasks-overview.libsonnet index 1ce84a2..dfec62f 100644 --- a/celery-mixin/dashboards/celery-tasks-overview.libsonnet +++ b/celery-mixin/dashboards/celery-tasks-overview.libsonnet @@ -260,7 +260,7 @@ local tbOverride = tbStandardOptions.override; tbOptions.sortBy.withDisplayName('Value') + tbOptions.sortBy.withDesc(true) ) + - tbOptions.footer.TableFooterOptions.withEnablePagination(true) + + tbOptions.footer.withEnablePagination(true) + tbQueryOptions.withTargets( prometheus.new( '$datasource', @@ -325,7 +325,7 @@ local tbOverride = tbStandardOptions.override; tbOptions.sortBy.withDisplayName('Value') + tbOptions.sortBy.withDesc(true) ) + - tbOptions.footer.TableFooterOptions.withEnablePagination(true) + + tbOptions.footer.withEnablePagination(true) + tbQueryOptions.withTargets( prometheus.new( '$datasource', @@ -383,7 +383,7 @@ local tbOverride = tbStandardOptions.override; tbOptions.sortBy.withDisplayName('Runtime') + tbOptions.sortBy.withDesc(true) ) + - tbOptions.footer.TableFooterOptions.withEnablePagination(true) + + tbOptions.footer.withEnablePagination(true) + tbQueryOptions.withTargets( prometheus.new( '$datasource', diff --git a/celery-mixin/dashboards_out/celery-tasks-by-task.json b/celery-mixin/dashboards_out/celery-tasks-by-task.json index a76f64b..19aa371 100644 --- a/celery-mixin/dashboards_out/celery-tasks-by-task.json +++ b/celery-mixin/dashboards_out/celery-tasks-by-task.json @@ -68,7 +68,7 @@ } ] }, - "pluginVersion": "v10.4.0", + "pluginVersion": "v11.0.0", "targets": [ { "datasource": { @@ -209,7 +209,7 @@ } ] }, - "pluginVersion": "v10.4.0", + "pluginVersion": "v11.0.0", "targets": [ { "datasource": { @@ -281,7 +281,7 @@ "sort": "desc" } }, - "pluginVersion": "v10.4.0", + "pluginVersion": "v11.0.0", "targets": [ { "datasource": { @@ -380,7 +380,7 @@ "sort": "desc" } }, - "pluginVersion": "v10.4.0", + "pluginVersion": "v11.0.0", "targets": [ { "datasource": { @@ -478,7 +478,7 @@ "sort": "desc" } }, - "pluginVersion": "v10.4.0", + "pluginVersion": "v11.0.0", "targets": [ { "datasource": { @@ -509,7 +509,7 @@ "type": "timeseries" } ], - "schemaVersion": 36, + "schemaVersion": 39, "tags": [ "celery", "celery-mixin" diff --git a/celery-mixin/dashboards_out/celery-tasks-overview.json b/celery-mixin/dashboards_out/celery-tasks-overview.json index 27923a6..d94db25 100644 --- a/celery-mixin/dashboards_out/celery-tasks-overview.json +++ b/celery-mixin/dashboards_out/celery-tasks-overview.json @@ -61,7 +61,7 @@ ] } }, - "pluginVersion": "v10.4.0", + "pluginVersion": "v11.0.0", "targets": [ { "datasource": { @@ -110,7 +110,7 @@ ] } }, - "pluginVersion": "v10.4.0", + "pluginVersion": "v11.0.0", "targets": [ { "datasource": { @@ -159,7 +159,7 @@ ] } }, - "pluginVersion": "v10.4.0", + "pluginVersion": "v11.0.0", "targets": [ { "datasource": { @@ -212,7 +212,7 @@ ] } }, - "pluginVersion": "v10.4.0", + "pluginVersion": "v11.0.0", "targets": [ { "datasource": { @@ -261,7 +261,7 @@ ] } }, - "pluginVersion": "v10.4.0", + "pluginVersion": "v11.0.0", "targets": [ { "datasource": { @@ -323,7 +323,7 @@ } ] }, - "pluginVersion": "v10.4.0", + "pluginVersion": "v11.0.0", "targets": [ { "datasource": { @@ -384,7 +384,7 @@ } ] }, - "pluginVersion": "v10.4.0", + "pluginVersion": "v11.0.0", "targets": [ { "datasource": { @@ -466,7 +466,7 @@ } ] }, - "pluginVersion": "v10.4.0", + "pluginVersion": "v11.0.0", "targets": [ { "datasource": { @@ -548,7 +548,7 @@ "sort": "desc" } }, - "pluginVersion": "v10.4.0", + "pluginVersion": "v11.0.0", "targets": [ { "datasource": { @@ -614,7 +614,7 @@ } ] }, - "pluginVersion": "v10.4.0", + "pluginVersion": "v11.0.0", "targets": [ { "datasource": { @@ -764,7 +764,7 @@ "sort": "desc" } }, - "pluginVersion": "v10.4.0", + "pluginVersion": "v11.0.0", "targets": [ { "datasource": { @@ -910,7 +910,7 @@ "sort": "desc" } }, - "pluginVersion": "v10.4.0", + "pluginVersion": "v11.0.0", "targets": [ { "datasource": { @@ -941,7 +941,7 @@ "type": "timeseries" } ], - "schemaVersion": 36, + "schemaVersion": 39, "tags": [ "celery", "celery-mixin" diff --git a/celery-mixin/jsonnetfile.json b/celery-mixin/jsonnetfile.json index 5d0a248..2d56d91 100644 --- a/celery-mixin/jsonnetfile.json +++ b/celery-mixin/jsonnetfile.json @@ -1,15 +1,6 @@ { "version": 1, "dependencies": [ - { - "source": { - "git": { - "remote": "https://github.com/grafana/grafonnet-lib.git", - "subdir": "grafonnet" - } - }, - "version": "master" - }, { "source": { "git": {