From 7289845b0ad9175cd880b246b6ad8f173ba081f0 Mon Sep 17 00:00:00 2001 From: Kaxil Naik Date: Thu, 12 Nov 2020 12:47:16 +0000 Subject: [PATCH] Remove deprecated Elasticsearch Configs (#12296) Since Airflow 1.10.4 we have removed `elasticsearch_` prefix from all config items under `[elasticsearch]` section. It is time we remove them from 2.0. https://github.com/apache/airflow/blob/1.10.4/UPDATING.md#changes-in-writing-logs-to-elasticsearch --- airflow/configuration.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/airflow/configuration.py b/airflow/configuration.py index 4ae0ce1ca0dc..92790d1fb763 100644 --- a/airflow/configuration.py +++ b/airflow/configuration.py @@ -137,13 +137,6 @@ class AirflowConfigParser(ConfigParser): # pylint: disable=too-many-ancestors # When reading new option, the old option will be checked to see if it exists. If it does a # DeprecationWarning will be issued and the old option will be used instead deprecated_options = { - ('elasticsearch', 'host'): ('elasticsearch', 'elasticsearch_host'), - ('elasticsearch', 'log_id_template'): ('elasticsearch', 'elasticsearch_log_id_template'), - ('elasticsearch', 'end_of_log_mark'): ('elasticsearch', 'elasticsearch_end_of_log_mark'), - ('elasticsearch', 'frontend'): ('elasticsearch', 'elasticsearch_frontend'), - ('elasticsearch', 'write_stdout'): ('elasticsearch', 'elasticsearch_write_stdout'), - ('elasticsearch', 'json_format'): ('elasticsearch', 'elasticsearch_json_format'), - ('elasticsearch', 'json_fields'): ('elasticsearch', 'elasticsearch_json_fields'), ('logging', 'base_log_folder'): ('core', 'base_log_folder'), ('logging', 'remote_logging'): ('core', 'remote_logging'), ('logging', 'remote_log_conn_id'): ('core', 'remote_log_conn_id'),