From 63827978f1e9b709f4010c2da05ca83bfd76b2cb Mon Sep 17 00:00:00 2001
From: Alvaro Cabanas <acabanas@newrelic.com>
Date: Tue, 8 Jun 2021 16:47:57 +0200
Subject: [PATCH] Support for ARM (#131)

- Support for ARM
---
 CHANGELOG.md          |  4 +++
 build/.goreleaser.yml | 71 +++++++++++++++----------------------------
 build/release.mk      |  2 +-
 3 files changed, 30 insertions(+), 47 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19817cf5..d31a5317 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.16.2 (2021-06-08)
+### Changed
+- Support for ARM
+
 ## 2.16.1 (2021-06-07)
 ### Changed
 - New argument topic_source to be either broker or zookeeper (default broker)  
diff --git a/build/.goreleaser.yml b/build/.goreleaser.yml
index 6ad19c95..a80955d5 100644
--- a/build/.goreleaser.yml
+++ b/build/.goreleaser.yml
@@ -29,67 +29,46 @@ builds:
       pre: build/windows/set_exe_properties.sh {{ .Env.TAG }} "kafka"
 
 nfpms:
-  - id: nri-deb
-    builds:
-      - nri-nix
+  - id: linux
     file_name_template: "{{ .ProjectName }}_{{ .Version }}-1_{{ .Arch }}"
     vendor: "New Relic, Inc."
     homepage: "https://www.newrelic.com/infrastructure"
     maintainer: "New Relic Infrastructure Team <infrastructure-eng@newrelic.com>"
     description: "New Relic Infrastructure kafka Integration extend the core New Relic\nInfrastructure agent's capabilities to allow you to collect metric and\nlive state data from kafka components."
     license: "https://newrelic.com/terms (also see LICENSE installed with this package)"
-    # Formats to be generated.
-    formats:
-      - deb
-    bindir: "/var/db/newrelic-infra/newrelic-integrations/bin"
-    contents:
-      - src: kafka-config.yml.sample
-        dst: /etc/newrelic-infra/integrations.d/kafka-config.yml.sample
-      - src: CHANGELOG.md
-        dst: /usr/share/doc/nri-kafka/CHANGELOG.md
-      - src: README.md
-        dst: /usr/share/doc/nri-kafka/README.md
-      - src: LICENSE
-        dst: /usr/share/doc/nri-kafka/LICENSE
-      - src: kafka-definition.yml
-        dst: /var/db/newrelic-infra/newrelic-integrations/kafka-definition.yml
-        type: config
+
+    builds:
+      - nri-nix
+
     dependencies:
       - "newrelic-infra"
       - "nrjmx"
 
-  - id: nri-rpm
-    builds:
-      - nri-nix
-    file_name_template: "{{ .ProjectName }}-{{ .Version }}-{{ .Arch }}"
-    vendor: "New Relic, Inc."
-    homepage: "https://www.newrelic.com/infrastructure"
-    maintainer: "New Relic Infrastructure Team <infrastructure-eng@newrelic.com>"
-    description: "New Relic Infrastructure kafka Integration extend the core New Relic\nInfrastructure agent's capabilities to allow you to collect metric and\nlive state data from kafka components."
-    license: "https://newrelic.com/terms (also see LICENSE installed with this package)"
-    # Formats to be generated.
-    formats:
-      - rpm
     bindir: "/var/db/newrelic-infra/newrelic-integrations/bin"
+
     contents:
-      - src: kafka-config.yml.sample
-        dst: /etc/newrelic-infra/integrations.d/kafka-config.yml.sample
-      - src: CHANGELOG.md
-        dst: /usr/share/doc/nri-kafka/CHANGELOG.md
-      - src: README.md
-        dst: /usr/share/doc/nri-kafka/README.md
-      - src: LICENSE
-        dst: /usr/share/doc/nri-kafka/LICENSE
-      - src: kafka-definition.yml
-        dst: /var/db/newrelic-infra/newrelic-integrations/kafka-definition.yml
+      - src: "kafka-config.yml.sample"
+        dst: "/etc/newrelic-infra/integrations.d/kafka-config.yml.sample"
+      - src: "CHANGELOG.md"
+        dst: "/usr/share/doc/nri-kafka/CHANGELOG.md"
+      - src: "README.md"
+        dst: "/usr/share/doc/nri-kafka/README.md"
+      - src: "LICENSE"
+        dst: "/usr/share/doc/nri-kafka/LICENSE"
+      - src: "kafka-definition.yml"
+        dst: "/var/db/newrelic-infra/newrelic-integrations/kafka-definition.yml"
         type: config
-    dependencies:
-      - "newrelic-infra"
-      - "nrjmx"
+
     overrides:
       rpm:
+        file_name_template: "{{ .ProjectName }}-{{ .Version }}-1.{{ .Arch }}"
         replacements:
-          amd64: 1.x86_64
+          amd64: x86_64
+
+    # Formats to be generated.
+    formats:
+      - deb
+      - rpm
 
 archives:
   - id: nri-nix
@@ -112,4 +91,4 @@ archives:
 
 # we use custom publisher for fixing archives and signing them
 release:
-  disable: true
\ No newline at end of file
+  disable: true
diff --git a/build/release.mk b/build/release.mk
index 543c4c3e..09cf5645 100644
--- a/build/release.mk
+++ b/build/release.mk
@@ -1,5 +1,5 @@
 BUILD_DIR    := ./bin/
-GORELEASER_VERSION := v0.154.0
+GORELEASER_VERSION := v0.169.0
 GORELEASER_BIN ?= bin/goreleaser
 
 bin: