You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by pi...@apache.org on 2023/03/06 21:47:02 UTC
[airflow] 18/37: Don't get ES log template from airflow local settings unless necessary (#28882)
This is an automated email from the ASF dual-hosted git repository.
pierrejeambrun pushed a commit to branch v2-5-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 0cb731c3944b46e670e9edbb74d333ac275da70b
Author: Daniel Standish <15...@users.noreply.github.com>
AuthorDate: Fri Jan 13 13:40:11 2023 -0800
Don't get ES log template from airflow local settings unless necessary (#28882)
This creates an unnecessary warning.
(cherry picked from commit c5ee4b8a3a2266ef98b379ee28ed68ff1b59ac5f)
---
airflow/config_templates/airflow_local_settings.py | 2 --
1 file changed, 2 deletions(-)
diff --git a/airflow/config_templates/airflow_local_settings.py b/airflow/config_templates/airflow_local_settings.py
index 01edea7520..b606a00018 100644
--- a/airflow/config_templates/airflow_local_settings.py
+++ b/airflow/config_templates/airflow_local_settings.py
@@ -287,7 +287,6 @@ if REMOTE_LOGGING:
}
DEFAULT_LOGGING_CONFIG["handlers"].update(OSS_REMOTE_HANDLERS)
elif ELASTICSEARCH_HOST:
- ELASTICSEARCH_LOG_ID_TEMPLATE: str = conf.get_mandatory_value("elasticsearch", "LOG_ID_TEMPLATE")
ELASTICSEARCH_END_OF_LOG_MARK: str = conf.get_mandatory_value("elasticsearch", "END_OF_LOG_MARK")
ELASTICSEARCH_FRONTEND: str = conf.get_mandatory_value("elasticsearch", "frontend")
ELASTICSEARCH_WRITE_STDOUT: bool = conf.getboolean("elasticsearch", "WRITE_STDOUT")
@@ -301,7 +300,6 @@ if REMOTE_LOGGING:
"class": "airflow.providers.elasticsearch.log.es_task_handler.ElasticsearchTaskHandler",
"formatter": "airflow",
"base_log_folder": str(os.path.expanduser(BASE_LOG_FOLDER)),
- "log_id_template": ELASTICSEARCH_LOG_ID_TEMPLATE,
"filename_template": FILENAME_TEMPLATE,
"end_of_log_mark": ELASTICSEARCH_END_OF_LOG_MARK,
"host": ELASTICSEARCH_HOST,