Skip to content

Commit

Permalink
NR-160489: move bins to /opt
Browse files Browse the repository at this point in the history
  • Loading branch information
brushknight committed Oct 13, 2023
1 parent 9b48d53 commit 6eaeeb2
Show file tree
Hide file tree
Showing 58 changed files with 270 additions and 153 deletions.
14 changes: 9 additions & 5 deletions .github/workflows/prerelease_linux_on_demand.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,17 @@ on:
branch:
description: 'Branch to build from'
required: true
fake_tag:
description: 'Version to be given to the packages'
default: '0.0.0'
dest_prefix:
description: 'Repo prefix'
required: true

env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
TAG: "0.0.0"
# TAG: "0.0.0"
FAKE_TAG: ${{ inputs.fake_tag }}
DOCKER_HUB_ID: ${{secrets.OHAI_DOCKER_HUB_ID}}
DOCKER_HUB_PASSWORD: ${{secrets.OHAI_DOCKER_HUB_PASSWORD}}
# required for GHA publish action, should be moved into optional
Expand Down Expand Up @@ -43,7 +47,7 @@ jobs:
ref: ${{ env.BRANCH }}

- name: "Tag this commit" # required for Goreleaser
run: git tag ${{ env.TAG }}
run: git tag ${{ env.FAKE_TAG }}

- name: Login to DockerHub
uses: docker/login-action@v1
Expand All @@ -64,7 +68,7 @@ jobs:
- name: Publish deb to S3 action
uses: newrelic/[email protected]
with:
tag: ${{env.TAG}}
tag: ${{env.FAKE_TAG}}
app_name: "newrelic-infra"
repo_name: "newrelic/infrastructure-agent"
schema: "custom"
Expand All @@ -89,7 +93,7 @@ jobs:
- name: Publish rpm to S3 action
uses: newrelic/[email protected]
with:
tag: ${{env.TAG}}
tag: ${{env.FAKE_TAG}}
app_name: "newrelic-infra"
repo_name: "newrelic/infrastructure-agent"
schema: "custom"
Expand All @@ -113,7 +117,7 @@ jobs:
- name: Publish targz to S3 action
uses: newrelic/[email protected]
with:
tag: ${{env.TAG}}
tag: ${{env.FAKE_TAG}}
app_name: "newrelic-infra"
repo_name: "newrelic/infrastructure-agent"
schema: "custom"
Expand Down
8 changes: 5 additions & 3 deletions build/goreleaser/linux/al2023_amd64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,18 @@
dst: '/etc/newrelic-infra/integrations.d/docker-config.yml'
type: config
- src: 'target/nridocker/amd64/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-docker'
- src: 'target/nriflex/amd64/nri-flex'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-flex'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-flex'
- src: 'target/nriprometheus/amd64/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
- src: 'target/fluent-bit-plugin/amd64/out_newrelic.so'
dst: '/var/db/newrelic-infra/newrelic-integrations/logging/out_newrelic.so'
- src: 'assets/examples/logging/parsers.conf'
dst: '/var/db/newrelic-infra/newrelic-integrations/logging/parsers.conf'
empty_folders:
- /opt/newrelic-infra/custom-integrations
- /opt/newrelic-infra/newrelic-integrations
- /var/db/newrelic-infra/custom-integrations
- /var/db/newrelic-infra/integrations.d
- /var/log/newrelic-infra
Expand Down
8 changes: 5 additions & 3 deletions build/goreleaser/linux/al2023_arm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,18 @@
type: config

- src: 'target/nridocker/{{ .Arch }}/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-docker'
- src: 'target/nriflex/{{ .Arch }}/nri-flex'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-flex'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-flex'
- src: 'target/nriprometheus/{{ .Arch }}/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
# - src: 'target/fluent-bit-plugin/{{ .Arch }}/out_newrelic.so'
# dst: '/var/db/newrelic-infra/newrelic-integrations/logging/out_newrelic.so'
# - src: 'assets/examples/logging/parsers.conf'
# dst: '/var/db/newrelic-infra/newrelic-integrations/logging/parsers.conf'
empty_folders:
- /opt/newrelic-infra/custom-integrations
- /opt/newrelic-infra/newrelic-integrations
- /var/db/newrelic-infra/custom-integrations
- /var/db/newrelic-infra/integrations.d
- /var/log/newrelic-infra
Expand Down
8 changes: 5 additions & 3 deletions build/goreleaser/linux/al2023_arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,18 @@
dst: '/etc/newrelic-infra/integrations.d/docker-config.yml'
type: config
- src: 'target/nridocker/{{ .Arch }}/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-docker'
- src: 'target/nriflex/{{ .Arch }}/nri-flex'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-flex'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-flex'
- src: 'target/nriprometheus/{{ .Arch }}/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
- src: 'target/fluent-bit-plugin/{{ .Arch }}/out_newrelic.so'
dst: '/var/db/newrelic-infra/newrelic-integrations/logging/out_newrelic.so'
- src: 'assets/examples/logging/parsers.conf'
dst: '/var/db/newrelic-infra/newrelic-integrations/logging/parsers.conf'
empty_folders:
- /opt/newrelic-infra/custom-integrations
- /opt/newrelic-infra/newrelic-integrations
- /var/db/newrelic-infra/custom-integrations
- /var/db/newrelic-infra/integrations.d
- /var/log/newrelic-infra
Expand Down
8 changes: 5 additions & 3 deletions build/goreleaser/linux/al2_amd64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,18 @@
dst: '/etc/newrelic-infra/integrations.d/docker-config.yml'
type: config
- src: 'target/nridocker/amd64/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-docker'
- src: 'target/nriflex/amd64/nri-flex'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-flex'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-flex'
- src: 'target/nriprometheus/amd64/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
- src: 'target/fluent-bit-plugin/amd64/out_newrelic.so'
dst: '/var/db/newrelic-infra/newrelic-integrations/logging/out_newrelic.so'
- src: 'assets/examples/logging/parsers.conf'
dst: '/var/db/newrelic-infra/newrelic-integrations/logging/parsers.conf'
empty_folders:
- /opt/newrelic-infra/custom-integrations
- /opt/newrelic-infra/newrelic-integrations
- /var/db/newrelic-infra/custom-integrations
- /var/db/newrelic-infra/integrations.d
- /var/log/newrelic-infra
Expand Down
8 changes: 5 additions & 3 deletions build/goreleaser/linux/al2_arm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,18 @@
type: config

