Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Amazon linux 2023 logs and infra agent installtargets #1114

Merged
merged 3 commits into from
Sep 5, 2024
Merged

fix: Amazon linux 2023 logs and infra agent installtargets #1114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a25ccea
fix: Amazon linux 2023 logs and infra agent installtargets
NSSPKrishna Sep 2, 2024
b5c904f
test: Updated the AMI
NSSPKrishna Sep 3, 2024
f6baf6c
chore: Revised size
NSSPKrishna Sep 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion recipes/newrelic/infrastructure/awslinux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ installTargets:
os: linux
platform: amazon
platformFamily: rhel
platformVersion: "2023"
platformVersion: "(2023\\.*)"

keywords:
- Infrastructure
Expand Down
2 changes: 1 addition & 1 deletion recipes/newrelic/infrastructure/logs/linux-logs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ installTargets:
- type: host
os: linux
platform: amazon
platformVersion: "2023"
platformVersion: "(2023\\.*)"
kernelArch: x86_64
- type: host
os: linux
Expand Down
56 changes: 29 additions & 27 deletions test/definitions-eu/infra-agent/rhel/awslinux-infra.json
View file
Open in desktop
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.nano"
}
],

"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 test/definitions/logging/amazonlinux2018-logs-unsupported.json
View file
Open in desktop
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": "amzn-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
}
]
}
}
}
]
}
}
30 changes: 16 additions & 14 deletions test/manual/definitions/infra-agent/awslinux-infra.json
View file
Open in desktop
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"
}
]
}
Loading