This is an automated email from the ASF dual-hosted git repository.
dmeden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new efda39eec4 cleanup - removing some TM leftovers from a particular doc.
(#9605)
efda39eec4 is described below
commit efda39eec44ab1042e990515740ff010865862e5
Author: Damian Meden <[email protected]>
AuthorDate: Tue Apr 25 11:14:45 2023 +0100
cleanup - removing some TM leftovers from a particular doc. (#9605)
---
doc/admin-guide/logging/rotation.en.rst | 2 +-
doc/admin-guide/monitoring/alarms.en.rst | 36 ------
doc/admin-guide/monitoring/error-messages.en.rst | 43 -------
doc/admin-guide/monitoring/index.en.rst | 1 -
doc/developer-guide/api/functions/TSDebug.en.rst | 16 +--
.../admin-guide/monitoring/alarms.en.po | 135 ---------------------
.../admin-guide/monitoring/error-messages.en.po | 7 --
include/ts/experimental.h | 2 +-
mgmt/api/include/mgmtapi.h | 4 +-
9 files changed, 12 insertions(+), 234 deletions(-)
diff --git a/doc/admin-guide/logging/rotation.en.rst
b/doc/admin-guide/logging/rotation.en.rst
index 1271e58886..81f2cfd6e3 100644
--- a/doc/admin-guide/logging/rotation.en.rst
+++ b/doc/admin-guide/logging/rotation.en.rst
@@ -177,7 +177,7 @@ they reach a certain size, adjust the following settings in
You can fine-tune log file rolling settings for individual log files in the
``log.*`` specification in :file:`logging.yaml`. The custom log file uses the
rolling settings provided in the relevant ``log`` function call, which override
-the default settings you specify in Traffic Manager or :file:`records.yaml`
+the default settings you specify in :file:`records.yaml`
described above.
.. _admin-logging-retention:
diff --git a/doc/admin-guide/monitoring/alarms.en.rst
b/doc/admin-guide/monitoring/alarms.en.rst
deleted file mode 100644
index 08c1422f9d..0000000000
--- a/doc/admin-guide/monitoring/alarms.en.rst
+++ /dev/null
@@ -1,36 +0,0 @@
-.. Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
-.. include:: ../../common.defs
-
-.. _admin-monitoring-alarms:
-
-Traffic Manager Alarms
-**********************
-
-|TS| signals an alarm when it detects a problem. For example, the space
-allocated to event logs could be full or |TS| may not be able to write to a
-configuration file.
-
-Using a Script File for Alarms
-------------------------------
-
-Alarm messages are built into Traffic Server and cannot be changed.
-However, you can write a script file to execute certain actions when an
-alarm is signaled. Traffic Server provides a sample script file named
-``example_alarm_bin.sh`` in the ``bin`` directory which can serve as the
-basis for your custom alarm scripts.
diff --git a/doc/admin-guide/monitoring/error-messages.en.rst
b/doc/admin-guide/monitoring/error-messages.en.rst
index 0912a1a80e..eb472272fb 100644
--- a/doc/admin-guide/monitoring/error-messages.en.rst
+++ b/doc/admin-guide/monitoring/error-messages.en.rst
@@ -75,49 +75,6 @@ Process Warnings
disks; Traffic Server is running in proxy-only mode. You must add
the disks you want to use for the cache to :file:`storage.config`.
-Alarm Messages
-==============
-
-``[ConfigManager::ConfigManager] Config file is read-only: <filename>``
- Go to the Traffic Server ``config`` directory and check the
- indicated file permissions; change if necessary.
-
-``[ConfigManager::ConfigManager] Unable to read or write config file
<filename>``
- Go to the Traffic Server ``config`` directory and make sure the
- indicated file exists. Check permissions and modify if necessary.
-
-``[Traffic Manager] Configuration File Update Failed: <error number>``
- Go to the Traffic Server ``config`` directory and check the
- indicated file permissions; change if necessary.
-
-``[Traffic Manager] Mgmt <==>Proxy conn. closed``
- An informational message to inform you that the :program:`traffic_server`
- process is down.
-
-``Access logging suspended - configured space allocation exhausted.``
- The space allocated to the event log files is full; you must either
- increase the space or delete some log files so that access logging
- to continue. To prevent this error, consider rolling log files more
- frequently and enabling the autodelete feature.
-
-``Access logging suspended - no more space on the logging partition.``
- The entire partition containing the event logs is full; you must
- delete or move some log files to enable access logging to continue.
- To prevent this error, consider rolling log files more frequently
- and enabling the autodelete feature.
-
-``Created zero length place holder for config file <filename>``
- Go to the Traffic Server ``config`` directory and check the
- indicated file. If it is indeed zero in length, then use a backup
- copy of the configuration file.
-
-``Traffic Server could not open logfile <filename>``
- Check permissions for the indicated file and the logging directory.
-
-``Traffic Server failed to parse line <line number> of the logging config file
<filename>``
- Check your custom log configuration file; there could be syntax
- errors. Refer to :ref:`admin-logging-fields` for correct custom log format
fields.
-
.. _body-factory:
HTML Messages Sent to Clients
diff --git a/doc/admin-guide/monitoring/index.en.rst
b/doc/admin-guide/monitoring/index.en.rst
index 913e27f8cf..af06c3435e 100644
--- a/doc/admin-guide/monitoring/index.en.rst
+++ b/doc/admin-guide/monitoring/index.en.rst
@@ -25,7 +25,6 @@ Monitoring
.. toctree::
:maxdepth: 3
- alarms.en
statistics/index.en
monitoring/index.en
error-messages.en
diff --git a/doc/developer-guide/api/functions/TSDebug.en.rst
b/doc/developer-guide/api/functions/TSDebug.en.rst
index 9a458bfd0d..6be89c2590 100644
--- a/doc/developer-guide/api/functions/TSDebug.en.rst
+++ b/doc/developer-guide/api/functions/TSDebug.en.rst
@@ -59,19 +59,19 @@ diags.log
=========
The following methods print to diags.log with expected reactions as a
coordinated outcome of
-Traffic Server, Traffic Manager, AuTest, CI, and your log monitoring
service/dashboard (e.g. Splunk)
+Traffic Server, AuTest, CI, and your log monitoring service/dashboard (e.g.
Splunk)
.. csv-table::
- :header: "API", "Purpose", "TrafficManager", "AuTest+CI", "LogMonitor"
- :widths: 15, 20, 10, 10, 10
+ :header: "API", "Purpose", "AuTest+CI", "LogMonitor"
+ :widths: 15, 20, 10, 10
":func:`TSStatus`","basic information"
":func:`TSNote`","significant information"
- ":func:`TSWarning`","concerning information","","","track"
- ":func:`TSError`","operational failure","","FAIL","review"
- ":func:`TSFatal`","recoverable crash","restart","FAIL","review"
- ":func:`TSAlert`","significant crash","restart","FAIL","ALERT"
- ":func:`TSEmergency`","unrecoverable,misconfigured","EXIT","FAIL","ALERT"
+ ":func:`TSWarning`","concerning information","","track"
+ ":func:`TSError`","operational failure","FAIL","review"
+ ":func:`TSFatal`","recoverable crash","FAIL","review"
+ ":func:`TSAlert`","significant crash","FAIL","ALERT"
+ ":func:`TSEmergency`","unrecoverable,misconfigured","FAIL","ALERT"
.. note::
:func:`TSFatal`, :func:`TSAlert`, and :func:`TSEmergency` can be called
within
diff --git a/doc/locale/ja/LC_MESSAGES/admin-guide/monitoring/alarms.en.po
b/doc/locale/ja/LC_MESSAGES/admin-guide/monitoring/alarms.en.po
deleted file mode 100644
index a879e2938a..0000000000
--- a/doc/locale/ja/LC_MESSAGES/admin-guide/monitoring/alarms.en.po
+++ /dev/null
@@ -1,135 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Apache Traffic Server 6.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-30 14:07+0900\n"
-"PO-Revision-Date: 2016-01-11 17:21+0900\n"
-"Last-Translator: Hiroaki Nakamura <[email protected]>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.2.0\n"
-
-#: ../../../admin-guide/monitoring/alarms.en.rst:23
-msgid "Traffic Manager Alarms"
-msgstr "Traffic Manager アラーム"
-
-#: ../../../admin-guide/monitoring/alarms.en.rst:25
-msgid ""
-"|TS| signals an alarm when it detects a problem. For example, the space "
-"allocated to event logs could be full or |TS| may not be able to write to a "
-"configuration file."
-msgstr ""
-"|TS| は問題を検出するとアラームを発します。例えば、イベントログに割り当てた"
-"スペースに空きがないときや Traffic Server が設定ファイルに書き込めないときで"
-"す。"
-
-#: ../../../admin-guide/monitoring/alarms.en.rst:30
-msgid "Email Alarms"
-msgstr "E メールアラーム"
-
-#: ../../../admin-guide/monitoring/alarms.en.rst:32
-msgid ""
-"To configure |TS| to send an email to a specific address whenever an alarm "
-"occurs, follow the steps below:"
-msgstr ""
-"アラームが発生したときに |TS| が指定したアドレスに E メールを送信するように"
-"設定するには、以下の手順に従ってください。"
-
-#: ../../../admin-guide/monitoring/alarms.en.rst:40
-msgid ""
-"Run the command :option:`traffic_ctl config reload` to apply the "
-"configuration changes."
-msgstr ""
-"設定の変更を反映するにはコマンド :option:`traffic_ctl config reload` を実行"
-"してください。"
-
-#: ../../../admin-guide/monitoring/alarms.en.rst:43
-msgid "Using a Script File for Alarms"
-msgstr "アラームにスクリプトファイルを使用する"
-
-#: ../../../admin-guide/monitoring/alarms.en.rst:45
-msgid ""
-"Alarm messages are built into Traffic Server and cannot be changed. "
-"However, you can write a script file to execute certain actions when an "
-"alarm is signaled. Traffic Server provides a sample script file named "
-"``example_alarm_bin.sh`` in the ``bin`` directory which can serve as the "
-"basis for your custom alarm scripts."
-msgstr ""
-"アラームメッセージは Traffic Server 内に組み込まれており変更はできません。し"
-"かし、アラームが発せられたときに特定のアクションを実行するためにスクリプトを"
-"書くことは可能です。``bin`` ディレクトリにカスタムアラームスクリプトを利用す"
-"るための基礎として利用できる ``example_alarm_bin.sh`` というサンプルスクリプ"
-"トが提供されています。"
-
-#: ../../../admin-guide/monitoring/alarms.en.rst:52
-msgid "Viewing Statistics from Traffic Line"
-msgstr "Traffic Line で統計を見る"
-
-#: ../../../admin-guide/monitoring/alarms.en.rst:54
-#, fuzzy
-msgid ""
-"You can use the Traffic Line command-line interface to view statistics "
-"about Traffic Server performance and web traffic. In addition to viewing "
-"statistics, you can also configure, stop, and restart the Traffic Server "
-"system. For additional information, refer to :ref:`configure-using-traffic-"
-"line` and :program:`traffic_ctl`. You can view specific information about a "
-"Traffic Server node or cluster by specifying the variable that corresponds "
-"to the statistic you want to see."
-msgstr ""
-"Traffic Line コマンドラインインターフェースを Traffic Server のパフォーマン"
-"スや Web トラフィックの統計を見るために使用することができます。統計を見るこ"
-"とに加え、Traffic Server システムを設定、停止、起動、再起動することもできま"
-"す。追加の情報については :ref:`configure-using-traffic-line` と :program:"
-"`traffic_line` を参照してください。見たい統計に対応する変数を指定することで "
-"Traffic Server の特定のノードまたはクラスターに関する特定の情報を見ることが"
-"できます。"
-
-#: ../../../admin-guide/monitoring/alarms.en.rst:63
-msgid "To view a statistic, enter the following command:::"
-msgstr "統計を見るには次のコマンドを入力してください:::"
-
-#: ../../../admin-guide/monitoring/alarms.en.rst:67
-msgid ""
-"where ``variable`` is the variable representing the information you want to "
-"view. For a list of variables you can specify, refer to :ref:`Traffic "
-"Server Metrics <traffic-line-performance-statistics>`."
-msgstr ""
-"``variable`` の部分は見たい情報を示す変数です。指定できる変数の一覧について"
-"は :ref:`Traffic Line メトリクス <traffic-line-performance-statistics>` を参"
-"照してください。"
-
-#: ../../../admin-guide/monitoring/alarms.en.rst:71
-msgid ""
-"For example, the following command displays the document hit rate for the "
-"Traffic Server node:::"
-msgstr ""
-"例えば、次のコマンドは Traffic Server ノードのドキュメントヒット率を表示しま"
-"す。"
-
-#: ../../../admin-guide/monitoring/alarms.en.rst:76
-msgid ""
-"If the Traffic Server ``bin`` directory is not in your path, then prepend "
-"the Traffic Line command with ``./`` (for example: :option:`traffic_ctl "
-"metric get` ``VARIABLE``)."
-msgstr ""
-"Traffic Server ``bin`` ディレクトリが path に無い場合は、``./`` を Traffic "
-"Line コマンドの前に付けてください ( 例: :option:`traffic_ctl metric get` "
-"``VARIABLE``) 。"
diff --git
a/doc/locale/ja/LC_MESSAGES/admin-guide/monitoring/error-messages.en.po
b/doc/locale/ja/LC_MESSAGES/admin-guide/monitoring/error-messages.en.po
index 91e7e23bd1..21ba98325e 100644
--- a/doc/locale/ja/LC_MESSAGES/admin-guide/monitoring/error-messages.en.po
+++ b/doc/locale/ja/LC_MESSAGES/admin-guide/monitoring/error-messages.en.po
@@ -210,13 +210,6 @@ msgstr ""
"Traffic Server の ``config`` ディレクトリで指示されたファイルが存在すること"
"を確認してください。パーミッションを確認し、必要であれば変更してください"
-#: ../../../admin-guide/monitoring/error-messages.en.rst:100
-msgid "``[Traffic Manager] Configuration File Update Failed: <error number>``"
-msgstr ""
-
-#: ../../../admin-guide/monitoring/error-messages.en.rst:104
-msgid "``[Traffic Manager] Mgmt <==>Proxy conn. closed``"
-msgstr ""
#: ../../../admin-guide/monitoring/error-messages.en.rst:103
msgid ""
diff --git a/include/ts/experimental.h b/include/ts/experimental.h
index ade7ccee53..cf0b913ea1 100644
--- a/include/ts/experimental.h
+++ b/include/ts/experimental.h
@@ -230,7 +230,7 @@ tsapi TSReturnCode TSIpStringToAddr(const char *str, size_t
str_len, struct sock
/**
Attempt to attach the contp continuation to sockets that have already been
- opened by the traffic manager and defined as belonging to plugins (based on
+ opened by the traffic Server and defined as belonging to plugins (based on
records.yaml configuration). If a connection is successfully accepted,
the TS_EVENT_NET_ACCEPT is delivered to the continuation. The event
data will be a valid TSVConn bound to the accepted connection.
diff --git a/mgmt/api/include/mgmtapi.h b/mgmt/api/include/mgmtapi.h
index 99406a2e91..d30cc518c8 100644
--- a/mgmt/api/include/mgmtapi.h
+++ b/mgmt/api/include/mgmtapi.h
@@ -98,8 +98,8 @@ typedef TSHandle TSIntList; /* contains int* 's */
/*--- basic control operations --------------------------------------------*/
typedef enum {
- TS_ACTION_SHUTDOWN, /* change requires user to stop then start the
Traffic Server and Manager */
- TS_ACTION_RESTART, /* change requires restart Traffic Server and Traffic
Manager */
+ TS_ACTION_SHUTDOWN, /* change requires user to stop then start the
Traffic Server */
+ TS_ACTION_RESTART, /* change requires restart Traffic Server */
TS_ACTION_DYNAMIC, /* change is already made in function call */
TS_ACTION_RECONFIGURE, /* change requires TS to reread configuration files */
TS_ACTION_UNDEFINED
