-
Notifications
You must be signed in to change notification settings - Fork 54
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
a25ccea
commit b5c904f
Showing
3 changed files
with
77 additions
and
73 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +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": "amzn-ami-hvm-????.??.*-x86_64-gp2", | ||
| "type": "ec2", | ||
| "size": "t3.nano" | ||
| }], | ||
| "resources": [ | ||
| { | ||
| "id": "host1", | ||
| "provider": "aws", | ||
| "ami_name": "amzn2-ami-hvm-????.??.*-x86_64-gp2", | ||
| "type": "ec2", | ||
| "size": "t3.medium" | ||
| } | ||
| ], | ||
|
|
||
| "instrumentations": { | ||
| "resources": [ | ||
| { | ||
| "id": "nr_infra", | ||
| "resource_ids": ["host1"], | ||
| "provider": "newrelic", | ||
| "source_repository": "https://github.com/newrelic/open-install-library", | ||
| "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/awslinux.yml", | ||
| "validate_output": "Infrastructure Agent\\s+\\(installed\\)" | ||
| } | ||
| "instrumentations": { | ||
| "resources": [ | ||
| { | ||
| "id": "nr_infra", | ||
| "resource_ids": ["host1"], | ||
| "provider": "newrelic", | ||
| "source_repository": "https://github.com/newrelic/open-install-library", | ||
| "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/awslinux.yml", | ||
| "validate_output": "Infrastructure Agent\\s+\\(installed\\)" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } |
64 changes: 32 additions & 32 deletions
64
test/definitions/logging/amazonlinux2018-logs-unsupported.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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.nano", | ||
| "ami_name": "amzn2-ami-hvm-2018.03.0.????????.?-x86_64-gp2", | ||
| "user_name": "ec2-user" | ||
| } | ||
| ], | ||
|
|
||
| "instrumentations": { | ||
| "resources": [ | ||
| { | ||
| "id": "host1", | ||
| "provider": "aws", | ||
| "type": "ec2", | ||
| "size": "t3.nano", | ||
| "ami_name": "amzn-ami-hvm-2018.03.0.????????.?-x86_64-gp2", | ||
| "user_name": "ec2-user" | ||
| } | ||
| ], | ||
|
|
||
| "instrumentations": { | ||
| "resources": [ | ||
| { | ||
| "id": "nr_logging_amazon2018", | ||
| "resource_ids": ["host1"], | ||
| "provider": "newrelic", | ||
| "source_repository": "https://github.com/newrelic/open-install-library", | ||
| "deploy_script_path": "test/deploy/linux/newrelic-cli/install/roles", | ||
| "params": { | ||
| "newrelic_cli_option": "-n logs-integration", | ||
| "validate_output": "logs-integration\\s+\\(unsupported\\)", | ||
| "local_recipes": true | ||
| } | ||
| "id": "nr_logging_amazon2018", | ||
| "resource_ids": ["host1"], | ||
| "provider": "newrelic", | ||
| "source_repository": "https://github.com/newrelic/open-install-library", | ||
| "deploy_script_path": "test/deploy/linux/newrelic-cli/install/roles", | ||
| "params": { | ||
| "newrelic_cli_option": "-n logs-integration", | ||
| "validate_output": "logs-integration\\s+\\(unsupported\\)", | ||
| "local_recipes": true | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,18 @@ | ||
| { | ||
| "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": "amzn-ami-hvm-????.??.*-x86_64-gp2", | ||
| "type": "ec2", | ||
| "size": "t3.nano" | ||
| }] | ||
| } | ||
| "resources": [ | ||
| { | ||
| "id": "host1", | ||
| "provider": "aws", | ||
| "ami_name": "amzn2-ami-hvm-????.??.*-x86_64-gp2", | ||
| "type": "ec2", | ||
| "size": "t3.nano" | ||
| } | ||
| ] | ||
| } |