Merge pull request #815 from jfg956/master

Add the DiscoveryIgnoreReplicaHostnameFilters in the sample configuration.
openark · Mar 2, 2019 · 792f42d · 792f42d
2 parents 172cec8 + 428f343
commit 792f42d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git 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[.]example[.]com",
+    ".*[.]ignore_all_hosts_from_this_domain[.]example[.]com"
+  ],
   "UnseenInstanceForgetHours": 240,
   "SnapshotTopologiesIntervalHours": 0,
   "InstanceBulkOperationsWaitTimeoutSeconds": 10,

diff --git 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[.]example[.]com",
+    ".*[.]ignore_all_hosts_from_this_domain[.]example[.]com"
+  ],
   "UnseenInstanceForgetHours": 240,
   "SnapshotTopologiesIntervalHours": 0,
   "InstanceBulkOperationsWaitTimeoutSeconds": 10,

diff --git 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[.]example[.]com",
+    ".*[.]ignore_all_hosts_from_this_domain[.]example[.]com"
+  ],
   "HostnameResolveMethod": "default",
   "MySQLHostnameResolveMethod": "@@hostname",
   "ReasonableReplicationLagSeconds": 10,

diff --git 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[.]example[.]com",
+    ".*[.]ignore_all_hosts_from_this_domain[.]example[.]com"
+  ],
   "ReadLongRunningQueries": false,
   "SkipMaxScaleCheck": true,
   "BinlogFileHistoryDays": 10,