Skip to content

Commit 02b9f04

Browse files
rimashah25rimashah25
authored
Revert Traffic Monitor renaming to rascal (#7190)
* Revert "Dev CiaB: Prefix Traffic Monitor profile name with TM profile prefix (#7175)" This reverts commit 3721d91. * Revert "Renamed rascal migration file to get latest time stamp (#7172)" This reverts commit f956d76. * Revert commits #7068, #7172, #7175
1 parent 323a465 commit 02b9f04

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+191
-245
lines changed

‎CHANGELOG.md

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
2323
- [#7176](https://github.com/apache/trafficcontrol/pull/7176) *ATC Build system* Support building ATC for the `aarch64` CPU architecture
2424

2525
### Changed
26-
- [#2564](https://github.com/apache/trafficcontrol/issues/2564) *Traffic Ops, Traffic Monitor* Renamed RASCAL references to TRAFFIC_MONITOR
2726
- [#7063](https://github.com/apache/trafficcontrol/pull/7063) *Traffic Ops* Python client now uses Traffic Ops API 4.1 by default.
2827
- [#6981](https://github.com/apache/trafficcontrol/pull/6981) *Traffic Portal* Obscures sensitive text in Delivery Service "Raw Remap" fields, private SSL keys, "Header Rewrite" rules, and ILO interface passwords by default.
2928
- [#7037](https://github.com/apache/trafficcontrol/pull/7037) *Traffic Router* Uses Traffic Ops API 4.0 by default

‎cache-config/testing/ort-tests/tc-fixtures.json

+20-20
Original file line numberDiff line numberDiff line change
@@ -1345,21 +1345,21 @@
13451345
],
13461346
"parameters": [
13471347
{
1348-
"configFile": "traffic_monitor.properties",
1348+
"configFile": "rascal.properties",
13491349
"lastUpdated": "2018-01-19T19:01:21.455131+00:00",
13501350
"name": "health.threshold.loadavg",
13511351
"secure": false,
13521352
"value": "25.0"
13531353
},
13541354
{
1355-
"configFile": "traffic_monitor.properties",
1355+
"configFile": "rascal.properties",
13561356
"lastUpdated": "2018-01-19T19:01:21.472279+00:00",
13571357
"name": "health.threshold.availableBandwidthInKbps",
13581358
"secure": false,
13591359
"value": ">1750000"
13601360
},
13611361
{
1362-
"configFile": "traffic_monitor.properties",
1362+
"configFile": "rascal.properties",
13631363
"lastUpdated": "2018-01-19T19:01:21.489534+00:00",
13641364
"name": "history.count",
13651365
"secure": false,
@@ -1681,13 +1681,13 @@
16811681
"value": "INT 0"
16821682
},
16831683
{
1684-
"configFile": "traffic_monitor.properties",
1684+
"configFile": "rascal.properties",
16851685
"name": "health.threshold.queryTime",
16861686
"secure": false,
16871687
"value": "1000"
16881688
},
16891689
{
1690-
"configFile": "traffic_monitor.properties",
1690+
"configFile": "rascal.properties",
16911691
"name": "health.polling.url",
16921692
"secure": false,
16931693
"value": "http://${hostname}/_astats?application=&inf.name=${interface_name}"
@@ -1699,7 +1699,7 @@
16991699
"value": "1"
17001700
},
17011701
{
1702-
"configFile": "traffic_monitor.properties",
1702+
"configFile": "rascal.properties",
17031703
"name": "health.connection.timeout",
17041704
"secure": false,
17051705
"value": "2000"
@@ -2078,13 +2078,13 @@
20782078
"value": "INT 0"
20792079
},
20802080
{
2081-
"configFile": "traffic_monitor.properties",
2081+
"configFile": "rascal.properties",
20822082
"name": "health.threshold.queryTime",
20832083
"secure": false,
20842084
"value": "1000"
20852085
},
20862086
{
2087-
"configFile": "traffic_monitor.properties",
2087+
"configFile": "rascal.properties",
20882088
"name": "health.polling.url",
20892089
"secure": false,
20902090
"value": "http://${hostname}/_astats?application=&inf.name=${interface_name}"
@@ -2096,7 +2096,7 @@
20962096
"value": "1"
20972097
},
20982098
{
2099-
"configFile": "traffic_monitor.properties",
2099+
"configFile": "rascal.properties",
21002100
"name": "health.connection.timeout",
21012101
"secure": false,
21022102
"value": "2000"
@@ -2390,33 +2390,33 @@
23902390
},
23912391
{
23922392
"cdnName": "cdn1",
2393-
"description": "traffic-monitor description",
2393+
"description": "rascal description",
23942394
"lastUpdated": "2018-03-02T17:27:11.813052+00:00",
2395-
"name": "TRAFFIC_MONITOR1",
2395+
"name": "RASCAL1",
23962396
"routing_disabled": false,
23972397
"type": "TM_PROFILE",
23982398
"params": [
23992399
{
2400-
"configFile": "traffic_monitor.properties",
2400+
"configFile": "rascal.properties",
24012401
"name": "health.threshold.queryTime",
24022402
"secure": false,
24032403
"value": "1000"
24042404
},
24052405
{
2406-
"configFile": "traffic_monitor.properties",
2406+
"configFile": "rascal.properties",
24072407
"name": "health.polling.url",
24082408
"secure": false,
24092409
"value": "http://${hostname}/_astats?application=&inf.name=${interface_name}"
24102410
},
24112411
{
2412-
"configFile": "traffic_monitor-config.txt",
2412+
"configFile": "rascal-config.txt",
24132413
"lastUpdated": "2018-01-19T19:01:21.472279+00:00",
24142414
"name": "peers.polling.interval",
24152415
"secure": false,
24162416
"value": "60"
24172417
},
24182418
{
2419-
"configFile": "traffic_monitor-config.txt",
2419+
"configFile": "rascal-config.txt",
24202420
"lastUpdated": "2018-01-19T19:01:21.472279+00:00",
24212421
"name": "health.polling.interval",
24222422
"secure": false,
@@ -3164,7 +3164,7 @@
31643164
"cdnName": "cdn1",
31653165
"domainName": "kabletown.net",
31663166
"guid": null,
3167-
"hostName": "tm01",
3167+
"hostName": "rascal01",
31683168
"httpsPort": 443,
31693169
"iloIpAddress": "",
31703170
"iloIpGateway": "",
@@ -3197,14 +3197,14 @@
31973197
"mgmtIpNetmask": "",
31983198
"offlineReason": null,
31993199
"physLocation": "Denver",
3200-
"profile": "TRAFFIC_MONITOR1",
3200+
"profile": "RASCAL1",
32013201
"rack": "RR 119.02",
32023202
"revalPending": false,
32033203
"routerHostName": "",
32043204
"routerPortName": "",
32053205
"status": "ONLINE",
32063206
"tcpPort": 81,
3207-
"type": "TRAFFIC_MONITOR",
3207+
"type": "RASCAL",
32083208
"updPending": false,
32093209
"xmppId": "",
32103210
"xmppPasswd": "X"
@@ -5046,9 +5046,9 @@
50465046
"useInTable": "server"
50475047
},
50485048
{
5049-
"description": "Traffic Monitor",
5049+
"description": "Traffic Monitor (Rascal)",
50505050
"lastUpdated": "2018-03-02T19:13:46.832327+00:00",
5051-
"name": "TRAFFIC_MONITOR",
5051+
"name": "RASCAL",
50525052
"useInTable": "server"
50535053
}
50545054
],

‎dev/traffic_ops/seed.psql

+14-14
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ INSERT INTO snapshot (
4646
monitoring
4747
) VALUES (
4848
'dev',
49-
'{"config":{"coveragezone.polling.url":"file:///go/src/github.com/apache/trafficcontrol/dev/traffic_router/czf.json","dnssec.enabled":"false","domain_name":"ciab.test","geolocation.polling.url":"file:///go/src/github.com/apache/trafficcontrol/traffic_router/core/src/test/resources/geo/GeoLite2-City.mmdb.gz"},"contentServers":{"edge":{"cacheGroup":"dev","fqdn":"edge.dev.ciab.test","hashCount":999,"hashId":"edge","httpsPort":443,"interfaceName":"eth0","ip":"129.0.0.2","ip6":"","locationId":"dev","port":80,"profile":"EDGE_dev","status":"REPORTED","type":"EDGE","deliveryServices":{"dev-ds":["edge.dev-ds.ciab.test"]},"routingDisabled":0}},"contentRouters":{"trafficrouter":{"fqdn":"trafficrouter.dev.ciab.test","httpsPort":443,"ip":"","ip6":"","location":"tr-cg","port":80,"profile":"CCR_dev","status":"ONLINE"}},"deliveryServices":{"dev-ds":{"anonymousBlockingEnabled":"false","coverageZoneOnly":"false","deepCachingType":"NEVER","dispersion":{"limit":1,"shuffled":"true"},"domains":["dev-ds.ciab.test"],"ecsEnabled":"false","geolocationProvider":"maxmindGeolocationService","ip6RoutingEnabled":"false","matchsets":[{"protocol":"HTTP","matchlist":[{"regex":".*\\.dev-ds\\..*","match-type":"HOST"}]}],"missLocation":{"lat":1,"long":1},"protocol":{"acceptHttps":"false","redirectToHttps":"false"},"regionalGeoBlocking":"false","routingName":"cdn","soa":{"admin":"traffic_ops","expire":"604800","minimum":"30","refresh":"28800","retry":"7200"},"sslEnabled":"false","ttls":{"A":"","AAAA":"","NS":"3600","SOA":"86400"}}},"edgeLocations":{"dev":{"latitude":1,"longitude":1,"backupLocations":{"fallbackToClosest":"true"},"localizationMethods":["GEO","CZ","DEEP_CZ"]}},"trafficRouterLocations":{"tr-cg":{"latitude":1,"longitude":1,"backupLocations":{"fallbackToClosest":"false"},"localizationMethods":["GEO","CZ","DEEP_CZ"]}},"monitors":{"trafficmonitor":{"fqdn":"trafficmonitor.dev.ciab.test","httpsPort":null,"ip":"129.0.0.1","ip6":"","location":"dev","port":80,"profile":"TRAFFIC_MONITOR_dev","status":"ONLINE"}},"stats":{"CDN_name":"dev","date":1649361181,"tm_host":"trafficops","tm_user":"admin","tm_version":"development"}}',
50-
'{"trafficServers":[{"profile":"EDGE_dev","status":"REPORTED","port":80,"cachegroup":"dev","hostname":"edge","fqdn":"edge.dev.ciab.test","interfaces":[{"ipAddresses":[{"address":"129.0.0.2","gateway":null,"serviceAddress":true}],"maxBandwidth":null,"monitor":true,"mtu":1500,"name":"eth0"}],"type":"EDGE","hashid":"","deliveryServices":[{"xmlId":"dev-ds"}]}],"trafficMonitors":[{"profile":"TRAFFIC_MONITOR_dev","status":"ONLINE","port":80,"cachegroup":"dev","hostname":"trafficmonitor","fqdn":"trafficmonitor.dev.ciab.test","ip":"129.0.0.1","ip6":""}],"cacheGroups":[{"name":"dev","coordinates":{"latitude":1,"longitude":1}},{"name":"tr-cg","coordinates":{"latitude":1,"longitude":1}}],"profiles":[{"name":"CCR_dev","type":"CCR","parameters":null},{"name":"EDGE_dev","type":"EDGE","parameters":{"health.polling.format":"stats_over_http","health.polling.url":"http://edge:8080/_stats?application=\\u0026inf.name=${interface_name}"}}],"deliveryServices":[{"xmlId":"dev-ds","totalTpsThreshold":0,"status":"REPORTED","totalKbpsThreshold":0,"type":"HTTP","topology":"","hostRegexes":[".*\\.dev-ds\\..*"]}],"config":{"health.polling.interval":6000,"heartbeat.polling.interval":3000,"peers.polling.interval":3000,"tm.polling.interval":2000},"topologies":{}}'
49+
'{"config":{"coveragezone.polling.url":"file:///go/src/github.com/apache/trafficcontrol/dev/traffic_router/czf.json","dnssec.enabled":"false","domain_name":"ciab.test","geolocation.polling.url":"file:///go/src/github.com/apache/trafficcontrol/traffic_router/core/src/test/resources/geo/GeoLite2-City.mmdb.gz"},"contentServers":{"edge":{"cacheGroup":"dev","fqdn":"edge.dev.ciab.test","hashCount":999,"hashId":"edge","httpsPort":443,"interfaceName":"eth0","ip":"129.0.0.2","ip6":"","locationId":"dev","port":80,"profile":"EDGE_dev","status":"REPORTED","type":"EDGE","deliveryServices":{"dev-ds":["edge.dev-ds.ciab.test"]},"routingDisabled":0}},"contentRouters":{"trafficrouter":{"fqdn":"trafficrouter.dev.ciab.test","httpsPort":443,"ip":"","ip6":"","location":"tr-cg","port":80,"profile":"CCR_dev","status":"ONLINE"}},"deliveryServices":{"dev-ds":{"anonymousBlockingEnabled":"false","coverageZoneOnly":"false","deepCachingType":"NEVER","dispersion":{"limit":1,"shuffled":"true"},"domains":["dev-ds.ciab.test"],"ecsEnabled":"false","geolocationProvider":"maxmindGeolocationService","ip6RoutingEnabled":"false","matchsets":[{"protocol":"HTTP","matchlist":[{"regex":".*\\.dev-ds\\..*","match-type":"HOST"}]}],"missLocation":{"lat":1,"long":1},"protocol":{"acceptHttps":"false","redirectToHttps":"false"},"regionalGeoBlocking":"false","routingName":"cdn","soa":{"admin":"traffic_ops","expire":"604800","minimum":"30","refresh":"28800","retry":"7200"},"sslEnabled":"false","ttls":{"A":"","AAAA":"","NS":"3600","SOA":"86400"}}},"edgeLocations":{"dev":{"latitude":1,"longitude":1,"backupLocations":{"fallbackToClosest":"true"},"localizationMethods":["GEO","CZ","DEEP_CZ"]}},"trafficRouterLocations":{"tr-cg":{"latitude":1,"longitude":1,"backupLocations":{"fallbackToClosest":"false"},"localizationMethods":["GEO","CZ","DEEP_CZ"]}},"monitors":{"trafficmonitor":{"fqdn":"trafficmonitor.dev.ciab.test","httpsPort":null,"ip":"129.0.0.1","ip6":"","location":"dev","port":80,"profile":"RASCAL_TM_dev","status":"ONLINE"}},"stats":{"CDN_name":"dev","date":1649361181,"tm_host":"trafficops","tm_user":"admin","tm_version":"development"}}',
50+
'{"trafficServers":[{"profile":"EDGE_dev","status":"REPORTED","port":80,"cachegroup":"dev","hostname":"edge","fqdn":"edge.dev.ciab.test","interfaces":[{"ipAddresses":[{"address":"129.0.0.2","gateway":null,"serviceAddress":true}],"maxBandwidth":null,"monitor":true,"mtu":1500,"name":"eth0"}],"type":"EDGE","hashid":"","deliveryServices":[{"xmlId":"dev-ds"}]}],"trafficMonitors":[{"profile":"RASCAL_TM_dev","status":"ONLINE","port":80,"cachegroup":"dev","hostname":"trafficmonitor","fqdn":"trafficmonitor.dev.ciab.test","ip":"129.0.0.1","ip6":""}],"cacheGroups":[{"name":"dev","coordinates":{"latitude":1,"longitude":1}},{"name":"tr-cg","coordinates":{"latitude":1,"longitude":1}}],"profiles":[{"name":"CCR_dev","type":"CCR","parameters":null},{"name":"EDGE_dev","type":"EDGE","parameters":{"health.polling.format":"stats_over_http","health.polling.url":"http://edge:8080/_stats?application=\\u0026inf.name=${interface_name}"}}],"deliveryServices":[{"xmlId":"dev-ds","totalTpsThreshold":0,"status":"REPORTED","totalKbpsThreshold":0,"type":"HTTP","topology":"","hostRegexes":[".*\\.dev-ds\\..*"]}],"config":{"health.polling.interval":6000,"heartbeat.polling.interval":3000,"peers.polling.interval":3000,"tm.polling.interval":2000},"topologies":{}}'
5151
)
5252
ON CONFLICT DO NOTHING;
5353

@@ -57,7 +57,7 @@ INSERT INTO profile (
5757
"type",
5858
cdn
5959
) VALUES (
60-
'TRAFFIC_MONITOR_dev',
60+
'RASCAL_TM_dev',
6161
'dev TM Profile',
6262
'TM_PROFILE',
6363
(SELECT id FROM cdn WHERE "name" = 'dev')
@@ -79,27 +79,27 @@ INSERT INTO parameter (
7979
"name",
8080
"value"
8181
) VALUES (
82-
'traffic_monitor-config.txt',
82+
'rascal-config.txt',
8383
'health.polling.interval',
8484
'6000'
8585
), (
86-
'traffic_monitor-config.txt',
86+
'rascal-config.txt',
8787
'heartbeat.polling.interval',
8888
'3000'
8989
), (
90-
'traffic_monitor-config.txt',
90+
'rascal-config.txt',
9191
'peers.polling.interval',
9292
'3000'
9393
), (
94-
'traffic_monitor-config.txt',
94+
'rascal-config.txt',
9595
'tm.polling.interval',
9696
'2000'
9797
), (
98-
'traffic_monitor.properties',
98+
'rascal.properties',
9999
'health.polling.url',
100100
'http://edge:8080/_stats?application=&inf.name=${interface_name}'
101101
), (
102-
'traffic_monitor.properties',
102+
'rascal.properties',
103103
'health.polling.format',
104104
'stats_over_http'
105105
), (
@@ -120,15 +120,15 @@ ON CONFLICT DO NOTHING;
120120
INSERT INTO profile_parameter
121121
SELECT profile.id, parameter.id
122122
FROM profile, parameter
123-
WHERE parameter.config_file = 'traffic_monitor-config.txt'
123+
WHERE parameter.config_file = 'rascal-config.txt'
124124
AND parameter."name" LIKE '%.polling.%'
125-
AND profile."name" = 'TRAFFIC_MONITOR_dev'
125+
AND profile."name" = 'RASCAL_TM_dev'
126126
ON CONFLICT DO NOTHING;
127127

128128
INSERT INTO profile_parameter
129129
SELECT profile.id, parameter.id
130130
FROM profile, parameter
131-
WHERE parameter.config_file = 'traffic_monitor.properties'
131+
WHERE parameter.config_file = 'rascal.properties'
132132
AND profile."name" = 'EDGE_dev'
133133
ON CONFLICT DO NOTHING;
134134

@@ -214,9 +214,9 @@ INSERT INTO "server" (
214214
NULL,
215215
(SELECT id FROM phys_location WHERE "name" = 'dev'),
216216
(SELECT id FROM cachegroup WHERE "name" = 'dev'),
217-
(SELECT id FROM "type" WHERE "name" = 'TRAFFIC_MONITOR'),
217+
(SELECT id FROM "type" WHERE "name" = 'RASCAL'),
218218
(SELECT id FROM status WHERE "name" = 'ONLINE'),
219-
(SELECT id FROM profile WHERE "name"= 'TRAFFIC_MONITOR_dev'),
219+
(SELECT id FROM profile WHERE "name"= 'RASCAL_TM_dev'),
220220
(SELECT id FROM cdn WHERE "name" = 'dev')
221221
), (
222222
'edge',

‎docs/source/admin/traffic_monitor.rst

+3
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ These are the recommended hardware specifications for a production deployment of
3434
* It is also recommended that you know the geographic coordinates and/or mailing address of the site where the Traffic Monitor machine lives for optimal performance
3535

3636
#. Enter the Traffic Monitor server into Traffic Portal
37+
38+
.. note:: For legacy compatibility reasons, the 'Type' field of a new Traffic Monitor server must be 'RASCAL'.
39+
3740
#. Make sure the :abbr:`FQDN (Fully Qualified Domain Name)` of the Traffic Monitor is resolvable in DNS.
3841
#. Install Traffic Monitor, either from source or by installing a :file:`traffic_monitor-{version string}.rpm` package generated by the instructions in :ref:`dev-building` with :manpage:`yum(8)` or :manpage:`rpm(8)`
3942
#. Configure Traffic Monitor according to `Configuring Traffic Monitor`_

‎docs/source/api/v3/cdns_name_configs_monitoring.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ Response Structure
215215
],
216216
"trafficMonitors": [
217217
{
218-
"profile": "TRAFFIC_MONITOR",
218+
"profile": "RASCAL-Traffic_Monitor",
219219
"status": "ONLINE",
220220
"ip": "172.16.239.40",
221221
"ip6": "fc01:9400:1000:8::40",

‎docs/source/api/v3/cdns_name_snapshot.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ Response Structure
536536
"ip6": "",
537537
"location": "CDN_in_a_Box_Edge",
538538
"port": 80,
539-
"profile": "TRAFFIC_MONITOR",
539+
"profile": "RASCAL-Traffic_Monitor",
540540
"status": "ONLINE"
541541
}
542542
},

‎docs/source/api/v3/cdns_name_snapshot_new.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ Response Structure
552552
"ip6": "",
553553
"location": "CDN_in_a_Box_Edge",
554554
"port": 80,
555-
"profile": "TRAFFIC_MONITOR",
555+
"profile": "RASCAL-Traffic_Monitor",
556556
"status": "ONLINE"
557557
}
558558
},

‎docs/source/api/v4/cdns_name_configs_monitoring.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ Response Structure
216216
],
217217
"trafficMonitors": [
218218
{
219-
"profile": "TRAFFIC_MONITOR",
219+
"profile": "RASCAL-Traffic_Monitor",
220220
"status": "ONLINE",
221221
"ip": "172.16.239.40",
222222
"ip6": "fc01:9400:1000:8::40",

‎docs/source/api/v4/cdns_name_snapshot.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ Response Structure
533533
"ip6": "",
534534
"location": "CDN_in_a_Box_Edge",
535535
"port": 80,
536-
"profile": "TRAFFIC_MONITOR",
536+
"profile": "RASCAL-Traffic_Monitor",
537537
"status": "ONLINE"
538538
}
539539
},

‎docs/source/api/v4/cdns_name_snapshot_new.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ Response Structure
547547
"ip6": "",
548548
"location": "CDN_in_a_Box_Edge",
549549
"port": 80,
550-
"profile": "TRAFFIC_MONITOR",
550+
"profile": "RASCAL-Traffic_Monitor",
551551
"status": "ONLINE"
552552
}
553553
},

‎docs/source/api/v5/cdns_name_configs_monitoring.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ Response Structure
216216
],
217217
"trafficMonitors": [
218218
{
219-
"profile": "TRAFFIC_MONITOR",
219+
"profile": "RASCAL-Traffic_Monitor",
220220
"status": "ONLINE",
221221
"ip": "172.16.239.40",
222222
"ip6": "fc01:9400:1000:8::40",

‎docs/source/api/v5/cdns_name_snapshot.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ Response Structure
533533
"ip6": "",
534534
"location": "CDN_in_a_Box_Edge",
535535
"port": 80,
536-
"profile": "TRAFFIC_MONITOR",
536+
"profile": "RASCAL-Traffic_Monitor",
537537
"status": "ONLINE"
538538
}
539539
},

‎docs/source/api/v5/cdns_name_snapshot_new.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ Response Structure
547547
"ip6": "",
548548
"location": "CDN_in_a_Box_Edge",
549549
"port": 80,
550-
"profile": "TRAFFIC_MONITOR",
550+
"profile": "RASCAL-Traffic_Monitor",
551551
"status": "ONLINE"
552552
}
553553
},

‎docs/source/overview/profiles_and_parameters.rst

+4-2
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@ SPLUNK_PROFILE
112112
TM_PROFILE
113113
A Traffic Monitor Profile.
114114

115+
.. warning:: For legacy reasons, the names of Profiles of this type *must* begin with ``RASCAL_``. This is **not** enforced by the :ref:`to-api` or Traffic Portal, but certain Traffic Control operations/components expect this and will fail to work otherwise!
116+
115117
TP_PROFILE
116118
A Traffic Portal Profile. This has no known special meaning to any Traffic Control component(s) (not even Traffic Portal itself), but its use is suggested for the profiles used by any and all Traffic Portal servers anyway.
117119

@@ -495,8 +497,8 @@ For each Parameter with this Config File value on the same :ref:`Profile <profil
495497

496498
.. _tm-related-cache-server-params:
497499

498-
traffic_monitor.properties
499-
''''''''''''''''''''''''''
500+
rascal.properties
501+
'''''''''''''''''
500502
This Config File is meant to be on Parameters assigned to either Traffic Monitor Profiles_ or :term:`cache server` Profiles_. Its allowed :ref:`Parameter Names <parameter-name>` are all configuration options for Traffic Monitor. The :ref:`Names <parameter-name>` with meaning are as follows.
501503

502504
.. seealso:: :ref:`health-proto`

‎experimental/traffic-portal/src/app/core/servers/server-details/server-details.component.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ describe("ServerDetailsComponent", () => {
119119
expect(component.isCache()).toBeTrue();
120120
s.type = "a string that merely CONTAINS 'EDGE' instead of starting with it";
121121
expect(component.isCache()).toBeFalse();
122-
s.type = "TRAFFIC_MONITOR";
122+
s.type = "RASCAL";
123123
expect(component.isCache()).toBeFalse();
124124
});
125125

‎experimental/traffic-portal/src/app/core/servers/servers-table/servers-table.component.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ describe("ServersTableComponent", () => {
9494
expect(serverIsCache(s)).toBeTrue();
9595
s.type = "a string that merely CONTAINS 'EDGE' instead of starting with it";
9696
expect(serverIsCache(s)).toBeFalse();
97-
s.type = "TRAFFIC_MONITOR";
97+
s.type = "RASCAL";
9898
expect(serverIsCache(s)).toBeFalse();
9999
});
100100

0 commit comments

Comments
 (0)