This is an automated email from the ASF dual-hosted git repository.
ocket8888 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 ad52369855 Clean up Ansible TM config options, remove unused
peer_optimistic option (#6940)
ad52369855 is described below
commit ad52369855215292039ea928f3be829b8ada294d
Author: Rawlin Peters <[email protected]>
AuthorDate: Mon Jul 18 16:34:36 2022 -0600
Clean up Ansible TM config options, remove unused peer_optimistic option
(#6940)
---
.github/actions/tm-integration-tests/entrypoint.sh | 1 -
dev/traffic_monitor/tm.config.json | 1 -
infrastructure/ansible/roles/traffic-monitor/README.md | 1 -
infrastructure/ansible/roles/traffic-monitor/defaults/main.yml | 4 +++-
.../ansible/roles/traffic-monitor/templates/traffic_monitor.cfg.j2 | 4 +++-
infrastructure/cdn-in-a-box/traffic_monitor/traffic_monitor.cfg | 1 -
infrastructure/docker/traffic_monitor/run.sh | 1 -
traffic_monitor/conf/traffic_monitor.cfg | 1 -
traffic_monitor/config/config_test.go | 2 --
traffic_monitor/tests/_integration/tm/Dockerfile_run.sh | 1 -
10 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/.github/actions/tm-integration-tests/entrypoint.sh
b/.github/actions/tm-integration-tests/entrypoint.sh
index a9dad03512..7e3e533f5c 100755
--- a/.github/actions/tm-integration-tests/entrypoint.sh
+++ b/.github/actions/tm-integration-tests/entrypoint.sh
@@ -125,7 +125,6 @@ cat > ./traffic_monitor.cfg <<- EOF
{
"monitor_config_polling_interval_ms": 15000,
"http_timeout_ms": 8000,
- "peer_optimistic": true,
"max_events": 200,
"health_flush_interval_ms": 20,
"stat_flush_interval_ms": 20,
diff --git a/dev/traffic_monitor/tm.config.json
b/dev/traffic_monitor/tm.config.json
index 91b6882653..3834cf6ac4 100644
--- a/dev/traffic_monitor/tm.config.json
+++ b/dev/traffic_monitor/tm.config.json
@@ -1,7 +1,6 @@
{
"monitor_config_polling_interval_ms": 15000,
"http_timeout_ms": 86400000,
- "peer_optimistic": true,
"peer_optimistic_quorum_min": 0,
"max_events": 100,
"health_flush_interval_ms": 20,
diff --git a/infrastructure/ansible/roles/traffic-monitor/README.md
b/infrastructure/ansible/roles/traffic-monitor/README.md
index 529f7bf4cc..057a193092 100644
--- a/infrastructure/ansible/roles/traffic-monitor/README.md
+++ b/infrastructure/ansible/roles/traffic-monitor/README.md
@@ -48,7 +48,6 @@ Example Playbook
name: traffic-monitor
vars:
install_traffic_monitor: true
- tm_peer_optimistic: true
```
License
diff --git a/infrastructure/ansible/roles/traffic-monitor/defaults/main.yml
b/infrastructure/ansible/roles/traffic-monitor/defaults/main.yml
index 022f99cae8..09b2643688 100644
--- a/infrastructure/ansible/roles/traffic-monitor/defaults/main.yml
+++ b/infrastructure/ansible/roles/traffic-monitor/defaults/main.yml
@@ -26,7 +26,9 @@ tm_group: traffic_monitor
# traffic_monitor.cfg
tm_monitor_config_polling_interval_ms: 5000
tm_http_timeout_ms: 2000
-tm_peer_optimistic: true
+tm_peer_optimistic_quorum_min: 0
+tm_stat_polling: true
+tm_distributed_polling: false
tm_max_events: 200
tm_health_flush_interval_ms: 20
tm_log_location_error: "{{ tm_log_dir }}/traffic_monitor.log"
diff --git
a/infrastructure/ansible/roles/traffic-monitor/templates/traffic_monitor.cfg.j2
b/infrastructure/ansible/roles/traffic-monitor/templates/traffic_monitor.cfg.j2
index 37c9021281..12529a3066 100644
---
a/infrastructure/ansible/roles/traffic-monitor/templates/traffic_monitor.cfg.j2
+++
b/infrastructure/ansible/roles/traffic-monitor/templates/traffic_monitor.cfg.j2
@@ -14,7 +14,9 @@
{
"monitor_config_polling_interval_ms": {{
tm_monitor_config_polling_interval_ms }},
"http_timeout_ms": {{ tm_http_timeout_ms }},
- "peer_optimistic": {{ tm_peer_optimistic | lower }},
+ "peer_optimistic_quorum_min": {{ tm_peer_optimistic_quorum_min }},
+ "stat_polling": {{ tm_stat_polling | lower }},
+ "distributed_polling": {{ tm_distributed_polling | lower }},
"max_events": {{ tm_max_events }},
"health_flush_interval_ms": {{ tm_health_flush_interval_ms }},
"stat_flush_interval_ms": {{ tm_stat_flush_interval_ms }},
diff --git a/infrastructure/cdn-in-a-box/traffic_monitor/traffic_monitor.cfg
b/infrastructure/cdn-in-a-box/traffic_monitor/traffic_monitor.cfg
index d36e7e6181..4d98e70e9a 100644
--- a/infrastructure/cdn-in-a-box/traffic_monitor/traffic_monitor.cfg
+++ b/infrastructure/cdn-in-a-box/traffic_monitor/traffic_monitor.cfg
@@ -1,7 +1,6 @@
{
"monitor_config_polling_interval_ms": 15000,
"http_timeout_ms": $HTTP_TIMEOUT_MS,
- "peer_optimistic": true,
"peer_optimistic_quorum_min": 0,
"max_events": 200,
"health_flush_interval_ms": 20,
diff --git a/infrastructure/docker/traffic_monitor/run.sh
b/infrastructure/docker/traffic_monitor/run.sh
index 65fb3c6096..d52e2dbaf7 100755
--- a/infrastructure/docker/traffic_monitor/run.sh
+++ b/infrastructure/docker/traffic_monitor/run.sh
@@ -70,7 +70,6 @@ init() {
{
"monitor_config_polling_interval_ms": 15000,
"http_timeout_ms": 2000,
- "peer_optimistic": true,
"max_events": 200,
"health_flush_interval_ms": 20,
"stat_flush_interval_ms": 20,
diff --git a/traffic_monitor/conf/traffic_monitor.cfg
b/traffic_monitor/conf/traffic_monitor.cfg
index 8380c2c5e5..6590c69955 100644
--- a/traffic_monitor/conf/traffic_monitor.cfg
+++ b/traffic_monitor/conf/traffic_monitor.cfg
@@ -1,7 +1,6 @@
{
"monitor_config_polling_interval_ms": 5000,
"http_timeout_ms": 2000,
- "peer_optimistic": true,
"peer_optimistic_quorum_min": 0,
"max_events": 200,
"stat_polling": true,
diff --git a/traffic_monitor/config/config_test.go
b/traffic_monitor/config/config_test.go
index 1e98d09fbc..ff1e3169b7 100644
--- a/traffic_monitor/config/config_test.go
+++ b/traffic_monitor/config/config_test.go
@@ -27,7 +27,6 @@ const exampleTMConfig = `
{
"monitor_config_polling_interval_ms": 5000,
"http_timeout_ms": 30000,
- "peer_optimistic": false,
"peer_optimistic_quorum_min": 3,
"max_events": 200,
"health_flush_interval_ms": 1000,
@@ -56,7 +55,6 @@ const exampleBadTMConfig = `
{
"monitor_config_polling_interval_ms": 5000,
"http_timeout_ms": 30000,
- "peer_optimistic": false,
"peer_optimistic_quorum_min": 3,
"max_events": 200,
"health_flush_interval_ms": 1000,
diff --git a/traffic_monitor/tests/_integration/tm/Dockerfile_run.sh
b/traffic_monitor/tests/_integration/tm/Dockerfile_run.sh
index e895b486bd..295a9ac704 100755
--- a/traffic_monitor/tests/_integration/tm/Dockerfile_run.sh
+++ b/traffic_monitor/tests/_integration/tm/Dockerfile_run.sh
@@ -41,7 +41,6 @@ init() {
{
"monitor_config_polling_interval_ms": 15000,
"http_timeout_ms": 2000,
- "peer_optimistic": true,
"max_events": 200,
"health_flush_interval_ms": 20,
"stat_flush_interval_ms": 20,
