Created
August 28, 2019 19:06
-
-
Save bmorelli25/1386f5666494e5b1a6624971ac39e7d3 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| html/en/apm/server/6.0/configuring.html | |
| html/en/apm/server/6.0/error-api.html | |
| html/en/apm/server/6.0/exported-fields-apm-error.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.0/exported-fields-apm-error.html | |
| @@ -279,7 +279,7 @@ | |
| Error-specific data for APM | |
| </p> | |
| <h3> | |
| - <a id="_literal_view_errors_literal"> | |
| + <a id="_view_errors"> | |
| </a> | |
| <code class="literal"> | |
| view errors | |
| @@ -295,7 +295,7 @@ | |
| format: url | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_id_icon_literal"> | |
| + <a id="_error_id_icon"> | |
| </a> | |
| <code class="literal"> | |
| error id icon | |
| @@ -311,7 +311,7 @@ | |
| format: url | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_id_literal"> | |
| + <a id="_error_id"> | |
| </a> | |
| <code class="literal"> | |
| error.id | |
| @@ -327,7 +327,7 @@ | |
| A UUID4 error ID. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_culprit_literal"> | |
| + <a id="_error_culprit"> | |
| </a> | |
| <code class="literal"> | |
| error.culprit | |
| @@ -343,7 +343,7 @@ | |
| Function call which was the primary perpetrator of this event. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_grouping_key_literal"> | |
| + <a id="_error_grouping_key"> | |
| </a> | |
| <code class="literal"> | |
| error.grouping_key | |
| @@ -373,7 +373,7 @@ | |
| Information about the originally thrown error. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_exception_code_literal"> | |
| + <a id="_error_exception_code"> | |
| </a> | |
| <code class="literal"> | |
| error.exception.code | |
| @@ -389,7 +389,7 @@ | |
| The error code set when the error happened, e.g. database error code. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_exception_message_literal"> | |
| + <a id="_error_exception_message"> | |
| </a> | |
| <code class="literal"> | |
| error.exception.message | |
| @@ -405,7 +405,7 @@ | |
| The original error message. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_exception_module_literal"> | |
| + <a id="_error_exception_module"> | |
| </a> | |
| <code class="literal"> | |
| error.exception.module | |
| @@ -421,7 +421,7 @@ | |
| The module namespace of the original error. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_exception_type_literal"> | |
| + <a id="_error_exception_type"> | |
| </a> | |
| <code class="literal"> | |
| error.exception.type | |
| @@ -434,7 +434,7 @@ | |
| type: keyword | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_exception_uncaught_literal"> | |
| + <a id="_error_exception_uncaught"> | |
| </a> | |
| <code class="literal"> | |
| error.exception.uncaught | |
| @@ -461,7 +461,7 @@ | |
| Additional information added by logging the error. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_log_level_literal"> | |
| + <a id="_error_log_level"> | |
| </a> | |
| <code class="literal"> | |
| error.log.level | |
| @@ -477,7 +477,7 @@ | |
| The severity of the record. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_log_logger_name_literal"> | |
| + <a id="_error_log_logger_name"> | |
| </a> | |
| <code class="literal"> | |
| error.log.logger_name | |
| @@ -493,7 +493,7 @@ | |
| The name of the used logger instance. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_log_message_literal"> | |
| + <a id="_error_log_message"> | |
| </a> | |
| <code class="literal"> | |
| error.log.message | |
| @@ -509,7 +509,7 @@ | |
| The additionally logged error message. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_log_param_message_literal"> | |
| + <a id="_error_log_param_message"> | |
| </a> | |
| <code class="literal"> | |
| error.log.param_message | |
| html/en/apm/server/6.0/exported-fields-apm-trace.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.0/exported-fields-apm-trace.html | |
| @@ -279,7 +279,7 @@ | |
| Trace-specific data for APM. | |
| </p> | |
| <h3> | |
| - <a id="_literal_view_traces_literal"> | |
| + <a id="_view_traces"> | |
| </a> | |
| <code class="literal"> | |
| view traces | |
| @@ -292,7 +292,7 @@ | |
| format: url | |
| </p> | |
| <h3> | |
| - <a id="_literal_trace_id_literal"> | |
| + <a id="_trace_id"> | |
| </a> | |
| <code class="literal"> | |
| trace.id | |
| @@ -308,7 +308,7 @@ | |
| A locally unique ID of the trace. | |
| </p> | |
| <h3> | |
| - <a id="_literal_trace_transaction_id_literal"> | |
| + <a id="_trace_transaction_id"> | |
| </a> | |
| <code class="literal"> | |
| trace.transaction_id | |
| @@ -324,7 +324,7 @@ | |
| Reference to the transaction this trace is part of. | |
| </p> | |
| <h3> | |
| - <a id="_literal_trace_name_literal"> | |
| + <a id="_trace_name"> | |
| </a> | |
| <code class="literal"> | |
| trace.name | |
| @@ -340,7 +340,7 @@ | |
| Generic name of the trace. | |
| </p> | |
| <h3> | |
| - <a id="_literal_trace_type_literal"> | |
| + <a id="_trace_type"> | |
| </a> | |
| <code class="literal"> | |
| trace.type | |
| @@ -367,7 +367,7 @@ | |
| None | |
| </p> | |
| <h3> | |
| - <a id="_literal_trace_start_us_literal"> | |
| + <a id="_trace_start_us"> | |
| </a> | |
| <code class="literal"> | |
| trace.start.us | |
| @@ -394,7 +394,7 @@ | |
| None | |
| </p> | |
| <h3> | |
| - <a id="_literal_trace_duration_us_literal"> | |
| + <a id="_trace_duration_us"> | |
| </a> | |
| <code class="literal"> | |
| trace.duration.us | |
| @@ -413,7 +413,7 @@ | |
| Duration of the trace, in microseconds. | |
| </p> | |
| <h3> | |
| - <a id="_literal_trace_parent_literal"> | |
| + <a id="_trace_parent"> | |
| </a> | |
| <code class="literal"> | |
| trace.parent | |
| html/en/apm/server/6.0/exported-fields-apm-transaction.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.0/exported-fields-apm-transaction.html | |
| @@ -279,7 +279,7 @@ | |
| Transaction-specific data for APM | |
| </p> | |
| <h3> | |
| - <a id="_literal_transaction_id_literal"> | |
| + <a id="_transaction_id"> | |
| </a> | |
| <code class="literal"> | |
| transaction.id | |
| @@ -298,7 +298,7 @@ | |
| A UUID4 transaction ID. | |
| </p> | |
| <h3> | |
| - <a id="_literal_transaction_name_literal"> | |
| + <a id="_transaction_name"> | |
| </a> | |
| <code class="literal"> | |
| transaction.name | |
| @@ -314,7 +314,7 @@ | |
| Name of the transaction. This is usually a generic path to the controller/endpoint that handled the transaction. TODO: investigate use of "path_hierarchy" tokenizer | |
| </p> | |
| <h3> | |
| - <a id="_literal_transaction_name_keyword_literal"> | |
| + <a id="_transaction_name_keyword"> | |
| </a> | |
| <code class="literal"> | |
| transaction.name.keyword | |
| @@ -327,7 +327,7 @@ | |
| type: keyword | |
| </p> | |
| <h3> | |
| - <a id="_literal_transaction_type_literal"> | |
| + <a id="_transaction_type"> | |
| </a> | |
| <code class="literal"> | |
| transaction.type | |
| @@ -354,7 +354,7 @@ | |
| None | |
| </p> | |
| <h3> | |
| - <a id="_literal_transaction_duration_us_literal"> | |
| + <a id="_transaction_duration_us"> | |
| </a> | |
| <code class="literal"> | |
| transaction.duration.us | |
| @@ -373,7 +373,7 @@ | |
| Total duration of this transaction, in microseconds. | |
| </p> | |
| <h3> | |
| - <a id="_literal_transaction_result_literal"> | |
| + <a id="_transaction_result"> | |
| </a> | |
| <code class="literal"> | |
| transaction.result | |
| html/en/apm/server/6.0/exported-fields-apm.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.0/exported-fields-apm.html | |
| @@ -279,7 +279,7 @@ | |
| None | |
| </p> | |
| <h3> | |
| - <a id="_literal_listening_literal"> | |
| + <a id="_listening"> | |
| </a> | |
| <code class="literal"> | |
| listening | |
| @@ -295,7 +295,7 @@ | |
| Address the server is listening on. | |
| </p> | |
| <h3> | |
| - <a id="_literal_processor_name_literal"> | |
| + <a id="_processor_name"> | |
| </a> | |
| <code class="literal"> | |
| processor.name | |
| @@ -311,7 +311,7 @@ | |
| Processor name. | |
| </p> | |
| <h3> | |
| - <a id="_literal_processor_event_literal"> | |
| + <a id="_processor_event"> | |
| </a> | |
| <code class="literal"> | |
| processor.event | |
| @@ -338,7 +338,7 @@ | |
| General context fields. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_tags_literal"> | |
| + <a id="_context_tags"> | |
| </a> | |
| <code class="literal"> | |
| context.tags | |
| @@ -354,7 +354,7 @@ | |
| Flat mapping of user-defined tags. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_user_username_literal"> | |
| + <a id="_context_user_username"> | |
| </a> | |
| <code class="literal"> | |
| context.user.username | |
| @@ -370,7 +370,7 @@ | |
| The username of the user who experienced this event. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_user_id_literal"> | |
| + <a id="_context_user_id"> | |
| </a> | |
| <code class="literal"> | |
| context.user.id | |
| @@ -386,7 +386,7 @@ | |
| Identifier of the user who experienced this event. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_user_email_literal"> | |
| + <a id="_context_user_email"> | |
| </a> | |
| <code class="literal"> | |
| context.user.email | |
| @@ -413,7 +413,7 @@ | |
| The http URL of the request leading to this event. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_request_url_raw_literal"> | |
| + <a id="_context_request_url_raw"> | |
| </a> | |
| <code class="literal"> | |
| context.request.url.raw | |
| @@ -433,7 +433,7 @@ | |
| . | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_request_url_protocol_literal"> | |
| + <a id="_context_request_url_protocol"> | |
| </a> | |
| <code class="literal"> | |
| context.request.url.protocol | |
| @@ -449,7 +449,7 @@ | |
| The protocol of the request, e.g. "https:". | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_request_url_hostname_literal"> | |
| + <a id="_context_request_url_hostname"> | |
| </a> | |
| <code class="literal"> | |
| context.request.url.hostname | |
| @@ -465,7 +465,7 @@ | |
| The hostname of the request, e.g. "example.com". | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_request_url_port_literal"> | |
| + <a id="_context_request_url_port"> | |
| </a> | |
| <code class="literal"> | |
| context.request.url.port | |
| @@ -481,7 +481,7 @@ | |
| The port of the request, e.g. 443. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_request_url_pathname_literal"> | |
| + <a id="_context_request_url_pathname"> | |
| </a> | |
| <code class="literal"> | |
| context.request.url.pathname | |
| @@ -497,7 +497,7 @@ | |
| The path of the request, e.g. "/search". | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_request_url_search_literal"> | |
| + <a id="_context_request_url_search"> | |
| </a> | |
| <code class="literal"> | |
| context.request.url.search | |
| @@ -513,7 +513,7 @@ | |
| The search describes the query string of the request, e.g. "q=elasticsearch". | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_request_url_hash_literal"> | |
| + <a id="_context_request_url_hash"> | |
| </a> | |
| <code class="literal"> | |
| context.request.url.hash | |
| @@ -529,7 +529,7 @@ | |
| The hash of the request URL, e.g. "top". | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_request_http_version_literal"> | |
| + <a id="_context_request_http_version"> | |
| </a> | |
| <code class="literal"> | |
| context.request.http_version | |
| @@ -545,7 +545,7 @@ | |
| The http version of the request leading to this event. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_request_method_literal"> | |
| + <a id="_context_request_method"> | |
| </a> | |
| <code class="literal"> | |
| context.request.method | |
| @@ -561,7 +561,7 @@ | |
| The http method of the request leading to this event. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_response_status_code_literal"> | |
| + <a id="_context_response_status_code"> | |
| </a> | |
| <code class="literal"> | |
| context.response.status_code | |
| @@ -577,7 +577,7 @@ | |
| Http response status code. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_response_finished_literal"> | |
| + <a id="_context_response_finished"> | |
| </a> | |
| <code class="literal"> | |
| context.response.finished | |
| @@ -601,7 +601,7 @@ | |
| Optional system fields. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_system_hostname_literal"> | |
| + <a id="_context_system_hostname"> | |
| </a> | |
| <code class="literal"> | |
| context.system.hostname | |
| @@ -617,7 +617,7 @@ | |
| The host that records the event. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_system_architecture_literal"> | |
| + <a id="_context_system_architecture"> | |
| </a> | |
| <code class="literal"> | |
| context.system.architecture | |
| @@ -633,7 +633,7 @@ | |
| The architecture of the host that records the event. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_system_platform_literal"> | |
| + <a id="_context_system_platform"> | |
| </a> | |
| <code class="literal"> | |
| context.system.platform | |
| @@ -660,7 +660,7 @@ | |
| App fields. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_app_name_literal"> | |
| + <a id="_context_app_name"> | |
| </a> | |
| <code class="literal"> | |
| context.app.name | |
| @@ -679,7 +679,7 @@ | |
| Unique App name. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_app_version_literal"> | |
| + <a id="_context_app_version"> | |
| </a> | |
| <code class="literal"> | |
| context.app.version | |
| @@ -695,7 +695,7 @@ | |
| App version. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_app_pid_literal"> | |
| + <a id="_context_app_pid"> | |
| </a> | |
| <code class="literal"> | |
| context.app.pid | |
| @@ -711,7 +711,7 @@ | |
| Numeric process ID of the app process. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_app_process_title_literal"> | |
| + <a id="_context_app_process_title"> | |
| </a> | |
| <code class="literal"> | |
| context.app.process_title | |
| @@ -727,7 +727,7 @@ | |
| App process_title. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_app_language_name_literal"> | |
| + <a id="_context_app_language_name"> | |
| </a> | |
| <code class="literal"> | |
| context.app.language.name | |
| @@ -743,7 +743,7 @@ | |
| Language name. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_app_language_version_literal"> | |
| + <a id="_context_app_language_version"> | |
| </a> | |
| <code class="literal"> | |
| context.app.language.version | |
| @@ -759,7 +759,7 @@ | |
| Language version. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_app_runtime_name_literal"> | |
| + <a id="_context_app_runtime_name"> | |
| </a> | |
| <code class="literal"> | |
| context.app.runtime.name | |
| @@ -775,7 +775,7 @@ | |
| Runtime name. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_app_runtime_version_literal"> | |
| + <a id="_context_app_runtime_version"> | |
| </a> | |
| <code class="literal"> | |
| context.app.runtime.version | |
| @@ -791,7 +791,7 @@ | |
| Runtime version. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_app_framework_name_literal"> | |
| + <a id="_context_app_framework_name"> | |
| </a> | |
| <code class="literal"> | |
| context.app.framework.name | |
| @@ -807,7 +807,7 @@ | |
| Framework name. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_app_framework_version_literal"> | |
| + <a id="_context_app_framework_version"> | |
| </a> | |
| <code class="literal"> | |
| context.app.framework.version | |
| @@ -823,7 +823,7 @@ | |
| Framework version. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_app_agent_name_literal"> | |
| + <a id="_context_app_agent_name"> | |
| </a> | |
| <code class="literal"> | |
| context.app.agent.name | |
| @@ -839,7 +839,7 @@ | |
| Agent name. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_app_agent_version_literal"> | |
| + <a id="_context_app_agent_version"> | |
| </a> | |
| <code class="literal"> | |
| context.app.agent.version | |
| html/en/apm/server/6.0/exported-fields-beat.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.0/exported-fields-beat.html | |
| @@ -279,7 +279,7 @@ | |
| Contains common beat fields available in all event types. | |
| </p> | |
| <h3> | |
| - <a id="_literal_beat_name_literal"> | |
| + <a id="_beat_name"> | |
| </a> | |
| <code class="literal"> | |
| beat.name | |
| @@ -296,7 +296,7 @@ | |
| option in the configuration file. | |
| </p> | |
| <h3> | |
| - <a id="_literal_beat_hostname_literal"> | |
| + <a id="_beat_hostname"> | |
| </a> | |
| <code class="literal"> | |
| beat.hostname | |
| @@ -309,7 +309,7 @@ | |
| The hostname as returned by the operating system on which the Beat is running. | |
| </p> | |
| <h3> | |
| - <a id="_literal_beat_timezone_literal"> | |
| + <a id="_beat_timezone"> | |
| </a> | |
| <code class="literal"> | |
| beat.timezone | |
| @@ -322,7 +322,7 @@ | |
| The timezone as returned by the operating system on which the Beat is running. | |
| </p> | |
| <h3> | |
| - <a id="_literal_beat_version_literal"> | |
| + <a id="_beat_version"> | |
| </a> | |
| <code class="literal"> | |
| beat.version | |
| @@ -335,7 +335,7 @@ | |
| The version of the beat that generated this event. | |
| </p> | |
| <h3> | |
| - <a id="_literal_timestamp_literal"> | |
| + <a id="_timestamp"> | |
| </a> | |
| <code class="literal"> | |
| @timestamp | |
| @@ -360,7 +360,7 @@ | |
| The timestamp when the event log record was generated. | |
| </p> | |
| <h3> | |
| - <a id="_literal_tags_literal"> | |
| + <a id="_tags"> | |
| </a> | |
| <code class="literal"> | |
| tags | |
| @@ -373,7 +373,7 @@ | |
| Arbitrary tags that can be set per Beat and per transaction type. | |
| </p> | |
| <h3> | |
| - <a id="_literal_fields_literal"> | |
| + <a id="_fields"> | |
| </a> | |
| <code class="literal"> | |
| fields | |
| @@ -400,7 +400,7 @@ | |
| Error fields containing additional info in case of errors. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_message_literal"> | |
| + <a id="_error_message"> | |
| </a> | |
| <code class="literal"> | |
| error.message | |
| @@ -416,7 +416,7 @@ | |
| Error message. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_code_literal"> | |
| + <a id="_error_code"> | |
| </a> | |
| <code class="literal"> | |
| error.code | |
| @@ -432,7 +432,7 @@ | |
| Error code. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_type_literal"> | |
| + <a id="_error_type"> | |
| </a> | |
| <code class="literal"> | |
| error.type | |
| html/en/apm/server/6.0/exported-fields-cloud.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.0/exported-fields-cloud.html | |
| @@ -279,7 +279,7 @@ | |
| Metadata from cloud providers added by the add_cloud_metadata processor. | |
| </p> | |
| <h3> | |
| - <a id="_literal_meta_cloud_provider_literal"> | |
| + <a id="_meta_cloud_provider"> | |
| </a> | |
| <code class="literal"> | |
| meta.cloud.provider | |
| @@ -295,7 +295,7 @@ | |
| Name of the cloud provider. Possible values are ec2, gce, or digitalocean. | |
| </p> | |
| <h3> | |
| - <a id="_literal_meta_cloud_instance_id_literal"> | |
| + <a id="_meta_cloud_instance_id"> | |
| </a> | |
| <code class="literal"> | |
| meta.cloud.instance_id | |
| @@ -308,7 +308,7 @@ | |
| Instance ID of the host machine. | |
| </p> | |
| <h3> | |
| - <a id="_literal_meta_cloud_instance_name_literal"> | |
| + <a id="_meta_cloud_instance_name"> | |
| </a> | |
| <code class="literal"> | |
| meta.cloud.instance_name | |
| @@ -321,7 +321,7 @@ | |
| Instance name of the host machine. | |
| </p> | |
| <h3> | |
| - <a id="_literal_meta_cloud_machine_type_literal"> | |
| + <a id="_meta_cloud_machine_type"> | |
| </a> | |
| <code class="literal"> | |
| meta.cloud.machine_type | |
| @@ -337,7 +337,7 @@ | |
| Machine type of the host machine. | |
| </p> | |
| <h3> | |
| - <a id="_literal_meta_cloud_availability_zone_literal"> | |
| + <a id="_meta_cloud_availability_zone"> | |
| </a> | |
| <code class="literal"> | |
| meta.cloud.availability_zone | |
| @@ -353,7 +353,7 @@ | |
| Availability zone in which this host is running. | |
| </p> | |
| <h3> | |
| - <a id="_literal_meta_cloud_project_id_literal"> | |
| + <a id="_meta_cloud_project_id"> | |
| </a> | |
| <code class="literal"> | |
| meta.cloud.project_id | |
| @@ -369,7 +369,7 @@ | |
| Name of the project in Google Cloud. | |
| </p> | |
| <h3> | |
| - <a id="_literal_meta_cloud_region_literal"> | |
| + <a id="_meta_cloud_region"> | |
| </a> | |
| <code class="literal"> | |
| meta.cloud.region | |
| html/en/apm/server/6.0/exported-fields-docker-processor.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.0/exported-fields-docker-processor.html | |
| @@ -289,7 +289,7 @@ | |
| Docker stats collected from Docker. | |
| </p> | |
| <h3> | |
| - <a id="_literal_docker_container_id_literal"> | |
| + <a id="_docker_container_id"> | |
| </a> | |
| <code class="literal"> | |
| docker.container.id | |
| @@ -305,7 +305,7 @@ | |
| Unique container id. | |
| </p> | |
| <h3> | |
| - <a id="_literal_docker_container_image_literal"> | |
| + <a id="_docker_container_image"> | |
| </a> | |
| <code class="literal"> | |
| docker.container.image | |
| @@ -321,7 +321,7 @@ | |
| Name of the image the container was built on. | |
| </p> | |
| <h3> | |
| - <a id="_literal_docker_container_name_literal"> | |
| + <a id="_docker_container_name"> | |
| </a> | |
| <code class="literal"> | |
| docker.container.name | |
| @@ -337,7 +337,7 @@ | |
| Container name. | |
| </p> | |
| <h3> | |
| - <a id="_literal_docker_container_labels_literal"> | |
| + <a id="_docker_container_labels"> | |
| </a> | |
| <code class="literal"> | |
| docker.container.labels | |
| html/en/apm/server/6.0/exported-fields-kubernetes-processor.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.0/exported-fields-kubernetes-processor.html | |
| @@ -285,7 +285,7 @@ | |
| Kubernetes metadata added by the kubernetes processor | |
| </p> | |
| <h3> | |
| - <a id="_literal_kubernetes_pod_name_literal"> | |
| + <a id="_kubernetes_pod_name"> | |
| </a> | |
| <code class="literal"> | |
| kubernetes.pod.name | |
| @@ -301,7 +301,7 @@ | |
| Kubernetes pod name | |
| </p> | |
| <h3> | |
| - <a id="_literal_kubernetes_namespace_literal"> | |
| + <a id="_kubernetes_namespace"> | |
| </a> | |
| <code class="literal"> | |
| kubernetes.namespace | |
| @@ -317,7 +317,7 @@ | |
| Kubernetes namespace | |
| </p> | |
| <h3> | |
| - <a id="_literal_kubernetes_labels_literal"> | |
| + <a id="_kubernetes_labels"> | |
| </a> | |
| <code class="literal"> | |
| kubernetes.labels | |
| @@ -333,7 +333,7 @@ | |
| Kubernetes labels map | |
| </p> | |
| <h3> | |
| - <a id="_literal_kubernetes_annotations_literal"> | |
| + <a id="_kubernetes_annotations"> | |
| </a> | |
| <code class="literal"> | |
| kubernetes.annotations | |
| @@ -349,7 +349,7 @@ | |
| Kubernetes annotations map | |
| </p> | |
| <h3> | |
| - <a id="_literal_kubernetes_container_name_literal"> | |
| + <a id="_kubernetes_container_name"> | |
| </a> | |
| <code class="literal"> | |
| kubernetes.container.name | |
| @@ -365,7 +365,7 @@ | |
| Kubernetes container name | |
| </p> | |
| <h3> | |
| - <a id="_literal_kubernetes_container_image_literal"> | |
| + <a id="_kubernetes_container_image"> | |
| </a> | |
| <code class="literal"> | |
| kubernetes.container.image | |
| html/en/apm/server/6.0/exported-fields.html | |
| html/en/apm/server/6.0/generated-docs.html | |
| html/en/apm/server/6.0/index.html | |
| html/en/apm/server/6.0/installing.html | |
| html/en/apm/server/6.0/overview.html | |
| html/en/apm/server/6.0/running-on-docker.html | |
| html/en/apm/server/6.0/setup-repositories.html | |
| html/en/apm/server/6.0/toc.html | |
| html/en/apm/server/6.0/transaction-api.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.0/transaction-api.html | |
| @@ -422,8 +422,8 @@ | |
| "maxLength": 1024 | |
| }, | |
| "result": { | |
| - "type": "string", | |
| - "description": "The result of the transaction. HTTP status code for HTTP-related transactions.", | |
| + "type": "string", | |
| + "description": "The result of the transaction. HTTP status code for HTTP-related transactions.", | |
| "maxLength": 1024 | |
| }, | |
| "timestamp": { | |
| html/en/apm/server/6.1/configuring.html | |
| html/en/apm/server/6.1/error-api.html | |
| html/en/apm/server/6.1/exported-fields-apm-error.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.1/exported-fields-apm-error.html | |
| @@ -279,7 +279,7 @@ | |
| Error-specific data for APM | |
| </p> | |
| <h3> | |
| - <a id="_literal_view_errors_literal"> | |
| + <a id="_view_errors"> | |
| </a> | |
| <code class="literal"> | |
| view errors | |
| @@ -295,7 +295,7 @@ | |
| format: url | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_id_icon_literal"> | |
| + <a id="_error_id_icon"> | |
| </a> | |
| <code class="literal"> | |
| error id icon | |
| @@ -311,7 +311,7 @@ | |
| format: url | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_id_literal"> | |
| + <a id="_error_id"> | |
| </a> | |
| <code class="literal"> | |
| error.id | |
| @@ -327,7 +327,7 @@ | |
| A UUID4 error ID. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_culprit_literal"> | |
| + <a id="_error_culprit"> | |
| </a> | |
| <code class="literal"> | |
| error.culprit | |
| @@ -343,7 +343,7 @@ | |
| Function call which was the primary perpetrator of this event. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_grouping_key_literal"> | |
| + <a id="_error_grouping_key"> | |
| </a> | |
| <code class="literal"> | |
| error.grouping_key | |
| @@ -373,7 +373,7 @@ | |
| Information about the originally thrown error. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_exception_code_literal"> | |
| + <a id="_error_exception_code"> | |
| </a> | |
| <code class="literal"> | |
| error.exception.code | |
| @@ -389,7 +389,7 @@ | |
| The error code set when the error happened, e.g. database error code. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_exception_message_literal"> | |
| + <a id="_error_exception_message"> | |
| </a> | |
| <code class="literal"> | |
| error.exception.message | |
| @@ -405,7 +405,7 @@ | |
| The original error message. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_exception_module_literal"> | |
| + <a id="_error_exception_module"> | |
| </a> | |
| <code class="literal"> | |
| error.exception.module | |
| @@ -421,7 +421,7 @@ | |
| The module namespace of the original error. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_exception_type_literal"> | |
| + <a id="_error_exception_type"> | |
| </a> | |
| <code class="literal"> | |
| error.exception.type | |
| @@ -434,7 +434,7 @@ | |
| type: keyword | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_exception_uncaught_literal"> | |
| + <a id="_error_exception_uncaught"> | |
| </a> | |
| <code class="literal"> | |
| error.exception.uncaught | |
| @@ -461,7 +461,7 @@ | |
| Additional information added by logging the error. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_log_level_literal"> | |
| + <a id="_error_log_level"> | |
| </a> | |
| <code class="literal"> | |
| error.log.level | |
| @@ -477,7 +477,7 @@ | |
| The severity of the record. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_log_logger_name_literal"> | |
| + <a id="_error_log_logger_name"> | |
| </a> | |
| <code class="literal"> | |
| error.log.logger_name | |
| @@ -493,7 +493,7 @@ | |
| The name of the used logger instance. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_log_message_literal"> | |
| + <a id="_error_log_message"> | |
| </a> | |
| <code class="literal"> | |
| error.log.message | |
| @@ -509,7 +509,7 @@ | |
| The additionally logged error message. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_log_param_message_literal"> | |
| + <a id="_error_log_param_message"> | |
| </a> | |
| <code class="literal"> | |
| error.log.param_message | |
| html/en/apm/server/6.1/exported-fields-apm-trace.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.1/exported-fields-apm-trace.html | |
| @@ -279,7 +279,7 @@ | |
| Trace-specific data for APM. | |
| </p> | |
| <h3> | |
| - <a id="_literal_view_traces_literal"> | |
| + <a id="_view_traces"> | |
| </a> | |
| <code class="literal"> | |
| view traces | |
| @@ -292,7 +292,7 @@ | |
| format: url | |
| </p> | |
| <h3> | |
| - <a id="_literal_trace_id_literal"> | |
| + <a id="_trace_id"> | |
| </a> | |
| <code class="literal"> | |
| trace.id | |
| @@ -308,7 +308,7 @@ | |
| A locally unique ID of the trace. | |
| </p> | |
| <h3> | |
| - <a id="_literal_trace_transaction_id_literal"> | |
| + <a id="_trace_transaction_id"> | |
| </a> | |
| <code class="literal"> | |
| trace.transaction_id | |
| @@ -324,7 +324,7 @@ | |
| Reference to the transaction this trace is part of. | |
| </p> | |
| <h3> | |
| - <a id="_literal_trace_name_literal"> | |
| + <a id="_trace_name"> | |
| </a> | |
| <code class="literal"> | |
| trace.name | |
| @@ -340,7 +340,7 @@ | |
| Generic name of the trace. | |
| </p> | |
| <h3> | |
| - <a id="_literal_trace_type_literal"> | |
| + <a id="_trace_type"> | |
| </a> | |
| <code class="literal"> | |
| trace.type | |
| @@ -367,7 +367,7 @@ | |
| None | |
| </p> | |
| <h3> | |
| - <a id="_literal_trace_start_us_literal"> | |
| + <a id="_trace_start_us"> | |
| </a> | |
| <code class="literal"> | |
| trace.start.us | |
| @@ -394,7 +394,7 @@ | |
| None | |
| </p> | |
| <h3> | |
| - <a id="_literal_trace_duration_us_literal"> | |
| + <a id="_trace_duration_us"> | |
| </a> | |
| <code class="literal"> | |
| trace.duration.us | |
| @@ -413,7 +413,7 @@ | |
| Duration of the trace, in microseconds. | |
| </p> | |
| <h3> | |
| - <a id="_literal_trace_parent_literal"> | |
| + <a id="_trace_parent"> | |
| </a> | |
| <code class="literal"> | |
| trace.parent | |
| html/en/apm/server/6.1/exported-fields-apm-transaction.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.1/exported-fields-apm-transaction.html | |
| @@ -279,7 +279,7 @@ | |
| Transaction-specific data for APM | |
| </p> | |
| <h3> | |
| - <a id="_literal_transaction_id_literal"> | |
| + <a id="_transaction_id"> | |
| </a> | |
| <code class="literal"> | |
| transaction.id | |
| @@ -298,7 +298,7 @@ | |
| A UUID4 transaction ID. | |
| </p> | |
| <h3> | |
| - <a id="_literal_transaction_name_literal"> | |
| + <a id="_transaction_name"> | |
| </a> | |
| <code class="literal"> | |
| transaction.name | |
| @@ -314,7 +314,7 @@ | |
| Name of the transaction. This is usually a generic path to the controller/endpoint that handled the transaction. TODO: investigate use of "path_hierarchy" tokenizer | |
| </p> | |
| <h3> | |
| - <a id="_literal_transaction_name_keyword_literal"> | |
| + <a id="_transaction_name_keyword"> | |
| </a> | |
| <code class="literal"> | |
| transaction.name.keyword | |
| @@ -327,7 +327,7 @@ | |
| type: keyword | |
| </p> | |
| <h3> | |
| - <a id="_literal_transaction_type_literal"> | |
| + <a id="_transaction_type"> | |
| </a> | |
| <code class="literal"> | |
| transaction.type | |
| @@ -354,7 +354,7 @@ | |
| None | |
| </p> | |
| <h3> | |
| - <a id="_literal_transaction_duration_us_literal"> | |
| + <a id="_transaction_duration_us"> | |
| </a> | |
| <code class="literal"> | |
| transaction.duration.us | |
| @@ -373,7 +373,7 @@ | |
| Total duration of this transaction, in microseconds. | |
| </p> | |
| <h3> | |
| - <a id="_literal_transaction_result_literal"> | |
| + <a id="_transaction_result"> | |
| </a> | |
| <code class="literal"> | |
| transaction.result | |
| html/en/apm/server/6.1/exported-fields-apm.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.1/exported-fields-apm.html | |
| @@ -279,7 +279,7 @@ | |
| None | |
| </p> | |
| <h3> | |
| - <a id="_literal_listening_literal"> | |
| + <a id="_listening"> | |
| </a> | |
| <code class="literal"> | |
| listening | |
| @@ -295,7 +295,7 @@ | |
| Address the server is listening on. | |
| </p> | |
| <h3> | |
| - <a id="_literal_processor_name_literal"> | |
| + <a id="_processor_name"> | |
| </a> | |
| <code class="literal"> | |
| processor.name | |
| @@ -311,7 +311,7 @@ | |
| Processor name. | |
| </p> | |
| <h3> | |
| - <a id="_literal_processor_event_literal"> | |
| + <a id="_processor_event"> | |
| </a> | |
| <code class="literal"> | |
| processor.event | |
| @@ -338,7 +338,7 @@ | |
| General context fields. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_tags_literal"> | |
| + <a id="_context_tags"> | |
| </a> | |
| <code class="literal"> | |
| context.tags | |
| @@ -354,7 +354,7 @@ | |
| Flat mapping of user-defined tags. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_user_username_literal"> | |
| + <a id="_context_user_username"> | |
| </a> | |
| <code class="literal"> | |
| context.user.username | |
| @@ -370,7 +370,7 @@ | |
| The username of the user who experienced this event. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_user_id_literal"> | |
| + <a id="_context_user_id"> | |
| </a> | |
| <code class="literal"> | |
| context.user.id | |
| @@ -386,7 +386,7 @@ | |
| Identifier of the user who experienced this event. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_user_email_literal"> | |
| + <a id="_context_user_email"> | |
| </a> | |
| <code class="literal"> | |
| context.user.email | |
| @@ -413,7 +413,7 @@ | |
| The http URL of the request leading to this event. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_request_url_raw_literal"> | |
| + <a id="_context_request_url_raw"> | |
| </a> | |
| <code class="literal"> | |
| context.request.url.raw | |
| @@ -433,7 +433,7 @@ | |
| . | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_request_url_protocol_literal"> | |
| + <a id="_context_request_url_protocol"> | |
| </a> | |
| <code class="literal"> | |
| context.request.url.protocol | |
| @@ -449,7 +449,7 @@ | |
| The protocol of the request, e.g. "https:". | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_request_url_hostname_literal"> | |
| + <a id="_context_request_url_hostname"> | |
| </a> | |
| <code class="literal"> | |
| context.request.url.hostname | |
| @@ -465,7 +465,7 @@ | |
| The hostname of the request, e.g. "example.com". | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_request_url_port_literal"> | |
| + <a id="_context_request_url_port"> | |
| </a> | |
| <code class="literal"> | |
| context.request.url.port | |
| @@ -481,7 +481,7 @@ | |
| The port of the request, e.g. 443. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_request_url_pathname_literal"> | |
| + <a id="_context_request_url_pathname"> | |
| </a> | |
| <code class="literal"> | |
| context.request.url.pathname | |
| @@ -497,7 +497,7 @@ | |
| The path of the request, e.g. "/search". | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_request_url_search_literal"> | |
| + <a id="_context_request_url_search"> | |
| </a> | |
| <code class="literal"> | |
| context.request.url.search | |
| @@ -513,7 +513,7 @@ | |
| The search describes the query string of the request, e.g. "q=elasticsearch". | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_request_url_hash_literal"> | |
| + <a id="_context_request_url_hash"> | |
| </a> | |
| <code class="literal"> | |
| context.request.url.hash | |
| @@ -529,7 +529,7 @@ | |
| The hash of the request URL, e.g. "top". | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_request_http_version_literal"> | |
| + <a id="_context_request_http_version"> | |
| </a> | |
| <code class="literal"> | |
| context.request.http_version | |
| @@ -545,7 +545,7 @@ | |
| The http version of the request leading to this event. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_request_method_literal"> | |
| + <a id="_context_request_method"> | |
| </a> | |
| <code class="literal"> | |
| context.request.method | |
| @@ -561,7 +561,7 @@ | |
| The http method of the request leading to this event. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_response_status_code_literal"> | |
| + <a id="_context_response_status_code"> | |
| </a> | |
| <code class="literal"> | |
| context.response.status_code | |
| @@ -577,7 +577,7 @@ | |
| Http response status code. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_response_finished_literal"> | |
| + <a id="_context_response_finished"> | |
| </a> | |
| <code class="literal"> | |
| context.response.finished | |
| @@ -601,7 +601,7 @@ | |
| Optional system fields. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_system_hostname_literal"> | |
| + <a id="_context_system_hostname"> | |
| </a> | |
| <code class="literal"> | |
| context.system.hostname | |
| @@ -617,7 +617,7 @@ | |
| The host that records the event. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_system_architecture_literal"> | |
| + <a id="_context_system_architecture"> | |
| </a> | |
| <code class="literal"> | |
| context.system.architecture | |
| @@ -633,7 +633,7 @@ | |
| The architecture of the host that records the event. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_system_platform_literal"> | |
| + <a id="_context_system_platform"> | |
| </a> | |
| <code class="literal"> | |
| context.system.platform | |
| @@ -660,7 +660,7 @@ | |
| App fields. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_app_name_literal"> | |
| + <a id="_context_app_name"> | |
| </a> | |
| <code class="literal"> | |
| context.app.name | |
| @@ -679,7 +679,7 @@ | |
| Unique App name. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_app_version_literal"> | |
| + <a id="_context_app_version"> | |
| </a> | |
| <code class="literal"> | |
| context.app.version | |
| @@ -695,7 +695,7 @@ | |
| App version. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_app_pid_literal"> | |
| + <a id="_context_app_pid"> | |
| </a> | |
| <code class="literal"> | |
| context.app.pid | |
| @@ -711,7 +711,7 @@ | |
| Numeric process ID of the app process. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_app_process_title_literal"> | |
| + <a id="_context_app_process_title"> | |
| </a> | |
| <code class="literal"> | |
| context.app.process_title | |
| @@ -727,7 +727,7 @@ | |
| App process_title. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_app_language_name_literal"> | |
| + <a id="_context_app_language_name"> | |
| </a> | |
| <code class="literal"> | |
| context.app.language.name | |
| @@ -743,7 +743,7 @@ | |
| Language name. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_app_language_version_literal"> | |
| + <a id="_context_app_language_version"> | |
| </a> | |
| <code class="literal"> | |
| context.app.language.version | |
| @@ -759,7 +759,7 @@ | |
| Language version. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_app_runtime_name_literal"> | |
| + <a id="_context_app_runtime_name"> | |
| </a> | |
| <code class="literal"> | |
| context.app.runtime.name | |
| @@ -775,7 +775,7 @@ | |
| Runtime name. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_app_runtime_version_literal"> | |
| + <a id="_context_app_runtime_version"> | |
| </a> | |
| <code class="literal"> | |
| context.app.runtime.version | |
| @@ -791,7 +791,7 @@ | |
| Runtime version. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_app_framework_name_literal"> | |
| + <a id="_context_app_framework_name"> | |
| </a> | |
| <code class="literal"> | |
| context.app.framework.name | |
| @@ -807,7 +807,7 @@ | |
| Framework name. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_app_framework_version_literal"> | |
| + <a id="_context_app_framework_version"> | |
| </a> | |
| <code class="literal"> | |
| context.app.framework.version | |
| @@ -823,7 +823,7 @@ | |
| Framework version. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_app_agent_name_literal"> | |
| + <a id="_context_app_agent_name"> | |
| </a> | |
| <code class="literal"> | |
| context.app.agent.name | |
| @@ -839,7 +839,7 @@ | |
| Agent name. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_app_agent_version_literal"> | |
| + <a id="_context_app_agent_version"> | |
| </a> | |
| <code class="literal"> | |
| context.app.agent.version | |
| html/en/apm/server/6.1/exported-fields-beat.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.1/exported-fields-beat.html | |
| @@ -279,7 +279,7 @@ | |
| Contains common beat fields available in all event types. | |
| </p> | |
| <h3> | |
| - <a id="_literal_beat_name_literal"> | |
| + <a id="_beat_name"> | |
| </a> | |
| <code class="literal"> | |
| beat.name | |
| @@ -296,7 +296,7 @@ | |
| option in the configuration file. | |
| </p> | |
| <h3> | |
| - <a id="_literal_beat_hostname_literal"> | |
| + <a id="_beat_hostname"> | |
| </a> | |
| <code class="literal"> | |
| beat.hostname | |
| @@ -309,7 +309,7 @@ | |
| The hostname as returned by the operating system on which the Beat is running. | |
| </p> | |
| <h3> | |
| - <a id="_literal_beat_timezone_literal"> | |
| + <a id="_beat_timezone"> | |
| </a> | |
| <code class="literal"> | |
| beat.timezone | |
| @@ -322,7 +322,7 @@ | |
| The timezone as returned by the operating system on which the Beat is running. | |
| </p> | |
| <h3> | |
| - <a id="_literal_beat_version_literal"> | |
| + <a id="_beat_version"> | |
| </a> | |
| <code class="literal"> | |
| beat.version | |
| @@ -335,7 +335,7 @@ | |
| The version of the beat that generated this event. | |
| </p> | |
| <h3> | |
| - <a id="_literal_timestamp_literal"> | |
| + <a id="_timestamp"> | |
| </a> | |
| <code class="literal"> | |
| @timestamp | |
| @@ -360,7 +360,7 @@ | |
| The timestamp when the event log record was generated. | |
| </p> | |
| <h3> | |
| - <a id="_literal_tags_literal"> | |
| + <a id="_tags"> | |
| </a> | |
| <code class="literal"> | |
| tags | |
| @@ -373,7 +373,7 @@ | |
| Arbitrary tags that can be set per Beat and per transaction type. | |
| </p> | |
| <h3> | |
| - <a id="_literal_fields_literal"> | |
| + <a id="_fields"> | |
| </a> | |
| <code class="literal"> | |
| fields | |
| @@ -400,7 +400,7 @@ | |
| Error fields containing additional info in case of errors. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_message_literal"> | |
| + <a id="_error_message"> | |
| </a> | |
| <code class="literal"> | |
| error.message | |
| @@ -416,7 +416,7 @@ | |
| Error message. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_code_literal"> | |
| + <a id="_error_code"> | |
| </a> | |
| <code class="literal"> | |
| error.code | |
| @@ -432,7 +432,7 @@ | |
| Error code. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_type_literal"> | |
| + <a id="_error_type"> | |
| </a> | |
| <code class="literal"> | |
| error.type | |
| html/en/apm/server/6.1/exported-fields-cloud.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.1/exported-fields-cloud.html | |
| @@ -279,7 +279,7 @@ | |
| Metadata from cloud providers added by the add_cloud_metadata processor. | |
| </p> | |
| <h3> | |
| - <a id="_literal_meta_cloud_provider_literal"> | |
| + <a id="_meta_cloud_provider"> | |
| </a> | |
| <code class="literal"> | |
| meta.cloud.provider | |
| @@ -295,7 +295,7 @@ | |
| Name of the cloud provider. Possible values are ec2, gce, or digitalocean. | |
| </p> | |
| <h3> | |
| - <a id="_literal_meta_cloud_instance_id_literal"> | |
| + <a id="_meta_cloud_instance_id"> | |
| </a> | |
| <code class="literal"> | |
| meta.cloud.instance_id | |
| @@ -308,7 +308,7 @@ | |
| Instance ID of the host machine. | |
| </p> | |
| <h3> | |
| - <a id="_literal_meta_cloud_instance_name_literal"> | |
| + <a id="_meta_cloud_instance_name"> | |
| </a> | |
| <code class="literal"> | |
| meta.cloud.instance_name | |
| @@ -321,7 +321,7 @@ | |
| Instance name of the host machine. | |
| </p> | |
| <h3> | |
| - <a id="_literal_meta_cloud_machine_type_literal"> | |
| + <a id="_meta_cloud_machine_type"> | |
| </a> | |
| <code class="literal"> | |
| meta.cloud.machine_type | |
| @@ -337,7 +337,7 @@ | |
| Machine type of the host machine. | |
| </p> | |
| <h3> | |
| - <a id="_literal_meta_cloud_availability_zone_literal"> | |
| + <a id="_meta_cloud_availability_zone"> | |
| </a> | |
| <code class="literal"> | |
| meta.cloud.availability_zone | |
| @@ -353,7 +353,7 @@ | |
| Availability zone in which this host is running. | |
| </p> | |
| <h3> | |
| - <a id="_literal_meta_cloud_project_id_literal"> | |
| + <a id="_meta_cloud_project_id"> | |
| </a> | |
| <code class="literal"> | |
| meta.cloud.project_id | |
| @@ -369,7 +369,7 @@ | |
| Name of the project in Google Cloud. | |
| </p> | |
| <h3> | |
| - <a id="_literal_meta_cloud_region_literal"> | |
| + <a id="_meta_cloud_region"> | |
| </a> | |
| <code class="literal"> | |
| meta.cloud.region | |
| html/en/apm/server/6.1/exported-fields-docker-processor.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.1/exported-fields-docker-processor.html | |
| @@ -289,7 +289,7 @@ | |
| Docker stats collected from Docker. | |
| </p> | |
| <h3> | |
| - <a id="_literal_docker_container_id_literal"> | |
| + <a id="_docker_container_id"> | |
| </a> | |
| <code class="literal"> | |
| docker.container.id | |
| @@ -305,7 +305,7 @@ | |
| Unique container id. | |
| </p> | |
| <h3> | |
| - <a id="_literal_docker_container_image_literal"> | |
| + <a id="_docker_container_image"> | |
| </a> | |
| <code class="literal"> | |
| docker.container.image | |
| @@ -321,7 +321,7 @@ | |
| Name of the image the container was built on. | |
| </p> | |
| <h3> | |
| - <a id="_literal_docker_container_name_literal"> | |
| + <a id="_docker_container_name"> | |
| </a> | |
| <code class="literal"> | |
| docker.container.name | |
| @@ -337,7 +337,7 @@ | |
| Container name. | |
| </p> | |
| <h3> | |
| - <a id="_literal_docker_container_labels_literal"> | |
| + <a id="_docker_container_labels"> | |
| </a> | |
| <code class="literal"> | |
| docker.container.labels | |
| html/en/apm/server/6.1/exported-fields-kubernetes-processor.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.1/exported-fields-kubernetes-processor.html | |
| @@ -285,7 +285,7 @@ | |
| Kubernetes metadata added by the kubernetes processor | |
| </p> | |
| <h3> | |
| - <a id="_literal_kubernetes_pod_name_literal"> | |
| + <a id="_kubernetes_pod_name"> | |
| </a> | |
| <code class="literal"> | |
| kubernetes.pod.name | |
| @@ -301,7 +301,7 @@ | |
| Kubernetes pod name | |
| </p> | |
| <h3> | |
| - <a id="_literal_kubernetes_namespace_literal"> | |
| + <a id="_kubernetes_namespace"> | |
| </a> | |
| <code class="literal"> | |
| kubernetes.namespace | |
| @@ -317,7 +317,7 @@ | |
| Kubernetes namespace | |
| </p> | |
| <h3> | |
| - <a id="_literal_kubernetes_labels_literal"> | |
| + <a id="_kubernetes_labels"> | |
| </a> | |
| <code class="literal"> | |
| kubernetes.labels | |
| @@ -333,7 +333,7 @@ | |
| Kubernetes labels map | |
| </p> | |
| <h3> | |
| - <a id="_literal_kubernetes_annotations_literal"> | |
| + <a id="_kubernetes_annotations"> | |
| </a> | |
| <code class="literal"> | |
| kubernetes.annotations | |
| @@ -349,7 +349,7 @@ | |
| Kubernetes annotations map | |
| </p> | |
| <h3> | |
| - <a id="_literal_kubernetes_container_name_literal"> | |
| + <a id="_kubernetes_container_name"> | |
| </a> | |
| <code class="literal"> | |
| kubernetes.container.name | |
| @@ -365,7 +365,7 @@ | |
| Kubernetes container name | |
| </p> | |
| <h3> | |
| - <a id="_literal_kubernetes_container_image_literal"> | |
| + <a id="_kubernetes_container_image"> | |
| </a> | |
| <code class="literal"> | |
| kubernetes.container.image | |
| html/en/apm/server/6.1/exported-fields.html | |
| html/en/apm/server/6.1/generated-docs.html | |
| html/en/apm/server/6.1/index.html | |
| html/en/apm/server/6.1/installing.html | |
| html/en/apm/server/6.1/overview.html | |
| html/en/apm/server/6.1/release-notes-6.1.0.html | |
| html/en/apm/server/6.1/release-notes-6.1.1.html | |
| html/en/apm/server/6.1/release-notes-6.1.2.html | |
| html/en/apm/server/6.1/release-notes-6.1.3.html | |
| html/en/apm/server/6.1/release-notes-6.1.4.html | |
| html/en/apm/server/6.1/release-notes-6.1.html | |
| html/en/apm/server/6.1/release-notes.html | |
| html/en/apm/server/6.1/running-on-docker.html | |
| html/en/apm/server/6.1/setup-repositories.html | |
| html/en/apm/server/6.1/toc.html | |
| html/en/apm/server/6.1/transaction-api.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.1/transaction-api.html | |
| @@ -422,8 +422,8 @@ | |
| "maxLength": 1024 | |
| }, | |
| "result": { | |
| - "type": "string", | |
| - "description": "The result of the transaction. HTTP status code for HTTP-related transactions.", | |
| + "type": "string", | |
| + "description": "The result of the transaction. HTTP status code for HTTP-related transactions.", | |
| "maxLength": 1024 | |
| }, | |
| "timestamp": { | |
| html/en/apm/server/6.2/_manually_loading_template_configuration.html | |
| html/en/apm/server/6.2/apm-server-configuration.html | |
| html/en/apm/server/6.2/command-line-options.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.2/command-line-options.html | |
| @@ -509,33 +509,37 @@ | |
| </code> | |
| flag, this command exports the configuration that’s defined in the specified file. | |
| </dd> | |
| - <dt> | |
| - <span class="term"> | |
| - <span class="strong strong"> | |
| - <strong> | |
| - <code class="literal"> | |
| - template | |
| - </code> | |
| - </strong> | |
| - </span> | |
| - </span> | |
| - </dt> | |
| - <dd> | |
| - Exports the index template to stdout. You can specify the | |
| - <code class="literal"> | |
| - --es.version | |
| - </code> | |
| - and | |
| - <code class="literal"> | |
| - --index | |
| - </code> | |
| - flags to further define what gets exported. | |
| - </dd> | |
| </dl> | |
| </div> | |
| - <p> | |
| + <div class="variablelist"> | |
| <a id="template-subcommand"> | |
| </a> | |
| + <dl class="variablelist"> | |
| + <dt> | |
| + <span class="term"> | |
| + <span class="strong strong"> | |
| + <strong> | |
| + <code class="literal"> | |
| + template | |
| + </code> | |
| + </strong> | |
| + </span> | |
| + </span> | |
| + </dt> | |
| + <dd> | |
| + Exports the index template to stdout. You can specify the | |
| + <code class="literal"> | |
| + --es.version | |
| + </code> | |
| + and | |
| + <code class="literal"> | |
| + --index | |
| + </code> | |
| + flags to further define what gets exported. | |
| + </dd> | |
| + </dl> | |
| + </div> | |
| + <p> | |
| <span class="strong strong"> | |
| <strong> | |
| FLAGS | |
| html/en/apm/server/6.2/configuration-dashboards.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.2/configuration-dashboards.html | |
| @@ -326,7 +326,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_enabled_literal"> | |
| + <a id="_setup_dashboards_enabled"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.enabled | |
| @@ -407,7 +407,7 @@ | |
| The file archive (zip file) that contains the dashboards to load. If this option is set, APM Server looks for a dashboard archive in the specified path instead of using the local directory. | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_beat_literal"> | |
| + <a id="_setup_dashboards_beat"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.beat | |
| @@ -424,7 +424,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_kibana_index_literal"> | |
| + <a id="_setup_dashboards_kibana_index"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.kibana_index | |
| @@ -440,7 +440,7 @@ | |
| </code> | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_index_literal"> | |
| + <a id="_setup_dashboards_index"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.index | |
| @@ -456,7 +456,7 @@ | |
| </code> | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_always_kibana_literal"> | |
| + <a id="_setup_dashboards_always_kibana"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.always_kibana | |
| html/en/apm/server/6.2/configuration-logging.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.2/configuration-logging.html | |
| @@ -333,7 +333,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_to_syslog_literal"> | |
| + <a id="_logging_to_syslog"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_syslog | |
| @@ -346,7 +346,7 @@ | |
| When true, writes all logging output to the syslog. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_to_eventlog_literal"> | |
| + <a id="_logging_to_eventlog"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_eventlog | |
| @@ -359,7 +359,7 @@ | |
| When true, writes all logging output to the Windows Event Log. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_to_files_literal"> | |
| + <a id="_logging_to_files"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_files | |
| @@ -512,7 +512,7 @@ | |
| also sets the debug log level). | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_metrics_enabled_literal"> | |
| + <a id="_logging_metrics_enabled"> | |
| </a> | |
| <code class="literal"> | |
| logging.metrics.enabled | |
| @@ -534,7 +534,7 @@ | |
| Note that we currently offer no backwards compatible guarantees for the internal metrics and for this reason they are also not documented. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_metrics_period_literal"> | |
| + <a id="_logging_metrics_period"> | |
| </a> | |
| <code class="literal"> | |
| logging.metrics.period | |
| @@ -547,7 +547,7 @@ | |
| The period after which to log the internal metrics. The default is 30s. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_path_literal"> | |
| + <a id="_logging_files_path"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.path | |
| @@ -564,7 +564,7 @@ | |
| section for details. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_name_literal"> | |
| + <a id="_logging_files_name"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.name | |
| @@ -583,7 +583,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_rotateeverybytes_literal"> | |
| + <a id="_logging_files_rotateeverybytes"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.rotateeverybytes | |
| @@ -596,7 +596,7 @@ | |
| The maximum size of a log file. If the limit is reached, a new log file is generated. The default size limit is 10485760 (10 MB). | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_keepfiles_literal"> | |
| + <a id="_logging_files_keepfiles"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.keepfiles | |
| @@ -613,7 +613,7 @@ | |
| options has to be in the range of 2 to 1024 files. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_permissions_literal"> | |
| + <a id="_logging_files_permissions"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.permissions | |
| @@ -652,7 +652,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_logging_json_literal"> | |
| + <a id="_logging_json"> | |
| </a> | |
| <code class="literal"> | |
| logging.json | |
| @@ -705,17 +705,17 @@ | |
| </p> | |
| <p> | |
| <code class="literal"> | |
| - 2017-12-17T18:54:16.241-0500 INFO logp/core_test.go:13 unnamed global logger | |
| - </code> | |
| - </p> | |
| - <p> | |
| - <code class="literal"> | |
| - 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:16 some message | |
| - </code> | |
| - </p> | |
| - <p> | |
| - <code class="literal"> | |
| - 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:19 some message {"x": 1} | |
| + 2017-12-17T18:54:16.241-0500 INFO logp/core_test.go:13 unnamed global logger | |
| + </code> | |
| + </p> | |
| + <p> | |
| + <code class="literal"> | |
| + 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:16 some message | |
| + </code> | |
| + </p> | |
| + <p> | |
| + <code class="literal"> | |
| + 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:19 some message {"x": 1} | |
| </code> | |
| </p> | |
| </div> | |
| html/en/apm/server/6.2/configuration-path.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.2/configuration-path.html | |
| @@ -329,7 +329,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_home_literal"> | |
| + <a id="_home"> | |
| </a> | |
| <code class="literal"> | |
| home | |
| @@ -348,7 +348,7 @@ | |
| <pre class="programlisting prettyprint lang-yaml">path.home: /usr/share/beats</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_config_literal"> | |
| + <a id="_config"> | |
| </a> | |
| <code class="literal"> | |
| config | |
| @@ -367,7 +367,7 @@ | |
| <pre class="programlisting prettyprint lang-yaml">path.config: /usr/share/beats/config</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_data_literal"> | |
| + <a id="_data"> | |
| </a> | |
| <code class="literal"> | |
| data | |
| @@ -390,7 +390,7 @@ | |
| <pre class="programlisting prettyprint lang-yaml">path.data: /var/lib/beats</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_logs_literal"> | |
| + <a id="_logs"> | |
| </a> | |
| <code class="literal"> | |
| logs | |
| html/en/apm/server/6.2/configuration-ssl.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.2/configuration-ssl.html | |
| @@ -330,7 +330,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_enabled_literal_2"> | |
| + <a id="_enabled_2"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -377,7 +377,7 @@ | |
| </div> | |
| </div> | |
| <h4> | |
| - <a id="_literal_certificate_authorities_literal"> | |
| + <a id="_certificate_authorities"> | |
| </a> | |
| <code class="literal"> | |
| certificate_authorities | |
| @@ -435,7 +435,7 @@ | |
| is specified. | |
| </p> | |
| <h4> | |
| - <a id="_literal_key_passphrase_literal"> | |
| + <a id="_key_passphrase"> | |
| </a> | |
| <code class="literal"> | |
| key_passphrase | |
| @@ -452,7 +452,7 @@ | |
| file. | |
| </p> | |
| <h4> | |
| - <a id="_literal_supported_protocols_literal"> | |
| + <a id="_supported_protocols"> | |
| </a> | |
| <code class="literal"> | |
| supported_protocols | |
| @@ -492,7 +492,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_verification_mode_literal"> | |
| + <a id="_verification_mode"> | |
| </a> | |
| <code class="literal"> | |
| verification_mode | |
| @@ -528,7 +528,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_cipher_suites_literal"> | |
| + <a id="_cipher_suites"> | |
| </a> | |
| <code class="literal"> | |
| cipher_suites | |
| @@ -627,7 +627,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_curve_types_literal"> | |
| + <a id="_curve_types"> | |
| </a> | |
| <code class="literal"> | |
| curve_types | |
| @@ -656,7 +656,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_renegotiation_literal"> | |
| + <a id="_renegotiation"> | |
| </a> | |
| <code class="literal"> | |
| renegotiation | |
| html/en/apm/server/6.2/configuration-template.html | |
| html/en/apm/server/6.2/configuring-howto-apm-server.html | |
| html/en/apm/server/6.2/configuring-output.html | |
| html/en/apm/server/6.2/directory-layout.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.2/directory-layout.html | |
| @@ -323,10 +323,6 @@ | |
| </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| - <p> | |
| - <code class="literal"> | |
| - </code> | |
| - </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| <p> | |
| @@ -359,10 +355,6 @@ | |
| </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| - <p> | |
| - <code class="literal"> | |
| - </code> | |
| - </p> | |
| </td> | |
| </tr> | |
| <tr> | |
| html/en/apm/server/6.2/elasticsearch-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.2/elasticsearch-output.html | |
| @@ -390,7 +390,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal"> | |
| + <a id="_enabled"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -514,7 +514,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_level_literal"> | |
| + <a id="_compression_level"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -541,7 +541,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_worker_literal"> | |
| + <a id="_worker"> | |
| </a> | |
| <code class="literal"> | |
| worker | |
| @@ -565,7 +565,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_username_literal"> | |
| + <a id="_username"> | |
| </a> | |
| <code class="literal"> | |
| username | |
| @@ -586,7 +586,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_password_literal"> | |
| + <a id="_password"> | |
| </a> | |
| <code class="literal"> | |
| password | |
| @@ -607,7 +607,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_parameters_literal"> | |
| + <a id="_parameters"> | |
| </a> | |
| <code class="literal"> | |
| parameters | |
| @@ -692,7 +692,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_headers_literal"> | |
| + <a id="_headers"> | |
| </a> | |
| <code class="literal"> | |
| headers | |
| @@ -720,7 +720,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_proxy_url_literal"> | |
| + <a id="_proxy_url"> | |
| </a> | |
| <code class="literal"> | |
| proxy_url | |
| @@ -798,7 +798,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_indices_literal"> | |
| + <a id="_indices"> | |
| </a> | |
| <code class="literal"> | |
| indices | |
| @@ -897,7 +897,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_max_retries_literal"> | |
| + <a id="_max_retries"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -928,7 +928,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal"> | |
| + <a id="_bulk_max_size"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -966,7 +966,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_timeout_literal"> | |
| + <a id="_timeout"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -987,7 +987,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ssl_literal"> | |
| + <a id="_ssl"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| html/en/apm/server/6.2/enable-apm-server-debugging.html | |
| html/en/apm/server/6.2/error-api.html | |
| html/en/apm/server/6.2/errors.html | |
| html/en/apm/server/6.2/event-types.html | |
| html/en/apm/server/6.2/exported-fields-apm-error.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.2/exported-fields-apm-error.html | |
| @@ -283,7 +283,7 @@ | |
| Error-specific data for APM | |
| </p> | |
| <h3> | |
| - <a id="_literal_view_errors_literal"> | |
| + <a id="_view_errors"> | |
| </a> | |
| <code class="literal"> | |
| view errors | |
| @@ -299,7 +299,7 @@ | |
| format: url | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_id_icon_literal"> | |
| + <a id="_error_id_icon"> | |
| </a> | |
| <code class="literal"> | |
| error id icon | |
| @@ -326,7 +326,7 @@ | |
| Data captured by an agent representing an event occurring in a monitored service. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_id_literal"> | |
| + <a id="_error_id"> | |
| </a> | |
| <code class="literal"> | |
| error.id | |
| @@ -342,7 +342,7 @@ | |
| A UUID for the error. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_culprit_literal"> | |
| + <a id="_error_culprit"> | |
| </a> | |
| <code class="literal"> | |
| error.culprit | |
| @@ -358,7 +358,7 @@ | |
| Function call which was the primary perpetrator of this event. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_grouping_key_literal"> | |
| + <a id="_error_grouping_key"> | |
| </a> | |
| <code class="literal"> | |
| error.grouping_key | |
| @@ -388,7 +388,7 @@ | |
| Information about the originally thrown error. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_exception_code_literal"> | |
| + <a id="_error_exception_code"> | |
| </a> | |
| <code class="literal"> | |
| error.exception.code | |
| @@ -404,7 +404,7 @@ | |
| The error code set when the error happened, e.g. database error code. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_exception_message_literal"> | |
| + <a id="_error_exception_message"> | |
| </a> | |
| <code class="literal"> | |
| error.exception.message | |
| @@ -420,7 +420,7 @@ | |
| The original error message. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_exception_module_literal"> | |
| + <a id="_error_exception_module"> | |
| </a> | |
| <code class="literal"> | |
| error.exception.module | |
| @@ -436,7 +436,7 @@ | |
| The module namespace of the original error. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_exception_type_literal"> | |
| + <a id="_error_exception_type"> | |
| </a> | |
| <code class="literal"> | |
| error.exception.type | |
| @@ -449,7 +449,7 @@ | |
| type: keyword | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_exception_handled_literal"> | |
| + <a id="_error_exception_handled"> | |
| </a> | |
| <code class="literal"> | |
| error.exception.handled | |
| @@ -476,7 +476,7 @@ | |
| Additional information added by logging the error. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_log_level_literal"> | |
| + <a id="_error_log_level"> | |
| </a> | |
| <code class="literal"> | |
| error.log.level | |
| @@ -492,7 +492,7 @@ | |
| The severity of the record. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_log_logger_name_literal"> | |
| + <a id="_error_log_logger_name"> | |
| </a> | |
| <code class="literal"> | |
| error.log.logger_name | |
| @@ -508,7 +508,7 @@ | |
| The name of the logger instance used. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_log_message_literal"> | |
| + <a id="_error_log_message"> | |
| </a> | |
| <code class="literal"> | |
| error.log.message | |
| @@ -524,7 +524,7 @@ | |
| The additionally logged error message. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_log_param_message_literal"> | |
| + <a id="_error_log_param_message"> | |
| </a> | |
| <code class="literal"> | |
| error.log.param_message | |
| html/en/apm/server/6.2/exported-fields-apm-sourcemap.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.2/exported-fields-apm-sourcemap.html | |
| @@ -294,7 +294,7 @@ | |
| Service fields. | |
| </p> | |
| <h3> | |
| - <a id="_literal_sourcemap_service_name_literal"> | |
| + <a id="_sourcemap_service_name"> | |
| </a> | |
| <code class="literal"> | |
| sourcemap.service.name | |
| @@ -310,7 +310,7 @@ | |
| The name of the service this sourcemap belongs to. | |
| </p> | |
| <h3> | |
| - <a id="_literal_sourcemap_service_version_literal"> | |
| + <a id="_sourcemap_service_version"> | |
| </a> | |
| <code class="literal"> | |
| sourcemap.service.version | |
| @@ -326,7 +326,7 @@ | |
| Service version. | |
| </p> | |
| <h3> | |
| - <a id="_literal_sourcemap_bundle_filepath_literal"> | |
| + <a id="_sourcemap_bundle_filepath"> | |
| </a> | |
| <code class="literal"> | |
| sourcemap.bundle_filepath | |
| html/en/apm/server/6.2/exported-fields-apm-span.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.2/exported-fields-apm-span.html | |
| @@ -283,7 +283,7 @@ | |
| Span-specific data for APM. | |
| </p> | |
| <h3> | |
| - <a id="_literal_view_spans_literal"> | |
| + <a id="_view_spans"> | |
| </a> | |
| <code class="literal"> | |
| view spans | |
| @@ -296,7 +296,7 @@ | |
| format: url | |
| </p> | |
| <h3> | |
| - <a id="_literal_span_id_literal"> | |
| + <a id="_span_id"> | |
| </a> | |
| <code class="literal"> | |
| span.id | |
| @@ -312,7 +312,7 @@ | |
| A locally unique ID of the span. | |
| </p> | |
| <h3> | |
| - <a id="_literal_span_name_literal"> | |
| + <a id="_span_name"> | |
| </a> | |
| <code class="literal"> | |
| span.name | |
| @@ -328,7 +328,7 @@ | |
| Generic designation of a span in the scope of a transaction. | |
| </p> | |
| <h3> | |
| - <a id="_literal_span_type_literal"> | |
| + <a id="_span_type"> | |
| </a> | |
| <code class="literal"> | |
| span.type | |
| @@ -373,7 +373,7 @@ | |
| None | |
| </p> | |
| <h3> | |
| - <a id="_literal_span_start_us_literal"> | |
| + <a id="_span_start_us"> | |
| </a> | |
| <code class="literal"> | |
| span.start.us | |
| @@ -400,7 +400,7 @@ | |
| None | |
| </p> | |
| <h3> | |
| - <a id="_literal_span_duration_us_literal"> | |
| + <a id="_span_duration_us"> | |
| </a> | |
| <code class="literal"> | |
| span.duration.us | |
| @@ -419,7 +419,7 @@ | |
| Duration of the span, in microseconds. | |
| </p> | |
| <h3> | |
| - <a id="_literal_span_parent_literal"> | |
| + <a id="_span_parent"> | |
| </a> | |
| <code class="literal"> | |
| span.parent | |
| html/en/apm/server/6.2/exported-fields-apm-transaction.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.2/exported-fields-apm-transaction.html | |
| @@ -283,7 +283,7 @@ | |
| Transaction-specific data for APM | |
| </p> | |
| <h3> | |
| - <a id="_literal_transaction_name_literal"> | |
| + <a id="_transaction_name"> | |
| </a> | |
| <code class="literal"> | |
| transaction.name | |
| @@ -305,7 +305,7 @@ | |
| ). | |
| </p> | |
| <h3> | |
| - <a id="_literal_transaction_name_keyword_literal"> | |
| + <a id="_transaction_name_keyword"> | |
| </a> | |
| <code class="literal"> | |
| transaction.name.keyword | |
| @@ -318,7 +318,7 @@ | |
| type: keyword | |
| </p> | |
| <h3> | |
| - <a id="_literal_transaction_type_literal"> | |
| + <a id="_transaction_type"> | |
| </a> | |
| <code class="literal"> | |
| transaction.type | |
| @@ -357,7 +357,7 @@ | |
| None | |
| </p> | |
| <h3> | |
| - <a id="_literal_transaction_duration_us_literal"> | |
| + <a id="_transaction_duration_us"> | |
| </a> | |
| <code class="literal"> | |
| transaction.duration.us | |
| @@ -376,7 +376,7 @@ | |
| Total duration of this transaction, in microseconds. | |
| </p> | |
| <h3> | |
| - <a id="_literal_transaction_result_literal"> | |
| + <a id="_transaction_result"> | |
| </a> | |
| <code class="literal"> | |
| transaction.result | |
| @@ -392,7 +392,7 @@ | |
| The result of the transaction. HTTP status code for HTTP-related transactions. | |
| </p> | |
| <h3> | |
| - <a id="_literal_transaction_marks_literal"> | |
| + <a id="_transaction_marks"> | |
| </a> | |
| <code class="literal"> | |
| transaction.marks | |
| @@ -408,7 +408,7 @@ | |
| A user-defined mapping of groups of marks in milliseconds. | |
| </p> | |
| <h3> | |
| - <a id="_literal_transaction_sampled_literal"> | |
| + <a id="_transaction_sampled"> | |
| </a> | |
| <code class="literal"> | |
| transaction.sampled | |
| @@ -430,7 +430,7 @@ | |
| will include all available information. Transactions that are not sampled will not have spans or context. Defaults to true. | |
| </p> | |
| <h3> | |
| - <a id="_literal_transaction_span_count_dropped_total_literal"> | |
| + <a id="_transaction_span_count_dropped_total"> | |
| </a> | |
| <code class="literal"> | |
| transaction.span_count.dropped.total | |
| html/en/apm/server/6.2/exported-fields-apm.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.2/exported-fields-apm.html | |
| @@ -283,7 +283,7 @@ | |
| None | |
| </p> | |
| <h3> | |
| - <a id="_literal_listening_literal"> | |
| + <a id="_listening"> | |
| </a> | |
| <code class="literal"> | |
| listening | |
| @@ -299,7 +299,7 @@ | |
| Address the server is listening on. | |
| </p> | |
| <h3> | |
| - <a id="_literal_processor_name_literal"> | |
| + <a id="_processor_name"> | |
| </a> | |
| <code class="literal"> | |
| processor.name | |
| @@ -315,7 +315,7 @@ | |
| Processor name. | |
| </p> | |
| <h3> | |
| - <a id="_literal_processor_event_literal"> | |
| + <a id="_processor_event"> | |
| </a> | |
| <code class="literal"> | |
| processor.event | |
| @@ -342,7 +342,7 @@ | |
| Any arbitrary contextual information regarding the event, captured by the agent, optionally provided by the user. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_tags_literal"> | |
| + <a id="_context_tags"> | |
| </a> | |
| <code class="literal"> | |
| context.tags | |
| @@ -358,7 +358,7 @@ | |
| A flat mapping of user-defined tags with string values. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_user_username_literal"> | |
| + <a id="_context_user_username"> | |
| </a> | |
| <code class="literal"> | |
| context.user.username | |
| @@ -374,7 +374,7 @@ | |
| The username of the logged in user. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_user_id_literal"> | |
| + <a id="_context_user_id"> | |
| </a> | |
| <code class="literal"> | |
| context.user.id | |
| @@ -390,7 +390,7 @@ | |
| Identifier of the logged in user. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_user_email_literal"> | |
| + <a id="_context_user_email"> | |
| </a> | |
| <code class="literal"> | |
| context.user.email | |
| @@ -417,7 +417,7 @@ | |
| A complete Url, with scheme, host and path. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_request_url_raw_literal"> | |
| + <a id="_context_request_url_raw"> | |
| </a> | |
| <code class="literal"> | |
| context.request.url.raw | |
| @@ -437,7 +437,7 @@ | |
| . | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_request_url_protocol_literal"> | |
| + <a id="_context_request_url_protocol"> | |
| </a> | |
| <code class="literal"> | |
| context.request.url.protocol | |
| @@ -453,7 +453,7 @@ | |
| The protocol of the request, e.g. "https:". | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_request_url_full_literal"> | |
| + <a id="_context_request_url_full"> | |
| </a> | |
| <code class="literal"> | |
| context.request.url.full | |
| @@ -473,7 +473,7 @@ | |
| . | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_request_url_hostname_literal"> | |
| + <a id="_context_request_url_hostname"> | |
| </a> | |
| <code class="literal"> | |
| context.request.url.hostname | |
| @@ -489,7 +489,7 @@ | |
| The hostname of the request, e.g. "example.com". | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_request_url_port_literal"> | |
| + <a id="_context_request_url_port"> | |
| </a> | |
| <code class="literal"> | |
| context.request.url.port | |
| @@ -505,7 +505,7 @@ | |
| The port of the request, e.g. 443. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_request_url_pathname_literal"> | |
| + <a id="_context_request_url_pathname"> | |
| </a> | |
| <code class="literal"> | |
| context.request.url.pathname | |
| @@ -521,7 +521,7 @@ | |
| The path of the request, e.g. "/search". | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_request_url_search_literal"> | |
| + <a id="_context_request_url_search"> | |
| </a> | |
| <code class="literal"> | |
| context.request.url.search | |
| @@ -537,7 +537,7 @@ | |
| The search describes the query string of the request, e.g. "q=elasticsearch". | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_request_url_hash_literal"> | |
| + <a id="_context_request_url_hash"> | |
| </a> | |
| <code class="literal"> | |
| context.request.url.hash | |
| @@ -553,7 +553,7 @@ | |
| The hash of the request URL, e.g. "top". | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_request_http_version_literal"> | |
| + <a id="_context_request_http_version"> | |
| </a> | |
| <code class="literal"> | |
| context.request.http_version | |
| @@ -569,7 +569,7 @@ | |
| The http version of the request leading to this event. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_request_method_literal"> | |
| + <a id="_context_request_method"> | |
| </a> | |
| <code class="literal"> | |
| context.request.method | |
| @@ -585,7 +585,7 @@ | |
| The http method of the request leading to this event. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_response_status_code_literal"> | |
| + <a id="_context_response_status_code"> | |
| </a> | |
| <code class="literal"> | |
| context.response.status_code | |
| @@ -607,7 +607,7 @@ | |
| . | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_response_finished_literal"> | |
| + <a id="_context_response_finished"> | |
| </a> | |
| <code class="literal"> | |
| context.response.finished | |
| @@ -634,7 +634,7 @@ | |
| Optional system fields. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_system_hostname_literal"> | |
| + <a id="_context_system_hostname"> | |
| </a> | |
| <code class="literal"> | |
| context.system.hostname | |
| @@ -650,7 +650,7 @@ | |
| The hostname of the system the event was recorded on. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_system_architecture_literal"> | |
| + <a id="_context_system_architecture"> | |
| </a> | |
| <code class="literal"> | |
| context.system.architecture | |
| @@ -666,7 +666,7 @@ | |
| The architecture of the system the event was recorded on. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_system_platform_literal"> | |
| + <a id="_context_system_platform"> | |
| </a> | |
| <code class="literal"> | |
| context.system.platform | |
| @@ -693,7 +693,7 @@ | |
| Information pertaining to the running process where the data was collected | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_process_pid_literal"> | |
| + <a id="_context_process_pid"> | |
| </a> | |
| <code class="literal"> | |
| context.process.pid | |
| @@ -709,7 +709,7 @@ | |
| Numeric process ID of the service process. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_process_title_literal"> | |
| + <a id="_context_process_title"> | |
| </a> | |
| <code class="literal"> | |
| context.process.title | |
| @@ -736,7 +736,7 @@ | |
| Service fields. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_service_name_literal"> | |
| + <a id="_context_service_name"> | |
| </a> | |
| <code class="literal"> | |
| context.service.name | |
| @@ -755,7 +755,7 @@ | |
| Immutable unique name of the service emitting this event. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_service_version_literal"> | |
| + <a id="_context_service_version"> | |
| </a> | |
| <code class="literal"> | |
| context.service.version | |
| @@ -771,7 +771,7 @@ | |
| Version of the service emitting this event. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_service_environment_literal"> | |
| + <a id="_context_service_environment"> | |
| </a> | |
| <code class="literal"> | |
| context.service.environment | |
| @@ -787,7 +787,7 @@ | |
| Service environment. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_service_language_name_literal"> | |
| + <a id="_context_service_language_name"> | |
| </a> | |
| <code class="literal"> | |
| context.service.language.name | |
| @@ -803,7 +803,7 @@ | |
| Name of the programming language used. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_service_language_version_literal"> | |
| + <a id="_context_service_language_version"> | |
| </a> | |
| <code class="literal"> | |
| context.service.language.version | |
| @@ -819,7 +819,7 @@ | |
| Version of the programming language used. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_service_runtime_name_literal"> | |
| + <a id="_context_service_runtime_name"> | |
| </a> | |
| <code class="literal"> | |
| context.service.runtime.name | |
| @@ -835,7 +835,7 @@ | |
| Name of the runtime used. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_service_runtime_version_literal"> | |
| + <a id="_context_service_runtime_version"> | |
| </a> | |
| <code class="literal"> | |
| context.service.runtime.version | |
| @@ -851,7 +851,7 @@ | |
| Version of the runtime used. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_service_framework_name_literal"> | |
| + <a id="_context_service_framework_name"> | |
| </a> | |
| <code class="literal"> | |
| context.service.framework.name | |
| @@ -867,7 +867,7 @@ | |
| Name of the framework used. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_service_framework_version_literal"> | |
| + <a id="_context_service_framework_version"> | |
| </a> | |
| <code class="literal"> | |
| context.service.framework.version | |
| @@ -883,7 +883,7 @@ | |
| Version of the framework used. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_service_agent_name_literal"> | |
| + <a id="_context_service_agent_name"> | |
| </a> | |
| <code class="literal"> | |
| context.service.agent.name | |
| @@ -899,7 +899,7 @@ | |
| Name of the agent used. | |
| </p> | |
| <h3> | |
| - <a id="_literal_context_service_agent_version_literal"> | |
| + <a id="_context_service_agent_version"> | |
| </a> | |
| <code class="literal"> | |
| context.service.agent.version | |
| @@ -915,7 +915,7 @@ | |
| Version of the agent used. | |
| </p> | |
| <h3> | |
| - <a id="_literal_transaction_id_literal"> | |
| + <a id="_transaction_id"> | |
| </a> | |
| <code class="literal"> | |
| transaction.id | |
| html/en/apm/server/6.2/exported-fields-beat.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.2/exported-fields-beat.html | |
| @@ -283,7 +283,7 @@ | |
| Contains common beat fields available in all event types. | |
| </p> | |
| <h3> | |
| - <a id="_literal_beat_name_literal"> | |
| + <a id="_beat_name"> | |
| </a> | |
| <code class="literal"> | |
| beat.name | |
| @@ -300,7 +300,7 @@ | |
| option in the configuration file. | |
| </p> | |
| <h3> | |
| - <a id="_literal_beat_hostname_literal"> | |
| + <a id="_beat_hostname"> | |
| </a> | |
| <code class="literal"> | |
| beat.hostname | |
| @@ -313,7 +313,7 @@ | |
| The hostname as returned by the operating system on which the Beat is running. | |
| </p> | |
| <h3> | |
| - <a id="_literal_beat_timezone_literal"> | |
| + <a id="_beat_timezone"> | |
| </a> | |
| <code class="literal"> | |
| beat.timezone | |
| @@ -326,7 +326,7 @@ | |
| The timezone as returned by the operating system on which the Beat is running. | |
| </p> | |
| <h3> | |
| - <a id="_literal_beat_version_literal"> | |
| + <a id="_beat_version"> | |
| </a> | |
| <code class="literal"> | |
| beat.version | |
| @@ -339,7 +339,7 @@ | |
| The version of the beat that generated this event. | |
| </p> | |
| <h3> | |
| - <a id="_literal_timestamp_literal"> | |
| + <a id="_timestamp"> | |
| </a> | |
| <code class="literal"> | |
| @timestamp | |
| @@ -364,7 +364,7 @@ | |
| The timestamp when the event log record was generated. | |
| </p> | |
| <h3> | |
| - <a id="_literal_tags_literal"> | |
| + <a id="_tags"> | |
| </a> | |
| <code class="literal"> | |
| tags | |
| @@ -377,7 +377,7 @@ | |
| Arbitrary tags that can be set per Beat and per transaction type. | |
| </p> | |
| <h3> | |
| - <a id="_literal_fields_literal"> | |
| + <a id="_fields"> | |
| </a> | |
| <code class="literal"> | |
| fields | |
| @@ -404,7 +404,7 @@ | |
| Error fields containing additional info in case of errors. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_message_literal"> | |
| + <a id="_error_message"> | |
| </a> | |
| <code class="literal"> | |
| error.message | |
| @@ -420,7 +420,7 @@ | |
| Error message. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_code_literal"> | |
| + <a id="_error_code"> | |
| </a> | |
| <code class="literal"> | |
| error.code | |
| @@ -436,7 +436,7 @@ | |
| Error code. | |
| </p> | |
| <h3> | |
| - <a id="_literal_error_type_literal"> | |
| + <a id="_error_type"> | |
| </a> | |
| <code class="literal"> | |
| error.type | |
| html/en/apm/server/6.2/exported-fields-cloud.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.2/exported-fields-cloud.html | |
| @@ -283,7 +283,7 @@ | |
| Metadata from cloud providers added by the add_cloud_metadata processor. | |
| </p> | |
| <h3> | |
| - <a id="_literal_meta_cloud_provider_literal"> | |
| + <a id="_meta_cloud_provider"> | |
| </a> | |
| <code class="literal"> | |
| meta.cloud.provider | |
| @@ -299,7 +299,7 @@ | |
| Name of the cloud provider. Possible values are ec2, gce, or digitalocean. | |
| </p> | |
| <h3> | |
| - <a id="_literal_meta_cloud_instance_id_literal"> | |
| + <a id="_meta_cloud_instance_id"> | |
| </a> | |
| <code class="literal"> | |
| meta.cloud.instance_id | |
| @@ -312,7 +312,7 @@ | |
| Instance ID of the host machine. | |
| </p> | |
| <h3> | |
| - <a id="_literal_meta_cloud_instance_name_literal"> | |
| + <a id="_meta_cloud_instance_name"> | |
| </a> | |
| <code class="literal"> | |
| meta.cloud.instance_name | |
| @@ -325,7 +325,7 @@ | |
| Instance name of the host machine. | |
| </p> | |
| <h3> | |
| - <a id="_literal_meta_cloud_machine_type_literal"> | |
| + <a id="_meta_cloud_machine_type"> | |
| </a> | |
| <code class="literal"> | |
| meta.cloud.machine_type | |
| @@ -341,7 +341,7 @@ | |
| Machine type of the host machine. | |
| </p> | |
| <h3> | |
| - <a id="_literal_meta_cloud_availability_zone_literal"> | |
| + <a id="_meta_cloud_availability_zone"> | |
| </a> | |
| <code class="literal"> | |
| meta.cloud.availability_zone | |
| @@ -357,7 +357,7 @@ | |
| Availability zone in which this host is running. | |
| </p> | |
| <h3> | |
| - <a id="_literal_meta_cloud_project_id_literal"> | |
| + <a id="_meta_cloud_project_id"> | |
| </a> | |
| <code class="literal"> | |
| meta.cloud.project_id | |
| @@ -373,7 +373,7 @@ | |
| Name of the project in Google Cloud. | |
| </p> | |
| <h3> | |
| - <a id="_literal_meta_cloud_region_literal"> | |
| + <a id="_meta_cloud_region"> | |
| </a> | |
| <code class="literal"> | |
| meta.cloud.region | |
| html/en/apm/server/6.2/exported-fields-docker-processor.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.2/exported-fields-docker-processor.html | |
| @@ -283,7 +283,7 @@ | |
| Docker stats collected from Docker. | |
| </p> | |
| <h3> | |
| - <a id="_literal_docker_container_id_literal"> | |
| + <a id="_docker_container_id"> | |
| </a> | |
| <code class="literal"> | |
| docker.container.id | |
| @@ -299,7 +299,7 @@ | |
| Unique container id. | |
| </p> | |
| <h3> | |
| - <a id="_literal_docker_container_image_literal"> | |
| + <a id="_docker_container_image"> | |
| </a> | |
| <code class="literal"> | |
| docker.container.image | |
| @@ -315,7 +315,7 @@ | |
| Name of the image the container was built on. | |
| </p> | |
| <h3> | |
| - <a id="_literal_docker_container_name_literal"> | |
| + <a id="_docker_container_name"> | |
| </a> | |
| <code class="literal"> | |
| docker.container.name | |
| @@ -331,7 +331,7 @@ | |
| Container name. | |
| </p> | |
| <h3> | |
| - <a id="_literal_docker_container_labels_literal"> | |
| + <a id="_docker_container_labels"> | |
| </a> | |
| <code class="literal"> | |
| docker.container.labels | |
| html/en/apm/server/6.2/exported-fields-kubernetes-processor.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.2/exported-fields-kubernetes-processor.html | |
| @@ -283,7 +283,7 @@ | |
| Kubernetes metadata added by the kubernetes processor | |
| </p> | |
| <h3> | |
| - <a id="_literal_kubernetes_pod_name_literal"> | |
| + <a id="_kubernetes_pod_name"> | |
| </a> | |
| <code class="literal"> | |
| kubernetes.pod.name | |
| @@ -299,7 +299,7 @@ | |
| Kubernetes pod name | |
| </p> | |
| <h3> | |
| - <a id="_literal_kubernetes_namespace_literal"> | |
| + <a id="_kubernetes_namespace"> | |
| </a> | |
| <code class="literal"> | |
| kubernetes.namespace | |
| @@ -315,7 +315,7 @@ | |
| Kubernetes namespace | |
| </p> | |
| <h3> | |
| - <a id="_literal_kubernetes_node_name_literal"> | |
| + <a id="_kubernetes_node_name"> | |
| </a> | |
| <code class="literal"> | |
| kubernetes.node.name | |
| @@ -331,7 +331,7 @@ | |
| Kubernetes node name | |
| </p> | |
| <h3> | |
| - <a id="_literal_kubernetes_labels_literal"> | |
| + <a id="_kubernetes_labels"> | |
| </a> | |
| <code class="literal"> | |
| kubernetes.labels | |
| @@ -347,7 +347,7 @@ | |
| Kubernetes labels map | |
| </p> | |
| <h3> | |
| - <a id="_literal_kubernetes_annotations_literal"> | |
| + <a id="_kubernetes_annotations"> | |
| </a> | |
| <code class="literal"> | |
| kubernetes.annotations | |
| @@ -363,7 +363,7 @@ | |
| Kubernetes annotations map | |
| </p> | |
| <h3> | |
| - <a id="_literal_kubernetes_container_name_literal"> | |
| + <a id="_kubernetes_container_name"> | |
| </a> | |
| <code class="literal"> | |
| kubernetes.container.name | |
| @@ -379,7 +379,7 @@ | |
| Kubernetes container name | |
| </p> | |
| <h3> | |
| - <a id="_literal_kubernetes_container_image_literal"> | |
| + <a id="_kubernetes_container_image"> | |
| </a> | |
| <code class="literal"> | |
| kubernetes.container.image | |
| html/en/apm/server/6.2/exported-fields.html | |
| html/en/apm/server/6.2/frontend.html | |
| html/en/apm/server/6.2/getting-help.html | |
| html/en/apm/server/6.2/high-availability.html | |
| html/en/apm/server/6.2/index.html | |
| html/en/apm/server/6.2/installing-on-windows.html | |
| html/en/apm/server/6.2/installing.html | |
| html/en/apm/server/6.2/intake-api.html | |
| html/en/apm/server/6.2/keystore.html | |
| html/en/apm/server/6.2/load-kibana-dashboards.html | |
| html/en/apm/server/6.2/overview.html | |
| html/en/apm/server/6.2/release-notes-6.1.0.html | |
| html/en/apm/server/6.2/release-notes-6.1.1.html | |
| html/en/apm/server/6.2/release-notes-6.1.2.html | |
| html/en/apm/server/6.2/release-notes-6.1.3.html | |
| html/en/apm/server/6.2/release-notes-6.1.4.html | |
| html/en/apm/server/6.2/release-notes-6.1.html | |
| html/en/apm/server/6.2/release-notes-6.2.0.html | |
| html/en/apm/server/6.2/release-notes-6.2.1.html | |
| html/en/apm/server/6.2/release-notes-6.2.2.html | |
| html/en/apm/server/6.2/release-notes-6.2.3.html | |
| html/en/apm/server/6.2/release-notes-6.2.4.html | |
| html/en/apm/server/6.2/release-notes-6.2.html | |
| html/en/apm/server/6.2/release-notes.html | |
| html/en/apm/server/6.2/running-on-docker.html | |
| html/en/apm/server/6.2/security.html | |
| html/en/apm/server/6.2/setting-up-and-running.html | |
| html/en/apm/server/6.2/setup-kibana-endpoint.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.2/setup-kibana-endpoint.html | |
| @@ -319,7 +319,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_kibana_host_literal"> | |
| + <a id="_setup_kibana_host"> | |
| </a> | |
| <code class="literal"> | |
| setup.kibana.host | |
| @@ -442,7 +442,7 @@ | |
| setup.kibana.path: /kibana</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_setup_kibana_username_literal"> | |
| + <a id="_setup_kibana_username"> | |
| </a> | |
| <code class="literal"> | |
| setup.kibana.username | |
| @@ -459,7 +459,7 @@ | |
| specified for the Elasticsearch output. | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_kibana_password_literal"> | |
| + <a id="_setup_kibana_password"> | |
| </a> | |
| <code class="literal"> | |
| setup.kibana.password | |
| @@ -489,7 +489,7 @@ | |
| An HTTP path prefix that is prepended to the HTTP API calls. This is useful for the cases where Kibana listens behind an HTTP reverse proxy that exports the API under a custom prefix. | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_kibana_ssl_enabled_literal"> | |
| + <a id="_setup_kibana_ssl_enabled"> | |
| </a> | |
| <code class="literal"> | |
| setup.kibana.ssl.enabled | |
| html/en/apm/server/6.2/setup-repositories.html | |
| html/en/apm/server/6.2/sourcemap.html | |
| html/en/apm/server/6.2/spans.html | |
| html/en/apm/server/6.2/toc.html | |
| html/en/apm/server/6.2/transaction-api.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.2/transaction-api.html | |
| @@ -480,8 +480,8 @@ | |
| "maxLength": 1024 | |
| }, | |
| "result": { | |
| - "type": "string", | |
| - "description": "The result of the transaction. HTTP status code for HTTP-related transactions.", | |
| + "type": "string", | |
| + "description": "The result of the transaction. HTTP status code for HTTP-related transactions.", | |
| "maxLength": 1024 | |
| }, | |
| "timestamp": { | |
| html/en/apm/server/6.2/transactions.html | |
| html/en/apm/server/6.2/troubleshooting.html | |
| html/en/apm/server/6.2/using-environ-vars.html | |
| html/en/apm/server/6.3/_manually_loading_template_configuration.html | |
| html/en/apm/server/6.3/apm-server-configuration.html | |
| html/en/apm/server/6.3/beats-basic-auth.html | |
| html/en/apm/server/6.3/beats-tls.html | |
| html/en/apm/server/6.3/beats-user-access.html | |
| html/en/apm/server/6.3/command-line-options.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.3/command-line-options.html | |
| @@ -509,33 +509,37 @@ | |
| </code> | |
| flag, this command exports the configuration that’s defined in the specified file. | |
| </dd> | |
| - <dt> | |
| - <span class="term"> | |
| - <span class="strong strong"> | |
| - <strong> | |
| - <code class="literal"> | |
| - template | |
| - </code> | |
| - </strong> | |
| - </span> | |
| - </span> | |
| - </dt> | |
| - <dd> | |
| - Exports the index template to stdout. You can specify the | |
| - <code class="literal"> | |
| - --es.version | |
| - </code> | |
| - and | |
| - <code class="literal"> | |
| - --index | |
| - </code> | |
| - flags to further define what gets exported. | |
| - </dd> | |
| </dl> | |
| </div> | |
| - <p> | |
| + <div class="variablelist"> | |
| <a id="template-subcommand"> | |
| </a> | |
| + <dl class="variablelist"> | |
| + <dt> | |
| + <span class="term"> | |
| + <span class="strong strong"> | |
| + <strong> | |
| + <code class="literal"> | |
| + template | |
| + </code> | |
| + </strong> | |
| + </span> | |
| + </span> | |
| + </dt> | |
| + <dd> | |
| + Exports the index template to stdout. You can specify the | |
| + <code class="literal"> | |
| + --es.version | |
| + </code> | |
| + and | |
| + <code class="literal"> | |
| + --index | |
| + </code> | |
| + flags to further define what gets exported. | |
| + </dd> | |
| + </dl> | |
| + </div> | |
| + <p> | |
| <span class="strong strong"> | |
| <strong> | |
| FLAGS | |
| html/en/apm/server/6.3/common-problems.html | |
| html/en/apm/server/6.3/configuration-dashboards.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.3/configuration-dashboards.html | |
| @@ -326,7 +326,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_enabled_literal"> | |
| + <a id="_setup_dashboards_enabled"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.enabled | |
| @@ -407,7 +407,7 @@ | |
| The file archive (zip file) that contains the dashboards to load. If this option is set, APM Server looks for a dashboard archive in the specified path instead of using the local directory. | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_beat_literal"> | |
| + <a id="_setup_dashboards_beat"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.beat | |
| @@ -424,7 +424,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_kibana_index_literal"> | |
| + <a id="_setup_dashboards_kibana_index"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.kibana_index | |
| @@ -440,7 +440,7 @@ | |
| </code> | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_index_literal"> | |
| + <a id="_setup_dashboards_index"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.index | |
| @@ -466,7 +466,7 @@ | |
| </div> | |
| </div> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_always_kibana_literal"> | |
| + <a id="_setup_dashboards_always_kibana"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.always_kibana | |
| @@ -483,7 +483,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_retry_enabled_literal"> | |
| + <a id="_setup_dashboards_retry_enabled"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.retry.enabled | |
| @@ -496,7 +496,7 @@ | |
| If this option is set to true, and Kibana is not reachable at the time when dashboards are loaded, APM Server will retry to reconnect to Kibana instead of exiting with an error. Disabled by default. | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_retry_interval_literal"> | |
| + <a id="_setup_dashboards_retry_interval"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.retry.interval | |
| @@ -509,7 +509,7 @@ | |
| Duration interval between Kibana connection retries. Defaults to 1 second. | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_retry_maximum_literal"> | |
| + <a id="_setup_dashboards_retry_maximum"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.retry.maximum | |
| html/en/apm/server/6.3/configuration-frontend.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.3/configuration-frontend.html | |
| @@ -348,7 +348,7 @@ | |
| . By default this is disabled. | |
| </p> | |
| <h4> | |
| - <a id="_literal_rate_limit_literal"> | |
| + <a id="_rate_limit"> | |
| </a> | |
| <code class="literal"> | |
| rate_limit | |
| @@ -365,7 +365,7 @@ | |
| . The rate limit cannot be disabled. Ensure to have it set to a number suiting your requirements. Default value is set to 10. | |
| </p> | |
| <h4> | |
| - <a id="_literal_allow_origins_literal"> | |
| + <a id="_allow_origins"> | |
| </a> | |
| <code class="literal"> | |
| allow_origins | |
| @@ -386,7 +386,7 @@ | |
| , which allows everything. | |
| </p> | |
| <h4> | |
| - <a id="_literal_library_pattern_literal"> | |
| + <a id="_library_pattern"> | |
| </a> | |
| <code class="literal"> | |
| library_pattern | |
| @@ -427,7 +427,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_exclude_from_grouping_literal"> | |
| + <a id="_exclude_from_grouping"> | |
| </a> | |
| <code class="literal"> | |
| exclude_from_grouping | |
| @@ -448,7 +448,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_source_mapping_cache_expiration_literal"> | |
| + <a id="_source_mapping_cache_expiration"> | |
| </a> | |
| <code class="literal"> | |
| source_mapping.cache.expiration | |
| @@ -465,7 +465,7 @@ | |
| is automatically applied to documents sent to the frontend endpoint. Source maps are fetched from Elasticsearch and then kept in an in-memory cache for the configured time. Values configured without a time unit are treated as seconds. Default value is 5 minutes. | |
| </p> | |
| <h4> | |
| - <a id="_literal_source_mapping_index_pattern_literal"> | |
| + <a id="_source_mapping_index_pattern"> | |
| </a> | |
| <code class="literal"> | |
| source_mapping.index_pattern | |
| html/en/apm/server/6.3/configuration-logging.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.3/configuration-logging.html | |
| @@ -333,7 +333,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_to_syslog_literal"> | |
| + <a id="_logging_to_syslog"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_syslog | |
| @@ -346,7 +346,7 @@ | |
| When true, writes all logging output to the syslog. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_to_eventlog_literal"> | |
| + <a id="_logging_to_eventlog"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_eventlog | |
| @@ -359,7 +359,7 @@ | |
| When true, writes all logging output to the Windows Event Log. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_to_files_literal"> | |
| + <a id="_logging_to_files"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_files | |
| @@ -512,7 +512,7 @@ | |
| also sets the debug log level). | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_metrics_enabled_literal"> | |
| + <a id="_logging_metrics_enabled"> | |
| </a> | |
| <code class="literal"> | |
| logging.metrics.enabled | |
| @@ -534,7 +534,7 @@ | |
| Note that we currently offer no backwards compatible guarantees for the internal metrics and for this reason they are also not documented. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_metrics_period_literal"> | |
| + <a id="_logging_metrics_period"> | |
| </a> | |
| <code class="literal"> | |
| logging.metrics.period | |
| @@ -547,7 +547,7 @@ | |
| The period after which to log the internal metrics. The default is 30s. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_path_literal"> | |
| + <a id="_logging_files_path"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.path | |
| @@ -564,7 +564,7 @@ | |
| section for details. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_name_literal"> | |
| + <a id="_logging_files_name"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.name | |
| @@ -583,7 +583,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_rotateeverybytes_literal"> | |
| + <a id="_logging_files_rotateeverybytes"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.rotateeverybytes | |
| @@ -596,7 +596,7 @@ | |
| The maximum size of a log file. If the limit is reached, a new log file is generated. The default size limit is 10485760 (10 MB). | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_keepfiles_literal"> | |
| + <a id="_logging_files_keepfiles"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.keepfiles | |
| @@ -613,7 +613,7 @@ | |
| options has to be in the range of 2 to 1024 files. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_permissions_literal"> | |
| + <a id="_logging_files_permissions"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.permissions | |
| @@ -652,7 +652,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_logging_json_literal"> | |
| + <a id="_logging_json"> | |
| </a> | |
| <code class="literal"> | |
| logging.json | |
| @@ -705,17 +705,17 @@ | |
| </p> | |
| <p> | |
| <code class="literal"> | |
| - 2017-12-17T18:54:16.241-0500 INFO logp/core_test.go:13 unnamed global logger | |
| - </code> | |
| - </p> | |
| - <p> | |
| - <code class="literal"> | |
| - 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:16 some message | |
| - </code> | |
| - </p> | |
| - <p> | |
| - <code class="literal"> | |
| - 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:19 some message {"x": 1} | |
| + 2017-12-17T18:54:16.241-0500 INFO logp/core_test.go:13 unnamed global logger | |
| + </code> | |
| + </p> | |
| + <p> | |
| + <code class="literal"> | |
| + 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:16 some message | |
| + </code> | |
| + </p> | |
| + <p> | |
| + <code class="literal"> | |
| + 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:19 some message {"x": 1} | |
| </code> | |
| </p> | |
| </div> | |
| html/en/apm/server/6.3/configuration-path.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.3/configuration-path.html | |
| @@ -329,7 +329,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_home_literal"> | |
| + <a id="_home"> | |
| </a> | |
| <code class="literal"> | |
| home | |
| @@ -348,7 +348,7 @@ | |
| <pre class="programlisting prettyprint lang-yaml">path.home: /usr/share/beats</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_config_literal"> | |
| + <a id="_config"> | |
| </a> | |
| <code class="literal"> | |
| config | |
| @@ -367,7 +367,7 @@ | |
| <pre class="programlisting prettyprint lang-yaml">path.config: /usr/share/beats/config</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_data_literal"> | |
| + <a id="_data"> | |
| </a> | |
| <code class="literal"> | |
| data | |
| @@ -390,7 +390,7 @@ | |
| <pre class="programlisting prettyprint lang-yaml">path.data: /var/lib/beats</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_logs_literal"> | |
| + <a id="_logs"> | |
| </a> | |
| <code class="literal"> | |
| logs | |
| html/en/apm/server/6.3/configuration-ssl.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.3/configuration-ssl.html | |
| @@ -330,7 +330,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_enabled_literal_2"> | |
| + <a id="_enabled_2"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -377,7 +377,7 @@ | |
| </div> | |
| </div> | |
| <h4> | |
| - <a id="_literal_certificate_authorities_literal"> | |
| + <a id="_certificate_authorities"> | |
| </a> | |
| <code class="literal"> | |
| certificate_authorities | |
| @@ -435,7 +435,7 @@ | |
| is specified. | |
| </p> | |
| <h4> | |
| - <a id="_literal_key_passphrase_literal"> | |
| + <a id="_key_passphrase"> | |
| </a> | |
| <code class="literal"> | |
| key_passphrase | |
| @@ -452,7 +452,7 @@ | |
| file. | |
| </p> | |
| <h4> | |
| - <a id="_literal_supported_protocols_literal"> | |
| + <a id="_supported_protocols"> | |
| </a> | |
| <code class="literal"> | |
| supported_protocols | |
| @@ -492,7 +492,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_verification_mode_literal"> | |
| + <a id="_verification_mode"> | |
| </a> | |
| <code class="literal"> | |
| verification_mode | |
| @@ -528,7 +528,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_cipher_suites_literal"> | |
| + <a id="_cipher_suites"> | |
| </a> | |
| <code class="literal"> | |
| cipher_suites | |
| @@ -627,7 +627,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_curve_types_literal"> | |
| + <a id="_curve_types"> | |
| </a> | |
| <code class="literal"> | |
| curve_types | |
| @@ -656,7 +656,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_renegotiation_literal"> | |
| + <a id="_renegotiation"> | |
| </a> | |
| <code class="literal"> | |
| renegotiation | |
| html/en/apm/server/6.3/configuration-template.html | |
| html/en/apm/server/6.3/configuring-howto-apm-server.html | |
| html/en/apm/server/6.3/configuring-output.html | |
| html/en/apm/server/6.3/directory-layout.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.3/directory-layout.html | |
| @@ -323,10 +323,6 @@ | |
| </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| - <p> | |
| - <code class="literal"> | |
| - </code> | |
| - </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| <p> | |
| @@ -359,10 +355,6 @@ | |
| </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| - <p> | |
| - <code class="literal"> | |
| - </code> | |
| - </p> | |
| </td> | |
| </tr> | |
| <tr> | |
| html/en/apm/server/6.3/elasticsearch-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.3/elasticsearch-output.html | |
| @@ -390,7 +390,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal"> | |
| + <a id="_enabled"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -514,7 +514,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_level_literal"> | |
| + <a id="_compression_level"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -541,7 +541,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_worker_literal"> | |
| + <a id="_worker"> | |
| </a> | |
| <code class="literal"> | |
| worker | |
| @@ -565,7 +565,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_username_literal"> | |
| + <a id="_username"> | |
| </a> | |
| <code class="literal"> | |
| username | |
| @@ -586,7 +586,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_password_literal"> | |
| + <a id="_password"> | |
| </a> | |
| <code class="literal"> | |
| password | |
| @@ -607,7 +607,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_parameters_literal"> | |
| + <a id="_parameters"> | |
| </a> | |
| <code class="literal"> | |
| parameters | |
| @@ -692,7 +692,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_headers_literal"> | |
| + <a id="_headers"> | |
| </a> | |
| <code class="literal"> | |
| headers | |
| @@ -720,7 +720,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_proxy_url_literal"> | |
| + <a id="_proxy_url"> | |
| </a> | |
| <code class="literal"> | |
| proxy_url | |
| @@ -798,7 +798,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_indices_literal"> | |
| + <a id="_indices"> | |
| </a> | |
| <code class="literal"> | |
| indices | |
| @@ -897,7 +897,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_max_retries_literal"> | |
| + <a id="_max_retries"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -928,7 +928,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal"> | |
| + <a id="_bulk_max_size"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -966,7 +966,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_timeout_literal"> | |
| + <a id="_timeout"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -987,7 +987,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ssl_literal"> | |
| + <a id="_ssl"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| html/en/apm/server/6.3/enable-apm-server-debugging.html | |
| html/en/apm/server/6.3/error-api.html | |
| html/en/apm/server/6.3/error-indices.html | |
| html/en/apm/server/6.3/errors.html | |
| html/en/apm/server/6.3/event-types.html | |
| html/en/apm/server/6.3/exploring-es-data.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.3/exploring-es-data.html | |
| @@ -286,8 +286,8 @@ | |
| <p> | |
| For getting an overview of existing indices you can run: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET _cat/indices/apm*</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET _cat/indices/apm*</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| @@ -344,24 +344,24 @@ | |
| <p> | |
| For querying all APM data: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET apm*/_search</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET apm*/_search</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| <p> | |
| Querying documents that have been collected with a specific APM Server version: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET apm-6.3.2-*/_search</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET apm-6.3.2-*/_search</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| <p> | |
| If you are only interested in specific document types, e.g. error documents you can use the type in your query: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET apm-*error-*/_search</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET apm-*error-*/_search</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| @@ -380,16 +380,16 @@ | |
| </span> | |
| applied to the Elastic APM indices, you can fetch the index templates. First run a query for figuring out which templates exist: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET _cat/templates/apm*</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET _cat/templates/apm*</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| <p> | |
| Then you can retrieve the specific template you are interested in by sending: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET /_template/your-template-name</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET /_template/your-template-name</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| html/en/apm/server/6.3/exported-fields-apm-error.html | |
| html/en/apm/server/6.3/exported-fields-apm-sourcemap.html | |
| html/en/apm/server/6.3/exported-fields-apm-span.html | |
| html/en/apm/server/6.3/exported-fields-apm-transaction.html | |
| html/en/apm/server/6.3/exported-fields-apm.html | |
| html/en/apm/server/6.3/exported-fields-beat.html | |
| html/en/apm/server/6.3/exported-fields-cloud.html | |
| html/en/apm/server/6.3/exported-fields-docker-processor.html | |
| html/en/apm/server/6.3/exported-fields-host-processor.html | |
| html/en/apm/server/6.3/exported-fields-kubernetes-processor.html | |
| html/en/apm/server/6.3/exported-fields.html | |
| html/en/apm/server/6.3/getting-help.html | |
| html/en/apm/server/6.3/healthcheck-indices.html | |
| html/en/apm/server/6.3/high-availability.html | |
| html/en/apm/server/6.3/index.html | |
| html/en/apm/server/6.3/installing-on-windows.html | |
| html/en/apm/server/6.3/installing.html | |
| html/en/apm/server/6.3/intake-api.html | |
| html/en/apm/server/6.3/keystore.html | |
| html/en/apm/server/6.3/load-kibana-dashboards.html | |
| html/en/apm/server/6.3/manage-indices-kibana.html | |
| html/en/apm/server/6.3/overview.html | |
| html/en/apm/server/6.3/reduce-storage.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.3/reduce-storage.html | |
| @@ -374,7 +374,7 @@ | |
| . With the curator command line interface you can, for instance, see all your existing indices: | |
| </p> | |
| <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">curator_cli --host localhost show_indices --filter_list '[{"filtertype":"pattern","kind":"prefix","value":"apm-"}]' | |
| + <pre class="programlisting prettyprint lang-sh">curator_cli --host localhost show_indices --filter_list '[\{"filtertype":"pattern","kind":"prefix","value":"apm-"\}]' | |
| apm-6.3.2-error-2018.05.10 | |
| apm-6.3.2-error-2018.05.11 | |
| @@ -391,7 +391,7 @@ | |
| And then delete any span indices older than 1 day: | |
| </p> | |
| <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">curator_cli --host localhost delete_indices --filter_list '[{"filtertype":"pattern","kind":"prefix","value":"apm-6.3.2-span-"}, {"filtertype":"age","source":"name","timestring":"%Y.%m.%d","unit":"days","unit_count":1,"direction":"older"}]' | |
| + <pre class="programlisting prettyprint lang-sh">curator_cli --host localhost delete_indices --filter_list '[\{"filtertype":"pattern","kind":"prefix","value":"apm-6.3.2-span-"\}, \{"filtertype":"age","source":"name","timestring":"%Y.%m.%d","unit":"days","unit_count":1,"direction":"older"\}]' | |
| INFO Deleting selected indices: [apm-6.3.2-span-2018.05.10, apm-6.3.2-span-2018.05.11] | |
| INFO ---deleting index apm-6.3.2-span-2018.05.10 | |
| @@ -413,8 +413,8 @@ | |
| </code> | |
| , you can do this by sending the following request: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST /apm-*/_delete_by_query | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST /apm-*/_delete_by_query | |
| { | |
| "query": { | |
| "bool": { | |
| html/en/apm/server/6.3/release-notes-6.1.0.html | |
| html/en/apm/server/6.3/release-notes-6.1.1.html | |
| html/en/apm/server/6.3/release-notes-6.1.2.html | |
| html/en/apm/server/6.3/release-notes-6.1.3.html | |
| html/en/apm/server/6.3/release-notes-6.1.4.html | |
| html/en/apm/server/6.3/release-notes-6.1.html | |
| html/en/apm/server/6.3/release-notes-6.2.0.html | |
| html/en/apm/server/6.3/release-notes-6.2.1.html | |
| html/en/apm/server/6.3/release-notes-6.2.2.html | |
| html/en/apm/server/6.3/release-notes-6.2.3.html | |
| html/en/apm/server/6.3/release-notes-6.2.4.html | |
| html/en/apm/server/6.3/release-notes-6.2.html | |
| html/en/apm/server/6.3/release-notes-6.3.0.html | |
| html/en/apm/server/6.3/release-notes-6.3.1.html | |
| html/en/apm/server/6.3/release-notes-6.3.2.html | |
| html/en/apm/server/6.3/release-notes-6.3.html | |
| html/en/apm/server/6.3/release-notes.html | |
| html/en/apm/server/6.3/rum.html | |
| html/en/apm/server/6.3/running-on-docker.html | |
| html/en/apm/server/6.3/security.html | |
| html/en/apm/server/6.3/setting-up-and-running.html | |
| html/en/apm/server/6.3/setup-kibana-endpoint.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.3/setup-kibana-endpoint.html | |
| @@ -319,7 +319,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_kibana_host_literal"> | |
| + <a id="_setup_kibana_host"> | |
| </a> | |
| <code class="literal"> | |
| setup.kibana.host | |
| @@ -442,7 +442,7 @@ | |
| setup.kibana.path: /kibana</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_setup_kibana_username_literal"> | |
| + <a id="_setup_kibana_username"> | |
| </a> | |
| <code class="literal"> | |
| setup.kibana.username | |
| @@ -459,7 +459,7 @@ | |
| specified for the Elasticsearch output. | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_kibana_password_literal"> | |
| + <a id="_setup_kibana_password"> | |
| </a> | |
| <code class="literal"> | |
| setup.kibana.password | |
| @@ -489,7 +489,7 @@ | |
| An HTTP path prefix that is prepended to the HTTP API calls. This is useful for the cases where Kibana listens behind an HTTP reverse proxy that exports the API under a custom prefix. | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_kibana_ssl_enabled_literal"> | |
| + <a id="_setup_kibana_ssl_enabled"> | |
| </a> | |
| <code class="literal"> | |
| setup.kibana.ssl.enabled | |
| html/en/apm/server/6.3/setup-repositories.html | |
| html/en/apm/server/6.3/sourcemap-api.html | |
| html/en/apm/server/6.3/sourcemap-indices.html | |
| html/en/apm/server/6.3/sourcemaps.html | |
| html/en/apm/server/6.3/span-indices.html | |
| html/en/apm/server/6.3/storage-management.html | |
| html/en/apm/server/6.3/toc.html | |
| html/en/apm/server/6.3/transaction-api.html | |
| html/en/apm/server/6.3/transaction-indices.html | |
| html/en/apm/server/6.3/transactions.html | |
| html/en/apm/server/6.3/troubleshooting.html | |
| html/en/apm/server/6.3/tune-apm-server.html | |
| html/en/apm/server/6.3/tune-data-ingestion.html | |
| html/en/apm/server/6.3/tune-es.html | |
| html/en/apm/server/6.3/update-existing-data.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.3/update-existing-data.html | |
| @@ -300,8 +300,8 @@ | |
| <p> | |
| For exampe, if you want to change the service name reported for your monitored data, you can do that by sending the following request: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST /apm-*/_update_by_query | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST /apm-*/_update_by_query | |
| { | |
| "query": { | |
| "term": { | |
| html/en/apm/server/6.3/using-environ-vars.html | |
| html/en/apm/server/6.3/why-separate-component.html | |
| html/en/apm/server/6.4/_manually_loading_template_configuration.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.4/_manually_loading_template_configuration.html | |
| @@ -445,13 +445,13 @@ | |
| </code> | |
| options to match the new name. For example: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">output.elasticsearch.index: "customname-%{[beat.version]}-%{+yyyy.MM.dd}" | |
| + </li> | |
| + </ul> | |
| + </div> | |
| + <div class="pre_wrapper lang-sh"> | |
| + <pre class="programlisting prettyprint lang-sh">output.elasticsearch.index: "customname-%{[beat.version]}-%{+yyyy.MM.dd}" | |
| setup.template.name: "customname" | |
| setup.template.pattern: "customname-*"</pre> | |
| - </div> | |
| - </li> | |
| - </ul> | |
| </div> | |
| <p> | |
| Also ensure to change the index name accordingly in the Kibana dashboards, when loading via the Kibana UI. | |
| html/en/apm/server/6.4/apm-server-configuration.html | |
| html/en/apm/server/6.4/beats-basic-auth.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.4/beats-basic-auth.html | |
| @@ -430,8 +430,8 @@ | |
| </code> | |
| roles: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST /_xpack/security/user/apm_internal | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST /_xpack/security/user/apm_internal | |
| { | |
| "password" : "YOUR_PASSWORD", | |
| "roles" : [ "apm_writer","kibana_user"], | |
| html/en/apm/server/6.4/beats-tls.html | |
| html/en/apm/server/6.4/beats-user-access.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.4/beats-user-access.html | |
| @@ -333,8 +333,8 @@ | |
| </code> | |
| : | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST _xpack/security/role/apm_reader | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST _xpack/security/role/apm_reader | |
| { | |
| "indices": [ | |
| { | |
| @@ -410,8 +410,8 @@ | |
| </code> | |
| roles: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST /_xpack/security/user/apm_user | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST /_xpack/security/user/apm_user | |
| { | |
| "password" : "YOUR_PASSWORD", | |
| "roles" : [ "apm_reader","kibana_user"], | |
| html/en/apm/server/6.4/breaking-changes.html | |
| html/en/apm/server/6.4/command-line-options.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.4/command-line-options.html | |
| @@ -521,33 +521,37 @@ | |
| </code> | |
| flag, this command exports the configuration that’s defined in the specified file. | |
| </dd> | |
| - <dt> | |
| - <span class="term"> | |
| - <span class="strong strong"> | |
| - <strong> | |
| - <code class="literal"> | |
| - template | |
| - </code> | |
| - </strong> | |
| - </span> | |
| - </span> | |
| - </dt> | |
| - <dd> | |
| - Exports the index template to stdout. You can specify the | |
| - <code class="literal"> | |
| - --es.version | |
| - </code> | |
| - and | |
| - <code class="literal"> | |
| - --index | |
| - </code> | |
| - flags to further define what gets exported. | |
| - </dd> | |
| </dl> | |
| </div> | |
| - <p> | |
| + <div class="variablelist"> | |
| <a id="template-subcommand"> | |
| </a> | |
| + <dl class="variablelist"> | |
| + <dt> | |
| + <span class="term"> | |
| + <span class="strong strong"> | |
| + <strong> | |
| + <code class="literal"> | |
| + template | |
| + </code> | |
| + </strong> | |
| + </span> | |
| + </span> | |
| + </dt> | |
| + <dd> | |
| + Exports the index template to stdout. You can specify the | |
| + <code class="literal"> | |
| + --es.version | |
| + </code> | |
| + and | |
| + <code class="literal"> | |
| + --index | |
| + </code> | |
| + flags to further define what gets exported. | |
| + </dd> | |
| + </dl> | |
| + </div> | |
| + <p> | |
| <span class="strong strong"> | |
| <strong> | |
| FLAGS | |
| @@ -1095,7 +1099,16 @@ | |
| </dt> | |
| <dd> | |
| <p class="simpara"> | |
| - deprecated:[6.4.0] | |
| + <span class="Admonishment"> | |
| + [ | |
| + <span class="Admonishment-version u-mono u-strikethrough"> | |
| + 6.4.0 | |
| + </span> | |
| + ] | |
| + <span class="Admonishment-detail"> | |
| + Deprecated in 6.4.0. | |
| + </span> | |
| + </span> | |
| </p> | |
| <p class="simpara"> | |
| Loads the initial setup, including Elasticsearch template, Kibana index pattern and Kibana dashboards. If you want to use the command without running APM Server, use the | |
| @@ -1203,7 +1216,16 @@ | |
| </dt> | |
| <dd> | |
| <p class="simpara"> | |
| - deprecated:[6.4.0] | |
| + <span class="Admonishment"> | |
| + [ | |
| + <span class="Admonishment-version u-mono u-strikethrough"> | |
| + 6.4.0 | |
| + </span> | |
| + ] | |
| + <span class="Admonishment-detail"> | |
| + Deprecated in 6.4.0. | |
| + </span> | |
| + </span> | |
| </p> | |
| <p class="simpara"> | |
| Sets up the Kibana dashboards only. | |
| html/en/apm/server/6.4/common-problems.html | |
| html/en/apm/server/6.4/configuration-dashboards.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.4/configuration-dashboards.html | |
| @@ -336,7 +336,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_enabled_literal"> | |
| + <a id="_setup_dashboards_enabled"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.enabled | |
| @@ -431,7 +431,7 @@ | |
| The file archive (zip file) that contains the dashboards to load. If this option is set, APM Server looks for a dashboard archive in the specified path instead of using the local directory. | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_beat_literal"> | |
| + <a id="_setup_dashboards_beat"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.beat | |
| @@ -448,7 +448,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_kibana_index_literal"> | |
| + <a id="_setup_dashboards_kibana_index"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.kibana_index | |
| @@ -464,7 +464,7 @@ | |
| </code> | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_index_literal"> | |
| + <a id="_setup_dashboards_index"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.index | |
| @@ -490,7 +490,7 @@ | |
| </div> | |
| </div> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_always_kibana_literal"> | |
| + <a id="_setup_dashboards_always_kibana"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.always_kibana | |
| @@ -507,7 +507,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_retry_enabled_literal"> | |
| + <a id="_setup_dashboards_retry_enabled"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.retry.enabled | |
| @@ -520,7 +520,7 @@ | |
| If this option is set to true, and Kibana is not reachable at the time when dashboards are loaded, APM Server will retry to reconnect to Kibana instead of exiting with an error. Disabled by default. | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_retry_interval_literal"> | |
| + <a id="_setup_dashboards_retry_interval"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.retry.interval | |
| @@ -533,7 +533,7 @@ | |
| Duration interval between Kibana connection retries. Defaults to 1 second. | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_retry_maximum_literal"> | |
| + <a id="_setup_dashboards_retry_maximum"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.retry.maximum | |
| html/en/apm/server/6.4/configuration-logging.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.4/configuration-logging.html | |
| @@ -333,7 +333,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_to_syslog_literal"> | |
| + <a id="_logging_to_syslog"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_syslog | |
| @@ -356,7 +356,7 @@ | |
| </div> | |
| </div> | |
| <h4> | |
| - <a id="_literal_logging_to_eventlog_literal"> | |
| + <a id="_logging_to_eventlog"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_eventlog | |
| @@ -369,7 +369,7 @@ | |
| When true, writes all logging output to the Windows Event Log. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_to_files_literal"> | |
| + <a id="_logging_to_files"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_files | |
| @@ -522,7 +522,7 @@ | |
| also sets the debug log level). | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_metrics_enabled_literal"> | |
| + <a id="_logging_metrics_enabled"> | |
| </a> | |
| <code class="literal"> | |
| logging.metrics.enabled | |
| @@ -544,7 +544,7 @@ | |
| Note that we currently offer no backwards compatible guarantees for the internal metrics and for this reason they are also not documented. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_metrics_period_literal"> | |
| + <a id="_logging_metrics_period"> | |
| </a> | |
| <code class="literal"> | |
| logging.metrics.period | |
| @@ -557,7 +557,7 @@ | |
| The period after which to log the internal metrics. The default is 30s. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_path_literal"> | |
| + <a id="_logging_files_path"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.path | |
| @@ -574,7 +574,7 @@ | |
| section for details. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_name_literal"> | |
| + <a id="_logging_files_name"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.name | |
| @@ -593,7 +593,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_rotateeverybytes_literal"> | |
| + <a id="_logging_files_rotateeverybytes"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.rotateeverybytes | |
| @@ -606,7 +606,7 @@ | |
| The maximum size of a log file. If the limit is reached, a new log file is generated. The default size limit is 10485760 (10 MB). | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_keepfiles_literal"> | |
| + <a id="_logging_files_keepfiles"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.keepfiles | |
| @@ -623,7 +623,7 @@ | |
| options has to be in the range of 2 to 1024 files. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_permissions_literal"> | |
| + <a id="_logging_files_permissions"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.permissions | |
| @@ -662,7 +662,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_logging_json_literal"> | |
| + <a id="_logging_json"> | |
| </a> | |
| <code class="literal"> | |
| logging.json | |
| @@ -715,17 +715,17 @@ | |
| </p> | |
| <p> | |
| <code class="literal"> | |
| - 2017-12-17T18:54:16.241-0500 INFO logp/core_test.go:13 unnamed global logger | |
| - </code> | |
| - </p> | |
| - <p> | |
| - <code class="literal"> | |
| - 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:16 some message | |
| - </code> | |
| - </p> | |
| - <p> | |
| - <code class="literal"> | |
| - 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:19 some message {"x": 1} | |
| + 2017-12-17T18:54:16.241-0500 INFO logp/core_test.go:13 unnamed global logger | |
| + </code> | |
| + </p> | |
| + <p> | |
| + <code class="literal"> | |
| + 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:16 some message | |
| + </code> | |
| + </p> | |
| + <p> | |
| + <code class="literal"> | |
| + 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:19 some message {"x": 1} | |
| </code> | |
| </p> | |
| </div> | |
| html/en/apm/server/6.4/configuration-output-codec.html | |
| html/en/apm/server/6.4/configuration-path.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.4/configuration-path.html | |
| @@ -329,7 +329,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_home_literal"> | |
| + <a id="_home"> | |
| </a> | |
| <code class="literal"> | |
| home | |
| @@ -348,7 +348,7 @@ | |
| <pre class="programlisting prettyprint lang-yaml">path.home: /usr/share/beats</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_config_literal"> | |
| + <a id="_config"> | |
| </a> | |
| <code class="literal"> | |
| config | |
| @@ -367,7 +367,7 @@ | |
| <pre class="programlisting prettyprint lang-yaml">path.config: /usr/share/beats/config</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_data_literal"> | |
| + <a id="_data"> | |
| </a> | |
| <code class="literal"> | |
| data | |
| @@ -390,7 +390,7 @@ | |
| <pre class="programlisting prettyprint lang-yaml">path.data: /var/lib/beats</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_logs_literal"> | |
| + <a id="_logs"> | |
| </a> | |
| <code class="literal"> | |
| logs | |
| html/en/apm/server/6.4/configuration-process.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.4/configuration-process.html | |
| @@ -294,7 +294,7 @@ | |
| max_procs: 4</pre> | |
| </div> | |
| <h3> | |
| - <a id="_configuration_options_literal_apm_server_literal"> | |
| + <a id="_configuration_options_apm_server"> | |
| </a> | |
| Configuration options | |
| <code class="literal"> | |
| @@ -535,7 +535,7 @@ | |
| Experimental Metrics endpoint for collecting application metrics. Enabled by default. | |
| </p> | |
| <h3> | |
| - <a id="_configuration_options_literal_queue_mem_literal"> | |
| + <a id="_configuration_options_queue_mem"> | |
| </a> | |
| Configuration options | |
| <code class="literal"> | |
| @@ -602,7 +602,7 @@ | |
| . Default value is 1 second. | |
| </p> | |
| <h3> | |
| - <a id="_configuration_options_literal_max_procs_literal"> | |
| + <a id="_configuration_options_max_procs"> | |
| </a> | |
| Configuration options | |
| <code class="literal"> | |
| html/en/apm/server/6.4/configuration-rum.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.4/configuration-rum.html | |
| @@ -332,7 +332,7 @@ | |
| . By default this is disabled. | |
| </p> | |
| <h4> | |
| - <a id="_literal_rate_limit_literal"> | |
| + <a id="_rate_limit"> | |
| </a> | |
| <code class="literal"> | |
| rate_limit | |
| @@ -349,7 +349,7 @@ | |
| . The rate limit cannot be disabled. Ensure to have it set to a number suiting your requirements. Default value is set to 10. | |
| </p> | |
| <h4> | |
| - <a id="_literal_allow_origins_literal"> | |
| + <a id="_allow_origins"> | |
| </a> | |
| <code class="literal"> | |
| allow_origins | |
| @@ -370,7 +370,7 @@ | |
| , which allows everything. | |
| </p> | |
| <h4> | |
| - <a id="_literal_library_pattern_literal"> | |
| + <a id="_library_pattern"> | |
| </a> | |
| <code class="literal"> | |
| library_pattern | |
| @@ -411,7 +411,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_exclude_from_grouping_literal"> | |
| + <a id="_exclude_from_grouping"> | |
| </a> | |
| <code class="literal"> | |
| exclude_from_grouping | |
| @@ -466,7 +466,7 @@ | |
| . This must be set when using an output other than Elasticsearch, and that output is writing to Elasticsearch. Othewise leave this section empty. | |
| </p> | |
| <h4> | |
| - <a id="_literal_source_mapping_index_pattern_literal"> | |
| + <a id="_source_mapping_index_pattern"> | |
| </a> | |
| <code class="literal"> | |
| source_mapping.index_pattern | |
| html/en/apm/server/6.4/configuration-ssl.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.4/configuration-ssl.html | |
| @@ -347,7 +347,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_enabled_literal_6"> | |
| + <a id="_enabled_6"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -394,7 +394,7 @@ | |
| </div> | |
| </div> | |
| <h4> | |
| - <a id="_literal_certificate_authorities_literal"> | |
| + <a id="_certificate_authorities"> | |
| </a> | |
| <code class="literal"> | |
| certificate_authorities | |
| @@ -452,7 +452,7 @@ | |
| is specified. | |
| </p> | |
| <h4> | |
| - <a id="_literal_key_passphrase_literal"> | |
| + <a id="_key_passphrase"> | |
| </a> | |
| <code class="literal"> | |
| key_passphrase | |
| @@ -469,7 +469,7 @@ | |
| file. | |
| </p> | |
| <h4> | |
| - <a id="_literal_supported_protocols_literal"> | |
| + <a id="_supported_protocols"> | |
| </a> | |
| <code class="literal"> | |
| supported_protocols | |
| @@ -509,7 +509,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_verification_mode_literal"> | |
| + <a id="_verification_mode"> | |
| </a> | |
| <code class="literal"> | |
| verification_mode | |
| @@ -545,7 +545,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_cipher_suites_literal"> | |
| + <a id="_cipher_suites"> | |
| </a> | |
| <code class="literal"> | |
| cipher_suites | |
| @@ -644,7 +644,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_curve_types_literal"> | |
| + <a id="_curve_types"> | |
| </a> | |
| <code class="literal"> | |
| curve_types | |
| @@ -673,7 +673,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_renegotiation_literal"> | |
| + <a id="_renegotiation"> | |
| </a> | |
| <code class="literal"> | |
| renegotiation | |
| html/en/apm/server/6.4/configuration-template.html | |
| html/en/apm/server/6.4/configure-cloud-id.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.4/configure-cloud-id.html | |
| @@ -310,7 +310,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_cloud_id_literal"> | |
| + <a id="_cloud_id"> | |
| </a> | |
| <code class="literal"> | |
| cloud.id | |
| @@ -339,7 +339,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_cloud_auth_literal"> | |
| + <a id="_cloud_auth"> | |
| </a> | |
| <code class="literal"> | |
| cloud.auth | |
| html/en/apm/server/6.4/configuring-howto-apm-server.html | |
| html/en/apm/server/6.4/configuring-ingest-node.html | |
| html/en/apm/server/6.4/configuring-output.html | |
| html/en/apm/server/6.4/configuring-ssl-logstash.html | |
| html/en/apm/server/6.4/console-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.4/console-output.html | |
| @@ -323,7 +323,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_pretty_literal"> | |
| + <a id="_pretty"> | |
| </a> | |
| <code class="literal"> | |
| pretty | |
| @@ -348,7 +348,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_codec_literal_3"> | |
| + <a id="_codec_3"> | |
| </a> | |
| <code class="literal"> | |
| codec | |
| @@ -384,7 +384,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_5"> | |
| + <a id="_enabled_5"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -408,7 +408,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal_4"> | |
| + <a id="_bulk_max_size_4"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| html/en/apm/server/6.4/directory-layout.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.4/directory-layout.html | |
| @@ -323,10 +323,6 @@ | |
| </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| - <p> | |
| - <code class="literal"> | |
| - </code> | |
| - </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| <p> | |
| @@ -359,10 +355,6 @@ | |
| </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| - <p> | |
| - <code class="literal"> | |
| - </code> | |
| - </p> | |
| </td> | |
| </tr> | |
| <tr> | |
| html/en/apm/server/6.4/elasticsearch-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.4/elasticsearch-output.html | |
| @@ -397,7 +397,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal"> | |
| + <a id="_enabled"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -521,7 +521,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_level_literal"> | |
| + <a id="_compression_level"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -548,7 +548,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_escape_html_literal"> | |
| + <a id="_escape_html"> | |
| </a> | |
| <code class="literal"> | |
| escape_html | |
| @@ -580,7 +580,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_worker_literal"> | |
| + <a id="_worker"> | |
| </a> | |
| <code class="literal"> | |
| worker | |
| @@ -604,7 +604,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_username_literal"> | |
| + <a id="_username"> | |
| </a> | |
| <code class="literal"> | |
| username | |
| @@ -625,7 +625,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_password_literal"> | |
| + <a id="_password"> | |
| </a> | |
| <code class="literal"> | |
| password | |
| @@ -646,7 +646,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_parameters_literal"> | |
| + <a id="_parameters"> | |
| </a> | |
| <code class="literal"> | |
| parameters | |
| @@ -731,7 +731,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_headers_literal"> | |
| + <a id="_headers"> | |
| </a> | |
| <code class="literal"> | |
| headers | |
| @@ -759,7 +759,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_proxy_url_literal"> | |
| + <a id="_proxy_url"> | |
| </a> | |
| <code class="literal"> | |
| proxy_url | |
| @@ -835,15 +835,24 @@ | |
| ). | |
| </p> | |
| <p> | |
| - deprecated:[6.4.0] | |
| - </p> | |
| - </div> | |
| - <div class="section"> | |
| - <div class="titlepage"> | |
| - <div> | |
| - <div> | |
| - <h4 class="title"> | |
| - <a id="_literal_indices_literal"> | |
| + <span class="Admonishment"> | |
| + [ | |
| + <span class="Admonishment-version u-mono u-strikethrough"> | |
| + 6.4.0 | |
| + </span> | |
| + ] | |
| + <span class="Admonishment-detail"> | |
| + Deprecated in 6.4.0. | |
| + </span> | |
| + </span> | |
| + </p> | |
| + </div> | |
| + <div class="section"> | |
| + <div class="titlepage"> | |
| + <div> | |
| + <div> | |
| + <h4 class="title"> | |
| + <a id="_indices"> | |
| </a> | |
| <code class="literal"> | |
| indices | |
| @@ -942,7 +951,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_pipeline_literal"> | |
| + <a id="_pipeline"> | |
| </a> | |
| <code class="literal"> | |
| pipeline | |
| @@ -977,7 +986,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_pipelines_literal"> | |
| + <a id="_pipelines"> | |
| </a> | |
| <code class="literal"> | |
| pipelines | |
| @@ -1043,7 +1052,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_max_retries_literal"> | |
| + <a id="_max_retries"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -1074,7 +1083,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal"> | |
| + <a id="_bulk_max_size"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -1112,7 +1121,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_init_literal"> | |
| + <a id="_backoff_init"> | |
| </a> | |
| <code class="literal"> | |
| backoff.init | |
| @@ -1141,7 +1150,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_max_literal"> | |
| + <a id="_backoff_max"> | |
| </a> | |
| <code class="literal"> | |
| backoff.max | |
| @@ -1162,7 +1171,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_timeout_literal"> | |
| + <a id="_timeout"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -1183,7 +1192,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ssl_literal"> | |
| + <a id="_ssl"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| html/en/apm/server/6.4/enable-apm-server-debugging.html | |
| html/en/apm/server/6.4/error-api.html | |
| html/en/apm/server/6.4/error-indices.html | |
| html/en/apm/server/6.4/errors.html | |
| html/en/apm/server/6.4/event-types.html | |
| html/en/apm/server/6.4/exploring-es-data.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.4/exploring-es-data.html | |
| @@ -293,8 +293,8 @@ | |
| <p> | |
| To get an overview of existing indices you can run: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET _cat/indices/apm*</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET _cat/indices/apm*</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| @@ -344,16 +344,16 @@ | |
| <p> | |
| To query all documents collected with a specific APM Server version: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET apm-6.4.3-*/_search</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET apm-6.4.3-*/_search</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| <p> | |
| To query a specific type, for example transactions: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET apm-*transactions-*/_search</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET apm-*transactions-*/_search</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| @@ -372,16 +372,16 @@ | |
| </span> | |
| of the Elastic APM indices, first run a query to find template names: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET _cat/templates/apm*</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET _cat/templates/apm*</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| <p> | |
| Then you can retrieve the specific template you are interested in: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET /_template/your-template-name</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET /_template/your-template-name</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| html/en/apm/server/6.4/exported-fields-apm-error.html | |
| html/en/apm/server/6.4/exported-fields-apm-sourcemap.html | |
| html/en/apm/server/6.4/exported-fields-apm-span.html | |
| html/en/apm/server/6.4/exported-fields-apm-transaction.html | |
| html/en/apm/server/6.4/exported-fields-apm.html | |
| html/en/apm/server/6.4/exported-fields-beat.html | |
| html/en/apm/server/6.4/exported-fields-cloud.html | |
| html/en/apm/server/6.4/exported-fields-docker-processor.html | |
| html/en/apm/server/6.4/exported-fields-host-processor.html | |
| html/en/apm/server/6.4/exported-fields-kubernetes-processor.html | |
| html/en/apm/server/6.4/exported-fields-system.html | |
| html/en/apm/server/6.4/exported-fields.html | |
| html/en/apm/server/6.4/file-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.4/file-output.html | |
| @@ -327,7 +327,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_4"> | |
| + <a id="_enabled_4"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -372,7 +372,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_filename_literal"> | |
| + <a id="_filename"> | |
| </a> | |
| <code class="literal"> | |
| filename | |
| @@ -393,7 +393,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_rotate_every_kb_literal"> | |
| + <a id="_rotate_every_kb"> | |
| </a> | |
| <code class="literal"> | |
| rotate_every_kb | |
| @@ -414,7 +414,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_number_of_files_literal"> | |
| + <a id="_number_of_files"> | |
| </a> | |
| <code class="literal"> | |
| number_of_files | |
| @@ -441,7 +441,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_permissions_literal"> | |
| + <a id="_permissions"> | |
| </a> | |
| <code class="literal"> | |
| permissions | |
| @@ -462,7 +462,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_codec_literal_2"> | |
| + <a id="_codec_2"> | |
| </a> | |
| <code class="literal"> | |
| codec | |
| html/en/apm/server/6.4/getting-help.html | |
| html/en/apm/server/6.4/high-availability.html | |
| html/en/apm/server/6.4/index.html | |
| html/en/apm/server/6.4/installing-on-windows.html | |
| html/en/apm/server/6.4/installing.html | |
| html/en/apm/server/6.4/intake-api.html | |
| html/en/apm/server/6.4/kafka-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.4/kafka-output.html | |
| @@ -377,7 +377,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_3"> | |
| + <a id="_enabled_3"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -405,7 +405,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_hosts_literal"> | |
| + <a id="_hosts"> | |
| </a> | |
| <code class="literal"> | |
| hosts | |
| @@ -426,7 +426,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_version_literal"> | |
| + <a id="_version"> | |
| </a> | |
| <code class="literal"> | |
| version | |
| @@ -461,7 +461,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_username_literal_2"> | |
| + <a id="_username_2"> | |
| </a> | |
| <code class="literal"> | |
| username | |
| @@ -482,7 +482,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_password_literal_2"> | |
| + <a id="_password_2"> | |
| </a> | |
| <code class="literal"> | |
| password | |
| @@ -503,7 +503,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_topic_literal"> | |
| + <a id="_topic"> | |
| </a> | |
| <code class="literal"> | |
| topic | |
| @@ -541,7 +541,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_topics_literal"> | |
| + <a id="_topics"> | |
| </a> | |
| <code class="literal"> | |
| topics | |
| @@ -621,7 +621,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_key_literal"> | |
| + <a id="_key"> | |
| </a> | |
| <code class="literal"> | |
| key | |
| @@ -642,7 +642,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_partition_literal"> | |
| + <a id="_partition"> | |
| </a> | |
| <code class="literal"> | |
| partition | |
| @@ -748,7 +748,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_client_id_literal"> | |
| + <a id="_client_id"> | |
| </a> | |
| <code class="literal"> | |
| client_id | |
| @@ -769,7 +769,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_worker_literal_3"> | |
| + <a id="_worker_3"> | |
| </a> | |
| <code class="literal"> | |
| worker | |
| @@ -790,7 +790,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_codec_literal"> | |
| + <a id="_codec"> | |
| </a> | |
| <code class="literal"> | |
| codec | |
| @@ -822,7 +822,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_metadata_literal"> | |
| + <a id="_metadata"> | |
| </a> | |
| <code class="literal"> | |
| metadata | |
| @@ -889,7 +889,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_max_retries_literal_3"> | |
| + <a id="_max_retries_3"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -920,7 +920,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal_3"> | |
| + <a id="_bulk_max_size_3"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -941,7 +941,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_timeout_literal_3"> | |
| + <a id="_timeout_3"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -962,7 +962,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_broker_timeout_literal"> | |
| + <a id="_broker_timeout"> | |
| </a> | |
| <code class="literal"> | |
| broker_timeout | |
| @@ -983,7 +983,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_channel_buffer_size_literal"> | |
| + <a id="_channel_buffer_size"> | |
| </a> | |
| <code class="literal"> | |
| channel_buffer_size | |
| @@ -1004,7 +1004,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_keep_alive_literal"> | |
| + <a id="_keep_alive"> | |
| </a> | |
| <code class="literal"> | |
| keep_alive | |
| @@ -1025,7 +1025,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_literal"> | |
| + <a id="_compression"> | |
| </a> | |
| <code class="literal"> | |
| compression | |
| @@ -1091,7 +1091,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_required_acks_literal"> | |
| + <a id="_required_acks"> | |
| </a> | |
| <code class="literal"> | |
| required_acks | |
| @@ -1115,7 +1115,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ssl_literal_3"> | |
| + <a id="_ssl_3"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| html/en/apm/server/6.4/keystore.html | |
| html/en/apm/server/6.4/linux-seccomp.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.4/linux-seccomp.html | |
| @@ -469,6 +469,12 @@ | |
| <dd> | |
| A list of system call names. The system call name must exist for the runtime architecture, otherwise an error will be logged and the filter will not be installed. At least one system call must be defined. | |
| </dd> | |
| + </dl> | |
| + </div> | |
| + <div class="variablelist"> | |
| + <a id="seccomp-policy-config-action"> | |
| + </a> | |
| + <dl class="variablelist"> | |
| <dt> | |
| <span class="term"> | |
| <span class="strong strong"> | |
| @@ -489,8 +495,6 @@ | |
| is executed. This is required. These are the available action values. The actions that are available depend on the kernel version. | |
| </p> | |
| <div class="itemizedlist"> | |
| - <a id="seccomp-policy-config-action"> | |
| - </a> | |
| <ul class="itemizedlist" type="disc"> | |
| <li class="listitem"> | |
| <code class="literal"> | |
| html/en/apm/server/6.4/load-kibana-dashboards.html | |
| html/en/apm/server/6.4/logstash-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.4/logstash-output.html | |
| @@ -293,6 +293,9 @@ | |
| <img alt="Important" src="images/icons/important.png"/> | |
| </div> | |
| <div class="admon_content"> | |
| + <h3> | |
| + Prerequisite | |
| + </h3> | |
| <p> | |
| To send events to Logstash, you also need to create a Logstash configuration pipeline that listens for incoming Beats connections and indexes the received events into Elasticsearch. For more information, see the section about | |
| <a class="ulink" href="https://www.elastic.co/guide/en/elastic-stack-overview/6.4/get-started-elastic-stack.html#logstash-setup" target="_top"> | |
| @@ -595,7 +598,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_2"> | |
| + <a id="_enabled_2"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -649,7 +652,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_level_literal_2"> | |
| + <a id="_compression_level_2"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -676,7 +679,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_escape_html_literal_2"> | |
| + <a id="_escape_html_2"> | |
| </a> | |
| <code class="literal"> | |
| escape_html | |
| @@ -708,7 +711,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_worker_literal_2"> | |
| + <a id="_worker_2"> | |
| </a> | |
| <code class="literal"> | |
| worker | |
| @@ -756,7 +759,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ttl_literal"> | |
| + <a id="_ttl"> | |
| </a> | |
| <code class="literal"> | |
| ttl | |
| @@ -790,7 +793,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_pipelining_literal"> | |
| + <a id="_pipelining"> | |
| </a> | |
| <code class="literal"> | |
| pipelining | |
| @@ -852,7 +855,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_proxy_url_literal_2"> | |
| + <a id="_proxy_url_2"> | |
| </a> | |
| <code class="literal"> | |
| proxy_url | |
| @@ -952,7 +955,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ssl_literal_2"> | |
| + <a id="_ssl_2"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| @@ -983,7 +986,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_timeout_literal_2"> | |
| + <a id="_timeout_2"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -1004,7 +1007,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_max_retries_literal_2"> | |
| + <a id="_max_retries_2"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -1035,7 +1038,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal_2"> | |
| + <a id="_bulk_max_size_2"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -1073,7 +1076,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_slow_start_literal"> | |
| + <a id="_slow_start"> | |
| </a> | |
| <code class="literal"> | |
| slow_start | |
| @@ -1105,7 +1108,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_init_literal_2"> | |
| + <a id="_backoff_init_2"> | |
| </a> | |
| <code class="literal"> | |
| backoff.init | |
| @@ -1134,7 +1137,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_max_literal_2"> | |
| + <a id="_backoff_max_2"> | |
| </a> | |
| <code class="literal"> | |
| backoff.max | |
| html/en/apm/server/6.4/manage-indices-kibana.html | |
| html/en/apm/server/6.4/overview.html | |
| html/en/apm/server/6.4/reduce-storage.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.4/reduce-storage.html | |
| @@ -366,7 +366,7 @@ | |
| . With the curator command line interface you can, for instance, see all your existing indices: | |
| </p> | |
| <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">curator_cli --host localhost show_indices --filter_list '[{"filtertype":"pattern","kind":"prefix","value":"apm-"}]' | |
| + <pre class="programlisting prettyprint lang-sh">curator_cli --host localhost show_indices --filter_list '[\{"filtertype":"pattern","kind":"prefix","value":"apm-"\}]' | |
| apm-6.4.3-error-2018.05.10 | |
| apm-6.4.3-error-2018.05.11 | |
| @@ -383,7 +383,7 @@ | |
| And then delete any span indices older than 1 day: | |
| </p> | |
| <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">curator_cli --host localhost delete_indices --filter_list '[{"filtertype":"pattern","kind":"prefix","value":"apm-6.4.3-span-"}, {"filtertype":"age","source":"name","timestring":"%Y.%m.%d","unit":"days","unit_count":1,"direction":"older"}]' | |
| + <pre class="programlisting prettyprint lang-sh">curator_cli --host localhost delete_indices --filter_list '[\{"filtertype":"pattern","kind":"prefix","value":"apm-6.4.3-span-"\}, \{"filtertype":"age","source":"name","timestring":"%Y.%m.%d","unit":"days","unit_count":1,"direction":"older"\}]' | |
| INFO Deleting selected indices: [apm-6.4.3-span-2018.05.10, apm-6.4.3-span-2018.05.11] | |
| INFO ---deleting index apm-6.4.3-span-2018.05.10 | |
| @@ -401,8 +401,8 @@ | |
| <p> | |
| To delete documents matching a specific query, for example, all documents with a given context.service.name, use the following request: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST /apm-*/_delete_by_query | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST /apm-*/_delete_by_query | |
| { | |
| "query": { | |
| "bool": { | |
| html/en/apm/server/6.4/release-notes-6.1.0.html | |
| html/en/apm/server/6.4/release-notes-6.1.1.html | |
| html/en/apm/server/6.4/release-notes-6.1.2.html | |
| html/en/apm/server/6.4/release-notes-6.1.3.html | |
| html/en/apm/server/6.4/release-notes-6.1.4.html | |
| html/en/apm/server/6.4/release-notes-6.1.html | |
| html/en/apm/server/6.4/release-notes-6.2.0.html | |
| html/en/apm/server/6.4/release-notes-6.2.1.html | |
| html/en/apm/server/6.4/release-notes-6.2.2.html | |
| html/en/apm/server/6.4/release-notes-6.2.3.html | |
| html/en/apm/server/6.4/release-notes-6.2.4.html | |
| html/en/apm/server/6.4/release-notes-6.2.html | |
| html/en/apm/server/6.4/release-notes-6.3.0.html | |
| html/en/apm/server/6.4/release-notes-6.3.1.html | |
| html/en/apm/server/6.4/release-notes-6.3.2.html | |
| html/en/apm/server/6.4/release-notes-6.3.html | |
| html/en/apm/server/6.4/release-notes-6.4.0.html | |
| html/en/apm/server/6.4/release-notes-6.4.1.html | |
| html/en/apm/server/6.4/release-notes-6.4.2.html | |
| html/en/apm/server/6.4/release-notes-6.4.3.html | |
| html/en/apm/server/6.4/release-notes-6.4.html | |
| html/en/apm/server/6.4/release-notes.html | |
| html/en/apm/server/6.4/rum.html | |
| html/en/apm/server/6.4/running-on-docker.html | |
| html/en/apm/server/6.4/securing-apm-server.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.4/securing-apm-server.html | |
| @@ -313,7 +313,7 @@ | |
| <a id="security-overview"> | |
| </a> | |
| Security Overview | |
| - <a class="edit_me" href="https://github.com/elastic/apm-server/edit/6.4/docs/security.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| + <a class="edit_me" href="https://github.com/elastic/apm-server/edit/6.4/docs/copied-from-beats/shared-securing-beat.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| edit | |
| </a> | |
| </h3> | |
| @@ -324,7 +324,7 @@ | |
| <a id="secret-token"> | |
| </a> | |
| Secret token | |
| - <a class="edit_me" href="https://github.com/elastic/apm-server/edit/6.4/docs/security.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| + <a class="edit_me" href="https://github.com/elastic/apm-server/edit/6.4/docs/copied-from-beats/shared-securing-beat.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| edit | |
| </a> | |
| </h4> | |
| @@ -345,7 +345,7 @@ | |
| <a id="ssl-setup"> | |
| </a> | |
| SSL/TLS setup | |
| - <a class="edit_me" href="https://github.com/elastic/apm-server/edit/6.4/docs/security.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| + <a class="edit_me" href="https://github.com/elastic/apm-server/edit/6.4/docs/copied-from-beats/shared-securing-beat.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| edit | |
| </a> | |
| </h4> | |
| html/en/apm/server/6.4/securing-beats.html | |
| html/en/apm/server/6.4/securing-communication-elasticsearch.html | |
| html/en/apm/server/6.4/setting-up-and-running.html | |
| html/en/apm/server/6.4/setup-kibana-endpoint.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.4/setup-kibana-endpoint.html | |
| @@ -329,7 +329,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_kibana_host_literal"> | |
| + <a id="_setup_kibana_host"> | |
| </a> | |
| <code class="literal"> | |
| setup.kibana.host | |
| @@ -452,7 +452,7 @@ | |
| setup.kibana.path: /kibana</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_setup_kibana_username_literal"> | |
| + <a id="_setup_kibana_username"> | |
| </a> | |
| <code class="literal"> | |
| setup.kibana.username | |
| @@ -469,7 +469,7 @@ | |
| specified for the Elasticsearch output. | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_kibana_password_literal"> | |
| + <a id="_setup_kibana_password"> | |
| </a> | |
| <code class="literal"> | |
| setup.kibana.password | |
| @@ -499,7 +499,7 @@ | |
| An HTTP path prefix that is prepended to the HTTP API calls. This is useful for the cases where Kibana listens behind an HTTP reverse proxy that exports the API under a custom prefix. | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_kibana_ssl_enabled_literal"> | |
| + <a id="_setup_kibana_ssl_enabled"> | |
| </a> | |
| <code class="literal"> | |
| setup.kibana.ssl.enabled | |
| html/en/apm/server/6.4/setup-repositories.html | |
| html/en/apm/server/6.4/sourcemap-api.html | |
| html/en/apm/server/6.4/sourcemap-indices.html | |
| html/en/apm/server/6.4/sourcemaps.html | |
| html/en/apm/server/6.4/span-indices.html | |
| html/en/apm/server/6.4/storage-management.html | |
| html/en/apm/server/6.4/toc.html | |
| html/en/apm/server/6.4/transaction-api.html | |
| html/en/apm/server/6.4/transaction-indices.html | |
| html/en/apm/server/6.4/transactions.html | |
| html/en/apm/server/6.4/troubleshooting.html | |
| html/en/apm/server/6.4/tune-apm-server.html | |
| html/en/apm/server/6.4/tune-data-ingestion.html | |
| html/en/apm/server/6.4/tune-es.html | |
| html/en/apm/server/6.4/update-existing-data.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.4/update-existing-data.html | |
| @@ -300,8 +300,8 @@ | |
| <p> | |
| To rename a service send the following request: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST /apm-*/_update_by_query | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST /apm-*/_update_by_query | |
| { | |
| "query": { | |
| "term": { | |
| html/en/apm/server/6.4/upgrading.html | |
| html/en/apm/server/6.4/using-environ-vars.html | |
| html/en/apm/server/6.4/why-separate-component.html | |
| html/en/apm/server/6.5/_manually_loading_template_configuration.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.5/_manually_loading_template_configuration.html | |
| @@ -445,13 +445,13 @@ | |
| </code> | |
| options to match the new name. For example: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">output.elasticsearch.index: "customname-%{[beat.version]}-%{+yyyy.MM.dd}" | |
| + </li> | |
| + </ul> | |
| + </div> | |
| + <div class="pre_wrapper lang-sh"> | |
| + <pre class="programlisting prettyprint lang-sh">output.elasticsearch.index: "customname-%{[beat.version]}-%{+yyyy.MM.dd}" | |
| setup.template.name: "customname" | |
| setup.template.pattern: "customname-*"</pre> | |
| - </div> | |
| - </li> | |
| - </ul> | |
| </div> | |
| <p> | |
| Also ensure to change the index name accordingly in the Kibana dashboards, when loading via the Kibana UI. | |
| html/en/apm/server/6.5/apm-server-configuration.html | |
| html/en/apm/server/6.5/beats-basic-auth.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.5/beats-basic-auth.html | |
| @@ -430,8 +430,8 @@ | |
| </code> | |
| roles: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST /_xpack/security/user/apm_internal | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST /_xpack/security/user/apm_internal | |
| { | |
| "password" : "YOUR_PASSWORD", | |
| "roles" : [ "apm_writer","kibana_user"], | |
| html/en/apm/server/6.5/beats-system-user.html | |
| html/en/apm/server/6.5/beats-tls.html | |
| html/en/apm/server/6.5/beats-user-access.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.5/beats-user-access.html | |
| @@ -333,8 +333,8 @@ | |
| </code> | |
| : | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST _xpack/security/role/apm_reader | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST _xpack/security/role/apm_reader | |
| { | |
| "indices": [ | |
| { | |
| @@ -410,8 +410,8 @@ | |
| </code> | |
| roles: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST /_xpack/security/user/apm_user | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST /_xpack/security/user/apm_user | |
| { | |
| "password" : "YOUR_PASSWORD", | |
| "roles" : [ "apm_reader","kibana_user"], | |
| html/en/apm/server/6.5/breaking-changes.html | |
| html/en/apm/server/6.5/command-line-options.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.5/command-line-options.html | |
| @@ -581,33 +581,37 @@ | |
| must be adjusted. | |
| </p> | |
| </dd> | |
| - <dt> | |
| - <span class="term"> | |
| - <span class="strong strong"> | |
| - <strong> | |
| - <code class="literal"> | |
| - template | |
| - </code> | |
| - </strong> | |
| - </span> | |
| - </span> | |
| - </dt> | |
| - <dd> | |
| - Exports the index template to stdout. You can specify the | |
| - <code class="literal"> | |
| - --es.version | |
| - </code> | |
| - and | |
| - <code class="literal"> | |
| - --index | |
| - </code> | |
| - flags to further define what gets exported. | |
| - </dd> | |
| </dl> | |
| </div> | |
| - <p> | |
| + <div class="variablelist"> | |
| <a id="template-subcommand"> | |
| </a> | |
| + <dl class="variablelist"> | |
| + <dt> | |
| + <span class="term"> | |
| + <span class="strong strong"> | |
| + <strong> | |
| + <code class="literal"> | |
| + template | |
| + </code> | |
| + </strong> | |
| + </span> | |
| + </span> | |
| + </dt> | |
| + <dd> | |
| + Exports the index template to stdout. You can specify the | |
| + <code class="literal"> | |
| + --es.version | |
| + </code> | |
| + and | |
| + <code class="literal"> | |
| + --index | |
| + </code> | |
| + flags to further define what gets exported. | |
| + </dd> | |
| + </dl> | |
| + </div> | |
| + <p> | |
| <span class="strong strong"> | |
| <strong> | |
| FLAGS | |
| @@ -1155,7 +1159,16 @@ | |
| </dt> | |
| <dd> | |
| <p class="simpara"> | |
| - deprecated:[6.4.0] | |
| + <span class="Admonishment"> | |
| + [ | |
| + <span class="Admonishment-version u-mono u-strikethrough"> | |
| + 6.4.0 | |
| + </span> | |
| + ] | |
| + <span class="Admonishment-detail"> | |
| + Deprecated in 6.4.0. | |
| + </span> | |
| + </span> | |
| </p> | |
| <p class="simpara"> | |
| Loads the initial setup, including Elasticsearch template, Kibana index pattern and Kibana dashboards. If you want to use the command without running APM Server, use the | |
| @@ -1263,7 +1276,16 @@ | |
| </dt> | |
| <dd> | |
| <p class="simpara"> | |
| - deprecated:[6.4.0] | |
| + <span class="Admonishment"> | |
| + [ | |
| + <span class="Admonishment-version u-mono u-strikethrough"> | |
| + 6.4.0 | |
| + </span> | |
| + ] | |
| + <span class="Admonishment-detail"> | |
| + Deprecated in 6.4.0. | |
| + </span> | |
| + </span> | |
| </p> | |
| <p class="simpara"> | |
| Sets up the Kibana dashboards only. | |
| html/en/apm/server/6.5/common-problems.html | |
| html/en/apm/server/6.5/configuration-dashboards.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.5/configuration-dashboards.html | |
| @@ -336,7 +336,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_enabled_literal"> | |
| + <a id="_setup_dashboards_enabled"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.enabled | |
| @@ -431,7 +431,7 @@ | |
| The file archive (zip file) that contains the dashboards to load. If this option is set, APM Server looks for a dashboard archive in the specified path instead of using the local directory. | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_beat_literal"> | |
| + <a id="_setup_dashboards_beat"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.beat | |
| @@ -448,7 +448,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_kibana_index_literal"> | |
| + <a id="_setup_dashboards_kibana_index"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.kibana_index | |
| @@ -464,7 +464,7 @@ | |
| </code> | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_index_literal"> | |
| + <a id="_setup_dashboards_index"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.index | |
| @@ -490,7 +490,7 @@ | |
| </div> | |
| </div> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_always_kibana_literal"> | |
| + <a id="_setup_dashboards_always_kibana"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.always_kibana | |
| @@ -507,7 +507,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_retry_enabled_literal"> | |
| + <a id="_setup_dashboards_retry_enabled"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.retry.enabled | |
| @@ -520,7 +520,7 @@ | |
| If this option is set to true, and Kibana is not reachable at the time when dashboards are loaded, APM Server will retry to reconnect to Kibana instead of exiting with an error. Disabled by default. | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_retry_interval_literal"> | |
| + <a id="_setup_dashboards_retry_interval"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.retry.interval | |
| @@ -533,7 +533,7 @@ | |
| Duration interval between Kibana connection retries. Defaults to 1 second. | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_retry_maximum_literal"> | |
| + <a id="_setup_dashboards_retry_maximum"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.retry.maximum | |
| html/en/apm/server/6.5/configuration-logging.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.5/configuration-logging.html | |
| @@ -333,7 +333,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_to_syslog_literal"> | |
| + <a id="_logging_to_syslog"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_syslog | |
| @@ -356,7 +356,7 @@ | |
| </div> | |
| </div> | |
| <h4> | |
| - <a id="_literal_logging_to_eventlog_literal"> | |
| + <a id="_logging_to_eventlog"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_eventlog | |
| @@ -369,7 +369,7 @@ | |
| When true, writes all logging output to the Windows Event Log. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_to_files_literal"> | |
| + <a id="_logging_to_files"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_files | |
| @@ -522,7 +522,7 @@ | |
| also sets the debug log level). | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_metrics_enabled_literal"> | |
| + <a id="_logging_metrics_enabled"> | |
| </a> | |
| <code class="literal"> | |
| logging.metrics.enabled | |
| @@ -544,7 +544,7 @@ | |
| Note that we currently offer no backwards compatible guarantees for the internal metrics and for this reason they are also not documented. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_metrics_period_literal"> | |
| + <a id="_logging_metrics_period"> | |
| </a> | |
| <code class="literal"> | |
| logging.metrics.period | |
| @@ -557,7 +557,7 @@ | |
| The period after which to log the internal metrics. The default is 30s. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_path_literal"> | |
| + <a id="_logging_files_path"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.path | |
| @@ -574,7 +574,7 @@ | |
| section for details. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_name_literal"> | |
| + <a id="_logging_files_name"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.name | |
| @@ -593,7 +593,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_rotateeverybytes_literal"> | |
| + <a id="_logging_files_rotateeverybytes"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.rotateeverybytes | |
| @@ -606,7 +606,7 @@ | |
| The maximum size of a log file. If the limit is reached, a new log file is generated. The default size limit is 10485760 (10 MB). | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_keepfiles_literal"> | |
| + <a id="_logging_files_keepfiles"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.keepfiles | |
| @@ -623,7 +623,7 @@ | |
| options has to be in the range of 2 to 1024 files. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_permissions_literal"> | |
| + <a id="_logging_files_permissions"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.permissions | |
| @@ -662,7 +662,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_logging_json_literal"> | |
| + <a id="_logging_json"> | |
| </a> | |
| <code class="literal"> | |
| logging.json | |
| @@ -715,17 +715,17 @@ | |
| </p> | |
| <p> | |
| <code class="literal"> | |
| - 2017-12-17T18:54:16.241-0500 INFO logp/core_test.go:13 unnamed global logger | |
| - </code> | |
| - </p> | |
| - <p> | |
| - <code class="literal"> | |
| - 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:16 some message | |
| - </code> | |
| - </p> | |
| - <p> | |
| - <code class="literal"> | |
| - 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:19 some message {"x": 1} | |
| + 2017-12-17T18:54:16.241-0500 INFO logp/core_test.go:13 unnamed global logger | |
| + </code> | |
| + </p> | |
| + <p> | |
| + <code class="literal"> | |
| + 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:16 some message | |
| + </code> | |
| + </p> | |
| + <p> | |
| + <code class="literal"> | |
| + 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:19 some message {"x": 1} | |
| </code> | |
| </p> | |
| </div> | |
| html/en/apm/server/6.5/configuration-monitor.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.5/configuration-monitor.html | |
| @@ -291,7 +291,7 @@ | |
| config file: | |
| </p> | |
| <h3> | |
| - <a id="_literal_enabled_literal_7"> | |
| + <a id="_enabled_7"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -319,7 +319,7 @@ | |
| . | |
| </p> | |
| <h3> | |
| - <a id="_literal_elasticsearch_literal"> | |
| + <a id="_elasticsearch"> | |
| </a> | |
| <code class="literal"> | |
| elasticsearch | |
| @@ -332,7 +332,7 @@ | |
| The Elasticsearch instances that you want to ship your APM Server metrics to. This configuration option contains the following fields: | |
| </p> | |
| <h4> | |
| - <a id="_literal_bulk_max_size_literal_5"> | |
| + <a id="_bulk_max_size_5"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -353,7 +353,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_backoff_init_literal_3"> | |
| + <a id="_backoff_init_3"> | |
| </a> | |
| <code class="literal"> | |
| backoff.init | |
| @@ -374,7 +374,7 @@ | |
| . After a successful connection, the backoff timer is reset. The default is 1s. | |
| </p> | |
| <h5> | |
| - <a id="_literal_backoff_max_literal_3"> | |
| + <a id="_backoff_max_3"> | |
| </a> | |
| <code class="literal"> | |
| backoff.max | |
| @@ -387,7 +387,7 @@ | |
| The maximum number of seconds to wait before attempting to connect to Elasticsearch after a network error. The default is 60s. | |
| </p> | |
| <h4> | |
| - <a id="_literal_compression_level_literal_4"> | |
| + <a id="_compression_level_4"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -416,7 +416,7 @@ | |
| . Increasing the compression level reduces the network usage but increases the CPU usage. | |
| </p> | |
| <h4> | |
| - <a id="_literal_headers_literal_2"> | |
| + <a id="_headers_2"> | |
| </a> | |
| <code class="literal"> | |
| headers | |
| @@ -433,7 +433,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_hosts_literal_2"> | |
| + <a id="_hosts_2"> | |
| </a> | |
| <code class="literal"> | |
| hosts | |
| @@ -450,7 +450,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_max_retries_literal_4"> | |
| + <a id="_max_retries_4"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -471,7 +471,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_parameters_literal_2"> | |
| + <a id="_parameters_2"> | |
| </a> | |
| <code class="literal"> | |
| parameters | |
| @@ -484,7 +484,7 @@ | |
| Dictionary of HTTP parameters to pass within the url with index operations. | |
| </p> | |
| <h4> | |
| - <a id="_literal_password_literal_3"> | |
| + <a id="_password_3"> | |
| </a> | |
| <code class="literal"> | |
| password | |
| @@ -497,7 +497,7 @@ | |
| The password that APM Server uses to authenticate with the Elasticsearch instances for shipping monitoring data. | |
| </p> | |
| <h4> | |
| - <a id="_literal_metrics_period_literal"> | |
| + <a id="_metrics_period"> | |
| </a> | |
| <code class="literal"> | |
| metrics.period | |
| @@ -510,7 +510,7 @@ | |
| The time interval (in seconds) when metrics are sent to the Elasticsearch cluster. A new snapshot of APM Server metrics is generated and scheduled for publishing each period. The default value is 10 * time.Second. | |
| </p> | |
| <h4> | |
| - <a id="_literal_state_period_literal"> | |
| + <a id="_state_period"> | |
| </a> | |
| <code class="literal"> | |
| state.period | |
| @@ -523,7 +523,7 @@ | |
| The time interval (in seconds) when state information are sent to the Elasticsearch cluster. A new snapshot of APM Server state is generated and scheduled for publishing each period. The default value is 60 * time.Second. | |
| </p> | |
| <h4> | |
| - <a id="_literal_protocol_literal"> | |
| + <a id="_protocol"> | |
| </a> | |
| <code class="literal"> | |
| protocol | |
| @@ -552,7 +552,7 @@ | |
| , however, the value of protocol is overridden by the scheme you specify in the URL. | |
| </p> | |
| <h4> | |
| - <a id="_literal_proxy_url_literal_3"> | |
| + <a id="_proxy_url_3"> | |
| </a> | |
| <code class="literal"> | |
| proxy_url | |
| @@ -569,7 +569,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_timeout_literal_4"> | |
| + <a id="_timeout_4"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -586,7 +586,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_ssl_literal_4"> | |
| + <a id="_ssl_4"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| @@ -609,7 +609,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_username_literal_3"> | |
| + <a id="_username_3"> | |
| </a> | |
| <code class="literal"> | |
| username | |
| html/en/apm/server/6.5/configuration-output-codec.html | |
| html/en/apm/server/6.5/configuration-path.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.5/configuration-path.html | |
| @@ -329,7 +329,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_home_literal"> | |
| + <a id="_home"> | |
| </a> | |
| <code class="literal"> | |
| home | |
| @@ -348,7 +348,7 @@ | |
| <pre class="programlisting prettyprint lang-yaml">path.home: /usr/share/beats</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_config_literal"> | |
| + <a id="_config"> | |
| </a> | |
| <code class="literal"> | |
| config | |
| @@ -367,7 +367,7 @@ | |
| <pre class="programlisting prettyprint lang-yaml">path.config: /usr/share/beats/config</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_data_literal"> | |
| + <a id="_data"> | |
| </a> | |
| <code class="literal"> | |
| data | |
| @@ -390,7 +390,7 @@ | |
| <pre class="programlisting prettyprint lang-yaml">path.data: /var/lib/beats</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_logs_literal"> | |
| + <a id="_logs"> | |
| </a> | |
| <code class="literal"> | |
| logs | |
| html/en/apm/server/6.5/configuration-process.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.5/configuration-process.html | |
| @@ -668,7 +668,7 @@ | |
| Overwrites existing pipeline definitions in Elasticsearch. Defaults to true. | |
| </p> | |
| <h3> | |
| - <a id="_configuration_options_literal_queue_mem_literal"> | |
| + <a id="_configuration_options_queue_mem"> | |
| </a> | |
| Configuration options: | |
| <code class="literal"> | |
| @@ -735,7 +735,7 @@ | |
| . Default value is 1 second. | |
| </p> | |
| <h3> | |
| - <a id="_configuration_options_literal_max_procs_literal"> | |
| + <a id="_configuration_options_max_procs"> | |
| </a> | |
| Configuration options: | |
| <code class="literal"> | |
| html/en/apm/server/6.5/configuration-rum.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.5/configuration-rum.html | |
| @@ -418,7 +418,7 @@ | |
| Defines the maximum amount of events allowed to be sent to the APM Server v2 RUM endpoint per ip per second. Defaults to 300. | |
| </p> | |
| <h4> | |
| - <a id="_literal_event_rate_lru_size_literal"> | |
| + <a id="_event_rate_lru_size"> | |
| </a> | |
| <code class="literal"> | |
| event_rate.lru_size | |
| @@ -439,7 +439,7 @@ | |
| </a> | |
| </h3> | |
| <h4> | |
| - <a id="_literal_allow_origins_literal"> | |
| + <a id="_allow_origins"> | |
| </a> | |
| <code class="literal"> | |
| allow_origins | |
| @@ -460,7 +460,7 @@ | |
| , which allows everything. | |
| </p> | |
| <h4> | |
| - <a id="_literal_library_pattern_literal"> | |
| + <a id="_library_pattern"> | |
| </a> | |
| <code class="literal"> | |
| library_pattern | |
| @@ -501,7 +501,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_exclude_from_grouping_literal"> | |
| + <a id="_exclude_from_grouping"> | |
| </a> | |
| <code class="literal"> | |
| exclude_from_grouping | |
| @@ -556,7 +556,7 @@ | |
| is automatically applied to documents sent to the RUM endpoint. Source maps are fetched from Elasticsearch and then kept in an in-memory cache for the configured time. Values configured without a time unit are treated as seconds. Default value is 5 minutes. | |
| </p> | |
| <h4> | |
| - <a id="_literal_source_mapping_index_pattern_literal"> | |
| + <a id="_source_mapping_index_pattern"> | |
| </a> | |
| <code class="literal"> | |
| source_mapping.index_pattern | |
| html/en/apm/server/6.5/configuration-ssl.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.5/configuration-ssl.html | |
| @@ -347,7 +347,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_enabled_literal_6"> | |
| + <a id="_enabled_6"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -394,7 +394,7 @@ | |
| </div> | |
| </div> | |
| <h4> | |
| - <a id="_literal_certificate_authorities_literal"> | |
| + <a id="_certificate_authorities"> | |
| </a> | |
| <code class="literal"> | |
| certificate_authorities | |
| @@ -452,7 +452,7 @@ | |
| is specified. | |
| </p> | |
| <h4> | |
| - <a id="_literal_key_passphrase_literal"> | |
| + <a id="_key_passphrase"> | |
| </a> | |
| <code class="literal"> | |
| key_passphrase | |
| @@ -469,7 +469,7 @@ | |
| file. | |
| </p> | |
| <h4> | |
| - <a id="_literal_supported_protocols_literal"> | |
| + <a id="_supported_protocols"> | |
| </a> | |
| <code class="literal"> | |
| supported_protocols | |
| @@ -509,7 +509,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_verification_mode_literal"> | |
| + <a id="_verification_mode"> | |
| </a> | |
| <code class="literal"> | |
| verification_mode | |
| @@ -545,7 +545,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_cipher_suites_literal"> | |
| + <a id="_cipher_suites"> | |
| </a> | |
| <code class="literal"> | |
| cipher_suites | |
| @@ -644,7 +644,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_curve_types_literal"> | |
| + <a id="_curve_types"> | |
| </a> | |
| <code class="literal"> | |
| curve_types | |
| @@ -673,7 +673,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_renegotiation_literal"> | |
| + <a id="_renegotiation"> | |
| </a> | |
| <code class="literal"> | |
| renegotiation | |
| html/en/apm/server/6.5/configuration-template.html | |
| html/en/apm/server/6.5/configure-cloud-id.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.5/configure-cloud-id.html | |
| @@ -310,7 +310,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_cloud_id_literal"> | |
| + <a id="_cloud_id"> | |
| </a> | |
| <code class="literal"> | |
| cloud.id | |
| @@ -339,7 +339,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_cloud_auth_literal"> | |
| + <a id="_cloud_auth"> | |
| </a> | |
| <code class="literal"> | |
| cloud.auth | |
| html/en/apm/server/6.5/configuring-howto-apm-server.html | |
| html/en/apm/server/6.5/configuring-ingest-node.html | |
| html/en/apm/server/6.5/configuring-output.html | |
| html/en/apm/server/6.5/configuring-ssl-logstash.html | |
| html/en/apm/server/6.5/console-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.5/console-output.html | |
| @@ -323,7 +323,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_pretty_literal"> | |
| + <a id="_pretty"> | |
| </a> | |
| <code class="literal"> | |
| pretty | |
| @@ -348,7 +348,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_codec_literal_3"> | |
| + <a id="_codec_3"> | |
| </a> | |
| <code class="literal"> | |
| codec | |
| @@ -384,7 +384,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_5"> | |
| + <a id="_enabled_5"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -408,7 +408,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal_4"> | |
| + <a id="_bulk_max_size_4"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| html/en/apm/server/6.5/directory-layout.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.5/directory-layout.html | |
| @@ -323,10 +323,6 @@ | |
| </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| - <p> | |
| - <code class="literal"> | |
| - </code> | |
| - </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| <p> | |
| @@ -359,10 +355,6 @@ | |
| </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| - <p> | |
| - <code class="literal"> | |
| - </code> | |
| - </p> | |
| </td> | |
| </tr> | |
| <tr> | |
| html/en/apm/server/6.5/elasticsearch-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.5/elasticsearch-output.html | |
| @@ -397,7 +397,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal"> | |
| + <a id="_enabled"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -521,7 +521,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_level_literal"> | |
| + <a id="_compression_level"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -548,7 +548,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_escape_html_literal"> | |
| + <a id="_escape_html"> | |
| </a> | |
| <code class="literal"> | |
| escape_html | |
| @@ -580,7 +580,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_worker_literal"> | |
| + <a id="_worker"> | |
| </a> | |
| <code class="literal"> | |
| worker | |
| @@ -604,7 +604,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_username_literal"> | |
| + <a id="_username"> | |
| </a> | |
| <code class="literal"> | |
| username | |
| @@ -625,7 +625,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_password_literal"> | |
| + <a id="_password"> | |
| </a> | |
| <code class="literal"> | |
| password | |
| @@ -646,7 +646,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_parameters_literal"> | |
| + <a id="_parameters"> | |
| </a> | |
| <code class="literal"> | |
| parameters | |
| @@ -731,7 +731,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_headers_literal"> | |
| + <a id="_headers"> | |
| </a> | |
| <code class="literal"> | |
| headers | |
| @@ -759,7 +759,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_proxy_url_literal"> | |
| + <a id="_proxy_url"> | |
| </a> | |
| <code class="literal"> | |
| proxy_url | |
| @@ -840,7 +840,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_indices_literal"> | |
| + <a id="_indices"> | |
| </a> | |
| <code class="literal"> | |
| indices | |
| @@ -953,7 +953,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_pipeline_literal"> | |
| + <a id="_pipeline"> | |
| </a> | |
| <code class="literal"> | |
| pipeline | |
| @@ -988,7 +988,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_pipelines_literal"> | |
| + <a id="_pipelines"> | |
| </a> | |
| <code class="literal"> | |
| pipelines | |
| @@ -1054,7 +1054,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_max_retries_literal"> | |
| + <a id="_max_retries"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -1085,7 +1085,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal"> | |
| + <a id="_bulk_max_size"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -1123,7 +1123,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_init_literal"> | |
| + <a id="_backoff_init"> | |
| </a> | |
| <code class="literal"> | |
| backoff.init | |
| @@ -1152,7 +1152,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_max_literal"> | |
| + <a id="_backoff_max"> | |
| </a> | |
| <code class="literal"> | |
| backoff.max | |
| @@ -1173,7 +1173,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_timeout_literal"> | |
| + <a id="_timeout"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -1194,7 +1194,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ssl_literal"> | |
| + <a id="_ssl"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| html/en/apm/server/6.5/enable-apm-server-debugging.html | |
| html/en/apm/server/6.5/error-api-examples.html | |
| html/en/apm/server/6.5/error-api.html | |
| html/en/apm/server/6.5/error-context-schema.html | |
| html/en/apm/server/6.5/error-endpoint.html | |
| html/en/apm/server/6.5/error-indices.html | |
| html/en/apm/server/6.5/error-payload-schema.html | |
| html/en/apm/server/6.5/error-schema-definition.html | |
| html/en/apm/server/6.5/error-service-schema.html | |
| html/en/apm/server/6.5/error-stacktraceframe-schema.html | |
| html/en/apm/server/6.5/error-system-schema.html | |
| html/en/apm/server/6.5/errors.html | |
| html/en/apm/server/6.5/event-types.html | |
| html/en/apm/server/6.5/events-api.html | |
| html/en/apm/server/6.5/example-intakev2-events.html | |
| html/en/apm/server/6.5/exploring-es-data.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.5/exploring-es-data.html | |
| @@ -326,8 +326,8 @@ | |
| <p> | |
| To get an overview of existing indices you can run: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET _cat/indices/apm*</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET _cat/indices/apm*</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| @@ -377,16 +377,16 @@ | |
| <p> | |
| To query all documents collected with a specific APM Server version: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET apm-6.5.4-*/_search</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET apm-6.5.4-*/_search</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| <p> | |
| To query a specific type, for example transactions: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET apm-*transactions-*/_search</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET apm-*transactions-*/_search</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| @@ -405,16 +405,16 @@ | |
| </span> | |
| of the Elastic APM indices, first, run a query to find template names: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET _cat/templates/apm*</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET _cat/templates/apm*</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| <p> | |
| Then you can retrieve the specific template you are interested in: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET /_template/your-template-name</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET /_template/your-template-name</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| html/en/apm/server/6.5/exported-fields-apm-error.html | |
| html/en/apm/server/6.5/exported-fields-apm-sourcemap.html | |
| html/en/apm/server/6.5/exported-fields-apm-span.html | |
| html/en/apm/server/6.5/exported-fields-apm-transaction.html | |
| html/en/apm/server/6.5/exported-fields-apm.html | |
| html/en/apm/server/6.5/exported-fields-beat.html | |
| html/en/apm/server/6.5/exported-fields-cloud.html | |
| html/en/apm/server/6.5/exported-fields-docker-processor.html | |
| html/en/apm/server/6.5/exported-fields-host-processor.html | |
| html/en/apm/server/6.5/exported-fields-kubernetes-processor.html | |
| html/en/apm/server/6.5/exported-fields-system.html | |
| html/en/apm/server/6.5/exported-fields.html | |
| html/en/apm/server/6.5/file-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.5/file-output.html | |
| @@ -327,7 +327,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_4"> | |
| + <a id="_enabled_4"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -372,7 +372,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_filename_literal"> | |
| + <a id="_filename"> | |
| </a> | |
| <code class="literal"> | |
| filename | |
| @@ -393,7 +393,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_rotate_every_kb_literal"> | |
| + <a id="_rotate_every_kb"> | |
| </a> | |
| <code class="literal"> | |
| rotate_every_kb | |
| @@ -414,7 +414,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_number_of_files_literal"> | |
| + <a id="_number_of_files"> | |
| </a> | |
| <code class="literal"> | |
| number_of_files | |
| @@ -441,7 +441,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_permissions_literal"> | |
| + <a id="_permissions"> | |
| </a> | |
| <code class="literal"> | |
| permissions | |
| @@ -462,7 +462,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_codec_literal_2"> | |
| + <a id="_codec_2"> | |
| </a> | |
| <code class="literal"> | |
| codec | |
| html/en/apm/server/6.5/getting-help.html | |
| html/en/apm/server/6.5/high-availability.html | |
| html/en/apm/server/6.5/index.html | |
| html/en/apm/server/6.5/installing-on-windows.html | |
| html/en/apm/server/6.5/installing.html | |
| html/en/apm/server/6.5/intake-api.html | |
| html/en/apm/server/6.5/kafka-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.5/kafka-output.html | |
| @@ -377,7 +377,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_3"> | |
| + <a id="_enabled_3"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -405,7 +405,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_hosts_literal"> | |
| + <a id="_hosts"> | |
| </a> | |
| <code class="literal"> | |
| hosts | |
| @@ -426,7 +426,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_version_literal"> | |
| + <a id="_version"> | |
| </a> | |
| <code class="literal"> | |
| version | |
| @@ -461,7 +461,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_username_literal_2"> | |
| + <a id="_username_2"> | |
| </a> | |
| <code class="literal"> | |
| username | |
| @@ -482,7 +482,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_password_literal_2"> | |
| + <a id="_password_2"> | |
| </a> | |
| <code class="literal"> | |
| password | |
| @@ -503,7 +503,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_topic_literal"> | |
| + <a id="_topic"> | |
| </a> | |
| <code class="literal"> | |
| topic | |
| @@ -541,7 +541,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_topics_literal"> | |
| + <a id="_topics"> | |
| </a> | |
| <code class="literal"> | |
| topics | |
| @@ -621,7 +621,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_key_literal"> | |
| + <a id="_key"> | |
| </a> | |
| <code class="literal"> | |
| key | |
| @@ -642,7 +642,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_partition_literal"> | |
| + <a id="_partition"> | |
| </a> | |
| <code class="literal"> | |
| partition | |
| @@ -748,7 +748,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_client_id_literal"> | |
| + <a id="_client_id"> | |
| </a> | |
| <code class="literal"> | |
| client_id | |
| @@ -769,7 +769,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_worker_literal_3"> | |
| + <a id="_worker_3"> | |
| </a> | |
| <code class="literal"> | |
| worker | |
| @@ -790,7 +790,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_codec_literal"> | |
| + <a id="_codec"> | |
| </a> | |
| <code class="literal"> | |
| codec | |
| @@ -822,7 +822,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_metadata_literal"> | |
| + <a id="_metadata"> | |
| </a> | |
| <code class="literal"> | |
| metadata | |
| @@ -889,7 +889,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_max_retries_literal_3"> | |
| + <a id="_max_retries_3"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -920,7 +920,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal_3"> | |
| + <a id="_bulk_max_size_3"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -941,7 +941,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_timeout_literal_3"> | |
| + <a id="_timeout_3"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -962,7 +962,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_broker_timeout_literal"> | |
| + <a id="_broker_timeout"> | |
| </a> | |
| <code class="literal"> | |
| broker_timeout | |
| @@ -983,7 +983,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_channel_buffer_size_literal"> | |
| + <a id="_channel_buffer_size"> | |
| </a> | |
| <code class="literal"> | |
| channel_buffer_size | |
| @@ -1004,7 +1004,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_keep_alive_literal"> | |
| + <a id="_keep_alive"> | |
| </a> | |
| <code class="literal"> | |
| keep_alive | |
| @@ -1025,7 +1025,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_literal"> | |
| + <a id="_compression"> | |
| </a> | |
| <code class="literal"> | |
| compression | |
| @@ -1066,7 +1066,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_level_literal_3"> | |
| + <a id="_compression_level_3"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -1118,7 +1118,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_required_acks_literal"> | |
| + <a id="_required_acks"> | |
| </a> | |
| <code class="literal"> | |
| required_acks | |
| @@ -1142,7 +1142,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ssl_literal_3"> | |
| + <a id="_ssl_3"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| html/en/apm/server/6.5/keystore.html | |
| html/en/apm/server/6.5/linux-seccomp.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.5/linux-seccomp.html | |
| @@ -469,6 +469,12 @@ | |
| <dd> | |
| A list of system call names. The system call name must exist for the runtime architecture, otherwise an error will be logged and the filter will not be installed. At least one system call must be defined. | |
| </dd> | |
| + </dl> | |
| + </div> | |
| + <div class="variablelist"> | |
| + <a id="seccomp-policy-config-action"> | |
| + </a> | |
| + <dl class="variablelist"> | |
| <dt> | |
| <span class="term"> | |
| <span class="strong strong"> | |
| @@ -489,8 +495,6 @@ | |
| is executed. This is required. These are the available action values. The actions that are available depend on the kernel version. | |
| </p> | |
| <div class="itemizedlist"> | |
| - <a id="seccomp-policy-config-action"> | |
| - </a> | |
| <ul class="itemizedlist" type="disc"> | |
| <li class="listitem"> | |
| <code class="literal"> | |
| html/en/apm/server/6.5/load-kibana-dashboards.html | |
| html/en/apm/server/6.5/logstash-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.5/logstash-output.html | |
| @@ -293,6 +293,9 @@ | |
| <img alt="Important" src="images/icons/important.png"/> | |
| </div> | |
| <div class="admon_content"> | |
| + <h3> | |
| + Prerequisite | |
| + </h3> | |
| <p> | |
| To send events to Logstash, you also need to create a Logstash configuration pipeline that listens for incoming Beats connections and indexes the received events into Elasticsearch. For more information, see the section about | |
| <a class="ulink" href="https://www.elastic.co/guide/en/elastic-stack-overview/6.5/get-started-elastic-stack.html#logstash-setup" target="_top"> | |
| @@ -595,7 +598,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_2"> | |
| + <a id="_enabled_2"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -649,7 +652,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_level_literal_2"> | |
| + <a id="_compression_level_2"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -676,7 +679,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_escape_html_literal_2"> | |
| + <a id="_escape_html_2"> | |
| </a> | |
| <code class="literal"> | |
| escape_html | |
| @@ -708,7 +711,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_worker_literal_2"> | |
| + <a id="_worker_2"> | |
| </a> | |
| <code class="literal"> | |
| worker | |
| @@ -756,7 +759,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ttl_literal"> | |
| + <a id="_ttl"> | |
| </a> | |
| <code class="literal"> | |
| ttl | |
| @@ -790,7 +793,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_pipelining_literal"> | |
| + <a id="_pipelining"> | |
| </a> | |
| <code class="literal"> | |
| pipelining | |
| @@ -852,7 +855,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_proxy_url_literal_2"> | |
| + <a id="_proxy_url_2"> | |
| </a> | |
| <code class="literal"> | |
| proxy_url | |
| @@ -952,7 +955,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ssl_literal_2"> | |
| + <a id="_ssl_2"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| @@ -983,7 +986,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_timeout_literal_2"> | |
| + <a id="_timeout_2"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -1004,7 +1007,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_max_retries_literal_2"> | |
| + <a id="_max_retries_2"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -1035,7 +1038,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal_2"> | |
| + <a id="_bulk_max_size_2"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -1073,7 +1076,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_slow_start_literal"> | |
| + <a id="_slow_start"> | |
| </a> | |
| <code class="literal"> | |
| slow_start | |
| @@ -1105,7 +1108,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_init_literal_2"> | |
| + <a id="_backoff_init_2"> | |
| </a> | |
| <code class="literal"> | |
| backoff.init | |
| @@ -1134,7 +1137,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_max_literal_2"> | |
| + <a id="_backoff_max_2"> | |
| </a> | |
| <code class="literal"> | |
| backoff.max | |
| html/en/apm/server/6.5/manage-indices-kibana.html | |
| html/en/apm/server/6.5/metadata-api.html | |
| html/en/apm/server/6.5/metricset-api.html | |
| html/en/apm/server/6.5/metricset-indices.html | |
| html/en/apm/server/6.5/monitoring.html | |
| html/en/apm/server/6.5/overview.html | |
| html/en/apm/server/6.5/payload-with-error.html | |
| html/en/apm/server/6.5/payload-with-minimal-exception.html | |
| html/en/apm/server/6.5/payload-with-minimal-log.html | |
| html/en/apm/server/6.5/payload-with-minimal-span.html | |
| html/en/apm/server/6.5/payload-with-minimal-transaction.html | |
| html/en/apm/server/6.5/payload-with-transactions.html | |
| html/en/apm/server/6.5/redirects.html | |
| html/en/apm/server/6.5/reduce-storage.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.5/reduce-storage.html | |
| @@ -366,7 +366,7 @@ | |
| . With the curator command line interface you can, for instance, see all your existing indices: | |
| </p> | |
| <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">curator_cli --host localhost show_indices --filter_list '[{"filtertype":"pattern","kind":"prefix","value":"apm-"}]' | |
| + <pre class="programlisting prettyprint lang-sh">curator_cli --host localhost show_indices --filter_list '[\{"filtertype":"pattern","kind":"prefix","value":"apm-"\}]' | |
| apm-6.5.4-error-2018.05.10 | |
| apm-6.5.4-error-2018.05.11 | |
| @@ -383,7 +383,7 @@ | |
| And then delete any span indices older than 1 day: | |
| </p> | |
| <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">curator_cli --host localhost delete_indices --filter_list '[{"filtertype":"pattern","kind":"prefix","value":"apm-6.5.4-span-"}, {"filtertype":"age","source":"name","timestring":"%Y.%m.%d","unit":"days","unit_count":1,"direction":"older"}]' | |
| + <pre class="programlisting prettyprint lang-sh">curator_cli --host localhost delete_indices --filter_list '[\{"filtertype":"pattern","kind":"prefix","value":"apm-6.5.4-span-"\}, \{"filtertype":"age","source":"name","timestring":"%Y.%m.%d","unit":"days","unit_count":1,"direction":"older"\}]' | |
| INFO Deleting selected indices: [apm-6.5.4-span-2018.05.10, apm-6.5.4-span-2018.05.11] | |
| INFO ---deleting index apm-6.5.4-span-2018.05.10 | |
| @@ -401,8 +401,8 @@ | |
| <p> | |
| To delete documents matching a specific query, for example, all documents with a given context.service.name, use the following request: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST /apm-*/_delete_by_query | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST /apm-*/_delete_by_query | |
| { | |
| "query": { | |
| "bool": { | |
| html/en/apm/server/6.5/release-notes-6.1.0.html | |
| html/en/apm/server/6.5/release-notes-6.1.1.html | |
| html/en/apm/server/6.5/release-notes-6.1.2.html | |
| html/en/apm/server/6.5/release-notes-6.1.3.html | |
| html/en/apm/server/6.5/release-notes-6.1.4.html | |
| html/en/apm/server/6.5/release-notes-6.1.html | |
| html/en/apm/server/6.5/release-notes-6.2.0.html | |
| html/en/apm/server/6.5/release-notes-6.2.1.html | |
| html/en/apm/server/6.5/release-notes-6.2.2.html | |
| html/en/apm/server/6.5/release-notes-6.2.3.html | |
| html/en/apm/server/6.5/release-notes-6.2.4.html | |
| html/en/apm/server/6.5/release-notes-6.2.html | |
| html/en/apm/server/6.5/release-notes-6.3.0.html | |
| html/en/apm/server/6.5/release-notes-6.3.1.html | |
| html/en/apm/server/6.5/release-notes-6.3.2.html | |
| html/en/apm/server/6.5/release-notes-6.3.html | |
| html/en/apm/server/6.5/release-notes-6.4.0.html | |
| html/en/apm/server/6.5/release-notes-6.4.1.html | |
| html/en/apm/server/6.5/release-notes-6.4.2.html | |
| html/en/apm/server/6.5/release-notes-6.4.3.html | |
| html/en/apm/server/6.5/release-notes-6.4.html | |
| html/en/apm/server/6.5/release-notes-6.5.0.html | |
| html/en/apm/server/6.5/release-notes-6.5.1.html | |
| html/en/apm/server/6.5/release-notes-6.5.2.html | |
| html/en/apm/server/6.5/release-notes-6.5.3.html | |
| html/en/apm/server/6.5/release-notes-6.5.4.html | |
| html/en/apm/server/6.5/release-notes-6.5.html | |
| html/en/apm/server/6.5/release-notes.html | |
| html/en/apm/server/6.5/rum.html | |
| html/en/apm/server/6.5/running-on-docker.html | |
| html/en/apm/server/6.5/securing-apm-server.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.5/securing-apm-server.html | |
| @@ -313,7 +313,7 @@ | |
| <a id="security-overview"> | |
| </a> | |
| Security Overview | |
| - <a class="edit_me" href="https://github.com/elastic/apm-server/edit/6.5/docs/security.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| + <a class="edit_me" href="https://github.com/elastic/apm-server/edit/6.5/docs/copied-from-beats/shared-securing-beat.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| edit | |
| </a> | |
| </h3> | |
| @@ -324,7 +324,7 @@ | |
| <a id="secret-token"> | |
| </a> | |
| Secret token | |
| - <a class="edit_me" href="https://github.com/elastic/apm-server/edit/6.5/docs/security.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| + <a class="edit_me" href="https://github.com/elastic/apm-server/edit/6.5/docs/copied-from-beats/shared-securing-beat.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| edit | |
| </a> | |
| </h4> | |
| @@ -345,7 +345,7 @@ | |
| <a id="ssl-setup"> | |
| </a> | |
| SSL/TLS setup | |
| - <a class="edit_me" href="https://github.com/elastic/apm-server/edit/6.5/docs/security.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| + <a class="edit_me" href="https://github.com/elastic/apm-server/edit/6.5/docs/copied-from-beats/shared-securing-beat.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| edit | |
| </a> | |
| </h4> | |
| html/en/apm/server/6.5/securing-beats.html | |
| html/en/apm/server/6.5/securing-communication-elasticsearch.html | |
| html/en/apm/server/6.5/server-info.html | |
| html/en/apm/server/6.5/setting-up-and-running.html | |
| html/en/apm/server/6.5/setup-kibana-endpoint.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.5/setup-kibana-endpoint.html | |
| @@ -329,7 +329,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_kibana_host_literal"> | |
| + <a id="_setup_kibana_host"> | |
| </a> | |
| <code class="literal"> | |
| setup.kibana.host | |
| @@ -452,7 +452,7 @@ | |
| setup.kibana.path: /kibana</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_setup_kibana_username_literal"> | |
| + <a id="_setup_kibana_username"> | |
| </a> | |
| <code class="literal"> | |
| setup.kibana.username | |
| @@ -469,7 +469,7 @@ | |
| specified for the Elasticsearch output. | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_kibana_password_literal"> | |
| + <a id="_setup_kibana_password"> | |
| </a> | |
| <code class="literal"> | |
| setup.kibana.password | |
| @@ -499,7 +499,7 @@ | |
| An HTTP path prefix that is prepended to the HTTP API calls. This is useful for the cases where Kibana listens behind an HTTP reverse proxy that exports the API under a custom prefix. | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_kibana_ssl_enabled_literal"> | |
| + <a id="_setup_kibana_ssl_enabled"> | |
| </a> | |
| <code class="literal"> | |
| setup.kibana.ssl.enabled | |
| html/en/apm/server/6.5/setup-repositories.html | |
| html/en/apm/server/6.5/sourcemap-api.html | |
| html/en/apm/server/6.5/sourcemap-indices.html | |
| html/en/apm/server/6.5/sourcemaps.html | |
| html/en/apm/server/6.5/span-api.html | |
| html/en/apm/server/6.5/span-indices.html | |
| html/en/apm/server/6.5/storage-management.html | |
| html/en/apm/server/6.5/toc.html | |
| html/en/apm/server/6.5/transaction-api-examples.html | |
| html/en/apm/server/6.5/transaction-api.html | |
| html/en/apm/server/6.5/transaction-context-schema.html | |
| html/en/apm/server/6.5/transaction-endpoint.html | |
| html/en/apm/server/6.5/transaction-indices.html | |
| html/en/apm/server/6.5/transaction-payload-schema.html | |
| html/en/apm/server/6.5/transaction-request-schema.html | |
| html/en/apm/server/6.5/transaction-schema-definition.html | |
| html/en/apm/server/6.5/transaction-service-schema.html | |
| html/en/apm/server/6.5/transaction-span-schema.html | |
| html/en/apm/server/6.5/transaction-stacktraceframe-schema.html | |
| html/en/apm/server/6.5/transaction-system-schema.html | |
| html/en/apm/server/6.5/transaction-user-schema.html | |
| html/en/apm/server/6.5/transactions-spans.html | |
| html/en/apm/server/6.5/transactions.html | |
| html/en/apm/server/6.5/troubleshooting.html | |
| html/en/apm/server/6.5/tune-apm-server.html | |
| html/en/apm/server/6.5/tune-data-ingestion.html | |
| html/en/apm/server/6.5/tune-es.html | |
| html/en/apm/server/6.5/update-existing-data.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.5/update-existing-data.html | |
| @@ -300,8 +300,8 @@ | |
| <p> | |
| To rename a service send the following request: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST /apm-*/_update_by_query | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST /apm-*/_update_by_query | |
| { | |
| "query": { | |
| "term": { | |
| html/en/apm/server/6.5/upgrading-to-65.html | |
| html/en/apm/server/6.5/upgrading.html | |
| html/en/apm/server/6.5/using-environ-vars.html | |
| html/en/apm/server/6.5/why-separate-component.html | |
| html/en/apm/server/6.6/_manually_loading_template_configuration.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.6/_manually_loading_template_configuration.html | |
| @@ -445,13 +445,13 @@ | |
| </code> | |
| options to match the new name. For example: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">output.elasticsearch.index: "customname-%{[beat.version]}-%{+yyyy.MM.dd}" | |
| + </li> | |
| + </ul> | |
| + </div> | |
| + <div class="pre_wrapper lang-sh"> | |
| + <pre class="programlisting prettyprint lang-sh">output.elasticsearch.index: "customname-%{[beat.version]}-%{+yyyy.MM.dd}" | |
| setup.template.name: "customname" | |
| setup.template.pattern: "customname-*"</pre> | |
| - </div> | |
| - </li> | |
| - </ul> | |
| </div> | |
| <p> | |
| Also ensure to change the index name accordingly in the Kibana dashboards, when loading via the Kibana UI. | |
| html/en/apm/server/6.6/apm-server-configuration.html | |
| html/en/apm/server/6.6/beats-basic-auth.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.6/beats-basic-auth.html | |
| @@ -430,8 +430,8 @@ | |
| </code> | |
| roles: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST /_xpack/security/user/apm_internal | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST /_xpack/security/user/apm_internal | |
| { | |
| "password" : "YOUR_PASSWORD", | |
| "roles" : [ "apm_writer","kibana_user"], | |
| html/en/apm/server/6.6/beats-system-user.html | |
| html/en/apm/server/6.6/beats-tls.html | |
| html/en/apm/server/6.6/beats-user-access.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.6/beats-user-access.html | |
| @@ -333,8 +333,8 @@ | |
| </code> | |
| : | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST _xpack/security/role/apm_reader | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST _xpack/security/role/apm_reader | |
| { | |
| "indices": [ | |
| { | |
| @@ -410,8 +410,8 @@ | |
| </code> | |
| roles: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST /_xpack/security/user/apm_user | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST /_xpack/security/user/apm_user | |
| { | |
| "password" : "YOUR_PASSWORD", | |
| "roles" : [ "apm_reader","kibana_user"], | |
| html/en/apm/server/6.6/breaking-changes.html | |
| html/en/apm/server/6.6/command-line-options.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.6/command-line-options.html | |
| @@ -581,33 +581,37 @@ | |
| must be adjusted. | |
| </p> | |
| </dd> | |
| - <dt> | |
| - <span class="term"> | |
| - <span class="strong strong"> | |
| - <strong> | |
| - <code class="literal"> | |
| - template | |
| - </code> | |
| - </strong> | |
| - </span> | |
| - </span> | |
| - </dt> | |
| - <dd> | |
| - Exports the index template to stdout. You can specify the | |
| - <code class="literal"> | |
| - --es.version | |
| - </code> | |
| - and | |
| - <code class="literal"> | |
| - --index | |
| - </code> | |
| - flags to further define what gets exported. | |
| - </dd> | |
| </dl> | |
| </div> | |
| - <p> | |
| + <div class="variablelist"> | |
| <a id="template-subcommand"> | |
| </a> | |
| + <dl class="variablelist"> | |
| + <dt> | |
| + <span class="term"> | |
| + <span class="strong strong"> | |
| + <strong> | |
| + <code class="literal"> | |
| + template | |
| + </code> | |
| + </strong> | |
| + </span> | |
| + </span> | |
| + </dt> | |
| + <dd> | |
| + Exports the index template to stdout. You can specify the | |
| + <code class="literal"> | |
| + --es.version | |
| + </code> | |
| + and | |
| + <code class="literal"> | |
| + --index | |
| + </code> | |
| + flags to further define what gets exported. | |
| + </dd> | |
| + </dl> | |
| + </div> | |
| + <p> | |
| <span class="strong strong"> | |
| <strong> | |
| FLAGS | |
| @@ -1155,7 +1159,16 @@ | |
| </dt> | |
| <dd> | |
| <p class="simpara"> | |
| - deprecated:[6.4.0] | |
| + <span class="Admonishment"> | |
| + [ | |
| + <span class="Admonishment-version u-mono u-strikethrough"> | |
| + 6.4.0 | |
| + </span> | |
| + ] | |
| + <span class="Admonishment-detail"> | |
| + Deprecated in 6.4.0. | |
| + </span> | |
| + </span> | |
| </p> | |
| <p class="simpara"> | |
| Loads the initial setup, including Elasticsearch template, Kibana index pattern and Kibana dashboards. If you want to use the command without running APM Server, use the | |
| @@ -1263,7 +1276,16 @@ | |
| </dt> | |
| <dd> | |
| <p class="simpara"> | |
| - deprecated:[6.4.0] | |
| + <span class="Admonishment"> | |
| + [ | |
| + <span class="Admonishment-version u-mono u-strikethrough"> | |
| + 6.4.0 | |
| + </span> | |
| + ] | |
| + <span class="Admonishment-detail"> | |
| + Deprecated in 6.4.0. | |
| + </span> | |
| + </span> | |
| </p> | |
| <p class="simpara"> | |
| Sets up the Kibana dashboards only. | |
| html/en/apm/server/6.6/common-problems.html | |
| html/en/apm/server/6.6/configuration-dashboards.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.6/configuration-dashboards.html | |
| @@ -336,7 +336,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_enabled_literal"> | |
| + <a id="_setup_dashboards_enabled"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.enabled | |
| @@ -431,7 +431,7 @@ | |
| The file archive (zip file) that contains the dashboards to load. If this option is set, APM Server looks for a dashboard archive in the specified path instead of using the local directory. | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_beat_literal"> | |
| + <a id="_setup_dashboards_beat"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.beat | |
| @@ -448,7 +448,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_kibana_index_literal"> | |
| + <a id="_setup_dashboards_kibana_index"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.kibana_index | |
| @@ -464,7 +464,7 @@ | |
| </code> | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_index_literal"> | |
| + <a id="_setup_dashboards_index"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.index | |
| @@ -490,7 +490,7 @@ | |
| </div> | |
| </div> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_always_kibana_literal"> | |
| + <a id="_setup_dashboards_always_kibana"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.always_kibana | |
| @@ -507,7 +507,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_retry_enabled_literal"> | |
| + <a id="_setup_dashboards_retry_enabled"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.retry.enabled | |
| @@ -520,7 +520,7 @@ | |
| If this option is set to true, and Kibana is not reachable at the time when dashboards are loaded, APM Server will retry to reconnect to Kibana instead of exiting with an error. Disabled by default. | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_retry_interval_literal"> | |
| + <a id="_setup_dashboards_retry_interval"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.retry.interval | |
| @@ -533,7 +533,7 @@ | |
| Duration interval between Kibana connection retries. Defaults to 1 second. | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_retry_maximum_literal"> | |
| + <a id="_setup_dashboards_retry_maximum"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.retry.maximum | |
| html/en/apm/server/6.6/configuration-logging.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.6/configuration-logging.html | |
| @@ -333,7 +333,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_to_syslog_literal"> | |
| + <a id="_logging_to_syslog"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_syslog | |
| @@ -356,7 +356,7 @@ | |
| </div> | |
| </div> | |
| <h4> | |
| - <a id="_literal_logging_to_eventlog_literal"> | |
| + <a id="_logging_to_eventlog"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_eventlog | |
| @@ -369,7 +369,7 @@ | |
| When true, writes all logging output to the Windows Event Log. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_to_files_literal"> | |
| + <a id="_logging_to_files"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_files | |
| @@ -522,7 +522,7 @@ | |
| also sets the debug log level). | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_metrics_enabled_literal"> | |
| + <a id="_logging_metrics_enabled"> | |
| </a> | |
| <code class="literal"> | |
| logging.metrics.enabled | |
| @@ -544,7 +544,7 @@ | |
| Note that we currently offer no backwards compatible guarantees for the internal metrics and for this reason they are also not documented. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_metrics_period_literal"> | |
| + <a id="_logging_metrics_period"> | |
| </a> | |
| <code class="literal"> | |
| logging.metrics.period | |
| @@ -557,7 +557,7 @@ | |
| The period after which to log the internal metrics. The default is 30s. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_path_literal"> | |
| + <a id="_logging_files_path"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.path | |
| @@ -574,7 +574,7 @@ | |
| section for details. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_name_literal"> | |
| + <a id="_logging_files_name"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.name | |
| @@ -593,7 +593,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_rotateeverybytes_literal"> | |
| + <a id="_logging_files_rotateeverybytes"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.rotateeverybytes | |
| @@ -606,7 +606,7 @@ | |
| The maximum size of a log file. If the limit is reached, a new log file is generated. The default size limit is 10485760 (10 MB). | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_keepfiles_literal"> | |
| + <a id="_logging_files_keepfiles"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.keepfiles | |
| @@ -623,7 +623,7 @@ | |
| options has to be in the range of 2 to 1024 files. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_permissions_literal"> | |
| + <a id="_logging_files_permissions"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.permissions | |
| @@ -662,7 +662,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_logging_json_literal"> | |
| + <a id="_logging_json"> | |
| </a> | |
| <code class="literal"> | |
| logging.json | |
| @@ -715,17 +715,17 @@ | |
| </p> | |
| <p> | |
| <code class="literal"> | |
| - 2017-12-17T18:54:16.241-0500 INFO logp/core_test.go:13 unnamed global logger | |
| - </code> | |
| - </p> | |
| - <p> | |
| - <code class="literal"> | |
| - 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:16 some message | |
| - </code> | |
| - </p> | |
| - <p> | |
| - <code class="literal"> | |
| - 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:19 some message {"x": 1} | |
| + 2017-12-17T18:54:16.241-0500 INFO logp/core_test.go:13 unnamed global logger | |
| + </code> | |
| + </p> | |
| + <p> | |
| + <code class="literal"> | |
| + 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:16 some message | |
| + </code> | |
| + </p> | |
| + <p> | |
| + <code class="literal"> | |
| + 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:19 some message {"x": 1} | |
| </code> | |
| </p> | |
| </div> | |
| html/en/apm/server/6.6/configuration-monitor.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.6/configuration-monitor.html | |
| @@ -291,7 +291,7 @@ | |
| config file: | |
| </p> | |
| <h3> | |
| - <a id="_literal_enabled_literal_7"> | |
| + <a id="_enabled_7"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -319,7 +319,7 @@ | |
| . | |
| </p> | |
| <h3> | |
| - <a id="_literal_elasticsearch_literal"> | |
| + <a id="_elasticsearch"> | |
| </a> | |
| <code class="literal"> | |
| elasticsearch | |
| @@ -332,7 +332,7 @@ | |
| The Elasticsearch instances that you want to ship your APM Server metrics to. This configuration option contains the following fields: | |
| </p> | |
| <h4> | |
| - <a id="_literal_bulk_max_size_literal_5"> | |
| + <a id="_bulk_max_size_5"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -353,7 +353,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_backoff_init_literal_3"> | |
| + <a id="_backoff_init_3"> | |
| </a> | |
| <code class="literal"> | |
| backoff.init | |
| @@ -374,7 +374,7 @@ | |
| . After a successful connection, the backoff timer is reset. The default is 1s. | |
| </p> | |
| <h5> | |
| - <a id="_literal_backoff_max_literal_3"> | |
| + <a id="_backoff_max_3"> | |
| </a> | |
| <code class="literal"> | |
| backoff.max | |
| @@ -387,7 +387,7 @@ | |
| The maximum number of seconds to wait before attempting to connect to Elasticsearch after a network error. The default is 60s. | |
| </p> | |
| <h4> | |
| - <a id="_literal_compression_level_literal_4"> | |
| + <a id="_compression_level_4"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -416,7 +416,7 @@ | |
| . Increasing the compression level reduces the network usage but increases the CPU usage. | |
| </p> | |
| <h4> | |
| - <a id="_literal_headers_literal_2"> | |
| + <a id="_headers_2"> | |
| </a> | |
| <code class="literal"> | |
| headers | |
| @@ -433,7 +433,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_hosts_literal_2"> | |
| + <a id="_hosts_2"> | |
| </a> | |
| <code class="literal"> | |
| hosts | |
| @@ -450,7 +450,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_max_retries_literal_4"> | |
| + <a id="_max_retries_4"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -471,7 +471,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_parameters_literal_2"> | |
| + <a id="_parameters_2"> | |
| </a> | |
| <code class="literal"> | |
| parameters | |
| @@ -484,7 +484,7 @@ | |
| Dictionary of HTTP parameters to pass within the url with index operations. | |
| </p> | |
| <h4> | |
| - <a id="_literal_password_literal_3"> | |
| + <a id="_password_3"> | |
| </a> | |
| <code class="literal"> | |
| password | |
| @@ -497,7 +497,7 @@ | |
| The password that APM Server uses to authenticate with the Elasticsearch instances for shipping monitoring data. | |
| </p> | |
| <h4> | |
| - <a id="_literal_metrics_period_literal"> | |
| + <a id="_metrics_period"> | |
| </a> | |
| <code class="literal"> | |
| metrics.period | |
| @@ -510,7 +510,7 @@ | |
| The time interval (in seconds) when metrics are sent to the Elasticsearch cluster. A new snapshot of APM Server metrics is generated and scheduled for publishing each period. The default value is 10 * time.Second. | |
| </p> | |
| <h4> | |
| - <a id="_literal_state_period_literal"> | |
| + <a id="_state_period"> | |
| </a> | |
| <code class="literal"> | |
| state.period | |
| @@ -523,7 +523,7 @@ | |
| The time interval (in seconds) when state information are sent to the Elasticsearch cluster. A new snapshot of APM Server state is generated and scheduled for publishing each period. The default value is 60 * time.Second. | |
| </p> | |
| <h4> | |
| - <a id="_literal_protocol_literal"> | |
| + <a id="_protocol"> | |
| </a> | |
| <code class="literal"> | |
| protocol | |
| @@ -552,7 +552,7 @@ | |
| , however, the value of protocol is overridden by the scheme you specify in the URL. | |
| </p> | |
| <h4> | |
| - <a id="_literal_proxy_url_literal_3"> | |
| + <a id="_proxy_url_3"> | |
| </a> | |
| <code class="literal"> | |
| proxy_url | |
| @@ -569,7 +569,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_timeout_literal_4"> | |
| + <a id="_timeout_4"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -586,7 +586,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_ssl_literal_4"> | |
| + <a id="_ssl_4"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| @@ -609,7 +609,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_username_literal_3"> | |
| + <a id="_username_3"> | |
| </a> | |
| <code class="literal"> | |
| username | |
| html/en/apm/server/6.6/configuration-output-codec.html | |
| html/en/apm/server/6.6/configuration-path.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.6/configuration-path.html | |
| @@ -329,7 +329,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_home_literal"> | |
| + <a id="_home"> | |
| </a> | |
| <code class="literal"> | |
| home | |
| @@ -348,7 +348,7 @@ | |
| <pre class="programlisting prettyprint lang-yaml">path.home: /usr/share/beats</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_config_literal"> | |
| + <a id="_config"> | |
| </a> | |
| <code class="literal"> | |
| config | |
| @@ -367,7 +367,7 @@ | |
| <pre class="programlisting prettyprint lang-yaml">path.config: /usr/share/beats/config</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_data_literal"> | |
| + <a id="_data"> | |
| </a> | |
| <code class="literal"> | |
| data | |
| @@ -390,7 +390,7 @@ | |
| <pre class="programlisting prettyprint lang-yaml">path.data: /var/lib/beats</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_logs_literal"> | |
| + <a id="_logs"> | |
| </a> | |
| <code class="literal"> | |
| logs | |
| html/en/apm/server/6.6/configuration-process.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.6/configuration-process.html | |
| @@ -668,7 +668,7 @@ | |
| Overwrites existing pipeline definitions in Elasticsearch. Defaults to true. | |
| </p> | |
| <h3> | |
| - <a id="_configuration_options_literal_queue_mem_literal"> | |
| + <a id="_configuration_options_queue_mem"> | |
| </a> | |
| Configuration options: | |
| <code class="literal"> | |
| @@ -735,7 +735,7 @@ | |
| . Default value is 1 second. | |
| </p> | |
| <h3> | |
| - <a id="_configuration_options_literal_max_procs_literal"> | |
| + <a id="_configuration_options_max_procs"> | |
| </a> | |
| Configuration options: | |
| <code class="literal"> | |
| html/en/apm/server/6.6/configuration-rum.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.6/configuration-rum.html | |
| @@ -418,7 +418,7 @@ | |
| Defines the maximum amount of events allowed to be sent to the APM Server v2 RUM endpoint per ip per second. Defaults to 300. | |
| </p> | |
| <h4> | |
| - <a id="_literal_event_rate_lru_size_literal"> | |
| + <a id="_event_rate_lru_size"> | |
| </a> | |
| <code class="literal"> | |
| event_rate.lru_size | |
| @@ -439,7 +439,7 @@ | |
| </a> | |
| </h3> | |
| <h4> | |
| - <a id="_literal_allow_origins_literal"> | |
| + <a id="_allow_origins"> | |
| </a> | |
| <code class="literal"> | |
| allow_origins | |
| @@ -460,7 +460,7 @@ | |
| , which allows everything. | |
| </p> | |
| <h4> | |
| - <a id="_literal_library_pattern_literal"> | |
| + <a id="_library_pattern"> | |
| </a> | |
| <code class="literal"> | |
| library_pattern | |
| @@ -501,7 +501,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_exclude_from_grouping_literal"> | |
| + <a id="_exclude_from_grouping"> | |
| </a> | |
| <code class="literal"> | |
| exclude_from_grouping | |
| @@ -556,7 +556,7 @@ | |
| is automatically applied to documents sent to the RUM endpoint. Source maps are fetched from Elasticsearch and then kept in an in-memory cache for the configured time. Values configured without a time unit are treated as seconds. Default value is 5 minutes. | |
| </p> | |
| <h4> | |
| - <a id="_literal_source_mapping_index_pattern_literal"> | |
| + <a id="_source_mapping_index_pattern"> | |
| </a> | |
| <code class="literal"> | |
| source_mapping.index_pattern | |
| html/en/apm/server/6.6/configuration-ssl.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.6/configuration-ssl.html | |
| @@ -347,7 +347,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_enabled_literal_6"> | |
| + <a id="_enabled_6"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -394,7 +394,7 @@ | |
| </div> | |
| </div> | |
| <h4> | |
| - <a id="_literal_certificate_authorities_literal"> | |
| + <a id="_certificate_authorities"> | |
| </a> | |
| <code class="literal"> | |
| certificate_authorities | |
| @@ -452,7 +452,7 @@ | |
| is specified. | |
| </p> | |
| <h4> | |
| - <a id="_literal_key_passphrase_literal"> | |
| + <a id="_key_passphrase"> | |
| </a> | |
| <code class="literal"> | |
| key_passphrase | |
| @@ -469,7 +469,7 @@ | |
| file. | |
| </p> | |
| <h4> | |
| - <a id="_literal_supported_protocols_literal"> | |
| + <a id="_supported_protocols"> | |
| </a> | |
| <code class="literal"> | |
| supported_protocols | |
| @@ -509,7 +509,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_verification_mode_literal"> | |
| + <a id="_verification_mode"> | |
| </a> | |
| <code class="literal"> | |
| verification_mode | |
| @@ -545,7 +545,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_cipher_suites_literal"> | |
| + <a id="_cipher_suites"> | |
| </a> | |
| <code class="literal"> | |
| cipher_suites | |
| @@ -644,7 +644,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_curve_types_literal"> | |
| + <a id="_curve_types"> | |
| </a> | |
| <code class="literal"> | |
| curve_types | |
| @@ -673,7 +673,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_renegotiation_literal"> | |
| + <a id="_renegotiation"> | |
| </a> | |
| <code class="literal"> | |
| renegotiation | |
| html/en/apm/server/6.6/configuration-template.html | |
| html/en/apm/server/6.6/configure-cloud-id.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.6/configure-cloud-id.html | |
| @@ -310,7 +310,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_cloud_id_literal"> | |
| + <a id="_cloud_id"> | |
| </a> | |
| <code class="literal"> | |
| cloud.id | |
| @@ -339,7 +339,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_cloud_auth_literal"> | |
| + <a id="_cloud_auth"> | |
| </a> | |
| <code class="literal"> | |
| cloud.auth | |
| html/en/apm/server/6.6/configuring-howto-apm-server.html | |
| html/en/apm/server/6.6/configuring-ingest-node.html | |
| html/en/apm/server/6.6/configuring-output.html | |
| html/en/apm/server/6.6/configuring-ssl-logstash.html | |
| html/en/apm/server/6.6/console-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.6/console-output.html | |
| @@ -323,7 +323,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_pretty_literal"> | |
| + <a id="_pretty"> | |
| </a> | |
| <code class="literal"> | |
| pretty | |
| @@ -348,7 +348,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_codec_literal_3"> | |
| + <a id="_codec_3"> | |
| </a> | |
| <code class="literal"> | |
| codec | |
| @@ -384,7 +384,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_5"> | |
| + <a id="_enabled_5"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -408,7 +408,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal_4"> | |
| + <a id="_bulk_max_size_4"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| html/en/apm/server/6.6/directory-layout.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.6/directory-layout.html | |
| @@ -323,10 +323,6 @@ | |
| </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| - <p> | |
| - <code class="literal"> | |
| - </code> | |
| - </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| <p> | |
| @@ -359,10 +355,6 @@ | |
| </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| - <p> | |
| - <code class="literal"> | |
| - </code> | |
| - </p> | |
| </td> | |
| </tr> | |
| <tr> | |
| html/en/apm/server/6.6/elasticsearch-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.6/elasticsearch-output.html | |
| @@ -397,7 +397,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal"> | |
| + <a id="_enabled"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -521,7 +521,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_level_literal"> | |
| + <a id="_compression_level"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -548,7 +548,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_escape_html_literal"> | |
| + <a id="_escape_html"> | |
| </a> | |
| <code class="literal"> | |
| escape_html | |
| @@ -580,7 +580,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_worker_literal"> | |
| + <a id="_worker"> | |
| </a> | |
| <code class="literal"> | |
| worker | |
| @@ -604,7 +604,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_username_literal"> | |
| + <a id="_username"> | |
| </a> | |
| <code class="literal"> | |
| username | |
| @@ -625,7 +625,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_password_literal"> | |
| + <a id="_password"> | |
| </a> | |
| <code class="literal"> | |
| password | |
| @@ -646,7 +646,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_parameters_literal"> | |
| + <a id="_parameters"> | |
| </a> | |
| <code class="literal"> | |
| parameters | |
| @@ -731,7 +731,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_headers_literal"> | |
| + <a id="_headers"> | |
| </a> | |
| <code class="literal"> | |
| headers | |
| @@ -759,7 +759,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_proxy_url_literal"> | |
| + <a id="_proxy_url"> | |
| </a> | |
| <code class="literal"> | |
| proxy_url | |
| @@ -840,7 +840,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_indices_literal"> | |
| + <a id="_indices"> | |
| </a> | |
| <code class="literal"> | |
| indices | |
| @@ -953,7 +953,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_pipeline_literal"> | |
| + <a id="_pipeline"> | |
| </a> | |
| <code class="literal"> | |
| pipeline | |
| @@ -988,7 +988,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_pipelines_literal"> | |
| + <a id="_pipelines"> | |
| </a> | |
| <code class="literal"> | |
| pipelines | |
| @@ -1054,7 +1054,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_max_retries_literal"> | |
| + <a id="_max_retries"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -1085,7 +1085,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal"> | |
| + <a id="_bulk_max_size"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -1123,7 +1123,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_init_literal"> | |
| + <a id="_backoff_init"> | |
| </a> | |
| <code class="literal"> | |
| backoff.init | |
| @@ -1152,7 +1152,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_max_literal"> | |
| + <a id="_backoff_max"> | |
| </a> | |
| <code class="literal"> | |
| backoff.max | |
| @@ -1173,7 +1173,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_timeout_literal"> | |
| + <a id="_timeout"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -1194,7 +1194,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ssl_literal"> | |
| + <a id="_ssl"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| html/en/apm/server/6.6/enable-apm-server-debugging.html | |
| html/en/apm/server/6.6/error-api-examples.html | |
| html/en/apm/server/6.6/error-api.html | |
| html/en/apm/server/6.6/error-context-schema.html | |
| html/en/apm/server/6.6/error-endpoint.html | |
| html/en/apm/server/6.6/error-indices.html | |
| html/en/apm/server/6.6/error-payload-schema.html | |
| html/en/apm/server/6.6/error-schema-definition.html | |
| html/en/apm/server/6.6/error-service-schema.html | |
| html/en/apm/server/6.6/error-stacktraceframe-schema.html | |
| html/en/apm/server/6.6/error-system-schema.html | |
| html/en/apm/server/6.6/errors.html | |
| html/en/apm/server/6.6/event-types.html | |
| html/en/apm/server/6.6/events-api.html | |
| html/en/apm/server/6.6/example-intakev2-events.html | |
| html/en/apm/server/6.6/exploring-es-data.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.6/exploring-es-data.html | |
| @@ -326,8 +326,8 @@ | |
| <p> | |
| To get an overview of existing indices you can run: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET _cat/indices/apm*</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET _cat/indices/apm*</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| @@ -384,16 +384,16 @@ | |
| <p> | |
| To query all documents collected with a specific APM Server version: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET apm-6.6.2-*/_search</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET apm-6.6.2-*/_search</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| <p> | |
| To query a specific type, for example transactions: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET apm-*transactions-*/_search</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET apm-*transactions-*/_search</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| @@ -412,16 +412,16 @@ | |
| </span> | |
| of the Elastic APM indices, first, run a query to find template names: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET _cat/templates/apm*</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET _cat/templates/apm*</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| <p> | |
| Then you can retrieve the specific template you are interested in: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET /_template/your-template-name</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET /_template/your-template-name</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| html/en/apm/server/6.6/exported-fields-alias.html | |
| html/en/apm/server/6.6/exported-fields-apm-error.html | |
| html/en/apm/server/6.6/exported-fields-apm-sourcemap.html | |
| html/en/apm/server/6.6/exported-fields-apm-span.html | |
| html/en/apm/server/6.6/exported-fields-apm-transaction.html | |
| html/en/apm/server/6.6/exported-fields-apm.html | |
| html/en/apm/server/6.6/exported-fields-beat.html | |
| html/en/apm/server/6.6/exported-fields-cloud.html | |
| html/en/apm/server/6.6/exported-fields-docker-processor.html | |
| html/en/apm/server/6.6/exported-fields-host-processor.html | |
| html/en/apm/server/6.6/exported-fields-kubernetes-processor.html | |
| html/en/apm/server/6.6/exported-fields-system.html | |
| html/en/apm/server/6.6/exported-fields.html | |
| html/en/apm/server/6.6/file-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.6/file-output.html | |
| @@ -327,7 +327,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_4"> | |
| + <a id="_enabled_4"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -372,7 +372,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_filename_literal"> | |
| + <a id="_filename"> | |
| </a> | |
| <code class="literal"> | |
| filename | |
| @@ -393,7 +393,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_rotate_every_kb_literal"> | |
| + <a id="_rotate_every_kb"> | |
| </a> | |
| <code class="literal"> | |
| rotate_every_kb | |
| @@ -414,7 +414,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_number_of_files_literal"> | |
| + <a id="_number_of_files"> | |
| </a> | |
| <code class="literal"> | |
| number_of_files | |
| @@ -441,7 +441,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_permissions_literal"> | |
| + <a id="_permissions"> | |
| </a> | |
| <code class="literal"> | |
| permissions | |
| @@ -462,7 +462,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_codec_literal_2"> | |
| + <a id="_codec_2"> | |
| </a> | |
| <code class="literal"> | |
| codec | |
| html/en/apm/server/6.6/getting-help.html | |
| html/en/apm/server/6.6/high-availability.html | |
| html/en/apm/server/6.6/index.html | |
| html/en/apm/server/6.6/installing-on-windows.html | |
| html/en/apm/server/6.6/installing.html | |
| html/en/apm/server/6.6/intake-api.html | |
| html/en/apm/server/6.6/kafka-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.6/kafka-output.html | |
| @@ -377,7 +377,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_3"> | |
| + <a id="_enabled_3"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -405,7 +405,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_hosts_literal"> | |
| + <a id="_hosts"> | |
| </a> | |
| <code class="literal"> | |
| hosts | |
| @@ -426,7 +426,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_version_literal"> | |
| + <a id="_version"> | |
| </a> | |
| <code class="literal"> | |
| version | |
| @@ -461,7 +461,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_username_literal_2"> | |
| + <a id="_username_2"> | |
| </a> | |
| <code class="literal"> | |
| username | |
| @@ -482,7 +482,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_password_literal_2"> | |
| + <a id="_password_2"> | |
| </a> | |
| <code class="literal"> | |
| password | |
| @@ -503,7 +503,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_topic_literal"> | |
| + <a id="_topic"> | |
| </a> | |
| <code class="literal"> | |
| topic | |
| @@ -541,7 +541,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_topics_literal"> | |
| + <a id="_topics"> | |
| </a> | |
| <code class="literal"> | |
| topics | |
| @@ -621,7 +621,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_key_literal"> | |
| + <a id="_key"> | |
| </a> | |
| <code class="literal"> | |
| key | |
| @@ -642,7 +642,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_partition_literal"> | |
| + <a id="_partition"> | |
| </a> | |
| <code class="literal"> | |
| partition | |
| @@ -748,7 +748,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_client_id_literal"> | |
| + <a id="_client_id"> | |
| </a> | |
| <code class="literal"> | |
| client_id | |
| @@ -769,7 +769,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_worker_literal_3"> | |
| + <a id="_worker_3"> | |
| </a> | |
| <code class="literal"> | |
| worker | |
| @@ -790,7 +790,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_codec_literal"> | |
| + <a id="_codec"> | |
| </a> | |
| <code class="literal"> | |
| codec | |
| @@ -822,7 +822,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_metadata_literal"> | |
| + <a id="_metadata"> | |
| </a> | |
| <code class="literal"> | |
| metadata | |
| @@ -889,7 +889,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_max_retries_literal_3"> | |
| + <a id="_max_retries_3"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -920,7 +920,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal_3"> | |
| + <a id="_bulk_max_size_3"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -941,7 +941,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_timeout_literal_3"> | |
| + <a id="_timeout_3"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -962,7 +962,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_broker_timeout_literal"> | |
| + <a id="_broker_timeout"> | |
| </a> | |
| <code class="literal"> | |
| broker_timeout | |
| @@ -983,7 +983,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_channel_buffer_size_literal"> | |
| + <a id="_channel_buffer_size"> | |
| </a> | |
| <code class="literal"> | |
| channel_buffer_size | |
| @@ -1004,7 +1004,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_keep_alive_literal"> | |
| + <a id="_keep_alive"> | |
| </a> | |
| <code class="literal"> | |
| keep_alive | |
| @@ -1025,7 +1025,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_literal"> | |
| + <a id="_compression"> | |
| </a> | |
| <code class="literal"> | |
| compression | |
| @@ -1066,7 +1066,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_level_literal_3"> | |
| + <a id="_compression_level_3"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -1118,7 +1118,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_required_acks_literal"> | |
| + <a id="_required_acks"> | |
| </a> | |
| <code class="literal"> | |
| required_acks | |
| @@ -1142,7 +1142,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ssl_literal_3"> | |
| + <a id="_ssl_3"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| html/en/apm/server/6.6/keystore.html | |
| html/en/apm/server/6.6/linux-seccomp.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.6/linux-seccomp.html | |
| @@ -469,6 +469,12 @@ | |
| <dd> | |
| A list of system call names. The system call name must exist for the runtime architecture, otherwise an error will be logged and the filter will not be installed. At least one system call must be defined. | |
| </dd> | |
| + </dl> | |
| + </div> | |
| + <div class="variablelist"> | |
| + <a id="seccomp-policy-config-action"> | |
| + </a> | |
| + <dl class="variablelist"> | |
| <dt> | |
| <span class="term"> | |
| <span class="strong strong"> | |
| @@ -489,8 +495,6 @@ | |
| is executed. This is required. These are the available action values. The actions that are available depend on the kernel version. | |
| </p> | |
| <div class="itemizedlist"> | |
| - <a id="seccomp-policy-config-action"> | |
| - </a> | |
| <ul class="itemizedlist" type="disc"> | |
| <li class="listitem"> | |
| <code class="literal"> | |
| html/en/apm/server/6.6/load-kibana-dashboards.html | |
| html/en/apm/server/6.6/logstash-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.6/logstash-output.html | |
| @@ -293,6 +293,9 @@ | |
| <img alt="Important" src="images/icons/important.png"/> | |
| </div> | |
| <div class="admon_content"> | |
| + <h3> | |
| + Prerequisite | |
| + </h3> | |
| <p> | |
| To send events to Logstash, you also need to create a Logstash configuration pipeline that listens for incoming Beats connections and indexes the received events into Elasticsearch. For more information, see the section about | |
| <a class="ulink" href="https://www.elastic.co/guide/en/elastic-stack-overview/6.6/get-started-elastic-stack.html#logstash-setup" target="_top"> | |
| @@ -595,7 +598,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_2"> | |
| + <a id="_enabled_2"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -649,7 +652,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_level_literal_2"> | |
| + <a id="_compression_level_2"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -676,7 +679,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_escape_html_literal_2"> | |
| + <a id="_escape_html_2"> | |
| </a> | |
| <code class="literal"> | |
| escape_html | |
| @@ -708,7 +711,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_worker_literal_2"> | |
| + <a id="_worker_2"> | |
| </a> | |
| <code class="literal"> | |
| worker | |
| @@ -756,7 +759,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ttl_literal"> | |
| + <a id="_ttl"> | |
| </a> | |
| <code class="literal"> | |
| ttl | |
| @@ -790,7 +793,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_pipelining_literal"> | |
| + <a id="_pipelining"> | |
| </a> | |
| <code class="literal"> | |
| pipelining | |
| @@ -852,7 +855,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_proxy_url_literal_2"> | |
| + <a id="_proxy_url_2"> | |
| </a> | |
| <code class="literal"> | |
| proxy_url | |
| @@ -952,7 +955,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ssl_literal_2"> | |
| + <a id="_ssl_2"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| @@ -983,7 +986,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_timeout_literal_2"> | |
| + <a id="_timeout_2"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -1004,7 +1007,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_max_retries_literal_2"> | |
| + <a id="_max_retries_2"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -1035,7 +1038,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal_2"> | |
| + <a id="_bulk_max_size_2"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -1073,7 +1076,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_slow_start_literal"> | |
| + <a id="_slow_start"> | |
| </a> | |
| <code class="literal"> | |
| slow_start | |
| @@ -1105,7 +1108,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_init_literal_2"> | |
| + <a id="_backoff_init_2"> | |
| </a> | |
| <code class="literal"> | |
| backoff.init | |
| @@ -1134,7 +1137,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_max_literal_2"> | |
| + <a id="_backoff_max_2"> | |
| </a> | |
| <code class="literal"> | |
| backoff.max | |
| html/en/apm/server/6.6/manage-indices-kibana.html | |
| html/en/apm/server/6.6/metadata-api.html | |
| html/en/apm/server/6.6/metricset-api.html | |
| html/en/apm/server/6.6/metricset-indices.html | |
| html/en/apm/server/6.6/monitoring.html | |
| html/en/apm/server/6.6/overview.html | |
| html/en/apm/server/6.6/payload-with-error.html | |
| html/en/apm/server/6.6/payload-with-minimal-exception.html | |
| html/en/apm/server/6.6/payload-with-minimal-log.html | |
| html/en/apm/server/6.6/payload-with-minimal-span.html | |
| html/en/apm/server/6.6/payload-with-minimal-transaction.html | |
| html/en/apm/server/6.6/payload-with-transactions.html | |
| html/en/apm/server/6.6/redirects.html | |
| html/en/apm/server/6.6/reduce-storage.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.6/reduce-storage.html | |
| @@ -366,7 +366,7 @@ | |
| . With the curator command line interface you can, for instance, see all your existing indices: | |
| </p> | |
| <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">curator_cli --host localhost show_indices --filter_list '[{"filtertype":"pattern","kind":"prefix","value":"apm-"}]' | |
| + <pre class="programlisting prettyprint lang-sh">curator_cli --host localhost show_indices --filter_list '[\{"filtertype":"pattern","kind":"prefix","value":"apm-"\}]' | |
| apm-6.6.2-error-2018.05.10 | |
| apm-6.6.2-error-2018.05.11 | |
| @@ -383,7 +383,7 @@ | |
| And then delete any span indices older than 1 day: | |
| </p> | |
| <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">curator_cli --host localhost delete_indices --filter_list '[{"filtertype":"pattern","kind":"prefix","value":"apm-6.6.2-span-"}, {"filtertype":"age","source":"name","timestring":"%Y.%m.%d","unit":"days","unit_count":1,"direction":"older"}]' | |
| + <pre class="programlisting prettyprint lang-sh">curator_cli --host localhost delete_indices --filter_list '[\{"filtertype":"pattern","kind":"prefix","value":"apm-6.6.2-span-"\}, \{"filtertype":"age","source":"name","timestring":"%Y.%m.%d","unit":"days","unit_count":1,"direction":"older"\}]' | |
| INFO Deleting selected indices: [apm-6.6.2-span-2018.05.10, apm-6.6.2-span-2018.05.11] | |
| INFO ---deleting index apm-6.6.2-span-2018.05.10 | |
| @@ -401,8 +401,8 @@ | |
| <p> | |
| To delete documents matching a specific query, for example, all documents with a given context.service.name, use the following request: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST /apm-*/_delete_by_query | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST /apm-*/_delete_by_query | |
| { | |
| "query": { | |
| "bool": { | |
| html/en/apm/server/6.6/release-notes-6.1.0.html | |
| html/en/apm/server/6.6/release-notes-6.1.1.html | |
| html/en/apm/server/6.6/release-notes-6.1.2.html | |
| html/en/apm/server/6.6/release-notes-6.1.3.html | |
| html/en/apm/server/6.6/release-notes-6.1.4.html | |
| html/en/apm/server/6.6/release-notes-6.1.html | |
| html/en/apm/server/6.6/release-notes-6.2.0.html | |
| html/en/apm/server/6.6/release-notes-6.2.1.html | |
| html/en/apm/server/6.6/release-notes-6.2.2.html | |
| html/en/apm/server/6.6/release-notes-6.2.3.html | |
| html/en/apm/server/6.6/release-notes-6.2.4.html | |
| html/en/apm/server/6.6/release-notes-6.2.html | |
| html/en/apm/server/6.6/release-notes-6.3.0.html | |
| html/en/apm/server/6.6/release-notes-6.3.1.html | |
| html/en/apm/server/6.6/release-notes-6.3.2.html | |
| html/en/apm/server/6.6/release-notes-6.3.html | |
| html/en/apm/server/6.6/release-notes-6.4.0.html | |
| html/en/apm/server/6.6/release-notes-6.4.1.html | |
| html/en/apm/server/6.6/release-notes-6.4.2.html | |
| html/en/apm/server/6.6/release-notes-6.4.3.html | |
| html/en/apm/server/6.6/release-notes-6.4.html | |
| html/en/apm/server/6.6/release-notes-6.5.0.html | |
| html/en/apm/server/6.6/release-notes-6.5.1.html | |
| html/en/apm/server/6.6/release-notes-6.5.2.html | |
| html/en/apm/server/6.6/release-notes-6.5.3.html | |
| html/en/apm/server/6.6/release-notes-6.5.4.html | |
| html/en/apm/server/6.6/release-notes-6.5.html | |
| html/en/apm/server/6.6/release-notes-6.6.0.html | |
| html/en/apm/server/6.6/release-notes-6.6.1.html | |
| html/en/apm/server/6.6/release-notes-6.6.2.html | |
| html/en/apm/server/6.6/release-notes-6.6.html | |
| html/en/apm/server/6.6/release-notes.html | |
| html/en/apm/server/6.6/rum.html | |
| html/en/apm/server/6.6/running-on-docker.html | |
| html/en/apm/server/6.6/securing-apm-server.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.6/securing-apm-server.html | |
| @@ -313,7 +313,7 @@ | |
| <a id="security-overview"> | |
| </a> | |
| Security Overview | |
| - <a class="edit_me" href="https://github.com/elastic/apm-server/edit/6.6/docs/security.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| + <a class="edit_me" href="https://github.com/elastic/apm-server/edit/6.6/docs/copied-from-beats/shared-securing-beat.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| edit | |
| </a> | |
| </h3> | |
| @@ -324,7 +324,7 @@ | |
| <a id="secret-token"> | |
| </a> | |
| Secret token | |
| - <a class="edit_me" href="https://github.com/elastic/apm-server/edit/6.6/docs/security.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| + <a class="edit_me" href="https://github.com/elastic/apm-server/edit/6.6/docs/copied-from-beats/shared-securing-beat.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| edit | |
| </a> | |
| </h4> | |
| @@ -345,7 +345,7 @@ | |
| <a id="ssl-setup"> | |
| </a> | |
| SSL/TLS setup | |
| - <a class="edit_me" href="https://github.com/elastic/apm-server/edit/6.6/docs/security.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| + <a class="edit_me" href="https://github.com/elastic/apm-server/edit/6.6/docs/copied-from-beats/shared-securing-beat.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| edit | |
| </a> | |
| </h4> | |
| html/en/apm/server/6.6/securing-beats.html | |
| html/en/apm/server/6.6/securing-communication-elasticsearch.html | |
| html/en/apm/server/6.6/server-info.html | |
| html/en/apm/server/6.6/setting-up-and-running.html | |
| html/en/apm/server/6.6/setup-kibana-endpoint.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.6/setup-kibana-endpoint.html | |
| @@ -329,7 +329,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_kibana_host_literal"> | |
| + <a id="_setup_kibana_host"> | |
| </a> | |
| <code class="literal"> | |
| setup.kibana.host | |
| @@ -452,7 +452,7 @@ | |
| setup.kibana.path: /kibana</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_setup_kibana_username_literal"> | |
| + <a id="_setup_kibana_username"> | |
| </a> | |
| <code class="literal"> | |
| setup.kibana.username | |
| @@ -469,7 +469,7 @@ | |
| specified for the Elasticsearch output. | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_kibana_password_literal"> | |
| + <a id="_setup_kibana_password"> | |
| </a> | |
| <code class="literal"> | |
| setup.kibana.password | |
| @@ -499,7 +499,7 @@ | |
| An HTTP path prefix that is prepended to the HTTP API calls. This is useful for the cases where Kibana listens behind an HTTP reverse proxy that exports the API under a custom prefix. | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_kibana_ssl_enabled_literal"> | |
| + <a id="_setup_kibana_ssl_enabled"> | |
| </a> | |
| <code class="literal"> | |
| setup.kibana.ssl.enabled | |
| html/en/apm/server/6.6/setup-repositories.html | |
| html/en/apm/server/6.6/sourcemap-api.html | |
| html/en/apm/server/6.6/sourcemap-indices.html | |
| html/en/apm/server/6.6/sourcemaps.html | |
| html/en/apm/server/6.6/span-api.html | |
| html/en/apm/server/6.6/span-indices.html | |
| html/en/apm/server/6.6/storage-management.html | |
| html/en/apm/server/6.6/toc.html | |
| html/en/apm/server/6.6/transaction-api-examples.html | |
| html/en/apm/server/6.6/transaction-api.html | |
| html/en/apm/server/6.6/transaction-context-schema.html | |
| html/en/apm/server/6.6/transaction-endpoint.html | |
| html/en/apm/server/6.6/transaction-indices.html | |
| html/en/apm/server/6.6/transaction-payload-schema.html | |
| html/en/apm/server/6.6/transaction-request-schema.html | |
| html/en/apm/server/6.6/transaction-schema-definition.html | |
| html/en/apm/server/6.6/transaction-service-schema.html | |
| html/en/apm/server/6.6/transaction-span-schema.html | |
| html/en/apm/server/6.6/transaction-stacktraceframe-schema.html | |
| html/en/apm/server/6.6/transaction-system-schema.html | |
| html/en/apm/server/6.6/transaction-user-schema.html | |
| html/en/apm/server/6.6/transactions-spans.html | |
| html/en/apm/server/6.6/transactions.html | |
| html/en/apm/server/6.6/troubleshooting.html | |
| html/en/apm/server/6.6/tune-apm-server.html | |
| html/en/apm/server/6.6/tune-data-ingestion.html | |
| html/en/apm/server/6.6/tune-es.html | |
| html/en/apm/server/6.6/update-existing-data.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.6/update-existing-data.html | |
| @@ -300,8 +300,8 @@ | |
| <p> | |
| To rename a service send the following request: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST /apm-*/_update_by_query | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST /apm-*/_update_by_query | |
| { | |
| "query": { | |
| "term": { | |
| html/en/apm/server/6.6/upgrading-to-65.html | |
| html/en/apm/server/6.6/upgrading.html | |
| html/en/apm/server/6.6/using-environ-vars.html | |
| html/en/apm/server/6.6/why-separate-component.html | |
| html/en/apm/server/6.7/_manually_loading_template_configuration.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.7/_manually_loading_template_configuration.html | |
| @@ -445,13 +445,13 @@ | |
| </code> | |
| options to match the new name. For example: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">output.elasticsearch.index: "customname-%{[beat.version]}-%{+yyyy.MM.dd}" | |
| + </li> | |
| + </ul> | |
| + </div> | |
| + <div class="pre_wrapper lang-sh"> | |
| + <pre class="programlisting prettyprint lang-sh">output.elasticsearch.index: "customname-%{[beat.version]}-%{+yyyy.MM.dd}" | |
| setup.template.name: "customname" | |
| setup.template.pattern: "customname-*"</pre> | |
| - </div> | |
| - </li> | |
| - </ul> | |
| </div> | |
| <p> | |
| Also ensure to change the index name accordingly in the Kibana dashboards, when loading via the Kibana UI. | |
| html/en/apm/server/6.7/apm-server-configuration.html | |
| html/en/apm/server/6.7/beats-basic-auth.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.7/beats-basic-auth.html | |
| @@ -430,8 +430,8 @@ | |
| </code> | |
| roles: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST /_xpack/security/user/apm_internal | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST /_xpack/security/user/apm_internal | |
| { | |
| "password" : "YOUR_PASSWORD", | |
| "roles" : [ "apm_writer","kibana_user"], | |
| html/en/apm/server/6.7/beats-system-user.html | |
| html/en/apm/server/6.7/beats-tls.html | |
| html/en/apm/server/6.7/beats-user-access.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.7/beats-user-access.html | |
| @@ -333,8 +333,8 @@ | |
| </code> | |
| : | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST _xpack/security/role/apm_reader | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST _xpack/security/role/apm_reader | |
| { | |
| "indices": [ | |
| { | |
| @@ -410,8 +410,8 @@ | |
| </code> | |
| roles: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST /_xpack/security/user/apm_user | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST /_xpack/security/user/apm_user | |
| { | |
| "password" : "YOUR_PASSWORD", | |
| "roles" : [ "apm_reader","kibana_user"], | |
| html/en/apm/server/6.7/breaking-changes.html | |
| html/en/apm/server/6.7/command-line-options.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.7/command-line-options.html | |
| @@ -581,33 +581,37 @@ | |
| must be adjusted. | |
| </p> | |
| </dd> | |
| - <dt> | |
| - <span class="term"> | |
| - <span class="strong strong"> | |
| - <strong> | |
| - <code class="literal"> | |
| - template | |
| - </code> | |
| - </strong> | |
| - </span> | |
| - </span> | |
| - </dt> | |
| - <dd> | |
| - Exports the index template to stdout. You can specify the | |
| - <code class="literal"> | |
| - --es.version | |
| - </code> | |
| - and | |
| - <code class="literal"> | |
| - --index | |
| - </code> | |
| - flags to further define what gets exported. | |
| - </dd> | |
| </dl> | |
| </div> | |
| - <p> | |
| + <div class="variablelist"> | |
| <a id="template-subcommand"> | |
| </a> | |
| + <dl class="variablelist"> | |
| + <dt> | |
| + <span class="term"> | |
| + <span class="strong strong"> | |
| + <strong> | |
| + <code class="literal"> | |
| + template | |
| + </code> | |
| + </strong> | |
| + </span> | |
| + </span> | |
| + </dt> | |
| + <dd> | |
| + Exports the index template to stdout. You can specify the | |
| + <code class="literal"> | |
| + --es.version | |
| + </code> | |
| + and | |
| + <code class="literal"> | |
| + --index | |
| + </code> | |
| + flags to further define what gets exported. | |
| + </dd> | |
| + </dl> | |
| + </div> | |
| + <p> | |
| <span class="strong strong"> | |
| <strong> | |
| FLAGS | |
| @@ -1155,7 +1159,16 @@ | |
| </dt> | |
| <dd> | |
| <p class="simpara"> | |
| - deprecated:[6.4.0] | |
| + <span class="Admonishment"> | |
| + [ | |
| + <span class="Admonishment-version u-mono u-strikethrough"> | |
| + 6.4.0 | |
| + </span> | |
| + ] | |
| + <span class="Admonishment-detail"> | |
| + Deprecated in 6.4.0. | |
| + </span> | |
| + </span> | |
| </p> | |
| <p class="simpara"> | |
| Loads the initial setup, including Elasticsearch template, Kibana index pattern and Kibana dashboards. If you want to use the command without running APM Server, use the | |
| @@ -1263,7 +1276,16 @@ | |
| </dt> | |
| <dd> | |
| <p class="simpara"> | |
| - deprecated:[6.4.0] | |
| + <span class="Admonishment"> | |
| + [ | |
| + <span class="Admonishment-version u-mono u-strikethrough"> | |
| + 6.4.0 | |
| + </span> | |
| + ] | |
| + <span class="Admonishment-detail"> | |
| + Deprecated in 6.4.0. | |
| + </span> | |
| + </span> | |
| </p> | |
| <p class="simpara"> | |
| Sets up the Kibana dashboards only. | |
| html/en/apm/server/6.7/common-problems.html | |
| html/en/apm/server/6.7/configuration-dashboards.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.7/configuration-dashboards.html | |
| @@ -336,7 +336,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_enabled_literal"> | |
| + <a id="_setup_dashboards_enabled"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.enabled | |
| @@ -431,7 +431,7 @@ | |
| The file archive (zip file) that contains the dashboards to load. If this option is set, APM Server looks for a dashboard archive in the specified path instead of using the local directory. | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_beat_literal"> | |
| + <a id="_setup_dashboards_beat"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.beat | |
| @@ -448,7 +448,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_kibana_index_literal"> | |
| + <a id="_setup_dashboards_kibana_index"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.kibana_index | |
| @@ -464,7 +464,7 @@ | |
| </code> | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_index_literal"> | |
| + <a id="_setup_dashboards_index"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.index | |
| @@ -490,7 +490,7 @@ | |
| </div> | |
| </div> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_always_kibana_literal"> | |
| + <a id="_setup_dashboards_always_kibana"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.always_kibana | |
| @@ -507,7 +507,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_retry_enabled_literal"> | |
| + <a id="_setup_dashboards_retry_enabled"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.retry.enabled | |
| @@ -520,7 +520,7 @@ | |
| If this option is set to true, and Kibana is not reachable at the time when dashboards are loaded, APM Server will retry to reconnect to Kibana instead of exiting with an error. Disabled by default. | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_retry_interval_literal"> | |
| + <a id="_setup_dashboards_retry_interval"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.retry.interval | |
| @@ -533,7 +533,7 @@ | |
| Duration interval between Kibana connection retries. Defaults to 1 second. | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_retry_maximum_literal"> | |
| + <a id="_setup_dashboards_retry_maximum"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.retry.maximum | |
| html/en/apm/server/6.7/configuration-logging.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.7/configuration-logging.html | |
| @@ -333,7 +333,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_to_syslog_literal"> | |
| + <a id="_logging_to_syslog"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_syslog | |
| @@ -356,7 +356,7 @@ | |
| </div> | |
| </div> | |
| <h4> | |
| - <a id="_literal_logging_to_eventlog_literal"> | |
| + <a id="_logging_to_eventlog"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_eventlog | |
| @@ -369,7 +369,7 @@ | |
| When true, writes all logging output to the Windows Event Log. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_to_files_literal"> | |
| + <a id="_logging_to_files"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_files | |
| @@ -522,7 +522,7 @@ | |
| also sets the debug log level). | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_metrics_enabled_literal"> | |
| + <a id="_logging_metrics_enabled"> | |
| </a> | |
| <code class="literal"> | |
| logging.metrics.enabled | |
| @@ -544,7 +544,7 @@ | |
| Note that we currently offer no backwards compatible guarantees for the internal metrics and for this reason they are also not documented. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_metrics_period_literal"> | |
| + <a id="_logging_metrics_period"> | |
| </a> | |
| <code class="literal"> | |
| logging.metrics.period | |
| @@ -557,7 +557,7 @@ | |
| The period after which to log the internal metrics. The default is 30s. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_path_literal"> | |
| + <a id="_logging_files_path"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.path | |
| @@ -574,7 +574,7 @@ | |
| section for details. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_name_literal"> | |
| + <a id="_logging_files_name"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.name | |
| @@ -593,7 +593,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_rotateeverybytes_literal"> | |
| + <a id="_logging_files_rotateeverybytes"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.rotateeverybytes | |
| @@ -606,7 +606,7 @@ | |
| The maximum size of a log file. If the limit is reached, a new log file is generated. The default size limit is 10485760 (10 MB). | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_keepfiles_literal"> | |
| + <a id="_logging_files_keepfiles"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.keepfiles | |
| @@ -623,7 +623,7 @@ | |
| options has to be in the range of 2 to 1024 files. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_permissions_literal"> | |
| + <a id="_logging_files_permissions"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.permissions | |
| @@ -662,7 +662,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_logging_json_literal"> | |
| + <a id="_logging_json"> | |
| </a> | |
| <code class="literal"> | |
| logging.json | |
| @@ -715,17 +715,17 @@ | |
| </p> | |
| <p> | |
| <code class="literal"> | |
| - 2017-12-17T18:54:16.241-0500 INFO logp/core_test.go:13 unnamed global logger | |
| - </code> | |
| - </p> | |
| - <p> | |
| - <code class="literal"> | |
| - 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:16 some message | |
| - </code> | |
| - </p> | |
| - <p> | |
| - <code class="literal"> | |
| - 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:19 some message {"x": 1} | |
| + 2017-12-17T18:54:16.241-0500 INFO logp/core_test.go:13 unnamed global logger | |
| + </code> | |
| + </p> | |
| + <p> | |
| + <code class="literal"> | |
| + 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:16 some message | |
| + </code> | |
| + </p> | |
| + <p> | |
| + <code class="literal"> | |
| + 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:19 some message {"x": 1} | |
| </code> | |
| </p> | |
| </div> | |
| html/en/apm/server/6.7/configuration-monitor.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.7/configuration-monitor.html | |
| @@ -291,7 +291,7 @@ | |
| config file: | |
| </p> | |
| <h3> | |
| - <a id="_literal_enabled_literal_7"> | |
| + <a id="_enabled_7"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -319,7 +319,7 @@ | |
| . | |
| </p> | |
| <h3> | |
| - <a id="_literal_elasticsearch_literal"> | |
| + <a id="_elasticsearch"> | |
| </a> | |
| <code class="literal"> | |
| elasticsearch | |
| @@ -332,7 +332,7 @@ | |
| The Elasticsearch instances that you want to ship your APM Server metrics to. This configuration option contains the following fields: | |
| </p> | |
| <h4> | |
| - <a id="_literal_bulk_max_size_literal_5"> | |
| + <a id="_bulk_max_size_5"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -353,7 +353,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_backoff_init_literal_3"> | |
| + <a id="_backoff_init_3"> | |
| </a> | |
| <code class="literal"> | |
| backoff.init | |
| @@ -374,7 +374,7 @@ | |
| . After a successful connection, the backoff timer is reset. The default is 1s. | |
| </p> | |
| <h5> | |
| - <a id="_literal_backoff_max_literal_3"> | |
| + <a id="_backoff_max_3"> | |
| </a> | |
| <code class="literal"> | |
| backoff.max | |
| @@ -387,7 +387,7 @@ | |
| The maximum number of seconds to wait before attempting to connect to Elasticsearch after a network error. The default is 60s. | |
| </p> | |
| <h4> | |
| - <a id="_literal_compression_level_literal_4"> | |
| + <a id="_compression_level_4"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -416,7 +416,7 @@ | |
| . Increasing the compression level reduces the network usage but increases the CPU usage. | |
| </p> | |
| <h4> | |
| - <a id="_literal_headers_literal_2"> | |
| + <a id="_headers_2"> | |
| </a> | |
| <code class="literal"> | |
| headers | |
| @@ -433,7 +433,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_hosts_literal_2"> | |
| + <a id="_hosts_2"> | |
| </a> | |
| <code class="literal"> | |
| hosts | |
| @@ -450,7 +450,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_max_retries_literal_4"> | |
| + <a id="_max_retries_4"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -471,7 +471,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_parameters_literal_2"> | |
| + <a id="_parameters_2"> | |
| </a> | |
| <code class="literal"> | |
| parameters | |
| @@ -484,7 +484,7 @@ | |
| Dictionary of HTTP parameters to pass within the url with index operations. | |
| </p> | |
| <h4> | |
| - <a id="_literal_password_literal_3"> | |
| + <a id="_password_3"> | |
| </a> | |
| <code class="literal"> | |
| password | |
| @@ -497,7 +497,7 @@ | |
| The password that APM Server uses to authenticate with the Elasticsearch instances for shipping monitoring data. | |
| </p> | |
| <h4> | |
| - <a id="_literal_metrics_period_literal"> | |
| + <a id="_metrics_period"> | |
| </a> | |
| <code class="literal"> | |
| metrics.period | |
| @@ -510,7 +510,7 @@ | |
| The time interval (in seconds) when metrics are sent to the Elasticsearch cluster. A new snapshot of APM Server metrics is generated and scheduled for publishing each period. The default value is 10 * time.Second. | |
| </p> | |
| <h4> | |
| - <a id="_literal_state_period_literal"> | |
| + <a id="_state_period"> | |
| </a> | |
| <code class="literal"> | |
| state.period | |
| @@ -523,7 +523,7 @@ | |
| The time interval (in seconds) when state information are sent to the Elasticsearch cluster. A new snapshot of APM Server state is generated and scheduled for publishing each period. The default value is 60 * time.Second. | |
| </p> | |
| <h4> | |
| - <a id="_literal_protocol_literal"> | |
| + <a id="_protocol"> | |
| </a> | |
| <code class="literal"> | |
| protocol | |
| @@ -552,7 +552,7 @@ | |
| , however, the value of protocol is overridden by the scheme you specify in the URL. | |
| </p> | |
| <h4> | |
| - <a id="_literal_proxy_url_literal_3"> | |
| + <a id="_proxy_url_3"> | |
| </a> | |
| <code class="literal"> | |
| proxy_url | |
| @@ -569,7 +569,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_timeout_literal_4"> | |
| + <a id="_timeout_4"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -586,7 +586,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_ssl_literal_4"> | |
| + <a id="_ssl_4"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| @@ -609,7 +609,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_username_literal_3"> | |
| + <a id="_username_3"> | |
| </a> | |
| <code class="literal"> | |
| username | |
| html/en/apm/server/6.7/configuration-output-codec.html | |
| html/en/apm/server/6.7/configuration-path.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.7/configuration-path.html | |
| @@ -329,7 +329,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_home_literal"> | |
| + <a id="_home"> | |
| </a> | |
| <code class="literal"> | |
| home | |
| @@ -348,7 +348,7 @@ | |
| <pre class="programlisting prettyprint lang-yaml">path.home: /usr/share/beats</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_config_literal"> | |
| + <a id="_config"> | |
| </a> | |
| <code class="literal"> | |
| config | |
| @@ -367,7 +367,7 @@ | |
| <pre class="programlisting prettyprint lang-yaml">path.config: /usr/share/beats/config</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_data_literal"> | |
| + <a id="_data"> | |
| </a> | |
| <code class="literal"> | |
| data | |
| @@ -390,7 +390,7 @@ | |
| <pre class="programlisting prettyprint lang-yaml">path.data: /var/lib/beats</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_logs_literal"> | |
| + <a id="_logs"> | |
| </a> | |
| <code class="literal"> | |
| logs | |
| html/en/apm/server/6.7/configuration-process.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.7/configuration-process.html | |
| @@ -668,7 +668,7 @@ | |
| Overwrites existing pipeline definitions in Elasticsearch. Defaults to true. | |
| </p> | |
| <h3> | |
| - <a id="_configuration_options_literal_queue_mem_literal"> | |
| + <a id="_configuration_options_queue_mem"> | |
| </a> | |
| Configuration options: | |
| <code class="literal"> | |
| @@ -735,7 +735,7 @@ | |
| . Default value is 1 second. | |
| </p> | |
| <h3> | |
| - <a id="_configuration_options_literal_max_procs_literal"> | |
| + <a id="_configuration_options_max_procs"> | |
| </a> | |
| Configuration options: | |
| <code class="literal"> | |
| html/en/apm/server/6.7/configuration-rum.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.7/configuration-rum.html | |
| @@ -419,7 +419,7 @@ | |
| Defines the maximum amount of events allowed to be sent to the APM Server v2 RUM endpoint per ip per second. Defaults to 300. | |
| </p> | |
| <h4> | |
| - <a id="_literal_event_rate_lru_size_literal"> | |
| + <a id="_event_rate_lru_size"> | |
| </a> | |
| <code class="literal"> | |
| event_rate.lru_size | |
| @@ -440,7 +440,7 @@ | |
| </a> | |
| </h3> | |
| <h4> | |
| - <a id="_literal_allow_origins_literal"> | |
| + <a id="_allow_origins"> | |
| </a> | |
| <code class="literal"> | |
| allow_origins | |
| @@ -461,7 +461,7 @@ | |
| , which allows everything. | |
| </p> | |
| <h4> | |
| - <a id="_literal_library_pattern_literal"> | |
| + <a id="_library_pattern"> | |
| </a> | |
| <code class="literal"> | |
| library_pattern | |
| @@ -502,7 +502,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_exclude_from_grouping_literal"> | |
| + <a id="_exclude_from_grouping"> | |
| </a> | |
| <code class="literal"> | |
| exclude_from_grouping | |
| @@ -557,7 +557,7 @@ | |
| is automatically applied to documents sent to the RUM endpoint. Source maps are fetched from Elasticsearch and then kept in an in-memory cache for the configured time. Values configured without a time unit are treated as seconds. Default value is 5 minutes. | |
| </p> | |
| <h4> | |
| - <a id="_literal_source_mapping_index_pattern_literal"> | |
| + <a id="_source_mapping_index_pattern"> | |
| </a> | |
| <code class="literal"> | |
| source_mapping.index_pattern | |
| html/en/apm/server/6.7/configuration-ssl.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.7/configuration-ssl.html | |
| @@ -347,7 +347,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_enabled_literal_6"> | |
| + <a id="_enabled_6"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -394,7 +394,7 @@ | |
| </div> | |
| </div> | |
| <h4> | |
| - <a id="_literal_certificate_authorities_literal"> | |
| + <a id="_certificate_authorities"> | |
| </a> | |
| <code class="literal"> | |
| certificate_authorities | |
| @@ -452,7 +452,7 @@ | |
| is specified. | |
| </p> | |
| <h4> | |
| - <a id="_literal_key_passphrase_literal"> | |
| + <a id="_key_passphrase"> | |
| </a> | |
| <code class="literal"> | |
| key_passphrase | |
| @@ -469,7 +469,7 @@ | |
| file. | |
| </p> | |
| <h4> | |
| - <a id="_literal_supported_protocols_literal"> | |
| + <a id="_supported_protocols"> | |
| </a> | |
| <code class="literal"> | |
| supported_protocols | |
| @@ -509,7 +509,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_verification_mode_literal"> | |
| + <a id="_verification_mode"> | |
| </a> | |
| <code class="literal"> | |
| verification_mode | |
| @@ -545,7 +545,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_cipher_suites_literal"> | |
| + <a id="_cipher_suites"> | |
| </a> | |
| <code class="literal"> | |
| cipher_suites | |
| @@ -644,7 +644,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_curve_types_literal"> | |
| + <a id="_curve_types"> | |
| </a> | |
| <code class="literal"> | |
| curve_types | |
| @@ -673,7 +673,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_renegotiation_literal"> | |
| + <a id="_renegotiation"> | |
| </a> | |
| <code class="literal"> | |
| renegotiation | |
| html/en/apm/server/6.7/configuration-template.html | |
| html/en/apm/server/6.7/configure-cloud-id.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.7/configure-cloud-id.html | |
| @@ -310,7 +310,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_cloud_id_literal"> | |
| + <a id="_cloud_id"> | |
| </a> | |
| <code class="literal"> | |
| cloud.id | |
| @@ -339,7 +339,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_cloud_auth_literal"> | |
| + <a id="_cloud_auth"> | |
| </a> | |
| <code class="literal"> | |
| cloud.auth | |
| html/en/apm/server/6.7/configuring-howto-apm-server.html | |
| html/en/apm/server/6.7/configuring-ingest-node.html | |
| html/en/apm/server/6.7/configuring-output.html | |
| html/en/apm/server/6.7/configuring-ssl-logstash.html | |
| html/en/apm/server/6.7/console-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.7/console-output.html | |
| @@ -323,7 +323,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_pretty_literal"> | |
| + <a id="_pretty"> | |
| </a> | |
| <code class="literal"> | |
| pretty | |
| @@ -348,7 +348,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_codec_literal_3"> | |
| + <a id="_codec_3"> | |
| </a> | |
| <code class="literal"> | |
| codec | |
| @@ -384,7 +384,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_5"> | |
| + <a id="_enabled_5"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -408,7 +408,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal_4"> | |
| + <a id="_bulk_max_size_4"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| html/en/apm/server/6.7/directory-layout.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.7/directory-layout.html | |
| @@ -323,10 +323,6 @@ | |
| </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| - <p> | |
| - <code class="literal"> | |
| - </code> | |
| - </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| <p> | |
| @@ -359,10 +355,6 @@ | |
| </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| - <p> | |
| - <code class="literal"> | |
| - </code> | |
| - </p> | |
| </td> | |
| </tr> | |
| <tr> | |
| html/en/apm/server/6.7/elasticsearch-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.7/elasticsearch-output.html | |
| @@ -397,7 +397,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal"> | |
| + <a id="_enabled"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -521,7 +521,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_level_literal"> | |
| + <a id="_compression_level"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -548,7 +548,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_escape_html_literal"> | |
| + <a id="_escape_html"> | |
| </a> | |
| <code class="literal"> | |
| escape_html | |
| @@ -580,7 +580,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_worker_literal"> | |
| + <a id="_worker"> | |
| </a> | |
| <code class="literal"> | |
| worker | |
| @@ -604,7 +604,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_username_literal"> | |
| + <a id="_username"> | |
| </a> | |
| <code class="literal"> | |
| username | |
| @@ -625,7 +625,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_password_literal"> | |
| + <a id="_password"> | |
| </a> | |
| <code class="literal"> | |
| password | |
| @@ -646,7 +646,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_parameters_literal"> | |
| + <a id="_parameters"> | |
| </a> | |
| <code class="literal"> | |
| parameters | |
| @@ -731,7 +731,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_headers_literal"> | |
| + <a id="_headers"> | |
| </a> | |
| <code class="literal"> | |
| headers | |
| @@ -759,7 +759,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_proxy_url_literal"> | |
| + <a id="_proxy_url"> | |
| </a> | |
| <code class="literal"> | |
| proxy_url | |
| @@ -840,7 +840,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_indices_literal"> | |
| + <a id="_indices"> | |
| </a> | |
| <code class="literal"> | |
| indices | |
| @@ -953,7 +953,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_pipeline_literal"> | |
| + <a id="_pipeline"> | |
| </a> | |
| <code class="literal"> | |
| pipeline | |
| @@ -988,7 +988,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_pipelines_literal"> | |
| + <a id="_pipelines"> | |
| </a> | |
| <code class="literal"> | |
| pipelines | |
| @@ -1054,7 +1054,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_max_retries_literal"> | |
| + <a id="_max_retries"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -1085,7 +1085,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal"> | |
| + <a id="_bulk_max_size"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -1123,7 +1123,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_init_literal"> | |
| + <a id="_backoff_init"> | |
| </a> | |
| <code class="literal"> | |
| backoff.init | |
| @@ -1152,7 +1152,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_max_literal"> | |
| + <a id="_backoff_max"> | |
| </a> | |
| <code class="literal"> | |
| backoff.max | |
| @@ -1173,7 +1173,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_timeout_literal"> | |
| + <a id="_timeout"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -1194,7 +1194,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ssl_literal"> | |
| + <a id="_ssl"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| html/en/apm/server/6.7/enable-apm-server-debugging.html | |
| html/en/apm/server/6.7/error-api-examples.html | |
| html/en/apm/server/6.7/error-api.html | |
| html/en/apm/server/6.7/error-context-schema.html | |
| html/en/apm/server/6.7/error-endpoint.html | |
| html/en/apm/server/6.7/error-indices.html | |
| html/en/apm/server/6.7/error-payload-schema.html | |
| html/en/apm/server/6.7/error-schema-definition.html | |
| html/en/apm/server/6.7/error-service-schema.html | |
| html/en/apm/server/6.7/error-stacktraceframe-schema.html | |
| html/en/apm/server/6.7/error-system-schema.html | |
| html/en/apm/server/6.7/errors.html | |
| html/en/apm/server/6.7/event-types.html | |
| html/en/apm/server/6.7/events-api.html | |
| html/en/apm/server/6.7/example-intakev2-events.html | |
| html/en/apm/server/6.7/exploring-es-data.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.7/exploring-es-data.html | |
| @@ -326,8 +326,8 @@ | |
| <p> | |
| To get an overview of existing indices you can run: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET _cat/indices/apm*</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET _cat/indices/apm*</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| @@ -384,16 +384,16 @@ | |
| <p> | |
| To query all documents collected with a specific APM Server version: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET apm-6.7.2-*/_search</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET apm-6.7.2-*/_search</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| <p> | |
| To query a specific type, for example transactions: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET apm-*transactions-*/_search</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET apm-*transactions-*/_search</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| @@ -412,16 +412,16 @@ | |
| </span> | |
| of the Elastic APM indices, first, run a query to find template names: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET _cat/templates/apm*</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET _cat/templates/apm*</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| <p> | |
| Then you can retrieve the specific template you are interested in: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET /_template/your-template-name</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET /_template/your-template-name</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| html/en/apm/server/6.7/exported-fields-alias.html | |
| html/en/apm/server/6.7/exported-fields-apm-error.html | |
| html/en/apm/server/6.7/exported-fields-apm-sourcemap.html | |
| html/en/apm/server/6.7/exported-fields-apm-span.html | |
| html/en/apm/server/6.7/exported-fields-apm-transaction.html | |
| html/en/apm/server/6.7/exported-fields-apm.html | |
| html/en/apm/server/6.7/exported-fields-beat.html | |
| html/en/apm/server/6.7/exported-fields-cloud.html | |
| html/en/apm/server/6.7/exported-fields-docker-processor.html | |
| html/en/apm/server/6.7/exported-fields-host-processor.html | |
| html/en/apm/server/6.7/exported-fields-kubernetes-processor.html | |
| html/en/apm/server/6.7/exported-fields-system.html | |
| html/en/apm/server/6.7/exported-fields.html | |
| html/en/apm/server/6.7/file-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.7/file-output.html | |
| @@ -327,7 +327,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_4"> | |
| + <a id="_enabled_4"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -372,7 +372,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_filename_literal"> | |
| + <a id="_filename"> | |
| </a> | |
| <code class="literal"> | |
| filename | |
| @@ -393,7 +393,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_rotate_every_kb_literal"> | |
| + <a id="_rotate_every_kb"> | |
| </a> | |
| <code class="literal"> | |
| rotate_every_kb | |
| @@ -414,7 +414,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_number_of_files_literal"> | |
| + <a id="_number_of_files"> | |
| </a> | |
| <code class="literal"> | |
| number_of_files | |
| @@ -441,7 +441,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_permissions_literal"> | |
| + <a id="_permissions"> | |
| </a> | |
| <code class="literal"> | |
| permissions | |
| @@ -462,7 +462,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_codec_literal_2"> | |
| + <a id="_codec_2"> | |
| </a> | |
| <code class="literal"> | |
| codec | |
| html/en/apm/server/6.7/getting-help.html | |
| html/en/apm/server/6.7/high-availability.html | |
| html/en/apm/server/6.7/index.html | |
| html/en/apm/server/6.7/installing-on-windows.html | |
| html/en/apm/server/6.7/installing.html | |
| html/en/apm/server/6.7/intake-api.html | |
| html/en/apm/server/6.7/kafka-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.7/kafka-output.html | |
| @@ -377,7 +377,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_3"> | |
| + <a id="_enabled_3"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -405,7 +405,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_hosts_literal"> | |
| + <a id="_hosts"> | |
| </a> | |
| <code class="literal"> | |
| hosts | |
| @@ -426,7 +426,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_version_literal"> | |
| + <a id="_version"> | |
| </a> | |
| <code class="literal"> | |
| version | |
| @@ -461,7 +461,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_username_literal_2"> | |
| + <a id="_username_2"> | |
| </a> | |
| <code class="literal"> | |
| username | |
| @@ -482,7 +482,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_password_literal_2"> | |
| + <a id="_password_2"> | |
| </a> | |
| <code class="literal"> | |
| password | |
| @@ -503,7 +503,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_topic_literal"> | |
| + <a id="_topic"> | |
| </a> | |
| <code class="literal"> | |
| topic | |
| @@ -541,7 +541,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_topics_literal"> | |
| + <a id="_topics"> | |
| </a> | |
| <code class="literal"> | |
| topics | |
| @@ -621,7 +621,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_key_literal"> | |
| + <a id="_key"> | |
| </a> | |
| <code class="literal"> | |
| key | |
| @@ -642,7 +642,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_partition_literal"> | |
| + <a id="_partition"> | |
| </a> | |
| <code class="literal"> | |
| partition | |
| @@ -748,7 +748,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_client_id_literal"> | |
| + <a id="_client_id"> | |
| </a> | |
| <code class="literal"> | |
| client_id | |
| @@ -769,7 +769,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_worker_literal_3"> | |
| + <a id="_worker_3"> | |
| </a> | |
| <code class="literal"> | |
| worker | |
| @@ -790,7 +790,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_codec_literal"> | |
| + <a id="_codec"> | |
| </a> | |
| <code class="literal"> | |
| codec | |
| @@ -822,7 +822,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_metadata_literal"> | |
| + <a id="_metadata"> | |
| </a> | |
| <code class="literal"> | |
| metadata | |
| @@ -889,7 +889,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_max_retries_literal_3"> | |
| + <a id="_max_retries_3"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -920,7 +920,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal_3"> | |
| + <a id="_bulk_max_size_3"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -941,7 +941,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_timeout_literal_3"> | |
| + <a id="_timeout_3"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -962,7 +962,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_broker_timeout_literal"> | |
| + <a id="_broker_timeout"> | |
| </a> | |
| <code class="literal"> | |
| broker_timeout | |
| @@ -983,7 +983,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_channel_buffer_size_literal"> | |
| + <a id="_channel_buffer_size"> | |
| </a> | |
| <code class="literal"> | |
| channel_buffer_size | |
| @@ -1004,7 +1004,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_keep_alive_literal"> | |
| + <a id="_keep_alive"> | |
| </a> | |
| <code class="literal"> | |
| keep_alive | |
| @@ -1025,7 +1025,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_literal"> | |
| + <a id="_compression"> | |
| </a> | |
| <code class="literal"> | |
| compression | |
| @@ -1066,7 +1066,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_level_literal_3"> | |
| + <a id="_compression_level_3"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -1118,7 +1118,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_required_acks_literal"> | |
| + <a id="_required_acks"> | |
| </a> | |
| <code class="literal"> | |
| required_acks | |
| @@ -1142,7 +1142,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ssl_literal_3"> | |
| + <a id="_ssl_3"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| html/en/apm/server/6.7/keystore.html | |
| html/en/apm/server/6.7/linux-seccomp.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.7/linux-seccomp.html | |
| @@ -469,6 +469,12 @@ | |
| <dd> | |
| A list of system call names. The system call name must exist for the runtime architecture, otherwise an error will be logged and the filter will not be installed. At least one system call must be defined. | |
| </dd> | |
| + </dl> | |
| + </div> | |
| + <div class="variablelist"> | |
| + <a id="seccomp-policy-config-action"> | |
| + </a> | |
| + <dl class="variablelist"> | |
| <dt> | |
| <span class="term"> | |
| <span class="strong strong"> | |
| @@ -489,8 +495,6 @@ | |
| is executed. This is required. These are the available action values. The actions that are available depend on the kernel version. | |
| </p> | |
| <div class="itemizedlist"> | |
| - <a id="seccomp-policy-config-action"> | |
| - </a> | |
| <ul class="itemizedlist" type="disc"> | |
| <li class="listitem"> | |
| <code class="literal"> | |
| html/en/apm/server/6.7/load-kibana-dashboards.html | |
| html/en/apm/server/6.7/logstash-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.7/logstash-output.html | |
| @@ -293,6 +293,9 @@ | |
| <img alt="Important" src="images/icons/important.png"/> | |
| </div> | |
| <div class="admon_content"> | |
| + <h3> | |
| + Prerequisite | |
| + </h3> | |
| <p> | |
| To send events to Logstash, you also need to create a Logstash configuration pipeline that listens for incoming Beats connections and indexes the received events into Elasticsearch. For more information, see the section about | |
| <a class="ulink" href="https://www.elastic.co/guide/en/elastic-stack-overview/6.7/get-started-elastic-stack.html#logstash-setup" target="_top"> | |
| @@ -595,7 +598,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_2"> | |
| + <a id="_enabled_2"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -649,7 +652,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_level_literal_2"> | |
| + <a id="_compression_level_2"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -676,7 +679,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_escape_html_literal_2"> | |
| + <a id="_escape_html_2"> | |
| </a> | |
| <code class="literal"> | |
| escape_html | |
| @@ -708,7 +711,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_worker_literal_2"> | |
| + <a id="_worker_2"> | |
| </a> | |
| <code class="literal"> | |
| worker | |
| @@ -756,7 +759,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ttl_literal"> | |
| + <a id="_ttl"> | |
| </a> | |
| <code class="literal"> | |
| ttl | |
| @@ -790,7 +793,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_pipelining_literal"> | |
| + <a id="_pipelining"> | |
| </a> | |
| <code class="literal"> | |
| pipelining | |
| @@ -852,7 +855,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_proxy_url_literal_2"> | |
| + <a id="_proxy_url_2"> | |
| </a> | |
| <code class="literal"> | |
| proxy_url | |
| @@ -952,7 +955,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ssl_literal_2"> | |
| + <a id="_ssl_2"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| @@ -983,7 +986,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_timeout_literal_2"> | |
| + <a id="_timeout_2"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -1004,7 +1007,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_max_retries_literal_2"> | |
| + <a id="_max_retries_2"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -1035,7 +1038,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal_2"> | |
| + <a id="_bulk_max_size_2"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -1073,7 +1076,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_slow_start_literal"> | |
| + <a id="_slow_start"> | |
| </a> | |
| <code class="literal"> | |
| slow_start | |
| @@ -1105,7 +1108,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_init_literal_2"> | |
| + <a id="_backoff_init_2"> | |
| </a> | |
| <code class="literal"> | |
| backoff.init | |
| @@ -1134,7 +1137,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_max_literal_2"> | |
| + <a id="_backoff_max_2"> | |
| </a> | |
| <code class="literal"> | |
| backoff.max | |
| html/en/apm/server/6.7/manage-indices-kibana.html | |
| html/en/apm/server/6.7/manual-ilm-setup.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.7/manual-ilm-setup.html | |
| @@ -706,8 +706,8 @@ | |
| </code> | |
| overwrites defaults rather than being merged. This means you’ll need to configure all of your indices in the file, even if some are not using ILM. | |
| </p> | |
| - <div class="pre_wrapper lang-yml"> | |
| - <pre class="programlisting prettyprint lang-yml">output.elasticsearch: | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">output.elasticsearch: | |
| indices: | |
| - index: "apm-6.7.2-sourcemap" | |
| when.contains: | |
| html/en/apm/server/6.7/metadata-api.html | |
| html/en/apm/server/6.7/metricset-api.html | |
| html/en/apm/server/6.7/metricset-indices.html | |
| html/en/apm/server/6.7/monitoring.html | |
| html/en/apm/server/6.7/overview.html | |
| html/en/apm/server/6.7/payload-with-error.html | |
| html/en/apm/server/6.7/payload-with-minimal-exception.html | |
| html/en/apm/server/6.7/payload-with-minimal-log.html | |
| html/en/apm/server/6.7/payload-with-minimal-span.html | |
| html/en/apm/server/6.7/payload-with-minimal-transaction.html | |
| html/en/apm/server/6.7/payload-with-transactions.html | |
| html/en/apm/server/6.7/redirects.html | |
| html/en/apm/server/6.7/reduce-storage.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.7/reduce-storage.html | |
| @@ -366,7 +366,7 @@ | |
| . With the curator command line interface you can, for instance, see all your existing indices: | |
| </p> | |
| <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">curator_cli --host localhost show_indices --filter_list '[{"filtertype":"pattern","kind":"prefix","value":"apm-"}]' | |
| + <pre class="programlisting prettyprint lang-sh">curator_cli --host localhost show_indices --filter_list '[\{"filtertype":"pattern","kind":"prefix","value":"apm-"\}]' | |
| apm-6.7.2-error-2018.05.10 | |
| apm-6.7.2-error-2018.05.11 | |
| @@ -383,7 +383,7 @@ | |
| And then delete any span indices older than 1 day: | |
| </p> | |
| <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">curator_cli --host localhost delete_indices --filter_list '[{"filtertype":"pattern","kind":"prefix","value":"apm-6.7.2-span-"}, {"filtertype":"age","source":"name","timestring":"%Y.%m.%d","unit":"days","unit_count":1,"direction":"older"}]' | |
| + <pre class="programlisting prettyprint lang-sh">curator_cli --host localhost delete_indices --filter_list '[\{"filtertype":"pattern","kind":"prefix","value":"apm-6.7.2-span-"\}, \{"filtertype":"age","source":"name","timestring":"%Y.%m.%d","unit":"days","unit_count":1,"direction":"older"\}]' | |
| INFO Deleting selected indices: [apm-6.7.2-span-2018.05.10, apm-6.7.2-span-2018.05.11] | |
| INFO ---deleting index apm-6.7.2-span-2018.05.10 | |
| @@ -401,8 +401,8 @@ | |
| <p> | |
| To delete documents matching a specific query, for example, all documents with a given context.service.name, use the following request: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST /apm-*/_delete_by_query | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST /apm-*/_delete_by_query | |
| { | |
| "query": { | |
| "bool": { | |
| html/en/apm/server/6.7/release-notes-6.1.0.html | |
| html/en/apm/server/6.7/release-notes-6.1.1.html | |
| html/en/apm/server/6.7/release-notes-6.1.2.html | |
| html/en/apm/server/6.7/release-notes-6.1.3.html | |
| html/en/apm/server/6.7/release-notes-6.1.4.html | |
| html/en/apm/server/6.7/release-notes-6.1.html | |
| html/en/apm/server/6.7/release-notes-6.2.0.html | |
| html/en/apm/server/6.7/release-notes-6.2.1.html | |
| html/en/apm/server/6.7/release-notes-6.2.2.html | |
| html/en/apm/server/6.7/release-notes-6.2.3.html | |
| html/en/apm/server/6.7/release-notes-6.2.4.html | |
| html/en/apm/server/6.7/release-notes-6.2.html | |
| html/en/apm/server/6.7/release-notes-6.3.0.html | |
| html/en/apm/server/6.7/release-notes-6.3.1.html | |
| html/en/apm/server/6.7/release-notes-6.3.2.html | |
| html/en/apm/server/6.7/release-notes-6.3.html | |
| html/en/apm/server/6.7/release-notes-6.4.0.html | |
| html/en/apm/server/6.7/release-notes-6.4.1.html | |
| html/en/apm/server/6.7/release-notes-6.4.2.html | |
| html/en/apm/server/6.7/release-notes-6.4.3.html | |
| html/en/apm/server/6.7/release-notes-6.4.html | |
| html/en/apm/server/6.7/release-notes-6.5.0.html | |
| html/en/apm/server/6.7/release-notes-6.5.1.html | |
| html/en/apm/server/6.7/release-notes-6.5.2.html | |
| html/en/apm/server/6.7/release-notes-6.5.3.html | |
| html/en/apm/server/6.7/release-notes-6.5.4.html | |
| html/en/apm/server/6.7/release-notes-6.5.html | |
| html/en/apm/server/6.7/release-notes-6.6.0.html | |
| html/en/apm/server/6.7/release-notes-6.6.1.html | |
| html/en/apm/server/6.7/release-notes-6.6.2.html | |
| html/en/apm/server/6.7/release-notes-6.6.html | |
| html/en/apm/server/6.7/release-notes-6.7.0.html | |
| html/en/apm/server/6.7/release-notes-6.7.1.html | |
| html/en/apm/server/6.7/release-notes-6.7.2.html | |
| html/en/apm/server/6.7/release-notes-6.7.html | |
| html/en/apm/server/6.7/release-notes.html | |
| html/en/apm/server/6.7/rum.html | |
| html/en/apm/server/6.7/running-on-docker.html | |
| html/en/apm/server/6.7/securing-apm-server.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.7/securing-apm-server.html | |
| @@ -313,7 +313,7 @@ | |
| <a id="security-overview"> | |
| </a> | |
| Security Overview | |
| - <a class="edit_me" href="https://github.com/elastic/apm-server/edit/6.7/docs/security.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| + <a class="edit_me" href="https://github.com/elastic/apm-server/edit/6.7/docs/copied-from-beats/shared-securing-beat.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| edit | |
| </a> | |
| </h3> | |
| @@ -324,7 +324,7 @@ | |
| <a id="secret-token"> | |
| </a> | |
| Secret token | |
| - <a class="edit_me" href="https://github.com/elastic/apm-server/edit/6.7/docs/security.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| + <a class="edit_me" href="https://github.com/elastic/apm-server/edit/6.7/docs/copied-from-beats/shared-securing-beat.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| edit | |
| </a> | |
| </h4> | |
| @@ -345,7 +345,7 @@ | |
| <a id="ssl-setup"> | |
| </a> | |
| SSL/TLS setup | |
| - <a class="edit_me" href="https://github.com/elastic/apm-server/edit/6.7/docs/security.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| + <a class="edit_me" href="https://github.com/elastic/apm-server/edit/6.7/docs/copied-from-beats/shared-securing-beat.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| edit | |
| </a> | |
| </h4> | |
| html/en/apm/server/6.7/securing-beats.html | |
| html/en/apm/server/6.7/securing-communication-elasticsearch.html | |
| html/en/apm/server/6.7/server-info.html | |
| html/en/apm/server/6.7/setting-up-and-running.html | |
| html/en/apm/server/6.7/setup-kibana-endpoint.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.7/setup-kibana-endpoint.html | |
| @@ -329,7 +329,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_kibana_host_literal"> | |
| + <a id="_setup_kibana_host"> | |
| </a> | |
| <code class="literal"> | |
| setup.kibana.host | |
| @@ -452,7 +452,7 @@ | |
| setup.kibana.path: /kibana</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_setup_kibana_username_literal"> | |
| + <a id="_setup_kibana_username"> | |
| </a> | |
| <code class="literal"> | |
| setup.kibana.username | |
| @@ -469,7 +469,7 @@ | |
| specified for the Elasticsearch output. | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_kibana_password_literal"> | |
| + <a id="_setup_kibana_password"> | |
| </a> | |
| <code class="literal"> | |
| setup.kibana.password | |
| @@ -499,7 +499,7 @@ | |
| An HTTP path prefix that is prepended to the HTTP API calls. This is useful for the cases where Kibana listens behind an HTTP reverse proxy that exports the API under a custom prefix. | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_kibana_ssl_enabled_literal"> | |
| + <a id="_setup_kibana_ssl_enabled"> | |
| </a> | |
| <code class="literal"> | |
| setup.kibana.ssl.enabled | |
| html/en/apm/server/6.7/setup-repositories.html | |
| html/en/apm/server/6.7/sourcemap-api.html | |
| html/en/apm/server/6.7/sourcemap-indices.html | |
| html/en/apm/server/6.7/sourcemaps.html | |
| html/en/apm/server/6.7/span-api.html | |
| html/en/apm/server/6.7/span-indices.html | |
| html/en/apm/server/6.7/storage-management.html | |
| html/en/apm/server/6.7/toc.html | |
| html/en/apm/server/6.7/transaction-api-examples.html | |
| html/en/apm/server/6.7/transaction-api.html | |
| html/en/apm/server/6.7/transaction-context-schema.html | |
| html/en/apm/server/6.7/transaction-endpoint.html | |
| html/en/apm/server/6.7/transaction-indices.html | |
| html/en/apm/server/6.7/transaction-payload-schema.html | |
| html/en/apm/server/6.7/transaction-request-schema.html | |
| html/en/apm/server/6.7/transaction-schema-definition.html | |
| html/en/apm/server/6.7/transaction-service-schema.html | |
| html/en/apm/server/6.7/transaction-span-schema.html | |
| html/en/apm/server/6.7/transaction-stacktraceframe-schema.html | |
| html/en/apm/server/6.7/transaction-system-schema.html | |
| html/en/apm/server/6.7/transaction-user-schema.html | |
| html/en/apm/server/6.7/transactions-spans.html | |
| html/en/apm/server/6.7/transactions.html | |
| html/en/apm/server/6.7/troubleshooting.html | |
| html/en/apm/server/6.7/tune-apm-server.html | |
| html/en/apm/server/6.7/tune-data-ingestion.html | |
| html/en/apm/server/6.7/tune-es.html | |
| html/en/apm/server/6.7/update-existing-data.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.7/update-existing-data.html | |
| @@ -300,8 +300,8 @@ | |
| <p> | |
| To rename a service send the following request: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST /apm-*/_update_by_query | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST /apm-*/_update_by_query | |
| { | |
| "query": { | |
| "term": { | |
| html/en/apm/server/6.7/upgrading-to-65.html | |
| html/en/apm/server/6.7/upgrading.html | |
| html/en/apm/server/6.7/using-environ-vars.html | |
| html/en/apm/server/6.7/why-separate-component.html | |
| html/en/apm/server/6.8/_manually_loading_template_configuration.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.8/_manually_loading_template_configuration.html | |
| @@ -445,13 +445,13 @@ | |
| </code> | |
| options to match the new name. For example: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">output.elasticsearch.index: "customname-%{[beat.version]}-%{+yyyy.MM.dd}" | |
| + </li> | |
| + </ul> | |
| + </div> | |
| + <div class="pre_wrapper lang-sh"> | |
| + <pre class="programlisting prettyprint lang-sh">output.elasticsearch.index: "customname-%{[beat.version]}-%{+yyyy.MM.dd}" | |
| setup.template.name: "customname" | |
| setup.template.pattern: "customname-*"</pre> | |
| - </div> | |
| - </li> | |
| - </ul> | |
| </div> | |
| <p> | |
| Also ensure to change the index name accordingly in the Kibana dashboards, when loading via the Kibana UI. | |
| html/en/apm/server/6.8/apm-server-configuration.html | |
| html/en/apm/server/6.8/beats-basic-auth.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.8/beats-basic-auth.html | |
| @@ -430,8 +430,8 @@ | |
| </code> | |
| roles: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST /_xpack/security/user/apm_internal | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST /_xpack/security/user/apm_internal | |
| { | |
| "password" : "YOUR_PASSWORD", | |
| "roles" : [ "apm_writer","kibana_user"], | |
| html/en/apm/server/6.8/beats-system-user.html | |
| html/en/apm/server/6.8/beats-tls.html | |
| html/en/apm/server/6.8/beats-user-access.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.8/beats-user-access.html | |
| @@ -333,8 +333,8 @@ | |
| </code> | |
| : | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST _xpack/security/role/apm_reader | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST _xpack/security/role/apm_reader | |
| { | |
| "indices": [ | |
| { | |
| @@ -410,8 +410,8 @@ | |
| </code> | |
| roles: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST /_xpack/security/user/apm_user | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST /_xpack/security/user/apm_user | |
| { | |
| "password" : "YOUR_PASSWORD", | |
| "roles" : [ "apm_reader","kibana_user"], | |
| html/en/apm/server/6.8/breaking-changes.html | |
| html/en/apm/server/6.8/command-line-options.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.8/command-line-options.html | |
| @@ -581,33 +581,37 @@ | |
| must be adjusted. | |
| </p> | |
| </dd> | |
| - <dt> | |
| - <span class="term"> | |
| - <span class="strong strong"> | |
| - <strong> | |
| - <code class="literal"> | |
| - template | |
| - </code> | |
| - </strong> | |
| - </span> | |
| - </span> | |
| - </dt> | |
| - <dd> | |
| - Exports the index template to stdout. You can specify the | |
| - <code class="literal"> | |
| - --es.version | |
| - </code> | |
| - and | |
| - <code class="literal"> | |
| - --index | |
| - </code> | |
| - flags to further define what gets exported. | |
| - </dd> | |
| </dl> | |
| </div> | |
| - <p> | |
| + <div class="variablelist"> | |
| <a id="template-subcommand"> | |
| </a> | |
| + <dl class="variablelist"> | |
| + <dt> | |
| + <span class="term"> | |
| + <span class="strong strong"> | |
| + <strong> | |
| + <code class="literal"> | |
| + template | |
| + </code> | |
| + </strong> | |
| + </span> | |
| + </span> | |
| + </dt> | |
| + <dd> | |
| + Exports the index template to stdout. You can specify the | |
| + <code class="literal"> | |
| + --es.version | |
| + </code> | |
| + and | |
| + <code class="literal"> | |
| + --index | |
| + </code> | |
| + flags to further define what gets exported. | |
| + </dd> | |
| + </dl> | |
| + </div> | |
| + <p> | |
| <span class="strong strong"> | |
| <strong> | |
| FLAGS | |
| @@ -1155,7 +1159,16 @@ | |
| </dt> | |
| <dd> | |
| <p class="simpara"> | |
| - deprecated:[6.4.0] | |
| + <span class="Admonishment"> | |
| + [ | |
| + <span class="Admonishment-version u-mono u-strikethrough"> | |
| + 6.4.0 | |
| + </span> | |
| + ] | |
| + <span class="Admonishment-detail"> | |
| + Deprecated in 6.4.0. | |
| + </span> | |
| + </span> | |
| </p> | |
| <p class="simpara"> | |
| Loads the initial setup, including Elasticsearch template, Kibana index pattern and Kibana dashboards. If you want to use the command without running APM Server, use the | |
| @@ -1263,7 +1276,16 @@ | |
| </dt> | |
| <dd> | |
| <p class="simpara"> | |
| - deprecated:[6.4.0] | |
| + <span class="Admonishment"> | |
| + [ | |
| + <span class="Admonishment-version u-mono u-strikethrough"> | |
| + 6.4.0 | |
| + </span> | |
| + ] | |
| + <span class="Admonishment-detail"> | |
| + Deprecated in 6.4.0. | |
| + </span> | |
| + </span> | |
| </p> | |
| <p class="simpara"> | |
| Sets up the Kibana dashboards only. | |
| html/en/apm/server/6.8/common-problems.html | |
| html/en/apm/server/6.8/configuration-dashboards.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.8/configuration-dashboards.html | |
| @@ -336,7 +336,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_enabled_literal"> | |
| + <a id="_setup_dashboards_enabled"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.enabled | |
| @@ -431,7 +431,7 @@ | |
| The file archive (zip file) that contains the dashboards to load. If this option is set, APM Server looks for a dashboard archive in the specified path instead of using the local directory. | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_beat_literal"> | |
| + <a id="_setup_dashboards_beat"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.beat | |
| @@ -448,7 +448,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_kibana_index_literal"> | |
| + <a id="_setup_dashboards_kibana_index"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.kibana_index | |
| @@ -464,7 +464,7 @@ | |
| </code> | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_index_literal"> | |
| + <a id="_setup_dashboards_index"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.index | |
| @@ -490,7 +490,7 @@ | |
| </div> | |
| </div> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_always_kibana_literal"> | |
| + <a id="_setup_dashboards_always_kibana"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.always_kibana | |
| @@ -507,7 +507,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_retry_enabled_literal"> | |
| + <a id="_setup_dashboards_retry_enabled"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.retry.enabled | |
| @@ -520,7 +520,7 @@ | |
| If this option is set to true, and Kibana is not reachable at the time when dashboards are loaded, APM Server will retry to reconnect to Kibana instead of exiting with an error. Disabled by default. | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_retry_interval_literal"> | |
| + <a id="_setup_dashboards_retry_interval"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.retry.interval | |
| @@ -533,7 +533,7 @@ | |
| Duration interval between Kibana connection retries. Defaults to 1 second. | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_dashboards_retry_maximum_literal"> | |
| + <a id="_setup_dashboards_retry_maximum"> | |
| </a> | |
| <code class="literal"> | |
| setup.dashboards.retry.maximum | |
| html/en/apm/server/6.8/configuration-logging.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.8/configuration-logging.html | |
| @@ -333,7 +333,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_to_syslog_literal"> | |
| + <a id="_logging_to_syslog"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_syslog | |
| @@ -356,7 +356,7 @@ | |
| </div> | |
| </div> | |
| <h4> | |
| - <a id="_literal_logging_to_eventlog_literal"> | |
| + <a id="_logging_to_eventlog"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_eventlog | |
| @@ -369,7 +369,7 @@ | |
| When true, writes all logging output to the Windows Event Log. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_to_files_literal"> | |
| + <a id="_logging_to_files"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_files | |
| @@ -522,7 +522,7 @@ | |
| also sets the debug log level). | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_metrics_enabled_literal"> | |
| + <a id="_logging_metrics_enabled"> | |
| </a> | |
| <code class="literal"> | |
| logging.metrics.enabled | |
| @@ -544,7 +544,7 @@ | |
| Note that we currently offer no backwards compatible guarantees for the internal metrics and for this reason they are also not documented. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_metrics_period_literal"> | |
| + <a id="_logging_metrics_period"> | |
| </a> | |
| <code class="literal"> | |
| logging.metrics.period | |
| @@ -557,7 +557,7 @@ | |
| The period after which to log the internal metrics. The default is 30s. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_path_literal"> | |
| + <a id="_logging_files_path"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.path | |
| @@ -574,7 +574,7 @@ | |
| section for details. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_name_literal"> | |
| + <a id="_logging_files_name"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.name | |
| @@ -593,7 +593,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_rotateeverybytes_literal"> | |
| + <a id="_logging_files_rotateeverybytes"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.rotateeverybytes | |
| @@ -606,7 +606,7 @@ | |
| The maximum size of a log file. If the limit is reached, a new log file is generated. The default size limit is 10485760 (10 MB). | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_keepfiles_literal"> | |
| + <a id="_logging_files_keepfiles"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.keepfiles | |
| @@ -623,7 +623,7 @@ | |
| options has to be in the range of 2 to 1024 files. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_permissions_literal"> | |
| + <a id="_logging_files_permissions"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.permissions | |
| @@ -662,7 +662,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_logging_json_literal"> | |
| + <a id="_logging_json"> | |
| </a> | |
| <code class="literal"> | |
| logging.json | |
| @@ -715,17 +715,17 @@ | |
| </p> | |
| <p> | |
| <code class="literal"> | |
| - 2017-12-17T18:54:16.241-0500 INFO logp/core_test.go:13 unnamed global logger | |
| - </code> | |
| - </p> | |
| - <p> | |
| - <code class="literal"> | |
| - 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:16 some message | |
| - </code> | |
| - </p> | |
| - <p> | |
| - <code class="literal"> | |
| - 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:19 some message {"x": 1} | |
| + 2017-12-17T18:54:16.241-0500 INFO logp/core_test.go:13 unnamed global logger | |
| + </code> | |
| + </p> | |
| + <p> | |
| + <code class="literal"> | |
| + 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:16 some message | |
| + </code> | |
| + </p> | |
| + <p> | |
| + <code class="literal"> | |
| + 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:19 some message {"x": 1} | |
| </code> | |
| </p> | |
| </div> | |
| html/en/apm/server/6.8/configuration-monitor.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.8/configuration-monitor.html | |
| @@ -291,7 +291,7 @@ | |
| config file: | |
| </p> | |
| <h3> | |
| - <a id="_literal_enabled_literal_7"> | |
| + <a id="_enabled_7"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -319,7 +319,7 @@ | |
| . | |
| </p> | |
| <h3> | |
| - <a id="_literal_elasticsearch_literal"> | |
| + <a id="_elasticsearch"> | |
| </a> | |
| <code class="literal"> | |
| elasticsearch | |
| @@ -332,7 +332,7 @@ | |
| The Elasticsearch instances that you want to ship your APM Server metrics to. This configuration option contains the following fields: | |
| </p> | |
| <h4> | |
| - <a id="_literal_bulk_max_size_literal_5"> | |
| + <a id="_bulk_max_size_5"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -353,7 +353,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_backoff_init_literal_3"> | |
| + <a id="_backoff_init_3"> | |
| </a> | |
| <code class="literal"> | |
| backoff.init | |
| @@ -374,7 +374,7 @@ | |
| . After a successful connection, the backoff timer is reset. The default is 1s. | |
| </p> | |
| <h5> | |
| - <a id="_literal_backoff_max_literal_3"> | |
| + <a id="_backoff_max_3"> | |
| </a> | |
| <code class="literal"> | |
| backoff.max | |
| @@ -387,7 +387,7 @@ | |
| The maximum number of seconds to wait before attempting to connect to Elasticsearch after a network error. The default is 60s. | |
| </p> | |
| <h4> | |
| - <a id="_literal_compression_level_literal_4"> | |
| + <a id="_compression_level_4"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -416,7 +416,7 @@ | |
| . Increasing the compression level reduces the network usage but increases the CPU usage. | |
| </p> | |
| <h4> | |
| - <a id="_literal_headers_literal_2"> | |
| + <a id="_headers_2"> | |
| </a> | |
| <code class="literal"> | |
| headers | |
| @@ -433,7 +433,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_hosts_literal_2"> | |
| + <a id="_hosts_2"> | |
| </a> | |
| <code class="literal"> | |
| hosts | |
| @@ -450,7 +450,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_max_retries_literal_4"> | |
| + <a id="_max_retries_4"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -471,7 +471,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_parameters_literal_2"> | |
| + <a id="_parameters_2"> | |
| </a> | |
| <code class="literal"> | |
| parameters | |
| @@ -484,7 +484,7 @@ | |
| Dictionary of HTTP parameters to pass within the url with index operations. | |
| </p> | |
| <h4> | |
| - <a id="_literal_password_literal_3"> | |
| + <a id="_password_3"> | |
| </a> | |
| <code class="literal"> | |
| password | |
| @@ -497,7 +497,7 @@ | |
| The password that APM Server uses to authenticate with the Elasticsearch instances for shipping monitoring data. | |
| </p> | |
| <h4> | |
| - <a id="_literal_metrics_period_literal"> | |
| + <a id="_metrics_period"> | |
| </a> | |
| <code class="literal"> | |
| metrics.period | |
| @@ -510,7 +510,7 @@ | |
| The time interval (in seconds) when metrics are sent to the Elasticsearch cluster. A new snapshot of APM Server metrics is generated and scheduled for publishing each period. The default value is 10 * time.Second. | |
| </p> | |
| <h4> | |
| - <a id="_literal_state_period_literal"> | |
| + <a id="_state_period"> | |
| </a> | |
| <code class="literal"> | |
| state.period | |
| @@ -523,7 +523,7 @@ | |
| The time interval (in seconds) when state information are sent to the Elasticsearch cluster. A new snapshot of APM Server state is generated and scheduled for publishing each period. The default value is 60 * time.Second. | |
| </p> | |
| <h4> | |
| - <a id="_literal_protocol_literal"> | |
| + <a id="_protocol"> | |
| </a> | |
| <code class="literal"> | |
| protocol | |
| @@ -552,7 +552,7 @@ | |
| , however, the value of protocol is overridden by the scheme you specify in the URL. | |
| </p> | |
| <h4> | |
| - <a id="_literal_proxy_url_literal_3"> | |
| + <a id="_proxy_url_3"> | |
| </a> | |
| <code class="literal"> | |
| proxy_url | |
| @@ -569,7 +569,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_timeout_literal_4"> | |
| + <a id="_timeout_4"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -586,7 +586,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_ssl_literal_4"> | |
| + <a id="_ssl_4"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| @@ -609,7 +609,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_username_literal_3"> | |
| + <a id="_username_3"> | |
| </a> | |
| <code class="literal"> | |
| username | |
| html/en/apm/server/6.8/configuration-output-codec.html | |
| html/en/apm/server/6.8/configuration-path.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.8/configuration-path.html | |
| @@ -329,7 +329,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_home_literal"> | |
| + <a id="_home"> | |
| </a> | |
| <code class="literal"> | |
| home | |
| @@ -348,7 +348,7 @@ | |
| <pre class="programlisting prettyprint lang-yaml">path.home: /usr/share/beats</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_config_literal"> | |
| + <a id="_config"> | |
| </a> | |
| <code class="literal"> | |
| config | |
| @@ -367,7 +367,7 @@ | |
| <pre class="programlisting prettyprint lang-yaml">path.config: /usr/share/beats/config</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_data_literal"> | |
| + <a id="_data"> | |
| </a> | |
| <code class="literal"> | |
| data | |
| @@ -390,7 +390,7 @@ | |
| <pre class="programlisting prettyprint lang-yaml">path.data: /var/lib/beats</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_logs_literal"> | |
| + <a id="_logs"> | |
| </a> | |
| <code class="literal"> | |
| logs | |
| html/en/apm/server/6.8/configuration-process.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.8/configuration-process.html | |
| @@ -668,7 +668,7 @@ | |
| Overwrites existing pipeline definitions in Elasticsearch. Defaults to true. | |
| </p> | |
| <h3> | |
| - <a id="_configuration_options_literal_queue_mem_literal"> | |
| + <a id="_configuration_options_queue_mem"> | |
| </a> | |
| Configuration options: | |
| <code class="literal"> | |
| @@ -735,7 +735,7 @@ | |
| . Default value is 1 second. | |
| </p> | |
| <h3> | |
| - <a id="_configuration_options_literal_max_procs_literal"> | |
| + <a id="_configuration_options_max_procs"> | |
| </a> | |
| Configuration options: | |
| <code class="literal"> | |
| html/en/apm/server/6.8/configuration-rum.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.8/configuration-rum.html | |
| @@ -419,7 +419,7 @@ | |
| Defines the maximum amount of events allowed to be sent to the APM Server v2 RUM endpoint per ip per second. Defaults to 300. | |
| </p> | |
| <h4> | |
| - <a id="_literal_event_rate_lru_size_literal"> | |
| + <a id="_event_rate_lru_size"> | |
| </a> | |
| <code class="literal"> | |
| event_rate.lru_size | |
| @@ -440,7 +440,7 @@ | |
| </a> | |
| </h3> | |
| <h4> | |
| - <a id="_literal_allow_origins_literal"> | |
| + <a id="_allow_origins"> | |
| </a> | |
| <code class="literal"> | |
| allow_origins | |
| @@ -461,7 +461,7 @@ | |
| , which allows everything. | |
| </p> | |
| <h4> | |
| - <a id="_literal_library_pattern_literal"> | |
| + <a id="_library_pattern"> | |
| </a> | |
| <code class="literal"> | |
| library_pattern | |
| @@ -502,7 +502,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_exclude_from_grouping_literal"> | |
| + <a id="_exclude_from_grouping"> | |
| </a> | |
| <code class="literal"> | |
| exclude_from_grouping | |
| @@ -557,7 +557,7 @@ | |
| is automatically applied to documents sent to the RUM endpoint. Source maps are fetched from Elasticsearch and then kept in an in-memory cache for the configured time. Values configured without a time unit are treated as seconds. Default value is 5 minutes. | |
| </p> | |
| <h4> | |
| - <a id="_literal_source_mapping_index_pattern_literal"> | |
| + <a id="_source_mapping_index_pattern"> | |
| </a> | |
| <code class="literal"> | |
| source_mapping.index_pattern | |
| html/en/apm/server/6.8/configuration-ssl.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.8/configuration-ssl.html | |
| @@ -347,7 +347,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_enabled_literal_6"> | |
| + <a id="_enabled_6"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -394,7 +394,7 @@ | |
| </div> | |
| </div> | |
| <h4> | |
| - <a id="_literal_certificate_authorities_literal"> | |
| + <a id="_certificate_authorities"> | |
| </a> | |
| <code class="literal"> | |
| certificate_authorities | |
| @@ -452,7 +452,7 @@ | |
| is specified. | |
| </p> | |
| <h4> | |
| - <a id="_literal_key_passphrase_literal"> | |
| + <a id="_key_passphrase"> | |
| </a> | |
| <code class="literal"> | |
| key_passphrase | |
| @@ -469,7 +469,7 @@ | |
| file. | |
| </p> | |
| <h4> | |
| - <a id="_literal_supported_protocols_literal"> | |
| + <a id="_supported_protocols"> | |
| </a> | |
| <code class="literal"> | |
| supported_protocols | |
| @@ -509,7 +509,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_verification_mode_literal"> | |
| + <a id="_verification_mode"> | |
| </a> | |
| <code class="literal"> | |
| verification_mode | |
| @@ -545,7 +545,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_cipher_suites_literal"> | |
| + <a id="_cipher_suites"> | |
| </a> | |
| <code class="literal"> | |
| cipher_suites | |
| @@ -644,7 +644,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_curve_types_literal"> | |
| + <a id="_curve_types"> | |
| </a> | |
| <code class="literal"> | |
| curve_types | |
| @@ -673,7 +673,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_renegotiation_literal"> | |
| + <a id="_renegotiation"> | |
| </a> | |
| <code class="literal"> | |
| renegotiation | |
| html/en/apm/server/6.8/configuration-template.html | |
| html/en/apm/server/6.8/configure-cloud-id.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.8/configure-cloud-id.html | |
| @@ -310,7 +310,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_cloud_id_literal"> | |
| + <a id="_cloud_id"> | |
| </a> | |
| <code class="literal"> | |
| cloud.id | |
| @@ -339,7 +339,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_cloud_auth_literal"> | |
| + <a id="_cloud_auth"> | |
| </a> | |
| <code class="literal"> | |
| cloud.auth | |
| html/en/apm/server/6.8/configuring-howto-apm-server.html | |
| html/en/apm/server/6.8/configuring-ingest-node.html | |
| html/en/apm/server/6.8/configuring-output.html | |
| html/en/apm/server/6.8/configuring-ssl-logstash.html | |
| html/en/apm/server/6.8/console-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.8/console-output.html | |
| @@ -323,7 +323,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_pretty_literal"> | |
| + <a id="_pretty"> | |
| </a> | |
| <code class="literal"> | |
| pretty | |
| @@ -348,7 +348,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_codec_literal_3"> | |
| + <a id="_codec_3"> | |
| </a> | |
| <code class="literal"> | |
| codec | |
| @@ -384,7 +384,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_5"> | |
| + <a id="_enabled_5"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -408,7 +408,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal_4"> | |
| + <a id="_bulk_max_size_4"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| html/en/apm/server/6.8/directory-layout.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.8/directory-layout.html | |
| @@ -323,10 +323,6 @@ | |
| </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| - <p> | |
| - <code class="literal"> | |
| - </code> | |
| - </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| <p> | |
| @@ -359,10 +355,6 @@ | |
| </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| - <p> | |
| - <code class="literal"> | |
| - </code> | |
| - </p> | |
| </td> | |
| </tr> | |
| <tr> | |
| html/en/apm/server/6.8/elasticsearch-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.8/elasticsearch-output.html | |
| @@ -397,7 +397,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal"> | |
| + <a id="_enabled"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -521,7 +521,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_level_literal"> | |
| + <a id="_compression_level"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -548,7 +548,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_escape_html_literal"> | |
| + <a id="_escape_html"> | |
| </a> | |
| <code class="literal"> | |
| escape_html | |
| @@ -580,7 +580,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_worker_literal"> | |
| + <a id="_worker"> | |
| </a> | |
| <code class="literal"> | |
| worker | |
| @@ -604,7 +604,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_username_literal"> | |
| + <a id="_username"> | |
| </a> | |
| <code class="literal"> | |
| username | |
| @@ -625,7 +625,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_password_literal"> | |
| + <a id="_password"> | |
| </a> | |
| <code class="literal"> | |
| password | |
| @@ -646,7 +646,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_parameters_literal"> | |
| + <a id="_parameters"> | |
| </a> | |
| <code class="literal"> | |
| parameters | |
| @@ -731,7 +731,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_headers_literal"> | |
| + <a id="_headers"> | |
| </a> | |
| <code class="literal"> | |
| headers | |
| @@ -759,7 +759,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_proxy_url_literal"> | |
| + <a id="_proxy_url"> | |
| </a> | |
| <code class="literal"> | |
| proxy_url | |
| @@ -840,7 +840,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_indices_literal"> | |
| + <a id="_indices"> | |
| </a> | |
| <code class="literal"> | |
| indices | |
| @@ -953,7 +953,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_pipeline_literal"> | |
| + <a id="_pipeline"> | |
| </a> | |
| <code class="literal"> | |
| pipeline | |
| @@ -988,7 +988,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_pipelines_literal"> | |
| + <a id="_pipelines"> | |
| </a> | |
| <code class="literal"> | |
| pipelines | |
| @@ -1054,7 +1054,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_max_retries_literal"> | |
| + <a id="_max_retries"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -1085,7 +1085,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal"> | |
| + <a id="_bulk_max_size"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -1123,7 +1123,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_init_literal"> | |
| + <a id="_backoff_init"> | |
| </a> | |
| <code class="literal"> | |
| backoff.init | |
| @@ -1152,7 +1152,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_max_literal"> | |
| + <a id="_backoff_max"> | |
| </a> | |
| <code class="literal"> | |
| backoff.max | |
| @@ -1173,7 +1173,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_timeout_literal"> | |
| + <a id="_timeout"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -1194,7 +1194,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ssl_literal"> | |
| + <a id="_ssl"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| html/en/apm/server/6.8/enable-apm-server-debugging.html | |
| html/en/apm/server/6.8/error-api-examples.html | |
| html/en/apm/server/6.8/error-api.html | |
| html/en/apm/server/6.8/error-context-schema.html | |
| html/en/apm/server/6.8/error-endpoint.html | |
| html/en/apm/server/6.8/error-indices.html | |
| html/en/apm/server/6.8/error-payload-schema.html | |
| html/en/apm/server/6.8/error-schema-definition.html | |
| html/en/apm/server/6.8/error-service-schema.html | |
| html/en/apm/server/6.8/error-stacktraceframe-schema.html | |
| html/en/apm/server/6.8/error-system-schema.html | |
| html/en/apm/server/6.8/errors.html | |
| html/en/apm/server/6.8/event-types.html | |
| html/en/apm/server/6.8/events-api.html | |
| html/en/apm/server/6.8/example-intakev2-events.html | |
| html/en/apm/server/6.8/exploring-es-data.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.8/exploring-es-data.html | |
| @@ -326,8 +326,8 @@ | |
| <p> | |
| To get an overview of existing indices you can run: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET _cat/indices/apm*</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET _cat/indices/apm*</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| @@ -384,16 +384,16 @@ | |
| <p> | |
| To query all documents collected with a specific APM Server version: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET apm-6.8.2-*/_search</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET apm-6.8.2-*/_search</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| <p> | |
| To query a specific type, for example transactions: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET apm-*transactions-*/_search</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET apm-*transactions-*/_search</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| @@ -412,16 +412,16 @@ | |
| </span> | |
| of the Elastic APM indices, first, run a query to find template names: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET _cat/templates/apm*</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET _cat/templates/apm*</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| <p> | |
| Then you can retrieve the specific template you are interested in: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET /_template/your-template-name</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET /_template/your-template-name</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| html/en/apm/server/6.8/exported-fields-alias.html | |
| html/en/apm/server/6.8/exported-fields-apm-error.html | |
| html/en/apm/server/6.8/exported-fields-apm-sourcemap.html | |
| html/en/apm/server/6.8/exported-fields-apm-span.html | |
| html/en/apm/server/6.8/exported-fields-apm-transaction.html | |
| html/en/apm/server/6.8/exported-fields-apm.html | |
| html/en/apm/server/6.8/exported-fields-beat.html | |
| html/en/apm/server/6.8/exported-fields-cloud.html | |
| html/en/apm/server/6.8/exported-fields-docker-processor.html | |
| html/en/apm/server/6.8/exported-fields-host-processor.html | |
| html/en/apm/server/6.8/exported-fields-kubernetes-processor.html | |
| html/en/apm/server/6.8/exported-fields-system.html | |
| html/en/apm/server/6.8/exported-fields.html | |
| html/en/apm/server/6.8/file-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.8/file-output.html | |
| @@ -327,7 +327,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_4"> | |
| + <a id="_enabled_4"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -372,7 +372,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_filename_literal"> | |
| + <a id="_filename"> | |
| </a> | |
| <code class="literal"> | |
| filename | |
| @@ -393,7 +393,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_rotate_every_kb_literal"> | |
| + <a id="_rotate_every_kb"> | |
| </a> | |
| <code class="literal"> | |
| rotate_every_kb | |
| @@ -414,7 +414,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_number_of_files_literal"> | |
| + <a id="_number_of_files"> | |
| </a> | |
| <code class="literal"> | |
| number_of_files | |
| @@ -441,7 +441,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_permissions_literal"> | |
| + <a id="_permissions"> | |
| </a> | |
| <code class="literal"> | |
| permissions | |
| @@ -462,7 +462,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_codec_literal_2"> | |
| + <a id="_codec_2"> | |
| </a> | |
| <code class="literal"> | |
| codec | |
| html/en/apm/server/6.8/getting-help.html | |
| html/en/apm/server/6.8/high-availability.html | |
| html/en/apm/server/6.8/index.html | |
| html/en/apm/server/6.8/installing-on-windows.html | |
| html/en/apm/server/6.8/installing.html | |
| html/en/apm/server/6.8/intake-api.html | |
| html/en/apm/server/6.8/kafka-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.8/kafka-output.html | |
| @@ -377,7 +377,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_3"> | |
| + <a id="_enabled_3"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -405,7 +405,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_hosts_literal"> | |
| + <a id="_hosts"> | |
| </a> | |
| <code class="literal"> | |
| hosts | |
| @@ -426,7 +426,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_version_literal"> | |
| + <a id="_version"> | |
| </a> | |
| <code class="literal"> | |
| version | |
| @@ -461,7 +461,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_username_literal_2"> | |
| + <a id="_username_2"> | |
| </a> | |
| <code class="literal"> | |
| username | |
| @@ -482,7 +482,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_password_literal_2"> | |
| + <a id="_password_2"> | |
| </a> | |
| <code class="literal"> | |
| password | |
| @@ -503,7 +503,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_topic_literal"> | |
| + <a id="_topic"> | |
| </a> | |
| <code class="literal"> | |
| topic | |
| @@ -541,7 +541,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_topics_literal"> | |
| + <a id="_topics"> | |
| </a> | |
| <code class="literal"> | |
| topics | |
| @@ -621,7 +621,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_key_literal"> | |
| + <a id="_key"> | |
| </a> | |
| <code class="literal"> | |
| key | |
| @@ -642,7 +642,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_partition_literal"> | |
| + <a id="_partition"> | |
| </a> | |
| <code class="literal"> | |
| partition | |
| @@ -748,7 +748,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_client_id_literal"> | |
| + <a id="_client_id"> | |
| </a> | |
| <code class="literal"> | |
| client_id | |
| @@ -769,7 +769,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_worker_literal_3"> | |
| + <a id="_worker_3"> | |
| </a> | |
| <code class="literal"> | |
| worker | |
| @@ -790,7 +790,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_codec_literal"> | |
| + <a id="_codec"> | |
| </a> | |
| <code class="literal"> | |
| codec | |
| @@ -822,7 +822,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_metadata_literal"> | |
| + <a id="_metadata"> | |
| </a> | |
| <code class="literal"> | |
| metadata | |
| @@ -889,7 +889,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_max_retries_literal_3"> | |
| + <a id="_max_retries_3"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -920,7 +920,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal_3"> | |
| + <a id="_bulk_max_size_3"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -941,7 +941,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_timeout_literal_3"> | |
| + <a id="_timeout_3"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -962,7 +962,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_broker_timeout_literal"> | |
| + <a id="_broker_timeout"> | |
| </a> | |
| <code class="literal"> | |
| broker_timeout | |
| @@ -983,7 +983,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_channel_buffer_size_literal"> | |
| + <a id="_channel_buffer_size"> | |
| </a> | |
| <code class="literal"> | |
| channel_buffer_size | |
| @@ -1004,7 +1004,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_keep_alive_literal"> | |
| + <a id="_keep_alive"> | |
| </a> | |
| <code class="literal"> | |
| keep_alive | |
| @@ -1025,7 +1025,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_literal"> | |
| + <a id="_compression"> | |
| </a> | |
| <code class="literal"> | |
| compression | |
| @@ -1066,7 +1066,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_level_literal_3"> | |
| + <a id="_compression_level_3"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -1118,7 +1118,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_required_acks_literal"> | |
| + <a id="_required_acks"> | |
| </a> | |
| <code class="literal"> | |
| required_acks | |
| @@ -1142,7 +1142,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ssl_literal_3"> | |
| + <a id="_ssl_3"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| html/en/apm/server/6.8/keystore.html | |
| html/en/apm/server/6.8/linux-seccomp.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.8/linux-seccomp.html | |
| @@ -469,6 +469,12 @@ | |
| <dd> | |
| A list of system call names. The system call name must exist for the runtime architecture, otherwise an error will be logged and the filter will not be installed. At least one system call must be defined. | |
| </dd> | |
| + </dl> | |
| + </div> | |
| + <div class="variablelist"> | |
| + <a id="seccomp-policy-config-action"> | |
| + </a> | |
| + <dl class="variablelist"> | |
| <dt> | |
| <span class="term"> | |
| <span class="strong strong"> | |
| @@ -489,8 +495,6 @@ | |
| is executed. This is required. These are the available action values. The actions that are available depend on the kernel version. | |
| </p> | |
| <div class="itemizedlist"> | |
| - <a id="seccomp-policy-config-action"> | |
| - </a> | |
| <ul class="itemizedlist" type="disc"> | |
| <li class="listitem"> | |
| <code class="literal"> | |
| html/en/apm/server/6.8/load-kibana-dashboards.html | |
| html/en/apm/server/6.8/logstash-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.8/logstash-output.html | |
| @@ -293,6 +293,9 @@ | |
| <img alt="Important" src="images/icons/important.png"/> | |
| </div> | |
| <div class="admon_content"> | |
| + <h3> | |
| + Prerequisite | |
| + </h3> | |
| <p> | |
| To send events to Logstash, you also need to create a Logstash configuration pipeline that listens for incoming Beats connections and indexes the received events into Elasticsearch. For more information, see the section about | |
| <a class="ulink" href="https://www.elastic.co/guide/en/elastic-stack-overview/6.8/get-started-elastic-stack.html#logstash-setup" target="_top"> | |
| @@ -595,7 +598,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_2"> | |
| + <a id="_enabled_2"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -649,7 +652,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_level_literal_2"> | |
| + <a id="_compression_level_2"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -676,7 +679,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_escape_html_literal_2"> | |
| + <a id="_escape_html_2"> | |
| </a> | |
| <code class="literal"> | |
| escape_html | |
| @@ -708,7 +711,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_worker_literal_2"> | |
| + <a id="_worker_2"> | |
| </a> | |
| <code class="literal"> | |
| worker | |
| @@ -756,7 +759,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ttl_literal"> | |
| + <a id="_ttl"> | |
| </a> | |
| <code class="literal"> | |
| ttl | |
| @@ -790,7 +793,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_pipelining_literal"> | |
| + <a id="_pipelining"> | |
| </a> | |
| <code class="literal"> | |
| pipelining | |
| @@ -852,7 +855,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_proxy_url_literal_2"> | |
| + <a id="_proxy_url_2"> | |
| </a> | |
| <code class="literal"> | |
| proxy_url | |
| @@ -952,7 +955,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ssl_literal_2"> | |
| + <a id="_ssl_2"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| @@ -983,7 +986,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_timeout_literal_2"> | |
| + <a id="_timeout_2"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -1004,7 +1007,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_max_retries_literal_2"> | |
| + <a id="_max_retries_2"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -1035,7 +1038,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal_2"> | |
| + <a id="_bulk_max_size_2"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -1073,7 +1076,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_slow_start_literal"> | |
| + <a id="_slow_start"> | |
| </a> | |
| <code class="literal"> | |
| slow_start | |
| @@ -1105,7 +1108,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_init_literal_2"> | |
| + <a id="_backoff_init_2"> | |
| </a> | |
| <code class="literal"> | |
| backoff.init | |
| @@ -1134,7 +1137,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_max_literal_2"> | |
| + <a id="_backoff_max_2"> | |
| </a> | |
| <code class="literal"> | |
| backoff.max | |
| html/en/apm/server/6.8/manage-indices-kibana.html | |
| html/en/apm/server/6.8/manual-ilm-setup.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.8/manual-ilm-setup.html | |
| @@ -706,8 +706,8 @@ | |
| </code> | |
| overwrites defaults rather than being merged. This means you’ll need to configure all of your indices in the file, even if some are not using ILM. | |
| </p> | |
| - <div class="pre_wrapper lang-yml"> | |
| - <pre class="programlisting prettyprint lang-yml">output.elasticsearch: | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">output.elasticsearch: | |
| indices: | |
| - index: "apm-6.8.2-sourcemap" | |
| when.contains: | |
| html/en/apm/server/6.8/metadata-api.html | |
| html/en/apm/server/6.8/metricset-api.html | |
| html/en/apm/server/6.8/metricset-indices.html | |
| html/en/apm/server/6.8/monitoring.html | |
| html/en/apm/server/6.8/overview.html | |
| html/en/apm/server/6.8/payload-with-error.html | |
| html/en/apm/server/6.8/payload-with-minimal-exception.html | |
| html/en/apm/server/6.8/payload-with-minimal-log.html | |
| html/en/apm/server/6.8/payload-with-minimal-span.html | |
| html/en/apm/server/6.8/payload-with-minimal-transaction.html | |
| html/en/apm/server/6.8/payload-with-transactions.html | |
| html/en/apm/server/6.8/redirects.html | |
| html/en/apm/server/6.8/reduce-storage.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.8/reduce-storage.html | |
| @@ -366,7 +366,7 @@ | |
| . With the curator command line interface you can, for instance, see all your existing indices: | |
| </p> | |
| <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">curator_cli --host localhost show_indices --filter_list '[{"filtertype":"pattern","kind":"prefix","value":"apm-"}]' | |
| + <pre class="programlisting prettyprint lang-sh">curator_cli --host localhost show_indices --filter_list '[\{"filtertype":"pattern","kind":"prefix","value":"apm-"\}]' | |
| apm-6.8.2-error-2018.05.10 | |
| apm-6.8.2-error-2018.05.11 | |
| @@ -383,7 +383,7 @@ | |
| And then delete any span indices older than 1 day: | |
| </p> | |
| <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">curator_cli --host localhost delete_indices --filter_list '[{"filtertype":"pattern","kind":"prefix","value":"apm-6.8.2-span-"}, {"filtertype":"age","source":"name","timestring":"%Y.%m.%d","unit":"days","unit_count":1,"direction":"older"}]' | |
| + <pre class="programlisting prettyprint lang-sh">curator_cli --host localhost delete_indices --filter_list '[\{"filtertype":"pattern","kind":"prefix","value":"apm-6.8.2-span-"\}, \{"filtertype":"age","source":"name","timestring":"%Y.%m.%d","unit":"days","unit_count":1,"direction":"older"\}]' | |
| INFO Deleting selected indices: [apm-6.8.2-span-2018.05.10, apm-6.8.2-span-2018.05.11] | |
| INFO ---deleting index apm-6.8.2-span-2018.05.10 | |
| @@ -401,8 +401,8 @@ | |
| <p> | |
| To delete documents matching a specific query, for example, all documents with a given context.service.name, use the following request: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST /apm-*/_delete_by_query | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST /apm-*/_delete_by_query | |
| { | |
| "query": { | |
| "bool": { | |
| html/en/apm/server/6.8/release-notes-6.1.0.html | |
| html/en/apm/server/6.8/release-notes-6.1.1.html | |
| html/en/apm/server/6.8/release-notes-6.1.2.html | |
| html/en/apm/server/6.8/release-notes-6.1.3.html | |
| html/en/apm/server/6.8/release-notes-6.1.4.html | |
| html/en/apm/server/6.8/release-notes-6.1.html | |
| html/en/apm/server/6.8/release-notes-6.2.0.html | |
| html/en/apm/server/6.8/release-notes-6.2.1.html | |
| html/en/apm/server/6.8/release-notes-6.2.2.html | |
| html/en/apm/server/6.8/release-notes-6.2.3.html | |
| html/en/apm/server/6.8/release-notes-6.2.4.html | |
| html/en/apm/server/6.8/release-notes-6.2.html | |
| html/en/apm/server/6.8/release-notes-6.3.0.html | |
| html/en/apm/server/6.8/release-notes-6.3.1.html | |
| html/en/apm/server/6.8/release-notes-6.3.2.html | |
| html/en/apm/server/6.8/release-notes-6.3.html | |
| html/en/apm/server/6.8/release-notes-6.4.0.html | |
| html/en/apm/server/6.8/release-notes-6.4.1.html | |
| html/en/apm/server/6.8/release-notes-6.4.2.html | |
| html/en/apm/server/6.8/release-notes-6.4.3.html | |
| html/en/apm/server/6.8/release-notes-6.4.html | |
| html/en/apm/server/6.8/release-notes-6.5.0.html | |
| html/en/apm/server/6.8/release-notes-6.5.1.html | |
| html/en/apm/server/6.8/release-notes-6.5.2.html | |
| html/en/apm/server/6.8/release-notes-6.5.3.html | |
| html/en/apm/server/6.8/release-notes-6.5.4.html | |
| html/en/apm/server/6.8/release-notes-6.5.html | |
| html/en/apm/server/6.8/release-notes-6.6.0.html | |
| html/en/apm/server/6.8/release-notes-6.6.1.html | |
| html/en/apm/server/6.8/release-notes-6.6.2.html | |
| html/en/apm/server/6.8/release-notes-6.6.html | |
| html/en/apm/server/6.8/release-notes-6.7.0.html | |
| html/en/apm/server/6.8/release-notes-6.7.1.html | |
| html/en/apm/server/6.8/release-notes-6.7.2.html | |
| html/en/apm/server/6.8/release-notes-6.7.html | |
| html/en/apm/server/6.8/release-notes-6.8.0.html | |
| html/en/apm/server/6.8/release-notes-6.8.1.html | |
| html/en/apm/server/6.8/release-notes-6.8.2.html | |
| html/en/apm/server/6.8/release-notes-6.8.html | |
| html/en/apm/server/6.8/release-notes.html | |
| html/en/apm/server/6.8/rum.html | |
| html/en/apm/server/6.8/running-on-docker.html | |
| html/en/apm/server/6.8/securing-apm-server.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.8/securing-apm-server.html | |
| @@ -313,7 +313,7 @@ | |
| <a id="security-overview"> | |
| </a> | |
| Security Overview | |
| - <a class="edit_me" href="https://github.com/elastic/apm-server/edit/6.8/docs/security.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| + <a class="edit_me" href="https://github.com/elastic/apm-server/edit/6.8/docs/copied-from-beats/shared-securing-beat.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| edit | |
| </a> | |
| </h3> | |
| @@ -324,7 +324,7 @@ | |
| <a id="secret-token"> | |
| </a> | |
| Secret token | |
| - <a class="edit_me" href="https://github.com/elastic/apm-server/edit/6.8/docs/security.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| + <a class="edit_me" href="https://github.com/elastic/apm-server/edit/6.8/docs/copied-from-beats/shared-securing-beat.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| edit | |
| </a> | |
| </h4> | |
| @@ -345,7 +345,7 @@ | |
| <a id="ssl-setup"> | |
| </a> | |
| SSL/TLS setup | |
| - <a class="edit_me" href="https://github.com/elastic/apm-server/edit/6.8/docs/security.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| + <a class="edit_me" href="https://github.com/elastic/apm-server/edit/6.8/docs/copied-from-beats/shared-securing-beat.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| edit | |
| </a> | |
| </h4> | |
| html/en/apm/server/6.8/securing-beats.html | |
| html/en/apm/server/6.8/securing-communication-elasticsearch.html | |
| html/en/apm/server/6.8/server-info.html | |
| html/en/apm/server/6.8/setting-up-and-running.html | |
| html/en/apm/server/6.8/setup-kibana-endpoint.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.8/setup-kibana-endpoint.html | |
| @@ -329,7 +329,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_kibana_host_literal"> | |
| + <a id="_setup_kibana_host"> | |
| </a> | |
| <code class="literal"> | |
| setup.kibana.host | |
| @@ -452,7 +452,7 @@ | |
| setup.kibana.path: /kibana</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_setup_kibana_username_literal"> | |
| + <a id="_setup_kibana_username"> | |
| </a> | |
| <code class="literal"> | |
| setup.kibana.username | |
| @@ -469,7 +469,7 @@ | |
| specified for the Elasticsearch output. | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_kibana_password_literal"> | |
| + <a id="_setup_kibana_password"> | |
| </a> | |
| <code class="literal"> | |
| setup.kibana.password | |
| @@ -499,7 +499,7 @@ | |
| An HTTP path prefix that is prepended to the HTTP API calls. This is useful for the cases where Kibana listens behind an HTTP reverse proxy that exports the API under a custom prefix. | |
| </p> | |
| <h4> | |
| - <a id="_literal_setup_kibana_ssl_enabled_literal"> | |
| + <a id="_setup_kibana_ssl_enabled"> | |
| </a> | |
| <code class="literal"> | |
| setup.kibana.ssl.enabled | |
| html/en/apm/server/6.8/setup-repositories.html | |
| html/en/apm/server/6.8/sourcemap-api.html | |
| html/en/apm/server/6.8/sourcemap-indices.html | |
| html/en/apm/server/6.8/sourcemaps.html | |
| html/en/apm/server/6.8/span-api.html | |
| html/en/apm/server/6.8/span-indices.html | |
| html/en/apm/server/6.8/storage-management.html | |
| html/en/apm/server/6.8/toc.html | |
| html/en/apm/server/6.8/transaction-api-examples.html | |
| html/en/apm/server/6.8/transaction-api.html | |
| html/en/apm/server/6.8/transaction-context-schema.html | |
| html/en/apm/server/6.8/transaction-endpoint.html | |
| html/en/apm/server/6.8/transaction-indices.html | |
| html/en/apm/server/6.8/transaction-payload-schema.html | |
| html/en/apm/server/6.8/transaction-request-schema.html | |
| html/en/apm/server/6.8/transaction-schema-definition.html | |
| html/en/apm/server/6.8/transaction-service-schema.html | |
| html/en/apm/server/6.8/transaction-span-schema.html | |
| html/en/apm/server/6.8/transaction-stacktraceframe-schema.html | |
| html/en/apm/server/6.8/transaction-system-schema.html | |
| html/en/apm/server/6.8/transaction-user-schema.html | |
| html/en/apm/server/6.8/transactions-spans.html | |
| html/en/apm/server/6.8/transactions.html | |
| html/en/apm/server/6.8/troubleshooting.html | |
| html/en/apm/server/6.8/tune-apm-server.html | |
| html/en/apm/server/6.8/tune-data-ingestion.html | |
| html/en/apm/server/6.8/tune-es.html | |
| html/en/apm/server/6.8/update-existing-data.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/6.8/update-existing-data.html | |
| @@ -300,8 +300,8 @@ | |
| <p> | |
| To rename a service send the following request: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST /apm-*/_update_by_query | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST /apm-*/_update_by_query | |
| { | |
| "query": { | |
| "term": { | |
| html/en/apm/server/6.8/upgrading-to-65.html | |
| html/en/apm/server/6.8/upgrading.html | |
| html/en/apm/server/6.8/using-environ-vars.html | |
| html/en/apm/server/6.8/why-separate-component.html | |
| html/en/apm/server/7.0/_manually_loading_template_configuration.html | |
| html/en/apm/server/7.0/apm-server-configuration.html | |
| html/en/apm/server/7.0/beats-basic-auth.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.0/beats-basic-auth.html | |
| @@ -355,8 +355,8 @@ | |
| </code> | |
| : | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST _security/role/apm_writer | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST _security/role/apm_writer | |
| { | |
| "cluster": ["manage_index_templates","monitor"], | |
| "indices": [ | |
| @@ -393,6 +393,10 @@ | |
| </table> | |
| </div> | |
| </li> | |
| + </ol> | |
| + </div> | |
| + <div class="orderedlist"> | |
| + <ol class="orderedlist" type="1"> | |
| <li class="listitem"> | |
| <p class="simpara"> | |
| Assign the writer role to the user that APM Server will use to connect to Elasticsearch. Make sure you also assign any roles that are required for specific features. For the list of features and required roles, see | |
| @@ -432,8 +436,8 @@ | |
| </code> | |
| roles: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST /_security/user/apm_internal | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST /_security/user/apm_internal | |
| { | |
| "password" : "YOUR_PASSWORD", | |
| "roles" : [ "apm_writer","kibana_user"], | |
| html/en/apm/server/7.0/beats-system-user.html | |
| html/en/apm/server/7.0/beats-tls.html | |
| html/en/apm/server/7.0/beats-user-access.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.0/beats-user-access.html | |
| @@ -363,8 +363,8 @@ | |
| </code> | |
| roles: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST /_security/user/apm_account | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST /_security/user/apm_account | |
| { | |
| "password" : "YOUR_PASSWORD", | |
| "roles" : [ "apm_user","kibana_user"], | |
| html/en/apm/server/7.0/breaking-changes.html | |
| html/en/apm/server/7.0/command-line-options.html | |
| html/en/apm/server/7.0/common-problems.html | |
| html/en/apm/server/7.0/concurrent_requests.html | |
| html/en/apm/server/7.0/configuration-logging.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.0/configuration-logging.html | |
| @@ -333,7 +333,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_to_syslog_literal"> | |
| + <a id="_logging_to_syslog"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_syslog | |
| @@ -356,7 +356,7 @@ | |
| </div> | |
| </div> | |
| <h4> | |
| - <a id="_literal_logging_to_eventlog_literal"> | |
| + <a id="_logging_to_eventlog"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_eventlog | |
| @@ -369,7 +369,7 @@ | |
| When true, writes all logging output to the Windows Event Log. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_to_files_literal"> | |
| + <a id="_logging_to_files"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_files | |
| @@ -522,7 +522,7 @@ | |
| also sets the debug log level). | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_metrics_enabled_literal"> | |
| + <a id="_logging_metrics_enabled"> | |
| </a> | |
| <code class="literal"> | |
| logging.metrics.enabled | |
| @@ -544,7 +544,7 @@ | |
| Note that we currently offer no backwards compatible guarantees for the internal metrics and for this reason they are also not documented. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_metrics_period_literal"> | |
| + <a id="_logging_metrics_period"> | |
| </a> | |
| <code class="literal"> | |
| logging.metrics.period | |
| @@ -557,7 +557,7 @@ | |
| The period after which to log the internal metrics. The default is 30s. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_path_literal"> | |
| + <a id="_logging_files_path"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.path | |
| @@ -574,7 +574,7 @@ | |
| section for details. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_name_literal"> | |
| + <a id="_logging_files_name"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.name | |
| @@ -593,7 +593,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_rotateeverybytes_literal"> | |
| + <a id="_logging_files_rotateeverybytes"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.rotateeverybytes | |
| @@ -606,7 +606,7 @@ | |
| The maximum size of a log file. If the limit is reached, a new log file is generated. The default size limit is 10485760 (10 MB). | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_keepfiles_literal"> | |
| + <a id="_logging_files_keepfiles"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.keepfiles | |
| @@ -623,7 +623,7 @@ | |
| options has to be in the range of 2 to 1024 files. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_permissions_literal"> | |
| + <a id="_logging_files_permissions"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.permissions | |
| @@ -662,7 +662,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_logging_files_interval_literal"> | |
| + <a id="_logging_files_interval"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.interval | |
| @@ -675,7 +675,7 @@ | |
| Enable log file rotation on time intervals in addition to size-based rotation. Intervals must be at least 1s. Values of 1m, 1h, 24h, 7*24h, 30*24h, and 365*24h are boundary-aligned with minutes, hours, days, weeks, months, and years as reported by the local system clock. All other intervals are calculated from the unix epoch. Defaults to disabled. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_json_literal"> | |
| + <a id="_logging_json"> | |
| </a> | |
| <code class="literal"> | |
| logging.json | |
| @@ -688,7 +688,7 @@ | |
| When true, logs messages in JSON format. The default is false. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_redirect_stderr_literal_phrase_role_experimental_phrase"> | |
| + <a id="_logging_files_redirect_stderr"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.redirect_stderr | |
| @@ -755,17 +755,17 @@ | |
| </p> | |
| <p> | |
| <code class="literal"> | |
| - 2017-12-17T18:54:16.241-0500 INFO logp/core_test.go:13 unnamed global logger | |
| - </code> | |
| - </p> | |
| - <p> | |
| - <code class="literal"> | |
| - 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:16 some message | |
| - </code> | |
| - </p> | |
| - <p> | |
| - <code class="literal"> | |
| - 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:19 some message {"x": 1} | |
| + 2017-12-17T18:54:16.241-0500 INFO logp/core_test.go:13 unnamed global logger | |
| + </code> | |
| + </p> | |
| + <p> | |
| + <code class="literal"> | |
| + 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:16 some message | |
| + </code> | |
| + </p> | |
| + <p> | |
| + <code class="literal"> | |
| + 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:19 some message {"x": 1} | |
| </code> | |
| </p> | |
| </div> | |
| html/en/apm/server/7.0/configuration-monitor.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.0/configuration-monitor.html | |
| @@ -291,7 +291,7 @@ | |
| config file: | |
| </p> | |
| <h3> | |
| - <a id="_literal_enabled_literal_7"> | |
| + <a id="_enabled_7"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -319,7 +319,7 @@ | |
| . | |
| </p> | |
| <h3> | |
| - <a id="_literal_elasticsearch_literal"> | |
| + <a id="_elasticsearch"> | |
| </a> | |
| <code class="literal"> | |
| elasticsearch | |
| @@ -332,7 +332,7 @@ | |
| The Elasticsearch instances that you want to ship your APM Server metrics to. This configuration option contains the following fields: | |
| </p> | |
| <h4> | |
| - <a id="_literal_bulk_max_size_literal_5"> | |
| + <a id="_bulk_max_size_5"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -353,7 +353,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_backoff_init_literal_3"> | |
| + <a id="_backoff_init_3"> | |
| </a> | |
| <code class="literal"> | |
| backoff.init | |
| @@ -374,7 +374,7 @@ | |
| . After a successful connection, the backoff timer is reset. The default is 1s. | |
| </p> | |
| <h5> | |
| - <a id="_literal_backoff_max_literal_3"> | |
| + <a id="_backoff_max_3"> | |
| </a> | |
| <code class="literal"> | |
| backoff.max | |
| @@ -387,7 +387,7 @@ | |
| The maximum number of seconds to wait before attempting to connect to Elasticsearch after a network error. The default is 60s. | |
| </p> | |
| <h4> | |
| - <a id="_literal_compression_level_literal_4"> | |
| + <a id="_compression_level_4"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -416,7 +416,7 @@ | |
| . Increasing the compression level reduces the network usage but increases the CPU usage. | |
| </p> | |
| <h4> | |
| - <a id="_literal_headers_literal_2"> | |
| + <a id="_headers_2"> | |
| </a> | |
| <code class="literal"> | |
| headers | |
| @@ -433,7 +433,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_hosts_literal_2"> | |
| + <a id="_hosts_2"> | |
| </a> | |
| <code class="literal"> | |
| hosts | |
| @@ -450,7 +450,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_max_retries_literal_4"> | |
| + <a id="_max_retries_4"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -471,7 +471,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_parameters_literal_2"> | |
| + <a id="_parameters_2"> | |
| </a> | |
| <code class="literal"> | |
| parameters | |
| @@ -484,7 +484,7 @@ | |
| Dictionary of HTTP parameters to pass within the url with index operations. | |
| </p> | |
| <h4> | |
| - <a id="_literal_password_literal_3"> | |
| + <a id="_password_3"> | |
| </a> | |
| <code class="literal"> | |
| password | |
| @@ -497,7 +497,7 @@ | |
| The password that APM Server uses to authenticate with the Elasticsearch instances for shipping monitoring data. | |
| </p> | |
| <h4> | |
| - <a id="_literal_metrics_period_literal"> | |
| + <a id="_metrics_period"> | |
| </a> | |
| <code class="literal"> | |
| metrics.period | |
| @@ -510,7 +510,7 @@ | |
| The time interval (in seconds) when metrics are sent to the Elasticsearch cluster. A new snapshot of APM Server metrics is generated and scheduled for publishing each period. The default value is 10 * time.Second. | |
| </p> | |
| <h4> | |
| - <a id="_literal_state_period_literal"> | |
| + <a id="_state_period"> | |
| </a> | |
| <code class="literal"> | |
| state.period | |
| @@ -523,7 +523,7 @@ | |
| The time interval (in seconds) when state information are sent to the Elasticsearch cluster. A new snapshot of APM Server state is generated and scheduled for publishing each period. The default value is 60 * time.Second. | |
| </p> | |
| <h4> | |
| - <a id="_literal_protocol_literal"> | |
| + <a id="_protocol"> | |
| </a> | |
| <code class="literal"> | |
| protocol | |
| @@ -552,7 +552,7 @@ | |
| , however, the value of protocol is overridden by the scheme you specify in the URL. | |
| </p> | |
| <h4> | |
| - <a id="_literal_proxy_url_literal_3"> | |
| + <a id="_proxy_url_3"> | |
| </a> | |
| <code class="literal"> | |
| proxy_url | |
| @@ -569,7 +569,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_timeout_literal_4"> | |
| + <a id="_timeout_4"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -586,7 +586,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_ssl_literal_4"> | |
| + <a id="_ssl_4"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| @@ -609,7 +609,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_username_literal_3"> | |
| + <a id="_username_3"> | |
| </a> | |
| <code class="literal"> | |
| username | |
| html/en/apm/server/7.0/configuration-output-codec.html | |
| html/en/apm/server/7.0/configuration-path.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.0/configuration-path.html | |
| @@ -329,7 +329,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_home_literal"> | |
| + <a id="_home"> | |
| </a> | |
| <code class="literal"> | |
| home | |
| @@ -348,7 +348,7 @@ | |
| <pre class="programlisting prettyprint lang-yaml">path.home: /usr/share/beats</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_config_literal"> | |
| + <a id="_config"> | |
| </a> | |
| <code class="literal"> | |
| config | |
| @@ -367,7 +367,7 @@ | |
| <pre class="programlisting prettyprint lang-yaml">path.config: /usr/share/beats/config</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_data_literal"> | |
| + <a id="_data"> | |
| </a> | |
| <code class="literal"> | |
| data | |
| @@ -404,7 +404,7 @@ | |
| </div> | |
| </div> | |
| <h4> | |
| - <a id="_literal_logs_literal"> | |
| + <a id="_logs"> | |
| </a> | |
| <code class="literal"> | |
| logs | |
| html/en/apm/server/7.0/configuration-process.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.0/configuration-process.html | |
| @@ -525,7 +525,7 @@ | |
| Overwrites existing pipeline definitions in Elasticsearch. Defaults to true. | |
| </p> | |
| <h3> | |
| - <a id="_configuration_options_literal_queue_mem_literal"> | |
| + <a id="_configuration_options_queue_mem"> | |
| </a> | |
| Configuration options: | |
| <code class="literal"> | |
| @@ -592,7 +592,7 @@ | |
| . Default value is 1 second. | |
| </p> | |
| <h3> | |
| - <a id="_configuration_options_literal_max_procs_literal"> | |
| + <a id="_configuration_options_max_procs"> | |
| </a> | |
| Configuration options: | |
| <code class="literal"> | |
| html/en/apm/server/7.0/configuration-rum-general.html | |
| html/en/apm/server/7.0/configuration-rum-v1.html | |
| html/en/apm/server/7.0/configuration-rum-v2.html | |
| html/en/apm/server/7.0/configuration-rum.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.0/configuration-rum.html | |
| @@ -346,7 +346,7 @@ | |
| Defines the maximum amount of events allowed to be sent to the APM Server RUM endpoint per ip per second. Defaults to 300. | |
| </p> | |
| <h4> | |
| - <a id="_literal_event_rate_lru_size_literal"> | |
| + <a id="_event_rate_lru_size"> | |
| </a> | |
| <code class="literal"> | |
| event_rate.lru_size | |
| @@ -359,7 +359,7 @@ | |
| An LRU cache is used to keep a rate limit per IP for the most recently seen IPs. This setting defines the number of unique IPs that can be tracked in the cache. Sites with many concurrent clients should consider increasing this limit. Defaults to 1000. | |
| </p> | |
| <h4> | |
| - <a id="_literal_allow_origins_literal"> | |
| + <a id="_allow_origins"> | |
| </a> | |
| <code class="literal"> | |
| allow_origins | |
| @@ -380,7 +380,7 @@ | |
| , which allows everything. | |
| </p> | |
| <h4> | |
| - <a id="_literal_library_pattern_literal"> | |
| + <a id="_library_pattern"> | |
| </a> | |
| <code class="literal"> | |
| library_pattern | |
| @@ -421,7 +421,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_exclude_from_grouping_literal"> | |
| + <a id="_exclude_from_grouping"> | |
| </a> | |
| <code class="literal"> | |
| exclude_from_grouping | |
| @@ -476,7 +476,7 @@ | |
| is automatically applied to documents sent to the RUM endpoint. Source maps are fetched from Elasticsearch and then kept in an in-memory cache for the configured time. Values configured without a time unit are treated as seconds. Default value is 5 minutes. | |
| </p> | |
| <h4> | |
| - <a id="_literal_source_mapping_index_pattern_literal"> | |
| + <a id="_source_mapping_index_pattern"> | |
| </a> | |
| <code class="literal"> | |
| source_mapping.index_pattern | |
| html/en/apm/server/7.0/configuration-ssl.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.0/configuration-ssl.html | |
| @@ -330,7 +330,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_enabled_literal_6"> | |
| + <a id="_enabled_6"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -377,7 +377,7 @@ | |
| </div> | |
| </div> | |
| <h4> | |
| - <a id="_literal_certificate_authorities_literal"> | |
| + <a id="_certificate_authorities"> | |
| </a> | |
| <code class="literal"> | |
| certificate_authorities | |
| @@ -435,7 +435,7 @@ | |
| is specified. | |
| </p> | |
| <h4> | |
| - <a id="_literal_key_passphrase_literal"> | |
| + <a id="_key_passphrase"> | |
| </a> | |
| <code class="literal"> | |
| key_passphrase | |
| @@ -452,7 +452,7 @@ | |
| file. | |
| </p> | |
| <h4> | |
| - <a id="_literal_supported_protocols_literal"> | |
| + <a id="_supported_protocols"> | |
| </a> | |
| <code class="literal"> | |
| supported_protocols | |
| @@ -492,7 +492,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_verification_mode_literal"> | |
| + <a id="_verification_mode"> | |
| </a> | |
| <code class="literal"> | |
| verification_mode | |
| @@ -528,7 +528,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_cipher_suites_literal"> | |
| + <a id="_cipher_suites"> | |
| </a> | |
| <code class="literal"> | |
| cipher_suites | |
| @@ -648,7 +648,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_curve_types_literal"> | |
| + <a id="_curve_types"> | |
| </a> | |
| <code class="literal"> | |
| curve_types | |
| @@ -680,7 +680,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_renegotiation_literal"> | |
| + <a id="_renegotiation"> | |
| </a> | |
| <code class="literal"> | |
| renegotiation | |
| html/en/apm/server/7.0/configuration-template.html | |
| html/en/apm/server/7.0/configuration-v1-api.html | |
| html/en/apm/server/7.0/configuration-v2-api.html | |
| html/en/apm/server/7.0/configure-cloud-id.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.0/configure-cloud-id.html | |
| @@ -332,7 +332,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_cloud_id_literal"> | |
| + <a id="_cloud_id"> | |
| </a> | |
| <code class="literal"> | |
| cloud.id | |
| @@ -361,7 +361,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_cloud_auth_literal"> | |
| + <a id="_cloud_auth"> | |
| </a> | |
| <code class="literal"> | |
| cloud.auth | |
| html/en/apm/server/7.0/configuring-howto-apm-server.html | |
| html/en/apm/server/7.0/configuring-ingest-node.html | |
| html/en/apm/server/7.0/configuring-output.html | |
| Traceback (most recent call last): | |
| File "/docs_build/integtest/html_diff", line 11, in <module> | |
| from bs4 import BeautifulSoup, NavigableString | |
| File "<frozen importlib._bootstrap>", line 969, in _find_and_load | |
| File "<frozen importlib._bootstrap>", line 954, in _find_and_load_unlocked | |
| File "<frozen importlib._bootstrap>", line 896, in _find_spec | |
| File "<frozen importlib._bootstrap_external>", line 1147, in find_spec | |
| File "<frozen importlib._bootstrap_external>", line 1121, in _get_spec | |
| File "<frozen importlib._bootstrap_external>", line 1233, in find_spec | |
| File "<frozen importlib._bootstrap_external>", line 1272, in _fill_cache | |
| OSError: [Errno 5] Input/output error: '/docs_build/integtest' | |
| html/en/apm/server/7.0/configuring-ssl-logstash.html | |
| html/en/apm/server/7.0/console-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.0/console-output.html | |
| @@ -323,7 +323,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_pretty_literal"> | |
| + <a id="_pretty"> | |
| </a> | |
| <code class="literal"> | |
| pretty | |
| @@ -348,7 +348,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_codec_literal_3"> | |
| + <a id="_codec_3"> | |
| </a> | |
| <code class="literal"> | |
| codec | |
| @@ -384,7 +384,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_5"> | |
| + <a id="_enabled_5"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -408,7 +408,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal_4"> | |
| + <a id="_bulk_max_size_4"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| html/en/apm/server/7.0/directory-layout.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.0/directory-layout.html | |
| @@ -323,10 +323,6 @@ | |
| </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| - <p> | |
| - <code class="literal"> | |
| - </code> | |
| - </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| <p> | |
| @@ -359,10 +355,6 @@ | |
| </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| - <p> | |
| - <code class="literal"> | |
| - </code> | |
| - </p> | |
| </td> | |
| </tr> | |
| <tr> | |
| html/en/apm/server/7.0/elasticsearch-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.0/elasticsearch-output.html | |
| @@ -397,7 +397,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal"> | |
| + <a id="_enabled"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -521,7 +521,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_level_literal"> | |
| + <a id="_compression_level"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -548,7 +548,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_escape_html_literal"> | |
| + <a id="_escape_html"> | |
| </a> | |
| <code class="literal"> | |
| escape_html | |
| @@ -580,7 +580,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_worker_literal"> | |
| + <a id="_worker"> | |
| </a> | |
| <code class="literal"> | |
| worker | |
| @@ -604,7 +604,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_username_literal"> | |
| + <a id="_username"> | |
| </a> | |
| <code class="literal"> | |
| username | |
| @@ -625,7 +625,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_password_literal"> | |
| + <a id="_password"> | |
| </a> | |
| <code class="literal"> | |
| password | |
| @@ -646,7 +646,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_parameters_literal"> | |
| + <a id="_parameters"> | |
| </a> | |
| <code class="literal"> | |
| parameters | |
| @@ -731,7 +731,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_headers_literal"> | |
| + <a id="_headers"> | |
| </a> | |
| <code class="literal"> | |
| headers | |
| @@ -759,7 +759,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_proxy_url_literal"> | |
| + <a id="_proxy_url"> | |
| </a> | |
| <code class="literal"> | |
| proxy_url | |
| @@ -798,6 +798,10 @@ | |
| </div> | |
| <p> | |
| The index name to write events to. The default is | |
| + <code class="literal"> | |
| + "apm-%{[observer.version]}-{type}-%{+yyyy.MM.dd}" | |
| + </code> | |
| + (for example, | |
| <code class="literal"> | |
| "apm-7.0.1-transaction-2019-08-28" | |
| </code> | |
| @@ -1077,7 +1081,11 @@ | |
| </div> | |
| </div> | |
| <p> | |
| - This is the default configuration for APM Server and results in indices For example: | |
| + This is the default configuration for APM Server and results in indices named in the following format: | |
| + <code class="literal"> | |
| + "apm-%{[observer.version]}-{type}-%{+yyyy.MM.dd}" | |
| + </code> | |
| + For example: | |
| <code class="literal"> | |
| "apm-7.0.1-transaction-2019-08-28" | |
| </code> | |
| @@ -1409,7 +1417,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_max_retries_literal"> | |
| + <a id="_max_retries"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -1440,7 +1448,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal"> | |
| + <a id="_bulk_max_size"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -1478,7 +1486,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_init_literal"> | |
| + <a id="_backoff_init"> | |
| </a> | |
| <code class="literal"> | |
| backoff.init | |
| @@ -1507,7 +1515,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_max_literal"> | |
| + <a id="_backoff_max"> | |
| </a> | |
| <code class="literal"> | |
| backoff.max | |
| @@ -1528,7 +1536,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_timeout_literal"> | |
| + <a id="_timeout"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -1549,7 +1557,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ssl_literal"> | |
| + <a id="_ssl"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| html/en/apm/server/7.0/enable-apm-server-debugging.html | |
| html/en/apm/server/7.0/error-api-examples.html | |
| html/en/apm/server/7.0/error-api.html | |
| html/en/apm/server/7.0/error-context-schema.html | |
| html/en/apm/server/7.0/error-endpoint.html | |
| html/en/apm/server/7.0/error-indices.html | |
| html/en/apm/server/7.0/error-payload-schema.html | |
| html/en/apm/server/7.0/error-schema-definition.html | |
| html/en/apm/server/7.0/error-service-schema.html | |
| html/en/apm/server/7.0/error-stacktraceframe-schema.html | |
| html/en/apm/server/7.0/error-system-schema.html | |
| html/en/apm/server/7.0/errors.html | |
| html/en/apm/server/7.0/event-types.html | |
| html/en/apm/server/7.0/events-api.html | |
| html/en/apm/server/7.0/example-intake-events.html | |
| html/en/apm/server/7.0/example-intakev2-events.html | |
| html/en/apm/server/7.0/exploring-es-data.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.0/exploring-es-data.html | |
| @@ -312,8 +312,8 @@ | |
| <p> | |
| To get an overview of existing indices you can run: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET _cat/indices/apm*</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET _cat/indices/apm*</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| @@ -370,16 +370,16 @@ | |
| <p> | |
| To query all documents collected with a specific APM Server version: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET apm-7.0.1-*/_search</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET apm-7.0.1-*/_search</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| <p> | |
| To query a specific type, for example transactions: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET apm-*transactions-*/_search</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET apm-*transactions-*/_search</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| @@ -398,16 +398,16 @@ | |
| </span> | |
| of the Elastic APM indices, first, run a query to find template names: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET _cat/templates/apm*</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET _cat/templates/apm*</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| <p> | |
| Then you can retrieve the specific template you are interested in: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET /_template/your-template-name</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET /_template/your-template-name</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| html/en/apm/server/7.0/exported-fields-apm-error.html | |
| html/en/apm/server/7.0/exported-fields-apm-sourcemap.html | |
| html/en/apm/server/7.0/exported-fields-apm-span.html | |
| html/en/apm/server/7.0/exported-fields-apm-transaction.html | |
| html/en/apm/server/7.0/exported-fields-apm.html | |
| html/en/apm/server/7.0/exported-fields-beat.html | |
| html/en/apm/server/7.0/exported-fields-cloud.html | |
| html/en/apm/server/7.0/exported-fields-docker-processor.html | |
| html/en/apm/server/7.0/exported-fields-ecs.html | |
| html/en/apm/server/7.0/exported-fields-host-processor.html | |
| html/en/apm/server/7.0/exported-fields-kubernetes-processor.html | |
| html/en/apm/server/7.0/exported-fields-process.html | |
| html/en/apm/server/7.0/exported-fields-system.html | |
| html/en/apm/server/7.0/exported-fields.html | |
| html/en/apm/server/7.0/feature-roles.html | |
| html/en/apm/server/7.0/file-option.html | |
| html/en/apm/server/7.0/file-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.0/file-output.html | |
| @@ -327,7 +327,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_4"> | |
| + <a id="_enabled_4"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -372,7 +372,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_filename_literal"> | |
| + <a id="_filename"> | |
| </a> | |
| <code class="literal"> | |
| filename | |
| @@ -393,7 +393,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_rotate_every_kb_literal"> | |
| + <a id="_rotate_every_kb"> | |
| </a> | |
| <code class="literal"> | |
| rotate_every_kb | |
| @@ -414,7 +414,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_number_of_files_literal"> | |
| + <a id="_number_of_files"> | |
| </a> | |
| <code class="literal"> | |
| number_of_files | |
| @@ -441,7 +441,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_permissions_literal"> | |
| + <a id="_permissions"> | |
| </a> | |
| <code class="literal"> | |
| permissions | |
| @@ -462,7 +462,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_codec_literal_2"> | |
| + <a id="_codec_2"> | |
| </a> | |
| <code class="literal"> | |
| codec | |
| html/en/apm/server/7.0/getting-help.html | |
| html/en/apm/server/7.0/high-availability.html | |
| html/en/apm/server/7.0/index.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.0/index.html | |
| @@ -597,7 +597,7 @@ | |
| <li> | |
| <span class="chapter"> | |
| <a href="securing-beats.html"> | |
| - Use X-Pack security | |
| + Use {security} | |
| </a> | |
| </span> | |
| <ul> | |
| html/en/apm/server/7.0/installing-on-windows.html | |
| html/en/apm/server/7.0/installing.html | |
| html/en/apm/server/7.0/intake-api.html | |
| html/en/apm/server/7.0/kafka-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.0/kafka-output.html | |
| @@ -377,7 +377,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_3"> | |
| + <a id="_enabled_3"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -405,7 +405,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_hosts_literal"> | |
| + <a id="_hosts"> | |
| </a> | |
| <code class="literal"> | |
| hosts | |
| @@ -426,7 +426,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_version_literal"> | |
| + <a id="_version"> | |
| </a> | |
| <code class="literal"> | |
| version | |
| @@ -468,7 +468,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_username_literal_2"> | |
| + <a id="_username_2"> | |
| </a> | |
| <code class="literal"> | |
| username | |
| @@ -489,7 +489,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_password_literal_2"> | |
| + <a id="_password_2"> | |
| </a> | |
| <code class="literal"> | |
| password | |
| @@ -680,7 +680,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_key_literal"> | |
| + <a id="_key"> | |
| </a> | |
| <code class="literal"> | |
| key | |
| @@ -701,7 +701,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_partition_literal"> | |
| + <a id="_partition"> | |
| </a> | |
| <code class="literal"> | |
| partition | |
| @@ -807,7 +807,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_client_id_literal"> | |
| + <a id="_client_id"> | |
| </a> | |
| <code class="literal"> | |
| client_id | |
| @@ -828,7 +828,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_worker_literal_3"> | |
| + <a id="_worker_3"> | |
| </a> | |
| <code class="literal"> | |
| worker | |
| @@ -849,7 +849,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_codec_literal"> | |
| + <a id="_codec"> | |
| </a> | |
| <code class="literal"> | |
| codec | |
| @@ -881,7 +881,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_metadata_literal"> | |
| + <a id="_metadata"> | |
| </a> | |
| <code class="literal"> | |
| metadata | |
| @@ -948,7 +948,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_max_retries_literal_3"> | |
| + <a id="_max_retries_3"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -979,7 +979,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal_3"> | |
| + <a id="_bulk_max_size_3"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -1000,7 +1000,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_timeout_literal_3"> | |
| + <a id="_timeout_3"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -1021,7 +1021,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_broker_timeout_literal"> | |
| + <a id="_broker_timeout"> | |
| </a> | |
| <code class="literal"> | |
| broker_timeout | |
| @@ -1042,7 +1042,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_channel_buffer_size_literal"> | |
| + <a id="_channel_buffer_size"> | |
| </a> | |
| <code class="literal"> | |
| channel_buffer_size | |
| @@ -1063,7 +1063,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_keep_alive_literal"> | |
| + <a id="_keep_alive"> | |
| </a> | |
| <code class="literal"> | |
| keep_alive | |
| @@ -1084,7 +1084,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_literal"> | |
| + <a id="_compression"> | |
| </a> | |
| <code class="literal"> | |
| compression | |
| @@ -1125,7 +1125,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_level_literal_3"> | |
| + <a id="_compression_level_3"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -1177,7 +1177,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_required_acks_literal"> | |
| + <a id="_required_acks"> | |
| </a> | |
| <code class="literal"> | |
| required_acks | |
| @@ -1201,7 +1201,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ssl_literal_3"> | |
| + <a id="_ssl_3"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| html/en/apm/server/7.0/keystore.html | |
| html/en/apm/server/7.0/kibana-path-option.html | |
| html/en/apm/server/7.0/kibana-protocol-option.html | |
| html/en/apm/server/7.0/linux-seccomp.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.0/linux-seccomp.html | |
| @@ -469,6 +469,12 @@ | |
| <dd> | |
| A list of system call names. The system call name must exist for the runtime architecture, otherwise an error will be logged and the filter will not be installed. At least one system call must be defined. | |
| </dd> | |
| + </dl> | |
| + </div> | |
| + <div class="variablelist"> | |
| + <a id="seccomp-policy-config-action"> | |
| + </a> | |
| + <dl class="variablelist"> | |
| <dt> | |
| <span class="term"> | |
| <span class="strong strong"> | |
| @@ -489,8 +495,6 @@ | |
| is executed. This is required. These are the available action values. The actions that are available depend on the kernel version. | |
| </p> | |
| <div class="itemizedlist"> | |
| - <a id="seccomp-policy-config-action"> | |
| - </a> | |
| <ul class="itemizedlist" type="disc"> | |
| <li class="listitem"> | |
| <code class="literal"> | |
| html/en/apm/server/7.0/load-dashboards-logstash.html | |
| html/en/apm/server/7.0/load-kibana-dashboards.html | |
| html/en/apm/server/7.0/logstash-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.0/logstash-output.html | |
| @@ -293,6 +293,9 @@ | |
| <img alt="Important" src="images/icons/important.png"/> | |
| </div> | |
| <div class="admon_content"> | |
| + <h3> | |
| + Prerequisite | |
| + </h3> | |
| <p> | |
| To send events to Logstash, you also need to create a Logstash configuration pipeline that listens for incoming Beats connections and indexes the received events into Elasticsearch. For more information, see the section about | |
| <a class="ulink" href="https://www.elastic.co/guide/en/elastic-stack-get-started/7.0/get-started-elastic-stack.html#logstash-setup" target="_top"> | |
| @@ -617,7 +620,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_2"> | |
| + <a id="_enabled_2"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -665,7 +668,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_level_literal_2"> | |
| + <a id="_compression_level_2"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -692,7 +695,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_escape_html_literal_2"> | |
| + <a id="_escape_html_2"> | |
| </a> | |
| <code class="literal"> | |
| escape_html | |
| @@ -724,7 +727,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_worker_literal_2"> | |
| + <a id="_worker_2"> | |
| </a> | |
| <code class="literal"> | |
| worker | |
| @@ -772,7 +775,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ttl_literal"> | |
| + <a id="_ttl"> | |
| </a> | |
| <code class="literal"> | |
| ttl | |
| @@ -806,7 +809,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_pipelining_literal"> | |
| + <a id="_pipelining"> | |
| </a> | |
| <code class="literal"> | |
| pipelining | |
| @@ -831,7 +834,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_proxy_url_literal_2"> | |
| + <a id="_proxy_url_2"> | |
| </a> | |
| <code class="literal"> | |
| proxy_url | |
| @@ -931,7 +934,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ssl_literal_2"> | |
| + <a id="_ssl_2"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| @@ -962,7 +965,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_timeout_literal_2"> | |
| + <a id="_timeout_2"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -983,7 +986,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_max_retries_literal_2"> | |
| + <a id="_max_retries_2"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -1014,7 +1017,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal_2"> | |
| + <a id="_bulk_max_size_2"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -1052,7 +1055,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_slow_start_literal"> | |
| + <a id="_slow_start"> | |
| </a> | |
| <code class="literal"> | |
| slow_start | |
| @@ -1084,7 +1087,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_init_literal_2"> | |
| + <a id="_backoff_init_2"> | |
| </a> | |
| <code class="literal"> | |
| backoff.init | |
| @@ -1113,7 +1116,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_max_literal_2"> | |
| + <a id="_backoff_max_2"> | |
| </a> | |
| <code class="literal"> | |
| backoff.max | |
| html/en/apm/server/7.0/manage-indices-kibana.html | |
| html/en/apm/server/7.0/manual-ilm-setup.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.0/manual-ilm-setup.html | |
| @@ -706,8 +706,8 @@ | |
| </code> | |
| overwrites defaults rather than being merged. This means you’ll need to configure all of your indices in the file, even if some are not using ILM. | |
| </p> | |
| - <div class="pre_wrapper lang-yml"> | |
| - <pre class="programlisting prettyprint lang-yml">output.elasticsearch: | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">output.elasticsearch: | |
| indices: | |
| - index: "apm-7.0.1-sourcemap" | |
| when.contains: | |
| html/en/apm/server/7.0/max_request_queue_time.html | |
| html/en/apm/server/7.0/max_unzipped_size.html | |
| html/en/apm/server/7.0/metadata-api.html | |
| html/en/apm/server/7.0/metrics.enabled.html | |
| html/en/apm/server/7.0/metricset-api.html | |
| html/en/apm/server/7.0/metricset-indices.html | |
| html/en/apm/server/7.0/monitoring.html | |
| html/en/apm/server/7.0/overview.html | |
| html/en/apm/server/7.0/payload-with-error.html | |
| html/en/apm/server/7.0/payload-with-minimal-exception.html | |
| html/en/apm/server/7.0/payload-with-minimal-log.html | |
| html/en/apm/server/7.0/payload-with-minimal-span.html | |
| html/en/apm/server/7.0/payload-with-minimal-transaction.html | |
| html/en/apm/server/7.0/payload-with-transactions.html | |
| html/en/apm/server/7.0/processing-performance.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.0/processing-performance.html | |
| @@ -425,11 +425,7 @@ | |
| </table> | |
| </div> | |
| <p> | |
| - In other words, a 512 Mb instance can process | |
| - <sub> | |
| - 3 Mbs per second, while an 8 Gb instance can process | |
| - </sub> | |
| - 20 Mbs per second. | |
| + In other words, a 512 Mb instance can process ~3 Mbs per second, while an 8 Gb instance can process ~20 Mbs per second. | |
| </p> | |
| <p> | |
| APM Server is CPU bound, so it scales better from 2 Gb to 8 Gb than it does from 512 Mb to 2 Gb. This is because larger instance types in Elastic Cloud come with much more computing power. | |
| html/en/apm/server/7.0/rate_limit_v1.html | |
| html/en/apm/server/7.0/redirects.html | |
| html/en/apm/server/7.0/reduce-storage.html | |
| html/en/apm/server/7.0/release-notes-6.1.0.html | |
| html/en/apm/server/7.0/release-notes-6.1.1.html | |
| html/en/apm/server/7.0/release-notes-6.1.2.html | |
| html/en/apm/server/7.0/release-notes-6.1.3.html | |
| html/en/apm/server/7.0/release-notes-6.1.4.html | |
| html/en/apm/server/7.0/release-notes-6.1.html | |
| html/en/apm/server/7.0/release-notes-6.2.0.html | |
| html/en/apm/server/7.0/release-notes-6.2.1.html | |
| html/en/apm/server/7.0/release-notes-6.2.2.html | |
| html/en/apm/server/7.0/release-notes-6.2.3.html | |
| html/en/apm/server/7.0/release-notes-6.2.4.html | |
| html/en/apm/server/7.0/release-notes-6.2.html | |
| html/en/apm/server/7.0/release-notes-6.3.0.html | |
| html/en/apm/server/7.0/release-notes-6.3.1.html | |
| html/en/apm/server/7.0/release-notes-6.3.2.html | |
| html/en/apm/server/7.0/release-notes-6.3.html | |
| html/en/apm/server/7.0/release-notes-6.4.0.html | |
| html/en/apm/server/7.0/release-notes-6.4.1.html | |
| html/en/apm/server/7.0/release-notes-6.4.2.html | |
| html/en/apm/server/7.0/release-notes-6.4.3.html | |
| html/en/apm/server/7.0/release-notes-6.4.html | |
| html/en/apm/server/7.0/release-notes-6.5.0.html | |
| html/en/apm/server/7.0/release-notes-6.5.1.html | |
| html/en/apm/server/7.0/release-notes-6.5.2.html | |
| html/en/apm/server/7.0/release-notes-6.5.3.html | |
| html/en/apm/server/7.0/release-notes-6.5.4.html | |
| html/en/apm/server/7.0/release-notes-6.5.html | |
| html/en/apm/server/7.0/release-notes-6.6.0.html | |
| html/en/apm/server/7.0/release-notes-6.6.1.html | |
| html/en/apm/server/7.0/release-notes-6.6.2.html | |
| html/en/apm/server/7.0/release-notes-6.6.html | |
| html/en/apm/server/7.0/release-notes-6.7.0.html | |
| html/en/apm/server/7.0/release-notes-6.7.1.html | |
| html/en/apm/server/7.0/release-notes-6.7.2.html | |
| html/en/apm/server/7.0/release-notes-6.7.html | |
| html/en/apm/server/7.0/release-notes-6.8.0.html | |
| html/en/apm/server/7.0/release-notes-6.8.html | |
| html/en/apm/server/7.0/release-notes-7.0.0-alpha1.html | |
| html/en/apm/server/7.0/release-notes-7.0.0-alpha2.html | |
| html/en/apm/server/7.0/release-notes-7.0.0-beta1.html | |
| html/en/apm/server/7.0/release-notes-7.0.0-rc1.html | |
| html/en/apm/server/7.0/release-notes-7.0.0-rc2.html | |
| html/en/apm/server/7.0/release-notes-7.0.0.html | |
| html/en/apm/server/7.0/release-notes-7.0.1.html | |
| html/en/apm/server/7.0/release-notes-7.0.html | |
| html/en/apm/server/7.0/release-notes.html | |
| html/en/apm/server/7.0/request-too-large.html | |
| html/en/apm/server/7.0/rum.html | |
| html/en/apm/server/7.0/running-on-docker.html | |
| html/en/apm/server/7.0/running-with-systemd.html | |
| html/en/apm/server/7.0/securing-apm-server.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.0/securing-apm-server.html | |
| @@ -298,7 +298,7 @@ | |
| <li class="listitem"> | |
| <a class="xref" href="securing-beats.html" title="Configure APM Server to use X-Pack security"> | |
| <em> | |
| - Use X-Pack security | |
| + Use {security} | |
| </em> | |
| </a> | |
| </li> | |
| @@ -315,7 +315,7 @@ | |
| <a id="security-overview"> | |
| </a> | |
| Security Overview | |
| - <a class="edit_me" href="https://github.com/elastic/apm-server/edit/7.0/docs/security.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| + <a class="edit_me" href="https://github.com/elastic/apm-server/edit/7.0/docs/copied-from-beats/shared-securing-beat.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| edit | |
| </a> | |
| </h3> | |
| @@ -326,7 +326,7 @@ | |
| <a id="secret-token"> | |
| </a> | |
| Secret token | |
| - <a class="edit_me" href="https://github.com/elastic/apm-server/edit/7.0/docs/security.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| + <a class="edit_me" href="https://github.com/elastic/apm-server/edit/7.0/docs/copied-from-beats/shared-securing-beat.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| edit | |
| </a> | |
| </h4> | |
| @@ -347,7 +347,7 @@ | |
| <a id="ssl-setup"> | |
| </a> | |
| SSL/TLS setup | |
| - <a class="edit_me" href="https://github.com/elastic/apm-server/edit/7.0/docs/security.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| + <a class="edit_me" href="https://github.com/elastic/apm-server/edit/7.0/docs/copied-from-beats/shared-securing-beat.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| edit | |
| </a> | |
| </h4> | |
| html/en/apm/server/7.0/securing-beats.html | |
| html/en/apm/server/7.0/securing-communication-elasticsearch.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.0/securing-communication-elasticsearch.html | |
| @@ -287,7 +287,7 @@ | |
| and | |
| <a class="xref" href="securing-beats.html" title="Configure APM Server to use X-Pack security"> | |
| <em> | |
| - Use X-Pack security | |
| + Use {security} | |
| </em> | |
| </a> | |
| ). If you aren’t using X-Pack security, you can use a web proxy instead. | |
| html/en/apm/server/7.0/server-info.html | |
| html/en/apm/server/7.0/setting-up-and-running.html | |
| html/en/apm/server/7.0/setup-kibana-endpoint.html | |
| html/en/apm/server/7.0/setup-repositories.html | |
| html/en/apm/server/7.0/sizing-guide.html | |
| html/en/apm/server/7.0/sourcemap-api.html | |
| html/en/apm/server/7.0/sourcemap-indices.html | |
| html/en/apm/server/7.0/sourcemaps.html | |
| html/en/apm/server/7.0/span-api.html | |
| html/en/apm/server/7.0/span-indices.html | |
| html/en/apm/server/7.0/storage-management.html | |
| html/en/apm/server/7.0/toc.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.0/toc.html | |
| @@ -341,7 +341,7 @@ | |
| <li> | |
| <span class="chapter"> | |
| <a href="securing-beats.html"> | |
| - Use X-Pack security | |
| + Use {security} | |
| </a> | |
| </span> | |
| <ul> | |
| html/en/apm/server/7.0/transaction-api-examples.html | |
| html/en/apm/server/7.0/transaction-api.html | |
| html/en/apm/server/7.0/transaction-context-schema.html | |
| html/en/apm/server/7.0/transaction-endpoint.html | |
| html/en/apm/server/7.0/transaction-indices.html | |
| html/en/apm/server/7.0/transaction-payload-schema.html | |
| html/en/apm/server/7.0/transaction-request-schema.html | |
| html/en/apm/server/7.0/transaction-schema-definition.html | |
| html/en/apm/server/7.0/transaction-service-schema.html | |
| html/en/apm/server/7.0/transaction-span-schema.html | |
| html/en/apm/server/7.0/transaction-stacktraceframe-schema.html | |
| html/en/apm/server/7.0/transaction-system-schema.html | |
| html/en/apm/server/7.0/transaction-user-schema.html | |
| html/en/apm/server/7.0/transactions-spans.html | |
| html/en/apm/server/7.0/transactions.html | |
| html/en/apm/server/7.0/troubleshooting.html | |
| html/en/apm/server/7.0/tune-apm-server.html | |
| html/en/apm/server/7.0/tune-data-ingestion.html | |
| html/en/apm/server/7.0/tune-es.html | |
| html/en/apm/server/7.0/update-existing-data.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.0/update-existing-data.html | |
| @@ -300,8 +300,8 @@ | |
| <p> | |
| To rename a service, send the following request: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST /apm-*/_update_by_query | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST /apm-*/_update_by_query | |
| { | |
| "query": { | |
| "term": { | |
| html/en/apm/server/7.0/upgrading-to-65.html | |
| html/en/apm/server/7.0/upgrading-to-70.html | |
| html/en/apm/server/7.0/upgrading.html | |
| html/en/apm/server/7.0/url-option.html | |
| html/en/apm/server/7.0/use-v1-and-v2.html | |
| html/en/apm/server/7.0/using-environ-vars.html | |
| html/en/apm/server/7.0/why-separate-component.html | |
| html/en/apm/server/7.1/_manually_loading_template_configuration.html | |
| html/en/apm/server/7.1/apm-server-configuration.html | |
| html/en/apm/server/7.1/beats-basic-auth.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.1/beats-basic-auth.html | |
| @@ -355,8 +355,8 @@ | |
| </code> | |
| : | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST _security/role/apm_writer | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST _security/role/apm_writer | |
| { | |
| "cluster": ["manage_index_templates","monitor"], | |
| "indices": [ | |
| @@ -393,6 +393,10 @@ | |
| </table> | |
| </div> | |
| </li> | |
| + </ol> | |
| + </div> | |
| + <div class="orderedlist"> | |
| + <ol class="orderedlist" type="1"> | |
| <li class="listitem"> | |
| <p class="simpara"> | |
| Assign the writer role to the user that APM Server will use to connect to Elasticsearch. Make sure you also assign any roles that are required for specific features. For the list of features and required roles, see | |
| @@ -432,8 +436,8 @@ | |
| </code> | |
| roles: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST /_security/user/apm_internal | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST /_security/user/apm_internal | |
| { | |
| "password" : "YOUR_PASSWORD", | |
| "roles" : [ "apm_writer","kibana_user"], | |
| html/en/apm/server/7.1/beats-system-user.html | |
| html/en/apm/server/7.1/beats-tls.html | |
| html/en/apm/server/7.1/beats-user-access.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.1/beats-user-access.html | |
| @@ -363,8 +363,8 @@ | |
| </code> | |
| roles: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST /_security/user/apm_account | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST /_security/user/apm_account | |
| { | |
| "password" : "YOUR_PASSWORD", | |
| "roles" : [ "apm_user","kibana_user"], | |
| html/en/apm/server/7.1/breaking-changes.html | |
| html/en/apm/server/7.1/brew.html | |
| html/en/apm/server/7.1/command-line-options.html | |
| html/en/apm/server/7.1/common-problems.html | |
| html/en/apm/server/7.1/concurrent_requests.html | |
| html/en/apm/server/7.1/configuration-logging.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.1/configuration-logging.html | |
| @@ -333,7 +333,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_to_syslog_literal"> | |
| + <a id="_logging_to_syslog"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_syslog | |
| @@ -356,7 +356,7 @@ | |
| </div> | |
| </div> | |
| <h4> | |
| - <a id="_literal_logging_to_eventlog_literal"> | |
| + <a id="_logging_to_eventlog"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_eventlog | |
| @@ -369,7 +369,7 @@ | |
| When true, writes all logging output to the Windows Event Log. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_to_files_literal"> | |
| + <a id="_logging_to_files"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_files | |
| @@ -522,7 +522,7 @@ | |
| also sets the debug log level). | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_metrics_enabled_literal"> | |
| + <a id="_logging_metrics_enabled"> | |
| </a> | |
| <code class="literal"> | |
| logging.metrics.enabled | |
| @@ -544,7 +544,7 @@ | |
| Note that we currently offer no backwards compatible guarantees for the internal metrics and for this reason they are also not documented. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_metrics_period_literal"> | |
| + <a id="_logging_metrics_period"> | |
| </a> | |
| <code class="literal"> | |
| logging.metrics.period | |
| @@ -557,7 +557,7 @@ | |
| The period after which to log the internal metrics. The default is 30s. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_path_literal"> | |
| + <a id="_logging_files_path"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.path | |
| @@ -574,7 +574,7 @@ | |
| section for details. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_name_literal"> | |
| + <a id="_logging_files_name"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.name | |
| @@ -593,7 +593,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_rotateeverybytes_literal"> | |
| + <a id="_logging_files_rotateeverybytes"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.rotateeverybytes | |
| @@ -606,7 +606,7 @@ | |
| The maximum size of a log file. If the limit is reached, a new log file is generated. The default size limit is 10485760 (10 MB). | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_keepfiles_literal"> | |
| + <a id="_logging_files_keepfiles"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.keepfiles | |
| @@ -623,7 +623,7 @@ | |
| options has to be in the range of 2 to 1024 files. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_permissions_literal"> | |
| + <a id="_logging_files_permissions"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.permissions | |
| @@ -662,7 +662,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_logging_files_interval_literal"> | |
| + <a id="_logging_files_interval"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.interval | |
| @@ -675,7 +675,7 @@ | |
| Enable log file rotation on time intervals in addition to size-based rotation. Intervals must be at least 1s. Values of 1m, 1h, 24h, 7*24h, 30*24h, and 365*24h are boundary-aligned with minutes, hours, days, weeks, months, and years as reported by the local system clock. All other intervals are calculated from the unix epoch. Defaults to disabled. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_json_literal"> | |
| + <a id="_logging_json"> | |
| </a> | |
| <code class="literal"> | |
| logging.json | |
| @@ -688,7 +688,7 @@ | |
| When true, logs messages in JSON format. The default is false. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_redirect_stderr_literal_phrase_role_experimental_phrase"> | |
| + <a id="_logging_files_redirect_stderr"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.redirect_stderr | |
| @@ -755,17 +755,17 @@ | |
| </p> | |
| <p> | |
| <code class="literal"> | |
| - 2017-12-17T18:54:16.241-0500 INFO logp/core_test.go:13 unnamed global logger | |
| - </code> | |
| - </p> | |
| - <p> | |
| - <code class="literal"> | |
| - 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:16 some message | |
| - </code> | |
| - </p> | |
| - <p> | |
| - <code class="literal"> | |
| - 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:19 some message {"x": 1} | |
| + 2017-12-17T18:54:16.241-0500 INFO logp/core_test.go:13 unnamed global logger | |
| + </code> | |
| + </p> | |
| + <p> | |
| + <code class="literal"> | |
| + 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:16 some message | |
| + </code> | |
| + </p> | |
| + <p> | |
| + <code class="literal"> | |
| + 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:19 some message {"x": 1} | |
| </code> | |
| </p> | |
| </div> | |
| html/en/apm/server/7.1/configuration-monitor.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.1/configuration-monitor.html | |
| @@ -291,7 +291,7 @@ | |
| config file: | |
| </p> | |
| <h3> | |
| - <a id="_literal_enabled_literal_7"> | |
| + <a id="_enabled_7"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -319,7 +319,7 @@ | |
| . | |
| </p> | |
| <h3> | |
| - <a id="_literal_elasticsearch_literal"> | |
| + <a id="_elasticsearch"> | |
| </a> | |
| <code class="literal"> | |
| elasticsearch | |
| @@ -332,7 +332,7 @@ | |
| The Elasticsearch instances that you want to ship your APM Server metrics to. This configuration option contains the following fields: | |
| </p> | |
| <h4> | |
| - <a id="_literal_bulk_max_size_literal_5"> | |
| + <a id="_bulk_max_size_5"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -353,7 +353,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_backoff_init_literal_3"> | |
| + <a id="_backoff_init_3"> | |
| </a> | |
| <code class="literal"> | |
| backoff.init | |
| @@ -374,7 +374,7 @@ | |
| . After a successful connection, the backoff timer is reset. The default is 1s. | |
| </p> | |
| <h5> | |
| - <a id="_literal_backoff_max_literal_3"> | |
| + <a id="_backoff_max_3"> | |
| </a> | |
| <code class="literal"> | |
| backoff.max | |
| @@ -387,7 +387,7 @@ | |
| The maximum number of seconds to wait before attempting to connect to Elasticsearch after a network error. The default is 60s. | |
| </p> | |
| <h4> | |
| - <a id="_literal_compression_level_literal_4"> | |
| + <a id="_compression_level_4"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -416,7 +416,7 @@ | |
| . Increasing the compression level reduces the network usage but increases the CPU usage. | |
| </p> | |
| <h4> | |
| - <a id="_literal_headers_literal_2"> | |
| + <a id="_headers_2"> | |
| </a> | |
| <code class="literal"> | |
| headers | |
| @@ -433,7 +433,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_hosts_literal_2"> | |
| + <a id="_hosts_2"> | |
| </a> | |
| <code class="literal"> | |
| hosts | |
| @@ -450,7 +450,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_max_retries_literal_4"> | |
| + <a id="_max_retries_4"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -471,7 +471,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_parameters_literal_2"> | |
| + <a id="_parameters_2"> | |
| </a> | |
| <code class="literal"> | |
| parameters | |
| @@ -484,7 +484,7 @@ | |
| Dictionary of HTTP parameters to pass within the url with index operations. | |
| </p> | |
| <h4> | |
| - <a id="_literal_password_literal_3"> | |
| + <a id="_password_3"> | |
| </a> | |
| <code class="literal"> | |
| password | |
| @@ -497,7 +497,7 @@ | |
| The password that APM Server uses to authenticate with the Elasticsearch instances for shipping monitoring data. | |
| </p> | |
| <h4> | |
| - <a id="_literal_metrics_period_literal"> | |
| + <a id="_metrics_period"> | |
| </a> | |
| <code class="literal"> | |
| metrics.period | |
| @@ -510,7 +510,7 @@ | |
| The time interval (in seconds) when metrics are sent to the Elasticsearch cluster. A new snapshot of APM Server metrics is generated and scheduled for publishing each period. The default value is 10 * time.Second. | |
| </p> | |
| <h4> | |
| - <a id="_literal_state_period_literal"> | |
| + <a id="_state_period"> | |
| </a> | |
| <code class="literal"> | |
| state.period | |
| @@ -523,7 +523,7 @@ | |
| The time interval (in seconds) when state information are sent to the Elasticsearch cluster. A new snapshot of APM Server state is generated and scheduled for publishing each period. The default value is 60 * time.Second. | |
| </p> | |
| <h4> | |
| - <a id="_literal_protocol_literal"> | |
| + <a id="_protocol"> | |
| </a> | |
| <code class="literal"> | |
| protocol | |
| @@ -552,7 +552,7 @@ | |
| , however, the value of protocol is overridden by the scheme you specify in the URL. | |
| </p> | |
| <h4> | |
| - <a id="_literal_proxy_url_literal_3"> | |
| + <a id="_proxy_url_3"> | |
| </a> | |
| <code class="literal"> | |
| proxy_url | |
| @@ -569,7 +569,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_timeout_literal_4"> | |
| + <a id="_timeout_4"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -586,7 +586,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_ssl_literal_4"> | |
| + <a id="_ssl_4"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| @@ -609,7 +609,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_username_literal_3"> | |
| + <a id="_username_3"> | |
| </a> | |
| <code class="literal"> | |
| username | |
| html/en/apm/server/7.1/configuration-output-codec.html | |
| html/en/apm/server/7.1/configuration-path.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.1/configuration-path.html | |
| @@ -329,7 +329,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_home_literal"> | |
| + <a id="_home"> | |
| </a> | |
| <code class="literal"> | |
| home | |
| @@ -348,7 +348,7 @@ | |
| <pre class="programlisting prettyprint lang-yaml">path.home: /usr/share/beats</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_config_literal"> | |
| + <a id="_config"> | |
| </a> | |
| <code class="literal"> | |
| config | |
| @@ -367,7 +367,7 @@ | |
| <pre class="programlisting prettyprint lang-yaml">path.config: /usr/share/beats/config</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_data_literal"> | |
| + <a id="_data"> | |
| </a> | |
| <code class="literal"> | |
| data | |
| @@ -404,7 +404,7 @@ | |
| </div> | |
| </div> | |
| <h4> | |
| - <a id="_literal_logs_literal"> | |
| + <a id="_logs"> | |
| </a> | |
| <code class="literal"> | |
| logs | |
| html/en/apm/server/7.1/configuration-process.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.1/configuration-process.html | |
| @@ -525,7 +525,7 @@ | |
| Overwrites existing pipeline definitions in Elasticsearch. Defaults to true. | |
| </p> | |
| <h3> | |
| - <a id="_configuration_options_literal_queue_mem_literal"> | |
| + <a id="_configuration_options_queue_mem"> | |
| </a> | |
| Configuration options: | |
| <code class="literal"> | |
| @@ -592,7 +592,7 @@ | |
| . Default value is 1 second. | |
| </p> | |
| <h3> | |
| - <a id="_configuration_options_literal_max_procs_literal"> | |
| + <a id="_configuration_options_max_procs"> | |
| </a> | |
| Configuration options: | |
| <code class="literal"> | |
| html/en/apm/server/7.1/configuration-rum-general.html | |
| html/en/apm/server/7.1/configuration-rum-v1.html | |
| html/en/apm/server/7.1/configuration-rum-v2.html | |
| html/en/apm/server/7.1/configuration-rum.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.1/configuration-rum.html | |
| @@ -346,7 +346,7 @@ | |
| Defines the maximum amount of events allowed to be sent to the APM Server RUM endpoint per ip per second. Defaults to 300. | |
| </p> | |
| <h4> | |
| - <a id="_literal_event_rate_lru_size_literal"> | |
| + <a id="_event_rate_lru_size"> | |
| </a> | |
| <code class="literal"> | |
| event_rate.lru_size | |
| @@ -359,7 +359,7 @@ | |
| An LRU cache is used to keep a rate limit per IP for the most recently seen IPs. This setting defines the number of unique IPs that can be tracked in the cache. Sites with many concurrent clients should consider increasing this limit. Defaults to 1000. | |
| </p> | |
| <h4> | |
| - <a id="_literal_allow_origins_literal"> | |
| + <a id="_allow_origins"> | |
| </a> | |
| <code class="literal"> | |
| allow_origins | |
| @@ -380,7 +380,7 @@ | |
| , which allows everything. | |
| </p> | |
| <h4> | |
| - <a id="_literal_library_pattern_literal"> | |
| + <a id="_library_pattern"> | |
| </a> | |
| <code class="literal"> | |
| library_pattern | |
| @@ -421,7 +421,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_exclude_from_grouping_literal"> | |
| + <a id="_exclude_from_grouping"> | |
| </a> | |
| <code class="literal"> | |
| exclude_from_grouping | |
| @@ -476,7 +476,7 @@ | |
| is automatically applied to documents sent to the RUM endpoint. Source maps are fetched from Elasticsearch and then kept in an in-memory cache for the configured time. Values configured without a time unit are treated as seconds. Default value is 5 minutes. | |
| </p> | |
| <h4> | |
| - <a id="_literal_source_mapping_index_pattern_literal"> | |
| + <a id="_source_mapping_index_pattern"> | |
| </a> | |
| <code class="literal"> | |
| source_mapping.index_pattern | |
| html/en/apm/server/7.1/configuration-ssl.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.1/configuration-ssl.html | |
| @@ -330,7 +330,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_enabled_literal_6"> | |
| + <a id="_enabled_6"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -377,7 +377,7 @@ | |
| </div> | |
| </div> | |
| <h4> | |
| - <a id="_literal_certificate_authorities_literal"> | |
| + <a id="_certificate_authorities"> | |
| </a> | |
| <code class="literal"> | |
| certificate_authorities | |
| @@ -435,7 +435,7 @@ | |
| is specified. | |
| </p> | |
| <h4> | |
| - <a id="_literal_key_passphrase_literal"> | |
| + <a id="_key_passphrase"> | |
| </a> | |
| <code class="literal"> | |
| key_passphrase | |
| @@ -452,7 +452,7 @@ | |
| file. | |
| </p> | |
| <h4> | |
| - <a id="_literal_supported_protocols_literal"> | |
| + <a id="_supported_protocols"> | |
| </a> | |
| <code class="literal"> | |
| supported_protocols | |
| @@ -492,7 +492,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_verification_mode_literal"> | |
| + <a id="_verification_mode"> | |
| </a> | |
| <code class="literal"> | |
| verification_mode | |
| @@ -528,7 +528,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_cipher_suites_literal"> | |
| + <a id="_cipher_suites"> | |
| </a> | |
| <code class="literal"> | |
| cipher_suites | |
| @@ -648,7 +648,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_curve_types_literal"> | |
| + <a id="_curve_types"> | |
| </a> | |
| <code class="literal"> | |
| curve_types | |
| @@ -680,7 +680,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_renegotiation_literal"> | |
| + <a id="_renegotiation"> | |
| </a> | |
| <code class="literal"> | |
| renegotiation | |
| html/en/apm/server/7.1/configuration-template.html | |
| html/en/apm/server/7.1/configuration-v1-api.html | |
| html/en/apm/server/7.1/configuration-v2-api.html | |
| html/en/apm/server/7.1/configure-cloud-id.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.1/configure-cloud-id.html | |
| @@ -332,7 +332,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_cloud_id_literal"> | |
| + <a id="_cloud_id"> | |
| </a> | |
| <code class="literal"> | |
| cloud.id | |
| @@ -361,7 +361,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_cloud_auth_literal"> | |
| + <a id="_cloud_auth"> | |
| </a> | |
| <code class="literal"> | |
| cloud.auth | |
| html/en/apm/server/7.1/configuring-howto-apm-server.html | |
| html/en/apm/server/7.1/configuring-ingest-node.html | |
| html/en/apm/server/7.1/configuring-output.html | |
| html/en/apm/server/7.1/configuring-ssl-logstash.html | |
| html/en/apm/server/7.1/console-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.1/console-output.html | |
| @@ -323,7 +323,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_pretty_literal"> | |
| + <a id="_pretty"> | |
| </a> | |
| <code class="literal"> | |
| pretty | |
| @@ -348,7 +348,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_codec_literal_3"> | |
| + <a id="_codec_3"> | |
| </a> | |
| <code class="literal"> | |
| codec | |
| @@ -384,7 +384,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_5"> | |
| + <a id="_enabled_5"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -408,7 +408,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal_4"> | |
| + <a id="_bulk_max_size_4"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| html/en/apm/server/7.1/directory-layout.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.1/directory-layout.html | |
| @@ -323,10 +323,6 @@ | |
| </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| - <p> | |
| - <code class="literal"> | |
| - </code> | |
| - </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| <p> | |
| @@ -359,10 +355,6 @@ | |
| </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| - <p> | |
| - <code class="literal"> | |
| - </code> | |
| - </p> | |
| </td> | |
| </tr> | |
| <tr> | |
| html/en/apm/server/7.1/elasticsearch-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.1/elasticsearch-output.html | |
| @@ -397,7 +397,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal"> | |
| + <a id="_enabled"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -521,7 +521,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_level_literal"> | |
| + <a id="_compression_level"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -548,7 +548,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_escape_html_literal"> | |
| + <a id="_escape_html"> | |
| </a> | |
| <code class="literal"> | |
| escape_html | |
| @@ -580,7 +580,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_worker_literal"> | |
| + <a id="_worker"> | |
| </a> | |
| <code class="literal"> | |
| worker | |
| @@ -604,7 +604,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_username_literal"> | |
| + <a id="_username"> | |
| </a> | |
| <code class="literal"> | |
| username | |
| @@ -625,7 +625,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_password_literal"> | |
| + <a id="_password"> | |
| </a> | |
| <code class="literal"> | |
| password | |
| @@ -646,7 +646,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_parameters_literal"> | |
| + <a id="_parameters"> | |
| </a> | |
| <code class="literal"> | |
| parameters | |
| @@ -731,7 +731,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_headers_literal"> | |
| + <a id="_headers"> | |
| </a> | |
| <code class="literal"> | |
| headers | |
| @@ -759,7 +759,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_proxy_url_literal"> | |
| + <a id="_proxy_url"> | |
| </a> | |
| <code class="literal"> | |
| proxy_url | |
| @@ -798,6 +798,10 @@ | |
| </div> | |
| <p> | |
| The index name to write events to. The default is | |
| + <code class="literal"> | |
| + "apm-%{[observer.version]}-{type}-%{+yyyy.MM.dd}" | |
| + </code> | |
| + (for example, | |
| <code class="literal"> | |
| "apm-7.1.1-transaction-2019-08-28" | |
| </code> | |
| @@ -1077,7 +1081,11 @@ | |
| </div> | |
| </div> | |
| <p> | |
| - This is the default configuration for APM Server and results in indices For example: | |
| + This is the default configuration for APM Server and results in indices named in the following format: | |
| + <code class="literal"> | |
| + "apm-%{[observer.version]}-{type}-%{+yyyy.MM.dd}" | |
| + </code> | |
| + For example: | |
| <code class="literal"> | |
| "apm-7.1.1-transaction-2019-08-28" | |
| </code> | |
| @@ -1409,7 +1417,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_max_retries_literal"> | |
| + <a id="_max_retries"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -1440,7 +1448,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal"> | |
| + <a id="_bulk_max_size"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -1478,7 +1486,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_init_literal"> | |
| + <a id="_backoff_init"> | |
| </a> | |
| <code class="literal"> | |
| backoff.init | |
| @@ -1507,7 +1515,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_max_literal"> | |
| + <a id="_backoff_max"> | |
| </a> | |
| <code class="literal"> | |
| backoff.max | |
| @@ -1528,7 +1536,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_timeout_literal"> | |
| + <a id="_timeout"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -1549,7 +1557,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ssl_literal"> | |
| + <a id="_ssl"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| html/en/apm/server/7.1/enable-apm-server-debugging.html | |
| html/en/apm/server/7.1/error-api-examples.html | |
| html/en/apm/server/7.1/error-api.html | |
| html/en/apm/server/7.1/error-context-schema.html | |
| html/en/apm/server/7.1/error-endpoint.html | |
| html/en/apm/server/7.1/error-indices.html | |
| html/en/apm/server/7.1/error-payload-schema.html | |
| html/en/apm/server/7.1/error-schema-definition.html | |
| html/en/apm/server/7.1/error-service-schema.html | |
| html/en/apm/server/7.1/error-stacktraceframe-schema.html | |
| html/en/apm/server/7.1/error-system-schema.html | |
| html/en/apm/server/7.1/errors.html | |
| html/en/apm/server/7.1/event-types.html | |
| html/en/apm/server/7.1/events-api.html | |
| html/en/apm/server/7.1/example-intake-events.html | |
| html/en/apm/server/7.1/example-intakev2-events.html | |
| html/en/apm/server/7.1/exploring-es-data.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.1/exploring-es-data.html | |
| @@ -312,8 +312,8 @@ | |
| <p> | |
| To get an overview of existing indices you can run: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET _cat/indices/apm*</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET _cat/indices/apm*</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| @@ -370,16 +370,16 @@ | |
| <p> | |
| To query all documents collected with a specific APM Server version: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET apm-7.1.1-*/_search</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET apm-7.1.1-*/_search</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| <p> | |
| To query a specific type, for example transactions: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET apm-*transactions-*/_search</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET apm-*transactions-*/_search</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| @@ -398,16 +398,16 @@ | |
| </span> | |
| of the Elastic APM indices, first, run a query to find template names: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET _cat/templates/apm*</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET _cat/templates/apm*</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| <p> | |
| Then you can retrieve the specific template you are interested in: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET /_template/your-template-name</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET /_template/your-template-name</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| html/en/apm/server/7.1/exported-fields-apm-error.html | |
| html/en/apm/server/7.1/exported-fields-apm-sourcemap.html | |
| html/en/apm/server/7.1/exported-fields-apm-span.html | |
| html/en/apm/server/7.1/exported-fields-apm-transaction.html | |
| html/en/apm/server/7.1/exported-fields-apm.html | |
| html/en/apm/server/7.1/exported-fields-beat.html | |
| html/en/apm/server/7.1/exported-fields-cloud.html | |
| html/en/apm/server/7.1/exported-fields-docker-processor.html | |
| html/en/apm/server/7.1/exported-fields-ecs.html | |
| html/en/apm/server/7.1/exported-fields-host-processor.html | |
| html/en/apm/server/7.1/exported-fields-kubernetes-processor.html | |
| html/en/apm/server/7.1/exported-fields-process.html | |
| html/en/apm/server/7.1/exported-fields-system.html | |
| html/en/apm/server/7.1/exported-fields.html | |
| html/en/apm/server/7.1/feature-roles.html | |
| html/en/apm/server/7.1/file-option.html | |
| html/en/apm/server/7.1/file-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.1/file-output.html | |
| @@ -327,7 +327,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_4"> | |
| + <a id="_enabled_4"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -372,7 +372,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_filename_literal"> | |
| + <a id="_filename"> | |
| </a> | |
| <code class="literal"> | |
| filename | |
| @@ -393,7 +393,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_rotate_every_kb_literal"> | |
| + <a id="_rotate_every_kb"> | |
| </a> | |
| <code class="literal"> | |
| rotate_every_kb | |
| @@ -414,7 +414,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_number_of_files_literal"> | |
| + <a id="_number_of_files"> | |
| </a> | |
| <code class="literal"> | |
| number_of_files | |
| @@ -441,7 +441,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_permissions_literal"> | |
| + <a id="_permissions"> | |
| </a> | |
| <code class="literal"> | |
| permissions | |
| @@ -462,7 +462,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_codec_literal_2"> | |
| + <a id="_codec_2"> | |
| </a> | |
| <code class="literal"> | |
| codec | |
| html/en/apm/server/7.1/getting-help.html | |
| html/en/apm/server/7.1/high-availability.html | |
| html/en/apm/server/7.1/index.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.1/index.html | |
| @@ -604,7 +604,7 @@ | |
| <li> | |
| <span class="chapter"> | |
| <a href="securing-beats.html"> | |
| - Use X-Pack security | |
| + Use {security} | |
| </a> | |
| </span> | |
| <ul> | |
| html/en/apm/server/7.1/installing-on-windows.html | |
| html/en/apm/server/7.1/installing.html | |
| html/en/apm/server/7.1/intake-api.html | |
| html/en/apm/server/7.1/kafka-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.1/kafka-output.html | |
| @@ -377,7 +377,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_3"> | |
| + <a id="_enabled_3"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -405,7 +405,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_hosts_literal"> | |
| + <a id="_hosts"> | |
| </a> | |
| <code class="literal"> | |
| hosts | |
| @@ -426,7 +426,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_version_literal"> | |
| + <a id="_version"> | |
| </a> | |
| <code class="literal"> | |
| version | |
| @@ -468,7 +468,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_username_literal_2"> | |
| + <a id="_username_2"> | |
| </a> | |
| <code class="literal"> | |
| username | |
| @@ -489,7 +489,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_password_literal_2"> | |
| + <a id="_password_2"> | |
| </a> | |
| <code class="literal"> | |
| password | |
| @@ -680,7 +680,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_key_literal"> | |
| + <a id="_key"> | |
| </a> | |
| <code class="literal"> | |
| key | |
| @@ -701,7 +701,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_partition_literal"> | |
| + <a id="_partition"> | |
| </a> | |
| <code class="literal"> | |
| partition | |
| @@ -807,7 +807,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_client_id_literal"> | |
| + <a id="_client_id"> | |
| </a> | |
| <code class="literal"> | |
| client_id | |
| @@ -828,7 +828,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_worker_literal_3"> | |
| + <a id="_worker_3"> | |
| </a> | |
| <code class="literal"> | |
| worker | |
| @@ -849,7 +849,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_codec_literal"> | |
| + <a id="_codec"> | |
| </a> | |
| <code class="literal"> | |
| codec | |
| @@ -881,7 +881,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_metadata_literal"> | |
| + <a id="_metadata"> | |
| </a> | |
| <code class="literal"> | |
| metadata | |
| @@ -948,7 +948,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_max_retries_literal_3"> | |
| + <a id="_max_retries_3"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -979,7 +979,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal_3"> | |
| + <a id="_bulk_max_size_3"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -1000,7 +1000,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_timeout_literal_3"> | |
| + <a id="_timeout_3"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -1021,7 +1021,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_broker_timeout_literal"> | |
| + <a id="_broker_timeout"> | |
| </a> | |
| <code class="literal"> | |
| broker_timeout | |
| @@ -1042,7 +1042,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_channel_buffer_size_literal"> | |
| + <a id="_channel_buffer_size"> | |
| </a> | |
| <code class="literal"> | |
| channel_buffer_size | |
| @@ -1063,7 +1063,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_keep_alive_literal"> | |
| + <a id="_keep_alive"> | |
| </a> | |
| <code class="literal"> | |
| keep_alive | |
| @@ -1084,7 +1084,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_literal"> | |
| + <a id="_compression"> | |
| </a> | |
| <code class="literal"> | |
| compression | |
| @@ -1125,7 +1125,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_level_literal_3"> | |
| + <a id="_compression_level_3"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -1177,7 +1177,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_required_acks_literal"> | |
| + <a id="_required_acks"> | |
| </a> | |
| <code class="literal"> | |
| required_acks | |
| @@ -1201,7 +1201,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ssl_literal_3"> | |
| + <a id="_ssl_3"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| html/en/apm/server/7.1/keystore.html | |
| html/en/apm/server/7.1/kibana-path-option.html | |
| html/en/apm/server/7.1/kibana-protocol-option.html | |
| html/en/apm/server/7.1/linux-seccomp.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.1/linux-seccomp.html | |
| @@ -469,6 +469,12 @@ | |
| <dd> | |
| A list of system call names. The system call name must exist for the runtime architecture, otherwise an error will be logged and the filter will not be installed. At least one system call must be defined. | |
| </dd> | |
| + </dl> | |
| + </div> | |
| + <div class="variablelist"> | |
| + <a id="seccomp-policy-config-action"> | |
| + </a> | |
| + <dl class="variablelist"> | |
| <dt> | |
| <span class="term"> | |
| <span class="strong strong"> | |
| @@ -489,8 +495,6 @@ | |
| is executed. This is required. These are the available action values. The actions that are available depend on the kernel version. | |
| </p> | |
| <div class="itemizedlist"> | |
| - <a id="seccomp-policy-config-action"> | |
| - </a> | |
| <ul class="itemizedlist" type="disc"> | |
| <li class="listitem"> | |
| <code class="literal"> | |
| html/en/apm/server/7.1/load-dashboards-logstash.html | |
| html/en/apm/server/7.1/load-kibana-dashboards.html | |
| html/en/apm/server/7.1/logstash-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.1/logstash-output.html | |
| @@ -293,6 +293,9 @@ | |
| <img alt="Important" src="images/icons/important.png"/> | |
| </div> | |
| <div class="admon_content"> | |
| + <h3> | |
| + Prerequisite | |
| + </h3> | |
| <p> | |
| To send events to Logstash, you also need to create a Logstash configuration pipeline that listens for incoming Beats connections and indexes the received events into Elasticsearch. For more information, see the section about | |
| <a class="ulink" href="https://www.elastic.co/guide/en/elastic-stack-get-started/7.1/get-started-elastic-stack.html#logstash-setup" target="_top"> | |
| @@ -617,7 +620,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_2"> | |
| + <a id="_enabled_2"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -665,7 +668,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_level_literal_2"> | |
| + <a id="_compression_level_2"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -692,7 +695,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_escape_html_literal_2"> | |
| + <a id="_escape_html_2"> | |
| </a> | |
| <code class="literal"> | |
| escape_html | |
| @@ -724,7 +727,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_worker_literal_2"> | |
| + <a id="_worker_2"> | |
| </a> | |
| <code class="literal"> | |
| worker | |
| @@ -772,7 +775,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ttl_literal"> | |
| + <a id="_ttl"> | |
| </a> | |
| <code class="literal"> | |
| ttl | |
| @@ -806,7 +809,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_pipelining_literal"> | |
| + <a id="_pipelining"> | |
| </a> | |
| <code class="literal"> | |
| pipelining | |
| @@ -831,7 +834,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_proxy_url_literal_2"> | |
| + <a id="_proxy_url_2"> | |
| </a> | |
| <code class="literal"> | |
| proxy_url | |
| @@ -931,7 +934,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ssl_literal_2"> | |
| + <a id="_ssl_2"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| @@ -962,7 +965,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_timeout_literal_2"> | |
| + <a id="_timeout_2"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -983,7 +986,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_max_retries_literal_2"> | |
| + <a id="_max_retries_2"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -1014,7 +1017,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal_2"> | |
| + <a id="_bulk_max_size_2"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -1052,7 +1055,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_slow_start_literal"> | |
| + <a id="_slow_start"> | |
| </a> | |
| <code class="literal"> | |
| slow_start | |
| @@ -1084,7 +1087,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_init_literal_2"> | |
| + <a id="_backoff_init_2"> | |
| </a> | |
| <code class="literal"> | |
| backoff.init | |
| @@ -1113,7 +1116,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_max_literal_2"> | |
| + <a id="_backoff_max_2"> | |
| </a> | |
| <code class="literal"> | |
| backoff.max | |
| html/en/apm/server/7.1/manage-indices-kibana.html | |
| html/en/apm/server/7.1/manual-ilm-setup.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.1/manual-ilm-setup.html | |
| @@ -706,8 +706,8 @@ | |
| </code> | |
| overwrites defaults rather than being merged. This means you’ll need to configure all of your indices in the file, even if some are not using ILM. | |
| </p> | |
| - <div class="pre_wrapper lang-yml"> | |
| - <pre class="programlisting prettyprint lang-yml">output.elasticsearch: | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">output.elasticsearch: | |
| indices: | |
| - index: "apm-7.1.1-sourcemap" | |
| when.contains: | |
| html/en/apm/server/7.1/max_request_queue_time.html | |
| html/en/apm/server/7.1/max_unzipped_size.html | |
| html/en/apm/server/7.1/metadata-api.html | |
| html/en/apm/server/7.1/metrics.enabled.html | |
| html/en/apm/server/7.1/metricset-api.html | |
| html/en/apm/server/7.1/metricset-indices.html | |
| html/en/apm/server/7.1/monitoring.html | |
| html/en/apm/server/7.1/overview.html | |
| html/en/apm/server/7.1/payload-with-error.html | |
| html/en/apm/server/7.1/payload-with-minimal-exception.html | |
| html/en/apm/server/7.1/payload-with-minimal-log.html | |
| html/en/apm/server/7.1/payload-with-minimal-span.html | |
| html/en/apm/server/7.1/payload-with-minimal-transaction.html | |
| html/en/apm/server/7.1/payload-with-transactions.html | |
| html/en/apm/server/7.1/processing-performance.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.1/processing-performance.html | |
| @@ -425,11 +425,7 @@ | |
| </table> | |
| </div> | |
| <p> | |
| - In other words, a 512 Mb instance can process | |
| - <sub> | |
| - 3 Mbs per second, while an 8 Gb instance can process | |
| - </sub> | |
| - 20 Mbs per second. | |
| + In other words, a 512 Mb instance can process ~3 Mbs per second, while an 8 Gb instance can process ~20 Mbs per second. | |
| </p> | |
| <p> | |
| APM Server is CPU bound, so it scales better from 2 Gb to 8 Gb than it does from 512 Mb to 2 Gb. This is because larger instance types in Elastic Cloud come with much more computing power. | |
| html/en/apm/server/7.1/rate_limit_v1.html | |
| html/en/apm/server/7.1/redirects.html | |
| html/en/apm/server/7.1/reduce-storage.html | |
| html/en/apm/server/7.1/release-notes-6.1.0.html | |
| html/en/apm/server/7.1/release-notes-6.1.1.html | |
| html/en/apm/server/7.1/release-notes-6.1.2.html | |
| html/en/apm/server/7.1/release-notes-6.1.3.html | |
| html/en/apm/server/7.1/release-notes-6.1.4.html | |
| html/en/apm/server/7.1/release-notes-6.1.html | |
| html/en/apm/server/7.1/release-notes-6.2.0.html | |
| html/en/apm/server/7.1/release-notes-6.2.1.html | |
| html/en/apm/server/7.1/release-notes-6.2.2.html | |
| html/en/apm/server/7.1/release-notes-6.2.3.html | |
| html/en/apm/server/7.1/release-notes-6.2.4.html | |
| html/en/apm/server/7.1/release-notes-6.2.html | |
| html/en/apm/server/7.1/release-notes-6.3.0.html | |
| html/en/apm/server/7.1/release-notes-6.3.1.html | |
| html/en/apm/server/7.1/release-notes-6.3.2.html | |
| html/en/apm/server/7.1/release-notes-6.3.html | |
| html/en/apm/server/7.1/release-notes-6.4.0.html | |
| html/en/apm/server/7.1/release-notes-6.4.1.html | |
| html/en/apm/server/7.1/release-notes-6.4.2.html | |
| html/en/apm/server/7.1/release-notes-6.4.3.html | |
| html/en/apm/server/7.1/release-notes-6.4.html | |
| html/en/apm/server/7.1/release-notes-6.5.0.html | |
| html/en/apm/server/7.1/release-notes-6.5.1.html | |
| html/en/apm/server/7.1/release-notes-6.5.2.html | |
| html/en/apm/server/7.1/release-notes-6.5.3.html | |
| html/en/apm/server/7.1/release-notes-6.5.4.html | |
| html/en/apm/server/7.1/release-notes-6.5.html | |
| html/en/apm/server/7.1/release-notes-6.6.0.html | |
| html/en/apm/server/7.1/release-notes-6.6.1.html | |
| html/en/apm/server/7.1/release-notes-6.6.2.html | |
| html/en/apm/server/7.1/release-notes-6.6.html | |
| html/en/apm/server/7.1/release-notes-6.7.0.html | |
| html/en/apm/server/7.1/release-notes-6.7.1.html | |
| html/en/apm/server/7.1/release-notes-6.7.2.html | |
| html/en/apm/server/7.1/release-notes-6.7.html | |
| html/en/apm/server/7.1/release-notes-6.8.0.html | |
| html/en/apm/server/7.1/release-notes-6.8.html | |
| html/en/apm/server/7.1/release-notes-7.0.0-alpha1.html | |
| html/en/apm/server/7.1/release-notes-7.0.0-alpha2.html | |
| html/en/apm/server/7.1/release-notes-7.0.0-beta1.html | |
| html/en/apm/server/7.1/release-notes-7.0.0-rc1.html | |
| html/en/apm/server/7.1/release-notes-7.0.0-rc2.html | |
| html/en/apm/server/7.1/release-notes-7.0.0.html | |
| html/en/apm/server/7.1/release-notes-7.0.1.html | |
| html/en/apm/server/7.1/release-notes-7.0.html | |
| html/en/apm/server/7.1/release-notes-7.1.0.html | |
| html/en/apm/server/7.1/release-notes-7.1.1.html | |
| html/en/apm/server/7.1/release-notes-7.1.html | |
| html/en/apm/server/7.1/release-notes.html | |
| html/en/apm/server/7.1/request-too-large.html | |
| html/en/apm/server/7.1/rum.html | |
| html/en/apm/server/7.1/running-on-docker.html | |
| html/en/apm/server/7.1/running-with-systemd.html | |
| html/en/apm/server/7.1/securing-apm-server.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.1/securing-apm-server.html | |
| @@ -298,7 +298,7 @@ | |
| <li class="listitem"> | |
| <a class="xref" href="securing-beats.html" title="Configure APM Server to use X-Pack security"> | |
| <em> | |
| - Use X-Pack security | |
| + Use {security} | |
| </em> | |
| </a> | |
| </li> | |
| @@ -315,7 +315,7 @@ | |
| <a id="security-overview"> | |
| </a> | |
| Security Overview | |
| - <a class="edit_me" href="https://github.com/elastic/apm-server/edit/7.1/docs/security.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| + <a class="edit_me" href="https://github.com/elastic/apm-server/edit/7.1/docs/copied-from-beats/shared-securing-beat.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| edit | |
| </a> | |
| </h3> | |
| @@ -326,7 +326,7 @@ | |
| <a id="secret-token"> | |
| </a> | |
| Secret token | |
| - <a class="edit_me" href="https://github.com/elastic/apm-server/edit/7.1/docs/security.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| + <a class="edit_me" href="https://github.com/elastic/apm-server/edit/7.1/docs/copied-from-beats/shared-securing-beat.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| edit | |
| </a> | |
| </h4> | |
| @@ -347,7 +347,7 @@ | |
| <a id="ssl-setup"> | |
| </a> | |
| SSL/TLS setup | |
| - <a class="edit_me" href="https://github.com/elastic/apm-server/edit/7.1/docs/security.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| + <a class="edit_me" href="https://github.com/elastic/apm-server/edit/7.1/docs/copied-from-beats/shared-securing-beat.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| edit | |
| </a> | |
| </h4> | |
| html/en/apm/server/7.1/securing-beats.html | |
| html/en/apm/server/7.1/securing-communication-elasticsearch.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.1/securing-communication-elasticsearch.html | |
| @@ -287,7 +287,7 @@ | |
| and | |
| <a class="xref" href="securing-beats.html" title="Configure APM Server to use X-Pack security"> | |
| <em> | |
| - Use X-Pack security | |
| + Use {security} | |
| </em> | |
| </a> | |
| ). If you aren’t using X-Pack security, you can use a web proxy instead. | |
| html/en/apm/server/7.1/server-info.html | |
| html/en/apm/server/7.1/setting-up-and-running.html | |
| html/en/apm/server/7.1/setup-kibana-endpoint.html | |
| html/en/apm/server/7.1/setup-repositories.html | |
| html/en/apm/server/7.1/sizing-guide.html | |
| html/en/apm/server/7.1/sourcemap-api.html | |
| html/en/apm/server/7.1/sourcemap-indices.html | |
| html/en/apm/server/7.1/sourcemaps.html | |
| html/en/apm/server/7.1/span-api.html | |
| html/en/apm/server/7.1/span-indices.html | |
| html/en/apm/server/7.1/storage-management.html | |
| html/en/apm/server/7.1/toc.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.1/toc.html | |
| @@ -348,7 +348,7 @@ | |
| <li> | |
| <span class="chapter"> | |
| <a href="securing-beats.html"> | |
| - Use X-Pack security | |
| + Use {security} | |
| </a> | |
| </span> | |
| <ul> | |
| html/en/apm/server/7.1/transaction-api-examples.html | |
| html/en/apm/server/7.1/transaction-api.html | |
| html/en/apm/server/7.1/transaction-context-schema.html | |
| html/en/apm/server/7.1/transaction-endpoint.html | |
| html/en/apm/server/7.1/transaction-indices.html | |
| html/en/apm/server/7.1/transaction-payload-schema.html | |
| html/en/apm/server/7.1/transaction-request-schema.html | |
| html/en/apm/server/7.1/transaction-schema-definition.html | |
| html/en/apm/server/7.1/transaction-service-schema.html | |
| html/en/apm/server/7.1/transaction-span-schema.html | |
| html/en/apm/server/7.1/transaction-stacktraceframe-schema.html | |
| html/en/apm/server/7.1/transaction-system-schema.html | |
| html/en/apm/server/7.1/transaction-user-schema.html | |
| html/en/apm/server/7.1/transactions-spans.html | |
| html/en/apm/server/7.1/transactions.html | |
| html/en/apm/server/7.1/troubleshooting.html | |
| html/en/apm/server/7.1/tune-apm-server.html | |
| html/en/apm/server/7.1/tune-data-ingestion.html | |
| html/en/apm/server/7.1/tune-es.html | |
| html/en/apm/server/7.1/update-existing-data.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.1/update-existing-data.html | |
| @@ -300,8 +300,8 @@ | |
| <p> | |
| To rename a service, send the following request: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST /apm-*/_update_by_query | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST /apm-*/_update_by_query | |
| { | |
| "query": { | |
| "term": { | |
| html/en/apm/server/7.1/upgrading-to-65.html | |
| html/en/apm/server/7.1/upgrading-to-70.html | |
| html/en/apm/server/7.1/upgrading.html | |
| html/en/apm/server/7.1/url-option.html | |
| html/en/apm/server/7.1/use-v1-and-v2.html | |
| html/en/apm/server/7.1/using-environ-vars.html | |
| html/en/apm/server/7.1/why-separate-component.html | |
| html/en/apm/server/7.2/_manually_loading_template_configuration.html | |
| html/en/apm/server/7.2/apm-server-configuration.html | |
| html/en/apm/server/7.2/beats-basic-auth.html | |
| html/en/apm/server/7.2/beats-system-user.html | |
| html/en/apm/server/7.2/beats-tls.html | |
| html/en/apm/server/7.2/breaking-changes.html | |
| html/en/apm/server/7.2/brew.html | |
| html/en/apm/server/7.2/command-line-options.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.2/command-line-options.html | |
| @@ -553,37 +553,41 @@ | |
| </code> | |
| . | |
| </dd> | |
| - <dt> | |
| - <span class="term"> | |
| - <span class="strong strong"> | |
| - <strong> | |
| - <code class="literal"> | |
| - ilm-policy | |
| - </code> | |
| - </strong> | |
| - </span> | |
| - </span> | |
| - </dt> | |
| - <dd> | |
| - Exports ILM policy to stdout. You can specify the | |
| - <code class="literal"> | |
| - --es.version | |
| - </code> | |
| - and a | |
| - <code class="literal"> | |
| - --dir | |
| - </code> | |
| - to which the policy should be exported as a file rather than exporting to | |
| - <code class="literal"> | |
| - stdout | |
| - </code> | |
| - . | |
| - </dd> | |
| </dl> | |
| </div> | |
| - <p> | |
| + <div class="variablelist"> | |
| <a id="ilm-policy-subcommand"> | |
| </a> | |
| + <dl class="variablelist"> | |
| + <dt> | |
| + <span class="term"> | |
| + <span class="strong strong"> | |
| + <strong> | |
| + <code class="literal"> | |
| + ilm-policy | |
| + </code> | |
| + </strong> | |
| + </span> | |
| + </span> | |
| + </dt> | |
| + <dd> | |
| + Exports ILM policy to stdout. You can specify the | |
| + <code class="literal"> | |
| + --es.version | |
| + </code> | |
| + and a | |
| + <code class="literal"> | |
| + --dir | |
| + </code> | |
| + to which the policy should be exported as a file rather than exporting to | |
| + <code class="literal"> | |
| + stdout | |
| + </code> | |
| + . | |
| + </dd> | |
| + </dl> | |
| + </div> | |
| + <p> | |
| <span class="strong strong"> | |
| <strong> | |
| FLAGS | |
| @@ -1266,7 +1270,17 @@ | |
| </span> | |
| </dt> | |
| <dd> | |
| - deprecated:[7.2] Sets up the index template only. It is recommended to use | |
| + <span class="Admonishment"> | |
| + [ | |
| + <span class="Admonishment-version u-mono u-strikethrough"> | |
| + 7.2 | |
| + </span> | |
| + ] | |
| + <span class="Admonishment-detail"> | |
| + Deprecated in 7.2. | |
| + </span> | |
| + </span> | |
| + Sets up the index template only. It is recommended to use | |
| <code class="literal"> | |
| --index-management | |
| </code> | |
| @@ -1284,7 +1298,17 @@ | |
| </span> | |
| </dt> | |
| <dd> | |
| - deprecated:[7.2] Sets up the index lifecycle policy. It is recommended to use | |
| + <span class="Admonishment"> | |
| + [ | |
| + <span class="Admonishment-version u-mono u-strikethrough"> | |
| + 7.2 | |
| + </span> | |
| + ] | |
| + <span class="Admonishment-detail"> | |
| + Deprecated in 7.2. | |
| + </span> | |
| + </span> | |
| + Sets up the index lifecycle policy. It is recommended to use | |
| <code class="literal"> | |
| --index-management | |
| </code> | |
| html/en/apm/server/7.2/common-problems.html | |
| html/en/apm/server/7.2/concurrent_requests.html | |
| html/en/apm/server/7.2/configuration-logging.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.2/configuration-logging.html | |
| @@ -333,7 +333,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_to_syslog_literal"> | |
| + <a id="_logging_to_syslog"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_syslog | |
| @@ -356,7 +356,7 @@ | |
| </div> | |
| </div> | |
| <h4> | |
| - <a id="_literal_logging_to_eventlog_literal"> | |
| + <a id="_logging_to_eventlog"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_eventlog | |
| @@ -369,7 +369,7 @@ | |
| When true, writes all logging output to the Windows Event Log. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_to_files_literal"> | |
| + <a id="_logging_to_files"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_files | |
| @@ -522,7 +522,7 @@ | |
| also sets the debug log level). | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_metrics_enabled_literal"> | |
| + <a id="_logging_metrics_enabled"> | |
| </a> | |
| <code class="literal"> | |
| logging.metrics.enabled | |
| @@ -544,7 +544,7 @@ | |
| Note that we currently offer no backwards compatible guarantees for the internal metrics and for this reason they are also not documented. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_metrics_period_literal"> | |
| + <a id="_logging_metrics_period"> | |
| </a> | |
| <code class="literal"> | |
| logging.metrics.period | |
| @@ -557,7 +557,7 @@ | |
| The period after which to log the internal metrics. The default is 30s. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_path_literal"> | |
| + <a id="_logging_files_path"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.path | |
| @@ -574,7 +574,7 @@ | |
| section for details. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_name_literal"> | |
| + <a id="_logging_files_name"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.name | |
| @@ -593,7 +593,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_rotateeverybytes_literal"> | |
| + <a id="_logging_files_rotateeverybytes"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.rotateeverybytes | |
| @@ -606,7 +606,7 @@ | |
| The maximum size of a log file. If the limit is reached, a new log file is generated. The default size limit is 10485760 (10 MB). | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_keepfiles_literal"> | |
| + <a id="_logging_files_keepfiles"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.keepfiles | |
| @@ -623,7 +623,7 @@ | |
| options has to be in the range of 2 to 1024 files. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_permissions_literal"> | |
| + <a id="_logging_files_permissions"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.permissions | |
| @@ -662,7 +662,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_logging_files_interval_literal"> | |
| + <a id="_logging_files_interval"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.interval | |
| @@ -675,7 +675,7 @@ | |
| Enable log file rotation on time intervals in addition to size-based rotation. Intervals must be at least 1s. Values of 1m, 1h, 24h, 7*24h, 30*24h, and 365*24h are boundary-aligned with minutes, hours, days, weeks, months, and years as reported by the local system clock. All other intervals are calculated from the unix epoch. Defaults to disabled. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_json_literal"> | |
| + <a id="_logging_json"> | |
| </a> | |
| <code class="literal"> | |
| logging.json | |
| @@ -688,7 +688,7 @@ | |
| When true, logs messages in JSON format. The default is false. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_redirect_stderr_literal_phrase_role_experimental_phrase"> | |
| + <a id="_logging_files_redirect_stderr"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.redirect_stderr | |
| @@ -755,17 +755,17 @@ | |
| </p> | |
| <p> | |
| <code class="literal"> | |
| - 2017-12-17T18:54:16.241-0500 INFO logp/core_test.go:13 unnamed global logger | |
| - </code> | |
| - </p> | |
| - <p> | |
| - <code class="literal"> | |
| - 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:16 some message | |
| - </code> | |
| - </p> | |
| - <p> | |
| - <code class="literal"> | |
| - 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:19 some message {"x": 1} | |
| + 2017-12-17T18:54:16.241-0500 INFO logp/core_test.go:13 unnamed global logger | |
| + </code> | |
| + </p> | |
| + <p> | |
| + <code class="literal"> | |
| + 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:16 some message | |
| + </code> | |
| + </p> | |
| + <p> | |
| + <code class="literal"> | |
| + 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:19 some message {"x": 1} | |
| </code> | |
| </p> | |
| </div> | |
| html/en/apm/server/7.2/configuration-monitor.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.2/configuration-monitor.html | |
| @@ -291,7 +291,7 @@ | |
| config file: | |
| </p> | |
| <h3> | |
| - <a id="_literal_enabled_literal_7"> | |
| + <a id="_enabled_7"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -319,7 +319,7 @@ | |
| . | |
| </p> | |
| <h3> | |
| - <a id="_literal_elasticsearch_literal"> | |
| + <a id="_elasticsearch"> | |
| </a> | |
| <code class="literal"> | |
| elasticsearch | |
| @@ -332,7 +332,7 @@ | |
| The Elasticsearch instances that you want to ship your APM Server metrics to. This configuration option contains the following fields: | |
| </p> | |
| <h4> | |
| - <a id="_literal_bulk_max_size_literal_5"> | |
| + <a id="_bulk_max_size_5"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -353,7 +353,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_backoff_init_literal_3"> | |
| + <a id="_backoff_init_3"> | |
| </a> | |
| <code class="literal"> | |
| backoff.init | |
| @@ -374,7 +374,7 @@ | |
| . After a successful connection, the backoff timer is reset. The default is 1s. | |
| </p> | |
| <h5> | |
| - <a id="_literal_backoff_max_literal_3"> | |
| + <a id="_backoff_max_3"> | |
| </a> | |
| <code class="literal"> | |
| backoff.max | |
| @@ -387,7 +387,7 @@ | |
| The maximum number of seconds to wait before attempting to connect to Elasticsearch after a network error. The default is 60s. | |
| </p> | |
| <h4> | |
| - <a id="_literal_compression_level_literal_4"> | |
| + <a id="_compression_level_4"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -416,7 +416,7 @@ | |
| . Increasing the compression level reduces the network usage but increases the CPU usage. | |
| </p> | |
| <h4> | |
| - <a id="_literal_headers_literal_2"> | |
| + <a id="_headers_2"> | |
| </a> | |
| <code class="literal"> | |
| headers | |
| @@ -433,7 +433,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_hosts_literal_2"> | |
| + <a id="_hosts_2"> | |
| </a> | |
| <code class="literal"> | |
| hosts | |
| @@ -450,7 +450,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_max_retries_literal_4"> | |
| + <a id="_max_retries_4"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -471,7 +471,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_parameters_literal_2"> | |
| + <a id="_parameters_2"> | |
| </a> | |
| <code class="literal"> | |
| parameters | |
| @@ -484,7 +484,7 @@ | |
| Dictionary of HTTP parameters to pass within the url with index operations. | |
| </p> | |
| <h4> | |
| - <a id="_literal_password_literal_3"> | |
| + <a id="_password_3"> | |
| </a> | |
| <code class="literal"> | |
| password | |
| @@ -497,7 +497,7 @@ | |
| The password that APM Server uses to authenticate with the Elasticsearch instances for shipping monitoring data. | |
| </p> | |
| <h4> | |
| - <a id="_literal_metrics_period_literal"> | |
| + <a id="_metrics_period"> | |
| </a> | |
| <code class="literal"> | |
| metrics.period | |
| @@ -510,7 +510,7 @@ | |
| The time interval (in seconds) when metrics are sent to the Elasticsearch cluster. A new snapshot of APM Server metrics is generated and scheduled for publishing each period. The default value is 10 * time.Second. | |
| </p> | |
| <h4> | |
| - <a id="_literal_state_period_literal"> | |
| + <a id="_state_period"> | |
| </a> | |
| <code class="literal"> | |
| state.period | |
| @@ -523,7 +523,7 @@ | |
| The time interval (in seconds) when state information are sent to the Elasticsearch cluster. A new snapshot of APM Server state is generated and scheduled for publishing each period. The default value is 60 * time.Second. | |
| </p> | |
| <h4> | |
| - <a id="_literal_protocol_literal"> | |
| + <a id="_protocol"> | |
| </a> | |
| <code class="literal"> | |
| protocol | |
| @@ -552,7 +552,7 @@ | |
| , however, the value of protocol is overridden by the scheme you specify in the URL. | |
| </p> | |
| <h4> | |
| - <a id="_literal_proxy_url_literal_3"> | |
| + <a id="_proxy_url_3"> | |
| </a> | |
| <code class="literal"> | |
| proxy_url | |
| @@ -569,7 +569,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_timeout_literal_4"> | |
| + <a id="_timeout_4"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -586,7 +586,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_ssl_literal_4"> | |
| + <a id="_ssl_4"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| @@ -609,7 +609,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_username_literal_3"> | |
| + <a id="_username_3"> | |
| </a> | |
| <code class="literal"> | |
| username | |
| html/en/apm/server/7.2/configuration-output-codec.html | |
| html/en/apm/server/7.2/configuration-path.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.2/configuration-path.html | |
| @@ -329,7 +329,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_home_literal"> | |
| + <a id="_home"> | |
| </a> | |
| <code class="literal"> | |
| home | |
| @@ -348,7 +348,7 @@ | |
| <pre class="programlisting prettyprint lang-yaml">path.home: /usr/share/beats</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_config_literal"> | |
| + <a id="_config"> | |
| </a> | |
| <code class="literal"> | |
| config | |
| @@ -367,7 +367,7 @@ | |
| <pre class="programlisting prettyprint lang-yaml">path.config: /usr/share/beats/config</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_data_literal"> | |
| + <a id="_data"> | |
| </a> | |
| <code class="literal"> | |
| data | |
| @@ -404,7 +404,7 @@ | |
| </div> | |
| </div> | |
| <h4> | |
| - <a id="_literal_logs_literal"> | |
| + <a id="_logs"> | |
| </a> | |
| <code class="literal"> | |
| logs | |
| html/en/apm/server/7.2/configuration-process.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.2/configuration-process.html | |
| @@ -538,7 +538,7 @@ | |
| Overwrites existing pipeline definitions in Elasticsearch. Defaults to true. | |
| </p> | |
| <h3> | |
| - <a id="_configuration_options_literal_queue_mem_literal"> | |
| + <a id="_configuration_options_queue_mem"> | |
| </a> | |
| Configuration options: | |
| <code class="literal"> | |
| @@ -605,7 +605,7 @@ | |
| . Default value is 1 second. | |
| </p> | |
| <h3> | |
| - <a id="_configuration_options_literal_max_procs_literal"> | |
| + <a id="_configuration_options_max_procs"> | |
| </a> | |
| Configuration options: | |
| <code class="literal"> | |
| html/en/apm/server/7.2/configuration-rum-general.html | |
| html/en/apm/server/7.2/configuration-rum-v1.html | |
| html/en/apm/server/7.2/configuration-rum-v2.html | |
| html/en/apm/server/7.2/configuration-rum.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.2/configuration-rum.html | |
| @@ -346,7 +346,7 @@ | |
| Defines the maximum amount of events allowed to be sent to the APM Server RUM endpoint per ip per second. Defaults to 300. | |
| </p> | |
| <h4> | |
| - <a id="_literal_event_rate_lru_size_literal"> | |
| + <a id="_event_rate_lru_size"> | |
| </a> | |
| <code class="literal"> | |
| event_rate.lru_size | |
| @@ -359,7 +359,7 @@ | |
| An LRU cache is used to keep a rate limit per IP for the most recently seen IPs. This setting defines the number of unique IPs that can be tracked in the cache. Sites with many concurrent clients should consider increasing this limit. Defaults to 1000. | |
| </p> | |
| <h4> | |
| - <a id="_literal_allow_origins_literal"> | |
| + <a id="_allow_origins"> | |
| </a> | |
| <code class="literal"> | |
| allow_origins | |
| @@ -380,7 +380,7 @@ | |
| , which allows everything. | |
| </p> | |
| <h4> | |
| - <a id="_literal_library_pattern_literal"> | |
| + <a id="_library_pattern"> | |
| </a> | |
| <code class="literal"> | |
| library_pattern | |
| @@ -421,7 +421,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_exclude_from_grouping_literal"> | |
| + <a id="_exclude_from_grouping"> | |
| </a> | |
| <code class="literal"> | |
| exclude_from_grouping | |
| @@ -476,7 +476,7 @@ | |
| is automatically applied to documents sent to the RUM endpoint. Source maps are fetched from Elasticsearch and then kept in an in-memory cache for the configured time. Values configured without a time unit are treated as seconds. Default value is 5 minutes. | |
| </p> | |
| <h4> | |
| - <a id="_literal_source_mapping_index_pattern_literal"> | |
| + <a id="_source_mapping_index_pattern"> | |
| </a> | |
| <code class="literal"> | |
| source_mapping.index_pattern | |
| html/en/apm/server/7.2/configuration-ssl.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.2/configuration-ssl.html | |
| @@ -330,7 +330,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_enabled_literal_6"> | |
| + <a id="_enabled_6"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -377,7 +377,7 @@ | |
| </div> | |
| </div> | |
| <h4> | |
| - <a id="_literal_certificate_authorities_literal"> | |
| + <a id="_certificate_authorities"> | |
| </a> | |
| <code class="literal"> | |
| certificate_authorities | |
| @@ -435,7 +435,7 @@ | |
| is specified. | |
| </p> | |
| <h4> | |
| - <a id="_literal_key_passphrase_literal"> | |
| + <a id="_key_passphrase"> | |
| </a> | |
| <code class="literal"> | |
| key_passphrase | |
| @@ -452,7 +452,7 @@ | |
| file. | |
| </p> | |
| <h4> | |
| - <a id="_literal_supported_protocols_literal"> | |
| + <a id="_supported_protocols"> | |
| </a> | |
| <code class="literal"> | |
| supported_protocols | |
| @@ -492,7 +492,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_verification_mode_literal"> | |
| + <a id="_verification_mode"> | |
| </a> | |
| <code class="literal"> | |
| verification_mode | |
| @@ -528,7 +528,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_cipher_suites_literal"> | |
| + <a id="_cipher_suites"> | |
| </a> | |
| <code class="literal"> | |
| cipher_suites | |
| @@ -648,7 +648,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_curve_types_literal"> | |
| + <a id="_curve_types"> | |
| </a> | |
| <code class="literal"> | |
| curve_types | |
| @@ -680,7 +680,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_renegotiation_literal"> | |
| + <a id="_renegotiation"> | |
| </a> | |
| <code class="literal"> | |
| renegotiation | |
| html/en/apm/server/7.2/configuration-template.html | |
| html/en/apm/server/7.2/configuration-v1-api.html | |
| html/en/apm/server/7.2/configuration-v2-api.html | |
| html/en/apm/server/7.2/configure-cloud-id.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.2/configure-cloud-id.html | |
| @@ -332,7 +332,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_cloud_id_literal"> | |
| + <a id="_cloud_id"> | |
| </a> | |
| <code class="literal"> | |
| cloud.id | |
| @@ -361,7 +361,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_cloud_auth_literal"> | |
| + <a id="_cloud_auth"> | |
| </a> | |
| <code class="literal"> | |
| cloud.auth | |
| html/en/apm/server/7.2/configuring-howto-apm-server.html | |
| html/en/apm/server/7.2/configuring-ingest-node.html | |
| html/en/apm/server/7.2/configuring-output.html | |
| html/en/apm/server/7.2/configuring-ssl-logstash.html | |
| html/en/apm/server/7.2/console-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.2/console-output.html | |
| @@ -323,7 +323,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_pretty_literal"> | |
| + <a id="_pretty"> | |
| </a> | |
| <code class="literal"> | |
| pretty | |
| @@ -348,7 +348,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_codec_literal_3"> | |
| + <a id="_codec_3"> | |
| </a> | |
| <code class="literal"> | |
| codec | |
| @@ -384,7 +384,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_5"> | |
| + <a id="_enabled_5"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -408,7 +408,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal_4"> | |
| + <a id="_bulk_max_size_4"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| html/en/apm/server/7.2/directory-layout.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.2/directory-layout.html | |
| @@ -323,10 +323,6 @@ | |
| </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| - <p> | |
| - <code class="literal"> | |
| - </code> | |
| - </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| <p> | |
| @@ -359,10 +355,6 @@ | |
| </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| - <p> | |
| - <code class="literal"> | |
| - </code> | |
| - </p> | |
| </td> | |
| </tr> | |
| <tr> | |
| html/en/apm/server/7.2/elasticsearch-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.2/elasticsearch-output.html | |
| @@ -397,7 +397,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal"> | |
| + <a id="_enabled"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -521,7 +521,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_level_literal"> | |
| + <a id="_compression_level"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -548,7 +548,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_escape_html_literal"> | |
| + <a id="_escape_html"> | |
| </a> | |
| <code class="literal"> | |
| escape_html | |
| @@ -580,7 +580,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_worker_literal"> | |
| + <a id="_worker"> | |
| </a> | |
| <code class="literal"> | |
| worker | |
| @@ -604,7 +604,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_username_literal"> | |
| + <a id="_username"> | |
| </a> | |
| <code class="literal"> | |
| username | |
| @@ -625,7 +625,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_password_literal"> | |
| + <a id="_password"> | |
| </a> | |
| <code class="literal"> | |
| password | |
| @@ -646,7 +646,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_parameters_literal"> | |
| + <a id="_parameters"> | |
| </a> | |
| <code class="literal"> | |
| parameters | |
| @@ -731,7 +731,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_headers_literal"> | |
| + <a id="_headers"> | |
| </a> | |
| <code class="literal"> | |
| headers | |
| @@ -759,7 +759,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_proxy_url_literal"> | |
| + <a id="_proxy_url"> | |
| </a> | |
| <code class="literal"> | |
| proxy_url | |
| @@ -798,6 +798,10 @@ | |
| </div> | |
| <p> | |
| The index name to write events to. The default is | |
| + <code class="literal"> | |
| + "apm-%{[observer.version]}-{type}-%{+yyyy.MM.dd}" | |
| + </code> | |
| + (for example, | |
| <code class="literal"> | |
| "apm-7.2.1-transaction-2019-08-28" | |
| </code> | |
| @@ -1077,7 +1081,11 @@ | |
| </div> | |
| </div> | |
| <p> | |
| - This is the default configuration for APM Server and results in indices For example: | |
| + This is the default configuration for APM Server and results in indices named in the following format: | |
| + <code class="literal"> | |
| + "apm-%{[observer.version]}-{type}-%{+yyyy.MM.dd}" | |
| + </code> | |
| + For example: | |
| <code class="literal"> | |
| "apm-7.2.1-transaction-2019-08-28" | |
| </code> | |
| @@ -1409,7 +1417,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_max_retries_literal"> | |
| + <a id="_max_retries"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -1440,7 +1448,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal"> | |
| + <a id="_bulk_max_size"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -1478,7 +1486,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_init_literal"> | |
| + <a id="_backoff_init"> | |
| </a> | |
| <code class="literal"> | |
| backoff.init | |
| @@ -1507,7 +1515,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_max_literal"> | |
| + <a id="_backoff_max"> | |
| </a> | |
| <code class="literal"> | |
| backoff.max | |
| @@ -1528,7 +1536,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_timeout_literal"> | |
| + <a id="_timeout"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -1549,7 +1557,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ssl_literal"> | |
| + <a id="_ssl"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| html/en/apm/server/7.2/enable-apm-server-debugging.html | |
| html/en/apm/server/7.2/error-api-examples.html | |
| html/en/apm/server/7.2/error-api.html | |
| html/en/apm/server/7.2/error-context-schema.html | |
| html/en/apm/server/7.2/error-endpoint.html | |
| html/en/apm/server/7.2/error-indices.html | |
| html/en/apm/server/7.2/error-payload-schema.html | |
| html/en/apm/server/7.2/error-schema-definition.html | |
| html/en/apm/server/7.2/error-service-schema.html | |
| html/en/apm/server/7.2/error-stacktraceframe-schema.html | |
| html/en/apm/server/7.2/error-system-schema.html | |
| html/en/apm/server/7.2/errors.html | |
| html/en/apm/server/7.2/event-types.html | |
| html/en/apm/server/7.2/events-api.html | |
| html/en/apm/server/7.2/example-intake-events.html | |
| html/en/apm/server/7.2/example-intakev2-events.html | |
| html/en/apm/server/7.2/exploring-es-data.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.2/exploring-es-data.html | |
| @@ -312,8 +312,8 @@ | |
| <p> | |
| To get an overview of existing indices you can run: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET _cat/indices/apm*</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET _cat/indices/apm*</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| @@ -370,16 +370,16 @@ | |
| <p> | |
| To query all documents collected with a specific APM Server version: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET apm-7.2.1-*/_search</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET apm-7.2.1-*/_search</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| <p> | |
| To query a specific type, for example transactions: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET apm-*transactions-*/_search</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET apm-*transactions-*/_search</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| @@ -398,16 +398,16 @@ | |
| </span> | |
| of the Elastic APM indices, first, run a query to find template names: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET _cat/templates/apm*</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET _cat/templates/apm*</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| <p> | |
| Then you can retrieve the specific template you are interested in: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET /_template/your-template-name</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET /_template/your-template-name</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| html/en/apm/server/7.2/exported-fields-apm-error.html | |
| html/en/apm/server/7.2/exported-fields-apm-sourcemap.html | |
| html/en/apm/server/7.2/exported-fields-apm-span.html | |
| html/en/apm/server/7.2/exported-fields-apm-transaction.html | |
| html/en/apm/server/7.2/exported-fields-apm.html | |
| html/en/apm/server/7.2/exported-fields-beat.html | |
| html/en/apm/server/7.2/exported-fields-cloud.html | |
| html/en/apm/server/7.2/exported-fields-docker-processor.html | |
| html/en/apm/server/7.2/exported-fields-ecs.html | |
| html/en/apm/server/7.2/exported-fields-host-processor.html | |
| html/en/apm/server/7.2/exported-fields-kubernetes-processor.html | |
| html/en/apm/server/7.2/exported-fields-process.html | |
| html/en/apm/server/7.2/exported-fields-system.html | |
| html/en/apm/server/7.2/exported-fields.html | |
| html/en/apm/server/7.2/feature-roles.html | |
| html/en/apm/server/7.2/file-option.html | |
| html/en/apm/server/7.2/file-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.2/file-output.html | |
| @@ -327,7 +327,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_4"> | |
| + <a id="_enabled_4"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -372,7 +372,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_filename_literal"> | |
| + <a id="_filename"> | |
| </a> | |
| <code class="literal"> | |
| filename | |
| @@ -393,7 +393,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_rotate_every_kb_literal"> | |
| + <a id="_rotate_every_kb"> | |
| </a> | |
| <code class="literal"> | |
| rotate_every_kb | |
| @@ -414,7 +414,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_number_of_files_literal"> | |
| + <a id="_number_of_files"> | |
| </a> | |
| <code class="literal"> | |
| number_of_files | |
| @@ -441,7 +441,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_permissions_literal"> | |
| + <a id="_permissions"> | |
| </a> | |
| <code class="literal"> | |
| permissions | |
| @@ -462,7 +462,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_codec_literal_2"> | |
| + <a id="_codec_2"> | |
| </a> | |
| <code class="literal"> | |
| codec | |
| html/en/apm/server/7.2/getting-help.html | |
| html/en/apm/server/7.2/high-availability.html | |
| html/en/apm/server/7.2/ilm-default.html | |
| html/en/apm/server/7.2/ilm.html | |
| html/en/apm/server/7.2/index.html | |
| html/en/apm/server/7.2/installing-on-windows.html | |
| html/en/apm/server/7.2/installing.html | |
| html/en/apm/server/7.2/intake-api.html | |
| html/en/apm/server/7.2/kafka-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.2/kafka-output.html | |
| @@ -377,7 +377,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_3"> | |
| + <a id="_enabled_3"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -405,7 +405,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_hosts_literal"> | |
| + <a id="_hosts"> | |
| </a> | |
| <code class="literal"> | |
| hosts | |
| @@ -426,7 +426,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_version_literal"> | |
| + <a id="_version"> | |
| </a> | |
| <code class="literal"> | |
| version | |
| @@ -468,7 +468,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_username_literal_2"> | |
| + <a id="_username_2"> | |
| </a> | |
| <code class="literal"> | |
| username | |
| @@ -489,7 +489,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_password_literal_2"> | |
| + <a id="_password_2"> | |
| </a> | |
| <code class="literal"> | |
| password | |
| @@ -680,7 +680,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_key_literal"> | |
| + <a id="_key"> | |
| </a> | |
| <code class="literal"> | |
| key | |
| @@ -701,7 +701,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_partition_literal"> | |
| + <a id="_partition"> | |
| </a> | |
| <code class="literal"> | |
| partition | |
| @@ -807,7 +807,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_client_id_literal"> | |
| + <a id="_client_id"> | |
| </a> | |
| <code class="literal"> | |
| client_id | |
| @@ -828,7 +828,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_worker_literal_3"> | |
| + <a id="_worker_3"> | |
| </a> | |
| <code class="literal"> | |
| worker | |
| @@ -849,7 +849,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_codec_literal"> | |
| + <a id="_codec"> | |
| </a> | |
| <code class="literal"> | |
| codec | |
| @@ -881,7 +881,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_metadata_literal"> | |
| + <a id="_metadata"> | |
| </a> | |
| <code class="literal"> | |
| metadata | |
| @@ -970,7 +970,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_max_retries_literal_3"> | |
| + <a id="_max_retries_3"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -1001,7 +1001,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal_3"> | |
| + <a id="_bulk_max_size_3"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -1022,7 +1022,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_timeout_literal_3"> | |
| + <a id="_timeout_3"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -1043,7 +1043,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_broker_timeout_literal"> | |
| + <a id="_broker_timeout"> | |
| </a> | |
| <code class="literal"> | |
| broker_timeout | |
| @@ -1064,7 +1064,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_channel_buffer_size_literal"> | |
| + <a id="_channel_buffer_size"> | |
| </a> | |
| <code class="literal"> | |
| channel_buffer_size | |
| @@ -1085,7 +1085,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_keep_alive_literal"> | |
| + <a id="_keep_alive"> | |
| </a> | |
| <code class="literal"> | |
| keep_alive | |
| @@ -1106,7 +1106,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_literal"> | |
| + <a id="_compression"> | |
| </a> | |
| <code class="literal"> | |
| compression | |
| @@ -1147,7 +1147,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_level_literal_3"> | |
| + <a id="_compression_level_3"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -1199,7 +1199,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_required_acks_literal"> | |
| + <a id="_required_acks"> | |
| </a> | |
| <code class="literal"> | |
| required_acks | |
| @@ -1223,7 +1223,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ssl_literal_3"> | |
| + <a id="_ssl_3"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| html/en/apm/server/7.2/keystore.html | |
| html/en/apm/server/7.2/kibana-path-option.html | |
| html/en/apm/server/7.2/kibana-protocol-option.html | |
| html/en/apm/server/7.2/linux-seccomp.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.2/linux-seccomp.html | |
| @@ -469,6 +469,12 @@ | |
| <dd> | |
| A list of system call names. The system call name must exist for the runtime architecture, otherwise an error will be logged and the filter will not be installed. At least one system call must be defined. | |
| </dd> | |
| + </dl> | |
| + </div> | |
| + <div class="variablelist"> | |
| + <a id="seccomp-policy-config-action"> | |
| + </a> | |
| + <dl class="variablelist"> | |
| <dt> | |
| <span class="term"> | |
| <span class="strong strong"> | |
| @@ -489,8 +495,6 @@ | |
| is executed. This is required. These are the available action values. The actions that are available depend on the kernel version. | |
| </p> | |
| <div class="itemizedlist"> | |
| - <a id="seccomp-policy-config-action"> | |
| - </a> | |
| <ul class="itemizedlist" type="disc"> | |
| <li class="listitem"> | |
| <code class="literal"> | |
| html/en/apm/server/7.2/load-dashboards-logstash.html | |
| html/en/apm/server/7.2/load-kibana-dashboards.html | |
| html/en/apm/server/7.2/logstash-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.2/logstash-output.html | |
| @@ -293,6 +293,9 @@ | |
| <img alt="Important" src="images/icons/important.png"/> | |
| </div> | |
| <div class="admon_content"> | |
| + <h3> | |
| + Prerequisite | |
| + </h3> | |
| <p> | |
| To send events to Logstash, you also need to create a Logstash configuration pipeline that listens for incoming Beats connections and indexes the received events into Elasticsearch. For more information, see the section about | |
| <a class="ulink" href="https://www.elastic.co/guide/en/elastic-stack-get-started/7.2/get-started-elastic-stack.html#logstash-setup" target="_top"> | |
| @@ -617,7 +620,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_2"> | |
| + <a id="_enabled_2"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -665,7 +668,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_level_literal_2"> | |
| + <a id="_compression_level_2"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -692,7 +695,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_escape_html_literal_2"> | |
| + <a id="_escape_html_2"> | |
| </a> | |
| <code class="literal"> | |
| escape_html | |
| @@ -724,7 +727,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_worker_literal_2"> | |
| + <a id="_worker_2"> | |
| </a> | |
| <code class="literal"> | |
| worker | |
| @@ -772,7 +775,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ttl_literal"> | |
| + <a id="_ttl"> | |
| </a> | |
| <code class="literal"> | |
| ttl | |
| @@ -806,7 +809,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_pipelining_literal"> | |
| + <a id="_pipelining"> | |
| </a> | |
| <code class="literal"> | |
| pipelining | |
| @@ -831,7 +834,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_proxy_url_literal_2"> | |
| + <a id="_proxy_url_2"> | |
| </a> | |
| <code class="literal"> | |
| proxy_url | |
| @@ -931,7 +934,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ssl_literal_2"> | |
| + <a id="_ssl_2"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| @@ -962,7 +965,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_timeout_literal_2"> | |
| + <a id="_timeout_2"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -983,7 +986,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_max_retries_literal_2"> | |
| + <a id="_max_retries_2"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -1014,7 +1017,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal_2"> | |
| + <a id="_bulk_max_size_2"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -1052,7 +1055,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_slow_start_literal"> | |
| + <a id="_slow_start"> | |
| </a> | |
| <code class="literal"> | |
| slow_start | |
| @@ -1084,7 +1087,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_init_literal_2"> | |
| + <a id="_backoff_init_2"> | |
| </a> | |
| <code class="literal"> | |
| backoff.init | |
| @@ -1113,7 +1116,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_max_literal_2"> | |
| + <a id="_backoff_max_2"> | |
| </a> | |
| <code class="literal"> | |
| backoff.max | |
| html/en/apm/server/7.2/manage-indices-kibana.html | |
| html/en/apm/server/7.2/manual-ilm-setup.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.2/manual-ilm-setup.html | |
| @@ -709,8 +709,8 @@ | |
| </code> | |
| overwrites defaults rather than being merged. This means you’ll need to configure all of your indices in the file, even if some are not using ILM. | |
| </p> | |
| - <div class="pre_wrapper lang-yml"> | |
| - <pre class="programlisting prettyprint lang-yml">output.elasticsearch: | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">output.elasticsearch: | |
| indices: | |
| - index: "apm-7.2.1-sourcemap" | |
| when.contains: | |
| html/en/apm/server/7.2/max_request_queue_time.html | |
| html/en/apm/server/7.2/max_unzipped_size.html | |
| html/en/apm/server/7.2/metadata-api.html | |
| html/en/apm/server/7.2/metrics.enabled.html | |
| html/en/apm/server/7.2/metricset-api.html | |
| html/en/apm/server/7.2/metricset-indices.html | |
| html/en/apm/server/7.2/monitoring.html | |
| html/en/apm/server/7.2/overview.html | |
| html/en/apm/server/7.2/payload-with-error.html | |
| html/en/apm/server/7.2/payload-with-minimal-exception.html | |
| html/en/apm/server/7.2/payload-with-minimal-log.html | |
| html/en/apm/server/7.2/payload-with-minimal-span.html | |
| html/en/apm/server/7.2/payload-with-minimal-transaction.html | |
| html/en/apm/server/7.2/payload-with-transactions.html | |
| html/en/apm/server/7.2/processing-performance.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.2/processing-performance.html | |
| @@ -425,11 +425,7 @@ | |
| </table> | |
| </div> | |
| <p> | |
| - In other words, a 512 Mb instance can process | |
| - <sub> | |
| - 3 Mbs per second, while an 8 Gb instance can process | |
| - </sub> | |
| - 20 Mbs per second. | |
| + In other words, a 512 Mb instance can process ~3 Mbs per second, while an 8 Gb instance can process ~20 Mbs per second. | |
| </p> | |
| <p> | |
| APM Server is CPU bound, so it scales better from 2 Gb to 8 Gb than it does from 512 Mb to 2 Gb. This is because larger instance types in Elastic Cloud come with much more computing power. | |
| html/en/apm/server/7.2/rate_limit_v1.html | |
| html/en/apm/server/7.2/redirects.html | |
| html/en/apm/server/7.2/reduce-storage.html | |
| html/en/apm/server/7.2/release-notes-6.1.0.html | |
| html/en/apm/server/7.2/release-notes-6.1.1.html | |
| html/en/apm/server/7.2/release-notes-6.1.2.html | |
| html/en/apm/server/7.2/release-notes-6.1.3.html | |
| html/en/apm/server/7.2/release-notes-6.1.4.html | |
| html/en/apm/server/7.2/release-notes-6.1.html | |
| html/en/apm/server/7.2/release-notes-6.2.0.html | |
| html/en/apm/server/7.2/release-notes-6.2.1.html | |
| html/en/apm/server/7.2/release-notes-6.2.2.html | |
| html/en/apm/server/7.2/release-notes-6.2.3.html | |
| html/en/apm/server/7.2/release-notes-6.2.4.html | |
| html/en/apm/server/7.2/release-notes-6.2.html | |
| html/en/apm/server/7.2/release-notes-6.3.0.html | |
| html/en/apm/server/7.2/release-notes-6.3.1.html | |
| html/en/apm/server/7.2/release-notes-6.3.2.html | |
| html/en/apm/server/7.2/release-notes-6.3.html | |
| html/en/apm/server/7.2/release-notes-6.4.0.html | |
| html/en/apm/server/7.2/release-notes-6.4.1.html | |
| html/en/apm/server/7.2/release-notes-6.4.2.html | |
| html/en/apm/server/7.2/release-notes-6.4.3.html | |
| html/en/apm/server/7.2/release-notes-6.4.html | |
| html/en/apm/server/7.2/release-notes-6.5.0.html | |
| html/en/apm/server/7.2/release-notes-6.5.1.html | |
| html/en/apm/server/7.2/release-notes-6.5.2.html | |
| html/en/apm/server/7.2/release-notes-6.5.3.html | |
| html/en/apm/server/7.2/release-notes-6.5.4.html | |
| html/en/apm/server/7.2/release-notes-6.5.html | |
| html/en/apm/server/7.2/release-notes-6.6.0.html | |
| html/en/apm/server/7.2/release-notes-6.6.1.html | |
| html/en/apm/server/7.2/release-notes-6.6.2.html | |
| html/en/apm/server/7.2/release-notes-6.6.html | |
| html/en/apm/server/7.2/release-notes-6.7.0.html | |
| html/en/apm/server/7.2/release-notes-6.7.1.html | |
| html/en/apm/server/7.2/release-notes-6.7.2.html | |
| html/en/apm/server/7.2/release-notes-6.7.html | |
| html/en/apm/server/7.2/release-notes-6.8.0.html | |
| html/en/apm/server/7.2/release-notes-6.8.html | |
| html/en/apm/server/7.2/release-notes-7.0.0-alpha1.html | |
| html/en/apm/server/7.2/release-notes-7.0.0-alpha2.html | |
| html/en/apm/server/7.2/release-notes-7.0.0-beta1.html | |
| html/en/apm/server/7.2/release-notes-7.0.0-rc1.html | |
| html/en/apm/server/7.2/release-notes-7.0.0-rc2.html | |
| html/en/apm/server/7.2/release-notes-7.0.0.html | |
| html/en/apm/server/7.2/release-notes-7.0.1.html | |
| html/en/apm/server/7.2/release-notes-7.0.html | |
| html/en/apm/server/7.2/release-notes-7.1.0.html | |
| html/en/apm/server/7.2/release-notes-7.1.1.html | |
| html/en/apm/server/7.2/release-notes-7.1.html | |
| html/en/apm/server/7.2/release-notes-7.2.0.html | |
| html/en/apm/server/7.2/release-notes-7.2.1.html | |
| html/en/apm/server/7.2/release-notes-7.2.html | |
| html/en/apm/server/7.2/release-notes.html | |
| html/en/apm/server/7.2/request-too-large.html | |
| html/en/apm/server/7.2/rum.html | |
| html/en/apm/server/7.2/running-on-docker.html | |
| html/en/apm/server/7.2/running-with-systemd.html | |
| html/en/apm/server/7.2/securing-apm-server.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.2/securing-apm-server.html | |
| @@ -315,7 +315,7 @@ | |
| <a id="security-overview"> | |
| </a> | |
| Security Overview | |
| - <a class="edit_me" href="https://github.com/elastic/apm-server/edit/7.2/docs/security.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| + <a class="edit_me" href="https://github.com/elastic/apm-server/edit/7.2/docs/copied-from-beats/shared-securing-beat.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| edit | |
| </a> | |
| </h3> | |
| @@ -326,7 +326,7 @@ | |
| <a id="secret-token"> | |
| </a> | |
| Secret token | |
| - <a class="edit_me" href="https://github.com/elastic/apm-server/edit/7.2/docs/security.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| + <a class="edit_me" href="https://github.com/elastic/apm-server/edit/7.2/docs/copied-from-beats/shared-securing-beat.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| edit | |
| </a> | |
| </h4> | |
| @@ -347,7 +347,7 @@ | |
| <a id="ssl-setup"> | |
| </a> | |
| SSL/TLS setup | |
| - <a class="edit_me" href="https://github.com/elastic/apm-server/edit/7.2/docs/security.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| + <a class="edit_me" href="https://github.com/elastic/apm-server/edit/7.2/docs/copied-from-beats/shared-securing-beat.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| edit | |
| </a> | |
| </h4> | |
| html/en/apm/server/7.2/securing-beats.html | |
| html/en/apm/server/7.2/securing-communication-elasticsearch.html | |
| html/en/apm/server/7.2/server-info.html | |
| html/en/apm/server/7.2/setting-up-and-running.html | |
| html/en/apm/server/7.2/setup-kibana-endpoint.html | |
| html/en/apm/server/7.2/setup-repositories.html | |
| html/en/apm/server/7.2/sizing-guide.html | |
| html/en/apm/server/7.2/sourcemap-api.html | |
| html/en/apm/server/7.2/sourcemap-indices.html | |
| html/en/apm/server/7.2/sourcemaps.html | |
| html/en/apm/server/7.2/span-api.html | |
| html/en/apm/server/7.2/span-indices.html | |
| html/en/apm/server/7.2/storage-management.html | |
| html/en/apm/server/7.2/toc.html | |
| html/en/apm/server/7.2/transaction-api-examples.html | |
| html/en/apm/server/7.2/transaction-api.html | |
| html/en/apm/server/7.2/transaction-context-schema.html | |
| html/en/apm/server/7.2/transaction-endpoint.html | |
| html/en/apm/server/7.2/transaction-indices.html | |
| html/en/apm/server/7.2/transaction-payload-schema.html | |
| html/en/apm/server/7.2/transaction-request-schema.html | |
| html/en/apm/server/7.2/transaction-schema-definition.html | |
| html/en/apm/server/7.2/transaction-service-schema.html | |
| html/en/apm/server/7.2/transaction-span-schema.html | |
| html/en/apm/server/7.2/transaction-stacktraceframe-schema.html | |
| html/en/apm/server/7.2/transaction-system-schema.html | |
| html/en/apm/server/7.2/transaction-user-schema.html | |
| html/en/apm/server/7.2/transactions-spans.html | |
| html/en/apm/server/7.2/transactions.html | |
| html/en/apm/server/7.2/troubleshooting.html | |
| html/en/apm/server/7.2/tune-apm-server.html | |
| html/en/apm/server/7.2/tune-data-ingestion.html | |
| html/en/apm/server/7.2/tune-es.html | |
| html/en/apm/server/7.2/update-existing-data.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.2/update-existing-data.html | |
| @@ -300,8 +300,8 @@ | |
| <p> | |
| To rename a service, send the following request: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST /apm-*/_update_by_query | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST /apm-*/_update_by_query | |
| { | |
| "query": { | |
| "term": { | |
| html/en/apm/server/7.2/upgrading-to-65.html | |
| html/en/apm/server/7.2/upgrading-to-70.html | |
| html/en/apm/server/7.2/upgrading.html | |
| html/en/apm/server/7.2/url-option.html | |
| html/en/apm/server/7.2/use-v1-and-v2.html | |
| html/en/apm/server/7.2/using-environ-vars.html | |
| html/en/apm/server/7.2/why-separate-component.html | |
| html/en/apm/server/7.3/_manually_loading_template_configuration.html | |
| html/en/apm/server/7.3/agent-configuration-api.html | |
| html/en/apm/server/7.3/apm-server-configuration.html | |
| html/en/apm/server/7.3/beats-basic-auth.html | |
| html/en/apm/server/7.3/beats-system-user.html | |
| html/en/apm/server/7.3/beats-tls.html | |
| html/en/apm/server/7.3/breaking-changes.html | |
| html/en/apm/server/7.3/brew.html | |
| html/en/apm/server/7.3/command-line-options.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.3/command-line-options.html | |
| @@ -557,37 +557,41 @@ | |
| </code> | |
| . | |
| </dd> | |
| - <dt> | |
| - <span class="term"> | |
| - <span class="strong strong"> | |
| - <strong> | |
| - <code class="literal"> | |
| - ilm-policy | |
| - </code> | |
| - </strong> | |
| - </span> | |
| - </span> | |
| - </dt> | |
| - <dd> | |
| - Exports the index lifecycle management policy to stdout. You can specify the | |
| - <code class="literal"> | |
| - --es.version | |
| - </code> | |
| - and a | |
| - <code class="literal"> | |
| - --dir | |
| - </code> | |
| - to which the policy should be exported as a file rather than exporting to | |
| - <code class="literal"> | |
| - stdout | |
| - </code> | |
| - . | |
| - </dd> | |
| </dl> | |
| </div> | |
| - <p> | |
| + <div class="variablelist"> | |
| <a id="ilm-policy-subcommand"> | |
| </a> | |
| + <dl class="variablelist"> | |
| + <dt> | |
| + <span class="term"> | |
| + <span class="strong strong"> | |
| + <strong> | |
| + <code class="literal"> | |
| + ilm-policy | |
| + </code> | |
| + </strong> | |
| + </span> | |
| + </span> | |
| + </dt> | |
| + <dd> | |
| + Exports the index lifecycle management policy to stdout. You can specify the | |
| + <code class="literal"> | |
| + --es.version | |
| + </code> | |
| + and a | |
| + <code class="literal"> | |
| + --dir | |
| + </code> | |
| + to which the policy should be exported as a file rather than exporting to | |
| + <code class="literal"> | |
| + stdout | |
| + </code> | |
| + . | |
| + </dd> | |
| + </dl> | |
| + </div> | |
| + <p> | |
| <span class="strong strong"> | |
| <strong> | |
| FLAGS | |
| @@ -1270,7 +1274,17 @@ | |
| </span> | |
| </dt> | |
| <dd> | |
| - deprecated:[7.2] Sets up the index template only. It is recommended to use | |
| + <span class="Admonishment"> | |
| + [ | |
| + <span class="Admonishment-version u-mono u-strikethrough"> | |
| + 7.2 | |
| + </span> | |
| + ] | |
| + <span class="Admonishment-detail"> | |
| + Deprecated in 7.2. | |
| + </span> | |
| + </span> | |
| + Sets up the index template only. It is recommended to use | |
| <code class="literal"> | |
| --index-management | |
| </code> | |
| @@ -1288,7 +1302,17 @@ | |
| </span> | |
| </dt> | |
| <dd> | |
| - deprecated:[7.2] Sets up the index lifecycle management policy. It is recommended to use | |
| + <span class="Admonishment"> | |
| + [ | |
| + <span class="Admonishment-version u-mono u-strikethrough"> | |
| + 7.2 | |
| + </span> | |
| + ] | |
| + <span class="Admonishment-detail"> | |
| + Deprecated in 7.2. | |
| + </span> | |
| + </span> | |
| + Sets up the index lifecycle management policy. It is recommended to use | |
| <code class="literal"> | |
| --index-management | |
| </code> | |
| html/en/apm/server/7.3/common-problems.html | |
| html/en/apm/server/7.3/concurrent_requests.html | |
| html/en/apm/server/7.3/configuration-logging.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.3/configuration-logging.html | |
| @@ -344,7 +344,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_to_stderr_literal"> | |
| + <a id="_logging_to_stderr"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_stderr | |
| @@ -361,7 +361,7 @@ | |
| command line option. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_to_syslog_literal"> | |
| + <a id="_logging_to_syslog"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_syslog | |
| @@ -384,7 +384,7 @@ | |
| </div> | |
| </div> | |
| <h4> | |
| - <a id="_literal_logging_to_eventlog_literal"> | |
| + <a id="_logging_to_eventlog"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_eventlog | |
| @@ -397,7 +397,7 @@ | |
| When true, writes all logging output to the Windows Event Log. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_to_files_literal"> | |
| + <a id="_logging_to_files"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_files | |
| @@ -550,7 +550,7 @@ | |
| also sets the debug log level). | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_metrics_enabled_literal"> | |
| + <a id="_logging_metrics_enabled"> | |
| </a> | |
| <code class="literal"> | |
| logging.metrics.enabled | |
| @@ -572,7 +572,7 @@ | |
| Note that we currently offer no backwards compatible guarantees for the internal metrics and for this reason they are also not documented. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_metrics_period_literal"> | |
| + <a id="_logging_metrics_period"> | |
| </a> | |
| <code class="literal"> | |
| logging.metrics.period | |
| @@ -585,7 +585,7 @@ | |
| The period after which to log the internal metrics. The default is 30s. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_path_literal"> | |
| + <a id="_logging_files_path"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.path | |
| @@ -602,7 +602,7 @@ | |
| section for details. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_name_literal"> | |
| + <a id="_logging_files_name"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.name | |
| @@ -621,7 +621,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_rotateeverybytes_literal"> | |
| + <a id="_logging_files_rotateeverybytes"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.rotateeverybytes | |
| @@ -634,7 +634,7 @@ | |
| The maximum size of a log file. If the limit is reached, a new log file is generated. The default size limit is 10485760 (10 MB). | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_keepfiles_literal"> | |
| + <a id="_logging_files_keepfiles"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.keepfiles | |
| @@ -651,7 +651,7 @@ | |
| options has to be in the range of 2 to 1024 files. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_permissions_literal"> | |
| + <a id="_logging_files_permissions"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.permissions | |
| @@ -690,7 +690,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_logging_files_interval_literal"> | |
| + <a id="_logging_files_interval"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.interval | |
| @@ -703,7 +703,7 @@ | |
| Enable log file rotation on time intervals in addition to size-based rotation. Intervals must be at least 1s. Values of 1m, 1h, 24h, 7*24h, 30*24h, and 365*24h are boundary-aligned with minutes, hours, days, weeks, months, and years as reported by the local system clock. All other intervals are calculated from the unix epoch. Defaults to disabled. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_rotateonstartup_literal"> | |
| + <a id="_logging_files_rotateonstartup"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.rotateonstartup | |
| @@ -716,7 +716,7 @@ | |
| If the log file already exists on startup, immediately rotate it and start writing to a new file instead of appending to the existing one. Defaults to true. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_json_literal"> | |
| + <a id="_logging_json"> | |
| </a> | |
| <code class="literal"> | |
| logging.json | |
| @@ -729,7 +729,7 @@ | |
| When true, logs messages in JSON format. The default is false. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_redirect_stderr_literal_phrase_role_experimental_phrase"> | |
| + <a id="_logging_files_redirect_stderr"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.redirect_stderr | |
| @@ -796,17 +796,17 @@ | |
| </p> | |
| <p> | |
| <code class="literal"> | |
| - 2017-12-17T18:54:16.241-0500 INFO logp/core_test.go:13 unnamed global logger | |
| - </code> | |
| - </p> | |
| - <p> | |
| - <code class="literal"> | |
| - 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:16 some message | |
| - </code> | |
| - </p> | |
| - <p> | |
| - <code class="literal"> | |
| - 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:19 some message {"x": 1} | |
| + 2017-12-17T18:54:16.241-0500 INFO logp/core_test.go:13 unnamed global logger | |
| + </code> | |
| + </p> | |
| + <p> | |
| + <code class="literal"> | |
| + 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:16 some message | |
| + </code> | |
| + </p> | |
| + <p> | |
| + <code class="literal"> | |
| + 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:19 some message {"x": 1} | |
| </code> | |
| </p> | |
| </div> | |
| html/en/apm/server/7.3/configuration-monitor.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.3/configuration-monitor.html | |
| @@ -299,7 +299,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_enabled_literal_7"> | |
| + <a id="_enabled_7"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -335,7 +335,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_elasticsearch_literal"> | |
| + <a id="_elasticsearch"> | |
| </a> | |
| <code class="literal"> | |
| elasticsearch | |
| @@ -356,7 +356,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_bulk_max_size_literal_5"> | |
| + <a id="_bulk_max_size_5"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -385,7 +385,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_backoff_init_literal_3"> | |
| + <a id="_backoff_init_3"> | |
| </a> | |
| <code class="literal"> | |
| backoff.init | |
| @@ -414,7 +414,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_backoff_max_literal_3"> | |
| + <a id="_backoff_max_3"> | |
| </a> | |
| <code class="literal"> | |
| backoff.max | |
| @@ -435,7 +435,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_compression_level_literal_4"> | |
| + <a id="_compression_level_4"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -472,7 +472,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_headers_literal_2"> | |
| + <a id="_headers_2"> | |
| </a> | |
| <code class="literal"> | |
| headers | |
| @@ -497,7 +497,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_hosts_literal_2"> | |
| + <a id="_hosts_2"> | |
| </a> | |
| <code class="literal"> | |
| hosts | |
| @@ -522,7 +522,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_max_retries_literal_4"> | |
| + <a id="_max_retries_4"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -551,7 +551,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_parameters_literal_2"> | |
| + <a id="_parameters_2"> | |
| </a> | |
| <code class="literal"> | |
| parameters | |
| @@ -572,7 +572,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_password_literal_3"> | |
| + <a id="_password_3"> | |
| </a> | |
| <code class="literal"> | |
| password | |
| @@ -593,7 +593,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_metrics_period_literal"> | |
| + <a id="_metrics_period"> | |
| </a> | |
| <code class="literal"> | |
| metrics.period | |
| @@ -614,7 +614,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_state_period_literal"> | |
| + <a id="_state_period"> | |
| </a> | |
| <code class="literal"> | |
| state.period | |
| @@ -635,7 +635,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_protocol_literal"> | |
| + <a id="_protocol"> | |
| </a> | |
| <code class="literal"> | |
| protocol | |
| @@ -672,7 +672,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_proxy_url_literal_3"> | |
| + <a id="_proxy_url_3"> | |
| </a> | |
| <code class="literal"> | |
| proxy_url | |
| @@ -697,7 +697,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_timeout_literal_4"> | |
| + <a id="_timeout_4"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -722,7 +722,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_ssl_literal_4"> | |
| + <a id="_ssl_4"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| @@ -753,7 +753,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_username_literal_3"> | |
| + <a id="_username_3"> | |
| </a> | |
| <code class="literal"> | |
| username | |
| html/en/apm/server/7.3/configuration-output-codec.html | |
| html/en/apm/server/7.3/configuration-path.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.3/configuration-path.html | |
| @@ -322,7 +322,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_home_literal"> | |
| + <a id="_home"> | |
| </a> | |
| <code class="literal"> | |
| home | |
| @@ -341,7 +341,7 @@ | |
| <pre class="programlisting prettyprint lang-yaml">path.home: /usr/share/beats</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_config_literal"> | |
| + <a id="_config"> | |
| </a> | |
| <code class="literal"> | |
| config | |
| @@ -360,7 +360,7 @@ | |
| <pre class="programlisting prettyprint lang-yaml">path.config: /usr/share/beats/config</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_data_literal"> | |
| + <a id="_data"> | |
| </a> | |
| <code class="literal"> | |
| data | |
| @@ -397,7 +397,7 @@ | |
| </div> | |
| </div> | |
| <h4> | |
| - <a id="_literal_logs_literal"> | |
| + <a id="_logs"> | |
| </a> | |
| <code class="literal"> | |
| logs | |
| html/en/apm/server/7.3/configuration-process.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.3/configuration-process.html | |
| @@ -531,7 +531,7 @@ | |
| Overwrites the existing APM pipeline definition in Elasticsearch. Defaults to true. | |
| </p> | |
| <h3> | |
| - <a id="_configuration_options_literal_queue_mem_literal"> | |
| + <a id="_configuration_options_queue_mem"> | |
| </a> | |
| Configuration options: | |
| <code class="literal"> | |
| @@ -596,7 +596,7 @@ | |
| . Default value is 1 second. | |
| </p> | |
| <h3> | |
| - <a id="_configuration_options_literal_max_procs_literal"> | |
| + <a id="_configuration_options_max_procs"> | |
| </a> | |
| Configuration options: | |
| <code class="literal"> | |
| html/en/apm/server/7.3/configuration-rum-general.html | |
| html/en/apm/server/7.3/configuration-rum-v1.html | |
| html/en/apm/server/7.3/configuration-rum-v2.html | |
| html/en/apm/server/7.3/configuration-rum.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.3/configuration-rum.html | |
| @@ -335,7 +335,7 @@ | |
| Defines the maximum amount of events allowed to be sent to the APM Server RUM endpoint per ip per second. Defaults to 300. | |
| </p> | |
| <h4> | |
| - <a id="_literal_event_rate_lru_size_literal"> | |
| + <a id="_event_rate_lru_size"> | |
| </a> | |
| <code class="literal"> | |
| event_rate.lru_size | |
| @@ -410,7 +410,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_exclude_from_grouping_literal"> | |
| + <a id="_exclude_from_grouping"> | |
| </a> | |
| <code class="literal"> | |
| exclude_from_grouping | |
| @@ -465,7 +465,7 @@ | |
| is automatically applied to documents sent to the RUM endpoint. Source maps are fetched from Elasticsearch and then kept in an in-memory cache for the configured time. Values configured without a time unit are treated as seconds. Default value is 5 minutes. | |
| </p> | |
| <h4> | |
| - <a id="_literal_source_mapping_index_pattern_literal"> | |
| + <a id="_source_mapping_index_pattern"> | |
| </a> | |
| <code class="literal"> | |
| source_mapping.index_pattern | |
| html/en/apm/server/7.3/configuration-ssl.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.3/configuration-ssl.html | |
| @@ -323,7 +323,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_enabled_literal_6"> | |
| + <a id="_enabled_6"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -370,7 +370,7 @@ | |
| </div> | |
| </div> | |
| <h4> | |
| - <a id="_literal_certificate_authorities_literal"> | |
| + <a id="_certificate_authorities"> | |
| </a> | |
| <code class="literal"> | |
| certificate_authorities | |
| @@ -428,7 +428,7 @@ | |
| is specified. | |
| </p> | |
| <h4> | |
| - <a id="_literal_key_passphrase_literal"> | |
| + <a id="_key_passphrase"> | |
| </a> | |
| <code class="literal"> | |
| key_passphrase | |
| @@ -445,7 +445,7 @@ | |
| file. | |
| </p> | |
| <h4> | |
| - <a id="_literal_supported_protocols_literal"> | |
| + <a id="_supported_protocols"> | |
| </a> | |
| <code class="literal"> | |
| supported_protocols | |
| @@ -485,7 +485,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_verification_mode_literal"> | |
| + <a id="_verification_mode"> | |
| </a> | |
| <code class="literal"> | |
| verification_mode | |
| @@ -521,7 +521,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_cipher_suites_literal"> | |
| + <a id="_cipher_suites"> | |
| </a> | |
| <code class="literal"> | |
| cipher_suites | |
| @@ -641,7 +641,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_curve_types_literal"> | |
| + <a id="_curve_types"> | |
| </a> | |
| <code class="literal"> | |
| curve_types | |
| @@ -673,7 +673,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_renegotiation_literal"> | |
| + <a id="_renegotiation"> | |
| </a> | |
| <code class="literal"> | |
| renegotiation | |
| html/en/apm/server/7.3/configuration-template.html | |
| html/en/apm/server/7.3/configuration-v1-api.html | |
| html/en/apm/server/7.3/configuration-v2-api.html | |
| html/en/apm/server/7.3/configure-cloud-id.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.3/configure-cloud-id.html | |
| @@ -325,7 +325,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_cloud_id_literal"> | |
| + <a id="_cloud_id"> | |
| </a> | |
| <code class="literal"> | |
| cloud.id | |
| @@ -354,7 +354,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_cloud_auth_literal"> | |
| + <a id="_cloud_auth"> | |
| </a> | |
| <code class="literal"> | |
| cloud.auth | |
| html/en/apm/server/7.3/configuring-howto-apm-server.html | |
| html/en/apm/server/7.3/configuring-ingest-node.html | |
| html/en/apm/server/7.3/configuring-output.html | |
| html/en/apm/server/7.3/configuring-ssl-logstash.html | |
| html/en/apm/server/7.3/console-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.3/console-output.html | |
| @@ -316,7 +316,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_pretty_literal"> | |
| + <a id="_pretty"> | |
| </a> | |
| <code class="literal"> | |
| pretty | |
| @@ -341,7 +341,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_codec_literal_3"> | |
| + <a id="_codec_3"> | |
| </a> | |
| <code class="literal"> | |
| codec | |
| @@ -377,7 +377,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_5"> | |
| + <a id="_enabled_5"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -401,7 +401,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal_4"> | |
| + <a id="_bulk_max_size_4"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| html/en/apm/server/7.3/directory-layout.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.3/directory-layout.html | |
| @@ -316,10 +316,6 @@ | |
| </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| - <p> | |
| - <code class="literal"> | |
| - </code> | |
| - </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| <p> | |
| @@ -352,10 +348,6 @@ | |
| </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| - <p> | |
| - <code class="literal"> | |
| - </code> | |
| - </p> | |
| </td> | |
| </tr> | |
| <tr> | |
| html/en/apm/server/7.3/elasticsearch-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.3/elasticsearch-output.html | |
| @@ -390,7 +390,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal"> | |
| + <a id="_enabled"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -514,7 +514,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_level_literal"> | |
| + <a id="_compression_level"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -541,7 +541,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_escape_html_literal"> | |
| + <a id="_escape_html"> | |
| </a> | |
| <code class="literal"> | |
| escape_html | |
| @@ -573,7 +573,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_worker_literal"> | |
| + <a id="_worker"> | |
| </a> | |
| <code class="literal"> | |
| worker | |
| @@ -597,7 +597,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_username_literal"> | |
| + <a id="_username"> | |
| </a> | |
| <code class="literal"> | |
| username | |
| @@ -618,7 +618,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_password_literal"> | |
| + <a id="_password"> | |
| </a> | |
| <code class="literal"> | |
| password | |
| @@ -639,7 +639,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_parameters_literal"> | |
| + <a id="_parameters"> | |
| </a> | |
| <code class="literal"> | |
| parameters | |
| @@ -724,7 +724,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_headers_literal"> | |
| + <a id="_headers"> | |
| </a> | |
| <code class="literal"> | |
| headers | |
| @@ -752,7 +752,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_proxy_url_literal"> | |
| + <a id="_proxy_url"> | |
| </a> | |
| <code class="literal"> | |
| proxy_url | |
| @@ -791,6 +791,10 @@ | |
| </div> | |
| <p> | |
| The index name to write events to. The default is | |
| + <code class="literal"> | |
| + "apm-%{[observer.version]}-{type}-%{+yyyy.MM.dd}" | |
| + </code> | |
| + (for example, | |
| <code class="literal"> | |
| "apm-7.3.1-transaction-2019-08-28" | |
| </code> | |
| @@ -1070,7 +1074,11 @@ | |
| </div> | |
| </div> | |
| <p> | |
| - This is the default configuration for APM Server and results in indices For example: | |
| + This is the default configuration for APM Server and results in indices named in the following format: | |
| + <code class="literal"> | |
| + "apm-%{[observer.version]}-{type}-%{+yyyy.MM.dd}" | |
| + </code> | |
| + For example: | |
| <code class="literal"> | |
| "apm-7.3.1-transaction-2019-08-28" | |
| </code> | |
| @@ -1427,7 +1435,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_max_retries_literal"> | |
| + <a id="_max_retries"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -1458,7 +1466,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal"> | |
| + <a id="_bulk_max_size"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -1496,7 +1504,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_init_literal"> | |
| + <a id="_backoff_init"> | |
| </a> | |
| <code class="literal"> | |
| backoff.init | |
| @@ -1525,7 +1533,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_max_literal"> | |
| + <a id="_backoff_max"> | |
| </a> | |
| <code class="literal"> | |
| backoff.max | |
| @@ -1546,7 +1554,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_timeout_literal"> | |
| + <a id="_timeout"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -1567,7 +1575,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ssl_literal"> | |
| + <a id="_ssl"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| html/en/apm/server/7.3/enable-apm-server-debugging.html | |
| html/en/apm/server/7.3/error-api-examples.html | |
| html/en/apm/server/7.3/error-api.html | |
| html/en/apm/server/7.3/error-context-schema.html | |
| html/en/apm/server/7.3/error-endpoint.html | |
| html/en/apm/server/7.3/error-indices.html | |
| html/en/apm/server/7.3/error-payload-schema.html | |
| html/en/apm/server/7.3/error-schema-definition.html | |
| html/en/apm/server/7.3/error-service-schema.html | |
| html/en/apm/server/7.3/error-stacktraceframe-schema.html | |
| html/en/apm/server/7.3/error-system-schema.html | |
| html/en/apm/server/7.3/errors.html | |
| html/en/apm/server/7.3/event-types.html | |
| html/en/apm/server/7.3/events-api.html | |
| html/en/apm/server/7.3/example-intake-events.html | |
| html/en/apm/server/7.3/example-intakev2-events.html | |
| html/en/apm/server/7.3/exploring-es-data.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.3/exploring-es-data.html | |
| @@ -305,8 +305,8 @@ | |
| <p> | |
| To get an overview of existing indices you can run: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET _cat/indices/apm*</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET _cat/indices/apm*</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| @@ -363,16 +363,16 @@ | |
| <p> | |
| To query all documents collected with a specific APM Server version: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET apm-7.3.1-*/_search</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET apm-7.3.1-*/_search</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| <p> | |
| To query a specific type, for example transactions: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET apm-*transactions-*/_search</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET apm-*transactions-*/_search</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| @@ -391,16 +391,16 @@ | |
| </span> | |
| of the Elastic APM indices, first, run a query to find template names: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET _cat/templates/apm*</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET _cat/templates/apm*</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| <p> | |
| Then you can retrieve the specific template you are interested in: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET /_template/your-template-name</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET /_template/your-template-name</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| html/en/apm/server/7.3/exported-fields-apm-error.html | |
| html/en/apm/server/7.3/exported-fields-apm-sourcemap.html | |
| html/en/apm/server/7.3/exported-fields-apm-span.html | |
| html/en/apm/server/7.3/exported-fields-apm-transaction.html | |
| html/en/apm/server/7.3/exported-fields-apm.html | |
| html/en/apm/server/7.3/exported-fields-beat-common.html | |
| html/en/apm/server/7.3/exported-fields-cloud.html | |
| html/en/apm/server/7.3/exported-fields-docker-processor.html | |
| html/en/apm/server/7.3/exported-fields-ecs.html | |
| html/en/apm/server/7.3/exported-fields-host-processor.html | |
| html/en/apm/server/7.3/exported-fields-kubernetes-processor.html | |
| html/en/apm/server/7.3/exported-fields-process.html | |
| html/en/apm/server/7.3/exported-fields-system.html | |
| html/en/apm/server/7.3/exported-fields.html | |
| html/en/apm/server/7.3/feature-roles.html | |
| html/en/apm/server/7.3/file-option.html | |
| html/en/apm/server/7.3/file-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.3/file-output.html | |
| @@ -320,7 +320,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_4"> | |
| + <a id="_enabled_4"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -365,7 +365,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_filename_literal"> | |
| + <a id="_filename"> | |
| </a> | |
| <code class="literal"> | |
| filename | |
| @@ -386,7 +386,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_rotate_every_kb_literal"> | |
| + <a id="_rotate_every_kb"> | |
| </a> | |
| <code class="literal"> | |
| rotate_every_kb | |
| @@ -407,7 +407,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_number_of_files_literal"> | |
| + <a id="_number_of_files"> | |
| </a> | |
| <code class="literal"> | |
| number_of_files | |
| @@ -434,7 +434,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_permissions_literal"> | |
| + <a id="_permissions"> | |
| </a> | |
| <code class="literal"> | |
| permissions | |
| @@ -455,7 +455,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_codec_literal_2"> | |
| + <a id="_codec_2"> | |
| </a> | |
| <code class="literal"> | |
| codec | |
| html/en/apm/server/7.3/getting-help.html | |
| html/en/apm/server/7.3/high-availability.html | |
| html/en/apm/server/7.3/ilm-default.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.3/ilm-default.html | |
| @@ -445,7 +445,7 @@ | |
| </div> | |
| </div> | |
| <h5> | |
| - <a id="_literal_ilm_enabled_auto_literal"> | |
| + <a id="_ilm_enabled_auto"> | |
| </a> | |
| <code class="literal"> | |
| ilm.enabled: "auto" | |
| @@ -503,7 +503,7 @@ | |
| If all three of the above conditions are true, ILM will be enabled. | |
| </p> | |
| <h5> | |
| - <a id="_literal_ilm_enabled_true_literal"> | |
| + <a id="_ilm_enabled_true"> | |
| </a> | |
| <code class="literal"> | |
| ilm.enabled: true | |
| @@ -524,7 +524,7 @@ | |
| . When this happens, the APM Server ignores any configured index settings. The configured output must still be set to Elasticsearch and the instance still needs to support ILM. If not, APM Server falls back to ordinary index management without ILM, and an error is logged. | |
| </p> | |
| <h5> | |
| - <a id="_literal_ilm_enabled_false_literal"> | |
| + <a id="_ilm_enabled_false"> | |
| </a> | |
| <code class="literal"> | |
| ilm.enabled: false | |
| html/en/apm/server/7.3/ilm.html | |
| html/en/apm/server/7.3/index.html | |
| html/en/apm/server/7.3/installing-on-windows.html | |
| html/en/apm/server/7.3/installing.html | |
| html/en/apm/server/7.3/intake-api.html | |
| html/en/apm/server/7.3/kafka-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.3/kafka-output.html | |
| @@ -370,7 +370,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_3"> | |
| + <a id="_enabled_3"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -398,7 +398,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_hosts_literal"> | |
| + <a id="_hosts"> | |
| </a> | |
| <code class="literal"> | |
| hosts | |
| @@ -419,7 +419,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_version_literal"> | |
| + <a id="_version"> | |
| </a> | |
| <code class="literal"> | |
| version | |
| @@ -461,7 +461,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_username_literal_2"> | |
| + <a id="_username_2"> | |
| </a> | |
| <code class="literal"> | |
| username | |
| @@ -482,7 +482,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_password_literal_2"> | |
| + <a id="_password_2"> | |
| </a> | |
| <code class="literal"> | |
| password | |
| @@ -703,7 +703,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_key_literal"> | |
| + <a id="_key"> | |
| </a> | |
| <code class="literal"> | |
| key | |
| @@ -724,7 +724,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_partition_literal"> | |
| + <a id="_partition"> | |
| </a> | |
| <code class="literal"> | |
| partition | |
| @@ -830,7 +830,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_client_id_literal"> | |
| + <a id="_client_id"> | |
| </a> | |
| <code class="literal"> | |
| client_id | |
| @@ -851,7 +851,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_worker_literal_3"> | |
| + <a id="_worker_3"> | |
| </a> | |
| <code class="literal"> | |
| worker | |
| @@ -872,7 +872,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_codec_literal"> | |
| + <a id="_codec"> | |
| </a> | |
| <code class="literal"> | |
| codec | |
| @@ -904,7 +904,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_metadata_literal"> | |
| + <a id="_metadata"> | |
| </a> | |
| <code class="literal"> | |
| metadata | |
| @@ -993,7 +993,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_max_retries_literal_3"> | |
| + <a id="_max_retries_3"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -1024,7 +1024,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal_3"> | |
| + <a id="_bulk_max_size_3"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -1045,7 +1045,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_flush_frequency_literal"> | |
| + <a id="_bulk_flush_frequency"> | |
| </a> | |
| <code class="literal"> | |
| bulk_flush_frequency | |
| @@ -1066,7 +1066,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_timeout_literal_3"> | |
| + <a id="_timeout_3"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -1087,7 +1087,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_broker_timeout_literal"> | |
| + <a id="_broker_timeout"> | |
| </a> | |
| <code class="literal"> | |
| broker_timeout | |
| @@ -1108,7 +1108,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_channel_buffer_size_literal"> | |
| + <a id="_channel_buffer_size"> | |
| </a> | |
| <code class="literal"> | |
| channel_buffer_size | |
| @@ -1129,7 +1129,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_keep_alive_literal"> | |
| + <a id="_keep_alive"> | |
| </a> | |
| <code class="literal"> | |
| keep_alive | |
| @@ -1150,7 +1150,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_literal"> | |
| + <a id="_compression"> | |
| </a> | |
| <code class="literal"> | |
| compression | |
| @@ -1191,7 +1191,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_level_literal_3"> | |
| + <a id="_compression_level_3"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -1243,7 +1243,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_required_acks_literal"> | |
| + <a id="_required_acks"> | |
| </a> | |
| <code class="literal"> | |
| required_acks | |
| @@ -1267,7 +1267,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ssl_literal_3"> | |
| + <a id="_ssl_3"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| html/en/apm/server/7.3/keystore.html | |
| html/en/apm/server/7.3/linux-seccomp.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.3/linux-seccomp.html | |
| @@ -462,6 +462,12 @@ | |
| <dd> | |
| A list of system call names. The system call name must exist for the runtime architecture, otherwise an error will be logged and the filter will not be installed. At least one system call must be defined. | |
| </dd> | |
| + </dl> | |
| + </div> | |
| + <div class="variablelist"> | |
| + <a id="seccomp-policy-config-action"> | |
| + </a> | |
| + <dl class="variablelist"> | |
| <dt> | |
| <span class="term"> | |
| <span class="strong strong"> | |
| @@ -482,8 +488,6 @@ | |
| is executed. This is required. These are the available action values. The actions that are available depend on the kernel version. | |
| </p> | |
| <div class="itemizedlist"> | |
| - <a id="seccomp-policy-config-action"> | |
| - </a> | |
| <ul class="itemizedlist" type="disc"> | |
| <li class="listitem"> | |
| <code class="literal"> | |
| html/en/apm/server/7.3/load-dashboards-logstash.html | |
| html/en/apm/server/7.3/load-kibana-dashboards.html | |
| html/en/apm/server/7.3/logstash-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.3/logstash-output.html | |
| @@ -286,6 +286,9 @@ | |
| <img alt="Important" src="images/icons/important.png"/> | |
| </div> | |
| <div class="admon_content"> | |
| + <h3> | |
| + Prerequisite | |
| + </h3> | |
| <p> | |
| To send events to Logstash, you also need to create a Logstash configuration pipeline that listens for incoming Beats connections and indexes the received events into Elasticsearch. For more information, see the section about | |
| <a class="ulink" href="https://www.elastic.co/guide/en/elastic-stack-get-started/7.3/get-started-elastic-stack.html#logstash-setup" target="_top"> | |
| @@ -624,7 +627,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_2"> | |
| + <a id="_enabled_2"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -672,7 +675,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_level_literal_2"> | |
| + <a id="_compression_level_2"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -699,7 +702,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_escape_html_literal_2"> | |
| + <a id="_escape_html_2"> | |
| </a> | |
| <code class="literal"> | |
| escape_html | |
| @@ -731,7 +734,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_worker_literal_2"> | |
| + <a id="_worker_2"> | |
| </a> | |
| <code class="literal"> | |
| worker | |
| @@ -779,7 +782,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ttl_literal"> | |
| + <a id="_ttl"> | |
| </a> | |
| <code class="literal"> | |
| ttl | |
| @@ -813,7 +816,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_pipelining_literal"> | |
| + <a id="_pipelining"> | |
| </a> | |
| <code class="literal"> | |
| pipelining | |
| @@ -838,7 +841,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_proxy_url_literal_2"> | |
| + <a id="_proxy_url_2"> | |
| </a> | |
| <code class="literal"> | |
| proxy_url | |
| @@ -938,7 +941,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ssl_literal_2"> | |
| + <a id="_ssl_2"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| @@ -969,7 +972,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_timeout_literal_2"> | |
| + <a id="_timeout_2"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -990,7 +993,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_max_retries_literal_2"> | |
| + <a id="_max_retries_2"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -1021,7 +1024,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal_2"> | |
| + <a id="_bulk_max_size_2"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -1059,7 +1062,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_slow_start_literal"> | |
| + <a id="_slow_start"> | |
| </a> | |
| <code class="literal"> | |
| slow_start | |
| @@ -1091,7 +1094,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_init_literal_2"> | |
| + <a id="_backoff_init_2"> | |
| </a> | |
| <code class="literal"> | |
| backoff.init | |
| @@ -1120,7 +1123,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_max_literal_2"> | |
| + <a id="_backoff_max_2"> | |
| </a> | |
| <code class="literal"> | |
| backoff.max | |
| html/en/apm/server/7.3/manage-indices-kibana.html | |
| html/en/apm/server/7.3/manual-ilm-setup.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.3/manual-ilm-setup.html | |
| @@ -702,8 +702,8 @@ | |
| </code> | |
| overwrites defaults rather than being merged. This means you’ll need to configure all of your indices in the file, even if some are not using ILM. | |
| </p> | |
| - <div class="pre_wrapper lang-yml"> | |
| - <pre class="programlisting prettyprint lang-yml">output.elasticsearch: | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">output.elasticsearch: | |
| indices: | |
| - index: "apm-7.3.1-sourcemap" | |
| when.contains: | |
| html/en/apm/server/7.3/max_request_queue_time.html | |
| html/en/apm/server/7.3/max_unzipped_size.html | |
| html/en/apm/server/7.3/metadata-api.html | |
| html/en/apm/server/7.3/metrics.enabled.html | |
| html/en/apm/server/7.3/metricset-api.html | |
| html/en/apm/server/7.3/metricset-indices.html | |
| html/en/apm/server/7.3/monitoring-internal-collection.html | |
| html/en/apm/server/7.3/monitoring-metricbeat-collection.html | |
| html/en/apm/server/7.3/monitoring.html | |
| html/en/apm/server/7.3/overview.html | |
| html/en/apm/server/7.3/payload-with-error.html | |
| html/en/apm/server/7.3/payload-with-minimal-exception.html | |
| html/en/apm/server/7.3/payload-with-minimal-log.html | |
| html/en/apm/server/7.3/payload-with-minimal-span.html | |
| html/en/apm/server/7.3/payload-with-minimal-transaction.html | |
| html/en/apm/server/7.3/payload-with-transactions.html | |
| html/en/apm/server/7.3/processing-performance.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.3/processing-performance.html | |
| @@ -418,11 +418,7 @@ | |
| </table> | |
| </div> | |
| <p> | |
| - In other words, a 512 Mb instance can process | |
| - <sub> | |
| - 3 Mbs per second, while an 8 Gb instance can process | |
| - </sub> | |
| - 20 Mbs per second. | |
| + In other words, a 512 Mb instance can process ~3 Mbs per second, while an 8 Gb instance can process ~20 Mbs per second. | |
| </p> | |
| <p> | |
| APM Server is CPU bound, so it scales better from 2 Gb to 8 Gb than it does from 512 Mb to 2 Gb. This is because larger instance types in Elastic Cloud come with much more computing power. | |
| html/en/apm/server/7.3/rate_limit_v1.html | |
| html/en/apm/server/7.3/redirects.html | |
| html/en/apm/server/7.3/reduce-storage.html | |
| html/en/apm/server/7.3/release-notes-6.1.0.html | |
| html/en/apm/server/7.3/release-notes-6.1.1.html | |
| html/en/apm/server/7.3/release-notes-6.1.2.html | |
| html/en/apm/server/7.3/release-notes-6.1.3.html | |
| html/en/apm/server/7.3/release-notes-6.1.4.html | |
| html/en/apm/server/7.3/release-notes-6.1.html | |
| html/en/apm/server/7.3/release-notes-6.2.0.html | |
| html/en/apm/server/7.3/release-notes-6.2.1.html | |
| html/en/apm/server/7.3/release-notes-6.2.2.html | |
| html/en/apm/server/7.3/release-notes-6.2.3.html | |
| html/en/apm/server/7.3/release-notes-6.2.4.html | |
| html/en/apm/server/7.3/release-notes-6.2.html | |
| html/en/apm/server/7.3/release-notes-6.3.0.html | |
| html/en/apm/server/7.3/release-notes-6.3.1.html | |
| html/en/apm/server/7.3/release-notes-6.3.2.html | |
| html/en/apm/server/7.3/release-notes-6.3.html | |
| html/en/apm/server/7.3/release-notes-6.4.0.html | |
| html/en/apm/server/7.3/release-notes-6.4.1.html | |
| html/en/apm/server/7.3/release-notes-6.4.2.html | |
| html/en/apm/server/7.3/release-notes-6.4.3.html | |
| html/en/apm/server/7.3/release-notes-6.4.html | |
| html/en/apm/server/7.3/release-notes-6.5.0.html | |
| html/en/apm/server/7.3/release-notes-6.5.1.html | |
| html/en/apm/server/7.3/release-notes-6.5.2.html | |
| html/en/apm/server/7.3/release-notes-6.5.3.html | |
| html/en/apm/server/7.3/release-notes-6.5.4.html | |
| html/en/apm/server/7.3/release-notes-6.5.html | |
| html/en/apm/server/7.3/release-notes-6.6.0.html | |
| html/en/apm/server/7.3/release-notes-6.6.1.html | |
| html/en/apm/server/7.3/release-notes-6.6.2.html | |
| html/en/apm/server/7.3/release-notes-6.6.html | |
| html/en/apm/server/7.3/release-notes-6.7.0.html | |
| html/en/apm/server/7.3/release-notes-6.7.1.html | |
| html/en/apm/server/7.3/release-notes-6.7.2.html | |
| html/en/apm/server/7.3/release-notes-6.7.html | |
| html/en/apm/server/7.3/release-notes-6.8.0.html | |
| html/en/apm/server/7.3/release-notes-6.8.html | |
| html/en/apm/server/7.3/release-notes-7.0.0-alpha1.html | |
| html/en/apm/server/7.3/release-notes-7.0.0-alpha2.html | |
| html/en/apm/server/7.3/release-notes-7.0.0-beta1.html | |
| html/en/apm/server/7.3/release-notes-7.0.0-rc1.html | |
| html/en/apm/server/7.3/release-notes-7.0.0-rc2.html | |
| html/en/apm/server/7.3/release-notes-7.0.0.html | |
| html/en/apm/server/7.3/release-notes-7.0.1.html | |
| html/en/apm/server/7.3/release-notes-7.0.html | |
| html/en/apm/server/7.3/release-notes-7.1.0.html | |
| html/en/apm/server/7.3/release-notes-7.1.1.html | |
| html/en/apm/server/7.3/release-notes-7.1.html | |
| html/en/apm/server/7.3/release-notes-7.2.0.html | |
| html/en/apm/server/7.3/release-notes-7.2.1.html | |
| html/en/apm/server/7.3/release-notes-7.2.html | |
| html/en/apm/server/7.3/release-notes-7.3.0.html | |
| html/en/apm/server/7.3/release-notes-7.3.1.html | |
| html/en/apm/server/7.3/release-notes-7.3.html | |
| html/en/apm/server/7.3/release-notes.html | |
| html/en/apm/server/7.3/request-too-large.html | |
| html/en/apm/server/7.3/rum.html | |
| html/en/apm/server/7.3/running-on-docker.html | |
| html/en/apm/server/7.3/running-with-systemd.html | |
| html/en/apm/server/7.3/securing-apm-server.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.3/securing-apm-server.html | |
| @@ -308,7 +308,7 @@ | |
| <a id="security-overview"> | |
| </a> | |
| Security Overview | |
| - <a class="edit_me" href="https://github.com/elastic/apm-server/edit/7.3/docs/security.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| + <a class="edit_me" href="https://github.com/elastic/apm-server/edit/7.3/docs/copied-from-beats/shared-securing-beat.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| edit | |
| </a> | |
| </h3> | |
| @@ -319,7 +319,7 @@ | |
| <a id="secret-token"> | |
| </a> | |
| Secret token | |
| - <a class="edit_me" href="https://github.com/elastic/apm-server/edit/7.3/docs/security.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| + <a class="edit_me" href="https://github.com/elastic/apm-server/edit/7.3/docs/copied-from-beats/shared-securing-beat.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| edit | |
| </a> | |
| </h4> | |
| @@ -340,7 +340,7 @@ | |
| <a id="ssl-setup"> | |
| </a> | |
| SSL/TLS setup | |
| - <a class="edit_me" href="https://github.com/elastic/apm-server/edit/7.3/docs/security.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| + <a class="edit_me" href="https://github.com/elastic/apm-server/edit/7.3/docs/copied-from-beats/shared-securing-beat.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| edit | |
| </a> | |
| </h4> | |
| html/en/apm/server/7.3/securing-beats.html | |
| html/en/apm/server/7.3/securing-communication-elasticsearch.html | |
| html/en/apm/server/7.3/server-info.html | |
| html/en/apm/server/7.3/setting-up-and-running.html | |
| html/en/apm/server/7.3/setup-kibana-endpoint.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.3/setup-kibana-endpoint.html | |
| @@ -358,7 +358,7 @@ | |
| to use APM Agent configuration. | |
| </p> | |
| <h4> | |
| - <a id="_literal_apm_server_kibana_host_literal"> | |
| + <a id="_apm_server_kibana_host"> | |
| </a> | |
| <code class="literal"> | |
| apm-server.kibana.host | |
| @@ -481,7 +481,7 @@ | |
| apm-server.kibana.path: /kibana</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_apm_server_kibana_username_literal"> | |
| + <a id="_apm_server_kibana_username"> | |
| </a> | |
| <code class="literal"> | |
| apm-server.kibana.username | |
| @@ -498,7 +498,7 @@ | |
| specified for the Elasticsearch output. | |
| </p> | |
| <h4> | |
| - <a id="_literal_apm_server_kibana_password_literal"> | |
| + <a id="_apm_server_kibana_password"> | |
| </a> | |
| <code class="literal"> | |
| apm-server.kibana.password | |
| @@ -528,7 +528,7 @@ | |
| An HTTP path prefix that is prepended to the HTTP API calls. This is useful for the cases where Kibana listens behind an HTTP reverse proxy that exports the API under a custom prefix. | |
| </p> | |
| <h4> | |
| - <a id="_literal_apm_server_kibana_ssl_enabled_literal"> | |
| + <a id="_apm_server_kibana_ssl_enabled"> | |
| </a> | |
| <code class="literal"> | |
| apm-server.kibana.ssl.enabled | |
| @@ -583,7 +583,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_agent_config_cache_expiration_literal"> | |
| + <a id="_agent_config_cache_expiration"> | |
| </a> | |
| <code class="literal"> | |
| agent.config.cache.expiration | |
| html/en/apm/server/7.3/setup-repositories.html | |
| html/en/apm/server/7.3/sizing-guide.html | |
| html/en/apm/server/7.3/sourcemap-api.html | |
| html/en/apm/server/7.3/sourcemap-indices.html | |
| html/en/apm/server/7.3/sourcemaps.html | |
| html/en/apm/server/7.3/span-api.html | |
| html/en/apm/server/7.3/span-indices.html | |
| html/en/apm/server/7.3/storage-management.html | |
| html/en/apm/server/7.3/toc.html | |
| html/en/apm/server/7.3/transaction-api-examples.html | |
| html/en/apm/server/7.3/transaction-api.html | |
| html/en/apm/server/7.3/transaction-context-schema.html | |
| html/en/apm/server/7.3/transaction-endpoint.html | |
| html/en/apm/server/7.3/transaction-indices.html | |
| html/en/apm/server/7.3/transaction-payload-schema.html | |
| html/en/apm/server/7.3/transaction-request-schema.html | |
| html/en/apm/server/7.3/transaction-schema-definition.html | |
| html/en/apm/server/7.3/transaction-service-schema.html | |
| html/en/apm/server/7.3/transaction-span-schema.html | |
| html/en/apm/server/7.3/transaction-stacktraceframe-schema.html | |
| html/en/apm/server/7.3/transaction-system-schema.html | |
| html/en/apm/server/7.3/transaction-user-schema.html | |
| html/en/apm/server/7.3/transactions-spans.html | |
| html/en/apm/server/7.3/transactions.html | |
| html/en/apm/server/7.3/troubleshooting.html | |
| html/en/apm/server/7.3/tune-apm-server.html | |
| html/en/apm/server/7.3/tune-data-ingestion.html | |
| html/en/apm/server/7.3/tune-es.html | |
| html/en/apm/server/7.3/update-existing-data.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/7.3/update-existing-data.html | |
| @@ -293,8 +293,8 @@ | |
| <p> | |
| To rename a service, send the following request: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST /apm-*/_update_by_query | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST /apm-*/_update_by_query | |
| { | |
| "query": { | |
| "term": { | |
| html/en/apm/server/7.3/upgrading-to-65.html | |
| html/en/apm/server/7.3/upgrading-to-70.html | |
| html/en/apm/server/7.3/upgrading.html | |
| html/en/apm/server/7.3/url-option.html | |
| html/en/apm/server/7.3/use-v1-and-v2.html | |
| html/en/apm/server/7.3/using-environ-vars.html | |
| html/en/apm/server/7.3/why-separate-component.html | |
| html/en/apm/server/current/_manually_loading_template_configuration.html | |
| html/en/apm/server/current/agent-configuration-api.html | |
| html/en/apm/server/current/apm-server-configuration.html | |
| html/en/apm/server/current/beats-basic-auth.html | |
| html/en/apm/server/current/beats-system-user.html | |
| html/en/apm/server/current/beats-tls.html | |
| html/en/apm/server/current/breaking-changes.html | |
| html/en/apm/server/current/brew.html | |
| html/en/apm/server/current/command-line-options.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/current/command-line-options.html | |
| @@ -557,37 +557,41 @@ | |
| </code> | |
| . | |
| </dd> | |
| - <dt> | |
| - <span class="term"> | |
| - <span class="strong strong"> | |
| - <strong> | |
| - <code class="literal"> | |
| - ilm-policy | |
| - </code> | |
| - </strong> | |
| - </span> | |
| - </span> | |
| - </dt> | |
| - <dd> | |
| - Exports the index lifecycle management policy to stdout. You can specify the | |
| - <code class="literal"> | |
| - --es.version | |
| - </code> | |
| - and a | |
| - <code class="literal"> | |
| - --dir | |
| - </code> | |
| - to which the policy should be exported as a file rather than exporting to | |
| - <code class="literal"> | |
| - stdout | |
| - </code> | |
| - . | |
| - </dd> | |
| </dl> | |
| </div> | |
| - <p> | |
| + <div class="variablelist"> | |
| <a id="ilm-policy-subcommand"> | |
| </a> | |
| + <dl class="variablelist"> | |
| + <dt> | |
| + <span class="term"> | |
| + <span class="strong strong"> | |
| + <strong> | |
| + <code class="literal"> | |
| + ilm-policy | |
| + </code> | |
| + </strong> | |
| + </span> | |
| + </span> | |
| + </dt> | |
| + <dd> | |
| + Exports the index lifecycle management policy to stdout. You can specify the | |
| + <code class="literal"> | |
| + --es.version | |
| + </code> | |
| + and a | |
| + <code class="literal"> | |
| + --dir | |
| + </code> | |
| + to which the policy should be exported as a file rather than exporting to | |
| + <code class="literal"> | |
| + stdout | |
| + </code> | |
| + . | |
| + </dd> | |
| + </dl> | |
| + </div> | |
| + <p> | |
| <span class="strong strong"> | |
| <strong> | |
| FLAGS | |
| @@ -1270,7 +1274,17 @@ | |
| </span> | |
| </dt> | |
| <dd> | |
| - deprecated:[7.2] Sets up the index template only. It is recommended to use | |
| + <span class="Admonishment"> | |
| + [ | |
| + <span class="Admonishment-version u-mono u-strikethrough"> | |
| + 7.2 | |
| + </span> | |
| + ] | |
| + <span class="Admonishment-detail"> | |
| + Deprecated in 7.2. | |
| + </span> | |
| + </span> | |
| + Sets up the index template only. It is recommended to use | |
| <code class="literal"> | |
| --index-management | |
| </code> | |
| @@ -1288,7 +1302,17 @@ | |
| </span> | |
| </dt> | |
| <dd> | |
| - deprecated:[7.2] Sets up the index lifecycle management policy. It is recommended to use | |
| + <span class="Admonishment"> | |
| + [ | |
| + <span class="Admonishment-version u-mono u-strikethrough"> | |
| + 7.2 | |
| + </span> | |
| + ] | |
| + <span class="Admonishment-detail"> | |
| + Deprecated in 7.2. | |
| + </span> | |
| + </span> | |
| + Sets up the index lifecycle management policy. It is recommended to use | |
| <code class="literal"> | |
| --index-management | |
| </code> | |
| html/en/apm/server/current/common-problems.html | |
| html/en/apm/server/current/concurrent_requests.html | |
| html/en/apm/server/current/configuration-logging.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/current/configuration-logging.html | |
| @@ -344,7 +344,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_to_stderr_literal"> | |
| + <a id="_logging_to_stderr"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_stderr | |
| @@ -361,7 +361,7 @@ | |
| command line option. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_to_syslog_literal"> | |
| + <a id="_logging_to_syslog"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_syslog | |
| @@ -384,7 +384,7 @@ | |
| </div> | |
| </div> | |
| <h4> | |
| - <a id="_literal_logging_to_eventlog_literal"> | |
| + <a id="_logging_to_eventlog"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_eventlog | |
| @@ -397,7 +397,7 @@ | |
| When true, writes all logging output to the Windows Event Log. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_to_files_literal"> | |
| + <a id="_logging_to_files"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_files | |
| @@ -550,7 +550,7 @@ | |
| also sets the debug log level). | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_metrics_enabled_literal"> | |
| + <a id="_logging_metrics_enabled"> | |
| </a> | |
| <code class="literal"> | |
| logging.metrics.enabled | |
| @@ -572,7 +572,7 @@ | |
| Note that we currently offer no backwards compatible guarantees for the internal metrics and for this reason they are also not documented. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_metrics_period_literal"> | |
| + <a id="_logging_metrics_period"> | |
| </a> | |
| <code class="literal"> | |
| logging.metrics.period | |
| @@ -585,7 +585,7 @@ | |
| The period after which to log the internal metrics. The default is 30s. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_path_literal"> | |
| + <a id="_logging_files_path"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.path | |
| @@ -602,7 +602,7 @@ | |
| section for details. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_name_literal"> | |
| + <a id="_logging_files_name"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.name | |
| @@ -621,7 +621,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_rotateeverybytes_literal"> | |
| + <a id="_logging_files_rotateeverybytes"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.rotateeverybytes | |
| @@ -634,7 +634,7 @@ | |
| The maximum size of a log file. If the limit is reached, a new log file is generated. The default size limit is 10485760 (10 MB). | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_keepfiles_literal"> | |
| + <a id="_logging_files_keepfiles"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.keepfiles | |
| @@ -651,7 +651,7 @@ | |
| options has to be in the range of 2 to 1024 files. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_permissions_literal"> | |
| + <a id="_logging_files_permissions"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.permissions | |
| @@ -690,7 +690,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_logging_files_interval_literal"> | |
| + <a id="_logging_files_interval"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.interval | |
| @@ -703,7 +703,7 @@ | |
| Enable log file rotation on time intervals in addition to size-based rotation. Intervals must be at least 1s. Values of 1m, 1h, 24h, 7*24h, 30*24h, and 365*24h are boundary-aligned with minutes, hours, days, weeks, months, and years as reported by the local system clock. All other intervals are calculated from the unix epoch. Defaults to disabled. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_rotateonstartup_literal"> | |
| + <a id="_logging_files_rotateonstartup"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.rotateonstartup | |
| @@ -716,7 +716,7 @@ | |
| If the log file already exists on startup, immediately rotate it and start writing to a new file instead of appending to the existing one. Defaults to true. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_json_literal"> | |
| + <a id="_logging_json"> | |
| </a> | |
| <code class="literal"> | |
| logging.json | |
| @@ -729,7 +729,7 @@ | |
| When true, logs messages in JSON format. The default is false. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_redirect_stderr_literal_phrase_role_experimental_phrase"> | |
| + <a id="_logging_files_redirect_stderr"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.redirect_stderr | |
| @@ -796,17 +796,17 @@ | |
| </p> | |
| <p> | |
| <code class="literal"> | |
| - 2017-12-17T18:54:16.241-0500 INFO logp/core_test.go:13 unnamed global logger | |
| - </code> | |
| - </p> | |
| - <p> | |
| - <code class="literal"> | |
| - 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:16 some message | |
| - </code> | |
| - </p> | |
| - <p> | |
| - <code class="literal"> | |
| - 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:19 some message {"x": 1} | |
| + 2017-12-17T18:54:16.241-0500 INFO logp/core_test.go:13 unnamed global logger | |
| + </code> | |
| + </p> | |
| + <p> | |
| + <code class="literal"> | |
| + 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:16 some message | |
| + </code> | |
| + </p> | |
| + <p> | |
| + <code class="literal"> | |
| + 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:19 some message {"x": 1} | |
| </code> | |
| </p> | |
| </div> | |
| html/en/apm/server/current/configuration-monitor.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/current/configuration-monitor.html | |
| @@ -299,7 +299,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_enabled_literal_7"> | |
| + <a id="_enabled_7"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -335,7 +335,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_elasticsearch_literal"> | |
| + <a id="_elasticsearch"> | |
| </a> | |
| <code class="literal"> | |
| elasticsearch | |
| @@ -356,7 +356,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_bulk_max_size_literal_5"> | |
| + <a id="_bulk_max_size_5"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -385,7 +385,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_backoff_init_literal_3"> | |
| + <a id="_backoff_init_3"> | |
| </a> | |
| <code class="literal"> | |
| backoff.init | |
| @@ -414,7 +414,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_backoff_max_literal_3"> | |
| + <a id="_backoff_max_3"> | |
| </a> | |
| <code class="literal"> | |
| backoff.max | |
| @@ -435,7 +435,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_compression_level_literal_4"> | |
| + <a id="_compression_level_4"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -472,7 +472,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_headers_literal_2"> | |
| + <a id="_headers_2"> | |
| </a> | |
| <code class="literal"> | |
| headers | |
| @@ -497,7 +497,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_hosts_literal_2"> | |
| + <a id="_hosts_2"> | |
| </a> | |
| <code class="literal"> | |
| hosts | |
| @@ -522,7 +522,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_max_retries_literal_4"> | |
| + <a id="_max_retries_4"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -551,7 +551,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_parameters_literal_2"> | |
| + <a id="_parameters_2"> | |
| </a> | |
| <code class="literal"> | |
| parameters | |
| @@ -572,7 +572,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_password_literal_3"> | |
| + <a id="_password_3"> | |
| </a> | |
| <code class="literal"> | |
| password | |
| @@ -593,7 +593,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_metrics_period_literal"> | |
| + <a id="_metrics_period"> | |
| </a> | |
| <code class="literal"> | |
| metrics.period | |
| @@ -614,7 +614,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_state_period_literal"> | |
| + <a id="_state_period"> | |
| </a> | |
| <code class="literal"> | |
| state.period | |
| @@ -635,7 +635,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_protocol_literal"> | |
| + <a id="_protocol"> | |
| </a> | |
| <code class="literal"> | |
| protocol | |
| @@ -672,7 +672,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_proxy_url_literal_3"> | |
| + <a id="_proxy_url_3"> | |
| </a> | |
| <code class="literal"> | |
| proxy_url | |
| @@ -697,7 +697,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_timeout_literal_4"> | |
| + <a id="_timeout_4"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -722,7 +722,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_ssl_literal_4"> | |
| + <a id="_ssl_4"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| @@ -753,7 +753,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_username_literal_3"> | |
| + <a id="_username_3"> | |
| </a> | |
| <code class="literal"> | |
| username | |
| html/en/apm/server/current/configuration-output-codec.html | |
| html/en/apm/server/current/configuration-path.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/current/configuration-path.html | |
| @@ -322,7 +322,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_home_literal"> | |
| + <a id="_home"> | |
| </a> | |
| <code class="literal"> | |
| home | |
| @@ -341,7 +341,7 @@ | |
| <pre class="programlisting prettyprint lang-yaml">path.home: /usr/share/beats</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_config_literal"> | |
| + <a id="_config"> | |
| </a> | |
| <code class="literal"> | |
| config | |
| @@ -360,7 +360,7 @@ | |
| <pre class="programlisting prettyprint lang-yaml">path.config: /usr/share/beats/config</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_data_literal"> | |
| + <a id="_data"> | |
| </a> | |
| <code class="literal"> | |
| data | |
| @@ -397,7 +397,7 @@ | |
| </div> | |
| </div> | |
| <h4> | |
| - <a id="_literal_logs_literal"> | |
| + <a id="_logs"> | |
| </a> | |
| <code class="literal"> | |
| logs | |
| html/en/apm/server/current/configuration-process.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/current/configuration-process.html | |
| @@ -531,7 +531,7 @@ | |
| Overwrites the existing APM pipeline definition in Elasticsearch. Defaults to true. | |
| </p> | |
| <h3> | |
| - <a id="_configuration_options_literal_queue_mem_literal"> | |
| + <a id="_configuration_options_queue_mem"> | |
| </a> | |
| Configuration options: | |
| <code class="literal"> | |
| @@ -596,7 +596,7 @@ | |
| . Default value is 1 second. | |
| </p> | |
| <h3> | |
| - <a id="_configuration_options_literal_max_procs_literal"> | |
| + <a id="_configuration_options_max_procs"> | |
| </a> | |
| Configuration options: | |
| <code class="literal"> | |
| html/en/apm/server/current/configuration-rum-general.html | |
| html/en/apm/server/current/configuration-rum-v1.html | |
| html/en/apm/server/current/configuration-rum-v2.html | |
| html/en/apm/server/current/configuration-rum.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/current/configuration-rum.html | |
| @@ -335,7 +335,7 @@ | |
| Defines the maximum amount of events allowed to be sent to the APM Server RUM endpoint per ip per second. Defaults to 300. | |
| </p> | |
| <h4> | |
| - <a id="_literal_event_rate_lru_size_literal"> | |
| + <a id="_event_rate_lru_size"> | |
| </a> | |
| <code class="literal"> | |
| event_rate.lru_size | |
| @@ -410,7 +410,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_exclude_from_grouping_literal"> | |
| + <a id="_exclude_from_grouping"> | |
| </a> | |
| <code class="literal"> | |
| exclude_from_grouping | |
| @@ -465,7 +465,7 @@ | |
| is automatically applied to documents sent to the RUM endpoint. Source maps are fetched from Elasticsearch and then kept in an in-memory cache for the configured time. Values configured without a time unit are treated as seconds. Default value is 5 minutes. | |
| </p> | |
| <h4> | |
| - <a id="_literal_source_mapping_index_pattern_literal"> | |
| + <a id="_source_mapping_index_pattern"> | |
| </a> | |
| <code class="literal"> | |
| source_mapping.index_pattern | |
| html/en/apm/server/current/configuration-ssl.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/current/configuration-ssl.html | |
| @@ -323,7 +323,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_enabled_literal_6"> | |
| + <a id="_enabled_6"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -370,7 +370,7 @@ | |
| </div> | |
| </div> | |
| <h4> | |
| - <a id="_literal_certificate_authorities_literal"> | |
| + <a id="_certificate_authorities"> | |
| </a> | |
| <code class="literal"> | |
| certificate_authorities | |
| @@ -428,7 +428,7 @@ | |
| is specified. | |
| </p> | |
| <h4> | |
| - <a id="_literal_key_passphrase_literal"> | |
| + <a id="_key_passphrase"> | |
| </a> | |
| <code class="literal"> | |
| key_passphrase | |
| @@ -445,7 +445,7 @@ | |
| file. | |
| </p> | |
| <h4> | |
| - <a id="_literal_supported_protocols_literal"> | |
| + <a id="_supported_protocols"> | |
| </a> | |
| <code class="literal"> | |
| supported_protocols | |
| @@ -485,7 +485,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_verification_mode_literal"> | |
| + <a id="_verification_mode"> | |
| </a> | |
| <code class="literal"> | |
| verification_mode | |
| @@ -521,7 +521,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_cipher_suites_literal"> | |
| + <a id="_cipher_suites"> | |
| </a> | |
| <code class="literal"> | |
| cipher_suites | |
| @@ -641,7 +641,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_curve_types_literal"> | |
| + <a id="_curve_types"> | |
| </a> | |
| <code class="literal"> | |
| curve_types | |
| @@ -673,7 +673,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_renegotiation_literal"> | |
| + <a id="_renegotiation"> | |
| </a> | |
| <code class="literal"> | |
| renegotiation | |
| html/en/apm/server/current/configuration-template.html | |
| html/en/apm/server/current/configuration-v1-api.html | |
| html/en/apm/server/current/configuration-v2-api.html | |
| html/en/apm/server/current/configure-cloud-id.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/current/configure-cloud-id.html | |
| @@ -325,7 +325,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_cloud_id_literal"> | |
| + <a id="_cloud_id"> | |
| </a> | |
| <code class="literal"> | |
| cloud.id | |
| @@ -354,7 +354,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_cloud_auth_literal"> | |
| + <a id="_cloud_auth"> | |
| </a> | |
| <code class="literal"> | |
| cloud.auth | |
| html/en/apm/server/current/configuring-howto-apm-server.html | |
| html/en/apm/server/current/configuring-ingest-node.html | |
| html/en/apm/server/current/configuring-output.html | |
| html/en/apm/server/current/configuring-ssl-logstash.html | |
| html/en/apm/server/current/console-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/current/console-output.html | |
| @@ -316,7 +316,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_pretty_literal"> | |
| + <a id="_pretty"> | |
| </a> | |
| <code class="literal"> | |
| pretty | |
| @@ -341,7 +341,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_codec_literal_3"> | |
| + <a id="_codec_3"> | |
| </a> | |
| <code class="literal"> | |
| codec | |
| @@ -377,7 +377,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_5"> | |
| + <a id="_enabled_5"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -401,7 +401,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal_4"> | |
| + <a id="_bulk_max_size_4"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| html/en/apm/server/current/directory-layout.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/current/directory-layout.html | |
| @@ -316,10 +316,6 @@ | |
| </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| - <p> | |
| - <code class="literal"> | |
| - </code> | |
| - </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| <p> | |
| @@ -352,10 +348,6 @@ | |
| </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| - <p> | |
| - <code class="literal"> | |
| - </code> | |
| - </p> | |
| </td> | |
| </tr> | |
| <tr> | |
| html/en/apm/server/current/elasticsearch-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/current/elasticsearch-output.html | |
| @@ -390,7 +390,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal"> | |
| + <a id="_enabled"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -514,7 +514,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_level_literal"> | |
| + <a id="_compression_level"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -541,7 +541,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_escape_html_literal"> | |
| + <a id="_escape_html"> | |
| </a> | |
| <code class="literal"> | |
| escape_html | |
| @@ -573,7 +573,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_worker_literal"> | |
| + <a id="_worker"> | |
| </a> | |
| <code class="literal"> | |
| worker | |
| @@ -597,7 +597,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_username_literal"> | |
| + <a id="_username"> | |
| </a> | |
| <code class="literal"> | |
| username | |
| @@ -618,7 +618,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_password_literal"> | |
| + <a id="_password"> | |
| </a> | |
| <code class="literal"> | |
| password | |
| @@ -639,7 +639,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_parameters_literal"> | |
| + <a id="_parameters"> | |
| </a> | |
| <code class="literal"> | |
| parameters | |
| @@ -724,7 +724,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_headers_literal"> | |
| + <a id="_headers"> | |
| </a> | |
| <code class="literal"> | |
| headers | |
| @@ -752,7 +752,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_proxy_url_literal"> | |
| + <a id="_proxy_url"> | |
| </a> | |
| <code class="literal"> | |
| proxy_url | |
| @@ -791,6 +791,10 @@ | |
| </div> | |
| <p> | |
| The index name to write events to. The default is | |
| + <code class="literal"> | |
| + "apm-%{[observer.version]}-{type}-%{+yyyy.MM.dd}" | |
| + </code> | |
| + (for example, | |
| <code class="literal"> | |
| "apm-7.3.1-transaction-2019-08-28" | |
| </code> | |
| @@ -1070,7 +1074,11 @@ | |
| </div> | |
| </div> | |
| <p> | |
| - This is the default configuration for APM Server and results in indices For example: | |
| + This is the default configuration for APM Server and results in indices named in the following format: | |
| + <code class="literal"> | |
| + "apm-%{[observer.version]}-{type}-%{+yyyy.MM.dd}" | |
| + </code> | |
| + For example: | |
| <code class="literal"> | |
| "apm-7.3.1-transaction-2019-08-28" | |
| </code> | |
| @@ -1427,7 +1435,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_max_retries_literal"> | |
| + <a id="_max_retries"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -1458,7 +1466,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal"> | |
| + <a id="_bulk_max_size"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -1496,7 +1504,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_init_literal"> | |
| + <a id="_backoff_init"> | |
| </a> | |
| <code class="literal"> | |
| backoff.init | |
| @@ -1525,7 +1533,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_max_literal"> | |
| + <a id="_backoff_max"> | |
| </a> | |
| <code class="literal"> | |
| backoff.max | |
| @@ -1546,7 +1554,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_timeout_literal"> | |
| + <a id="_timeout"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -1567,7 +1575,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ssl_literal"> | |
| + <a id="_ssl"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| html/en/apm/server/current/enable-apm-server-debugging.html | |
| html/en/apm/server/current/error-api-examples.html | |
| html/en/apm/server/current/error-api.html | |
| html/en/apm/server/current/error-context-schema.html | |
| html/en/apm/server/current/error-endpoint.html | |
| html/en/apm/server/current/error-indices.html | |
| html/en/apm/server/current/error-payload-schema.html | |
| html/en/apm/server/current/error-schema-definition.html | |
| html/en/apm/server/current/error-service-schema.html | |
| html/en/apm/server/current/error-stacktraceframe-schema.html | |
| html/en/apm/server/current/error-system-schema.html | |
| html/en/apm/server/current/errors.html | |
| html/en/apm/server/current/event-types.html | |
| html/en/apm/server/current/events-api.html | |
| html/en/apm/server/current/example-intake-events.html | |
| html/en/apm/server/current/example-intakev2-events.html | |
| html/en/apm/server/current/exploring-es-data.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/current/exploring-es-data.html | |
| @@ -305,8 +305,8 @@ | |
| <p> | |
| To get an overview of existing indices you can run: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET _cat/indices/apm*</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET _cat/indices/apm*</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| @@ -363,16 +363,16 @@ | |
| <p> | |
| To query all documents collected with a specific APM Server version: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET apm-7.3.1-*/_search</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET apm-7.3.1-*/_search</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| <p> | |
| To query a specific type, for example transactions: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET apm-*transactions-*/_search</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET apm-*transactions-*/_search</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| @@ -391,16 +391,16 @@ | |
| </span> | |
| of the Elastic APM indices, first, run a query to find template names: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET _cat/templates/apm*</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET _cat/templates/apm*</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| <p> | |
| Then you can retrieve the specific template you are interested in: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET /_template/your-template-name</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET /_template/your-template-name</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| html/en/apm/server/current/exported-fields-apm-error.html | |
| html/en/apm/server/current/exported-fields-apm-sourcemap.html | |
| html/en/apm/server/current/exported-fields-apm-span.html | |
| html/en/apm/server/current/exported-fields-apm-transaction.html | |
| html/en/apm/server/current/exported-fields-apm.html | |
| html/en/apm/server/current/exported-fields-beat-common.html | |
| html/en/apm/server/current/exported-fields-cloud.html | |
| html/en/apm/server/current/exported-fields-docker-processor.html | |
| html/en/apm/server/current/exported-fields-ecs.html | |
| html/en/apm/server/current/exported-fields-host-processor.html | |
| html/en/apm/server/current/exported-fields-kubernetes-processor.html | |
| html/en/apm/server/current/exported-fields-process.html | |
| html/en/apm/server/current/exported-fields-system.html | |
| html/en/apm/server/current/exported-fields.html | |
| html/en/apm/server/current/feature-roles.html | |
| html/en/apm/server/current/file-option.html | |
| html/en/apm/server/current/file-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/current/file-output.html | |
| @@ -320,7 +320,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_4"> | |
| + <a id="_enabled_4"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -365,7 +365,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_filename_literal"> | |
| + <a id="_filename"> | |
| </a> | |
| <code class="literal"> | |
| filename | |
| @@ -386,7 +386,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_rotate_every_kb_literal"> | |
| + <a id="_rotate_every_kb"> | |
| </a> | |
| <code class="literal"> | |
| rotate_every_kb | |
| @@ -407,7 +407,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_number_of_files_literal"> | |
| + <a id="_number_of_files"> | |
| </a> | |
| <code class="literal"> | |
| number_of_files | |
| @@ -434,7 +434,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_permissions_literal"> | |
| + <a id="_permissions"> | |
| </a> | |
| <code class="literal"> | |
| permissions | |
| @@ -455,7 +455,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_codec_literal_2"> | |
| + <a id="_codec_2"> | |
| </a> | |
| <code class="literal"> | |
| codec | |
| html/en/apm/server/current/getting-help.html | |
| html/en/apm/server/current/high-availability.html | |
| html/en/apm/server/current/ilm-default.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/current/ilm-default.html | |
| @@ -445,7 +445,7 @@ | |
| </div> | |
| </div> | |
| <h5> | |
| - <a id="_literal_ilm_enabled_auto_literal"> | |
| + <a id="_ilm_enabled_auto"> | |
| </a> | |
| <code class="literal"> | |
| ilm.enabled: "auto" | |
| @@ -503,7 +503,7 @@ | |
| If all three of the above conditions are true, ILM will be enabled. | |
| </p> | |
| <h5> | |
| - <a id="_literal_ilm_enabled_true_literal"> | |
| + <a id="_ilm_enabled_true"> | |
| </a> | |
| <code class="literal"> | |
| ilm.enabled: true | |
| @@ -524,7 +524,7 @@ | |
| . When this happens, the APM Server ignores any configured index settings. The configured output must still be set to Elasticsearch and the instance still needs to support ILM. If not, APM Server falls back to ordinary index management without ILM, and an error is logged. | |
| </p> | |
| <h5> | |
| - <a id="_literal_ilm_enabled_false_literal"> | |
| + <a id="_ilm_enabled_false"> | |
| </a> | |
| <code class="literal"> | |
| ilm.enabled: false | |
| html/en/apm/server/current/ilm.html | |
| html/en/apm/server/current/index.html | |
| html/en/apm/server/current/installing-on-windows.html | |
| html/en/apm/server/current/installing.html | |
| html/en/apm/server/current/intake-api.html | |
| html/en/apm/server/current/kafka-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/current/kafka-output.html | |
| @@ -370,7 +370,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_3"> | |
| + <a id="_enabled_3"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -398,7 +398,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_hosts_literal"> | |
| + <a id="_hosts"> | |
| </a> | |
| <code class="literal"> | |
| hosts | |
| @@ -419,7 +419,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_version_literal"> | |
| + <a id="_version"> | |
| </a> | |
| <code class="literal"> | |
| version | |
| @@ -461,7 +461,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_username_literal_2"> | |
| + <a id="_username_2"> | |
| </a> | |
| <code class="literal"> | |
| username | |
| @@ -482,7 +482,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_password_literal_2"> | |
| + <a id="_password_2"> | |
| </a> | |
| <code class="literal"> | |
| password | |
| @@ -703,7 +703,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_key_literal"> | |
| + <a id="_key"> | |
| </a> | |
| <code class="literal"> | |
| key | |
| @@ -724,7 +724,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_partition_literal"> | |
| + <a id="_partition"> | |
| </a> | |
| <code class="literal"> | |
| partition | |
| @@ -830,7 +830,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_client_id_literal"> | |
| + <a id="_client_id"> | |
| </a> | |
| <code class="literal"> | |
| client_id | |
| @@ -851,7 +851,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_worker_literal_3"> | |
| + <a id="_worker_3"> | |
| </a> | |
| <code class="literal"> | |
| worker | |
| @@ -872,7 +872,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_codec_literal"> | |
| + <a id="_codec"> | |
| </a> | |
| <code class="literal"> | |
| codec | |
| @@ -904,7 +904,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_metadata_literal"> | |
| + <a id="_metadata"> | |
| </a> | |
| <code class="literal"> | |
| metadata | |
| @@ -993,7 +993,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_max_retries_literal_3"> | |
| + <a id="_max_retries_3"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -1024,7 +1024,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal_3"> | |
| + <a id="_bulk_max_size_3"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -1045,7 +1045,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_flush_frequency_literal"> | |
| + <a id="_bulk_flush_frequency"> | |
| </a> | |
| <code class="literal"> | |
| bulk_flush_frequency | |
| @@ -1066,7 +1066,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_timeout_literal_3"> | |
| + <a id="_timeout_3"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -1087,7 +1087,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_broker_timeout_literal"> | |
| + <a id="_broker_timeout"> | |
| </a> | |
| <code class="literal"> | |
| broker_timeout | |
| @@ -1108,7 +1108,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_channel_buffer_size_literal"> | |
| + <a id="_channel_buffer_size"> | |
| </a> | |
| <code class="literal"> | |
| channel_buffer_size | |
| @@ -1129,7 +1129,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_keep_alive_literal"> | |
| + <a id="_keep_alive"> | |
| </a> | |
| <code class="literal"> | |
| keep_alive | |
| @@ -1150,7 +1150,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_literal"> | |
| + <a id="_compression"> | |
| </a> | |
| <code class="literal"> | |
| compression | |
| @@ -1191,7 +1191,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_level_literal_3"> | |
| + <a id="_compression_level_3"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -1243,7 +1243,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_required_acks_literal"> | |
| + <a id="_required_acks"> | |
| </a> | |
| <code class="literal"> | |
| required_acks | |
| @@ -1267,7 +1267,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ssl_literal_3"> | |
| + <a id="_ssl_3"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| html/en/apm/server/current/keystore.html | |
| html/en/apm/server/current/linux-seccomp.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/current/linux-seccomp.html | |
| @@ -462,6 +462,12 @@ | |
| <dd> | |
| A list of system call names. The system call name must exist for the runtime architecture, otherwise an error will be logged and the filter will not be installed. At least one system call must be defined. | |
| </dd> | |
| + </dl> | |
| + </div> | |
| + <div class="variablelist"> | |
| + <a id="seccomp-policy-config-action"> | |
| + </a> | |
| + <dl class="variablelist"> | |
| <dt> | |
| <span class="term"> | |
| <span class="strong strong"> | |
| @@ -482,8 +488,6 @@ | |
| is executed. This is required. These are the available action values. The actions that are available depend on the kernel version. | |
| </p> | |
| <div class="itemizedlist"> | |
| - <a id="seccomp-policy-config-action"> | |
| - </a> | |
| <ul class="itemizedlist" type="disc"> | |
| <li class="listitem"> | |
| <code class="literal"> | |
| html/en/apm/server/current/load-dashboards-logstash.html | |
| html/en/apm/server/current/load-kibana-dashboards.html | |
| html/en/apm/server/current/logstash-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/current/logstash-output.html | |
| @@ -286,6 +286,9 @@ | |
| <img alt="Important" src="images/icons/important.png"/> | |
| </div> | |
| <div class="admon_content"> | |
| + <h3> | |
| + Prerequisite | |
| + </h3> | |
| <p> | |
| To send events to Logstash, you also need to create a Logstash configuration pipeline that listens for incoming Beats connections and indexes the received events into Elasticsearch. For more information, see the section about | |
| <a class="ulink" href="https://www.elastic.co/guide/en/elastic-stack-get-started/7.3/get-started-elastic-stack.html#logstash-setup" target="_top"> | |
| @@ -624,7 +627,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_2"> | |
| + <a id="_enabled_2"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -672,7 +675,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_level_literal_2"> | |
| + <a id="_compression_level_2"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -699,7 +702,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_escape_html_literal_2"> | |
| + <a id="_escape_html_2"> | |
| </a> | |
| <code class="literal"> | |
| escape_html | |
| @@ -731,7 +734,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_worker_literal_2"> | |
| + <a id="_worker_2"> | |
| </a> | |
| <code class="literal"> | |
| worker | |
| @@ -779,7 +782,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ttl_literal"> | |
| + <a id="_ttl"> | |
| </a> | |
| <code class="literal"> | |
| ttl | |
| @@ -813,7 +816,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_pipelining_literal"> | |
| + <a id="_pipelining"> | |
| </a> | |
| <code class="literal"> | |
| pipelining | |
| @@ -838,7 +841,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_proxy_url_literal_2"> | |
| + <a id="_proxy_url_2"> | |
| </a> | |
| <code class="literal"> | |
| proxy_url | |
| @@ -938,7 +941,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ssl_literal_2"> | |
| + <a id="_ssl_2"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| @@ -969,7 +972,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_timeout_literal_2"> | |
| + <a id="_timeout_2"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -990,7 +993,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_max_retries_literal_2"> | |
| + <a id="_max_retries_2"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -1021,7 +1024,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal_2"> | |
| + <a id="_bulk_max_size_2"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -1059,7 +1062,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_slow_start_literal"> | |
| + <a id="_slow_start"> | |
| </a> | |
| <code class="literal"> | |
| slow_start | |
| @@ -1091,7 +1094,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_init_literal_2"> | |
| + <a id="_backoff_init_2"> | |
| </a> | |
| <code class="literal"> | |
| backoff.init | |
| @@ -1120,7 +1123,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_max_literal_2"> | |
| + <a id="_backoff_max_2"> | |
| </a> | |
| <code class="literal"> | |
| backoff.max | |
| html/en/apm/server/current/manage-indices-kibana.html | |
| html/en/apm/server/current/manual-ilm-setup.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/current/manual-ilm-setup.html | |
| @@ -702,8 +702,8 @@ | |
| </code> | |
| overwrites defaults rather than being merged. This means you’ll need to configure all of your indices in the file, even if some are not using ILM. | |
| </p> | |
| - <div class="pre_wrapper lang-yml"> | |
| - <pre class="programlisting prettyprint lang-yml">output.elasticsearch: | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">output.elasticsearch: | |
| indices: | |
| - index: "apm-7.3.1-sourcemap" | |
| when.contains: | |
| html/en/apm/server/current/max_request_queue_time.html | |
| html/en/apm/server/current/max_unzipped_size.html | |
| html/en/apm/server/current/metadata-api.html | |
| html/en/apm/server/current/metrics.enabled.html | |
| html/en/apm/server/current/metricset-api.html | |
| html/en/apm/server/current/metricset-indices.html | |
| html/en/apm/server/current/monitoring-internal-collection.html | |
| html/en/apm/server/current/monitoring-metricbeat-collection.html | |
| html/en/apm/server/current/monitoring.html | |
| html/en/apm/server/current/overview.html | |
| html/en/apm/server/current/payload-with-error.html | |
| html/en/apm/server/current/payload-with-minimal-exception.html | |
| html/en/apm/server/current/payload-with-minimal-log.html | |
| html/en/apm/server/current/payload-with-minimal-span.html | |
| html/en/apm/server/current/payload-with-minimal-transaction.html | |
| html/en/apm/server/current/payload-with-transactions.html | |
| html/en/apm/server/current/processing-performance.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/current/processing-performance.html | |
| @@ -418,11 +418,7 @@ | |
| </table> | |
| </div> | |
| <p> | |
| - In other words, a 512 Mb instance can process | |
| - <sub> | |
| - 3 Mbs per second, while an 8 Gb instance can process | |
| - </sub> | |
| - 20 Mbs per second. | |
| + In other words, a 512 Mb instance can process ~3 Mbs per second, while an 8 Gb instance can process ~20 Mbs per second. | |
| </p> | |
| <p> | |
| APM Server is CPU bound, so it scales better from 2 Gb to 8 Gb than it does from 512 Mb to 2 Gb. This is because larger instance types in Elastic Cloud come with much more computing power. | |
| html/en/apm/server/current/rate_limit_v1.html | |
| html/en/apm/server/current/redirects.html | |
| html/en/apm/server/current/reduce-storage.html | |
| html/en/apm/server/current/release-notes-6.1.0.html | |
| html/en/apm/server/current/release-notes-6.1.1.html | |
| html/en/apm/server/current/release-notes-6.1.2.html | |
| html/en/apm/server/current/release-notes-6.1.3.html | |
| html/en/apm/server/current/release-notes-6.1.4.html | |
| html/en/apm/server/current/release-notes-6.1.html | |
| html/en/apm/server/current/release-notes-6.2.0.html | |
| html/en/apm/server/current/release-notes-6.2.1.html | |
| html/en/apm/server/current/release-notes-6.2.2.html | |
| html/en/apm/server/current/release-notes-6.2.3.html | |
| html/en/apm/server/current/release-notes-6.2.4.html | |
| html/en/apm/server/current/release-notes-6.2.html | |
| html/en/apm/server/current/release-notes-6.3.0.html | |
| html/en/apm/server/current/release-notes-6.3.1.html | |
| html/en/apm/server/current/release-notes-6.3.2.html | |
| html/en/apm/server/current/release-notes-6.3.html | |
| html/en/apm/server/current/release-notes-6.4.0.html | |
| html/en/apm/server/current/release-notes-6.4.1.html | |
| html/en/apm/server/current/release-notes-6.4.2.html | |
| html/en/apm/server/current/release-notes-6.4.3.html | |
| html/en/apm/server/current/release-notes-6.4.html | |
| html/en/apm/server/current/release-notes-6.5.0.html | |
| html/en/apm/server/current/release-notes-6.5.1.html | |
| html/en/apm/server/current/release-notes-6.5.2.html | |
| html/en/apm/server/current/release-notes-6.5.3.html | |
| html/en/apm/server/current/release-notes-6.5.4.html | |
| html/en/apm/server/current/release-notes-6.5.html | |
| html/en/apm/server/current/release-notes-6.6.0.html | |
| html/en/apm/server/current/release-notes-6.6.1.html | |
| html/en/apm/server/current/release-notes-6.6.2.html | |
| html/en/apm/server/current/release-notes-6.6.html | |
| html/en/apm/server/current/release-notes-6.7.0.html | |
| html/en/apm/server/current/release-notes-6.7.1.html | |
| html/en/apm/server/current/release-notes-6.7.2.html | |
| html/en/apm/server/current/release-notes-6.7.html | |
| html/en/apm/server/current/release-notes-6.8.0.html | |
| html/en/apm/server/current/release-notes-6.8.html | |
| html/en/apm/server/current/release-notes-7.0.0-alpha1.html | |
| html/en/apm/server/current/release-notes-7.0.0-alpha2.html | |
| html/en/apm/server/current/release-notes-7.0.0-beta1.html | |
| html/en/apm/server/current/release-notes-7.0.0-rc1.html | |
| html/en/apm/server/current/release-notes-7.0.0-rc2.html | |
| html/en/apm/server/current/release-notes-7.0.0.html | |
| html/en/apm/server/current/release-notes-7.0.1.html | |
| html/en/apm/server/current/release-notes-7.0.html | |
| html/en/apm/server/current/release-notes-7.1.0.html | |
| html/en/apm/server/current/release-notes-7.1.1.html | |
| html/en/apm/server/current/release-notes-7.1.html | |
| html/en/apm/server/current/release-notes-7.2.0.html | |
| html/en/apm/server/current/release-notes-7.2.1.html | |
| html/en/apm/server/current/release-notes-7.2.html | |
| html/en/apm/server/current/release-notes-7.3.0.html | |
| html/en/apm/server/current/release-notes-7.3.1.html | |
| html/en/apm/server/current/release-notes-7.3.html | |
| html/en/apm/server/current/release-notes.html | |
| html/en/apm/server/current/request-too-large.html | |
| html/en/apm/server/current/rum.html | |
| html/en/apm/server/current/running-on-docker.html | |
| html/en/apm/server/current/running-with-systemd.html | |
| html/en/apm/server/current/securing-apm-server.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/current/securing-apm-server.html | |
| @@ -308,7 +308,7 @@ | |
| <a id="security-overview"> | |
| </a> | |
| Security Overview | |
| - <a class="edit_me" href="https://github.com/elastic/apm-server/edit/7.3/docs/security.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| + <a class="edit_me" href="https://github.com/elastic/apm-server/edit/7.3/docs/copied-from-beats/shared-securing-beat.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| edit | |
| </a> | |
| </h3> | |
| @@ -319,7 +319,7 @@ | |
| <a id="secret-token"> | |
| </a> | |
| Secret token | |
| - <a class="edit_me" href="https://github.com/elastic/apm-server/edit/7.3/docs/security.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| + <a class="edit_me" href="https://github.com/elastic/apm-server/edit/7.3/docs/copied-from-beats/shared-securing-beat.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| edit | |
| </a> | |
| </h4> | |
| @@ -340,7 +340,7 @@ | |
| <a id="ssl-setup"> | |
| </a> | |
| SSL/TLS setup | |
| - <a class="edit_me" href="https://github.com/elastic/apm-server/edit/7.3/docs/security.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| + <a class="edit_me" href="https://github.com/elastic/apm-server/edit/7.3/docs/copied-from-beats/shared-securing-beat.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| edit | |
| </a> | |
| </h4> | |
| html/en/apm/server/current/securing-beats.html | |
| html/en/apm/server/current/securing-communication-elasticsearch.html | |
| html/en/apm/server/current/server-info.html | |
| html/en/apm/server/current/setting-up-and-running.html | |
| html/en/apm/server/current/setup-kibana-endpoint.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/current/setup-kibana-endpoint.html | |
| @@ -358,7 +358,7 @@ | |
| to use APM Agent configuration. | |
| </p> | |
| <h4> | |
| - <a id="_literal_apm_server_kibana_host_literal"> | |
| + <a id="_apm_server_kibana_host"> | |
| </a> | |
| <code class="literal"> | |
| apm-server.kibana.host | |
| @@ -481,7 +481,7 @@ | |
| apm-server.kibana.path: /kibana</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_apm_server_kibana_username_literal"> | |
| + <a id="_apm_server_kibana_username"> | |
| </a> | |
| <code class="literal"> | |
| apm-server.kibana.username | |
| @@ -498,7 +498,7 @@ | |
| specified for the Elasticsearch output. | |
| </p> | |
| <h4> | |
| - <a id="_literal_apm_server_kibana_password_literal"> | |
| + <a id="_apm_server_kibana_password"> | |
| </a> | |
| <code class="literal"> | |
| apm-server.kibana.password | |
| @@ -528,7 +528,7 @@ | |
| An HTTP path prefix that is prepended to the HTTP API calls. This is useful for the cases where Kibana listens behind an HTTP reverse proxy that exports the API under a custom prefix. | |
| </p> | |
| <h4> | |
| - <a id="_literal_apm_server_kibana_ssl_enabled_literal"> | |
| + <a id="_apm_server_kibana_ssl_enabled"> | |
| </a> | |
| <code class="literal"> | |
| apm-server.kibana.ssl.enabled | |
| @@ -583,7 +583,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_agent_config_cache_expiration_literal"> | |
| + <a id="_agent_config_cache_expiration"> | |
| </a> | |
| <code class="literal"> | |
| agent.config.cache.expiration | |
| html/en/apm/server/current/setup-repositories.html | |
| html/en/apm/server/current/sizing-guide.html | |
| html/en/apm/server/current/sourcemap-api.html | |
| html/en/apm/server/current/sourcemap-indices.html | |
| html/en/apm/server/current/sourcemaps.html | |
| html/en/apm/server/current/span-api.html | |
| html/en/apm/server/current/span-indices.html | |
| html/en/apm/server/current/storage-management.html | |
| html/en/apm/server/current/toc.html | |
| html/en/apm/server/current/transaction-api-examples.html | |
| html/en/apm/server/current/transaction-api.html | |
| html/en/apm/server/current/transaction-context-schema.html | |
| html/en/apm/server/current/transaction-endpoint.html | |
| html/en/apm/server/current/transaction-indices.html | |
| html/en/apm/server/current/transaction-payload-schema.html | |
| html/en/apm/server/current/transaction-request-schema.html | |
| html/en/apm/server/current/transaction-schema-definition.html | |
| html/en/apm/server/current/transaction-service-schema.html | |
| html/en/apm/server/current/transaction-span-schema.html | |
| html/en/apm/server/current/transaction-stacktraceframe-schema.html | |
| html/en/apm/server/current/transaction-system-schema.html | |
| html/en/apm/server/current/transaction-user-schema.html | |
| html/en/apm/server/current/transactions-spans.html | |
| html/en/apm/server/current/transactions.html | |
| html/en/apm/server/current/troubleshooting.html | |
| html/en/apm/server/current/tune-apm-server.html | |
| html/en/apm/server/current/tune-data-ingestion.html | |
| html/en/apm/server/current/tune-es.html | |
| html/en/apm/server/current/update-existing-data.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/current/update-existing-data.html | |
| @@ -293,8 +293,8 @@ | |
| <p> | |
| To rename a service, send the following request: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST /apm-*/_update_by_query | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST /apm-*/_update_by_query | |
| { | |
| "query": { | |
| "term": { | |
| html/en/apm/server/current/upgrading-to-65.html | |
| html/en/apm/server/current/upgrading-to-70.html | |
| html/en/apm/server/current/upgrading.html | |
| html/en/apm/server/current/url-option.html | |
| html/en/apm/server/current/use-v1-and-v2.html | |
| html/en/apm/server/current/using-environ-vars.html | |
| html/en/apm/server/current/why-separate-component.html | |
| html/en/apm/server/index.html | |
| html/en/apm/server/master/_manually_loading_template_configuration.html | |
| html/en/apm/server/master/agent-configuration-api.html | |
| html/en/apm/server/master/apm-server-configuration.html | |
| html/en/apm/server/master/beats-basic-auth.html | |
| html/en/apm/server/master/beats-system-user.html | |
| html/en/apm/server/master/beats-tls.html | |
| html/en/apm/server/master/breaking-changes.html | |
| html/en/apm/server/master/brew.html | |
| html/en/apm/server/master/command-line-options.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/master/command-line-options.html | |
| @@ -564,37 +564,41 @@ | |
| </code> | |
| . | |
| </dd> | |
| - <dt> | |
| - <span class="term"> | |
| - <span class="strong strong"> | |
| - <strong> | |
| - <code class="literal"> | |
| - ilm-policy | |
| - </code> | |
| - </strong> | |
| - </span> | |
| - </span> | |
| - </dt> | |
| - <dd> | |
| - Exports the index lifecycle management policy to stdout. You can specify the | |
| - <code class="literal"> | |
| - --es.version | |
| - </code> | |
| - and a | |
| - <code class="literal"> | |
| - --dir | |
| - </code> | |
| - to which the policy should be exported as a file rather than exporting to | |
| - <code class="literal"> | |
| - stdout | |
| - </code> | |
| - . | |
| - </dd> | |
| </dl> | |
| </div> | |
| - <p> | |
| + <div class="variablelist"> | |
| <a id="ilm-policy-subcommand"> | |
| </a> | |
| + <dl class="variablelist"> | |
| + <dt> | |
| + <span class="term"> | |
| + <span class="strong strong"> | |
| + <strong> | |
| + <code class="literal"> | |
| + ilm-policy | |
| + </code> | |
| + </strong> | |
| + </span> | |
| + </span> | |
| + </dt> | |
| + <dd> | |
| + Exports the index lifecycle management policy to stdout. You can specify the | |
| + <code class="literal"> | |
| + --es.version | |
| + </code> | |
| + and a | |
| + <code class="literal"> | |
| + --dir | |
| + </code> | |
| + to which the policy should be exported as a file rather than exporting to | |
| + <code class="literal"> | |
| + stdout | |
| + </code> | |
| + . | |
| + </dd> | |
| + </dl> | |
| + </div> | |
| + <p> | |
| <span class="strong strong"> | |
| <strong> | |
| FLAGS | |
| @@ -1277,7 +1281,17 @@ | |
| </span> | |
| </dt> | |
| <dd> | |
| - deprecated:[7.2] Sets up the index template only. It is recommended to use | |
| + <span class="Admonishment"> | |
| + [ | |
| + <span class="Admonishment-version u-mono u-strikethrough"> | |
| + 7.2 | |
| + </span> | |
| + ] | |
| + <span class="Admonishment-detail"> | |
| + Deprecated in 7.2. | |
| + </span> | |
| + </span> | |
| + Sets up the index template only. It is recommended to use | |
| <code class="literal"> | |
| --index-management | |
| </code> | |
| @@ -1295,7 +1309,17 @@ | |
| </span> | |
| </dt> | |
| <dd> | |
| - deprecated:[7.2] Sets up the index lifecycle management policy. It is recommended to use | |
| + <span class="Admonishment"> | |
| + [ | |
| + <span class="Admonishment-version u-mono u-strikethrough"> | |
| + 7.2 | |
| + </span> | |
| + ] | |
| + <span class="Admonishment-detail"> | |
| + Deprecated in 7.2. | |
| + </span> | |
| + </span> | |
| + Sets up the index lifecycle management policy. It is recommended to use | |
| <code class="literal"> | |
| --index-management | |
| </code> | |
| html/en/apm/server/master/common-problems.html | |
| html/en/apm/server/master/concurrent_requests.html | |
| html/en/apm/server/master/configuration-logging.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/master/configuration-logging.html | |
| @@ -351,7 +351,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_to_stderr_literal"> | |
| + <a id="_logging_to_stderr"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_stderr | |
| @@ -368,7 +368,7 @@ | |
| command line option. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_to_syslog_literal"> | |
| + <a id="_logging_to_syslog"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_syslog | |
| @@ -391,7 +391,7 @@ | |
| </div> | |
| </div> | |
| <h4> | |
| - <a id="_literal_logging_to_eventlog_literal"> | |
| + <a id="_logging_to_eventlog"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_eventlog | |
| @@ -404,7 +404,7 @@ | |
| When true, writes all logging output to the Windows Event Log. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_to_files_literal"> | |
| + <a id="_logging_to_files"> | |
| </a> | |
| <code class="literal"> | |
| logging.to_files | |
| @@ -557,7 +557,7 @@ | |
| also sets the debug log level). | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_metrics_enabled_literal"> | |
| + <a id="_logging_metrics_enabled"> | |
| </a> | |
| <code class="literal"> | |
| logging.metrics.enabled | |
| @@ -579,7 +579,7 @@ | |
| Note that we currently offer no backwards compatible guarantees for the internal metrics and for this reason they are also not documented. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_metrics_period_literal"> | |
| + <a id="_logging_metrics_period"> | |
| </a> | |
| <code class="literal"> | |
| logging.metrics.period | |
| @@ -592,7 +592,7 @@ | |
| The period after which to log the internal metrics. The default is 30s. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_path_literal"> | |
| + <a id="_logging_files_path"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.path | |
| @@ -609,7 +609,7 @@ | |
| section for details. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_name_literal"> | |
| + <a id="_logging_files_name"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.name | |
| @@ -628,7 +628,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_rotateeverybytes_literal"> | |
| + <a id="_logging_files_rotateeverybytes"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.rotateeverybytes | |
| @@ -641,7 +641,7 @@ | |
| The maximum size of a log file. If the limit is reached, a new log file is generated. The default size limit is 10485760 (10 MB). | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_keepfiles_literal"> | |
| + <a id="_logging_files_keepfiles"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.keepfiles | |
| @@ -658,7 +658,7 @@ | |
| options has to be in the range of 2 to 1024 files. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_permissions_literal"> | |
| + <a id="_logging_files_permissions"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.permissions | |
| @@ -697,7 +697,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_logging_files_interval_literal"> | |
| + <a id="_logging_files_interval"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.interval | |
| @@ -710,7 +710,7 @@ | |
| Enable log file rotation on time intervals in addition to size-based rotation. Intervals must be at least 1s. Values of 1m, 1h, 24h, 7*24h, 30*24h, and 365*24h are boundary-aligned with minutes, hours, days, weeks, months, and years as reported by the local system clock. All other intervals are calculated from the unix epoch. Defaults to disabled. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_rotateonstartup_literal"> | |
| + <a id="_logging_files_rotateonstartup"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.rotateonstartup | |
| @@ -723,7 +723,7 @@ | |
| If the log file already exists on startup, immediately rotate it and start writing to a new file instead of appending to the existing one. Defaults to true. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_json_literal"> | |
| + <a id="_logging_json"> | |
| </a> | |
| <code class="literal"> | |
| logging.json | |
| @@ -736,7 +736,7 @@ | |
| When true, logs messages in JSON format. The default is false. | |
| </p> | |
| <h4> | |
| - <a id="_literal_logging_files_redirect_stderr_literal_phrase_role_experimental_phrase"> | |
| + <a id="_logging_files_redirect_stderr"> | |
| </a> | |
| <code class="literal"> | |
| logging.files.redirect_stderr | |
| @@ -803,17 +803,17 @@ | |
| </p> | |
| <p> | |
| <code class="literal"> | |
| - 2017-12-17T18:54:16.241-0500 INFO logp/core_test.go:13 unnamed global logger | |
| - </code> | |
| - </p> | |
| - <p> | |
| - <code class="literal"> | |
| - 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:16 some message | |
| - </code> | |
| - </p> | |
| - <p> | |
| - <code class="literal"> | |
| - 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:19 some message {"x": 1} | |
| + 2017-12-17T18:54:16.241-0500 INFO logp/core_test.go:13 unnamed global logger | |
| + </code> | |
| + </p> | |
| + <p> | |
| + <code class="literal"> | |
| + 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:16 some message | |
| + </code> | |
| + </p> | |
| + <p> | |
| + <code class="literal"> | |
| + 2017-12-17T18:54:16.242-0500 INFO [example] logp/core_test.go:19 some message {"x": 1} | |
| </code> | |
| </p> | |
| </div> | |
| html/en/apm/server/master/configuration-monitor.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/master/configuration-monitor.html | |
| @@ -306,7 +306,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_enabled_literal_7"> | |
| + <a id="_enabled_7"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -342,7 +342,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_elasticsearch_literal"> | |
| + <a id="_elasticsearch"> | |
| </a> | |
| <code class="literal"> | |
| elasticsearch | |
| @@ -363,7 +363,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_bulk_max_size_literal_5"> | |
| + <a id="_bulk_max_size_5"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -392,7 +392,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_backoff_init_literal_3"> | |
| + <a id="_backoff_init_3"> | |
| </a> | |
| <code class="literal"> | |
| backoff.init | |
| @@ -421,7 +421,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_backoff_max_literal_3"> | |
| + <a id="_backoff_max_3"> | |
| </a> | |
| <code class="literal"> | |
| backoff.max | |
| @@ -442,7 +442,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_compression_level_literal_4"> | |
| + <a id="_compression_level_4"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -479,7 +479,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_headers_literal_2"> | |
| + <a id="_headers_2"> | |
| </a> | |
| <code class="literal"> | |
| headers | |
| @@ -504,7 +504,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_hosts_literal_2"> | |
| + <a id="_hosts_2"> | |
| </a> | |
| <code class="literal"> | |
| hosts | |
| @@ -529,7 +529,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_max_retries_literal_4"> | |
| + <a id="_max_retries_4"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -558,7 +558,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_parameters_literal_2"> | |
| + <a id="_parameters_2"> | |
| </a> | |
| <code class="literal"> | |
| parameters | |
| @@ -579,7 +579,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_password_literal_3"> | |
| + <a id="_password_3"> | |
| </a> | |
| <code class="literal"> | |
| password | |
| @@ -600,7 +600,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_metrics_period_literal"> | |
| + <a id="_metrics_period"> | |
| </a> | |
| <code class="literal"> | |
| metrics.period | |
| @@ -621,7 +621,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_state_period_literal"> | |
| + <a id="_state_period"> | |
| </a> | |
| <code class="literal"> | |
| state.period | |
| @@ -642,7 +642,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_protocol_literal"> | |
| + <a id="_protocol"> | |
| </a> | |
| <code class="literal"> | |
| protocol | |
| @@ -679,7 +679,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_proxy_url_literal_3"> | |
| + <a id="_proxy_url_3"> | |
| </a> | |
| <code class="literal"> | |
| proxy_url | |
| @@ -704,7 +704,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_timeout_literal_4"> | |
| + <a id="_timeout_4"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -729,7 +729,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_ssl_literal_4"> | |
| + <a id="_ssl_4"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| @@ -760,7 +760,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_username_literal_3"> | |
| + <a id="_username_3"> | |
| </a> | |
| <code class="literal"> | |
| username | |
| html/en/apm/server/master/configuration-output-codec.html | |
| html/en/apm/server/master/configuration-path.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/master/configuration-path.html | |
| @@ -329,7 +329,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_home_literal"> | |
| + <a id="_home"> | |
| </a> | |
| <code class="literal"> | |
| home | |
| @@ -348,7 +348,7 @@ | |
| <pre class="programlisting prettyprint lang-yaml">path.home: /usr/share/beats</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_config_literal"> | |
| + <a id="_config"> | |
| </a> | |
| <code class="literal"> | |
| config | |
| @@ -367,7 +367,7 @@ | |
| <pre class="programlisting prettyprint lang-yaml">path.config: /usr/share/beats/config</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_data_literal"> | |
| + <a id="_data"> | |
| </a> | |
| <code class="literal"> | |
| data | |
| @@ -404,7 +404,7 @@ | |
| </div> | |
| </div> | |
| <h4> | |
| - <a id="_literal_logs_literal"> | |
| + <a id="_logs"> | |
| </a> | |
| <code class="literal"> | |
| logs | |
| html/en/apm/server/master/configuration-process.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/master/configuration-process.html | |
| @@ -538,7 +538,7 @@ | |
| Overwrites the existing APM pipeline definition in Elasticsearch. Defaults to true. | |
| </p> | |
| <h3> | |
| - <a id="_configuration_options_literal_queue_mem_literal"> | |
| + <a id="_configuration_options_queue_mem"> | |
| </a> | |
| Configuration options: | |
| <code class="literal"> | |
| @@ -603,7 +603,7 @@ | |
| . Default value is 1 second. | |
| </p> | |
| <h3> | |
| - <a id="_configuration_options_literal_max_procs_literal"> | |
| + <a id="_configuration_options_max_procs"> | |
| </a> | |
| Configuration options: | |
| <code class="literal"> | |
| html/en/apm/server/master/configuration-rum-general.html | |
| html/en/apm/server/master/configuration-rum-v1.html | |
| html/en/apm/server/master/configuration-rum-v2.html | |
| html/en/apm/server/master/configuration-rum.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/master/configuration-rum.html | |
| @@ -342,7 +342,7 @@ | |
| Defines the maximum amount of events allowed to be sent to the APM Server RUM endpoint per ip per second. Defaults to 300. | |
| </p> | |
| <h4> | |
| - <a id="_literal_event_rate_lru_size_literal"> | |
| + <a id="_event_rate_lru_size"> | |
| </a> | |
| <code class="literal"> | |
| event_rate.lru_size | |
| @@ -417,7 +417,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_exclude_from_grouping_literal"> | |
| + <a id="_exclude_from_grouping"> | |
| </a> | |
| <code class="literal"> | |
| exclude_from_grouping | |
| @@ -472,7 +472,7 @@ | |
| is automatically applied to documents sent to the RUM endpoint. Source maps are fetched from Elasticsearch and then kept in an in-memory cache for the configured time. Values configured without a time unit are treated as seconds. Default value is 5 minutes. | |
| </p> | |
| <h4> | |
| - <a id="_literal_source_mapping_index_pattern_literal"> | |
| + <a id="_source_mapping_index_pattern"> | |
| </a> | |
| <code class="literal"> | |
| source_mapping.index_pattern | |
| html/en/apm/server/master/configuration-ssl.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/master/configuration-ssl.html | |
| @@ -330,7 +330,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_enabled_literal_6"> | |
| + <a id="_enabled_6"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -377,7 +377,7 @@ | |
| </div> | |
| </div> | |
| <h4> | |
| - <a id="_literal_certificate_authorities_literal"> | |
| + <a id="_certificate_authorities"> | |
| </a> | |
| <code class="literal"> | |
| certificate_authorities | |
| @@ -435,7 +435,7 @@ | |
| is specified. | |
| </p> | |
| <h4> | |
| - <a id="_literal_key_passphrase_literal"> | |
| + <a id="_key_passphrase"> | |
| </a> | |
| <code class="literal"> | |
| key_passphrase | |
| @@ -452,7 +452,7 @@ | |
| file. | |
| </p> | |
| <h4> | |
| - <a id="_literal_supported_protocols_literal"> | |
| + <a id="_supported_protocols"> | |
| </a> | |
| <code class="literal"> | |
| supported_protocols | |
| @@ -492,7 +492,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_verification_mode_literal"> | |
| + <a id="_verification_mode"> | |
| </a> | |
| <code class="literal"> | |
| verification_mode | |
| @@ -528,7 +528,7 @@ | |
| . | |
| </p> | |
| <h4> | |
| - <a id="_literal_cipher_suites_literal"> | |
| + <a id="_cipher_suites"> | |
| </a> | |
| <code class="literal"> | |
| cipher_suites | |
| @@ -648,7 +648,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_curve_types_literal"> | |
| + <a id="_curve_types"> | |
| </a> | |
| <code class="literal"> | |
| curve_types | |
| @@ -680,7 +680,7 @@ | |
| </ul> | |
| </div> | |
| <h4> | |
| - <a id="_literal_renegotiation_literal"> | |
| + <a id="_renegotiation"> | |
| </a> | |
| <code class="literal"> | |
| renegotiation | |
| html/en/apm/server/master/configuration-template.html | |
| html/en/apm/server/master/configuration-v1-api.html | |
| html/en/apm/server/master/configuration-v2-api.html | |
| html/en/apm/server/master/configure-cloud-id.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/master/configure-cloud-id.html | |
| @@ -332,7 +332,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_cloud_id_literal"> | |
| + <a id="_cloud_id"> | |
| </a> | |
| <code class="literal"> | |
| cloud.id | |
| @@ -361,7 +361,7 @@ | |
| <div> | |
| <div> | |
| <h3 class="title"> | |
| - <a id="_literal_cloud_auth_literal"> | |
| + <a id="_cloud_auth"> | |
| </a> | |
| <code class="literal"> | |
| cloud.auth | |
| html/en/apm/server/master/configuring-howto-apm-server.html | |
| html/en/apm/server/master/configuring-ingest-node.html | |
| html/en/apm/server/master/configuring-output.html | |
| html/en/apm/server/master/configuring-ssl-logstash.html | |
| html/en/apm/server/master/console-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/master/console-output.html | |
| @@ -323,7 +323,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_pretty_literal"> | |
| + <a id="_pretty"> | |
| </a> | |
| <code class="literal"> | |
| pretty | |
| @@ -348,7 +348,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_codec_literal_3"> | |
| + <a id="_codec_3"> | |
| </a> | |
| <code class="literal"> | |
| codec | |
| @@ -384,7 +384,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_5"> | |
| + <a id="_enabled_5"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -408,7 +408,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal_4"> | |
| + <a id="_bulk_max_size_4"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| html/en/apm/server/master/directory-layout.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/master/directory-layout.html | |
| @@ -323,10 +323,6 @@ | |
| </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| - <p> | |
| - <code class="literal"> | |
| - </code> | |
| - </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| <p> | |
| @@ -359,10 +355,6 @@ | |
| </p> | |
| </td> | |
| <td align="left" valign="top"> | |
| - <p> | |
| - <code class="literal"> | |
| - </code> | |
| - </p> | |
| </td> | |
| </tr> | |
| <tr> | |
| html/en/apm/server/master/elasticsearch-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/master/elasticsearch-output.html | |
| @@ -397,7 +397,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal"> | |
| + <a id="_enabled"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -521,7 +521,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_level_literal"> | |
| + <a id="_compression_level"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -548,7 +548,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_escape_html_literal"> | |
| + <a id="_escape_html"> | |
| </a> | |
| <code class="literal"> | |
| escape_html | |
| @@ -580,7 +580,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_worker_literal"> | |
| + <a id="_worker"> | |
| </a> | |
| <code class="literal"> | |
| worker | |
| @@ -604,7 +604,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_username_literal"> | |
| + <a id="_username"> | |
| </a> | |
| <code class="literal"> | |
| username | |
| @@ -625,7 +625,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_password_literal"> | |
| + <a id="_password"> | |
| </a> | |
| <code class="literal"> | |
| password | |
| @@ -646,7 +646,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_parameters_literal"> | |
| + <a id="_parameters"> | |
| </a> | |
| <code class="literal"> | |
| parameters | |
| @@ -731,7 +731,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_headers_literal"> | |
| + <a id="_headers"> | |
| </a> | |
| <code class="literal"> | |
| headers | |
| @@ -759,7 +759,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_proxy_url_literal"> | |
| + <a id="_proxy_url"> | |
| </a> | |
| <code class="literal"> | |
| proxy_url | |
| @@ -799,7 +799,11 @@ | |
| <p> | |
| The index name to write events to. The default is | |
| <code class="literal"> | |
| - "apm-8.0.0-transaction-2019-08-27" | |
| + "apm-%{[observer.version]}-{type}-%{+yyyy.MM.dd}" | |
| + </code> | |
| + (for example, | |
| + <code class="literal"> | |
| + "apm-8.0.0-transaction-2019-08-28" | |
| </code> | |
| ). See | |
| <a class="link" href="exploring-es-data.html" title="Exploring data in Elasticsearch"> | |
| @@ -1077,9 +1081,13 @@ | |
| </div> | |
| </div> | |
| <p> | |
| - This is the default configuration for APM Server and results in indices For example: | |
| - <code class="literal"> | |
| - "apm-8.0.0-transaction-2019-08-27" | |
| + This is the default configuration for APM Server and results in indices named in the following format: | |
| + <code class="literal"> | |
| + "apm-%{[observer.version]}-{type}-%{+yyyy.MM.dd}" | |
| + </code> | |
| + For example: | |
| + <code class="literal"> | |
| + "apm-8.0.0-transaction-2019-08-28" | |
| </code> | |
| . | |
| </p> | |
| @@ -1434,7 +1442,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_max_retries_literal"> | |
| + <a id="_max_retries"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -1465,7 +1473,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal"> | |
| + <a id="_bulk_max_size"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -1503,7 +1511,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_init_literal"> | |
| + <a id="_backoff_init"> | |
| </a> | |
| <code class="literal"> | |
| backoff.init | |
| @@ -1532,7 +1540,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_max_literal"> | |
| + <a id="_backoff_max"> | |
| </a> | |
| <code class="literal"> | |
| backoff.max | |
| @@ -1553,7 +1561,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_timeout_literal"> | |
| + <a id="_timeout"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -1574,7 +1582,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ssl_literal"> | |
| + <a id="_ssl"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| html/en/apm/server/master/enable-apm-server-debugging.html | |
| html/en/apm/server/master/error-api-examples.html | |
| html/en/apm/server/master/error-api.html | |
| html/en/apm/server/master/error-context-schema.html | |
| html/en/apm/server/master/error-endpoint.html | |
| html/en/apm/server/master/error-indices.html | |
| html/en/apm/server/master/error-payload-schema.html | |
| html/en/apm/server/master/error-schema-definition.html | |
| html/en/apm/server/master/error-service-schema.html | |
| html/en/apm/server/master/error-stacktraceframe-schema.html | |
| html/en/apm/server/master/error-system-schema.html | |
| html/en/apm/server/master/errors.html | |
| html/en/apm/server/master/event-types.html | |
| html/en/apm/server/master/events-api.html | |
| html/en/apm/server/master/example-intake-events.html | |
| html/en/apm/server/master/example-intakev2-events.html | |
| html/en/apm/server/master/exploring-es-data.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/master/exploring-es-data.html | |
| @@ -312,8 +312,8 @@ | |
| <p> | |
| To get an overview of existing indices you can run: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET _cat/indices/apm*</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET _cat/indices/apm*</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| @@ -370,16 +370,16 @@ | |
| <p> | |
| To query all documents collected with a specific APM Server version: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET apm-8.0.0-*/_search</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET apm-8.0.0-*/_search</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| <p> | |
| To query a specific type, for example transactions: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET apm-*transactions-*/_search</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET apm-*transactions-*/_search</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| @@ -398,16 +398,16 @@ | |
| </span> | |
| of the Elastic APM indices, first, run a query to find template names: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET _cat/templates/apm*</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET _cat/templates/apm*</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| <p> | |
| Then you can retrieve the specific template you are interested in: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">GET /_template/your-template-name</pre> | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">GET /_template/your-template-name</pre> | |
| </div> | |
| <div class="console_widget" data-snippet="snippet"> | |
| </div> | |
| html/en/apm/server/master/exported-fields-apm-error.html | |
| html/en/apm/server/master/exported-fields-apm-sourcemap.html | |
| html/en/apm/server/master/exported-fields-apm-span.html | |
| html/en/apm/server/master/exported-fields-apm-transaction.html | |
| html/en/apm/server/master/exported-fields-apm.html | |
| html/en/apm/server/master/exported-fields-beat-common.html | |
| html/en/apm/server/master/exported-fields-cloud.html | |
| html/en/apm/server/master/exported-fields-docker-processor.html | |
| html/en/apm/server/master/exported-fields-ecs.html | |
| html/en/apm/server/master/exported-fields-host-processor.html | |
| html/en/apm/server/master/exported-fields-kubernetes-processor.html | |
| html/en/apm/server/master/exported-fields-process.html | |
| html/en/apm/server/master/exported-fields-system.html | |
| html/en/apm/server/master/exported-fields.html | |
| html/en/apm/server/master/feature-roles.html | |
| html/en/apm/server/master/file-option.html | |
| html/en/apm/server/master/file-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/master/file-output.html | |
| @@ -327,7 +327,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_4"> | |
| + <a id="_enabled_4"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -372,7 +372,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_filename_literal"> | |
| + <a id="_filename"> | |
| </a> | |
| <code class="literal"> | |
| filename | |
| @@ -393,7 +393,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_rotate_every_kb_literal"> | |
| + <a id="_rotate_every_kb"> | |
| </a> | |
| <code class="literal"> | |
| rotate_every_kb | |
| @@ -414,7 +414,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_number_of_files_literal"> | |
| + <a id="_number_of_files"> | |
| </a> | |
| <code class="literal"> | |
| number_of_files | |
| @@ -441,7 +441,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_permissions_literal"> | |
| + <a id="_permissions"> | |
| </a> | |
| <code class="literal"> | |
| permissions | |
| @@ -462,7 +462,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_codec_literal_2"> | |
| + <a id="_codec_2"> | |
| </a> | |
| <code class="literal"> | |
| codec | |
| html/en/apm/server/master/getting-help.html | |
| html/en/apm/server/master/high-availability.html | |
| html/en/apm/server/master/ilm-default.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/master/ilm-default.html | |
| @@ -452,7 +452,7 @@ | |
| </div> | |
| </div> | |
| <h5> | |
| - <a id="_literal_ilm_enabled_auto_literal"> | |
| + <a id="_ilm_enabled_auto"> | |
| </a> | |
| <code class="literal"> | |
| ilm.enabled: "auto" | |
| @@ -510,7 +510,7 @@ | |
| If all three of the above conditions are true, ILM will be enabled. | |
| </p> | |
| <h5> | |
| - <a id="_literal_ilm_enabled_true_literal"> | |
| + <a id="_ilm_enabled_true"> | |
| </a> | |
| <code class="literal"> | |
| ilm.enabled: true | |
| @@ -531,7 +531,7 @@ | |
| . When this happens, the APM Server ignores any configured index settings. The configured output must still be set to Elasticsearch and the instance still needs to support ILM. If not, APM Server falls back to ordinary index management without ILM, and an error is logged. | |
| </p> | |
| <h5> | |
| - <a id="_literal_ilm_enabled_false_literal"> | |
| + <a id="_ilm_enabled_false"> | |
| </a> | |
| <code class="literal"> | |
| ilm.enabled: false | |
| html/en/apm/server/master/ilm.html | |
| html/en/apm/server/master/index.html | |
| html/en/apm/server/master/installing-on-windows.html | |
| html/en/apm/server/master/installing.html | |
| html/en/apm/server/master/intake-api.html | |
| html/en/apm/server/master/kafka-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/master/kafka-output.html | |
| @@ -377,7 +377,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_3"> | |
| + <a id="_enabled_3"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -405,7 +405,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_hosts_literal"> | |
| + <a id="_hosts"> | |
| </a> | |
| <code class="literal"> | |
| hosts | |
| @@ -426,7 +426,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_version_literal"> | |
| + <a id="_version"> | |
| </a> | |
| <code class="literal"> | |
| version | |
| @@ -468,7 +468,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_username_literal_2"> | |
| + <a id="_username_2"> | |
| </a> | |
| <code class="literal"> | |
| username | |
| @@ -489,7 +489,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_password_literal_2"> | |
| + <a id="_password_2"> | |
| </a> | |
| <code class="literal"> | |
| password | |
| @@ -710,7 +710,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_key_literal"> | |
| + <a id="_key"> | |
| </a> | |
| <code class="literal"> | |
| key | |
| @@ -731,7 +731,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_partition_literal"> | |
| + <a id="_partition"> | |
| </a> | |
| <code class="literal"> | |
| partition | |
| @@ -837,7 +837,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_client_id_literal"> | |
| + <a id="_client_id"> | |
| </a> | |
| <code class="literal"> | |
| client_id | |
| @@ -858,7 +858,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_worker_literal_3"> | |
| + <a id="_worker_3"> | |
| </a> | |
| <code class="literal"> | |
| worker | |
| @@ -879,7 +879,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_codec_literal"> | |
| + <a id="_codec"> | |
| </a> | |
| <code class="literal"> | |
| codec | |
| @@ -911,7 +911,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_metadata_literal"> | |
| + <a id="_metadata"> | |
| </a> | |
| <code class="literal"> | |
| metadata | |
| @@ -1000,7 +1000,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_max_retries_literal_3"> | |
| + <a id="_max_retries_3"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -1031,7 +1031,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal_3"> | |
| + <a id="_bulk_max_size_3"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -1052,7 +1052,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_flush_frequency_literal"> | |
| + <a id="_bulk_flush_frequency"> | |
| </a> | |
| <code class="literal"> | |
| bulk_flush_frequency | |
| @@ -1073,7 +1073,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_timeout_literal_3"> | |
| + <a id="_timeout_3"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -1094,7 +1094,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_broker_timeout_literal"> | |
| + <a id="_broker_timeout"> | |
| </a> | |
| <code class="literal"> | |
| broker_timeout | |
| @@ -1115,7 +1115,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_channel_buffer_size_literal"> | |
| + <a id="_channel_buffer_size"> | |
| </a> | |
| <code class="literal"> | |
| channel_buffer_size | |
| @@ -1136,7 +1136,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_keep_alive_literal"> | |
| + <a id="_keep_alive"> | |
| </a> | |
| <code class="literal"> | |
| keep_alive | |
| @@ -1157,7 +1157,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_literal"> | |
| + <a id="_compression"> | |
| </a> | |
| <code class="literal"> | |
| compression | |
| @@ -1198,7 +1198,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_level_literal_3"> | |
| + <a id="_compression_level_3"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -1250,7 +1250,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_required_acks_literal"> | |
| + <a id="_required_acks"> | |
| </a> | |
| <code class="literal"> | |
| required_acks | |
| @@ -1274,7 +1274,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ssl_literal_3"> | |
| + <a id="_ssl_3"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| html/en/apm/server/master/keystore.html | |
| html/en/apm/server/master/linux-seccomp.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/master/linux-seccomp.html | |
| @@ -469,6 +469,12 @@ | |
| <dd> | |
| A list of system call names. The system call name must exist for the runtime architecture, otherwise an error will be logged and the filter will not be installed. At least one system call must be defined. | |
| </dd> | |
| + </dl> | |
| + </div> | |
| + <div class="variablelist"> | |
| + <a id="seccomp-policy-config-action"> | |
| + </a> | |
| + <dl class="variablelist"> | |
| <dt> | |
| <span class="term"> | |
| <span class="strong strong"> | |
| @@ -489,8 +495,6 @@ | |
| is executed. This is required. These are the available action values. The actions that are available depend on the kernel version. | |
| </p> | |
| <div class="itemizedlist"> | |
| - <a id="seccomp-policy-config-action"> | |
| - </a> | |
| <ul class="itemizedlist" type="disc"> | |
| <li class="listitem"> | |
| <code class="literal"> | |
| html/en/apm/server/master/load-dashboards-logstash.html | |
| html/en/apm/server/master/load-kibana-dashboards.html | |
| html/en/apm/server/master/logstash-output.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/master/logstash-output.html | |
| @@ -293,6 +293,9 @@ | |
| <img alt="Important" src="images/icons/important.png"/> | |
| </div> | |
| <div class="admon_content"> | |
| + <h3> | |
| + Prerequisite | |
| + </h3> | |
| <p> | |
| To send events to Logstash, you also need to create a Logstash configuration pipeline that listens for incoming Beats connections and indexes the received events into Elasticsearch. For more information, see the section about | |
| <a class="ulink" href="https://www.elastic.co/guide/en/elastic-stack-get-started/master/get-started-elastic-stack.html#logstash-setup" target="_top"> | |
| @@ -631,7 +634,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_enabled_literal_2"> | |
| + <a id="_enabled_2"> | |
| </a> | |
| <code class="literal"> | |
| enabled | |
| @@ -679,7 +682,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_compression_level_literal_2"> | |
| + <a id="_compression_level_2"> | |
| </a> | |
| <code class="literal"> | |
| compression_level | |
| @@ -706,7 +709,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_escape_html_literal_2"> | |
| + <a id="_escape_html_2"> | |
| </a> | |
| <code class="literal"> | |
| escape_html | |
| @@ -738,7 +741,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_worker_literal_2"> | |
| + <a id="_worker_2"> | |
| </a> | |
| <code class="literal"> | |
| worker | |
| @@ -786,7 +789,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ttl_literal"> | |
| + <a id="_ttl"> | |
| </a> | |
| <code class="literal"> | |
| ttl | |
| @@ -820,7 +823,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_pipelining_literal"> | |
| + <a id="_pipelining"> | |
| </a> | |
| <code class="literal"> | |
| pipelining | |
| @@ -845,7 +848,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_proxy_url_literal_2"> | |
| + <a id="_proxy_url_2"> | |
| </a> | |
| <code class="literal"> | |
| proxy_url | |
| @@ -945,7 +948,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_ssl_literal_2"> | |
| + <a id="_ssl_2"> | |
| </a> | |
| <code class="literal"> | |
| ssl | |
| @@ -976,7 +979,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_timeout_literal_2"> | |
| + <a id="_timeout_2"> | |
| </a> | |
| <code class="literal"> | |
| timeout | |
| @@ -997,7 +1000,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_max_retries_literal_2"> | |
| + <a id="_max_retries_2"> | |
| </a> | |
| <code class="literal"> | |
| max_retries | |
| @@ -1028,7 +1031,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_bulk_max_size_literal_2"> | |
| + <a id="_bulk_max_size_2"> | |
| </a> | |
| <code class="literal"> | |
| bulk_max_size | |
| @@ -1066,7 +1069,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_slow_start_literal"> | |
| + <a id="_slow_start"> | |
| </a> | |
| <code class="literal"> | |
| slow_start | |
| @@ -1098,7 +1101,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_init_literal_2"> | |
| + <a id="_backoff_init_2"> | |
| </a> | |
| <code class="literal"> | |
| backoff.init | |
| @@ -1127,7 +1130,7 @@ | |
| <div> | |
| <div> | |
| <h4 class="title"> | |
| - <a id="_literal_backoff_max_literal_2"> | |
| + <a id="_backoff_max_2"> | |
| </a> | |
| <code class="literal"> | |
| backoff.max | |
| html/en/apm/server/master/manage-indices-kibana.html | |
| html/en/apm/server/master/manual-ilm-setup.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/master/manual-ilm-setup.html | |
| @@ -709,8 +709,8 @@ | |
| </code> | |
| overwrites defaults rather than being merged. This means you’ll need to configure all of your indices in the file, even if some are not using ILM. | |
| </p> | |
| - <div class="pre_wrapper lang-yml"> | |
| - <pre class="programlisting prettyprint lang-yml">output.elasticsearch: | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">output.elasticsearch: | |
| indices: | |
| - index: "apm-8.0.0-sourcemap" | |
| when.contains: | |
| html/en/apm/server/master/max_request_queue_time.html | |
| html/en/apm/server/master/max_unzipped_size.html | |
| html/en/apm/server/master/metadata-api.html | |
| html/en/apm/server/master/metrics.enabled.html | |
| html/en/apm/server/master/metricset-api.html | |
| html/en/apm/server/master/metricset-indices.html | |
| html/en/apm/server/master/monitoring-internal-collection.html | |
| html/en/apm/server/master/monitoring-metricbeat-collection.html | |
| html/en/apm/server/master/monitoring.html | |
| html/en/apm/server/master/overview.html | |
| html/en/apm/server/master/payload-with-error.html | |
| html/en/apm/server/master/payload-with-minimal-exception.html | |
| html/en/apm/server/master/payload-with-minimal-log.html | |
| html/en/apm/server/master/payload-with-minimal-span.html | |
| html/en/apm/server/master/payload-with-minimal-transaction.html | |
| html/en/apm/server/master/payload-with-transactions.html | |
| html/en/apm/server/master/processing-performance.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/master/processing-performance.html | |
| @@ -425,7 +425,7 @@ | |
| </table> | |
| </div> | |
| <p> | |
| - In other words, a 512 Mb instance can process ~3 Mbs per second, while an 8 Gb instance can process ~20 Mbs per second. | |
| + In other words, a 512 Mb instance can process \~3 Mbs per second, while an 8 Gb instance can process ~20 Mbs per second. | |
| </p> | |
| <p> | |
| APM Server is CPU bound, so it scales better from 2 Gb to 8 Gb than it does from 512 Mb to 2 Gb. This is because larger instance types in Elastic Cloud come with much more computing power. | |
| html/en/apm/server/master/rate_limit_v1.html | |
| html/en/apm/server/master/redirects.html | |
| html/en/apm/server/master/reduce-storage.html | |
| html/en/apm/server/master/release-notes-6.1.0.html | |
| html/en/apm/server/master/release-notes-6.1.1.html | |
| html/en/apm/server/master/release-notes-6.1.2.html | |
| html/en/apm/server/master/release-notes-6.1.3.html | |
| html/en/apm/server/master/release-notes-6.1.4.html | |
| html/en/apm/server/master/release-notes-6.1.html | |
| html/en/apm/server/master/release-notes-6.2.0.html | |
| html/en/apm/server/master/release-notes-6.2.1.html | |
| html/en/apm/server/master/release-notes-6.2.2.html | |
| html/en/apm/server/master/release-notes-6.2.3.html | |
| html/en/apm/server/master/release-notes-6.2.4.html | |
| html/en/apm/server/master/release-notes-6.2.html | |
| html/en/apm/server/master/release-notes-6.3.0.html | |
| html/en/apm/server/master/release-notes-6.3.1.html | |
| html/en/apm/server/master/release-notes-6.3.2.html | |
| html/en/apm/server/master/release-notes-6.3.html | |
| html/en/apm/server/master/release-notes-6.4.0.html | |
| html/en/apm/server/master/release-notes-6.4.1.html | |
| html/en/apm/server/master/release-notes-6.4.2.html | |
| html/en/apm/server/master/release-notes-6.4.3.html | |
| html/en/apm/server/master/release-notes-6.4.html | |
| html/en/apm/server/master/release-notes-6.5.0.html | |
| html/en/apm/server/master/release-notes-6.5.1.html | |
| html/en/apm/server/master/release-notes-6.5.2.html | |
| html/en/apm/server/master/release-notes-6.5.3.html | |
| html/en/apm/server/master/release-notes-6.5.4.html | |
| html/en/apm/server/master/release-notes-6.5.html | |
| html/en/apm/server/master/release-notes-6.6.0.html | |
| html/en/apm/server/master/release-notes-6.6.1.html | |
| html/en/apm/server/master/release-notes-6.6.2.html | |
| html/en/apm/server/master/release-notes-6.6.html | |
| html/en/apm/server/master/release-notes-6.7.0.html | |
| html/en/apm/server/master/release-notes-6.7.1.html | |
| html/en/apm/server/master/release-notes-6.7.2.html | |
| html/en/apm/server/master/release-notes-6.7.html | |
| html/en/apm/server/master/release-notes-6.8.0.html | |
| html/en/apm/server/master/release-notes-6.8.html | |
| html/en/apm/server/master/release-notes-7.0.0-alpha1.html | |
| html/en/apm/server/master/release-notes-7.0.0-alpha2.html | |
| html/en/apm/server/master/release-notes-7.0.0-beta1.html | |
| html/en/apm/server/master/release-notes-7.0.0-rc1.html | |
| html/en/apm/server/master/release-notes-7.0.0-rc2.html | |
| html/en/apm/server/master/release-notes-7.0.0.html | |
| html/en/apm/server/master/release-notes-7.0.1.html | |
| html/en/apm/server/master/release-notes-7.0.html | |
| html/en/apm/server/master/release-notes-7.1.0.html | |
| html/en/apm/server/master/release-notes-7.1.1.html | |
| html/en/apm/server/master/release-notes-7.1.html | |
| html/en/apm/server/master/release-notes-7.2.0.html | |
| html/en/apm/server/master/release-notes-7.2.1.html | |
| html/en/apm/server/master/release-notes-7.2.html | |
| html/en/apm/server/master/release-notes-7.3.0.html | |
| html/en/apm/server/master/release-notes-7.3.html | |
| html/en/apm/server/master/release-notes-head.html | |
| html/en/apm/server/master/release-notes.html | |
| html/en/apm/server/master/request-too-large.html | |
| html/en/apm/server/master/rum.html | |
| html/en/apm/server/master/running-on-docker.html | |
| html/en/apm/server/master/running-with-systemd.html | |
| html/en/apm/server/master/securing-apm-server.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/master/securing-apm-server.html | |
| @@ -315,7 +315,7 @@ | |
| <a id="security-overview"> | |
| </a> | |
| Security Overview | |
| - <a class="edit_me" href="https://github.com/elastic/apm-server/edit/master/docs/security.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| + <a class="edit_me" href="https://github.com/elastic/apm-server/edit/master/docs/copied-from-beats/shared-securing-beat.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| edit | |
| </a> | |
| </h3> | |
| @@ -326,7 +326,7 @@ | |
| <a id="secret-token"> | |
| </a> | |
| Secret token | |
| - <a class="edit_me" href="https://github.com/elastic/apm-server/edit/master/docs/security.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| + <a class="edit_me" href="https://github.com/elastic/apm-server/edit/master/docs/copied-from-beats/shared-securing-beat.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| edit | |
| </a> | |
| </h4> | |
| @@ -347,7 +347,7 @@ | |
| <a id="ssl-setup"> | |
| </a> | |
| SSL/TLS setup | |
| - <a class="edit_me" href="https://github.com/elastic/apm-server/edit/master/docs/security.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| + <a class="edit_me" href="https://github.com/elastic/apm-server/edit/master/docs/copied-from-beats/shared-securing-beat.asciidoc" rel="nofollow" title="Edit this page on GitHub"> | |
| edit | |
| </a> | |
| </h4> | |
| html/en/apm/server/master/securing-beats.html | |
| html/en/apm/server/master/securing-communication-elasticsearch.html | |
| html/en/apm/server/master/server-info.html | |
| html/en/apm/server/master/setting-up-and-running.html | |
| html/en/apm/server/master/setup-kibana-endpoint.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/master/setup-kibana-endpoint.html | |
| @@ -365,7 +365,7 @@ | |
| to use APM Agent configuration. | |
| </p> | |
| <h4> | |
| - <a id="_literal_apm_server_kibana_host_literal"> | |
| + <a id="_apm_server_kibana_host"> | |
| </a> | |
| <code class="literal"> | |
| apm-server.kibana.host | |
| @@ -488,7 +488,7 @@ | |
| apm-server.kibana.path: /kibana</pre> | |
| </div> | |
| <h4> | |
| - <a id="_literal_apm_server_kibana_username_literal"> | |
| + <a id="_apm_server_kibana_username"> | |
| </a> | |
| <code class="literal"> | |
| apm-server.kibana.username | |
| @@ -505,7 +505,7 @@ | |
| specified for the Elasticsearch output. | |
| </p> | |
| <h4> | |
| - <a id="_literal_apm_server_kibana_password_literal"> | |
| + <a id="_apm_server_kibana_password"> | |
| </a> | |
| <code class="literal"> | |
| apm-server.kibana.password | |
| @@ -535,7 +535,7 @@ | |
| An HTTP path prefix that is prepended to the HTTP API calls. This is useful for the cases where Kibana listens behind an HTTP reverse proxy that exports the API under a custom prefix. | |
| </p> | |
| <h4> | |
| - <a id="_literal_apm_server_kibana_ssl_enabled_literal"> | |
| + <a id="_apm_server_kibana_ssl_enabled"> | |
| </a> | |
| <code class="literal"> | |
| apm-server.kibana.ssl.enabled | |
| @@ -590,7 +590,7 @@ | |
| config file: | |
| </p> | |
| <h4> | |
| - <a id="_literal_agent_config_cache_expiration_literal"> | |
| + <a id="_agent_config_cache_expiration"> | |
| </a> | |
| <code class="literal"> | |
| agent.config.cache.expiration | |
| html/en/apm/server/master/setup-repositories.html | |
| html/en/apm/server/master/sizing-guide.html | |
| html/en/apm/server/master/sourcemap-api.html | |
| html/en/apm/server/master/sourcemap-indices.html | |
| html/en/apm/server/master/sourcemaps.html | |
| html/en/apm/server/master/span-api.html | |
| html/en/apm/server/master/span-indices.html | |
| html/en/apm/server/master/storage-management.html | |
| html/en/apm/server/master/toc.html | |
| html/en/apm/server/master/transaction-api-examples.html | |
| html/en/apm/server/master/transaction-api.html | |
| html/en/apm/server/master/transaction-context-schema.html | |
| html/en/apm/server/master/transaction-endpoint.html | |
| html/en/apm/server/master/transaction-indices.html | |
| html/en/apm/server/master/transaction-payload-schema.html | |
| html/en/apm/server/master/transaction-request-schema.html | |
| html/en/apm/server/master/transaction-schema-definition.html | |
| html/en/apm/server/master/transaction-service-schema.html | |
| html/en/apm/server/master/transaction-span-schema.html | |
| html/en/apm/server/master/transaction-stacktraceframe-schema.html | |
| html/en/apm/server/master/transaction-system-schema.html | |
| html/en/apm/server/master/transaction-user-schema.html | |
| html/en/apm/server/master/transactions-spans.html | |
| html/en/apm/server/master/transactions.html | |
| html/en/apm/server/master/troubleshooting.html | |
| html/en/apm/server/master/tune-apm-server.html | |
| html/en/apm/server/master/tune-data-ingestion.html | |
| html/en/apm/server/master/tune-es.html | |
| html/en/apm/server/master/update-existing-data.html | |
| --- /dev/fd/63 | |
| +++ html/en/apm/server/master/update-existing-data.html | |
| @@ -300,8 +300,8 @@ | |
| <p> | |
| To rename a service, send the following request: | |
| </p> | |
| - <div class="pre_wrapper lang-sh"> | |
| - <pre class="programlisting prettyprint lang-sh">POST /apm-*/_update_by_query | |
| + <div class="pre_wrapper lang-console"> | |
| + <pre class="programlisting prettyprint lang-console">POST /apm-*/_update_by_query | |
| { | |
| "query": { | |
| "term": { | |
| html/en/apm/server/master/upgrading-to-65.html | |
| html/en/apm/server/master/upgrading-to-70.html | |
| html/en/apm/server/master/upgrading.html | |
| html/en/apm/server/master/url-option.html | |
| html/en/apm/server/master/use-v1-and-v2.html | |
| html/en/apm/server/master/using-environ-vars.html | |
| html/en/apm/server/master/why-separate-component.html |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment