From c51672c81fa9492a8b6222401cae76418b48a2b4 Mon Sep 17 00:00:00 2001 From: Sarah Witt Date: Mon, 10 Aug 2020 13:54:10 -0400 Subject: [PATCH 1/3] Make config spec accurate --- mysql/assets/configuration/spec.yaml | 6 +++--- mysql/datadog_checks/mysql/data/conf.yaml.example | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mysql/assets/configuration/spec.yaml b/mysql/assets/configuration/spec.yaml index a80c799a8849e..16f86763a0609 100644 --- a/mysql/assets/configuration/spec.yaml +++ b/mysql/assets/configuration/spec.yaml @@ -33,7 +33,7 @@ files: value: type: string example: localhost - default: None + default: '' - name: user description: | @@ -42,7 +42,7 @@ files: value: type: string example: datadog - default: None + default: '' - name: pass description: | @@ -58,7 +58,7 @@ files: value: type: number example: 3306 - default: None + default: 0 - name: sock description: | diff --git a/mysql/datadog_checks/mysql/data/conf.yaml.example b/mysql/datadog_checks/mysql/data/conf.yaml.example index d69e349fc392e..ec31a9f0012b4 100644 --- a/mysql/datadog_checks/mysql/data/conf.yaml.example +++ b/mysql/datadog_checks/mysql/data/conf.yaml.example @@ -25,14 +25,14 @@ init_config: # instances: - ## @param host - string - optional - default: None + ## @param host - string - optional - default: ## MySQL host to connect to. ## NOTE: Even if the host is "localhost", the agent connects to MySQL using TCP/IP, unless you also ## provide a value for the sock key (below). # - host: localhost - ## @param user - string - optional - default: None + ## @param user - string - optional - default: ## Username used to connect to MySQL. # user: datadog @@ -42,7 +42,7 @@ instances: # pass: - ## @param port - number - optional - default: None + ## @param port - number - optional - default: 0 ## Port to use when connecting to MySQL. # port: 3306 From 0300768a31eb0df188071a0ee4386e15380504e2 Mon Sep 17 00:00:00 2001 From: Sarah Witt Date: Thu, 13 Aug 2020 09:37:29 -0400 Subject: [PATCH 2/3] Remove default --- mysql/assets/configuration/spec.yaml | 4 ++-- mysql/datadog_checks/mysql/data/conf.yaml.example | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mysql/assets/configuration/spec.yaml b/mysql/assets/configuration/spec.yaml index 16f86763a0609..97634ac9d211f 100644 --- a/mysql/assets/configuration/spec.yaml +++ b/mysql/assets/configuration/spec.yaml @@ -33,7 +33,7 @@ files: value: type: string example: localhost - default: '' + default: null - name: user description: | @@ -42,7 +42,7 @@ files: value: type: string example: datadog - default: '' + default: null - name: pass description: | diff --git a/mysql/datadog_checks/mysql/data/conf.yaml.example b/mysql/datadog_checks/mysql/data/conf.yaml.example index ec31a9f0012b4..f78ea53a235b6 100644 --- a/mysql/datadog_checks/mysql/data/conf.yaml.example +++ b/mysql/datadog_checks/mysql/data/conf.yaml.example @@ -25,14 +25,14 @@ init_config: # instances: - ## @param host - string - optional - default: + ## @param host - string - optional ## MySQL host to connect to. ## NOTE: Even if the host is "localhost", the agent connects to MySQL using TCP/IP, unless you also ## provide a value for the sock key (below). # - host: localhost - ## @param user - string - optional - default: + ## @param user - string - optional ## Username used to connect to MySQL. # user: datadog From ed043e999f691f97ff48718e1d36f7b3b16d70e5 Mon Sep 17 00:00:00 2001 From: Sarah Witt Date: Thu, 13 Aug 2020 10:02:28 -0400 Subject: [PATCH 3/3] Update default port --- mysql/assets/configuration/spec.yaml | 1 - mysql/datadog_checks/mysql/data/conf.yaml.example | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/mysql/assets/configuration/spec.yaml b/mysql/assets/configuration/spec.yaml index 97634ac9d211f..5eecd404119cb 100644 --- a/mysql/assets/configuration/spec.yaml +++ b/mysql/assets/configuration/spec.yaml @@ -58,7 +58,6 @@ files: value: type: number example: 3306 - default: 0 - name: sock description: | diff --git a/mysql/datadog_checks/mysql/data/conf.yaml.example b/mysql/datadog_checks/mysql/data/conf.yaml.example index f78ea53a235b6..55608f094c014 100644 --- a/mysql/datadog_checks/mysql/data/conf.yaml.example +++ b/mysql/datadog_checks/mysql/data/conf.yaml.example @@ -42,7 +42,7 @@ instances: # pass: - ## @param port - number - optional - default: 0 + ## @param port - number - optional - default: 3306 ## Port to use when connecting to MySQL. # port: 3306