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.

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

NR-298654: Adding ubuntu 24 support for logs recipe #1098

Merged
merged 13 commits into from
Aug 12, 2024
4 changes: 2 additions & 2 deletions recipes/newrelic/infrastructure/logs/linux-logs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ installTargets:
- type: host
os: linux
platform: "ubuntu"
platformVersion: "(((16|18|20|21|22)\\.04)|(20.10))" # Xenial, Bionic, Focal, Hirsute, Jammy, Groovy
platformVersion: "(((16|18|20|21|22|24)\\.04)|(20.10))" # Xenial, Bionic, Focal, Hirsute, Jammy, Groovy
- type: host
os: linux
platform: "redhat"
Expand All @@ -57,7 +57,7 @@ installTargets:
- type: host
os: linux
platformFamily: suse
platformVersion: "(15\\.[1-4]|15-SP[1-4])"
platformVersion: "(15\\.[1-5]|15-SP[1-5])"
kernelArch: x86_64
# ARM supported
- type: host
Expand Down
15 changes: 8 additions & 7 deletions recipes/newrelic/infrastructure/super-agent/logs/linux-logs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ installTargets:
- type: host
os: linux
platform: "ubuntu"
platformVersion: "(((16|18|20|21|22)\\.04)|(20.10))" # Xenial, Bionic, Focal, Hirsute, Jammy, Groovy
platformVersion: "(((16|18|20|21|22|24)\\.04)|(20.10))" # Xenial, Bionic, Focal, Hirsute, Jammy, Groovy
- type: host
os: linux
platform: "redhat"
Expand All @@ -44,7 +44,7 @@ installTargets:
- type: host
os: linux
platformFamily: suse
platformVersion: "(15\\.[1-4]|15-SP[1-4])"
platformVersion: "(15\\.[1-5]|15-SP[1-5])"
kernelArch: x86_64
# ARM supported
- type: host
Expand All @@ -68,11 +68,12 @@ installTargets:
platformFamily: rhel
platformVersion: "((7|8)\\.?.*)"
kernelArch: aarch64
- type: host
os: linux
platformFamily: suse
platformVersion: "(15\\.[1-4]|15-SP[1-4])"
kernelArch: aarch64
# Fluent Bit supported is not available for Suse aarch64
# - type: host
# os: linux
# platformFamily: suse
# platformVersion: "(15\\.[1-5]|15-SP[1-5])"
# kernelArch: aarch64

keywords:
- Logs
Expand Down
1 change: 1 addition & 0 deletions test/definitions/logging/suse154-logs.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"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+\\(installed\\)",
"local_recipes": true
}
Expand Down
35 changes: 35 additions & 0 deletions test/definitions/logging/suse155-logs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"global_tags": {
"owning_team": "virtuoso",
"Environment": "development",
"Department": "product",
"Product": "virtuoso"
},
"resources": [
{
"id": "suse5-logs",
"provider": "aws",
"type": "ec2",
"size": "t3.nano",
"ami_name": "suse-sles-15-sp5-chost-byos-v????????-hvm-ssd-x86_64"
}
],
"instrumentations": {
"resources": [
{
"id": "nr_infra_suse155",
"resource_ids": [
"suse5-logs"
],
"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+\\(installed\\)",
Nandu-pns marked this conversation as resolved.
Show resolved Hide resolved
"local_recipes": true
}
}
]
}
}
36 changes: 36 additions & 0 deletions test/definitions/logging/ubuntu24-logs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"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-gp3/ubuntu-noble-24.??-amd64-server-????????",
"user_name": "ubuntu"
}
],

"instrumentations": {
"resources": [
{
"id": "nr_logging_ubuntu24",
"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+\\(installed\\)",
"local_recipes": true
}
}
]
}
}
36 changes: 36 additions & 0 deletions test/definitions/super-agent/logs/suse155-super-agent-logs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"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-sp5-chost-byos-v????????-hvm-ssd-x86_64"
Avinash-Sanpala marked this conversation as resolved.
Show resolved Hide resolved
}
],
"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": {
"newrelic_cli_option": "-n super-agent,logs-integration-super-agent",
"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/suse.yml",
"validate_output": "Logs Integration\\s+\\(installed\\)",
"env_var": "NEW_RELIC_CLI_SKIP_CORE=1"
}
}
]
}
}
Loading