feat(configV4): migrate config file to v4 (#93)

* feat(configV4): migrate config file to v4

Author: paologallinaharbur

CHANGELOG.md

@@ -4,10 +4,19 @@ 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/).
 
-## [Unreleased]
+## 1.7.0  (2021-06-27)
 ### Added
 - New parameter for MySQL local socket connection. Local socket connection is secure so MySQL will not complain about non-secure connection when `require_secure_transport = ON`.
 
+- 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.
+
+
+### Fix
+- Detection of slave running for all mysql versions
+- IPv6 address URI formation
+
 ## 1.6.1 (2021-06-08)
 ### Changed
 - Support for ARM

Dockerfile

@@ -8,5 +8,4 @@ FROM newrelic/infrastructure:latest
 ENV NRIA_IS_FORWARD_ONLY true
 ENV NRIA_K8S_INTEGRATION true
 COPY --from=builder /go/src/github.com/newrelic/nri-mysql/bin/nri-mysql /nri-sidecar/newrelic-infra/newrelic-integrations/bin/nri-mysql
-COPY --from=builder /go/src/github.com/newrelic/nri-mysql/mysql-definition.yml /nri-sidecar/newrelic-infra/newrelic-integrations/definition.yaml
 USER 1000

Makefile

@@ -40,7 +40,6 @@ integration-test:
 install: bin/$(BINARY_NAME)
 	@echo "=== $(INTEGRATION) === [ install ]: installing bin/$(BINARY_NAME)..."
 	@sudo install -D --mode=755 --owner=root --strip $(ROOT)bin/$(BINARY_NAME) $(INTEGRATIONS_DIR)/bin/$(BINARY_NAME)
-	@sudo install -D --mode=644 --owner=root $(ROOT)$(INTEGRATION)-definition.yml $(INTEGRATIONS_DIR)/$(INTEGRATION)-definition.yml
 	@sudo install -D --mode=644 --owner=root $(ROOT)$(INTEGRATION)-config.yml.sample $(CONFIG_DIR)/$(INTEGRATION)-config.yml.sample
 
 # Include thematic Makefiles

build/.goreleaser.yml

@@ -42,7 +42,7 @@ nfpms:
       - nri-mysql-nix
 
     dependencies:
-      - "newrelic-infra"
+      - newrelic-infra (>= 1.20.0)
 
     bindir: "/var/db/newrelic-infra/newrelic-integrations/bin"
 
@@ -55,7 +55,7 @@ nfpms:
         dst: "/usr/share/doc/nri-mysql/README.md"
       - src: "LICENSE"
         dst: "/usr/share/doc/nri-mysql/LICENSE"
-      - src: "mysql-definition.yml"
+      - src: "legacy/mysql-definition.yml"
         dst: "/var/db/newrelic-infra/newrelic-integrations/mysql-definition.yml"
         type: config
 
@@ -76,7 +76,9 @@ archives:
     name_template: "{{ .ProjectName }}_{{ .Os }}_{{ .Version }}_{{ .Arch }}_dirty"
     files:
       - mysql-config.yml.sample
-      - mysql-definition.yml
+      - src: 'legacy/mysql-definition.yml'
+        dst: .
+        strip_parent: true
     format: tar.gz
 
   - id: nri-mysql-win
@@ -85,7 +87,9 @@ archives:
     name_template: "{{ .ProjectName }}-{{ .Arch }}.{{ .Version }}_dirty"
     files:
       - mysql-config.yml.sample
-      - mysql-win-definition.yml
+      - src: 'legacy/mysql-win-definition.yml'
+        dst: .
+        strip_parent: true
     format: zip
 
 # we use custom publisher for fixing archives and signing them

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:

mysql-definition.yml legacy/mysql-definition.ymlmysql-definition.yml renamed to legacy/mysql-definition.yml

