Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adapt manifests to zeros #866

Merged
merged 5 commits into from
Jun 28, 2024
+249 −108
Merged

Adapt manifests to zeros #866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ae7e4c8
fix(manifests): uncomment sci from aggregation error wrong metric
MariamKhalatova Jun 27, 2024
084da9d
fix(manifests): uncomment sci from nesting example
MariamKhalatova Jun 27, 2024
5e1b13f
fix(manifests): uncomment sci from pipeline with aggregate, fix secon…
MariamKhalatova Jun 27, 2024
a4e2757
fix(manifests): uncomment sci from pipeline with mocks, fix second child
MariamKhalatova Jun 27, 2024
5313ff1
feat(manifests): init zeros example
MariamKhalatova Jun 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions manifests/bugs/aggregation-error-wrong-metric.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ initialize:
path: builtin
global-config:
input-parameters: ["cpu-energy-kwh", "grid/carbon-intensity"]
output-parameter: "carbon-operational"
output-parameter: "carbon"
"sci":
path: "builtin"
method: Sci
Expand Down Expand Up @@ -87,7 +87,7 @@ tree:
- sci-embodied
- operational-carbon
- time-sync
# - sci
- sci
config:
group-by:
group:
Expand All @@ -107,21 +107,25 @@ tree:
cloud/region: uk-west
duration: 1
cpu/utilization: 10
requests: 100
- timestamp: "2023-12-12T00:00:01.000Z"
duration: 5
cpu/utilization: 20
cloud/instance-type: A1
cloud/region: uk-west
requests: 100
- timestamp: "2023-12-12T00:00:06.000Z"
duration: 7
cpu/utilization: 15
cloud/instance-type: A1
cloud/region: uk-west
requests: 100
- timestamp: "2023-12-12T00:00:13.000Z"
duration: 30
cloud/instance-type: A1
cloud/region: uk-west
cpu/utilization: 15
requests: 100
child-2:
pipeline:
- interpolate
Expand All @@ -133,7 +137,7 @@ tree:
- sci-embodied
- operational-carbon
- time-sync
# - sci
- sci
config:
group-by:
group:
Expand All @@ -153,18 +157,22 @@ tree:
cpu/utilization: 30
cloud/instance-type: A1
cloud/region: uk-west
requests: 100
- timestamp: "2023-12-12T00:00:01.000Z"
duration: 5
cpu/utilization: 28
cloud/instance-type: A1
cloud/region: uk-west
requests: 100
- timestamp: "2023-12-12T00:00:06.000Z"
duration: 7
cpu/utilization: 40
cloud/instance-type: A1
cloud/region: uk-west
requests: 100
- timestamp: "2023-12-12T00:00:13.000Z"
duration: 30
cpu/utilization: 33
cloud/instance-type: A1
cloud/region: uk-west
requests: 100
8 changes: 4 additions & 4 deletions manifests/examples/nesting.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ tree:
- operational-carbon
- sum-carbon
- time-sync
# - sci
- sci
inputs:
- timestamp: "2023-12-12T00:00:00.000Z"
cloud/instance-type: A1
Expand Down Expand Up @@ -156,7 +156,7 @@ tree:
- operational-carbon
- sum-carbon
- time-sync
# - sci
- sci
inputs:
- timestamp: "2023-12-12T00:00:00.000Z"
cloud/instance-type: A1
Expand Down Expand Up @@ -208,7 +208,7 @@ tree:
- operational-carbon
- sum-carbon
- time-sync
# - sci
- sci
inputs:
- timestamp: "2023-12-12T00:00:00.000Z"
cloud/instance-type: A1
Expand Down Expand Up @@ -258,7 +258,7 @@ tree:
- operational-carbon
- sum-carbon
- time-sync
# - sci
- sci
inputs:
- timestamp: "2023-12-12T00:00:00.000Z"
cloud/instance-type: A1
Expand Down
105 changes: 52 additions & 53 deletions manifests/examples/pipeline-with-aggregate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ tree:
- operational-carbon
- sum-carbon
- time-sync
# - sci
- sci
config:
group-by:
group:
Expand Down Expand Up @@ -132,55 +132,54 @@ tree:
cloud/region: uk-west
cpu/utilization: 15
requests: 30
# child-2:
# pipeline:
# - interpolate
# - cpu-factor-to-wattage
# - wattage-times-duration
# - wattage-to-energy-kwh
# - calculate-vcpu-ratio
# - correct-cpu-energy-for-vcpu-ratio
# - sci-e
# - sci-embodied
# - sci-o
# - sum-carbon
# - time-sync
# - sci
# config:
# group-by:
# group:
# - cloud/region
# - cloud/instance-type
# defaults:
# cpu/thermal-design-power: 100
# grid/carbon-intensity: 800
# device/emissions-embodied: 1533.120 # gCO2eq
# time-reserved: 3600 # 1hr in seconds
# device/expected-lifespan: 94608000 # 3 years in seconds
# resources-reserved: 1
# resources-total: 8
# inputs:
# - timestamp: "2023-12-12T00:00:00.000Z"
# duration: 1
# cpu/utilization: 30
# cloud/instance-type: A1
# cloud/region: uk-west
# requests: 100
# - timestamp: "2023-12-12T00:00:01.000Z"
# duration: 5
# cpu/utilization: 28
# cloud/instance-type: A1
# cloud/region: uk-west
# requests: 150
# - timestamp: "2023-12-12T00:00:06.000Z"
# duration: 7
# cpu/utilization: 40
# cloud/instance-type: A1
# cloud/region: uk-west
# requests: 110
# - timestamp: "2023-12-12T00:00:13.000Z"
# duration: 30
# cpu/utilization: 33
# cloud/instance-type: A1
# cloud/region: uk-west
# requests: 180
child-2:
pipeline:
- interpolate
- cpu-factor-to-wattage
- wattage-times-duration
- wattage-to-energy-kwh
- calculate-vcpu-ratio
- correct-cpu-energy-for-vcpu-ratio
- sci-embodied
- operational-carbon
- sum-carbon
- time-sync
- sci
config:
group-by:
group:
- cloud/region
- cloud/instance-type
defaults:
cpu/thermal-design-power: 100
grid/carbon-intensity: 800
device/emissions-embodied: 1533.120 # gCO2eq
time-reserved: 3600 # 1hr in seconds
device/expected-lifespan: 94608000 # 3 years in seconds
vcpus-total: 8
vcpus-allocated: 1
inputs:
- timestamp: "2023-12-12T00:00:00.000Z"
duration: 1
cpu/utilization: 30
cloud/instance-type: A1
cloud/region: uk-west
requests: 100
- timestamp: "2023-12-12T00:00:01.000Z"
duration: 5
cpu/utilization: 28
cloud/instance-type: A1
cloud/region: uk-west
requests: 150
- timestamp: "2023-12-12T00:00:06.000Z"
duration: 7
cpu/utilization: 40
cloud/instance-type: A1
cloud/region: uk-west
requests: 110
- timestamp: "2023-12-12T00:00:13.000Z"
duration: 30
cpu/utilization: 33
cloud/instance-type: A1
cloud/region: uk-west
requests: 180
100 changes: 52 additions & 48 deletions manifests/examples/pipeline-with-mocks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ tree:
- operational-carbon
- sum-carbon
- time-sync
# - sci
- sci
config:
group-by:
group:
Expand Down Expand Up @@ -154,50 +154,54 @@ tree:
cloud/region: uk-west
cpu/utilization: 15
requests: 50
# child-2:
# pipeline:
# - teads-curve
# - sci-e
# - sci-embodied
# - sci-o
# - sum-carbon
# - time-sync
# - sci
# config:
# group-by:
# group:
# - cloud/region
# - cloud/instance-type
# defaults:
# cpu/thermal-design-power: 100
# grid/carbon-intensity: 800
# device/emissions-embodied: 1533.120 # gCO2eq
# time-reserved: 3600 # 1hr in seconds
# device/expected-lifespan: 94608000 # 3 years in seconds
# resources-reserved: 1
# resources-total: 8
# inputs:
# - timestamp: "2023-12-12T00:00:00.000Z"
# duration: 1
# cpu/utilization: 30
# cloud/instance-type: A1
# cloud/region: uk-west
# requests: 30
# - timestamp: "2023-12-12T00:00:01.000Z"
# duration: 5
# cpu/utilization: 28
# cloud/instance-type: A1
# cloud/region: uk-west
# requests: 40
# - timestamp: "2023-12-12T00:00:06.000Z"
# duration: 7
# cpu/utilization: 40
# cloud/instance-type: A1
# cloud/region: uk-west
# requests: 50
# - timestamp: "2023-12-12T00:00:13.000Z"
# duration: 30
# cpu/utilization: 33
# cloud/instance-type: A1
# cloud/region: uk-west
# requests: 60
child-2:
pipeline:
- interpolate
- cpu-factor-to-wattage
- wattage-times-duration
- wattage-to-energy-kwh
- calculate-vcpu-ratio
- correct-cpu-energy-for-vcpu-ratio
- sci-embodied
- operational-carbon
- sum-carbon
- time-sync
- sci
config:
group-by:
group:
- cloud/region
- cloud/instance-type
defaults:
cpu/thermal-design-power: 100
grid/carbon-intensity: 800
device/emissions-embodied: 1533.120 # gCO2eq
time-reserved: 3600 # 1hr in seconds
device/expected-lifespan: 94608000 # 3 years in seconds
vcpus-total: 8
vcpus-allocated: 1
inputs:
- timestamp: "2023-12-12T00:00:00.000Z"
duration: 1
cpu/utilization: 30
cloud/instance-type: A1
cloud/region: uk-west
requests: 30
- timestamp: "2023-12-12T00:00:01.000Z"
duration: 5
cpu/utilization: 28
cloud/instance-type: A1
cloud/region: uk-west
requests: 40
- timestamp: "2023-12-12T00:00:06.000Z"
duration: 7
cpu/utilization: 40
cloud/instance-type: A1
cloud/region: uk-west
requests: 50
- timestamp: "2023-12-12T00:00:13.000Z"
duration: 30
cpu/utilization: 33
cloud/instance-type: A1
cloud/region: uk-west
requests: 60
Loading