Skip to content

Commit bb83d4d

Browse files
committed
Merge branch 'main' into fix-parameter-metadata
2 parents f2fe489 + ce87cca commit bb83d4d

31 files changed

+655
-1016
lines changed

Refactor-migration-guide.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,7 @@ The aggregate plugin aggregates data in two ways: first it condenses individual
199199
200200
This is a builtin feature of IF, meaning it does not have to be initialized as a plugin. Instead, you just have to include a short config block in the top of the manifest file. There are two pieces of information required:
201201
202-
- `metrics`: which metrics do you want to aggregate? Every metric you provide here must exist in the output array.
203-
204-
- `method`: the aggregation method for the specied metric
202+
- `metrics`: which metrics do you want to aggregate? Every metric you provide here must exist in the output array and be described in the `parameter-metadata` of the plugin.
205203
206204
- `type`: the options are `horizontal`, `vertical` or both. Horizontal aggregation is the type that condenses each time series into a single summary value. Vertical aggregation is aggregated across components.
207205
@@ -210,8 +208,7 @@ Here's what the config block should look like:
210208
```yaml
211209
aggregation:
212210
metrics:
213-
'carbon':
214-
method: 'sum'
211+
- carbon
215212
type: 'both'
216213
```
217214

manifests/examples/pipelines/nesting.yml

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ tags:
66
category: on-premise
77
aggregation:
88
metrics:
9-
"carbon":
10-
method: sum
9+
- carbon
1110
type: "both"
1211
initialize:
1312
plugins:
@@ -139,6 +138,21 @@ initialize:
139138
- carbon-operational
140139
- carbon-embodied
141140
output-parameter: carbon
141+
parameter-metadata:
142+
inputs:
143+
carbon-operational:
144+
description: Operational carbon footprint
145+
unit: gCO2eq
146+
aggregation-method: sum
147+
carbon-embodied:
148+
description: Embodied carbon footprint
149+
unit: gCO2eq
150+
aggregation-method: sum
151+
outputs:
152+
carbon:
153+
description: Total carbon footprint
154+
unit: gCO2eq
155+
aggregation-method: sum
142156
time-sync:
143157
method: TimeSync
144158
path: "builtin"
@@ -169,10 +183,10 @@ initialize:
169183
unit: seconds
170184
description: time reserved for a component
171185
aggregation-method: avg
172-
network/energy:
173-
description: 'Energy consumed by the Network of the component'
174-
unit: 'kWh'
175-
aggregation-method: 'sum'
186+
network/energy:
187+
description: "Energy consumed by the Network of the component"
188+
unit: "kWh"
189+
aggregation-method: "sum"
176190
tree:
177191
children:
178192
child-0:

manifests/examples/pipelines/outputs-if-diff/pipeline-with-aggregate.yaml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ description: a full pipeline with the aggregate feature enabled
33
tags: null
44
aggregation:
55
metrics:
6-
carbon:
7-
method: sum
6+
- carbon
87
type: both
98
initialize:
109
plugins:
@@ -159,6 +158,21 @@ initialize:
159158
- carbon-operational
160159
- carbon-embodied
161160
output-parameter: carbon
161+
parameter-metadata:
162+
inputs:
163+
carbon-operational:
164+
description: Operational carbon footprint
165+
unit: gCO2eq
166+
aggregation-method: sum
167+
carbon-embodied:
168+
description: Embodied carbon footprint
169+
unit: gCO2eq
170+
aggregation-method: sum
171+
outputs:
172+
carbon:
173+
description: Total carbon footprint
174+
unit: gCO2eq
175+
aggregation-method: sum
162176
time-sync:
163177
path: builtin
164178
method: TimeSync

0 commit comments

Comments
 (0)