This is an automated email from the ASF dual-hosted git repository.
mitchell852 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 8fd0ba8 updated Traffic Monitor to monitor both IPv4 and IPv6 by
default (#4576)
8fd0ba8 is described below
commit 8fd0ba8482f7724031030ce78e75554701c51896
Author: mattjackson220 <[email protected]>
AuthorDate: Tue Mar 31 21:24:50 2020 -0600
updated Traffic Monitor to monitor both IPv4 and IPv6 by default (#4576)
Co-authored-by: mjacks258 <[email protected]>
---
CHANGELOG.md | 1 +
docs/source/admin/traffic_monitor.rst | 4 ++--
traffic_monitor/config/config.go | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44113e4..26ed282 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,6 +48,7 @@ The format is based on [Keep a
Changelog](http://keepachangelog.com/en/1.0.0/).
- Modified Traffic Monitor to poll over IPv6 as well as IPv4 and separate the
availability statuses.
- Modified Traffic Router to separate availability statuses between IPv4 and
IPv6.
- Modified Traffic Portal and Traffic Ops to accept IPv6 only servers.
+- Updated Traffic Monitor to default to polling both IPv4 and IPv6.
### Deprecated/Removed
- Traffic Ops Python client no longer supports Python 2.
diff --git a/docs/source/admin/traffic_monitor.rst
b/docs/source/admin/traffic_monitor.rst
index c88abd0..ca07ae9 100644
--- a/docs/source/admin/traffic_monitor.rst
+++ b/docs/source/admin/traffic_monitor.rst
@@ -54,9 +54,9 @@ Traffic Monitor is configured via two JSON configuration
files, :file:`traffic_o
Polling protocol can be set for peers and caches and has 3 options:
-:ipv4only (the default): Traffic Monitor will communicate with the peers or
caches only over IPv4
+:ipv4only: Traffic Monitor will communicate with the peers or caches only over
IPv4
:ipv6only: Traffic Monitor will communicate with the peers or caches only over
IPv6 (use case for peers is if the other Traffic Monitor are only available
over IPv6)
-:both: Traffic Monitor will alternate its communication between IPv4 and IPv6
(note: this does not affect the polling frequency so if polling frequency is 1
second IPv4 will be polled every 2 seconds)
+:both (the default): Traffic Monitor will alternate its communication between
IPv4 and IPv6 (note: this does not affect the polling frequency so if polling
frequency is 1 second IPv4 will be polled every 2 seconds)
.. Note:: ``both`` will poll IPv4 and IPv6 and report on availability based on
if the respective IP addresses are defined on the server. So if only an IPv4
address is defined and the protocol is set to ``both`` then it will only show
the availability over IPv4, but if both addresses are defined then it will show
availability based on IPv4 and IPv6.
diff --git a/traffic_monitor/config/config.go b/traffic_monitor/config/config.go
index 7805fd2..ab7a5ea 100644
--- a/traffic_monitor/config/config.go
+++ b/traffic_monitor/config/config.go
@@ -163,8 +163,8 @@ var DefaultConfig = Config{
CRConfigBackupFile: CRConfigBackupFile,
TMConfigBackupFile: TMConfigBackupFile,
TrafficOpsDiskRetryMax: 2,
- CachePollingProtocol: IPv4Only,
- PeerPollingProtocol: IPv4Only,
+ CachePollingProtocol: Both,
+ PeerPollingProtocol: Both,
}
// MarshalJSON marshals custom millisecond durations. Aliasing inspired by
http://choly.ca/post/go-json-marshalling/
