Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: 2i2c-org/infrastructure
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9d737ccc8c992bae71fa2b4ce0efc80594a7be04
Choose a base ref
..
head repository: 2i2c-org/infrastructure
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 382656d8e8fd9c7ae5ac65c303df8b6783470e71
Choose a head ref
Showing with 4 additions and 4 deletions.
  1. +3 −3 deployer/commands/grafana/deploy_dashboards.py
  2. +1 −1 grafana-dashboards/{cost-attribution.jsonnet → cloud-cost-aws.jsonnet}
6 changes: 3 additions & 3 deletions deployer/commands/grafana/deploy_dashboards.py
View file
Original file line number Diff line number Diff line change
@@ -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",
2 changes: 1 addition & 1 deletion grafana-dashboards/cost-attribution.jsonnet → grafana-dashboards/cloud-cost-aws.jsonnet
View file
Original file line number Diff line number Diff line change
@@ -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")