Skip to content
Merged
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ node_modules
.DS_Store
recipes/.prettierrc
*.war
docs/superpowers/
7 changes: 5 additions & 2 deletions recipes/newrelic/apm/dotNet/linux-systemd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,11 @@ install:
add_gnupg2_if_required:
cmds:
- |
if [ $(({{.DEBIAN_VERSION}})) -ge 10 ]; then
sudo apt-get install gnupg2 -y
IS_YUM_INSTALLED=$(which yum 2>&1 || true)
if [[ -z "$IS_YUM_INSTALLED" ]]; then
if [ $(({{.DEBIAN_VERSION}})) -ge 10 ]; then
sudo apt-get install gnupg2 -y
fi
fi
vars:
DEBIAN_VERSION:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},

"resources": [{
"id": "ubuntuapachenetcore1",
"id": "ubuntu20-eu",
"provider": "aws",
"type": "ec2",
"size": "t3.micro",
Expand All @@ -17,21 +17,21 @@

"services": [{
"id": "aspnetcore",
"destinations": ["ubuntuapachenetcore1"],
"destinations": ["ubuntu20-eu"],
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/dotNet/install/ubuntu20/roles",
"port": 9999
},
{
"id": "apache1",
"destinations": ["ubuntuapachenetcore1"],
"destinations": ["ubuntu20-eu"],
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/apache/install/debian/roles",
"port": 80
},
{
"id": "dotnet1",
"destinations": ["ubuntuapachenetcore1"],
"destinations": ["ubuntu20-eu"],
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/apache/deploy-application/dotNet/debian/roles",
"port": 8080,
Expand All @@ -41,7 +41,7 @@
},
{
"id": "dotnet2",
"destinations": ["ubuntuapachenetcore1"],
"destinations": ["ubuntu20-eu"],
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/apache/deploy-application/dotNet/debian/roles",
"port": 8081
Expand All @@ -51,7 +51,7 @@
"resources": [
{
"id": "cli1",
"resource_ids": ["ubuntuapachenetcore1"],
"resource_ids": ["ubuntu20-eu"],
"provider": "newrelic",
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
{
"global_tags": {
"owning_team": "virtuoso",
"Environment": "development",
"Department": "product",
"Product": "virtuoso"
},

"resources": [{
"id": "ubuntu24-eu",
"provider": "aws",
"type": "ec2",
"size": "t3.micro",
"ami_name": "ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-????????",
"user_name": "ubuntu"
}],

"services": [{
"id": "aspnetcore",
"destinations": ["ubuntu24-eu"],
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/dotNet/install/ubuntu24/roles",
"port": 9999
},
{
"id": "apache1",
"destinations": ["ubuntu24-eu"],
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/apache/install/debian/roles",
"port": 80
},
{
"id": "dotnet1",
"destinations": ["ubuntu24-eu"],
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/apache/deploy-application/dotNet/debian/roles",
"port": 8080,
"params": {
"is_selfcontained": "true",
"dotnet_app_name": "net10webapp",
"web_app_url": "https://test-repo-production.s3.us-west-2.amazonaws.com/install/dotnet/testapps/selfcontained-net10webapplication.zip"
}
},
{
"id": "dotnet2",
"destinations": ["ubuntu24-eu"],
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/apache/deploy-application/dotNet/debian/roles",
"port": 8081,
"params": {
"dotnet_app_name": "net10webapp",
"web_app_url": "https://test-repo-production.s3.us-west-2.amazonaws.com/install/dotnet/testapps/frameworkdependent-net10webapplication.zip"
}
}],

"instrumentations": {
"resources": [
{
"id": "cli1",
"resource_ids": ["ubuntu24-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/ubuntu.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/apm/dotNet/linux-systemd.yml",
"validate_output": ".NET Agent\\s+\\(installed\\)"
}
}
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},

"resources": [{
"id": "ubuntuapachenetcore1",
"id": "ubuntu20-jp",
"provider": "aws",
"type": "ec2",
"size": "t3.micro",
Expand All @@ -17,21 +17,21 @@

"services": [{
"id": "aspnetcore",
"destinations": ["ubuntuapachenetcore1"],
"destinations": ["ubuntu20-jp"],
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/dotNet/install/ubuntu20/roles",
"port": 9999
},
{
"id": "apache1",
"destinations": ["ubuntuapachenetcore1"],
"destinations": ["ubuntu20-jp"],
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/apache/install/debian/roles",
"port": 80
},
{
"id": "dotnet1",
"destinations": ["ubuntuapachenetcore1"],
"destinations": ["ubuntu20-jp"],
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/apache/deploy-application/dotNet/debian/roles",
"port": 8080,
Expand All @@ -41,7 +41,7 @@
},
{
"id": "dotnet2",
"destinations": ["ubuntuapachenetcore1"],
"destinations": ["ubuntu20-jp"],
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/apache/deploy-application/dotNet/debian/roles",
"port": 8081
Expand All @@ -51,7 +51,7 @@
"resources": [
{
"id": "cli1",
"resource_ids": ["ubuntuapachenetcore1"],
"resource_ids": ["ubuntu20-jp"],
"provider": "newrelic",
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
{
"global_tags": {
"owning_team": "virtuoso",
"Environment": "development",
"Department": "product",
"Product": "virtuoso"
},

"resources": [{
"id": "ubuntu24-jp",
"provider": "aws",
"type": "ec2",
"size": "t3.micro",
"ami_name": "ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-????????",
"user_name": "ubuntu"
}],

"services": [{
"id": "aspnetcore",
"destinations": ["ubuntu24-jp"],
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/dotNet/install/ubuntu24/roles",
"port": 9999
},
{
"id": "apache1",
"destinations": ["ubuntu24-jp"],
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/apache/install/debian/roles",
"port": 80
},
{
"id": "dotnet1",
"destinations": ["ubuntu24-jp"],
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/apache/deploy-application/dotNet/debian/roles",
"port": 8080,
"params": {
"is_selfcontained": "true",
"dotnet_app_name": "net10webapp",
"web_app_url": "https://test-repo-production.s3.us-west-2.amazonaws.com/install/dotnet/testapps/selfcontained-net10webapplication.zip"
}
},
{
"id": "dotnet2",
"destinations": ["ubuntu24-jp"],
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/apache/deploy-application/dotNet/debian/roles",
"port": 8081,
"params": {
"dotnet_app_name": "net10webapp",
"web_app_url": "https://test-repo-production.s3.us-west-2.amazonaws.com/install/dotnet/testapps/frameworkdependent-net10webapplication.zip"
}
}],

"instrumentations": {
"resources": [
{
"id": "cli1",
"resource_ids": ["ubuntu24-jp"],
"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/ubuntu.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/apm/dotNet/linux-systemd.yml",
"validate_output": ".NET Agent\\s+\\(installed\\)"
}
}
]
}
}
72 changes: 72 additions & 0 deletions test/definitions/apm/dotNet/linux/al2023-apache-aspnetcore.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
{
"global_tags": {
"owning_team": "virtuoso",
"Environment": "development",
"Department": "product",
"Product": "virtuoso"
},

"resources": [{
"id": "al2023",
"provider": "aws",
"type": "ec2",
"size": "t3.micro",
"ami_name": "al2023-ami-2023.*-x86_64",
"user_name": "ec2-user"
}],

"services": [{
"id": "aspnetcore",
"destinations": ["al2023"],
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/dotNet/install/al2023/roles",
"port": 9999
},
{
"id": "apache1",
"destinations": ["al2023"],
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/apache/install/rhel/roles",
"port": 80
},
{
"id": "dotnet1",
"destinations": ["al2023"],
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/apache/deploy-application/dotNet/rhel/roles",
"port": 8080,
"params": {
"is_selfcontained": "true",
"dotnet_app_name": "net10webapp",
"web_app_url": "https://test-repo-production.s3.us-west-2.amazonaws.com/install/dotnet/testapps/selfcontained-net10webapplication.zip"
}
},
{
"id": "dotnet2",
"destinations": ["al2023"],
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/apache/deploy-application/dotNet/rhel/roles",
"port": 8081,
"params": {
"dotnet_app_name": "net10webapp",
"dotnet_exe": "/usr/bin/dotnet",
"web_app_url": "https://test-repo-production.s3.us-west-2.amazonaws.com/install/dotnet/testapps/frameworkdependent-net10webapplication.zip"
}
}],

"instrumentations": {
"resources": [
{
"id": "cli1",
"resource_ids": ["al2023"],
"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/awslinux.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/apm/dotNet/linux-systemd.yml",
"validate_output": ".NET Agent\\s+\\(installed\\)"
}
}
]
}
}
Loading
Loading