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

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

Merged
merged 13 commits into from
Aug 12, 2024
Merged

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

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8cdc4e2
NR-292615: Adding ubuntu 24 support for logs recipe
nr-rkallempudi Jul 24, 2024
7f5de67
Adding support all versions of suse
nr-rkallempudi Jul 25, 2024
2e2d258
adding suse 15.5 tests
nr-rkallempudi Jul 25, 2024
5488ad2
fixing resource ids
nr-rkallempudi Jul 25, 2024
d962fd6
limiting suse support to uptil 15.5
nr-rkallempudi Jul 25, 2024
e66c604
adding 15.* for Agent Control
nr-rkallempudi Jul 26, 2024
5e8cf06
moving test case to test/definitions/super-agent/logs
nr-rkallempudi Aug 1, 2024
a8f19cd
added config as recommended in PR feedback
nr-rkallempudi Aug 5, 2024
6a85e9d
rename the file to suse155-super-agent-logs
nr-rkallempudi Aug 5, 2024
3c95c13
removing recipe_targeted config param
nr-rkallempudi Aug 5, 2024
33d2966
Update suse155-super-agent-logs.json
nr-rkallempudi Aug 5, 2024
292dbf6
specifying AMIs
nr-rkallempudi Aug 10, 2024
f381475
updating source_repository
nr-rkallempudi Aug 12, 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
4 changes: 2 additions & 2 deletions recipes/newrelic/infrastructure/logs/linux-logs.yml
View file
Open in desktop
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
6 changes: 3 additions & 3 deletions recipes/newrelic/infrastructure/super-agent/logs/linux-logs.yml
View file
Open in desktop
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)\\.*"
danybmx marked this conversation as resolved.
Show resolved Hide resolved
kernelArch: x86_64
# ARM supported
- type: host
Expand All @@ -71,7 +71,7 @@ installTargets:
- type: host
os: linux
platformFamily: suse
platformVersion: "(15\\.[1-4]|15-SP[1-4])"
platformVersion: "(15)\\.*"
danybmx marked this conversation as resolved.
Show resolved Hide resolved
kernelArch: aarch64

keywords:
Expand Down
34 changes: 34 additions & 0 deletions test/definitions/logging/suse155-logs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"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": {
"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
View file
Open in desktop
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
}
}
]
}
}
35 changes: 35 additions & 0 deletions test/definitions/super-agent/suse/suse155-super-agent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
nr-rkallempudi marked this conversation as resolved.
Show resolved Hide resolved
"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"
}
],
"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"
}
}
]
}
}
Loading