@@ -17,10 +17,28 @@
           # Using the discovered IP as the host address
           HOSTNAME: ${discovery.ip}
           PORT: 3306
+          # ENABLE_TLS: false
+          # INSECURE_SKIP_VERIFY: false
+          # Specify extra connection parameters as attr1=val1&attr2=val2.
+          # EXTRA_CONNECTION_URL_ARGS: ""
+
           # If not empty `socket` parameter will discard `port` parameter
           SOCKET: <PATH_TO_LOCAL_SOCKET_FILE_NAME>
           USERNAME: <USERNAME>
           PASSWORD: <PASSWORD>
+          # Allow old password https://dev.mysql.com/doc/refman/5.6/en/server-system-variables.html#sysvar_old_passwords
+          # OLD_PASSWORDS: false
+
+          # Name of the database to be monitored
+          # DATABASE: ""
+
+          # Enable extended metrics
+          # EXTENDED_METRICS: false
+
+          # Enable additional metrics
+          # EXTENDED_INNODB_METRICS: false
+          # EXTENDED_MY_ISAM_METRICS: false
+
           # New users should leave this property as `true`, to identify the
           # monitored entities as `remote`. Setting this property to `false` (the
           # default value) is deprecated and will be removed soon, disallowing

mysql-win-definition.yml legacy/mysql-win-definition.ymlmysql-win-definition.yml renamed to legacy/mysql-win-definition.yml

@@ -1,23 +1,41 @@
-integration_name: com.newrelic.mysql
+integrations:
+- name: nri-mysql
+  env:
+    HOSTNAME: localhost
+    PORT: 3306
+    # ENABLE_TLS: false
+    # INSECURE_SKIP_VERIFY: false
+    # Specify extra connection parameters as attr1=val1&attr2=val2.
+    # EXTRA_CONNECTION_URL_ARGS: ""
 
-instances:
-  - name: mysql-server
-    command: status
-    arguments:
-        hostname: localhost
-        port: 3306
-        # If not empty `socket` parameter will discard `port` parameter
-        socket: <PATH_TO_LOCAL_SOCKET_FILE_NAME>
-        username: newrelic
-        password: <YOUR_SELECTED_PASSWORD>
-        # New users should leave this property as `true`, to identify the
-        # monitored entities as `remote`. Setting this property to `false` (the
-        # default value) is deprecated and will be removed soon, disallowing
-        # entities that are identified as `local`.
-        # Please check the documentation to get more information about local
-        # versus remote entities:
-        # https://github.com/newrelic/infra-integrations-sdk/blob/master/docs/entity-definition.md
-        remote_monitoring: true
-    labels:
-        env: production
-        role: write-replica
+    # If not empty `socket` parameter will discard `port` parameter
+    SOCKET: <PATH_TO_LOCAL_SOCKET_FILE_NAME>
+
+    USERNAME: newrelic
+    PASSWORD: <YOUR_SELECTED_PASSWORD>
+    # Allow old password https://dev.mysql.com/doc/refman/5.6/en/server-system-variables.html#sysvar_old_passwords
+    # OLD_PASSWORDS: false
+
+    # Name of the database to be monitored
+    # DATABASE: ""
+
+    # Enable extended metrics
+    # EXTENDED_METRICS: false
+
+    # Enable additional metrics
+    # EXTENDED_INNODB_METRICS: false
+    # EXTENDED_MY_ISAM_METRICS: false
+
+    # New users should leave this property as `true`, to identify the
+    # monitored entities as `remote`. Setting this property to `false` (the
+    # default value) is deprecated and will be removed soon, disallowing
+    # entities that are identified as `local`.
+    # Please check the documentation to get more information about local
+    # versus remote entities:
+    # https://github.com/newrelic/infra-integrations-sdk/blob/master/docs/entity-definition.md
+    REMOTE_MONITORING: true
+  interval: 30s
+  labels:
+    env: production
+    role: write-replica
+  inventory_source: config/mysql