Merge pull request #7 from adinhodovic/add-more-calcs

feat: add more calcs for the operation dashboard
adinhodovic · Jul 11, 2024 · c28f829 · c28f829
2 parents 3733302 + f09375f
commit c28f829
Show file tree

Hide file tree

Showing 5 changed files with 101 additions and 81 deletions.
diff --git a/dashboards/argo-cd-applications.libsonnet b/dashboards/argo-cd-applications.libsonnet
@@ -290,7 +290,7 @@ local tbOverride = tbStandardOptions.override;
       tbOptions.withSortBy(
         tbOptions.sortBy.withDisplayName('Application')
       ) +
-      tbOptions.footer.TableFooterOptions.withEnablePagination(true) +
+      tbOptions.footer.withEnablePagination(true) +
       tbQueryOptions.withTargets(
         prometheus.new(
           '$datasource',
@@ -362,7 +362,7 @@ local tbOverride = tbStandardOptions.override;
       tbOptions.withSortBy(
         tbOptions.sortBy.withDisplayName('Application')
       ) +
-      tbOptions.footer.TableFooterOptions.withEnablePagination(true) +
+      tbOptions.footer.withEnablePagination(true) +
       tbQueryOptions.withTargets(
         prometheus.new(
           '$datasource',
@@ -438,7 +438,7 @@ local tbOverride = tbStandardOptions.override;
       tbOptions.withSortBy(
         tbOptions.sortBy.withDisplayName('Application')
       ) +
-      tbOptions.footer.TableFooterOptions.withEnablePagination(true) +
+      tbOptions.footer.withEnablePagination(true) +
       tbQueryOptions.withTargets(
         prometheus.new(
           '$datasource',
@@ -510,7 +510,7 @@ local tbOverride = tbStandardOptions.override;
       tbOptions.withSortBy(
         tbOptions.sortBy.withDisplayName('Application')
       ) +
-      tbOptions.footer.TableFooterOptions.withEnablePagination(true) +
+      tbOptions.footer.withEnablePagination(true) +
       tbQueryOptions.withTargets(
         prometheus.new(
           '$datasource',

diff --git a/dashboards/argo-cd-operational.libsonnet b/dashboards/argo-cd-operational.libsonnet
@@ -290,7 +290,7 @@ local hmQueryOptions = heatmapPanel.queryOptions;
       tbOptions.withSortBy(
         tbOptions.sortBy.withDisplayName('Application')
       ) +
-      tbOptions.footer.TableFooterOptions.withEnablePagination(true) +
+      tbOptions.footer.withEnablePagination(true) +
       tbQueryOptions.withTargets(
         prometheus.new(
           '$datasource',
@@ -373,8 +373,8 @@ local hmQueryOptions = heatmapPanel.queryOptions;
       tsLegend.withShowLegend(true) +
       tsLegend.withDisplayMode('table') +
       tsLegend.withPlacement('right') +
-      tsLegend.withCalcs(['last']) +
-      tsLegend.withSortBy('Last') +
+      tsLegend.withCalcs(['lastNotNull', 'mean', 'max']) +
+      tsLegend.withSortBy('Mean') +
       tsLegend.withSortDesc(true) +
       tsCustom.withFillOpacity(10),
 
@@ -410,8 +410,8 @@ local hmQueryOptions = heatmapPanel.queryOptions;
       tsLegend.withShowLegend(true) +
       tsLegend.withDisplayMode('table') +
       tsLegend.withPlacement('right') +
-      tsLegend.withCalcs(['last']) +
-      tsLegend.withSortBy('Last') +
+      tsLegend.withCalcs(['lastNotNull', 'mean', 'max']) +
+      tsLegend.withSortBy('Mean') +
       tsLegend.withSortDesc(true) +
       tsCustom.withFillOpacity(10),
 
@@ -448,8 +448,8 @@ local hmQueryOptions = heatmapPanel.queryOptions;
       tsLegend.withShowLegend(true) +
       tsLegend.withDisplayMode('table') +
       tsLegend.withPlacement('right') +
-      tsLegend.withCalcs(['last']) +
-      tsLegend.withSortBy('Last') +
+      tsLegend.withCalcs(['lastNotNull', 'mean', 'max']) +
+      tsLegend.withSortBy('Mean') +
       tsLegend.withSortDesc(true) +
       tsCustom.withFillOpacity(10),
 
@@ -514,8 +514,8 @@ local hmQueryOptions = heatmapPanel.queryOptions;
       tsLegend.withShowLegend(true) +
       tsLegend.withDisplayMode('table') +
       tsLegend.withPlacement('right') +
-      tsLegend.withCalcs(['last']) +
-      tsLegend.withSortBy('Last') +
+      tsLegend.withCalcs(['lastNotNull', 'mean', 'max']) +
+      tsLegend.withSortBy('Mean') +
       tsLegend.withSortDesc(true) +
       tsCustom.withFillOpacity(10),
 
@@ -547,8 +547,8 @@ local hmQueryOptions = heatmapPanel.queryOptions;
       tsLegend.withShowLegend(true) +
       tsLegend.withDisplayMode('table') +
       tsLegend.withPlacement('right') +
-      tsLegend.withCalcs(['last']) +
-      tsLegend.withSortBy('Last') +
+      tsLegend.withCalcs(['lastNotNull', 'mean', 'max']) +
+      tsLegend.withSortBy('Mean') +
       tsLegend.withSortDesc(true) +
       tsCustom.withFillOpacity(10),
 
@@ -581,8 +581,8 @@ local hmQueryOptions = heatmapPanel.queryOptions;
       tsLegend.withShowLegend(true) +
       tsLegend.withDisplayMode('table') +
       tsLegend.withPlacement('right') +
-      tsLegend.withCalcs(['last']) +
-      tsLegend.withSortBy('Last') +
+      tsLegend.withCalcs(['lastNotNull', 'mean', 'max']) +
+      tsLegend.withSortBy('Mean') +
       tsLegend.withSortDesc(true) +
       tsCustom.withFillOpacity(10),
 
@@ -615,8 +615,8 @@ local hmQueryOptions = heatmapPanel.queryOptions;
       tsLegend.withShowLegend(true) +
       tsLegend.withDisplayMode('table') +
       tsLegend.withPlacement('right') +
-      tsLegend.withCalcs(['last']) +
-      tsLegend.withSortBy('Last') +
+      tsLegend.withCalcs(['lastNotNull', 'mean', 'max']) +
+      tsLegend.withSortBy('Mean') +
       tsLegend.withSortDesc(true) +
       tsCustom.withFillOpacity(10),
 
@@ -651,8 +651,8 @@ local hmQueryOptions = heatmapPanel.queryOptions;
       tsLegend.withShowLegend(true) +
       tsLegend.withDisplayMode('table') +
       tsLegend.withPlacement('right') +
-      tsLegend.withCalcs(['last']) +
-      tsLegend.withSortBy('Last') +
+      tsLegend.withCalcs(['lastNotNull', 'mean', 'max']) +
+      tsLegend.withSortBy('Mean') +
       tsLegend.withSortDesc(true) +
       tsCustom.withFillOpacity(10),
 
@@ -687,8 +687,8 @@ local hmQueryOptions = heatmapPanel.queryOptions;
       tsLegend.withShowLegend(true) +
       tsLegend.withDisplayMode('table') +
       tsLegend.withPlacement('right') +
-      tsLegend.withCalcs(['last']) +
-      tsLegend.withSortBy('Last') +
+      tsLegend.withCalcs(['lastNotNull', 'mean', 'max']) +
+      tsLegend.withSortBy('Mean') +
       tsLegend.withSortDesc(true) +
       tsCustom.withFillOpacity(10),
 
@@ -723,8 +723,8 @@ local hmQueryOptions = heatmapPanel.queryOptions;
       tsLegend.withShowLegend(true) +
       tsLegend.withDisplayMode('table') +
       tsLegend.withPlacement('right') +
-      tsLegend.withCalcs(['last']) +
-      tsLegend.withSortBy('Last') +
+      tsLegend.withCalcs(['lastNotNull', 'mean', 'max']) +
+      tsLegend.withSortBy('Mean') +
       tsLegend.withSortDesc(true) +
       tsCustom.withFillOpacity(10),
 

diff --git a/dashboards_out/argo-cd-application-overview.json b/dashboards_out/argo-cd-application-overview.json
@@ -64,7 +64,7 @@
                "sort": "desc"
             }
          },
-         "pluginVersion": "v10.2.0",
+         "pluginVersion": "v11.0.0",
          "targets": [
             {
                "datasource": {
@@ -115,7 +115,7 @@
                "sort": "desc"
             }
          },
-         "pluginVersion": "v10.2.0",
+         "pluginVersion": "v11.0.0",
          "targets": [
             {
                "datasource": {
@@ -166,7 +166,7 @@
                "sort": "desc"
             }
          },
-         "pluginVersion": "v10.2.0",
+         "pluginVersion": "v11.0.0",
          "targets": [
             {
                "datasource": {
@@ -217,7 +217,7 @@
                "sort": "desc"
             }
          },
-         "pluginVersion": "v10.2.0",
+         "pluginVersion": "v11.0.0",
          "targets": [
             {
                "datasource": {
@@ -247,7 +247,7 @@
             "content": "No applications defined",
             "mode": "markdown"
          },
-         "pluginVersion": "v10.2.0",
+         "pluginVersion": "v11.0.0",
          "title": "Application Badges",
          "type": "text"
       },
@@ -329,7 +329,7 @@
                }
             ]
          },
-         "pluginVersion": "v10.2.0",
+         "pluginVersion": "v11.0.0",
          "targets": [
             {
                "datasource": {
@@ -435,7 +435,7 @@
                }
             ]
          },
-         "pluginVersion": "v10.2.0",
+         "pluginVersion": "v11.0.0",
          "targets": [
             {
                "datasource": {
@@ -541,7 +541,7 @@
                }
             ]
          },
-         "pluginVersion": "v10.2.0",
+         "pluginVersion": "v11.0.0",
          "targets": [
             {
                "datasource": {
@@ -647,7 +647,7 @@
                }
             ]
          },
-         "pluginVersion": "v10.2.0",
+         "pluginVersion": "v11.0.0",
          "targets": [
             {
                "datasource": {
@@ -735,7 +735,7 @@
                "sort": "desc"
             }
          },
-         "pluginVersion": "v10.2.0",
+         "pluginVersion": "v11.0.0",
          "targets": [
             {
                "datasource": {
@@ -785,7 +785,7 @@
                "sort": "desc"
             }
          },
-         "pluginVersion": "v10.2.0",
+         "pluginVersion": "v11.0.0",
          "targets": [
             {
                "datasource": {
@@ -835,7 +835,7 @@
                "sort": "desc"
             }
          },
-         "pluginVersion": "v10.2.0",
+         "pluginVersion": "v11.0.0",
          "targets": [
             {
                "datasource": {
@@ -850,7 +850,7 @@
          "type": "timeseries"
       }
    ],
-   "schemaVersion": 36,
+   "schemaVersion": 39,
    "tags": [
       "ci/cd",
       "argo-cd"

diff --git a/dashboards_out/argo-cd-notifications-overview.json b/dashboards_out/argo-cd-notifications-overview.json
@@ -64,7 +64,7 @@
                "sort": "desc"
             }
          },
-         "pluginVersion": "v10.2.0",
+         "pluginVersion": "v11.0.0",
          "targets": [
             {
                "datasource": {
@@ -115,7 +115,7 @@
                "sort": "desc"
             }
          },
-         "pluginVersion": "v10.2.0",
+         "pluginVersion": "v11.0.0",
          "targets": [
             {
                "datasource": {
@@ -130,7 +130,7 @@
          "type": "timeseries"
       }
    ],
-   "schemaVersion": 36,
+   "schemaVersion": 39,
    "tags": [
       "ci/cd",
       "argo-cd"