Skip to content

Commit 8760c37

Browse files
vagrawal-newrelicvagrawal-newrelic
authored
feat(redis-otel): Add redis otel recipie for nrdot (#1371)
feat(redis-otel): Add redis otel recipie for nrdot (#1371)
1 parent ce47f66 commit 8760c37

8 files changed

Lines changed: 1788 additions & 0 deletions

File tree

‎recipes/newrelic/infrastructure/nrdot/redis/debian.yml‎

Lines changed: 778 additions & 0 deletions
Large diffs are not rendered by default.

‎recipes/newrelic/infrastructure/nrdot/redis/rhel.yml‎

Lines changed: 783 additions & 0 deletions
Large diffs are not rendered by default.

‎test/definitions/nrdot/redis/al2-amd64.json‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
{
2+
"global_tags": {
3+
"owning_team": "OHAI",
4+
"Environment": "development",
5+
"Department": "product",
6+
"Product": "OHAI"
7+
},
8+
"resources": [
9+
{
10+
"id": "host1",
11+
"provider": "aws",
12+
"type": "ec2",
13+
"size": "t3.small",
14+
"ami_name": "amzn2-ami-hvm-2.0.*-x86_64-gp2",
15+
"user_name": "ec2-user"
16+
}
17+
],
18+
"services": [
19+
{
20+
"id": "redis1",
21+
"destinations": [
22+
"host1"
23+
],
24+
"source_repository": "https://github.com/newrelic/open-install-library.git",
25+
"deploy_script_path": "test/deploy/linux/nrdot-redis/install/rhel/roles",
26+
"port": 6379
27+
}
28+
],
29+
"instrumentations": {
30+
"resources": [
31+
{
32+
"id": "redisotelal2",
33+
"resource_ids": [
34+
"host1"
35+
],
36+
"source_repository": "https://github.com/newrelic/open-install-library.git",
37+
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
38+
"params": {
39+
"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/nrdot/redis/rhel.yml",
40+
"recipe_targeted": "nrdot-collector-redis",
41+
"validate_output": "NRDOT Redis\\s+\\(installed\\)",
42+
"env_var": "NEW_RELIC_CLI_SKIP_CORE=1 NR_CLI_REDIS_ENDPOINT=localhost:6379"
43+
},
44+
"provider": "newrelic"
45+
}
46+
]
47+
}
48+
}

‎test/definitions/nrdot/redis/al2023-amd64.json‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
{
2+
"global_tags": {
3+
"owning_team": "OHAI",
4+
"Environment": "development",
5+
"Department": "product",
6+
"Product": "OHAI"
7+
},
8+
"resources": [
9+
{
10+
"id": "host1",
11+
"provider": "aws",
12+
"type": "ec2",
13+
"size": "t3.small",
14+
"ami_name": "al2023-ami-2023.*-x86_64",
15+
"user_name": "ec2-user"
16+
}
17+
],
18+
"services": [
19+
{
20+
"id": "redis1",
21+
"destinations": [
22+
"host1"
23+
],
24+
"source_repository": "https://github.com/newrelic/open-install-library.git",
25+
"deploy_script_path": "test/deploy/linux/nrdot-redis/install/rhel/roles",
26+
"port": 6379
27+
}
28+
],
29+
"instrumentations": {
30+
"resources": [
31+
{
32+
"id": "redisotelal2023",
33+
"resource_ids": [
34+
"host1"
35+
],
36+
"source_repository": "https://github.com/newrelic/open-install-library.git",
37+
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
38+
"params": {
39+
"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/nrdot/redis/rhel.yml",
40+
"recipe_targeted": "nrdot-collector-redis",
41+
"validate_output": "NRDOT Redis\\s+\\(installed\\)",
42+
"env_var": "NEW_RELIC_CLI_SKIP_CORE=1 NR_CLI_REDIS_ENDPOINT=localhost:6379"
43+
},
44+
"provider": "newrelic"
45+
}
46+
]
47+
}
48+
}

‎test/definitions/nrdot/redis/ubuntu22-amd64.json‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
{
2+
"global_tags": {
3+
"owning_team": "OHAI",
4+
"Environment": "development",
5+
"Department": "product",
6+
"Product": "OHAI"
7+
},
8+
"resources": [
9+
{
10+
"id": "host1",
11+
"provider": "aws",
12+
"type": "ec2",
13+
"size": "t3.small",
14+
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-*",
15+
"user_name": "ubuntu"
16+
}
17+
],
18+
"services": [
19+
{
20+
"id": "redis1",
21+
"destinations": [
22+
"host1"
23+
],
24+
"source_repository": "https://github.com/newrelic/open-install-library.git",
25+
"deploy_script_path": "test/deploy/linux/nrdot-redis/install/debian/roles",
26+
"port": 6379
27+
}
28+
],
29+
"instrumentations": {
30+
"resources": [
31+
{
32+
"id": "redisotelubuntu22",
33+
"resource_ids": [
34+
"host1"
35+
],
36+
"source_repository": "https://github.com/newrelic/open-install-library.git",
37+
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
38+
"params": {
39+
"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/nrdot/redis/debian.yml",
40+
"recipe_targeted": "nrdot-collector-redis",
41+
"validate_output": "NRDOT Redis\\s+\\(installed\\)",
42+
"env_var": "NEW_RELIC_CLI_SKIP_CORE=1 NR_CLI_REDIS_ENDPOINT=localhost:6379"
43+
},
44+
"provider": "newrelic"
45+
}
46+
]
47+
}
48+
}

‎test/definitions/nrdot/redis/ubuntu24-amd64.json‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
{
2+
"global_tags": {
3+
"owning_team": "OHAI",
4+
"Environment": "development",
5+
"Department": "product",
6+
"Product": "OHAI"
7+
},
8+
"resources": [
9+
{
10+
"id": "host1",
11+
"provider": "aws",
12+
"type": "ec2",
13+
"size": "t3.medium",
14+
"ami_name": "ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-????????",
15+
"user_name": "ubuntu"
16+
}
17+
],
18+
"services": [
19+
{
20+
"id": "redis1",
21+
"destinations": [
22+
"host1"
23+
],
24+
"source_repository": "https://github.com/newrelic/open-install-library.git",
25+
"deploy_script_path": "test/deploy/linux/nrdot-redis/install/debian/roles",
26+
"port": 6379
27+
}
28+
],
29+
"instrumentations": {
30+
"resources": [
31+
{
32+
"id": "redisotelubuntu24",
33+
"resource_ids": [
34+
"host1"
35+
],
36+
"source_repository": "https://github.com/newrelic/open-install-library.git",
37+
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
38+
"params": {
39+
"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/nrdot/redis/debian.yml",
40+
"recipe_targeted": "nrdot-collector-redis",
41+
"validate_output": "NRDOT Redis\\s+\\(installed\\)",
42+
"env_var": "NEW_RELIC_CLI_SKIP_CORE=1 NR_CLI_REDIS_ENDPOINT=localhost:6379"
43+
},
44+
"provider": "newrelic"
45+
}
46+
]
47+
}
48+
}

‎test/deploy/linux/nrdot-redis/install/debian/roles/configure/tasks/main.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
- debug:
3+
msg: Install Redis for NRDOT Testing
4+
5+
- name: Get latest packages info
6+
shell: "apt update -y"
7+
become: true
8+
9+
- name: Install Redis
10+
shell: "apt install redis-server -y"
11+
become: true
12+
13+
- name: Enable and start Redis
14+
shell: "systemctl enable redis-server && systemctl start redis-server"
15+
become: true

‎test/deploy/linux/nrdot-redis/install/rhel/roles/configure/tasks/main.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
- debug:
3+
msg: Install Redis for NRDOT Testing
4+
5+
- name: Update packages
6+
shell: yum update -y
7+
become: yes
8+
9+
- name: Enable EPEL repository (Amazon Linux 2)
10+
shell: amazon-linux-extras install epel -y || yum install epel-release -y
11+
become: yes
12+
ignore_errors: yes
13+
14+
- name: Install Redis (try redis6 for AL2023, fallback to redis)
15+
shell: yum install redis6 -y || yum install redis -y
16+
become: yes
17+
18+
- name: Enable and start Redis
19+
shell: systemctl enable redis6 2>/dev/null || systemctl enable redis 2>/dev/null; systemctl start redis6 2>/dev/null || systemctl start redis
20+
become: yes

0 commit comments

Comments
 (0)