- src: 'target/nridocker/{{ .Arch }}/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-docker'
- src: 'target/nriflex/{{ .Arch }}/nri-flex'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-flex'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-flex'
- src: 'target/nriprometheus/{{ .Arch }}/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
# - src: 'target/fluent-bit-plugin/{{ .Arch }}/out_newrelic.so'
# dst: '/var/db/newrelic-infra/newrelic-integrations/logging/out_newrelic.so'
# - src: 'assets/examples/logging/parsers.conf'
# dst: '/var/db/newrelic-infra/newrelic-integrations/logging/parsers.conf'
empty_folders:
- /opt/newrelic-infra/custom-integrations
- /opt/newrelic-infra/newrelic-integrations
- /var/db/newrelic-infra/custom-integrations
- /var/db/newrelic-infra/integrations.d
- /var/log/newrelic-infra
Expand Down
8 changes: 5 additions & 3 deletions build/goreleaser/linux/al2_arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,18 @@
dst: '/etc/newrelic-infra/integrations.d/docker-config.yml'
type: config
- src: 'target/nridocker/{{ .Arch }}/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-docker'
- src: 'target/nriflex/{{ .Arch }}/nri-flex'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-flex'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-flex'
- src: 'target/nriprometheus/{{ .Arch }}/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
- src: 'target/fluent-bit-plugin/{{ .Arch }}/out_newrelic.so'
dst: '/var/db/newrelic-infra/newrelic-integrations/logging/out_newrelic.so'
- src: 'assets/examples/logging/parsers.conf'
dst: '/var/db/newrelic-infra/newrelic-integrations/logging/parsers.conf'
empty_folders:
- /opt/newrelic-infra/custom-integrations
- /opt/newrelic-infra/newrelic-integrations
- /var/db/newrelic-infra/custom-integrations
- /var/db/newrelic-infra/integrations.d
- /var/log/newrelic-infra
Expand Down
8 changes: 5 additions & 3 deletions build/goreleaser/linux/centos_6_amd64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
type: config

- src: 'target/nridocker/amd64/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-docker'
- src: 'target/nriflex/amd64/nri-flex'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-flex'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-flex'
- src: 'target/nriprometheus/amd64/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-prometheus'

