Skip to content

Commit 2a2d33c

Browse files
committed
Revert "temp commit"
This reverts commit 3932e0e.
1 parent 3932e0e commit 2a2d33c

File tree

2 files changed

+1
-43
lines changed

2 files changed

+1
-43
lines changed

distributions/nrdot-collector-host/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
|-----------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
55
| Distro | `nrdot-collector-host` |
66
| Stability | `public` (deprecated in favor of [nrdot-collector](../nrdot-collector/README.md)) as drop-in replacement |
7-
| Artifacts | [Docker images on DockerHub](https://hub.docker.com/r/newrelic/nrdot-collector-host)<br> [Linux packages, Windows installer and archives under GitHub Releases](https://github.com/newrelic/nrdot-collector-releases/releases) |
7+
| Artifacts | [Docker images on DockerHub](https://hub.docker.com/r/newrelic/nrdot-collector-host)<br> [Linux packages and archives under GitHub Releases](https://github.com/newrelic/nrdot-collector-releases/releases) |
88

99
A distribution of the NRDOT collector focused on
1010
- monitoring the host the collector is deployed on via `hostmetricsreceiver` and `filelogreceiver`

test/terraform/modules/ec2/main.tf

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,6 @@ data "aws_ami" "ubuntu_ami" {
3030
owners = ["099720109477"] # Canonical
3131
}
3232

33-
/* WINDOWS AMI */
34-
data "aws_ami" "windows_ami" {
35-
most_recent = true
36-
37-
filter {
38-
name = "name"
39-
// TODO: Get 2025 Windows AMI
40-
values = ["windows/ami/here"]
41-
}
42-
43-
filter {
44-
name = "virtualization-type"
45-
values = ["hvm"]
46-
}
47-
48-
owners = [""] // TODO: Find windows owner
49-
}
50-
5133
data "aws_vpc" "ec2_vpc" {
5234
id = var.vpc_id
5335
}
@@ -162,27 +144,3 @@ resource "aws_instance" "ubuntu" {
162144
journalctl | grep ${var.collector_distro}
163145
EOF
164146
}
165-
166-
resource "aws_instance" "windows" {
167-
count = 1
168-
ami = data.aws_ami.windows_ami.id
169-
instance_type = "t2.micro"
170-
subnet_id = data.aws_subnets.private_subnets.ids[0]
171-
vpc_security_group_ids = [aws_security_group.ec2_allow_all_egress.id]
172-
iam_instance_profile = aws_iam_instance_profile.s3_read_access.name
173-
174-
# TODO: set tag properly
175-
tags = {
176-
Name = "${var.test_environment}-${var.collector_distro}-windows_server_2025"
177-
}
178-
179-
user_data_replace_on_change = true
180-
user_data = <<-EOF
181-
USE POWERSHELL VERSION OF ABOVE
182-
- install awscli
183-
- install s3 of msi
184-
- install msi file
185-
- the colletor config should be set on install
186-
- what is otel_resource_attributes?
187-
EOF
188-
}

0 commit comments

Comments
 (0)