From a6a8b320068584d68bb8fe860240c230dbcb6d38 Mon Sep 17 00:00:00 2001 From: MariamKhalatova Date: Thu, 20 Jun 2024 12:40:47 +0400 Subject: [PATCH 1/5] fix(manifests): update bugs to use builtins --- .../bugs/aggregation-error-wrong-metric.yml | 24 ++++++++++++------- .../bugs/azure-importer-ignoring-defaults.yml | 9 ++++--- .../azure-importer-incorrect-calculation.yml | 9 ++++--- manifests/bugs/pipeline-ordering-error.yml | 11 +++++---- 4 files changed, 35 insertions(+), 18 deletions(-) diff --git a/manifests/bugs/aggregation-error-wrong-metric.yml b/manifests/bugs/aggregation-error-wrong-metric.yml index e9a9af6ea..f95a9eed7 100644 --- a/manifests/bugs/aggregation-error-wrong-metric.yml +++ b/manifests/bugs/aggregation-error-wrong-metric.yml @@ -12,15 +12,23 @@ initialize: method: TeadsCurve global-config: interpolation: spline - "sci-e": - path: "@grnsft/if-plugins" - method: SciE + "sum-energy-components": + path: "builtin" + method: Sum + global-config: + input-parameters: + - cpu/energy + - network/energy + output-parameter: energy "sci-embodied": path: "builtin" method: SciEmbodied - "sci-o": - path: "@grnsft/if-plugins" - method: SciO + "operational-carbon": + method: Multiply + path: builtin + global-config: + input-parameters: ["energy", "grid/carbon-intensity"] + output-parameter: "carbon-operational" "sci": path: "builtin" method: Sci @@ -43,9 +51,9 @@ tree: child-1: pipeline: - teads-curve - - sci-e + - sum-energy-components - sci-embodied - - sci-o + - operational-carbon - time-sync - sci config: diff --git a/manifests/bugs/azure-importer-ignoring-defaults.yml b/manifests/bugs/azure-importer-ignoring-defaults.yml index 424be5e84..b6749ee70 100644 --- a/manifests/bugs/azure-importer-ignoring-defaults.yml +++ b/manifests/bugs/azure-importer-ignoring-defaults.yml @@ -28,9 +28,12 @@ initialize: input-parameter: network/energy coefficient: 1000 output-parameter: network/energy - "sci-o": - method: SciO - path: "@grnsft/if-plugins" + "operational-carbon": + method: Multiply + path: builtin + global-config: + input-parameters: ["energy", "grid/carbon-intensity"] + output-parameter: "carbon-operational" "group-by": path: "builtin" method: GroupBy diff --git a/manifests/bugs/azure-importer-incorrect-calculation.yml b/manifests/bugs/azure-importer-incorrect-calculation.yml index fa4cc17d0..bbac70ae2 100644 --- a/manifests/bugs/azure-importer-incorrect-calculation.yml +++ b/manifests/bugs/azure-importer-incorrect-calculation.yml @@ -20,9 +20,12 @@ initialize: input-parameter: network/energy coefficient: 1000 output-parameter: network/energy - sci-o: - path: '@grnsft/if-plugins' - method: SciO + "operational-carbon": + method: Multiply + path: builtin + global-config: + input-parameters: ["energy", "grid/carbon-intensity"] + output-parameter: "carbon-operational" group-by: path: builtin method: GroupBy diff --git a/manifests/bugs/pipeline-ordering-error.yml b/manifests/bugs/pipeline-ordering-error.yml index 3538465ea..554134287 100644 --- a/manifests/bugs/pipeline-ordering-error.yml +++ b/manifests/bugs/pipeline-ordering-error.yml @@ -19,9 +19,12 @@ initialize: "sci-embodied": path: "builtin" method: SciEmbodied - "sci-o": - path: "@grnsft/if-plugins" - method: SciO + "operational-carbon": + method: Multiply + path: builtin + global-config: + input-parameters: ["cpu/energy", "grid/carbon-intensity"] + output-parameter: "carbon-operational" "sci": path: "builtin" method: Sci @@ -41,7 +44,7 @@ tree: child-1: pipeline: - teads-curve - - sci-o + - operational-carbon - sum - sci-embodied - time-sync From ec099f839f0c273bd3c47af36c8da7939f4fa099 Mon Sep 17 00:00:00 2001 From: MariamKhalatova Date: Thu, 20 Jun 2024 12:42:45 +0400 Subject: [PATCH 2/5] fix(manifests): update examples to use builtins --- manifests/examples/basic.yml | 28 --- manifests/examples/instance-metadata.yml | 25 +-- .../examples/mock-cpu-util-to-carbon.yml | 10 +- manifests/examples/nesting.yml | 11 +- manifests/examples/pipeline-teads-sci.yml | 11 +- .../examples/pipeline-with-aggregate.yml | 178 +++++++++++------- manifests/examples/pipeline-with-mocks.yml | 169 ++++++++++------- 7 files changed, 240 insertions(+), 192 deletions(-) delete mode 100644 manifests/examples/basic.yml diff --git a/manifests/examples/basic.yml b/manifests/examples/basic.yml deleted file mode 100644 index e737f5d5b..000000000 --- a/manifests/examples/basic.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: basic -description: a minimal manifest executing a single plugin on a single component for a single timestep -tags: -initialize: - plugins: - teads-curve: - path: '@grnsft/if-unofficial-plugins' - method: TeadsCurve - global-config: - interpolation: spline - outputs: ['yaml'] -tree: - children: - child-0: - defaults: - cpu/thermal-design-power: 100 - pipeline: - - teads-curve - inputs: - - timestamp: 2023-07-06T00:00 - duration: 1 - cpu/utilization: 20 - - timestamp: 2023-07-06T00:01 - duration: 1 - cpu/utilization: 80 - - timestamp: 2023-07-06T00:02 - duration: 1 - cpu/utilization: 20 diff --git a/manifests/examples/instance-metadata.yml b/manifests/examples/instance-metadata.yml index c3e514773..ea0998241 100644 --- a/manifests/examples/instance-metadata.yml +++ b/manifests/examples/instance-metadata.yml @@ -1,23 +1,6 @@ name: csv-demo -<<<<<<< add-tdp-manifest description: tags: -initialize: - plugins: - cloud-instance-metadata: - method: CSVLookup - path: "builtin" - global-config: - filepath: https://raw.githubusercontent.com/Green-Software-Foundation/if-data/main/cloud-metdata-azure-instances.csv - query: - instance-class: "cloud/instance-type" - output: "*" - extract-processor-name: - method: Regex - path: "builtin" -======= -description: null -tags: null initialize: plugins: cloud-instance-metadata: @@ -32,16 +15,12 @@ initialize: extract-processor-name: path: builtin method: Regex ->>>>>>> main global-config: parameter: cpu-model-name match: /^([^,])+/g output: cpu/name -<<<<<<< add-tdp-manifest -======= - outputs: - - yaml ->>>>>>> main + # outputs: + # - yaml tree: children: child: diff --git a/manifests/examples/mock-cpu-util-to-carbon.yml b/manifests/examples/mock-cpu-util-to-carbon.yml index 35f7cea26..64e6d6719 100644 --- a/manifests/examples/mock-cpu-util-to-carbon.yml +++ b/manifests/examples/mock-cpu-util-to-carbon.yml @@ -21,8 +21,14 @@ initialize: global-config: interpolation: spline cloud-metadata: - method: CloudMetadata - path: "@grnsft/if-plugins" + path: builtin + method: CSVLookup + global-config: + filepath: >- + https://raw.githubusercontent.com/Green-Software-Foundation/if-data/main/cloud-metdata-azure-instances.csv + query: + instance-class: cloud/instance-type + output: ['cpu-cores-utilized', 'vcpus-allocated'] mock-observations: path: 'builtin' method: MockObservations diff --git a/manifests/examples/nesting.yml b/manifests/examples/nesting.yml index e56e8bb18..a5bf89230 100644 --- a/manifests/examples/nesting.yml +++ b/manifests/examples/nesting.yml @@ -29,9 +29,12 @@ initialize: sci-embodied: path: "builtin" method: SciEmbodied - sci-o: - path: "@grnsft/if-plugins" - method: SciO + "operational-carbon": + method: Multiply + path: builtin + global-config: + input-parameters: ["energy", "grid/carbon-intensity"] + output-parameter: "carbon-operational" sci: path: "builtin" method: Sci @@ -68,7 +71,7 @@ tree: - teads-curve - sum - sci-embodied - - sci-o + - operational-carbon - sum-carbon - time-sync - sci diff --git a/manifests/examples/pipeline-teads-sci.yml b/manifests/examples/pipeline-teads-sci.yml index 01c491cdc..bf20cc251 100644 --- a/manifests/examples/pipeline-teads-sci.yml +++ b/manifests/examples/pipeline-teads-sci.yml @@ -19,9 +19,12 @@ initialize: "sci-embodied": path: "builtin" method: SciEmbodied - "sci-o": - path: "@grnsft/if-plugins" - method: SciO + "operational-carbon": + method: Multiply + path: builtin + global-config: + input-parameters: ["cpu/energy", "grid/carbon-intensity"] + output-parameter: "carbon-operational" "sci": path: "builtin" method: Sci @@ -50,7 +53,7 @@ tree: - teads-curve - sum - sci-embodied - - sci-o + - operational-carbon - sum-carbon - sci config: diff --git a/manifests/examples/pipeline-with-aggregate.yml b/manifests/examples/pipeline-with-aggregate.yml index bd3e637ac..d1b90b152 100644 --- a/manifests/examples/pipeline-with-aggregate.yml +++ b/manifests/examples/pipeline-with-aggregate.yml @@ -7,25 +7,63 @@ aggregation: type: "both" initialize: plugins: - "teads-curve": - path: "@grnsft/if-unofficial-plugins" - method: TeadsCurve + "interpolate": + method: Interpolation + path: 'builtin' global-config: - interpolation: spline - "sci-e": - path: "@grnsft/if-plugins" - method: SciE + method: linear + x: [0, 10, 50, 100] + y: [0.12, 0.32, 0.75, 1.02] + input-parameter: 'cpu/utilization' + output-parameter: 'cpu-factor' + "cpu-factor-to-wattage": + method: Multiply + path: builtin + global-config: + input-parameters: ["cpu-factor", "cpu/thermal-design-power"] + output-parameter: "cpu-wattage" + "wattage-times-duration": + method: Multiply + path: builtin + global-config: + input-parameters: ["cpu-wattage", "duration"] + output-parameter: "cpu-wattage-times-duration" + "wattage-to-energy-kwh": + method: Divide + path: "builtin" + global-config: + numerator: cpu-wattage-times-duration + denominator: 3600000 + output: cpu-energy-raw + "calculate-vcpu-ratio": + method: Divide + path: "builtin" + global-config: + numerator: vcpus-total + denominator: vcpus-allocated + output: vcpu-ratio + "correct-cpu-energy-for-vcpu-ratio": + method: Divide + path: "builtin" + global-config: + numerator: cpu-energy-raw + denominator: vcpu-ratio + output: cpu-energy-kwh "sci-embodied": path: "builtin" method: SciEmbodied - "sci-o": - path: "@grnsft/if-plugins" - method: SciO + "operational-carbon": + method: Multiply + path: builtin + global-config: + input-parameters: ["cpu-energy-kwh", "grid/carbon-intensity"] + output-parameter: "carbon-operational" "sci": path: "builtin" method: Sci global-config: - functional-unit: "requests" + functional-unit-time: 1 sec + functional-unit: requests # factor to convert per time to per f.unit "sum-carbon": path: "builtin" method: Sum @@ -42,20 +80,21 @@ initialize: end-time: "2023-12-12T00:01:00.000Z" interval: 5 allow-padding: true - "group-by": - path: builtin - method: GroupBy tree: children: child-1: pipeline: - - teads-curve - - sci-e + - interpolate + - cpu-factor-to-wattage + - wattage-times-duration + - wattage-to-energy-kwh + - calculate-vcpu-ratio + - correct-cpu-energy-for-vcpu-ratio - sci-embodied - - sci-o + - operational-carbon - sum-carbon - time-sync - - sci + # - sci config: group-by: group: @@ -67,8 +106,8 @@ tree: 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 + vcpus-total: 8 + vcpus-allocated: 1 inputs: - timestamp: "2023-12-12T00:00:00.000Z" cloud/instance-type: A1 @@ -94,50 +133,55 @@ tree: cloud/region: uk-west cpu/utilization: 15 requests: 30 - 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: 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-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 diff --git a/manifests/examples/pipeline-with-mocks.yml b/manifests/examples/pipeline-with-mocks.yml index 008e319b1..fde8963ef 100644 --- a/manifests/examples/pipeline-with-mocks.yml +++ b/manifests/examples/pipeline-with-mocks.yml @@ -25,20 +25,57 @@ initialize: cpu/utilization: min: 1 max: 99 - "teads-curve": - path: "@grnsft/if-unofficial-plugins" - method: TeadsCurve + "interpolate": + method: Interpolation + path: 'builtin' global-config: - interpolation: spline - "sci-e": - path: "@grnsft/if-plugins" - method: SciE + method: linear + x: [0, 10, 50, 100] + y: [0.12, 0.32, 0.75, 1.02] + input-parameter: 'cpu/utilization' + output-parameter: 'cpu-factor' + "cpu-factor-to-wattage": + method: Multiply + path: builtin + global-config: + input-parameters: ["cpu-factor", "cpu/thermal-design-power"] + output-parameter: "cpu-wattage" + "wattage-times-duration": + method: Multiply + path: builtin + global-config: + input-parameters: ["cpu-wattage", "duration"] + output-parameter: "cpu-wattage-times-duration" + "wattage-to-energy-kwh": + method: Divide + path: "builtin" + global-config: + numerator: cpu-wattage-times-duration + denominator: 3600000 + output: cpu-energy-raw + "calculate-vcpu-ratio": + method: Divide + path: "builtin" + global-config: + numerator: vcpus-total + denominator: vcpus-allocated + output: vcpu-ratio + "correct-cpu-energy-for-vcpu-ratio": + method: Divide + path: "builtin" + global-config: + numerator: cpu-energy-raw + denominator: vcpu-ratio + output: cpu-energy-kwh "sci-embodied": path: "builtin" method: SciEmbodied - "sci-o": - path: "@grnsft/if-plugins" - method: SciO + "operational-carbon": + method: Multiply + path: builtin + global-config: + input-parameters: ["cpu-energy-kwh", "grid/carbon-intensity"] + output-parameter: "carbon-operational" "sum-carbon": path: "builtin" method: Sum @@ -68,13 +105,17 @@ tree: children: child-1: pipeline: - - teads-curve - - sci-e + - interpolate + - cpu-factor-to-wattage + - wattage-times-duration + - wattage-to-energy-kwh + - calculate-vcpu-ratio + - correct-cpu-energy-for-vcpu-ratio - sci-embodied - - sci-o + - operational-carbon - sum-carbon - time-sync - - sci + # - sci config: group-by: group: @@ -86,8 +127,8 @@ tree: 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 + vcpus-total: 8 + vcpus-allocated: 1 functional-unit-time: "1 min" inputs: - timestamp: "2023-12-12T00:00:00.000Z" @@ -114,51 +155,51 @@ 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 - functional-unit-time: "1 min" - 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: + # - 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 + # functional-unit-time: "1 min" + # 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 From 918fde8c1b1c4e0aa20afcd1112f4319b5ef29a4 Mon Sep 17 00:00:00 2001 From: MariamKhalatova Date: Thu, 20 Jun 2024 12:43:54 +0400 Subject: [PATCH 3/5] fix(manifests): update features to use builtins --- ...ics.yml => aggregate-failure-invalid-metrics.yml} | 12 +++++++++--- .../aggregate-failure-missing-metric-in-inputs.yml | 12 +++++++++--- manifests/features/aggregate-horizontal.yml | 10 ++++++++-- manifests/features/aggregate-vertical.yml | 10 ++++++++-- manifests/features/aggregate.yml | 10 ++++++++-- 5 files changed, 42 insertions(+), 12 deletions(-) rename manifests/features/{aggregate-failure-inalid-metrics.yml => aggregate-failure-invalid-metrics.yml} (75%) diff --git a/manifests/features/aggregate-failure-inalid-metrics.yml b/manifests/features/aggregate-failure-invalid-metrics.yml similarity index 75% rename from manifests/features/aggregate-failure-inalid-metrics.yml rename to manifests/features/aggregate-failure-invalid-metrics.yml index cf2e31bce..7e4692509 100644 --- a/manifests/features/aggregate-failure-inalid-metrics.yml +++ b/manifests/features/aggregate-failure-invalid-metrics.yml @@ -1,5 +1,5 @@ name: Aggregation -description: Apply both `horizontal` and `vertical` aggregations +description: Fails with invalid metric. aggregation: metrics: - 'test' @@ -7,8 +7,14 @@ aggregation: initialize: plugins: cloud-metadata: - method: CloudMetadata - path: "@grnsft/if-plugins" + path: builtin + method: CSVLookup + global-config: + 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'] tree: children: application: diff --git a/manifests/features/aggregate-failure-missing-metric-in-inputs.yml b/manifests/features/aggregate-failure-missing-metric-in-inputs.yml index 3857d0f76..eeff85290 100644 --- a/manifests/features/aggregate-failure-missing-metric-in-inputs.yml +++ b/manifests/features/aggregate-failure-missing-metric-in-inputs.yml @@ -1,5 +1,5 @@ name: Aggregation -description: Apply both `horizontal` and `vertical` aggregations +description: Fails with missing metric in inputs. aggregation: metrics: - 'cpu/utilization' @@ -7,8 +7,14 @@ aggregation: initialize: plugins: cloud-metadata: - method: CloudMetadata - path: "@grnsft/if-plugins" + path: builtin + method: CSVLookup + global-config: + 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'] tree: children: application: diff --git a/manifests/features/aggregate-horizontal.yml b/manifests/features/aggregate-horizontal.yml index 114074795..8003c4214 100644 --- a/manifests/features/aggregate-horizontal.yml +++ b/manifests/features/aggregate-horizontal.yml @@ -7,8 +7,14 @@ aggregation: initialize: plugins: cloud-metadata: - method: CloudMetadata - path: "@grnsft/if-plugins" + path: builtin + method: CSVLookup + global-config: + 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'] tree: children: application: diff --git a/manifests/features/aggregate-vertical.yml b/manifests/features/aggregate-vertical.yml index b37f8e22a..6308a01d0 100644 --- a/manifests/features/aggregate-vertical.yml +++ b/manifests/features/aggregate-vertical.yml @@ -7,8 +7,14 @@ aggregation: initialize: plugins: cloud-metadata: - method: CloudMetadata - path: "@grnsft/if-plugins" + path: builtin + method: CSVLookup + global-config: + 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'] tree: children: application: diff --git a/manifests/features/aggregate.yml b/manifests/features/aggregate.yml index f320a13ea..04672cf38 100644 --- a/manifests/features/aggregate.yml +++ b/manifests/features/aggregate.yml @@ -7,8 +7,14 @@ aggregation: initialize: plugins: cloud-metadata: - method: CloudMetadata - path: "@grnsft/if-plugins" + path: builtin + method: CSVLookup + global-config: + 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'] tree: children: application: From b80ab76e34f5901615c9424702d3717d01c7fdb7 Mon Sep 17 00:00:00 2001 From: MariamKhalatova Date: Thu, 20 Jun 2024 12:45:11 +0400 Subject: [PATCH 4/5] fix(manifests): update integrations to use builtins --- .../cloud-metadata-divide-boavizta.yml | 10 ++++-- .../failure-invalid-instance-type.yaml | 33 +++++++++++++++++++ .../failure-invalid-provider.yaml | 33 +++++++++++++++++++ .../failure-missing-queried-input.yml | 33 +++++++++++++++++++ .../instance-metadata/success.yml | 33 +++++++++++++++++++ .../mock-obs-group-by-cloud-meta.yml | 10 ++++-- 6 files changed, 148 insertions(+), 4 deletions(-) create mode 100644 manifests/integrations/instance-metadata/failure-invalid-instance-type.yaml create mode 100644 manifests/integrations/instance-metadata/failure-invalid-provider.yaml create mode 100644 manifests/integrations/instance-metadata/failure-missing-queried-input.yml create mode 100644 manifests/integrations/instance-metadata/success.yml diff --git a/manifests/integrations/cloud-metadata-divide-boavizta.yml b/manifests/integrations/cloud-metadata-divide-boavizta.yml index cafd1467b..efb48f0ab 100644 --- a/manifests/integrations/cloud-metadata-divide-boavizta.yml +++ b/manifests/integrations/cloud-metadata-divide-boavizta.yml @@ -4,8 +4,14 @@ tags: initialize: plugins: cloud-metadata: - method: CloudMetadata - path: "@grnsft/if-plugins" + path: builtin + method: CSVLookup + global-config: + 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'] divide: method: Divide path: "builtin" diff --git a/manifests/integrations/instance-metadata/failure-invalid-instance-type.yaml b/manifests/integrations/instance-metadata/failure-invalid-instance-type.yaml new file mode 100644 index 000000000..810dee072 --- /dev/null +++ b/manifests/integrations/instance-metadata/failure-invalid-instance-type.yaml @@ -0,0 +1,33 @@ +name: instance-metadata +description: +tags: +initialize: + plugins: + cloud-instance-metadata: + method: CSVLookup + path: "builtin" + global-config: + filepath: https://raw.githubusercontent.com/Green-Software-Foundation/if-data/main/cloud-metdata-azure-instances.csv + query: + instance-class: "cloud/instance-type" + output: "*" + extract-processor-name: + method: Regex + path: "builtin" + global-config: + parameter: cpu-model-name + match: /^([^,])+/g + output: cpu/name +tree: + children: + child: + pipeline: + - cloud-instance-metadata + - extract-processor-name + inputs: + - timestamp: 2023-08-06T00:00 + duration: 3600 + cpu/energy: 0.001 + cloud/provider: gcp + cloud/region: asia-east + cloud/instance-type: m6 \ No newline at end of file diff --git a/manifests/integrations/instance-metadata/failure-invalid-provider.yaml b/manifests/integrations/instance-metadata/failure-invalid-provider.yaml new file mode 100644 index 000000000..a362132e7 --- /dev/null +++ b/manifests/integrations/instance-metadata/failure-invalid-provider.yaml @@ -0,0 +1,33 @@ +name: instance-metadata +description: +tags: +initialize: + plugins: + cloud-instance-metadata: + method: CSVLookup + path: "builtin" + global-config: + filepath: https://raw.githubusercontent.com/Green-Software-Foundation/if-data/main/cloud-metdata-azure-instances.csv + query: + instance-class: "cloud/provider" + output: "*" + extract-processor-name: + method: Regex + path: "builtin" + global-config: + parameter: cpu-model-name + match: /^([^,])+/g + output: cpu/name +tree: + children: + child: + pipeline: + - cloud-instance-metadata + - extract-processor-name + inputs: + - timestamp: 2023-08-06T00:00 + duration: 3600 + cpu/energy: 0.001 + cloud/provider: 6568 + cloud/region: asia-east + cloud/instance-type: Standard_A1_v2 diff --git a/manifests/integrations/instance-metadata/failure-missing-queried-input.yml b/manifests/integrations/instance-metadata/failure-missing-queried-input.yml new file mode 100644 index 000000000..37f4001ae --- /dev/null +++ b/manifests/integrations/instance-metadata/failure-missing-queried-input.yml @@ -0,0 +1,33 @@ +name: instance-metadata +description: +tags: +initialize: + plugins: + cloud-instance-metadata: + method: CSVLookup + path: "builtin" + global-config: + filepath: https://raw.githubusercontent.com/Green-Software-Foundation/if-data/main/cloud-metdata-azure-instances.csv + query: + instance-class: "cloud/provider" + output: "*" + extract-processor-name: + method: Regex + path: "builtin" + global-config: + parameter: cpu-model-name + match: /^([^,])+/g + output: cpu/name +tree: + children: + child: + pipeline: + - cloud-instance-metadata + - extract-processor-name + inputs: + - timestamp: 2023-08-06T00:00 + duration: 3600 + cpu/energy: 0.001 + # cloud/provider: gcp + cloud/region: asia-east + cloud/instance-type: Standard_A1_v2 \ No newline at end of file diff --git a/manifests/integrations/instance-metadata/success.yml b/manifests/integrations/instance-metadata/success.yml new file mode 100644 index 000000000..d95115896 --- /dev/null +++ b/manifests/integrations/instance-metadata/success.yml @@ -0,0 +1,33 @@ +name: instance-metadata +description: +tags: +initialize: + plugins: + cloud-instance-metadata: + method: CSVLookup + path: "builtin" + global-config: + filepath: https://raw.githubusercontent.com/Green-Software-Foundation/if-data/main/cloud-metdata-azure-instances.csv + query: + instance-class: "cloud/instance-type" + output: "*" + extract-processor-name: + method: Regex + path: "builtin" + global-config: + parameter: cpu-model-name + match: /^([^,])+/g + output: cpu/name +tree: + children: + child: + pipeline: + - cloud-instance-metadata + - extract-processor-name + inputs: + - timestamp: 2023-08-06T00:00 + duration: 3600 + cpu/energy: 0.001 + cloud/provider: gcp + cloud/region: asia-east + cloud/instance-type: Standard_A1_v2 \ No newline at end of file diff --git a/manifests/integrations/mock-obs-group-by-cloud-meta.yml b/manifests/integrations/mock-obs-group-by-cloud-meta.yml index b0d43f2a5..6b6196cab 100644 --- a/manifests/integrations/mock-obs-group-by-cloud-meta.yml +++ b/manifests/integrations/mock-obs-group-by-cloud-meta.yml @@ -14,8 +14,14 @@ initialize: input-parameters: ['cpu/energy', 'grid/carbon-intensity'] output-parameter: 'carbon' cloud-metadata: - method: CloudMetadata - path: "@grnsft/if-plugins" + path: builtin + method: CSVLookup + global-config: + filepath: >- + https://raw.githubusercontent.com/Green-Software-Foundation/if-data/main/cloud-metdata-azure-instances.csv + query: + instance-class: cloud/instance-type + output: ['cpu-tdp'] mock-observations: path: 'builtin' method: MockObservations From ae53a1cc1fc13449b1707e2c6243377e8395d080 Mon Sep 17 00:00:00 2001 From: MariamKhalatova Date: Thu, 20 Jun 2024 12:46:12 +0400 Subject: [PATCH 5/5] fix(manifests): update plugins to use builtins --- .../failure-invalid-instance-type.yaml | 12 ++++++--- .../failure-invalid-vendor.yaml | 10 +++++-- .../failure-missing-cloud-vendor.yml | 12 ++++++--- .../cloud-metadata/success.yml | 10 +++++-- .../failure-missing-column.yml | 0 .../failure-missing-output.yml | 0 .../success-renaming.yml | 0 .../{ => region-metadata}/success.yml | 0 .../failure-missing-input-param.yml | 23 ++++++++++++++++ ...failure-unsupported-physical-processor.yml | 24 +++++++++++++++++ .../plugins/csv-lookup/tdp-finder/success.yml | 24 +++++++++++++++++ .../divide/failure-denominator-equal-zero.yml | 10 +++++-- .../failure-invalid-config-denominator.yml | 10 +++++-- .../divide/failure-missing-numerator.yml | 10 +++++-- manifests/plugins/divide/success.yml | 10 +++++-- manifests/plugins/exponent/success.yml | 26 +++++++++++++++++++ manifests/plugins/interpolation/success.yml | 24 +++++++++++++++++ manifests/plugins/subtract/success.yml | 25 ++++++++++++++++++ .../failure-missing-input-param.yml | 18 ------------- ...failure-unsupported-physical-processor.yml | 19 -------------- manifests/plugins/tdp-finder/success.yml | 19 -------------- 21 files changed, 212 insertions(+), 74 deletions(-) rename manifests/plugins/{ => csv-lookup}/cloud-metadata/failure-invalid-instance-type.yaml (57%) rename manifests/plugins/{ => csv-lookup}/cloud-metadata/failure-invalid-vendor.yaml (59%) rename manifests/plugins/{ => csv-lookup}/cloud-metadata/failure-missing-cloud-vendor.yml (56%) rename manifests/plugins/{ => csv-lookup}/cloud-metadata/success.yml (57%) rename manifests/plugins/csv-lookup/{ => region-metadata}/failure-missing-column.yml (100%) rename manifests/plugins/csv-lookup/{ => region-metadata}/failure-missing-output.yml (100%) rename manifests/plugins/csv-lookup/{ => region-metadata}/success-renaming.yml (100%) rename manifests/plugins/csv-lookup/{ => region-metadata}/success.yml (100%) create mode 100644 manifests/plugins/csv-lookup/tdp-finder/failure-missing-input-param.yml create mode 100644 manifests/plugins/csv-lookup/tdp-finder/failure-unsupported-physical-processor.yml create mode 100644 manifests/plugins/csv-lookup/tdp-finder/success.yml create mode 100644 manifests/plugins/exponent/success.yml create mode 100644 manifests/plugins/interpolation/success.yml create mode 100644 manifests/plugins/subtract/success.yml delete mode 100644 manifests/plugins/tdp-finder/failure-missing-input-param.yml delete mode 100644 manifests/plugins/tdp-finder/failure-unsupported-physical-processor.yml delete mode 100644 manifests/plugins/tdp-finder/success.yml diff --git a/manifests/plugins/cloud-metadata/failure-invalid-instance-type.yaml b/manifests/plugins/csv-lookup/cloud-metadata/failure-invalid-instance-type.yaml similarity index 57% rename from manifests/plugins/cloud-metadata/failure-invalid-instance-type.yaml rename to manifests/plugins/csv-lookup/cloud-metadata/failure-invalid-instance-type.yaml index 9bb4581ef..fa55623c2 100644 --- a/manifests/plugins/cloud-metadata/failure-invalid-instance-type.yaml +++ b/manifests/plugins/csv-lookup/cloud-metadata/failure-invalid-instance-type.yaml @@ -2,11 +2,17 @@ name: cloud-metadata description: cloud/instance-type instance type is not supported in the cloud vendor tags: initialize: - outputs: ['yaml'] + # outputs: ['yaml'] plugins: cloud-metadata: - method: CloudMetadata - path: "@grnsft/if-plugins" + path: builtin + method: CSVLookup + global-config: + 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'] tree: children: child: diff --git a/manifests/plugins/cloud-metadata/failure-invalid-vendor.yaml b/manifests/plugins/csv-lookup/cloud-metadata/failure-invalid-vendor.yaml similarity index 59% rename from manifests/plugins/cloud-metadata/failure-invalid-vendor.yaml rename to manifests/plugins/csv-lookup/cloud-metadata/failure-invalid-vendor.yaml index 9e2ebe4f2..c474c91fe 100644 --- a/manifests/plugins/cloud-metadata/failure-invalid-vendor.yaml +++ b/manifests/plugins/csv-lookup/cloud-metadata/failure-invalid-vendor.yaml @@ -5,8 +5,14 @@ initialize: #outputs: ['yaml'] plugins: cloud-metadata: - method: CloudMetadata - path: "@grnsft/if-plugins" + path: builtin + method: CSVLookup + global-config: + 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'] tree: children: child: diff --git a/manifests/plugins/cloud-metadata/failure-missing-cloud-vendor.yml b/manifests/plugins/csv-lookup/cloud-metadata/failure-missing-cloud-vendor.yml similarity index 56% rename from manifests/plugins/cloud-metadata/failure-missing-cloud-vendor.yml rename to manifests/plugins/csv-lookup/cloud-metadata/failure-missing-cloud-vendor.yml index 9b80c4301..33c5cc4b1 100644 --- a/manifests/plugins/cloud-metadata/failure-missing-cloud-vendor.yml +++ b/manifests/plugins/csv-lookup/cloud-metadata/failure-missing-cloud-vendor.yml @@ -2,11 +2,17 @@ name: cloud-metadata description: failing because cloud/vendor is not provided tags: initialize: - outputs: ['yaml'] + # outputs: ['yaml'] plugins: cloud-metadata: - method: CloudMetadata - path: "@grnsft/if-plugins" + path: builtin + method: CSVLookup + global-config: + 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'] tree: children: child: diff --git a/manifests/plugins/cloud-metadata/success.yml b/manifests/plugins/csv-lookup/cloud-metadata/success.yml similarity index 57% rename from manifests/plugins/cloud-metadata/success.yml rename to manifests/plugins/csv-lookup/cloud-metadata/success.yml index dec29460d..bd3cfdbb7 100644 --- a/manifests/plugins/cloud-metadata/success.yml +++ b/manifests/plugins/csv-lookup/cloud-metadata/success.yml @@ -5,8 +5,14 @@ initialize: # outputs: ['yaml'] plugins: cloud-metadata: - method: CloudMetadata - path: "@grnsft/if-plugins" + path: builtin + method: CSVLookup + global-config: + 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'] tree: children: child: diff --git a/manifests/plugins/csv-lookup/failure-missing-column.yml b/manifests/plugins/csv-lookup/region-metadata/failure-missing-column.yml similarity index 100% rename from manifests/plugins/csv-lookup/failure-missing-column.yml rename to manifests/plugins/csv-lookup/region-metadata/failure-missing-column.yml diff --git a/manifests/plugins/csv-lookup/failure-missing-output.yml b/manifests/plugins/csv-lookup/region-metadata/failure-missing-output.yml similarity index 100% rename from manifests/plugins/csv-lookup/failure-missing-output.yml rename to manifests/plugins/csv-lookup/region-metadata/failure-missing-output.yml diff --git a/manifests/plugins/csv-lookup/success-renaming.yml b/manifests/plugins/csv-lookup/region-metadata/success-renaming.yml similarity index 100% rename from manifests/plugins/csv-lookup/success-renaming.yml rename to manifests/plugins/csv-lookup/region-metadata/success-renaming.yml diff --git a/manifests/plugins/csv-lookup/success.yml b/manifests/plugins/csv-lookup/region-metadata/success.yml similarity index 100% rename from manifests/plugins/csv-lookup/success.yml rename to manifests/plugins/csv-lookup/region-metadata/success.yml diff --git a/manifests/plugins/csv-lookup/tdp-finder/failure-missing-input-param.yml b/manifests/plugins/csv-lookup/tdp-finder/failure-missing-input-param.yml new file mode 100644 index 000000000..b14e57d1d --- /dev/null +++ b/manifests/plugins/csv-lookup/tdp-finder/failure-missing-input-param.yml @@ -0,0 +1,23 @@ +name: tdp-finder +description: failure with `inputs` missing `physical-processor` param +tags: +initialize: + # outputs: ['yaml'] + plugins: + tdp-finder: + method: CSVLookup + path: "builtin" + global-config: + filepath: https://raw.githubusercontent.com/Green-Software-Foundation/if-data/main/tdp-data-1.csv + query: + name: physical-processor + output: "tdp" +tree: + children: + child: + pipeline: + - tdp-finder + config: + inputs: + - timestamp: 2023-07-06T00:00 + duration: 300 diff --git a/manifests/plugins/csv-lookup/tdp-finder/failure-unsupported-physical-processor.yml b/manifests/plugins/csv-lookup/tdp-finder/failure-unsupported-physical-processor.yml new file mode 100644 index 000000000..47f392fcc --- /dev/null +++ b/manifests/plugins/csv-lookup/tdp-finder/failure-unsupported-physical-processor.yml @@ -0,0 +1,24 @@ +name: tdp-finder +description: successful path +tags: +initialize: + # outputs: ['yaml'] + plugins: + tdp-finder: + method: CSVLookup + path: "builtin" + global-config: + filepath: https://raw.githubusercontent.com/Green-Software-Foundation/if-data/main/tdp-data-1.csv + query: + name: physical-processor + output: "tdp" +tree: + children: + child: + pipeline: + - tdp-finder + config: + inputs: + - timestamp: 2023-07-06T00:00 + duration: 300 + physical-processor: AMD 302 diff --git a/manifests/plugins/csv-lookup/tdp-finder/success.yml b/manifests/plugins/csv-lookup/tdp-finder/success.yml new file mode 100644 index 000000000..42545b0df --- /dev/null +++ b/manifests/plugins/csv-lookup/tdp-finder/success.yml @@ -0,0 +1,24 @@ +name: tdp-finder +description: successful path +tags: +initialize: + # outputs: ['yaml'] + plugins: + tdp-finder: + method: CSVLookup + path: "builtin" + global-config: + filepath: https://raw.githubusercontent.com/Green-Software-Foundation/if-data/main/tdp-data-1.csv + query: + name: physical-processor + output: "tdp" +tree: + children: + child: + pipeline: + - tdp-finder + config: + inputs: + - timestamp: 2023-07-06T00:00 + duration: 300 + physical-processor: AMD 3020e diff --git a/manifests/plugins/divide/failure-denominator-equal-zero.yml b/manifests/plugins/divide/failure-denominator-equal-zero.yml index af5ed2ae0..8c48e42b9 100644 --- a/manifests/plugins/divide/failure-denominator-equal-zero.yml +++ b/manifests/plugins/divide/failure-denominator-equal-zero.yml @@ -5,8 +5,14 @@ initialize: # outputs: ['yaml'] plugins: cloud-metadata: - method: CloudMetadata - path: "@grnsft/if-plugins" + path: builtin + method: CSVLookup + global-config: + 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'] divide: method: Divide path: "builtin" diff --git a/manifests/plugins/divide/failure-invalid-config-denominator.yml b/manifests/plugins/divide/failure-invalid-config-denominator.yml index 063274bc0..bc93f4f5f 100644 --- a/manifests/plugins/divide/failure-invalid-config-denominator.yml +++ b/manifests/plugins/divide/failure-invalid-config-denominator.yml @@ -5,8 +5,14 @@ initialize: outputs: ['yaml'] plugins: cloud-metadata: - method: CloudMetadata - path: "@grnsft/if-plugins" + path: builtin + method: CSVLookup + global-config: + 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'] divide: method: Divide path: "builtin" diff --git a/manifests/plugins/divide/failure-missing-numerator.yml b/manifests/plugins/divide/failure-missing-numerator.yml index 7f03d5eba..ebf250961 100644 --- a/manifests/plugins/divide/failure-missing-numerator.yml +++ b/manifests/plugins/divide/failure-missing-numerator.yml @@ -5,8 +5,14 @@ initialize: # outputs: ['yaml'] plugins: cloud-metadata: - method: CloudMetadata - path: "@grnsft/if-plugins" + path: builtin + method: CSVLookup + global-config: + 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'] divide: method: Divide path: "builtin" diff --git a/manifests/plugins/divide/success.yml b/manifests/plugins/divide/success.yml index ed75a7c5c..24626c8f4 100644 --- a/manifests/plugins/divide/success.yml +++ b/manifests/plugins/divide/success.yml @@ -5,8 +5,14 @@ initialize: # outputs: ['yaml'] plugins: cloud-metadata: - method: CloudMetadata - path: "@grnsft/if-plugins" + path: builtin + method: CSVLookup + global-config: + 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'] divide: method: Divide path: "builtin" diff --git a/manifests/plugins/exponent/success.yml b/manifests/plugins/exponent/success.yml new file mode 100644 index 000000000..c123b3a24 --- /dev/null +++ b/manifests/plugins/exponent/success.yml @@ -0,0 +1,26 @@ +name: exponent demo +description: +tags: +initialize: + # outputs: + # - yaml + plugins: + exponent: + method: Exponent + path: 'builtin' + global-config: + input-parameter: 'cpu/energy' + exponent: 2 + output-parameter: 'energy' +tree: + children: + child: + pipeline: + - exponent + config: + exponent: + inputs: + - timestamp: 2023-08-06T00:00 + duration: 3600 + cpu/energy: 0.001 + network/energy: 0.001 diff --git a/manifests/plugins/interpolation/success.yml b/manifests/plugins/interpolation/success.yml new file mode 100644 index 000000000..35d750e48 --- /dev/null +++ b/manifests/plugins/interpolation/success.yml @@ -0,0 +1,24 @@ +name: interpolation-demo +description: simple demo of interpolation plugin +tags: +initialize: + plugins: + interpolation: + method: Interpolation + path: "builtin" + global-config: + method: linear + x: [0, 10, 50, 100] + y: [0.12, 0.32, 0.75, 1.02] + input-parameter: "cpu/utilization" + output-parameter: "result" + +tree: + children: + child: + pipeline: + - interpolation + inputs: + - timestamp: 2023-07-06T00:00 + duration: 3600 + cpu/utilization: 45 diff --git a/manifests/plugins/subtract/success.yml b/manifests/plugins/subtract/success.yml new file mode 100644 index 000000000..276128171 --- /dev/null +++ b/manifests/plugins/subtract/success.yml @@ -0,0 +1,25 @@ +name: subtract demo +description: +tags: +initialize: + outputs: + - yaml + plugins: + subtract: + method: Subtract + path: 'builtin' + global-config: + input-parameters: ['cpu/energy', 'network/energy'] + output-parameter: 'energy/diff' +tree: + children: + child: + pipeline: + - subtract + config: + subtract: + inputs: + - timestamp: 2023-08-06T00:00 + duration: 3600 + cpu/energy: 0.003 + network/energy: 0.001 \ No newline at end of file diff --git a/manifests/plugins/tdp-finder/failure-missing-input-param.yml b/manifests/plugins/tdp-finder/failure-missing-input-param.yml deleted file mode 100644 index 7877b56ce..000000000 --- a/manifests/plugins/tdp-finder/failure-missing-input-param.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: tdp-finder -description: failure with `inputs` missing `physical-processor` param -tags: -initialize: - outputs: ['yaml'] - plugins: - tdp-finder: # a model that returns an embodied value given the sci embodied attribution equation. - method: TdpFinder - path: "@grnsft/if-plugins" -tree: - children: - child: - pipeline: - - tdp-finder - config: - inputs: - - timestamp: 2023-07-06T00:00 - duration: 300 diff --git a/manifests/plugins/tdp-finder/failure-unsupported-physical-processor.yml b/manifests/plugins/tdp-finder/failure-unsupported-physical-processor.yml deleted file mode 100644 index 56c5c93a5..000000000 --- a/manifests/plugins/tdp-finder/failure-unsupported-physical-processor.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: tdp-finder -description: successful path -tags: -initialize: - outputs: ['yaml'] - plugins: - tdp-finder: # a model that returns an embodied value given the sci embodied attribution equation. - method: TdpFinder - path: "@grnsft/if-plugins" -tree: - children: - child: - pipeline: - - tdp-finder - config: - inputs: - - timestamp: 2023-07-06T00:00 - duration: 300 - physical-processor: AMD 302 diff --git a/manifests/plugins/tdp-finder/success.yml b/manifests/plugins/tdp-finder/success.yml deleted file mode 100644 index 26f905ecd..000000000 --- a/manifests/plugins/tdp-finder/success.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: tdp-finder -description: successful path -tags: -initialize: - outputs: ['yaml'] - plugins: - tdp-finder: # a model that returns an embodied value given the sci embodied attribution equation. - method: TdpFinder - path: "@grnsft/if-plugins" -tree: - children: - child: - pipeline: - - tdp-finder - config: - inputs: - - timestamp: 2023-07-06T00:00 - duration: 300 - physical-processor: AMD 3020e