diff --git a/.github/workflows/prerelease_linux_on_demand.yml b/.github/workflows/prerelease_linux_on_demand.yml index fefb9fd1b..92410fe0c 100644 --- a/.github/workflows/prerelease_linux_on_demand.yml +++ b/.github/workflows/prerelease_linux_on_demand.yml @@ -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 @@ -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 @@ -64,7 +68,7 @@ jobs: - name: Publish deb to S3 action uses: newrelic/infrastructure-publish-action@v1.3.4 with: - tag: ${{env.TAG}} + tag: ${{env.FAKE_TAG}} app_name: "newrelic-infra" repo_name: "newrelic/infrastructure-agent" schema: "custom" @@ -89,7 +93,7 @@ jobs: - name: Publish rpm to S3 action uses: newrelic/infrastructure-publish-action@v1.3.4 with: - tag: ${{env.TAG}} + tag: ${{env.FAKE_TAG}} app_name: "newrelic-infra" repo_name: "newrelic/infrastructure-agent" schema: "custom" @@ -113,7 +117,7 @@ jobs: - name: Publish targz to S3 action uses: newrelic/infrastructure-publish-action@v1.3.4 with: - tag: ${{env.TAG}} + tag: ${{env.FAKE_TAG}} app_name: "newrelic-infra" repo_name: "newrelic/infrastructure-agent" schema: "custom" diff --git a/build/goreleaser/linux/al2023_amd64.yml b/build/goreleaser/linux/al2023_amd64.yml index b9798d712..8e4ce8f8d 100644 --- a/build/goreleaser/linux/al2023_amd64.yml +++ b/build/goreleaser/linux/al2023_amd64.yml @@ -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 diff --git a/build/goreleaser/linux/al2023_arm.yml b/build/goreleaser/linux/al2023_arm.yml index 93b19df05..1433bfeaf 100644 --- a/build/goreleaser/linux/al2023_arm.yml +++ b/build/goreleaser/linux/al2023_arm.yml @@ -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 diff --git a/build/goreleaser/linux/al2023_arm64.yml b/build/goreleaser/linux/al2023_arm64.yml index e3c10f1d6..922582c42 100644 --- a/build/goreleaser/linux/al2023_arm64.yml +++ b/build/goreleaser/linux/al2023_arm64.yml @@ -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 diff --git a/build/goreleaser/linux/al2_amd64.yml b/build/goreleaser/linux/al2_amd64.yml index 9a85e4dde..4d63496b5 100644 --- a/build/goreleaser/linux/al2_amd64.yml +++ b/build/goreleaser/linux/al2_amd64.yml @@ -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 diff --git a/build/goreleaser/linux/al2_arm.yml b/build/goreleaser/linux/al2_arm.yml index 4b1e8cd7a..1a507a0a4 100644 --- a/build/goreleaser/linux/al2_arm.yml +++ b/build/goreleaser/linux/al2_arm.yml @@ -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 diff --git a/build/goreleaser/linux/al2_arm64.yml b/build/goreleaser/linux/al2_arm64.yml index 2abeadfde..d60ca76f0 100644 --- a/build/goreleaser/linux/al2_arm64.yml +++ b/build/goreleaser/linux/al2_arm64.yml @@ -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 diff --git a/build/goreleaser/linux/centos_6_amd64.yml b/build/goreleaser/linux/centos_6_amd64.yml index 40b74f815..9df866441 100644 --- a/build/goreleaser/linux/centos_6_amd64.yml +++ b/build/goreleaser/linux/centos_6_amd64.yml @@ -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' @@ -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 diff --git a/build/goreleaser/linux/centos_7_amd64.yml b/build/goreleaser/linux/centos_7_amd64.yml index f81628e53..0f88f2ea1 100644 --- a/build/goreleaser/linux/centos_7_amd64.yml +++ b/build/goreleaser/linux/centos_7_amd64.yml @@ -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 diff --git a/build/goreleaser/linux/centos_7_arm.yml b/build/goreleaser/linux/centos_7_arm.yml index efebbdc38..3dde8d1bd 100644 --- a/build/goreleaser/linux/centos_7_arm.yml +++ b/build/goreleaser/linux/centos_7_arm.yml @@ -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 diff --git a/build/goreleaser/linux/centos_7_arm64.yml b/build/goreleaser/linux/centos_7_arm64.yml index 96309f408..659a9e132 100644 --- a/build/goreleaser/linux/centos_7_arm64.yml +++ b/build/goreleaser/linux/centos_7_arm64.yml @@ -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 diff --git a/build/goreleaser/linux/centos_8_amd64.yml b/build/goreleaser/linux/centos_8_amd64.yml index 2cf8e9ef9..57da656de 100644 --- a/build/goreleaser/linux/centos_8_amd64.yml +++ b/build/goreleaser/linux/centos_8_amd64.yml @@ -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 diff --git a/build/goreleaser/linux/centos_8_arm.yml b/build/goreleaser/linux/centos_8_arm.yml index 70e5cb2a9..654e2ada7 100644 --- a/build/goreleaser/linux/centos_8_arm.yml +++ b/build/goreleaser/linux/centos_8_arm.yml @@ -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 diff --git a/build/goreleaser/linux/centos_8_arm64.yml b/build/goreleaser/linux/centos_8_arm64.yml index ad645f513..04edda289 100644 --- a/build/goreleaser/linux/centos_8_arm64.yml +++ b/build/goreleaser/linux/centos_8_arm64.yml @@ -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 diff --git a/build/goreleaser/linux/debian_systemd_amd64.yml b/build/goreleaser/linux/debian_systemd_amd64.yml index 9ba63d6c7..bd67c1d32 100644 --- a/build/goreleaser/linux/debian_systemd_amd64.yml +++ b/build/goreleaser/linux/debian_systemd_amd64.yml @@ -33,16 +33,18 @@ - src: 'target/nridocker/{{ .Arch }}/etc/newrelic-infra/integrations.d/docker-config.yml' dst: '/etc/newrelic-infra/integrations.d/docker-config.yml' - 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 diff --git a/build/goreleaser/linux/debian_systemd_arm.yml b/build/goreleaser/linux/debian_systemd_arm.yml index ff6712048..7359a4170 100644 --- a/build/goreleaser/linux/debian_systemd_arm.yml +++ b/build/goreleaser/linux/debian_systemd_arm.yml @@ -33,16 +33,18 @@ - src: 'target/nridocker/{{ .Arch }}/etc/newrelic-infra/integrations.d/docker-config.yml' dst: '/etc/newrelic-infra/integrations.d/docker-config.yml' - 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 diff --git a/build/goreleaser/linux/debian_systemd_arm64.yml b/build/goreleaser/linux/debian_systemd_arm64.yml index 144ac7c17..d78d55e8e 100644 --- a/build/goreleaser/linux/debian_systemd_arm64.yml +++ b/build/goreleaser/linux/debian_systemd_arm64.yml @@ -33,16 +33,18 @@ - src: 'target/nridocker/{{ .Arch }}/etc/newrelic-infra/integrations.d/docker-config.yml' dst: '/etc/newrelic-infra/integrations.d/docker-config.yml' - 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 diff --git a/build/goreleaser/linux/debian_upstart_amd64.yml b/build/goreleaser/linux/debian_upstart_amd64.yml index a04acf2f0..15a7104b1 100644 --- a/build/goreleaser/linux/debian_upstart_amd64.yml +++ b/build/goreleaser/linux/debian_upstart_amd64.yml @@ -23,11 +23,11 @@ - src: 'LICENSE' dst: '/var/db/newrelic-infra/LICENSE.txt' - 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' # Upstart service conf file - src: 'build/package/upstart/newrelic-infra' @@ -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 diff --git a/build/goreleaser/linux/rhel_9_amd64.yml b/build/goreleaser/linux/rhel_9_amd64.yml index 30d0aa7f4..6eb91c859 100644 --- a/build/goreleaser/linux/rhel_9_amd64.yml +++ b/build/goreleaser/linux/rhel_9_amd64.yml @@ -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 diff --git a/build/goreleaser/linux/rhel_9_arm.yml b/build/goreleaser/linux/rhel_9_arm.yml index fd7f99fb6..23cbec182 100644 --- a/build/goreleaser/linux/rhel_9_arm.yml +++ b/build/goreleaser/linux/rhel_9_arm.yml @@ -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 diff --git a/build/goreleaser/linux/rhel_9_arm64.yml b/build/goreleaser/linux/rhel_9_arm64.yml index d44553db5..3b4cdcf49 100644 --- a/build/goreleaser/linux/rhel_9_arm64.yml +++ b/build/goreleaser/linux/rhel_9_arm64.yml @@ -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 diff --git a/build/goreleaser/linux/sles_114_amd64.yml b/build/goreleaser/linux/sles_114_amd64.yml index 836b27f4d..3abe215cb 100644 --- a/build/goreleaser/linux/sles_114_amd64.yml +++ b/build/goreleaser/linux/sles_114_amd64.yml @@ -27,12 +27,14 @@ - src: 'LICENSE' dst: '/var/db/newrelic-infra/LICENSE.txt' - 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' 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 diff --git a/build/goreleaser/linux/sles_121_amd64.yml b/build/goreleaser/linux/sles_121_amd64.yml index 3b05f581e..284c7448f 100644 --- a/build/goreleaser/linux/sles_121_amd64.yml +++ b/build/goreleaser/linux/sles_121_amd64.yml @@ -36,16 +36,18 @@ 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 diff --git a/build/goreleaser/linux/sles_122_amd64.yml b/build/goreleaser/linux/sles_122_amd64.yml index 5f35d20dd..d32bc2cb8 100644 --- a/build/goreleaser/linux/sles_122_amd64.yml +++ b/build/goreleaser/linux/sles_122_amd64.yml @@ -36,16 +36,18 @@ 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 diff --git a/build/goreleaser/linux/sles_122_arm.yml b/build/goreleaser/linux/sles_122_arm.yml index 40c73526e..ed1cbcbb0 100644 --- a/build/goreleaser/linux/sles_122_arm.yml +++ b/build/goreleaser/linux/sles_122_arm.yml @@ -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 diff --git a/build/goreleaser/linux/sles_122_arm64.yml b/build/goreleaser/linux/sles_122_arm64.yml index 19ede80e4..041e61806 100644 --- a/build/goreleaser/linux/sles_122_arm64.yml +++ b/build/goreleaser/linux/sles_122_arm64.yml @@ -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 diff --git a/build/goreleaser/linux/sles_123_amd64.yml b/build/goreleaser/linux/sles_123_amd64.yml index 5ae97afbc..7ce6eee2a 100644 --- a/build/goreleaser/linux/sles_123_amd64.yml +++ b/build/goreleaser/linux/sles_123_amd64.yml @@ -36,16 +36,18 @@ 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 diff --git a/build/goreleaser/linux/sles_123_arm.yml b/build/goreleaser/linux/sles_123_arm.yml index 92668b5e6..51e270a4c 100644 --- a/build/goreleaser/linux/sles_123_arm.yml +++ b/build/goreleaser/linux/sles_123_arm.yml @@ -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 diff --git a/build/goreleaser/linux/sles_123_arm64.yml b/build/goreleaser/linux/sles_123_arm64.yml index f815a2849..41d174399 100644 --- a/build/goreleaser/linux/sles_123_arm64.yml +++ b/build/goreleaser/linux/sles_123_arm64.yml @@ -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 diff --git a/build/goreleaser/linux/sles_124_amd64.yml b/build/goreleaser/linux/sles_124_amd64.yml index 8a4dac7c5..532e66f9d 100644 --- a/build/goreleaser/linux/sles_124_amd64.yml +++ b/build/goreleaser/linux/sles_124_amd64.yml @@ -36,16 +36,18 @@ 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 diff --git a/build/goreleaser/linux/sles_124_arm.yml b/build/goreleaser/linux/sles_124_arm.yml index 171858749..bdfcdbad0 100644 --- a/build/goreleaser/linux/sles_124_arm.yml +++ b/build/goreleaser/linux/sles_124_arm.yml @@ -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 diff --git a/build/goreleaser/linux/sles_124_arm64.yml b/build/goreleaser/linux/sles_124_arm64.yml index 188223364..bea9e6a20 100644 --- a/build/goreleaser/linux/sles_124_arm64.yml +++ b/build/goreleaser/linux/sles_124_arm64.yml @@ -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 diff --git a/build/goreleaser/linux/sles_125_amd64.yml b/build/goreleaser/linux/sles_125_amd64.yml index 9cb0bda87..c227d5ee3 100644 --- a/build/goreleaser/linux/sles_125_amd64.yml +++ b/build/goreleaser/linux/sles_125_amd64.yml @@ -25,13 +25,13 @@ 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: 'assets/examples/logging/linux/file.yml.example' dst: '/etc/newrelic-infra/logging.d/file.yml.example' @@ -48,6 +48,8 @@ - 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 diff --git a/build/goreleaser/linux/sles_125_arm.yml b/build/goreleaser/linux/sles_125_arm.yml index aff373f82..349ed008f 100644 --- a/build/goreleaser/linux/sles_125_arm.yml +++ b/build/goreleaser/linux/sles_125_arm.yml @@ -25,16 +25,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 diff --git a/build/goreleaser/linux/sles_125_arm64.yml b/build/goreleaser/linux/sles_125_arm64.yml index 4131970a1..0de28bd43 100644 --- a/build/goreleaser/linux/sles_125_arm64.yml +++ b/build/goreleaser/linux/sles_125_arm64.yml @@ -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 diff --git a/build/goreleaser/linux/sles_151_amd64.yml b/build/goreleaser/linux/sles_151_amd64.yml index 9d862b8e5..bcdcdd2dd 100644 --- a/build/goreleaser/linux/sles_151_amd64.yml +++ b/build/goreleaser/linux/sles_151_amd64.yml @@ -25,11 +25,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' - src: 'assets/examples/logging/linux/file.yml.example' dst: '/etc/newrelic-infra/logging.d/file.yml.example' @@ -46,6 +46,8 @@ - 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 diff --git a/build/goreleaser/linux/sles_151_arm.yml b/build/goreleaser/linux/sles_151_arm.yml index 2f5062042..b3ae99408 100644 --- a/build/goreleaser/linux/sles_151_arm.yml +++ b/build/goreleaser/linux/sles_151_arm.yml @@ -25,16 +25,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 diff --git a/build/goreleaser/linux/sles_151_arm64.yml b/build/goreleaser/linux/sles_151_arm64.yml index fdbbb2974..70f16ca98 100644 --- a/build/goreleaser/linux/sles_151_arm64.yml +++ b/build/goreleaser/linux/sles_151_arm64.yml @@ -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 diff --git a/build/goreleaser/linux/sles_152_amd64.yml b/build/goreleaser/linux/sles_152_amd64.yml index ebd4c061e..246883af4 100644 --- a/build/goreleaser/linux/sles_152_amd64.yml +++ b/build/goreleaser/linux/sles_152_amd64.yml @@ -25,11 +25,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' - src: 'assets/examples/logging/linux/file.yml.example' dst: '/etc/newrelic-infra/logging.d/file.yml.example' @@ -46,6 +46,8 @@ - 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 diff --git a/build/goreleaser/linux/sles_152_arm.yml b/build/goreleaser/linux/sles_152_arm.yml index 9ab6bb338..86469649a 100644 --- a/build/goreleaser/linux/sles_152_arm.yml +++ b/build/goreleaser/linux/sles_152_arm.yml @@ -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 diff --git a/build/goreleaser/linux/sles_152_arm64.yml b/build/goreleaser/linux/sles_152_arm64.yml index e047b4599..3099fc9a7 100644 --- a/build/goreleaser/linux/sles_152_arm64.yml +++ b/build/goreleaser/linux/sles_152_arm64.yml @@ -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 diff --git a/build/goreleaser/linux/sles_153_amd64.yml b/build/goreleaser/linux/sles_153_amd64.yml index 6affb4ac2..2a4cc6c1c 100644 --- a/build/goreleaser/linux/sles_153_amd64.yml +++ b/build/goreleaser/linux/sles_153_amd64.yml @@ -25,11 +25,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' - src: 'assets/examples/logging/linux/file.yml.example' dst: '/etc/newrelic-infra/logging.d/file.yml.example' @@ -46,6 +46,8 @@ - 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 diff --git a/build/goreleaser/linux/sles_153_arm.yml b/build/goreleaser/linux/sles_153_arm.yml index eb8c988f5..3fcbb8af6 100644 --- a/build/goreleaser/linux/sles_153_arm.yml +++ b/build/goreleaser/linux/sles_153_arm.yml @@ -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 diff --git a/build/goreleaser/linux/sles_153_arm64.yml b/build/goreleaser/linux/sles_153_arm64.yml index 4cadbc67b..55285c875 100644 --- a/build/goreleaser/linux/sles_153_arm64.yml +++ b/build/goreleaser/linux/sles_153_arm64.yml @@ -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 diff --git a/build/goreleaser/linux/sles_154_amd64.yml b/build/goreleaser/linux/sles_154_amd64.yml index e7fae1c04..af4d58c61 100644 --- a/build/goreleaser/linux/sles_154_amd64.yml +++ b/build/goreleaser/linux/sles_154_amd64.yml @@ -25,11 +25,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' - src: 'assets/examples/logging/linux/file.yml.example' dst: '/etc/newrelic-infra/logging.d/file.yml.example' @@ -46,6 +46,8 @@ - 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 diff --git a/build/goreleaser/linux/sles_154_arm.yml b/build/goreleaser/linux/sles_154_arm.yml index 07bd6b408..49c1ebc38 100644 --- a/build/goreleaser/linux/sles_154_arm.yml +++ b/build/goreleaser/linux/sles_154_arm.yml @@ -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 diff --git a/build/goreleaser/linux/sles_154_arm64.yml b/build/goreleaser/linux/sles_154_arm64.yml index 4654403cc..18c9d34f5 100644 --- a/build/goreleaser/linux/sles_154_arm64.yml +++ b/build/goreleaser/linux/sles_154_arm64.yml @@ -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 diff --git a/build/goreleaser/linux/sles_155_amd64.yml b/build/goreleaser/linux/sles_155_amd64.yml index 4d999ca92..e27f40391 100644 --- a/build/goreleaser/linux/sles_155_amd64.yml +++ b/build/goreleaser/linux/sles_155_amd64.yml @@ -25,11 +25,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' # - src: 'assets/examples/logging/linux/file.yml.example' # dst: '/etc/newrelic-infra/logging.d/file.yml.example' @@ -46,6 +46,8 @@ # - 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 diff --git a/build/goreleaser/linux/sles_155_arm.yml b/build/goreleaser/linux/sles_155_arm.yml index d5a665416..38ab73ec8 100644 --- a/build/goreleaser/linux/sles_155_arm.yml +++ b/build/goreleaser/linux/sles_155_arm.yml @@ -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 diff --git a/build/goreleaser/linux/sles_155_arm64.yml b/build/goreleaser/linux/sles_155_arm64.yml index 8db7b7d86..fed7d3be0 100644 --- a/build/goreleaser/linux/sles_155_arm64.yml +++ b/build/goreleaser/linux/sles_155_arm64.yml @@ -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 diff --git a/cmd/newrelic-infra/newrelic-infra.go b/cmd/newrelic-infra/newrelic-infra.go index 5ca46370d..ca9cc3023 100644 --- a/cmd/newrelic-infra/newrelic-infra.go +++ b/cmd/newrelic-infra/newrelic-infra.go @@ -728,6 +728,8 @@ func checkEndpointReachable( func getPluginSourceDirs(ac *config.Config) []string { pluginSourceDirs := []string{ + filepath.Join(ac.SafeBinDir, config.DefaultIntegrationsDir), + filepath.Join(ac.SafeBinDir, "custom-integrations"), ac.CustomPluginInstallationDir, filepath.Join(ac.AgentDir, "custom-integrations"), filepath.Join(ac.AgentDir, config.DefaultIntegrationsDir), diff --git a/pkg/config/config.go b/pkg/config/config.go index 6d357cb18..8f5f15080 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -404,6 +404,13 @@ type Config struct { // Public: Yes AgentDir string `yaml:"agent_dir" envconfig:"agent_dir"` + // SafeBinDir is the directory where the agent expects to see executables for Integrations + // Default (Linux): /opt/newrelic-infra + // Default (MacOS): /usr/local/var/db/newrelic-infra/ + // Default (Windows): C:\Program Files\NewRelic\newrelic-infra + // Public: Yes + SafeBinDir string `yaml:"safe_bin_dir" envconfig:"safe_bin_dir"` + // ConfigDir is the main directory where the agent stores configs. // Default (Linux): /etc/newrelic-infra // Default (Windows): C:\Program Files\NewRelic\newrelic-infra @@ -1811,6 +1818,7 @@ func NewConfig() *Config { CommandChannelEndpoint: defaultCmdChannelEndpoint, CommandChannelIntervalSec: defaultCmdChannelIntervalSec, AgentDir: defaultAgentDir, + SafeBinDir: defaultSafeBinDir, ConfigDir: defaultConfigDir, SupervisorRpcSocket: defaultSupervisorRpcSock, DebugLogSec: defaultDebugLogSec, diff --git a/pkg/config/config_darwin_amd64.go b/pkg/config/config_darwin_amd64.go index 8b856748f..3f7b66758 100644 --- a/pkg/config/config_darwin_amd64.go +++ b/pkg/config/config_darwin_amd64.go @@ -13,5 +13,6 @@ func init() { //nolint:gochecknoinits filepath.Join("/usr", "local", "etc", "newrelic-infra", "newrelic-infra.yml"), } defaultAgentDir = filepath.Join("/usr", "local", "var", "db", "newrelic-infra") + defaultSafeBinDir = defaultAgentDir defaultAgentTempDir = os.TempDir() } diff --git a/pkg/config/config_darwin_arm64.go b/pkg/config/config_darwin_arm64.go index 26c5f348e..2b853251c 100644 --- a/pkg/config/config_darwin_arm64.go +++ b/pkg/config/config_darwin_arm64.go @@ -13,5 +13,6 @@ func init() { //nolint:gochecknoinits filepath.Join("/opt", "homebrew", "etc", "newrelic-infra", "newrelic-infra.yml"), } defaultAgentDir = filepath.Join("/opt", "homebrew", "var", "db", "newrelic-infra") + defaultSafeBinDir = defaultAgentDir defaultAgentTempDir = os.TempDir() } diff --git a/pkg/config/config_linux.go b/pkg/config/config_linux.go index 2aedf8beb..2f949d8f1 100644 --- a/pkg/config/config_linux.go +++ b/pkg/config/config_linux.go @@ -31,6 +31,7 @@ func init() { defaultConfigDir = filepath.Join("/etc", "newrelic-infra") defaultAgentDir = filepath.Join("/var", "db", "newrelic-infra") + defaultSafeBinDir = filepath.Join("/opt", "newrelic-infra") defaultLogFile = filepath.Join("/var", "db", "newrelic-infra", "newrelic-infra.log") defaultNetworkInterfaceFilters = map[string][]string{ "prefix": {"dummy", "lo", "vmnet", "sit", "tun", "tap", "veth"}, diff --git a/pkg/config/config_windows.go b/pkg/config/config_windows.go index 293562071..359536ccd 100644 --- a/pkg/config/config_windows.go +++ b/pkg/config/config_windows.go @@ -54,6 +54,7 @@ func init() { sysDrive := os.Getenv("SystemDrive") + string(filepath.Separator) defaultAgentDir = filepath.Join(sysDrive, installationSubdir) + defaultSafeBinDir = defaultAgentDir defaultConfigDir = defaultAgentDir defaultLogFile = filepath.Join(defaultAgentDir, "newrelic-infra.log") defaultPluginInstanceDir = filepath.Join(defaultAgentDir, "integrations.d") diff --git a/pkg/config/defaults.go b/pkg/config/defaults.go index 4ae21ff01..03ebdffdf 100644 --- a/pkg/config/defaults.go +++ b/pkg/config/defaults.go @@ -119,6 +119,7 @@ var ( // nolint:gochecknoglobals var ( defaultAgentDir string + defaultSafeBinDir string defaultConfigFiles []string defaultLogFile string defaultNetworkInterfaceFilters map[string][]string diff --git a/test/packaging/ansible/roles/nri-docker/tasks/main.yml b/test/packaging/ansible/roles/nri-docker/tasks/main.yml index f82634ae4..c28359b85 100644 --- a/test/packaging/ansible/roles/nri-docker/tasks/main.yml +++ b/test/packaging/ansible/roles/nri-docker/tasks/main.yml @@ -12,7 +12,7 @@ shell: docker run --rm -it -d --name nri-docker-nginx nginx - name: verify nri-docker reports nginx - shell: /var/db/newrelic-infra/newrelic-integrations/bin/nri-docker 2>/dev/null + shell: /opt/newrelic-infra/newrelic-integrations/bin/nri-docker 2>/dev/null register: nri_docker_ouptut - name: register docker command line