Skip to content

Commit

Permalink
Merge branch 'main' into release
Browse files Browse the repository at this point in the history
Signed-off-by: Narek Hovhannisyan <[email protected]>
  • Loading branch information
narekhovhannisyan authored Jul 5, 2024
2 parents b8c1ad3 + 219f0d7 commit ba7ca7a
Show file tree
Hide file tree
Showing 11 changed files with 517 additions and 59 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/nodejs-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ jobs:
- name: Run lint
run: npm run lint

- name: Run tests
- name: Run unit tests
run: npm run test --silent
4 changes: 2 additions & 2 deletions .github/workflows/release-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ jobs:
- name: Run unit tests
run: npm test

- name: Install dependencies
run: npm ci
- name: Run integration tests
run: npm run if-check -- -d manifests/outputs

- name: Initialize git user email
run: git config --global user.email "${{ vars.RELEASE_USER_EMAIL }}"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ jobs:
- name: Run unit tests
run: npm test

- name: Install dependencies
run: npm ci
- name: Run integration tests
run: npm run if-check -- -d manifests/outputs

- name: Initialize git user email
run: git config --global user.email "${{ env.RELEASE_USER_EMAIL }}"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
name: cloud-metadata
description: cloud/instance-type instance type is not supported in the cloud vendor
tags:
tags: null
initialize:
# outputs: ['yaml']
outputs:
- yaml
plugins:
cloud-metadata:
path: builtin
Expand All @@ -12,15 +13,65 @@ initialize:
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']
output:
- cpu-cores-utilized
- vcpus-allocated
execution:
status: fail
command: >-
/Users/mariamkhalatova/.npm/_npx/1bf7c3c15bf47d04/node_modules/.bin/ts-node
/Users/mariamkhalatova/Projects/UK/if/src/index.ts -m
manifests/outputs/plugins/csv-lookup/cloud-metadata/failure-invalid-instance-type.yaml
-o
manifests/outputs/plugins/csv-lookup/cloud-metadata/failure-invalid-instance-type-1
environment:
if-version: 0.4.0
os: macOS
os-version: '13.2'
node-version: 18.14.2
date-time: 2024-07-04T13:44:58.641Z (UTC)
dependencies:
- '@babel/[email protected]'
- '@babel/[email protected]'
- '@commitlint/[email protected]'
- '@commitlint/[email protected]'
- '@grnsft/[email protected]'
- '@jest/[email protected]'
- '@types/[email protected]'
- '@types/[email protected]'
- '@types/[email protected]'
- '@types/[email protected]'
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
error: >-
QueryDataNotFoundError: One or more of the given query parameters are not
found in the target CSV file column headers.
tree:
children:
child:
pipeline:
- cloud-metadata
config:
config: null
inputs:
- timestamp: 2023-07-06T00:00 # [KEYWORD] [NO-SUBFIELDS] time when measurement occurred
- timestamp: 2023-07-06T00:00
cloud/vendor: aws
cloud/instance-type: m6
duration: 100
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,21 @@ execution:
command: >-
/Users/mariamkhalatova/.npm/_npx/1bf7c3c15bf47d04/node_modules/.bin/ts-node
/Users/mariamkhalatova/Projects/UK/if/src/index.ts -m
manifests/outputs/plugins/csv-lookup/cloud-metadata/failure-missing-cloud-vendor.yml
manifests/outputs/plugins/csv-lookup/cloud-metadata/failure-missing-cloud-vendor.yaml
-o
manifests/outputs/plugins/csv-lookup/cloud-metadata/failure-missing-cloud-vendor
manifests/outputs/plugins/csv-lookup/cloud-metadata/failure-missing-cloud-vendor1
environment:
if-version: 0.4.0
os: macOS
os-version: '13.2'
node-version: 18.14.2
date-time: 2024-07-02T21:20:08.333Z (UTC)
date-time: 2024-07-05T09:07:35.386Z (UTC)
dependencies:
- '@babel/[email protected]'
- '@babel/[email protected]'
- '@commitlint/[email protected]'
- '@commitlint/[email protected]'
- '@grnsft/[email protected]'

- '@grnsft/[email protected]'
- '@jest/[email protected]'
- '@types/[email protected]'
- '@types/[email protected]'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,20 @@ execution:
command: >-
/Users/mariamkhalatova/.npm/_npx/1bf7c3c15bf47d04/node_modules/.bin/ts-node
/Users/mariamkhalatova/Projects/UK/if/src/index.ts -m
manifests/outputs/plugins/csv-lookup/cloud-metadata/success.yml -o
manifests/outputs/plugins/csv-lookup/cloud-metadata/success
manifests/outputs/plugins/csv-lookup/cloud-metadata/success.yaml -o
manifests/outputs/plugins/csv-lookup/cloud-metadata/success1
environment:
if-version: 0.4.0
os: macOS
os-version: '13.2'
node-version: 18.14.2
date-time: 2024-07-02T21:21:45.504Z (UTC)
date-time: 2024-07-05T09:05:09.577Z (UTC)
dependencies:
- '@babel/[email protected]'
- '@babel/[email protected]'
- '@commitlint/[email protected]'
- '@commitlint/[email protected]'
- '@grnsft/[email protected]'

- '@jest/[email protected]'
- '@types/[email protected]'
- '@types/[email protected]'
Expand Down
80 changes: 40 additions & 40 deletions manifests/outputs/plugins/mock-observations/success.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,138 +83,138 @@ tree:
cloud/instance-type: A1
region: uk-west
common-key: common-val
cpu/utilization: 81
memory/utilization: 63
cpu/utilization: '*'
memory/utilization: '*'
- timestamp: '2023-07-06T00:01:00.000Z'
duration: 60
cloud/instance-type: A1
region: uk-west
common-key: common-val
cpu/utilization: 92
memory/utilization: 63
cpu/utilization: '*'
memory/utilization: '*'
- timestamp: '2023-07-06T00:02:00.000Z'
duration: 60
cloud/instance-type: A1
region: uk-west
common-key: common-val
cpu/utilization: 63
memory/utilization: 95
cpu/utilization: '*'
memory/utilization: '*'
- timestamp: '2023-07-06T00:03:00.000Z'
duration: 60
cloud/instance-type: A1
region: uk-west
common-key: common-val
cpu/utilization: 37
memory/utilization: 13
cpu/utilization: '*'
memory/utilization: '*'
- timestamp: '2023-07-06T00:04:00.000Z'
duration: 60
cloud/instance-type: A1
region: uk-west
common-key: common-val
cpu/utilization: 28
memory/utilization: 50
cpu/utilization: '*'
memory/utilization: '*'
- timestamp: '2023-07-06T00:05:00.000Z'
duration: 60
cloud/instance-type: A1
region: uk-west
common-key: common-val
cpu/utilization: 98
memory/utilization: 29
cpu/utilization: '*'
memory/utilization: '*'
- timestamp: '2023-07-06T00:06:00.000Z'
duration: 60
cloud/instance-type: A1
region: uk-west
common-key: common-val
cpu/utilization: 10
memory/utilization: 93
cpu/utilization: '*'
memory/utilization: '*'
- timestamp: '2023-07-06T00:07:00.000Z'
duration: 60
cloud/instance-type: A1
region: uk-west
common-key: common-val
cpu/utilization: 84
memory/utilization: 37
cpu/utilization: '*'
memory/utilization: '*'
- timestamp: '2023-07-06T00:08:00.000Z'
duration: 60
cloud/instance-type: A1
region: uk-west
common-key: common-val
cpu/utilization: 10
memory/utilization: 30
cpu/utilization: '*'
memory/utilization: '*'
- timestamp: '2023-07-06T00:09:00.000Z'
duration: 60
cloud/instance-type: A1
region: uk-west
common-key: common-val
cpu/utilization: 50
memory/utilization: 10
cpu/utilization: '*'
memory/utilization: '*'
- timestamp: '2023-07-06T00:00:00.000Z'
duration: 60
cloud/instance-type: B1
region: uk-west
common-key: common-val
cpu/utilization: 97
memory/utilization: 89
cpu/utilization: '*'
memory/utilization: '*'
- timestamp: '2023-07-06T00:01:00.000Z'
duration: 60
cloud/instance-type: B1
region: uk-west
common-key: common-val
cpu/utilization: 61
memory/utilization: 83
cpu/utilization: '*'
memory/utilization: '*'
- timestamp: '2023-07-06T00:02:00.000Z'
duration: 60
cloud/instance-type: B1
region: uk-west
common-key: common-val
cpu/utilization: 86
memory/utilization: 52
cpu/utilization: '*'
memory/utilization: '*'
- timestamp: '2023-07-06T00:03:00.000Z'
duration: 60
cloud/instance-type: B1
region: uk-west
common-key: common-val
cpu/utilization: 17
memory/utilization: 60
cpu/utilization: '*'
memory/utilization: '*'
- timestamp: '2023-07-06T00:04:00.000Z'
duration: 60
cloud/instance-type: B1
region: uk-west
common-key: common-val
cpu/utilization: 53
memory/utilization: 84
cpu/utilization: '*'
memory/utilization: '*'
- timestamp: '2023-07-06T00:05:00.000Z'
duration: 60
cloud/instance-type: B1
region: uk-west
common-key: common-val
cpu/utilization: 38
memory/utilization: 58
cpu/utilization: '*'
memory/utilization: '*'
- timestamp: '2023-07-06T00:06:00.000Z'
duration: 60
cloud/instance-type: B1
region: uk-west
common-key: common-val
cpu/utilization: 4
memory/utilization: 39
cpu/utilization: '*'
memory/utilization: '*'
- timestamp: '2023-07-06T00:07:00.000Z'
duration: 60
cloud/instance-type: B1
region: uk-west
common-key: common-val
cpu/utilization: 89
memory/utilization: 52
cpu/utilization: '*'
memory/utilization: '*'
- timestamp: '2023-07-06T00:08:00.000Z'
duration: 60
cloud/instance-type: B1
region: uk-west
common-key: common-val
cpu/utilization: 38
memory/utilization: 16
cpu/utilization: '*'
memory/utilization: '*'
- timestamp: '2023-07-06T00:09:00.000Z'
duration: 60
cloud/instance-type: B1
region: uk-west
common-key: common-val
cpu/utilization: 25
memory/utilization: 78
cpu/utilization: '*'
memory/utilization: '*'
Loading

0 comments on commit ba7ca7a

Please sign in to comment.