diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 863bc0c9..1f63552b 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,5 +1,5 @@ blank_issues_enabled: false contact_links: - name: Troubleshooting - url: https://github.com/newrelic/opentelemetry-collector-releases/blob/master/README.md#support + url: https://github.com/newrelic/nrdot-collector-releases/blob/master/README.md#support about: Check out the README for troubleshooting directions diff --git a/.github/workflows/security.yaml b/.github/workflows/security.yaml index 47ee51bb..3287cee8 100644 --- a/.github/workflows/security.yaml +++ b/.github/workflows/security.yaml @@ -62,4 +62,4 @@ jobs: webhook-type: incoming-webhook # This data can be any valid JSON from a previous step in the GitHub Action payload: | - text: ":rotating_light: Hi from your Github Action, vulnerabilities found in NRDOT ${{ matrix.image }}:${{ inputs.tag }}, see: https://github.com/newrelic/opentelemetry-collector-releases/security :rotating_light:" + text: ":rotating_light: Hi from your Github Action, vulnerabilities found in NRDOT ${{ matrix.image }}:${{ inputs.tag }}, see: https://github.com/newrelic/nrdot-collector-releases/security :rotating_light:" diff --git a/cmd/goreleaser/main.go b/cmd/goreleaser/main.go index b0c0cc6c..104d2f25 100644 --- a/cmd/goreleaser/main.go +++ b/cmd/goreleaser/main.go @@ -20,7 +20,7 @@ import ( "github.com/goreleaser/goreleaser/v2/pkg/config" "gopkg.in/yaml.v3" - "github.com/newrelic/opentelemetry-collector-releases/cmd/goreleaser/internal" + "github.com/newrelic/nrdot-collector-releases/cmd/goreleaser/internal" ) var distFlag = flag.String("d", "", "Collector distributions to build") diff --git a/distributions/nr-otel-collector/THIRD_PARTY_NOTICES.md b/distributions/nr-otel-collector/THIRD_PARTY_NOTICES.md index 515b90fe..8ecef9ae 100644 --- a/distributions/nr-otel-collector/THIRD_PARTY_NOTICES.md +++ b/distributions/nr-otel-collector/THIRD_PARTY_NOTICES.md @@ -7,7 +7,7 @@ In the event that a required notice is missing or incorrect, please notify us by [open-source@newrelic.com](mailto:open-source@newrelic.com). For any licenses that require the disclosure of source code, the source code -can be found at https://github.com/newrelic/opentelemetry-collector-releases. +can be found at https://github.com/newrelic/nrdot-collector-releases. diff --git a/distributions/nr-otel-collector/manifest.yaml b/distributions/nr-otel-collector/manifest.yaml index 9efaa742..2832afd6 100644 --- a/distributions/nr-otel-collector/manifest.yaml +++ b/distributions/nr-otel-collector/manifest.yaml @@ -1,5 +1,5 @@ dist: - module: github.com/newrelic/opentelemetry-collector-releases/nr-otel-collector + module: github.com/newrelic/nrdot-collector-releases/nr-otel-collector name: nr-otel-collector description: NRDOT Collector Legacy version: 0.8.10 diff --git a/distributions/nrdot-collector-host/THIRD_PARTY_NOTICES.md b/distributions/nrdot-collector-host/THIRD_PARTY_NOTICES.md index cb1c4b2c..a9c16036 100644 --- a/distributions/nrdot-collector-host/THIRD_PARTY_NOTICES.md +++ b/distributions/nrdot-collector-host/THIRD_PARTY_NOTICES.md @@ -7,7 +7,7 @@ In the event that a required notice is missing or incorrect, please notify us by [open-source@newrelic.com](mailto:open-source@newrelic.com). For any licenses that require the disclosure of source code, the source code -can be found at https://github.com/newrelic/opentelemetry-collector-releases. +can be found at https://github.com/newrelic/nrdot-collector-releases. diff --git a/distributions/nrdot-collector-host/manifest.yaml b/distributions/nrdot-collector-host/manifest.yaml index 5472fa77..e6d79c7d 100644 --- a/distributions/nrdot-collector-host/manifest.yaml +++ b/distributions/nrdot-collector-host/manifest.yaml @@ -1,5 +1,5 @@ dist: - module: github.com/newrelic/opentelemetry-collector-releases/nrdot-collector-host + module: github.com/newrelic/nrdot-collector-releases/nrdot-collector-host name: nrdot-collector-host description: NRDOT Collector Host version: 0.8.10 diff --git a/distributions/nrdot-collector-k8s/THIRD_PARTY_NOTICES.md b/distributions/nrdot-collector-k8s/THIRD_PARTY_NOTICES.md index 93e8cfd5..72b2760a 100644 --- a/distributions/nrdot-collector-k8s/THIRD_PARTY_NOTICES.md +++ b/distributions/nrdot-collector-k8s/THIRD_PARTY_NOTICES.md @@ -7,7 +7,7 @@ In the event that a required notice is missing or incorrect, please notify us by [open-source@newrelic.com](mailto:open-source@newrelic.com). For any licenses that require the disclosure of source code, the source code -can be found at https://github.com/newrelic/opentelemetry-collector-releases. +can be found at https://github.com/newrelic/nrdot-collector-releases. diff --git a/distributions/nrdot-collector-k8s/manifest.yaml b/distributions/nrdot-collector-k8s/manifest.yaml index ca3a7148..4697ed9d 100644 --- a/distributions/nrdot-collector-k8s/manifest.yaml +++ b/distributions/nrdot-collector-k8s/manifest.yaml @@ -1,5 +1,5 @@ dist: - module: github.com/newrelic/opentelemetry-collector-releases/nrdot-collector-k8s + module: github.com/newrelic/nrdot-collector-releases/nrdot-collector-k8s name: nrdot-collector-k8s description: NRDOT Collector k8s version: 0.8.9 diff --git a/go.mod b/go.mod index ec3d58d6..38ae7c17 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/newrelic/opentelemetry-collector-releases +module github.com/newrelic/nrdot-collector-releases go 1.23.4 diff --git a/internal/assets/license/THIRD_PARTY_NOTICES.md.tmpl b/internal/assets/license/THIRD_PARTY_NOTICES.md.tmpl index a6f148dc..51e85968 100644 --- a/internal/assets/license/THIRD_PARTY_NOTICES.md.tmpl +++ b/internal/assets/license/THIRD_PARTY_NOTICES.md.tmpl @@ -19,7 +19,7 @@ In the event that a required notice is missing or incorrect, please notify us by [open-source@newrelic.com](mailto:open-source@newrelic.com). For any licenses that require the disclosure of source code, the source code -can be found at https://github.com/newrelic/opentelemetry-collector-releases. +can be found at https://github.com/newrelic/nrdot-collector-releases. {{ template "depInfo" .Direct }} diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 1f58df9a..281ca660 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -1,4 +1,4 @@ -module github.com/newrelic/opentelemetry-collector-releases/internal/tools +module github.com/newrelic/nrdot-collector-releases/internal/tools go 1.23 diff --git a/test/terraform/permanent/main.tf b/test/terraform/permanent/main.tf index 5b822df9..3651df1c 100644 --- a/test/terraform/permanent/main.tf +++ b/test/terraform/permanent/main.tf @@ -34,14 +34,14 @@ module "ecr" { for_each = local.distros - source = "terraform-aws-modules/ecr/aws" - + source = "terraform-aws-modules/ecr/aws" + version = "2.3.1" repository_name = each.value repository_image_tag_mutability = "MUTABLE" repository_read_write_access_arns = [data.aws_iam_session_context.current.issuer_arn] - repository_read_access_arns = [module.ci_e2e_cluster.cluster_iam_role_arn] + repository_read_access_arns = [module.ci_e2e_cluster.cluster_iam_role_arn] repository_lifecycle_policy = jsonencode({ rules = [ @@ -49,10 +49,10 @@ module "ecr" { rulePriority = 1, description = "Keep last 10 nightly images", selection = { - tagStatus = "tagged", + tagStatus = "tagged", tagPrefixList = ["nightly"], - countType = "imageCountMoreThan", - countNumber = 10 + countType = "imageCountMoreThan", + countNumber = 10 }, action = { type = "expire" @@ -63,10 +63,10 @@ module "ecr" { } module "s3_bucket" { - source = "terraform-aws-modules/s3-bucket/aws" - - bucket = local.releases_bucket_name - acl = "private" + source = "terraform-aws-modules/s3-bucket/aws" + version = "4.5.0" + bucket = local.releases_bucket_name + acl = "private" control_object_ownership = true object_ownership = "ObjectWriter" @@ -86,7 +86,7 @@ resource "random_string" "deploy_id" { } resource "helm_release" "ci_e2e_nightly" { - for_each = local.distros + for_each = local.distros depends_on = [module.ci_e2e_cluster, module.ecr] name = "ci-e2etest-nightly" @@ -131,9 +131,9 @@ module "ci_e2e_ec2" { source = "../modules/ec2" releases_bucket_name = local.releases_bucket_name collector_distro = each.key - nr_ingest_key = var.nr_ingest_key + nr_ingest_key = var.nr_ingest_key # reuse vpc to avoid having to pay for second NAT gateway for this simple use case - vpc_id = module.ci_e2e_cluster.eks_vpc_id - deploy_id = random_string.deploy_id.result - permission_boundary = local.required_permissions_boundary_arn_for_new_roles + vpc_id = module.ci_e2e_cluster.eks_vpc_id + deploy_id = random_string.deploy_id.result + permission_boundary = local.required_permissions_boundary_arn_for_new_roles }