# Upstart service conf file
- src: 'build/package/upstart/newrelic-infra'
Expand All @@ -39,6 +39,8 @@
dst: /etc/init.d/newrelic-infra
type: "symlink"
empty_folders:
- /opt/newrelic-infra/custom-integrations
- /opt/newrelic-infra/newrelic-integrations
- /var/db/newrelic-infra/custom-integrations
- /var/db/newrelic-infra/integrations.d
- /var/log/newrelic-infra
Expand Down
8 changes: 5 additions & 3 deletions build/goreleaser/linux/centos_7_amd64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,18 @@
dst: '/etc/newrelic-infra/integrations.d/docker-config.yml'
type: config
- src: 'target/nridocker/amd64/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-docker'
- src: 'target/nriflex/amd64/nri-flex'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-flex'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-flex'
- src: 'target/nriprometheus/amd64/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
- src: 'target/fluent-bit-plugin/amd64/out_newrelic.so'
dst: '/var/db/newrelic-infra/newrelic-integrations/logging/out_newrelic.so'
- src: 'assets/examples/logging/parsers.conf'
dst: '/var/db/newrelic-infra/newrelic-integrations/logging/parsers.conf'
empty_folders:
- /opt/newrelic-infra/custom-integrations
- /opt/newrelic-infra/newrelic-integrations
- /var/db/newrelic-infra/custom-integrations
- /var/db/newrelic-infra/integrations.d
- /var/log/newrelic-infra
Expand Down
8 changes: 5 additions & 3 deletions build/goreleaser/linux/centos_7_arm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,18 @@
dst: '/etc/newrelic-infra/integrations.d/docker-config.yml'
type: config
- src: 'target/nridocker/{{ .Arch }}/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-docker'
- src: 'target/nriflex/{{ .Arch }}/nri-flex'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-flex'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-flex'
- src: 'target/nriprometheus/{{ .Arch }}/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
# - src: 'target/fluent-bit-plugin/{{ .Arch }}/out_newrelic.so'
# dst: '/var/db/newrelic-infra/newrelic-integrations/logging/out_newrelic.so'
# - src: 'assets/examples/logging/parsers.conf'
# dst: '/var/db/newrelic-infra/newrelic-integrations/logging/parsers.conf'
empty_folders:
- /opt/newrelic-infra/custom-integrations
- /opt/newrelic-infra/newrelic-integrations
- /var/db/newrelic-infra/custom-integrations
- /var/db/newrelic-infra/integrations.d
- /var/log/newrelic-infra
Expand Down
8 changes: 5 additions & 3 deletions build/goreleaser/linux/centos_7_arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,18 @@
dst: '/etc/newrelic-infra/integrations.d/docker-config.yml'
type: config
- src: 'target/nridocker/{{ .Arch }}/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-docker'
- src: 'target/nriflex/{{ .Arch }}/nri-flex'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-flex'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-flex'
- src: 'target/nriprometheus/{{ .Arch }}/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
- src: 'target/fluent-bit-plugin/{{ .Arch }}/out_newrelic.so'
dst: '/var/db/newrelic-infra/newrelic-integrations/logging/out_newrelic.so'
- src: 'assets/examples/logging/parsers.conf'
dst: '/var/db/newrelic-infra/newrelic-integrations/logging/parsers.conf'
empty_folders:
- /opt/newrelic-infra/custom-integrations
- /opt/newrelic-infra/newrelic-integrations
- /var/db/newrelic-infra/custom-integrations
- /var/db/newrelic-infra/integrations.d
- /var/log/newrelic-infra
Expand Down
8 changes: 5 additions & 3 deletions build/goreleaser/linux/centos_8_amd64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,18 @@
dst: '/etc/newrelic-infra/integrations.d/docker-config.yml'
type: config
- src: 'target/nridocker/amd64/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-docker'
- src: 'target/nriflex/amd64/nri-flex'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-flex'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-flex'
- src: 'target/nriprometheus/amd64/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
- src: 'target/fluent-bit-plugin/amd64/out_newrelic.so'
dst: '/var/db/newrelic-infra/newrelic-integrations/logging/out_newrelic.so'
- src: 'assets/examples/logging/parsers.conf'
dst: '/var/db/newrelic-infra/newrelic-integrations/logging/parsers.conf'
empty_folders:
- /opt/newrelic-infra/custom-integrations
- /opt/newrelic-infra/newrelic-integrations
- /var/db/newrelic-infra/custom-integrations
- /var/db/newrelic-infra/integrations.d
- /var/log/newrelic-infra
Expand Down
8 changes: 5 additions & 3 deletions build/goreleaser/linux/centos_8_arm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,18 @@
dst: '/etc/newrelic-infra/integrations.d/docker-config.yml'
type: config
- src: 'target/nridocker/{{ .Arch }}/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-docker'
- src: 'target/nriflex/{{ .Arch }}/nri-flex'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-flex'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-flex'
- src: 'target/nriprometheus/{{ .Arch }}/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
# - src: 'target/fluent-bit-plugin/{{ .Arch }}/out_newrelic.so'
# dst: '/var/db/newrelic-infra/newrelic-integrations/logging/out_newrelic.so'
# - src: 'assets/examples/logging/parsers.conf'
# dst: '/var/db/newrelic-infra/newrelic-integrations/logging/parsers.conf'
empty_folders:
- /opt/newrelic-infra/custom-integrations
- /opt/newrelic-infra/newrelic-integrations
- /var/db/newrelic-infra/custom-integrations
- /var/db/newrelic-infra/integrations.d
- /var/log/newrelic-infra
Expand Down
8 changes: 5 additions & 3 deletions build/goreleaser/linux/centos_8_arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,18 @@
dst: '/etc/newrelic-infra/integrations.d/docker-config.yml'
type: config
- src: 'target/nridocker/{{ .Arch }}/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-docker'
- src: 'target/nriflex/{{ .Arch }}/nri-flex'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-flex'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-flex'
- src: 'target/nriprometheus/{{ .Arch }}/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
- src: 'target/fluent-bit-plugin/{{ .Arch }}/out_newrelic.so'
dst: '/var/db/newrelic-infra/newrelic-integrations/logging/out_newrelic.so'
- src: 'assets/examples/logging/parsers.conf'
dst: '/var/db/newrelic-infra/newrelic-integrations/logging/parsers.conf'
empty_folders:
- /opt/newrelic-infra/custom-integrations
- /opt/newrelic-infra/newrelic-integrations
- /var/db/newrelic-infra/custom-integrations
- /var/db/newrelic-infra/integrations.d
- /var/log/newrelic-infra
Expand Down
Loading

0 comments on commit 6eaeeb2

Please sign in to comment.