Migrating to config v4 (#86)

- feat(configV4): migrate config file to v4

Author: paologallinaharbur

CHANGELOG.md

@@ -5,6 +5,13 @@ 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.5.0
+### Added
+
+- Moved default config.sample to [V4](https://docs.newrelic.com/docs/create-integrations/infrastructure-integrations-sdk/specifications/host-integrations-newer-configuration-format/), added a dependency for infra-agent version 1.20.0
+
+Please notice that old [V3](https://docs.newrelic.com/docs/create-integrations/infrastructure-integrations-sdk/specifications/host-integrations-standard-configuration-format/) configuration format is deprecated, but still supported.
+
 ## 2.4.7 (2021-06-10)
 ### Changed
 - ARM support

Dockerfile

@@ -16,5 +16,4 @@ RUN apk --update add openjdk8-jre
 COPY --from=builder-mvn /nrjmx/bin/nrjmx /usr/bin/nrjmx
 COPY --from=builder-mvn /nrjmx/bin/nrjmx.jar /usr/bin/nrjmx.jar
 COPY --from=builder /go/src/github.com/newrelic/nri-jmx/bin/nri-jmx /nri-sidecar/newrelic-infra/newrelic-integrations/bin/nri-jmx
-COPY --from=builder /go/src/github.com/newrelic/nri-jmx/jmx-definition.yml /nri-sidecar/newrelic-infra/newrelic-integrations/definition.yaml
 USER 1000

build/.goreleaser.yml

@@ -59,20 +59,20 @@ nfpms:
         dst: "/usr/share/doc/nri-jmx/README.md"
       - src: "LICENSE"
         dst: "/usr/share/doc/nri-jmx/LICENSE"
-      - src: "jmx-definition.yml"
+      - src: "legacy/jmx-definition.yml"
         dst: "/var/db/newrelic-infra/newrelic-integrations/jmx-definition.yml"
 
     overrides:
       deb:
         dependencies:
-          - newrelic-infra
+          - newrelic-infra (>= 1.20.0)
           - nrjmx (>= 1.5.3)
       rpm:
         file_name_template: "{{ .ProjectName }}-{{ .Version }}-1.{{ .Arch }}"
         replacements:
           amd64: x86_64
         dependencies:
-          - newrelic-infra
+          - newrelic-infra (>= 1.20.0)
           - nrjmx >= 1.5.3
 
     # Formats to be generated.
@@ -87,7 +87,9 @@ archives:
     name_template: "{{ .ProjectName }}_{{ .Os }}_{{ .Version }}_{{ .Arch }}_dirty"
     files:
       - jmx-config.yml.sample
-      - jmx-definition.yml
+      - src: 'legacy/jmx-definition.yml'
+        dst: .
+        strip_parent: true
       - jvm-metrics.yml.sample
     format: tar.gz
 
@@ -97,7 +99,9 @@ archives:
     name_template: "{{ .ProjectName }}-{{ .Arch }}.{{ .Version }}_dirty"
     files:
       - jmx-win-config.yml.sample
-      - jmx-win-definition.yml
+      - src: 'legacy/jmx-win-definition.yml'
+        dst: .
+        strip_parent: true
       - jvm-metrics.yml.sample
     format: zip
 

build/release.mk

@@ -1,5 +1,5 @@
 BUILD_DIR    := ./bin/
-GORELEASER_VERSION := v0.169.0
+GORELEASER_VERSION := v0.174.1
 GORELEASER_BIN ?= bin/goreleaser
 
 bin:

jmx-config.yml.sample

@@ -1,13 +1,11 @@
-integration_name: com.newrelic.jmx
-
-instances:
-  - name: jmx
-    command: all_data
-    arguments:
-      jmx_host: jmx-host.localnet
-      jmx_port: 9999
-      jmx_user: admin
-      jmx_pass: admin
-      collection_files: "/etc/newrelic-infra/integrations.d/jvm-metrics.yml,/etc/newrelic-infra/integrations.d/tomcat-metrics.yml"
-    labels:
-      env: staging
+integrations:
+- name: nri-jmx
+  env:
+    COLLECTION_FILES: "/etc/newrelic-infra/integrations.d/jvm-metrics.yml,/etc/newrelic-infra/integrations.d/tomcat-metrics.yml"
+    JMX_HOST: jmx-host.localnet
+    JMX_PASS: admin
+    JMX_PORT: "9999"
+    JMX_USER: admin
+  interval: 15s
+  labels:
+    env: staging

jmx-ssl-config.yml.sample

@@ -1,17 +1,15 @@
-integration_name: com.newrelic.jmx
-
-instances:
-  - name: jmx
-    command: all_data
-    arguments:
-      jmx_host: jmx-host.localnet
-      jmx_port: 9999
-      jmx_user: admin
-      jmx_pass: admin
-      key_store: /etc/pki/JMXClientKeyStore.key
-      key_store_password: password
-      trust_store: /etc/pki/JMXClientTrustStore.key
-      trust_store_password: password
-      collection_files: "/etc/newrelic-infra/integrations.d/jvm-metrics.yml,/etc/newrelic-infra/integrations.d/tomcat-metrics.yml"
-    labels:
-      env: staging
+integrations:
+- name: nri-jmx
+  env:
+    COLLECTION_FILES: "/etc/newrelic-infra/integrations.d/jvm-metrics.yml,/etc/newrelic-infra/integrations.d/tomcat-metrics.yml"
+    JMX_HOST: jmx-host.localnet
+    JMX_PASS: admin
+    JMX_PORT: "9999"
+    JMX_USER: admin
+    KEY_STORE: /etc/pki/JMXClientKeyStore.key
+    KEY_STORE_PASSWORD: password
+    TRUST_STORE: /etc/pki/JMXClientTrustStore.key
+    TRUST_STORE_PASSWORD: password
+  interval: 15s
+  labels:
+    env: staging

jmx-win-config.yml.sample

@@ -1,13 +1,12 @@
-integration_name: com.newrelic.jmx
-
-instances:
-  - name: jmx
-    command: all_data
-    arguments:
-      jmx_host: jmx-host.localnet
-      jmx_port: 9999
-      jmx_user: admin
-      jmx_pass: admin
-      collection_files: "C:\\Program Files\\New Relic\\newrelic-infra\\integrations.d\\jvm-metrics.yml"
-    labels:
-      env: staging
+integrations:
+- name: nri-jmx
+  env:
+    COLLECTION_FILES: "C:\\Program Files\\New Relic\\newrelic-infra\\integrations.d\\jvm-metrics.yml"
+    JMX_HOST: jmx-host.localnet
+    JMX_PASS: admin
+    JMX_PORT: "9999"
+    JMX_USER: admin
+    NR_JMX: "C:\\Program Files\\New Relic\\nrjmx\\nrjmx.bat"
+  interval: 15s
+  labels:
+    env: staging