From a6a8666bebb198d5468640df5c3c0fa445d5e210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Gagn=C3=A9?= Date: Mon, 25 Feb 2019 13:18:35 +0100 Subject: [PATCH 1/2] Add the DiscoveryIgnoreReplicaHostnameFilters in the sample configuration. --- conf/orchestrator-sample-sqlite.conf.json | 4 ++++ conf/orchestrator-sample.conf.json | 4 ++++ conf/orchestrator-simple.conf.json | 4 ++++ docs/configuration-sample.md | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/conf/orchestrator-sample-sqlite.conf.json b/conf/orchestrator-sample-sqlite.conf.json index 7bd8057d5..b99da77f7 100644 --- a/conf/orchestrator-sample-sqlite.conf.json +++ b/conf/orchestrator-sample-sqlite.conf.json @@ -15,6 +15,10 @@ "DefaultInstancePort": 3306, "DiscoverByShowSlaveHosts": true, "InstancePollSeconds": 5, + "DiscoveryIgnoreReplicaHostnameFilters": [ + "a_host_i_want_to_ignore", + "another_host_i_want_to_ignore" + ], "UnseenInstanceForgetHours": 240, "SnapshotTopologiesIntervalHours": 0, "InstanceBulkOperationsWaitTimeoutSeconds": 10, diff --git a/conf/orchestrator-sample.conf.json b/conf/orchestrator-sample.conf.json index 844481ac4..cd71e5da9 100644 --- a/conf/orchestrator-sample.conf.json +++ b/conf/orchestrator-sample.conf.json @@ -25,6 +25,10 @@ "DefaultInstancePort": 3306, "DiscoverByShowSlaveHosts": true, "InstancePollSeconds": 5, + "DiscoveryIgnoreReplicaHostnameFilters": [ + "a_host_i_want_to_ignore", + "another_host_i_want_to_ignore" + ], "UnseenInstanceForgetHours": 240, "SnapshotTopologiesIntervalHours": 0, "InstanceBulkOperationsWaitTimeoutSeconds": 10, diff --git a/conf/orchestrator-simple.conf.json b/conf/orchestrator-simple.conf.json index 6e23db72b..84b592612 100644 --- a/conf/orchestrator-simple.conf.json +++ b/conf/orchestrator-simple.conf.json @@ -16,6 +16,10 @@ "#": "-----", "DiscoverByShowSlaveHosts": true, "InstancePollSeconds": 5, + "DiscoveryIgnoreReplicaHostnameFilters": [ + "a_host_i_want_to_ignore", + "another_host_i_want_to_ignore" + ], "HostnameResolveMethod": "default", "MySQLHostnameResolveMethod": "@@hostname", "ReasonableReplicationLagSeconds": 10, diff --git a/docs/configuration-sample.md b/docs/configuration-sample.md index 68054e787..017bc458a 100644 --- a/docs/configuration-sample.md +++ b/docs/configuration-sample.md @@ -29,6 +29,10 @@ The following is a production configuration file, with some details redacted. "SlaveStartPostWaitMilliseconds": 1000, "DiscoverByShowSlaveHosts": false, "InstancePollSeconds": 5, + "DiscoveryIgnoreReplicaHostnameFilters": [ + "a_host_i_want_to_ignore", + "another_host_i_want_to_ignore" + ], "ReadLongRunningQueries": false, "SkipMaxScaleCheck": true, "BinlogFileHistoryDays": 10, From 428f3431b3ba43f99f3d50d6bb0a7adf1c526042 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Gagn=C3=A9?= Date: Fri, 1 Mar 2019 11:16:39 +0100 Subject: [PATCH 2/2] Make explicit that DiscoveryIgnoreReplicaHostnameFilters can be a regexp. --- conf/orchestrator-sample-sqlite.conf.json | 4 ++-- conf/orchestrator-sample.conf.json | 4 ++-- conf/orchestrator-simple.conf.json | 4 ++-- docs/configuration-sample.md | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/conf/orchestrator-sample-sqlite.conf.json b/conf/orchestrator-sample-sqlite.conf.json index b99da77f7..7ac3dd207 100644 --- a/conf/orchestrator-sample-sqlite.conf.json +++ b/conf/orchestrator-sample-sqlite.conf.json @@ -16,8 +16,8 @@ "DiscoverByShowSlaveHosts": true, "InstancePollSeconds": 5, "DiscoveryIgnoreReplicaHostnameFilters": [ - "a_host_i_want_to_ignore", - "another_host_i_want_to_ignore" + "a_host_i_want_to_ignore[.]example[.]com", + ".*[.]ignore_all_hosts_from_this_domain[.]example[.]com" ], "UnseenInstanceForgetHours": 240, "SnapshotTopologiesIntervalHours": 0, diff --git a/conf/orchestrator-sample.conf.json b/conf/orchestrator-sample.conf.json index cd71e5da9..ac54aa642 100644 --- a/conf/orchestrator-sample.conf.json +++ b/conf/orchestrator-sample.conf.json @@ -26,8 +26,8 @@ "DiscoverByShowSlaveHosts": true, "InstancePollSeconds": 5, "DiscoveryIgnoreReplicaHostnameFilters": [ - "a_host_i_want_to_ignore", - "another_host_i_want_to_ignore" + "a_host_i_want_to_ignore[.]example[.]com", + ".*[.]ignore_all_hosts_from_this_domain[.]example[.]com" ], "UnseenInstanceForgetHours": 240, "SnapshotTopologiesIntervalHours": 0, diff --git a/conf/orchestrator-simple.conf.json b/conf/orchestrator-simple.conf.json index 84b592612..a4f5a50c5 100644 --- a/conf/orchestrator-simple.conf.json +++ b/conf/orchestrator-simple.conf.json @@ -17,8 +17,8 @@ "DiscoverByShowSlaveHosts": true, "InstancePollSeconds": 5, "DiscoveryIgnoreReplicaHostnameFilters": [ - "a_host_i_want_to_ignore", - "another_host_i_want_to_ignore" + "a_host_i_want_to_ignore[.]example[.]com", + ".*[.]ignore_all_hosts_from_this_domain[.]example[.]com" ], "HostnameResolveMethod": "default", "MySQLHostnameResolveMethod": "@@hostname", diff --git a/docs/configuration-sample.md b/docs/configuration-sample.md index 017bc458a..5ea818ebd 100644 --- a/docs/configuration-sample.md +++ b/docs/configuration-sample.md @@ -30,8 +30,8 @@ The following is a production configuration file, with some details redacted. "DiscoverByShowSlaveHosts": false, "InstancePollSeconds": 5, "DiscoveryIgnoreReplicaHostnameFilters": [ - "a_host_i_want_to_ignore", - "another_host_i_want_to_ignore" + "a_host_i_want_to_ignore[.]example[.]com", + ".*[.]ignore_all_hosts_from_this_domain[.]example[.]com" ], "ReadLongRunningQueries": false, "SkipMaxScaleCheck": true,