This is an automated email from the ASF dual-hosted git repository.
zrhoffman 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 c7ad6de Remove unused TM profile parameters (#6090)
c7ad6de is described below
commit c7ad6de0ff81cb5ab5951a7a21e7ca89cfae9e16
Author: Rawlin Peters <[email protected]>
AuthorDate: Mon Aug 16 16:37:56 2021 -0600
Remove unused TM profile parameters (#6090)
The following TM profile parameters are unused and will be removed:
- tm.crConfig.polling.url
- tm.dataServer.polling.url
- tm.healthParams.polling.url
- location
- health.threadPool
- health.event-count
- hack.ttl
- health.timepad
NOTE: they all have a config file of "rascal-config.txt"
---
.../source/api/v2/cdns_name_configs_monitoring.rst | 15 --------
.../source/api/v3/cdns_name_configs_monitoring.rst | 15 --------
.../source/api/v4/cdns_name_configs_monitoring.rst | 15 --------
.../ansible/roles/dataset_loader/defaults/main.yml | 32 -----------------
.../profiles/070-RASCAL-Traffic_Monitor.json | 40 ----------------------
5 files changed, 117 deletions(-)
diff --git a/docs/source/api/v2/cdns_name_configs_monitoring.rst
b/docs/source/api/v2/cdns_name_configs_monitoring.rst
index 3f8393f..322eab5 100644
--- a/docs/source/api/v2/cdns_name_configs_monitoring.rst
+++ b/docs/source/api/v2/cdns_name_configs_monitoring.rst
@@ -52,14 +52,7 @@ Response Structure
:config: A collection of parameters used to configure the monitoring behaviour
of Traffic Monitor
- :hack.ttl: Unknown
- :health.event-count: The total number of health events to store
:health.polling.interval: An interval in milliseconds on which to
poll for health statistics
- :health.threadPool: The number of threads to be used for
health polling
- :health.timepad: A 'padding time' to add to requests to
spread them out for Traffic Control systems that use a large number of Traffic
Monitors
- :tm.crConfig.polling.url: The URL from which a :term:`Snapshot` can
be obtained
- :tm.dataServer.polling.url: The URL from which a list of data servers
can be obtained
- :tm.healthParams.polling.url: The URL from which a list of
health-polling parameters can be obtained
:tm.polling.interval: The interval at which to poll for
configuration updates
:deliveryServices: An array of objects representing each :term:`Delivery
Service` provided by this CDN
@@ -215,17 +208,9 @@ Response Structure
],
"deliveryServices": [],
"config": {
- "hack.ttl": 30,
- "health.event-count": 200,
"health.polling.interval": 6000,
- "health.threadPool": 4,
- "health.timepad": 0,
"heartbeat.polling.interval": 3000,
- "location": "/opt/traffic_monitor/conf",
"peers.polling.interval": 3000,
- "tm.crConfig.polling.url":
"https://${tmHostname}/CRConfig-Snapshots/${cdnName}/CRConfig.xml";,
- "tm.dataServer.polling.url":
"https://${tmHostname}/dataserver/orderby/id";,
- "tm.healthParams.polling.url":
"https://${tmHostname}/health/${cdnName}";,
"tm.polling.interval": 2000
}
}}
diff --git a/docs/source/api/v3/cdns_name_configs_monitoring.rst
b/docs/source/api/v3/cdns_name_configs_monitoring.rst
index dd6bc17..9d394e2 100644
--- a/docs/source/api/v3/cdns_name_configs_monitoring.rst
+++ b/docs/source/api/v3/cdns_name_configs_monitoring.rst
@@ -52,14 +52,7 @@ Response Structure
:config: A collection of parameters used to configure the monitoring behaviour
of Traffic Monitor
- :hack.ttl: Unknown
- :health.event-count: The total number of health events to store
:health.polling.interval: An interval in milliseconds on which to
poll for health statistics
- :health.threadPool: The number of threads to be used for
health polling
- :health.timepad: A 'padding time' to add to requests to
spread them out for Traffic Control systems that use a large number of Traffic
Monitors
- :tm.crConfig.polling.url: The URL from which a :term:`Snapshot` can
be obtained
- :tm.dataServer.polling.url: The URL from which a list of data servers
can be obtained
- :tm.healthParams.polling.url: The URL from which a list of
health-polling parameters can be obtained
:tm.polling.interval: The interval at which to poll for
configuration updates
:deliveryServices: An array of objects representing each :term:`Delivery
Service` provided by this CDN
@@ -261,17 +254,9 @@ Response Structure
],
"deliveryServices": [],
"config": {
- "hack.ttl": 30,
- "health.event-count": 200,
"health.polling.interval": 6000,
- "health.threadPool": 4,
- "health.timepad": 0,
"heartbeat.polling.interval": 3000,
- "location": "/opt/traffic_monitor/conf",
"peers.polling.interval": 3000,
- "tm.crConfig.polling.url":
"https://${tmHostname}/CRConfig-Snapshots/${cdnName}/CRConfig.xml";,
- "tm.dataServer.polling.url":
"https://${tmHostname}/dataserver/orderby/id";,
- "tm.healthParams.polling.url":
"https://${tmHostname}/health/${cdnName}";,
"tm.polling.interval": 2000
}
}}
diff --git a/docs/source/api/v4/cdns_name_configs_monitoring.rst
b/docs/source/api/v4/cdns_name_configs_monitoring.rst
index b44a0b4..318149e 100644
--- a/docs/source/api/v4/cdns_name_configs_monitoring.rst
+++ b/docs/source/api/v4/cdns_name_configs_monitoring.rst
@@ -52,14 +52,7 @@ Response Structure
:config: A collection of parameters used to configure the monitoring behaviour
of Traffic Monitor
- :hack.ttl: Unknown
- :health.event-count: The total number of health events to store
:health.polling.interval: An interval in milliseconds on which to
poll for health statistics
- :health.threadPool: The number of threads to be used for
health polling
- :health.timepad: A 'padding time' to add to requests to
spread them out for Traffic Control systems that use a large number of Traffic
Monitors
- :tm.crConfig.polling.url: The URL from which a :term:`Snapshot` can
be obtained
- :tm.dataServer.polling.url: The URL from which a list of data servers
can be obtained
- :tm.healthParams.polling.url: The URL from which a list of
health-polling parameters can be obtained
:tm.polling.interval: The interval at which to poll for
configuration updates
:deliveryServices: An array of objects representing each :term:`Delivery
Service` provided by this CDN
@@ -261,17 +254,9 @@ Response Structure
],
"deliveryServices": [],
"config": {
- "hack.ttl": 30,
- "health.event-count": 200,
"health.polling.interval": 6000,
- "health.threadPool": 4,
- "health.timepad": 0,
"heartbeat.polling.interval": 3000,
- "location": "/opt/traffic_monitor/conf",
"peers.polling.interval": 3000,
- "tm.crConfig.polling.url":
"https://${tmHostname}/CRConfig-Snapshots/${cdnName}/CRConfig.xml";,
- "tm.dataServer.polling.url":
"https://${tmHostname}/dataserver/orderby/id";,
- "tm.healthParams.polling.url":
"https://${tmHostname}/health/${cdnName}";,
"tm.polling.interval": 2000
}
}}
diff --git a/infrastructure/ansible/roles/dataset_loader/defaults/main.yml
b/infrastructure/ansible/roles/dataset_loader/defaults/main.yml
index 12c2ee0..7f9f00d 100644
--- a/infrastructure/ansible/roles/dataset_loader/defaults/main.yml
+++ b/infrastructure/ansible/roles/dataset_loader/defaults/main.yml
@@ -616,50 +616,18 @@ dl_ds_default_profile_cdntemplates:
type: TM_PROFILE
routingDisabled: false
parameters:
- - name: hack.ttl
- configFile: rascal-config.txt
- value: '30'
- secure: 0
- - name: health.event-count
- configFile: rascal-config.txt
- value: '200'
- secure: 0
- name: health.polling.interval
configFile: rascal-config.txt
value: '6000'
secure: 0
- - name: health.threadPool
- configFile: rascal-config.txt
- value: '4'
- secure: 0
- - name: health.timepad
- configFile: rascal-config.txt
- value: '0'
- secure: 0
- name: heartbeat.polling.interval
configFile: rascal-config.txt
value: '2000'
secure: 0
- - name: location
- configFile: rascal-config.txt
- value: "/opt/traffic_monitor/conf"
- secure: 0
- name: peers.polling.interval
configFile: rascal-config.txt
value: '1000'
secure: 0
- - name: tm.crConfig.polling.url
- configFile: rascal-config.txt
- value: https://${tmHostname}/CRConfig-Snapshots/${cdnName}/CRConfig.xml
- secure: 0
- - name: tm.dataServer.polling.url
- configFile: rascal-config.txt
- value: https://${tmHostname}/dataserver/orderby/id
- secure: 0
- - name: tm.healthParams.polling.url
- configFile: rascal-config.txt
- value: https://${tmHostname}/health/${cdnName}
- secure: 0
- name: tm.polling.interval
configFile: rascal-config.txt
value: '60000'
diff --git
a/infrastructure/cdn-in-a-box/traffic_ops_data/profiles/070-RASCAL-Traffic_Monitor.json
b/infrastructure/cdn-in-a-box/traffic_ops_data/profiles/070-RASCAL-Traffic_Monitor.json
index 4ab828f..23bc567 100644
---
a/infrastructure/cdn-in-a-box/traffic_ops_data/profiles/070-RASCAL-Traffic_Monitor.json
+++
b/infrastructure/cdn-in-a-box/traffic_ops_data/profiles/070-RASCAL-Traffic_Monitor.json
@@ -6,61 +6,21 @@
"params": [
{
"configFile": "rascal-config.txt",
- "name": "hack.ttl",
- "value": "30"
- },
- {
- "configFile": "rascal-config.txt",
- "name": "health.event-count",
- "value": "200"
- },
- {
- "configFile": "rascal-config.txt",
"name": "health.polling.interval",
"value": "6000"
},
{
"configFile": "rascal-config.txt",
- "name": "health.threadPool",
- "value": "4"
- },
- {
- "configFile": "rascal-config.txt",
- "name": "health.timepad",
- "value": "0"
- },
- {
- "configFile": "rascal-config.txt",
"name": "heartbeat.polling.interval",
"value": "3000"
},
{
"configFile": "rascal-config.txt",
- "name": "location",
- "value": "/opt/traffic_monitor/conf"
- },
- {
- "configFile": "rascal-config.txt",
"name": "peers.polling.interval",
"value": "3000"
},
{
"configFile": "rascal-config.txt",
- "name": "tm.crConfig.polling.url",
- "value":
"https://${tmHostname}/CRConfig-Snapshots/${cdnName}/CRConfig.xml";
- },
- {
- "configFile": "rascal-config.txt",
- "name": "tm.dataServer.polling.url",
- "value": "https://${tmHostname}/dataserver/orderby/id";
- },
- {
- "configFile": "rascal-config.txt",
- "name": "tm.healthParams.polling.url",
- "value": "https://${tmHostname}/health/${cdnName}";
- },
- {
- "configFile": "rascal-config.txt",
"name": "tm.polling.interval",
"value": "2000"
}
