Merge pull request #4954 from consideRatio/pr/detail-fix

cloud cost dashboard: fix quote in folder name and ensure ensure uid mentions aws
2i2c-org · Oct 7, 2024 · d3f6102 · d3f6102
2 parents 5f227db + 89d7a24
commit d3f6102
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/deployer/commands/grafana/deploy_dashboards.py b/deployer/commands/grafana/deploy_dashboards.py
@@ -56,14 +56,14 @@ def deploy_dashboards(
         )
 
         if cluster_provider == "aws":
-            print_colour("Deploying cost attribution dashboards to an AWS cluster...")
+            print_colour("Deploying cloud cost dashboards to an AWS cluster...")
             subprocess.check_call(
                 [
                     "./deploy.py",
                     grafana_url,
                     "--dashboards-dir=../grafana-dashboards",
-                    "--folder-name='Cost Attribution Dashboards'",
-                    "--folder-uid=aws-ce-grafana-backend",
+                    "--folder-name=Cloud cost dashboards",
+                    "--folder-uid=cloud-cost",
                 ],
                 env=deploy_script_env,
                 cwd="jupyterhub-grafana-dashboards",

diff --git a/grafana-dashboards/cost-attribution.jsonnet → grafana-dashboards/cloud-cost-aws.jsonnet b/grafana-dashboards/cost-attribution.jsonnet → grafana-dashboards/cloud-cost-aws.jsonnet
@@ -94,7 +94,7 @@ local totalDailyCostsPerComponentAndHub =
 
 // grafonnet ref: https://grafana.github.io/grafonnet/API/dashboard/index.html
 dashboard.new("Cloud cost attribution")
-+ dashboard.withUid("cloud-cost-attribution")
++ dashboard.withUid("cloud-cost-aws")
 + dashboard.withTimezone("utc")
 + dashboard.withEditable(true)
 + dashboard.time.withFrom("now-30d")