Merge pull request #1014 from Green-Software-Foundation/add-fix-manif…

…ests

Fix and add missing manifests

manifests/examples/builtins/csv-lookup/cloud-metadata/failure-invalid-vendor.yaml

@@ -10,8 +10,8 @@ initialize:
         filepath: >-
           https://raw.githubusercontent.com/Green-Software-Foundation/if-data/main/cloud-metdata-aws-instances.csv
         query:
-          instance-class: cloud/instance-type
-        output: ["cpu-cores-utilized", "vcpus-allocated"]
+          instance-class: cloud/vendor
+        output: ["cpu-cores-utilized", "cloud/instance-type"]
 tree:
   children:
     child:

manifests/examples/builtins/csv-lookup/cloud-metadata/failure-missing-cloud-vendor.yml

@@ -10,7 +10,7 @@ initialize:
         filepath: >-
           https://raw.githubusercontent.com/Green-Software-Foundation/if-data/main/cloud-metdata-aws-instances.csv
         query:
-          instance-class: cloud/instance-type
+          instance-class: cloud/vendor
         output: ["cpu-cores-utilized", "vcpus-allocated"]
 tree:
   children:

manifests/examples/builtins/csv-lookup/region-metadata/failure-missing-output.yml

@@ -11,7 +11,7 @@ initialize:
         query:
           cloud-provider: "cloud/provider"
           cloud-region: "cloud/region"
-        output: "*"
+        output:
 tree:
   children:
     child:

manifests/examples/builtins/regex/failure-not-matching-with-regex.yml

@@ -8,7 +8,7 @@ initialize:
       path: "builtin"
       config:
         parameter: physical-processor
-        match: ^
+        match: ^$
         output: cpu/name
 tree:
   children:

manifests/examples/builtins/time-sync/failure-config-start-later-end.yml

@@ -2,8 +2,6 @@ name: time-sync
 description: failure with `config.start-time` being later than `config.end-time`
 tags:
 initialize:
-  output:
-    - yaml
   plugins:
     "time-sync":
       method: TimeSync

manifests/examples/features/regroup/failure-missing-cloud-instance-type.yml

@@ -1,7 +1,7 @@
 name: regroup
 description:
 initialize:
-  plugins:
+  plugins: {}
 tree:
   children:
     my-app:

manifests/examples/pipelines/nesting.yml

@@ -24,12 +24,16 @@ initialize:
           cpu/utilization:
             unit: percentage
             description: refers to CPU utilization.
-            aggregation-method: avg
+            aggregation-method:
+              time: avg
+              component: sum
         outputs:
           cpu-factor:
             unit: kWh
             description: result of interpolate
-            aggregation-method: avg
+            aggregation-method:
+              time: avg
+              component: avg
     "cpu-factor-to-wattage":
       method: Multiply
       path: builtin
@@ -41,16 +45,22 @@ initialize:
           cpu-factor:
             unit: kWh
             description: result of interpolate
-            aggregation-method: avg
+            aggregation-method:
+              time: avg
+              component: avg
           cpu/thermal-design-power:
             unit: kWh
             description: thermal design power for a processor
-            aggregation-method: avg
+            aggregation-method:
+              time: avg
+              component: avg
         outputs:
           cpu-wattage:
             unit: kWh
             description: the energy used by the CPU
-            aggregation-method: sum
+            aggregation-method:
+              time: sum
+              component: sum
     "wattage-times-duration":
       method: Multiply
       path: builtin
@@ -69,12 +79,16 @@ initialize:
           cpu-wattage-times-duration:
             unit: kWh
             description: CPU wattage multiplied by duration
-            aggregation-method: sum
+            aggregation-method:
+              time: sum
+              component: sum
         outputs:
           cpu-energy-raw:
             unit: kWh
             description: Raw energy used by CPU in kWh
-            aggregation-method: sum
+            aggregation-method:
+              time: sum
+              component: sum
     "calculate-vcpu-ratio":
       method: Divide
       path: "builtin"
@@ -87,7 +101,9 @@ initialize:
           vcpu-ratio:
             unit: none
             description: Ratio of vCPUs
-            aggregation-method: none
+            aggregation-method:
+              time: copy
+              component: copy
     "correct-cpu-energy-for-vcpu-ratio":
       method: Divide
       path: "builtin"
@@ -109,16 +125,22 @@ initialize:
           cpu-energy-kwh:
             unit: kWh
             description: Corrected CPU energy in kWh
-            aggregation-method: sum
+            aggregation-method:
+              time: sum
+              component: sum
           grid/carbon-intensity:
             unit: gCO2eq/kWh
             description: Carbon intensity for the grid
-            aggregation-method: avg
+            aggregation-method:
+              time: avg
+              component: avg
         outputs:
           carbon-operational:
             unit: gCO2eq
             description: Operational carbon footprint
-            aggregation-method: sum
+            aggregation-method:
+              time: sum
+              component: sum
     sci:
       path: "builtin"
       method: Sci
@@ -129,7 +151,9 @@ initialize:
           requests:
             unit: none
             description: expressed the final SCI value
-            aggregation-method: sum
+            aggregation-method:
+              time: sum
+              component: sum
     "sum-carbon":
       path: "builtin"
       method: Sum
@@ -143,16 +167,22 @@ initialize:
           carbon-operational:
             description: Operational carbon footprint
             unit: gCO2eq
-            aggregation-method: sum
+            aggregation-method:
+              time: sum
+              component: sum
           embodied-carbon:
             description: Embodied carbon footprint
             unit: gCO2eq
-            aggregation-method: sum
+            aggregation-method:
+              time: sum
+              component: sum
         outputs:
           carbon:
             description: Total carbon footprint
             unit: gCO2eq
-            aggregation-method: sum
+            aggregation-method:
+              time: sum
+              component: sum
     time-sync:
       method: TimeSync
       path: "builtin"
@@ -166,27 +196,39 @@ initialize:
           timestamp:
             unit: RFC3339
             description: refers to the time of occurrence of the input
-            aggregation-method: none
+            aggregation-method:
+              time: none
+              component: none
           duration:
             unit: seconds
             description: refers to the duration of the input
-            aggregation-method: sum
+            aggregation-method:
+              time: sum
+              component: sum
           cloud/instance-type:
             unit: none
             description: type of Cloud Instance name used in the cloud provider APIs
-            aggregation-method: none
+            aggregation-method:
+              time: copy
+              component: copy
           cloud/region:
             unit: none
             description: region cloud instance
-            aggregation-method: none
+            aggregation-method:
+              time: copy
+              component: copy
           time-reserved:
             unit: seconds
             description: time reserved for a component
-            aggregation-method: avg
+            aggregation-method:
+              time: avg
+              component: avg
           network/energy:
             description: "Energy consumed by the Network of the component"
             unit: "kWh"
-            aggregation-method: "sum"
+            aggregation-method:
+              time: sum
+              component: sum
 tree:
   children:
     child-0: