From 995c0eac28c9bf5c60bba6eb6f4954fc38ea9e35 Mon Sep 17 00:00:00 2001 From: NSSPKrishna Date: Thu, 22 Aug 2024 15:24:42 +0530 Subject: [PATCH] test: Super agent to Agent Control --- .../infrastructure/super-agent/debian.yml | 4 +- .../infrastructure/super-agent/rhel.yml | 4 +- .../infrastructure/super-agent/suse.yml | 4 +- .../debians/debian11-super-agent-eu.json | 62 ++++++++-------- .../debians/ubuntu16-super-agent-eu.json | 62 ++++++++-------- .../debians/ubuntu18-super-agent-eu.json | 62 ++++++++-------- .../debians/ubuntu20-super-agent-eu.json | 60 ++++++++-------- .../debians/ubuntu20arm64-super-agent-eu.json | 60 ++++++++-------- .../debians/ubuntu22-super-agent-eu.json | 64 ++++++++--------- .../rhel/awslinux23-super-agent-eu.json | 62 ++++++++-------- .../rhel/awslinuxarm64-super-agent-eu.json | 2 +- .../rhel/centos7-super-agent-eu.json | 62 ++++++++-------- .../rhel/centos8-super-agent-eu.json | 60 ++++++++-------- .../rhel/centos8arm64-super-agent-eu.json | 60 ++++++++-------- .../rhel/redhat7-super-agent-eu.json | 60 ++++++++-------- .../rhel/redhat8arm64-super-agent-eu.json | 60 ++++++++-------- .../suse/suse125-super-agent-eu.json | 60 ++++++++-------- .../suse/suse154-super-agent-eu.json | 60 ++++++++-------- .../debians/debian11-super-agent.json | 2 +- .../debians/ubuntu16-super-agent.json | 2 +- .../debians/ubuntu18-super-agent.json | 2 +- .../debians/ubuntu20-super-agent.json | 2 +- .../debians/ubuntu20arm64-super-agent.json | 2 +- .../debians/ubuntu22-super-agent.json | 4 +- .../rhel/awslinux23-super-agent.json | 2 +- .../rhel/awslinuxarm64-super-agent.json | 2 +- .../super-agent/rhel/centos7-super-agent.json | 2 +- .../super-agent/rhel/centos8-super-agent.json | 2 +- .../rhel/centos8arm64-super-agent.json | 2 +- .../super-agent/rhel/redhat7-super-agent.json | 2 +- .../rhel/redhat8arm64-super-agent.json | 2 +- .../super-agent/suse/suse125-super-agent.json | 2 +- .../super-agent/suse/suse154-super-agent.json | 2 +- test/manual/definitions/fleet.json | 70 +++++++++++++++---- 34 files changed, 500 insertions(+), 470 deletions(-) diff --git a/recipes/newrelic/infrastructure/super-agent/debian.yml b/recipes/newrelic/infrastructure/super-agent/debian.yml index 6a80ac1c0..ad1f9f5ce 100644 --- a/recipes/newrelic/infrastructure/super-agent/debian.yml +++ b/recipes/newrelic/infrastructure/super-agent/debian.yml @@ -2,7 +2,7 @@ # https://github.com/newrelic/open-install-library/blob/main/docs/recipe-spec/recipe-spec.md#schema-definition name: super-agent -displayName: New Relic Super Agent +displayName: Agent Control description: New Relic install recipe for the Super Agent repository: https://github.com/newrelic/newrelic-super-agent @@ -610,4 +610,4 @@ install: post_install: info: |2 - ⚙️ The New Relic Super Agent configuration file can be found in /etc/newrelic-super-agent/config.yaml + ⚙️ The Agent Control configuration file can be found in /etc/newrelic-super-agent/config.yaml diff --git a/recipes/newrelic/infrastructure/super-agent/rhel.yml b/recipes/newrelic/infrastructure/super-agent/rhel.yml index 24176d0ee..44ac4febb 100644 --- a/recipes/newrelic/infrastructure/super-agent/rhel.yml +++ b/recipes/newrelic/infrastructure/super-agent/rhel.yml @@ -2,7 +2,7 @@ # https://github.com/newrelic/open-install-library/blob/main/docs/recipe-spec/recipe-spec.md#schema-definition name: super-agent -displayName: New Relic Super Agent +displayName: Agent Control description: New Relic install recipe for the Super Agent repository: https://github.com/newrelic/newrelic-super-agent @@ -550,4 +550,4 @@ install: post_install: info: |2 - ⚙️ The New Relic Super Agent configuration file can be found in /etc/newrelic-super-agent/config.yaml + ⚙️ The Agent Control configuration file can be found in /etc/newrelic-super-agent/config.yaml diff --git a/recipes/newrelic/infrastructure/super-agent/suse.yml b/recipes/newrelic/infrastructure/super-agent/suse.yml index 631151ae9..d46f67a78 100644 --- a/recipes/newrelic/infrastructure/super-agent/suse.yml +++ b/recipes/newrelic/infrastructure/super-agent/suse.yml @@ -2,7 +2,7 @@ # https://github.com/newrelic/open-install-library/blob/main/docs/recipe-spec/recipe-spec.md#schema-definition name: super-agent -displayName: New Relic Super Agent +displayName: Agent Control description: New Relic install recipe for the Super Agent repository: https://github.com/newrelic/newrelic-super-agent @@ -499,4 +499,4 @@ install: post_install: info: |2 - ⚙️ The New Relic Super Agent configuration file can be found in /etc/newrelic-super-agent/config.yaml + ⚙️ The Agent Control configuration file can be found in /etc/newrelic-super-agent/config.yaml diff --git a/test/definitions-eu/super-agent/debians/debian11-super-agent-eu.json b/test/definitions-eu/super-agent/debians/debian11-super-agent-eu.json index d3cea3325..c06e4a57b 100644 --- a/test/definitions-eu/super-agent/debians/debian11-super-agent-eu.json +++ b/test/definitions-eu/super-agent/debians/debian11-super-agent-eu.json @@ -1,36 +1,34 @@ { - "global_tags": { - "owning_team": "virtuoso", - "Environment": "development", - "Department": "product", - "Product": "virtuoso" - }, + "global_tags": { + "owning_team": "virtuoso", + "Environment": "development", + "Department": "product", + "Product": "virtuoso" + }, + "resources": [ + { + "id": "host1", + "provider": "aws", + "type": "ec2", + "size": "t3.nano", + "ami_name": "debian-11-amd64-daily-202?????-*", + "user_name": "admin" + } + ], + "instrumentations": { "resources": [ - { - "id": "host1", - "provider": "aws", - "type": "ec2", - "size": "t3.nano", - "ami_name": "debian-11-amd64-daily-202?????-*", - "user_name": "admin" + { + "id": "nr_super_agent", + "resource_ids": ["host1"], + "provider": "newrelic", + "source_repository": "https://github.com/newrelic/open-install-library.git", + "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", + "params": { + "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml", + "validate_output": "Agent Control\\s+\\(installed\\)", + "recipe_targeted": "super-agent" } - ], - "instrumentations": { - "resources": [ - { - "id": "nr_super_agent", - "resource_ids": [ - "host1" - ], - "provider": "newrelic", - "source_repository": "https://github.com/newrelic/open-install-library.git", - "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", - "params": { - "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", - "recipe_targeted": "super-agent" - } - } - ] - } + } + ] + } } diff --git a/test/definitions-eu/super-agent/debians/ubuntu16-super-agent-eu.json b/test/definitions-eu/super-agent/debians/ubuntu16-super-agent-eu.json index 263bcde76..1b99087d6 100644 --- a/test/definitions-eu/super-agent/debians/ubuntu16-super-agent-eu.json +++ b/test/definitions-eu/super-agent/debians/ubuntu16-super-agent-eu.json @@ -1,36 +1,34 @@ { - "global_tags": { - "owning_team": "virtuoso", - "Environment": "development", - "Department": "product", - "Product": "virtuoso" - }, + "global_tags": { + "owning_team": "virtuoso", + "Environment": "development", + "Department": "product", + "Product": "virtuoso" + }, + "resources": [ + { + "id": "ubuntu16-super-eu", + "provider": "aws", + "type": "ec2", + "size": "t3.small", + "ami_name": "ubuntu-pro-server/images/hvm-ssd/ubuntu-xenial-16.04-amd64-pro-server-????????", + "user_name": "ubuntu" + } + ], + "instrumentations": { "resources": [ - { - "id": "ubuntu16-super-eu", - "provider": "aws", - "type": "ec2", - "size": "t3.small", - "ami_name": "ubuntu-pro-server/images/hvm-ssd/ubuntu-xenial-16.04-amd64-pro-server-????????", - "user_name": "ubuntu" + { + "id": "nr_super_agent", + "resource_ids": ["ubuntu16-super-eu"], + "provider": "newrelic", + "source_repository": "https://github.com/newrelic/open-install-library.git", + "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", + "params": { + "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml", + "validate_output": "Agent Control\\s+\\(installed\\)", + "recipe_targeted": "super-agent" } - ], - "instrumentations": { - "resources": [ - { - "id": "nr_super_agent", - "resource_ids": [ - "ubuntu16-super-eu" - ], - "provider": "newrelic", - "source_repository": "https://github.com/newrelic/open-install-library.git", - "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", - "params": { - "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", - "recipe_targeted": "super-agent" - } - } - ] - } + } + ] + } } diff --git a/test/definitions-eu/super-agent/debians/ubuntu18-super-agent-eu.json b/test/definitions-eu/super-agent/debians/ubuntu18-super-agent-eu.json index d0f553978..6bc46533f 100644 --- a/test/definitions-eu/super-agent/debians/ubuntu18-super-agent-eu.json +++ b/test/definitions-eu/super-agent/debians/ubuntu18-super-agent-eu.json @@ -1,36 +1,34 @@ { - "global_tags": { - "owning_team": "virtuoso", - "Environment": "development", - "Department": "product", - "Product": "virtuoso" - }, + "global_tags": { + "owning_team": "virtuoso", + "Environment": "development", + "Department": "product", + "Product": "virtuoso" + }, + "resources": [ + { + "id": "host1", + "provider": "aws", + "type": "ec2", + "size": "t3.nano", + "ami_name": "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-????????", + "user_name": "ubuntu" + } + ], + "instrumentations": { "resources": [ - { - "id": "host1", - "provider": "aws", - "type": "ec2", - "size": "t3.nano", - "ami_name": "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-????????", - "user_name": "ubuntu" + { + "id": "nr_super_agent", + "resource_ids": ["host1"], + "provider": "newrelic", + "source_repository": "https://github.com/newrelic/open-install-library.git", + "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", + "params": { + "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml", + "validate_output": "Agent Control\\s+\\(installed\\)", + "recipe_targeted": "super-agent" } - ], - "instrumentations": { - "resources": [ - { - "id": "nr_super_agent", - "resource_ids": [ - "host1" - ], - "provider": "newrelic", - "source_repository": "https://github.com/newrelic/open-install-library.git", - "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", - "params": { - "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", - "recipe_targeted": "super-agent" - } - } - ] - } + } + ] + } } diff --git a/test/definitions-eu/super-agent/debians/ubuntu20-super-agent-eu.json b/test/definitions-eu/super-agent/debians/ubuntu20-super-agent-eu.json index 38c9f6944..ad428f742 100644 --- a/test/definitions-eu/super-agent/debians/ubuntu20-super-agent-eu.json +++ b/test/definitions-eu/super-agent/debians/ubuntu20-super-agent-eu.json @@ -1,34 +1,36 @@ { - "global_tags": { - "owning_team": "virtuoso", - "Environment": "development", - "Department": "product", - "Product": "virtuoso" - }, + "global_tags": { + "owning_team": "virtuoso", + "Environment": "development", + "Department": "product", + "Product": "virtuoso" + }, - "resources": [{ - "id": "host1", - "provider": "aws", - "type": "ec2", - "size": "t3.nano", - "ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-2023*", - "user_name": "ubuntu" - }], + "resources": [ + { + "id": "host1", + "provider": "aws", + "type": "ec2", + "size": "t3.nano", + "ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-2023*", + "user_name": "ubuntu" + } + ], - "instrumentations": { - "resources": [ - { - "id": "nr_super_agent", - "resource_ids": ["host1"], - "provider": "newrelic", - "source_repository": "https://github.com/newrelic/open-install-library.git", - "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", - "params": { - "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", - "recipe_targeted": "super-agent" - } - } - ] + "instrumentations": { + "resources": [ + { + "id": "nr_super_agent", + "resource_ids": ["host1"], + "provider": "newrelic", + "source_repository": "https://github.com/newrelic/open-install-library.git", + "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", + "params": { + "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml", + "validate_output": "Agent Control\\s+\\(installed\\)", + "recipe_targeted": "super-agent" + } } + ] + } } diff --git a/test/definitions-eu/super-agent/debians/ubuntu20arm64-super-agent-eu.json b/test/definitions-eu/super-agent/debians/ubuntu20arm64-super-agent-eu.json index 37e23d94d..8bb312513 100644 --- a/test/definitions-eu/super-agent/debians/ubuntu20arm64-super-agent-eu.json +++ b/test/definitions-eu/super-agent/debians/ubuntu20arm64-super-agent-eu.json @@ -1,34 +1,36 @@ { - "global_tags": { - "owning_team": "virtuoso", - "Environment": "development", - "Department": "product", - "Product": "virtuoso" - }, + "global_tags": { + "owning_team": "virtuoso", + "Environment": "development", + "Department": "product", + "Product": "virtuoso" + }, - "resources": [{ - "id": "host1", - "provider": "aws", - "type": "ec2", - "size": "t4g.nano", - "ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-????????-*", - "user_name": "ubuntu" - }], + "resources": [ + { + "id": "host1", + "provider": "aws", + "type": "ec2", + "size": "t4g.nano", + "ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-????????-*", + "user_name": "ubuntu" + } + ], - "instrumentations": { - "resources": [ - { - "id": "nr_super_agent", - "resource_ids": ["host1"], - "provider": "newrelic", - "source_repository": "https://github.com/newrelic/open-install-library.git", - "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", - "params": { - "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", - "recipe_targeted": "super-agent" - } - } - ] + "instrumentations": { + "resources": [ + { + "id": "nr_super_agent", + "resource_ids": ["host1"], + "provider": "newrelic", + "source_repository": "https://github.com/newrelic/open-install-library.git", + "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", + "params": { + "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml", + "validate_output": "Agent Control\\s+\\(installed\\)", + "recipe_targeted": "super-agent" + } } + ] + } } diff --git a/test/definitions-eu/super-agent/debians/ubuntu22-super-agent-eu.json b/test/definitions-eu/super-agent/debians/ubuntu22-super-agent-eu.json index b1e46fcf7..ffcf15544 100644 --- a/test/definitions-eu/super-agent/debians/ubuntu22-super-agent-eu.json +++ b/test/definitions-eu/super-agent/debians/ubuntu22-super-agent-eu.json @@ -1,36 +1,36 @@ { - "global_tags": { - "owning_team": "virtuoso", - "Environment": "development", - "Department": "product", - "Product": "virtuoso" - }, - + "global_tags": { + "owning_team": "virtuoso", + "Environment": "development", + "Department": "product", + "Product": "virtuoso" + }, + + "resources": [ + { + "id": "host1", + "provider": "aws", + "type": "ec2", + "size": "t3.micro", + "ami_name": "ubuntu/images/hvm-ssd/ubuntu-jammy-22.??-amd64-server-????????", + "user_name": "ubuntu" + } + ], + + "instrumentations": { "resources": [ { - "id": "host1", - "provider": "aws", - "type": "ec2", - "size": "t3.micro", - "ami_name": "ubuntu/images/hvm-ssd/ubuntu-jammy-22.??-amd64-server-????????", - "user_name": "ubuntu" - } - ], - - "instrumentations": { - "resources": [ - { - "id": "nr_super_agent", - "resource_ids": ["host1"], - "provider": "newrelic", - "source_repository": "https://github.com/newrelic/open-install-library.git", - "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", - "params": { - "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", - "recipe_targeted": "super-agent" - } + "id": "nr_super_agent", + "resource_ids": ["host1"], + "provider": "newrelic", + "source_repository": "https://github.com/newrelic/open-install-library.git", + "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", + "params": { + "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml", + "validate_output": "Agent Control\\s+\\(installed\\)", + "recipe_targeted": "super-agent" } - ] - } - } \ No newline at end of file + } + ] + } +} diff --git a/test/definitions-eu/super-agent/rhel/awslinux23-super-agent-eu.json b/test/definitions-eu/super-agent/rhel/awslinux23-super-agent-eu.json index 7b108d77e..02f70ca9d 100644 --- a/test/definitions-eu/super-agent/rhel/awslinux23-super-agent-eu.json +++ b/test/definitions-eu/super-agent/rhel/awslinux23-super-agent-eu.json @@ -1,36 +1,34 @@ { - "global_tags": { - "owning_team": "virtuoso", - "Environment": "development", - "Department": "product", - "Product": "virtuoso" - }, + "global_tags": { + "owning_team": "virtuoso", + "Environment": "development", + "Department": "product", + "Product": "virtuoso" + }, + "resources": [ + { + "id": "host1", + "provider": "aws", + "ami_name": "al2023-ami-2023.*-x86_64", + "type": "ec2", + "size": "t3.nano", + "user_name": "ec2-user" + } + ], + "instrumentations": { "resources": [ - { - "id": "host1", - "provider": "aws", - "ami_name": "al2023-ami-2023.*-x86_64", - "type": "ec2", - "size": "t3.nano", - "user_name": "ec2-user" + { + "id": "nr_super_agent", + "resource_ids": ["host1"], + "provider": "newrelic", + "source_repository": "https://github.com/newrelic/open-install-library.git", + "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", + "params": { + "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml", + "validate_output": "Agent Control\\s+\\(installed\\)", + "recipe_targeted": "super-agent" } - ], - "instrumentations": { - "resources": [ - { - "id": "nr_super_agent", - "resource_ids": [ - "host1" - ], - "provider": "newrelic", - "source_repository": "https://github.com/newrelic/open-install-library.git", - "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", - "params": { - "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", - "recipe_targeted": "super-agent" - } - } - ] - } + } + ] + } } diff --git a/test/definitions-eu/super-agent/rhel/awslinuxarm64-super-agent-eu.json b/test/definitions-eu/super-agent/rhel/awslinuxarm64-super-agent-eu.json index 35d31be4e..1c0275f16 100644 --- a/test/definitions-eu/super-agent/rhel/awslinuxarm64-super-agent-eu.json +++ b/test/definitions-eu/super-agent/rhel/awslinuxarm64-super-agent-eu.json @@ -26,7 +26,7 @@ "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", "params": { "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", + "validate_output": "Agent Control\\s+\\(installed\\)", "recipe_targeted": "super-agent" } } diff --git a/test/definitions-eu/super-agent/rhel/centos7-super-agent-eu.json b/test/definitions-eu/super-agent/rhel/centos7-super-agent-eu.json index c58373c42..d8744ea5a 100644 --- a/test/definitions-eu/super-agent/rhel/centos7-super-agent-eu.json +++ b/test/definitions-eu/super-agent/rhel/centos7-super-agent-eu.json @@ -1,36 +1,34 @@ { - "global_tags": { - "owning_team": "virtuoso", - "Environment": "development", - "Department": "product", - "Product": "virtuoso" - }, + "global_tags": { + "owning_team": "virtuoso", + "Environment": "development", + "Department": "product", + "Product": "virtuoso" + }, + "resources": [ + { + "id": "host1", + "provider": "aws", + "type": "ec2", + "size": "t3.nano", + "ami_name": "CentOS-7-????-????????_?.x86_64-*", + "user_name": "centos" + } + ], + "instrumentations": { "resources": [ - { - "id": "host1", - "provider": "aws", - "type": "ec2", - "size": "t3.nano", - "ami_name": "CentOS-7-????-????????_?.x86_64-*", - "user_name": "centos" + { + "id": "nr_super_agent", + "resource_ids": ["host1"], + "provider": "newrelic", + "source_repository": "https://github.com/newrelic/open-install-library.git", + "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", + "params": { + "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml", + "validate_output": "Agent Control\\s+\\(installed\\)", + "recipe_targeted": "super-agent" } - ], - "instrumentations": { - "resources": [ - { - "id": "nr_super_agent", - "resource_ids": [ - "host1" - ], - "provider": "newrelic", - "source_repository": "https://github.com/newrelic/open-install-library.git", - "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", - "params": { - "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", - "recipe_targeted": "super-agent" - } - } - ] - } + } + ] + } } diff --git a/test/definitions-eu/super-agent/rhel/centos8-super-agent-eu.json b/test/definitions-eu/super-agent/rhel/centos8-super-agent-eu.json index beb778b14..6e176aa2b 100644 --- a/test/definitions-eu/super-agent/rhel/centos8-super-agent-eu.json +++ b/test/definitions-eu/super-agent/rhel/centos8-super-agent-eu.json @@ -1,34 +1,36 @@ { - "global_tags": { - "owning_team": "virtuoso", - "Environment": "development", - "Department": "product", - "Product": "virtuoso" - }, + "global_tags": { + "owning_team": "virtuoso", + "Environment": "development", + "Department": "product", + "Product": "virtuoso" + }, - "resources": [{ - "id": "host1", - "provider": "aws", - "type": "ec2", - "size": "t3.nano", - "ami_name": "CentOS Stream 8 x86_64 ????????", - "user_name": "centos" - }], + "resources": [ + { + "id": "host1", + "provider": "aws", + "type": "ec2", + "size": "t3.nano", + "ami_name": "CentOS Stream 8 x86_64 ????????", + "user_name": "centos" + } + ], - "instrumentations": { - "resources": [ - { - "id": "nr_super_agent", - "resource_ids": ["host1"], - "provider": "newrelic", - "source_repository": "https://github.com/newrelic/open-install-library.git", - "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", - "params": { - "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", - "recipe_targeted": "super-agent" - } - } - ] + "instrumentations": { + "resources": [ + { + "id": "nr_super_agent", + "resource_ids": ["host1"], + "provider": "newrelic", + "source_repository": "https://github.com/newrelic/open-install-library.git", + "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", + "params": { + "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml", + "validate_output": "Agent Control\\s+\\(installed\\)", + "recipe_targeted": "super-agent" + } } + ] + } } diff --git a/test/definitions-eu/super-agent/rhel/centos8arm64-super-agent-eu.json b/test/definitions-eu/super-agent/rhel/centos8arm64-super-agent-eu.json index dfd0463b3..2a7e1e4fc 100644 --- a/test/definitions-eu/super-agent/rhel/centos8arm64-super-agent-eu.json +++ b/test/definitions-eu/super-agent/rhel/centos8arm64-super-agent-eu.json @@ -1,34 +1,36 @@ { - "global_tags": { - "owning_team": "virtuoso", - "Environment": "development", - "Department": "product", - "Product": "virtuoso" - }, + "global_tags": { + "owning_team": "virtuoso", + "Environment": "development", + "Department": "product", + "Product": "virtuoso" + }, - "resources": [{ - "id": "host1", - "provider": "aws", - "type": "ec2", - "size": "t4g.small", - "ami_name": "ProComputers CentOS-Stream-8-arm64-Minimal-8GiB-HVM-????????*", - "user_name": "centos" - }], + "resources": [ + { + "id": "host1", + "provider": "aws", + "type": "ec2", + "size": "t4g.small", + "ami_name": "ProComputers CentOS-Stream-8-arm64-Minimal-8GiB-HVM-????????*", + "user_name": "centos" + } + ], - "instrumentations": { - "resources": [ - { - "id": "nr_super_agent", - "resource_ids": ["host1"], - "provider": "newrelic", - "source_repository": "https://github.com/newrelic/open-install-library.git", - "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", - "params": { - "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", - "recipe_targeted": "super-agent" - } - } - ] + "instrumentations": { + "resources": [ + { + "id": "nr_super_agent", + "resource_ids": ["host1"], + "provider": "newrelic", + "source_repository": "https://github.com/newrelic/open-install-library.git", + "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", + "params": { + "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml", + "validate_output": "Agent Control\\s+\\(installed\\)", + "recipe_targeted": "super-agent" + } } + ] + } } diff --git a/test/definitions-eu/super-agent/rhel/redhat7-super-agent-eu.json b/test/definitions-eu/super-agent/rhel/redhat7-super-agent-eu.json index b755da949..75888c44b 100644 --- a/test/definitions-eu/super-agent/rhel/redhat7-super-agent-eu.json +++ b/test/definitions-eu/super-agent/rhel/redhat7-super-agent-eu.json @@ -1,35 +1,33 @@ { - "global_tags": { - "owning_team": "virtuoso", - "Environment": "development", - "Department": "product", - "Product": "virtuoso" - }, + "global_tags": { + "owning_team": "virtuoso", + "Environment": "development", + "Department": "product", + "Product": "virtuoso" + }, + "resources": [ + { + "id": "host1", + "provider": "aws", + "type": "ec2", + "size": "t3.micro", + "ami_name": "RHEL_HA-7.?_HVM-????????-x86_64-?-Hourly2-GP2" + } + ], + "instrumentations": { "resources": [ - { - "id": "host1", - "provider": "aws", - "type": "ec2", - "size": "t3.micro", - "ami_name": "RHEL_HA-7.?_HVM-????????-x86_64-?-Hourly2-GP2" + { + "id": "nr_super_agent", + "resource_ids": ["host1"], + "provider": "newrelic", + "source_repository": "https://github.com/newrelic/open-install-library.git", + "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", + "params": { + "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml", + "validate_output": "Agent Control\\s+\\(installed\\)", + "recipe_targeted": "super-agent" } - ], - "instrumentations": { - "resources": [ - { - "id": "nr_super_agent", - "resource_ids": [ - "host1" - ], - "provider": "newrelic", - "source_repository": "https://github.com/newrelic/open-install-library.git", - "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", - "params": { - "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", - "recipe_targeted": "super-agent" - } - } - ] - } + } + ] + } } diff --git a/test/definitions-eu/super-agent/rhel/redhat8arm64-super-agent-eu.json b/test/definitions-eu/super-agent/rhel/redhat8arm64-super-agent-eu.json index 437562774..e7b2e6b56 100644 --- a/test/definitions-eu/super-agent/rhel/redhat8arm64-super-agent-eu.json +++ b/test/definitions-eu/super-agent/rhel/redhat8arm64-super-agent-eu.json @@ -1,35 +1,33 @@ { - "global_tags": { - "owning_team": "virtuoso", - "Environment": "development", - "Department": "product", - "Product": "virtuoso" - }, + "global_tags": { + "owning_team": "virtuoso", + "Environment": "development", + "Department": "product", + "Product": "virtuoso" + }, + "resources": [ + { + "id": "host1", + "provider": "aws", + "type": "ec2", + "size": "t4g.micro", + "ami_name": "RHEL-8.*_HVM-????????-arm64-*-Hourly2-GP2" + } + ], + "instrumentations": { "resources": [ - { - "id": "host1", - "provider": "aws", - "type": "ec2", - "size": "t4g.micro", - "ami_name": "RHEL-8.*_HVM-????????-arm64-*-Hourly2-GP2" + { + "id": "nr_super_agent", + "resource_ids": ["host1"], + "provider": "newrelic", + "source_repository": "https://github.com/newrelic/open-install-library.git", + "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", + "params": { + "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml", + "validate_output": "Agent Control\\s+\\(installed\\)", + "recipe_targeted": "super-agent" } - ], - "instrumentations": { - "resources": [ - { - "id": "nr_super_agent", - "resource_ids": [ - "host1" - ], - "provider": "newrelic", - "source_repository": "https://github.com/newrelic/open-install-library.git", - "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", - "params": { - "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", - "recipe_targeted": "super-agent" - } - } - ] - } + } + ] + } } diff --git a/test/definitions-eu/super-agent/suse/suse125-super-agent-eu.json b/test/definitions-eu/super-agent/suse/suse125-super-agent-eu.json index 1d3c9a696..cc50d9b97 100644 --- a/test/definitions-eu/super-agent/suse/suse125-super-agent-eu.json +++ b/test/definitions-eu/super-agent/suse/suse125-super-agent-eu.json @@ -1,35 +1,33 @@ { - "global_tags": { - "owning_team": "virtuoso", - "Environment": "development", - "Department": "product", - "Product": "virtuoso" - }, + "global_tags": { + "owning_team": "virtuoso", + "Environment": "development", + "Department": "product", + "Product": "virtuoso" + }, + "resources": [ + { + "id": "host1", + "provider": "aws", + "type": "ec2", + "size": "t3.micro", + "ami_name": "suse-sles-12-sp5-v????????-hvm-*" + } + ], + "instrumentations": { "resources": [ - { - "id": "host1", - "provider": "aws", - "type": "ec2", - "size": "t3.micro", - "ami_name": "suse-sles-12-sp5-v????????-hvm-*" + { + "id": "nr_super_agent", + "resource_ids": ["host1"], + "provider": "newrelic", + "source_repository": "https://github.com/newrelic/open-install-library.git", + "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", + "params": { + "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/suse.yml", + "validate_output": "Agent Control\\s+\\(installed\\)", + "recipe_targeted": "super-agent" } - ], - "instrumentations": { - "resources": [ - { - "id": "nr_super_agent", - "resource_ids": [ - "host1" - ], - "provider": "newrelic", - "source_repository": "https://github.com/newrelic/open-install-library.git", - "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", - "params": { - "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/suse.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", - "recipe_targeted": "super-agent" - } - } - ] - } + } + ] + } } diff --git a/test/definitions-eu/super-agent/suse/suse154-super-agent-eu.json b/test/definitions-eu/super-agent/suse/suse154-super-agent-eu.json index b5e19926c..d936da161 100644 --- a/test/definitions-eu/super-agent/suse/suse154-super-agent-eu.json +++ b/test/definitions-eu/super-agent/suse/suse154-super-agent-eu.json @@ -1,35 +1,33 @@ { - "global_tags": { - "owning_team": "virtuoso", - "Environment": "development", - "Department": "product", - "Product": "virtuoso" - }, + "global_tags": { + "owning_team": "virtuoso", + "Environment": "development", + "Department": "product", + "Product": "virtuoso" + }, + "resources": [ + { + "id": "host1", + "provider": "aws", + "type": "ec2", + "size": "t3.nano", + "ami_name": "suse-sles-15-sp4-chost-byos-v????????-hvm-ssd-x86_64" + } + ], + "instrumentations": { "resources": [ - { - "id": "host1", - "provider": "aws", - "type": "ec2", - "size": "t3.nano", - "ami_name": "suse-sles-15-sp4-chost-byos-v????????-hvm-ssd-x86_64" + { + "id": "nr_super_agent", + "resource_ids": ["host1"], + "provider": "newrelic", + "source_repository": "https://github.com/newrelic/open-install-library.git", + "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", + "params": { + "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/suse.yml", + "validate_output": "Agent Control\\s+\\(installed\\)", + "recipe_targeted": "super-agent" } - ], - "instrumentations": { - "resources": [ - { - "id": "nr_super_agent", - "resource_ids": [ - "host1" - ], - "provider": "newrelic", - "source_repository": "https://github.com/newrelic/open-install-library.git", - "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", - "params": { - "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/suse.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", - "recipe_targeted": "super-agent" - } - } - ] - } + } + ] + } } diff --git a/test/definitions/super-agent/debians/debian11-super-agent.json b/test/definitions/super-agent/debians/debian11-super-agent.json index d3cea3325..a64ad83c5 100644 --- a/test/definitions/super-agent/debians/debian11-super-agent.json +++ b/test/definitions/super-agent/debians/debian11-super-agent.json @@ -27,7 +27,7 @@ "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", "params": { "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", + "validate_output": "Agent Control\\s+\\(installed\\)", "recipe_targeted": "super-agent" } } diff --git a/test/definitions/super-agent/debians/ubuntu16-super-agent.json b/test/definitions/super-agent/debians/ubuntu16-super-agent.json index a8bce8b41..9cd8a9768 100644 --- a/test/definitions/super-agent/debians/ubuntu16-super-agent.json +++ b/test/definitions/super-agent/debians/ubuntu16-super-agent.json @@ -27,7 +27,7 @@ "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", "params": { "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", + "validate_output": "Agent Control\\s+\\(installed\\)", "recipe_targeted": "super-agent" } } diff --git a/test/definitions/super-agent/debians/ubuntu18-super-agent.json b/test/definitions/super-agent/debians/ubuntu18-super-agent.json index d0f553978..1373ccaad 100644 --- a/test/definitions/super-agent/debians/ubuntu18-super-agent.json +++ b/test/definitions/super-agent/debians/ubuntu18-super-agent.json @@ -27,7 +27,7 @@ "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", "params": { "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", + "validate_output": "Agent Control\\s+\\(installed\\)", "recipe_targeted": "super-agent" } } diff --git a/test/definitions/super-agent/debians/ubuntu20-super-agent.json b/test/definitions/super-agent/debians/ubuntu20-super-agent.json index 38c9f6944..0389c05b2 100644 --- a/test/definitions/super-agent/debians/ubuntu20-super-agent.json +++ b/test/definitions/super-agent/debians/ubuntu20-super-agent.json @@ -25,7 +25,7 @@ "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", "params": { "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", + "validate_output": "Agent Control\\s+\\(installed\\)", "recipe_targeted": "super-agent" } } diff --git a/test/definitions/super-agent/debians/ubuntu20arm64-super-agent.json b/test/definitions/super-agent/debians/ubuntu20arm64-super-agent.json index 37e23d94d..285359721 100644 --- a/test/definitions/super-agent/debians/ubuntu20arm64-super-agent.json +++ b/test/definitions/super-agent/debians/ubuntu20arm64-super-agent.json @@ -25,7 +25,7 @@ "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", "params": { "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", + "validate_output": "Agent Control\\s+\\(installed\\)", "recipe_targeted": "super-agent" } } diff --git a/test/definitions/super-agent/debians/ubuntu22-super-agent.json b/test/definitions/super-agent/debians/ubuntu22-super-agent.json index b1e46fcf7..527a538e3 100644 --- a/test/definitions/super-agent/debians/ubuntu22-super-agent.json +++ b/test/definitions/super-agent/debians/ubuntu22-super-agent.json @@ -27,10 +27,10 @@ "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", "params": { "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", + "validate_output": "Agent Control\\s+\\(installed\\)", "recipe_targeted": "super-agent" } } ] } - } \ No newline at end of file + } diff --git a/test/definitions/super-agent/rhel/awslinux23-super-agent.json b/test/definitions/super-agent/rhel/awslinux23-super-agent.json index ab40fe43f..ead648106 100644 --- a/test/definitions/super-agent/rhel/awslinux23-super-agent.json +++ b/test/definitions/super-agent/rhel/awslinux23-super-agent.json @@ -27,7 +27,7 @@ "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", "params": { "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", + "validate_output": "Agent Control\\s+\\(installed\\)", "recipe_targeted": "super-agent" } } diff --git a/test/definitions/super-agent/rhel/awslinuxarm64-super-agent.json b/test/definitions/super-agent/rhel/awslinuxarm64-super-agent.json index 7fef7db3f..5d6a0211a 100644 --- a/test/definitions/super-agent/rhel/awslinuxarm64-super-agent.json +++ b/test/definitions/super-agent/rhel/awslinuxarm64-super-agent.json @@ -26,7 +26,7 @@ "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", "params": { "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", + "validate_output": "Agent Control\\s+\\(installed\\)", "recipe_targeted": "super-agent" } } diff --git a/test/definitions/super-agent/rhel/centos7-super-agent.json b/test/definitions/super-agent/rhel/centos7-super-agent.json index c58373c42..1c9e127ad 100644 --- a/test/definitions/super-agent/rhel/centos7-super-agent.json +++ b/test/definitions/super-agent/rhel/centos7-super-agent.json @@ -27,7 +27,7 @@ "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", "params": { "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", + "validate_output": "Agent Control\\s+\\(installed\\)", "recipe_targeted": "super-agent" } } diff --git a/test/definitions/super-agent/rhel/centos8-super-agent.json b/test/definitions/super-agent/rhel/centos8-super-agent.json index beb778b14..235c2d902 100644 --- a/test/definitions/super-agent/rhel/centos8-super-agent.json +++ b/test/definitions/super-agent/rhel/centos8-super-agent.json @@ -25,7 +25,7 @@ "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", "params": { "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", + "validate_output": "Agent Control\\s+\\(installed\\)", "recipe_targeted": "super-agent" } } diff --git a/test/definitions/super-agent/rhel/centos8arm64-super-agent.json b/test/definitions/super-agent/rhel/centos8arm64-super-agent.json index dfd0463b3..af3ea0641 100644 --- a/test/definitions/super-agent/rhel/centos8arm64-super-agent.json +++ b/test/definitions/super-agent/rhel/centos8arm64-super-agent.json @@ -25,7 +25,7 @@ "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", "params": { "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", + "validate_output": "Agent Control\\s+\\(installed\\)", "recipe_targeted": "super-agent" } } diff --git a/test/definitions/super-agent/rhel/redhat7-super-agent.json b/test/definitions/super-agent/rhel/redhat7-super-agent.json index b755da949..f540bc18a 100644 --- a/test/definitions/super-agent/rhel/redhat7-super-agent.json +++ b/test/definitions/super-agent/rhel/redhat7-super-agent.json @@ -26,7 +26,7 @@ "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", "params": { "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", + "validate_output": "Agent Control\\s+\\(installed\\)", "recipe_targeted": "super-agent" } } diff --git a/test/definitions/super-agent/rhel/redhat8arm64-super-agent.json b/test/definitions/super-agent/rhel/redhat8arm64-super-agent.json index 437562774..439849a00 100644 --- a/test/definitions/super-agent/rhel/redhat8arm64-super-agent.json +++ b/test/definitions/super-agent/rhel/redhat8arm64-super-agent.json @@ -26,7 +26,7 @@ "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", "params": { "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", + "validate_output": "Agent Control\\s+\\(installed\\)", "recipe_targeted": "super-agent" } } diff --git a/test/definitions/super-agent/suse/suse125-super-agent.json b/test/definitions/super-agent/suse/suse125-super-agent.json index 1d3c9a696..868c5115d 100644 --- a/test/definitions/super-agent/suse/suse125-super-agent.json +++ b/test/definitions/super-agent/suse/suse125-super-agent.json @@ -26,7 +26,7 @@ "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", "params": { "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/suse.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", + "validate_output": "Agent Control\\s+\\(installed\\)", "recipe_targeted": "super-agent" } } diff --git a/test/definitions/super-agent/suse/suse154-super-agent.json b/test/definitions/super-agent/suse/suse154-super-agent.json index b5e19926c..b5f1cc5ea 100644 --- a/test/definitions/super-agent/suse/suse154-super-agent.json +++ b/test/definitions/super-agent/suse/suse154-super-agent.json @@ -26,7 +26,7 @@ "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles", "params": { "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/suse.yml", - "validate_output": "New Relic Super Agent\\s+\\(installed\\)", + "validate_output": "Agent Control\\s+\\(installed\\)", "recipe_targeted": "super-agent" } } diff --git a/test/manual/definitions/fleet.json b/test/manual/definitions/fleet.json index cffabb111..fee7f1f51 100644 --- a/test/manual/definitions/fleet.json +++ b/test/manual/definitions/fleet.json @@ -1,18 +1,58 @@ { - "global_tags": { - "owning_team": "[env:NEW_RELIC_TEAM_NAME]" + "global_tags": { + "owning_team": "[env:NEW_RELIC_TEAM_NAME]" + }, + + "resources": [ + { "id": "l1", "provider": "aws", "type": "ec2", "size": "t3.nano" }, + { "id": "l2", "provider": "aws", "type": "ec2", "size": "t3.nano" }, + { "id": "l3", "provider": "aws", "type": "ec2", "size": "t3.nano" }, + { "id": "l4", "provider": "aws", "type": "ec2", "size": "t3.nano" }, + { "id": "l5", "provider": "aws", "type": "ec2", "size": "t3.nano" }, + { + "id": "w1", + "provider": "aws", + "type": "ec2", + "size": "t3.micro", + "is_windows": true, + "ami_name": "Windows_Server-2016-English-Full-HyperV-*", + "user_name": "Administrator" }, - - "resources": [ - {"id": "l1", "provider": "aws", "type": "ec2", "size": "t3.nano"}, - {"id": "l2", "provider": "aws", "type": "ec2", "size": "t3.nano"}, - {"id": "l3", "provider": "aws", "type": "ec2", "size": "t3.nano"}, - {"id": "l4", "provider": "aws", "type": "ec2", "size": "t3.nano"}, - {"id": "l5", "provider": "aws", "type": "ec2", "size": "t3.nano"}, - {"id": "w1", "provider": "aws", "type": "ec2", "size": "t3.micro", "is_windows": true, "ami_name": "Windows_Server-2016-English-Full-HyperV-*", "user_name": "Administrator"}, - {"id": "w2", "provider": "aws", "type": "ec2", "size": "t3.micro", "is_windows": true, "ami_name": "Windows_Server-2016-English-Full-HyperV-*", "user_name": "Administrator"}, - {"id": "w3", "provider": "aws", "type": "ec2", "size": "t3.micro", "is_windows": true, "ami_name": "Windows_Server-2016-English-Full-HyperV-*", "user_name": "Administrator"}, - {"id": "w4", "provider": "aws", "type": "ec2", "size": "t3.micro", "is_windows": true, "ami_name": "Windows_Server-2016-English-Full-HyperV-*", "user_name": "Administrator"}, - {"id": "w5", "provider": "aws", "type": "ec2", "size": "t3.micro", "is_windows": true, "ami_name": "Windows_Server-2016-English-Full-HyperV-*", "user_name": "Administrator"} - ] + { + "id": "w2", + "provider": "aws", + "type": "ec2", + "size": "t3.micro", + "is_windows": true, + "ami_name": "Windows_Server-2016-English-Full-HyperV-*", + "user_name": "Administrator" + }, + { + "id": "w3", + "provider": "aws", + "type": "ec2", + "size": "t3.micro", + "is_windows": true, + "ami_name": "Windows_Server-2016-English-Full-HyperV-*", + "user_name": "Administrator" + }, + { + "id": "w4", + "provider": "aws", + "type": "ec2", + "size": "t3.micro", + "is_windows": true, + "ami_name": "Windows_Server-2016-English-Full-HyperV-*", + "user_name": "Administrator" + }, + { + "id": "w5", + "provider": "aws", + "type": "ec2", + "size": "t3.micro", + "is_windows": true, + "ami_name": "Windows_Server-2016-English-Full-HyperV-*", + "user_name": "Administrator" + } + ] }