You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by GitBox <gi...@apache.org> on 2020/06/01 12:56:25 UTC
[GitHub] [airflow] ashb opened a new pull request #9092: airflow_local_settings is not a "template" file
ashb opened a new pull request #9092:
URL: https://github.com/apache/airflow/pull/9092
All of the other files in the config_templates are that -- templates,
but airflow_local_settings as it was was the actual file used by running
installs.
For the sake of clarity let's move it.
(This has also bugged me for a while, as it's name clashes with the actual airflow_local_settings that we try to load from settings.py. This file has never been the same as that.)
---
Make sure to mark the boxes below before creating PR: [x]
- [x] Description above provides context of the change
- [x] Unit tests coverage for changes (not needed for documentation changes)
- [x] Target Github ISSUE in description if exists
- [x] Commits follow "[How to write a good git commit message](http://chris.beams.io/posts/git-commit/)"
- [x] Relevant documentation is updated including usage instructions.
- [x] I will engage committers as explained in [Contribution Workflow Example](https://github.com/apache/airflow/blob/master/CONTRIBUTING.rst#contribution-workflow-example).
---
In case of fundamental code change, Airflow Improvement Proposal ([AIP](https://cwiki.apache.org/confluence/display/AIRFLOW/Airflow+Improvements+Proposals)) is needed.
In case of a new dependency, check compliance with the [ASF 3rd Party License Policy](https://www.apache.org/legal/resolved.html#category-x).
In case of backwards incompatible changes please leave a note in [UPDATING.md](https://github.com/apache/airflow/blob/master/UPDATING.md).
Read the [Pull Request Guidelines](https://github.com/apache/airflow/blob/master/CONTRIBUTING.rst#pull-request-guidelines) for more information.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] kaxil commented on a change in pull request #9092: airflow_local_settings is not a "template" file
Posted by GitBox <gi...@apache.org>.
kaxil commented on a change in pull request #9092:
URL: https://github.com/apache/airflow/pull/9092#discussion_r433222777
##########
File path: airflow/logging_config.py
##########
@@ -54,8 +58,8 @@ def configure_logging():
else:
logging_class_path = 'airflow.config_templates.' \
'airflow_local_settings.DEFAULT_LOGGING_CONFIG'
- logging_config = import_string(logging_class_path)
- log.debug('Unable to load custom logging, using default config instead')
+ logging_config = DEFAULT_LOGGING_CONFIG
+ log.debug('Using default loggin config instead')
Review comment:
```suggestion
log.debug('Using default logging config instead')
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] stale[bot] commented on pull request #9092: airflow_local_settings is not a "template" file
Posted by GitBox <gi...@apache.org>.
stale[bot] commented on pull request #9092:
URL: https://github.com/apache/airflow/pull/9092#issuecomment-660659060
This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] ashb commented on pull request #9092: airflow_local_settings is not a "template" file
Posted by GitBox <gi...@apache.org>.
ashb commented on pull request #9092:
URL: https://github.com/apache/airflow/pull/9092#issuecomment-637049545
> Should we update docs?
> https://airflow.readthedocs.io/en/latest/howto/write-logs.html#advanced-configuration
Oh yes, good call.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] kaxil commented on a change in pull request #9092: airflow_local_settings is not a "template" file
Posted by GitBox <gi...@apache.org>.
kaxil commented on a change in pull request #9092:
URL: https://github.com/apache/airflow/pull/9092#discussion_r433223379
##########
File path: airflow/logging_config.py
##########
@@ -54,8 +58,8 @@ def configure_logging():
else:
logging_class_path = 'airflow.config_templates.' \
'airflow_local_settings.DEFAULT_LOGGING_CONFIG'
Review comment:
```suggestion
logging_class_path = 'airflow.logging_config.DEFAULT_LOGGING_CONFIG'
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] kaxil commented on a change in pull request #9092: airflow_local_settings is not a "template" file
Posted by GitBox <gi...@apache.org>.
kaxil commented on a change in pull request #9092:
URL: https://github.com/apache/airflow/pull/9092#discussion_r433224621
##########
File path: airflow/logging_config.py
##########
@@ -54,8 +58,8 @@ def configure_logging():
else:
logging_class_path = 'airflow.config_templates.' \
'airflow_local_settings.DEFAULT_LOGGING_CONFIG'
Review comment:
I think we can just remove this line entirely since the CONFIG is now in this file itself
```suggestion
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] ashb commented on a change in pull request #9092: airflow_local_settings is not a "template" file
Posted by GitBox <gi...@apache.org>.
ashb commented on a change in pull request #9092:
URL: https://github.com/apache/airflow/pull/9092#discussion_r435235727
##########
File path: airflow/logging_config.py
##########
@@ -54,8 +58,8 @@ def configure_logging():
else:
logging_class_path = 'airflow.config_templates.' \
'airflow_local_settings.DEFAULT_LOGGING_CONFIG'
Review comment:
I think this is still needed for the "reload logging config" hack we pull in a few places. (Dag file processor is the one that comes to mind)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] ashb commented on pull request #9092: airflow_local_settings is not a "template" file
Posted by GitBox <gi...@apache.org>.
ashb commented on pull request #9092:
URL: https://github.com/apache/airflow/pull/9092#issuecomment-637049988
I made a hash of this PR, will re-ping once I've sorted it out.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] mik-laj commented on a change in pull request #9092: airflow_local_settings is not a "template" file
Posted by GitBox <gi...@apache.org>.
mik-laj commented on a change in pull request #9092:
URL: https://github.com/apache/airflow/pull/9092#discussion_r433248371
##########
File path: airflow/logging_config.py
##########
@@ -99,3 +103,234 @@ def _get_handler(name):
"Configured task_log_reader {!r} was not a handler of the 'airflow.task' "
"logger.".format(task_log_reader)
)
+
+
+# TODO: Logging format and level should be configured
+# in this file instead of from airflow.cfg. Currently
+# there are other log format and level configurations in
+# settings.py and cli.py. Please see AIRFLOW-1455.
+LOG_LEVEL: str = conf.get('logging', 'LOGGING_LEVEL').upper()
+
+
+# Flask appbuilder's info level log is very verbose,
+# so it's set to 'WARN' by default.
+FAB_LOG_LEVEL: str = conf.get('logging', 'FAB_LOGGING_LEVEL').upper()
+
+LOG_FORMAT: str = conf.get('logging', 'LOG_FORMAT')
+
+COLORED_LOG_FORMAT: str = conf.get('logging', 'COLORED_LOG_FORMAT')
+
+COLORED_LOG: bool = conf.getboolean('logging', 'COLORED_CONSOLE_LOG')
+
+COLORED_FORMATTER_CLASS: str = conf.get('logging', 'COLORED_FORMATTER_CLASS')
+
+BASE_LOG_FOLDER: str = conf.get('logging', 'BASE_LOG_FOLDER')
+
+PROCESSOR_LOG_FOLDER: str = conf.get('scheduler', 'CHILD_PROCESS_LOG_DIRECTORY')
+
+DAG_PROCESSOR_MANAGER_LOG_LOCATION: str = conf.get('logging', 'DAG_PROCESSOR_MANAGER_LOG_LOCATION')
+
+FILENAME_TEMPLATE: str = conf.get('logging', 'LOG_FILENAME_TEMPLATE')
+
+PROCESSOR_FILENAME_TEMPLATE: str = conf.get('logging', 'LOG_PROCESSOR_FILENAME_TEMPLATE')
+
+DEFAULT_LOGGING_CONFIG: Dict[str, Any] = {
+ 'version': 1,
+ 'disable_existing_loggers': False,
+ 'formatters': {
+ 'airflow': {
+ 'format': LOG_FORMAT
+ },
+ 'airflow_coloured': {
+ 'format': COLORED_LOG_FORMAT if COLORED_LOG else LOG_FORMAT,
+ 'class': COLORED_FORMATTER_CLASS if COLORED_LOG else 'logging.Formatter'
+ },
+ },
+ 'handlers': {
+ 'console': {
+ 'class': 'airflow.utils.log.logging_mixin.RedirectStdHandler',
+ 'formatter': 'airflow_coloured',
+ 'stream': 'sys.stdout'
+ },
+ 'task': {
+ 'class': 'airflow.utils.log.file_task_handler.FileTaskHandler',
+ 'formatter': 'airflow',
+ 'base_log_folder': os.path.expanduser(BASE_LOG_FOLDER),
+ 'filename_template': FILENAME_TEMPLATE,
+ },
+ 'processor': {
+ 'class': 'airflow.utils.log.file_processor_handler.FileProcessorHandler',
+ 'formatter': 'airflow',
+ 'base_log_folder': os.path.expanduser(PROCESSOR_LOG_FOLDER),
+ 'filename_template': PROCESSOR_FILENAME_TEMPLATE,
+ }
+ },
+ 'loggers': {
+ 'airflow.processor': {
+ 'handlers': ['processor'],
+ 'level': LOG_LEVEL,
+ 'propagate': False,
+ },
+ 'airflow.task': {
+ 'handlers': ['task'],
+ 'level': LOG_LEVEL,
+ 'propagate': False,
+ },
+ 'flask_appbuilder': {
+ 'handler': ['console'],
+ 'level': FAB_LOG_LEVEL,
+ 'propagate': True,
+ }
+ },
+ 'root': {
+ 'handlers': ['console'],
+ 'level': LOG_LEVEL,
+ }
+}
+
+DEFAULT_DAG_PARSING_LOGGING_CONFIG: Dict[str, Dict[str, Dict[str, Any]]] = {
+ 'handlers': {
+ 'processor_manager': {
+ 'class': 'logging.handlers.RotatingFileHandler',
+ 'formatter': 'airflow',
+ 'filename': DAG_PROCESSOR_MANAGER_LOG_LOCATION,
+ 'mode': 'a',
+ 'maxBytes': 104857600, # 100MB
+ 'backupCount': 5
+ }
+ },
+ 'loggers': {
+ 'airflow.processor_manager': {
+ 'handlers': ['processor_manager'],
+ 'level': LOG_LEVEL,
+ 'propagate': False,
+ }
+ }
+}
+
+# Only update the handlers and loggers when CONFIG_PROCESSOR_MANAGER_LOGGER is set.
+# This is to avoid exceptions when initializing RotatingFileHandler multiple times
+# in multiple processes.
+if os.environ.get('CONFIG_PROCESSOR_MANAGER_LOGGER') == 'True':
+ DEFAULT_LOGGING_CONFIG['handlers'] \
+ .update(DEFAULT_DAG_PARSING_LOGGING_CONFIG['handlers'])
+ DEFAULT_LOGGING_CONFIG['loggers'] \
+ .update(DEFAULT_DAG_PARSING_LOGGING_CONFIG['loggers'])
+
+ # Manually create log directory for processor_manager handler as RotatingFileHandler
+ # will only create file but not the directory.
+ processor_manager_handler_config: Dict[str, Any] = \
+ DEFAULT_DAG_PARSING_LOGGING_CONFIG['handlers']['processor_manager']
+ directory: str = os.path.dirname(processor_manager_handler_config['filename'])
+ mkdirs(directory, 0o755)
+
+##################
+# Remote logging #
+##################
+
+REMOTE_LOGGING: bool = conf.getboolean('logging', 'remote_logging')
+
+if REMOTE_LOGGING:
+
+ ELASTICSEARCH_HOST: str = conf.get('elasticsearch', 'HOST')
+
+ # Storage bucket URL for remote logging
+ # S3 buckets should start with "s3://"
+ # Cloudwatch log groups should start with "cloudwatch://"
+ # GCS buckets should start with "gs://"
+ # WASB buckets should start with "wasb"
+ # just to help Airflow select correct handler
+ REMOTE_BASE_LOG_FOLDER: str = conf.get('logging', 'REMOTE_BASE_LOG_FOLDER')
+
+ if REMOTE_BASE_LOG_FOLDER.startswith('s3://'):
+ S3_REMOTE_HANDLERS: Dict[str, Dict[str, str]] = {
+ 'task': {
+ 'class': 'airflow.utils.log.s3_task_handler.S3TaskHandler',
+ 'formatter': 'airflow',
+ 'base_log_folder': str(os.path.expanduser(BASE_LOG_FOLDER)),
+ 's3_log_folder': REMOTE_BASE_LOG_FOLDER,
+ 'filename_template': FILENAME_TEMPLATE,
+ },
+ }
+
+ DEFAULT_LOGGING_CONFIG['handlers'].update(S3_REMOTE_HANDLERS)
+ elif REMOTE_BASE_LOG_FOLDER.startswith('cloudwatch://'):
+ CLOUDWATCH_REMOTE_HANDLERS: Dict[str, Dict[str, str]] = {
+ 'task': {
+ 'class': 'airflow.utils.log.cloudwatch_task_handler.CloudwatchTaskHandler',
+ 'formatter': 'airflow',
+ 'base_log_folder': str(os.path.expanduser(BASE_LOG_FOLDER)),
+ 'log_group_arn': urlparse(REMOTE_BASE_LOG_FOLDER).netloc,
+ 'filename_template': FILENAME_TEMPLATE,
+ },
+ }
+
+ DEFAULT_LOGGING_CONFIG['handlers'].update(CLOUDWATCH_REMOTE_HANDLERS)
+ elif REMOTE_BASE_LOG_FOLDER.startswith('gs://'):
+ GCS_REMOTE_HANDLERS: Dict[str, Dict[str, str]] = {
+ 'task': {
+ 'class': 'airflow.utils.log.gcs_task_handler.GCSTaskHandler',
+ 'formatter': 'airflow',
+ 'base_log_folder': str(os.path.expanduser(BASE_LOG_FOLDER)),
+ 'gcs_log_folder': REMOTE_BASE_LOG_FOLDER,
+ 'filename_template': FILENAME_TEMPLATE,
+ },
+ }
+
+ DEFAULT_LOGGING_CONFIG['handlers'].update(GCS_REMOTE_HANDLERS)
+ elif REMOTE_BASE_LOG_FOLDER.startswith('wasb'):
+ WASB_REMOTE_HANDLERS: Dict[str, Dict[str, Union[str, bool]]] = {
+ 'task': {
+ 'class': 'airflow.utils.log.wasb_task_handler.WasbTaskHandler',
+ 'formatter': 'airflow',
+ 'base_log_folder': str(os.path.expanduser(BASE_LOG_FOLDER)),
+ 'wasb_log_folder': REMOTE_BASE_LOG_FOLDER,
+ 'wasb_container': 'airflow-logs',
+ 'filename_template': FILENAME_TEMPLATE,
+ 'delete_local_copy': False,
+ },
+ }
+
+ DEFAULT_LOGGING_CONFIG['handlers'].update(WASB_REMOTE_HANDLERS)
+ elif REMOTE_BASE_LOG_FOLDER.startswith('stackdriver://'):
+ gcp_conn_id = conf.get('core', 'REMOTE_LOG_CONN_ID', fallback=None)
+ # stackdriver:///airflow-tasks => airflow-tasks
+ log_name = urlparse(REMOTE_BASE_LOG_FOLDER).path[1:]
+ STACKDRIVER_REMOTE_HANDLERS = {
+ 'task': {
+ 'class': 'airflow.utils.log.stackdriver_task_handler.StackdriverTaskHandler',
+ 'formatter': 'airflow',
+ 'name': log_name,
+ 'gcp_conn_id': gcp_conn_id
+ }
+ }
+
+ DEFAULT_LOGGING_CONFIG['handlers'].update(STACKDRIVER_REMOTE_HANDLERS)
+ elif ELASTICSEARCH_HOST:
+ ELASTICSEARCH_LOG_ID_TEMPLATE: str = conf.get('elasticsearch', 'LOG_ID_TEMPLATE')
+ ELASTICSEARCH_END_OF_LOG_MARK: str = conf.get('elasticsearch', 'END_OF_LOG_MARK')
+ ELASTICSEARCH_WRITE_STDOUT: bool = conf.getboolean('elasticsearch', 'WRITE_STDOUT')
+ ELASTICSEARCH_JSON_FORMAT: bool = conf.getboolean('elasticsearch', 'JSON_FORMAT')
+ ELASTICSEARCH_JSON_FIELDS: str = conf.get('elasticsearch', 'JSON_FIELDS')
+
+ ELASTIC_REMOTE_HANDLERS: Dict[str, Dict[str, Union[str, bool]]] = {
+ 'task': {
+ 'class': 'airflow.utils.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,
+ 'write_stdout': ELASTICSEARCH_WRITE_STDOUT,
+ 'json_format': ELASTICSEARCH_JSON_FORMAT,
+ 'json_fields': ELASTICSEARCH_JSON_FIELDS
+ },
+ }
+
+ DEFAULT_LOGGING_CONFIG['handlers'].update(ELASTIC_REMOTE_HANDLERS)
+ else:
+ raise AirflowException(
Review comment:
This will block the configuration of other task handlers? Previously you could overwrite the entire file, so it wasn't a big problem.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] kaxil commented on a change in pull request #9092: airflow_local_settings is not a "template" file
Posted by GitBox <gi...@apache.org>.
kaxil commented on a change in pull request #9092:
URL: https://github.com/apache/airflow/pull/9092#discussion_r433220734
##########
File path: UPDATING.md
##########
@@ -458,6 +458,15 @@ The following configurations have been moved from `[core]` to the new `[logging]
* `dag_processor_manager_log_location`
* `task_log_reader`
+### Default logging config has moved
+
+The default logging config has moved from
+`airflow.config_templates.airflow_local_settings.DEFAULT_LOGGING_CONFIG` to
+`airflow.logging_config.DEFAULT_LOGGING_CONFIG`
+
+Most users will not need to take any action as a result of this change. (If you have a custom logging config
+which imports the base one you will recive a deprecation warning.)
Review comment:
```suggestion
which imports the base one you will receive a deprecation warning.)
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] kaxil commented on a change in pull request #9092: airflow_local_settings is not a "template" file
Posted by GitBox <gi...@apache.org>.
kaxil commented on a change in pull request #9092:
URL: https://github.com/apache/airflow/pull/9092#discussion_r433224247
##########
File path: airflow/logging_config.py
##########
@@ -54,8 +58,8 @@ def configure_logging():
else:
logging_class_path = 'airflow.config_templates.' \
'airflow_local_settings.DEFAULT_LOGGING_CONFIG'
- logging_config = import_string(logging_class_path)
- log.debug('Unable to load custom logging, using default config instead')
+ logging_config = DEFAULT_LOGGING_CONFIG
Review comment:
Where is this coming from? Don't we need: `import_string(logging_class_path)` line ?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] ashb edited a comment on pull request #9092: airflow_local_settings is not a "template" file
Posted by GitBox <gi...@apache.org>.
ashb edited a comment on pull request #9092:
URL: https://github.com/apache/airflow/pull/9092#issuecomment-637049545
> Should we update docs?
> https://airflow.readthedocs.io/en/latest/howto/write-logs.html#advanced-configuration
Oh yes, good call. Done now.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] kaxil commented on a change in pull request #9092: airflow_local_settings is not a "template" file
Posted by GitBox <gi...@apache.org>.
kaxil commented on a change in pull request #9092:
URL: https://github.com/apache/airflow/pull/9092#discussion_r433221380
##########
File path: airflow/config_templates/airflow_local_settings.py
##########
@@ -15,242 +15,15 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-"""Airflow logging settings"""
+"""This module is deprecated. Please use `airflow.logging_config` instead"""
-import os
-from typing import Any, Dict, Union
-from urllib.parse import urlparse
+import warnings
-from airflow.configuration import conf
-from airflow.exceptions import AirflowException
-from airflow.utils.file import mkdirs
+# pylint: disable=unused-import
+from airflow.logging_config import AwsLambdaHook # noqa
Review comment:
```suggestion
from airflow.logging_config import DEFAULT_LOGGING_CONFIG # noqa
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] ashb commented on a change in pull request #9092: airflow_local_settings is not a "template" file
Posted by GitBox <gi...@apache.org>.
ashb commented on a change in pull request #9092:
URL: https://github.com/apache/airflow/pull/9092#discussion_r435234824
##########
File path: airflow/logging_config.py
##########
@@ -99,3 +103,234 @@ def _get_handler(name):
"Configured task_log_reader {!r} was not a handler of the 'airflow.task' "
"logger.".format(task_log_reader)
)
+
+
+# TODO: Logging format and level should be configured
+# in this file instead of from airflow.cfg. Currently
+# there are other log format and level configurations in
+# settings.py and cli.py. Please see AIRFLOW-1455.
+LOG_LEVEL: str = conf.get('logging', 'LOGGING_LEVEL').upper()
+
+
+# Flask appbuilder's info level log is very verbose,
+# so it's set to 'WARN' by default.
+FAB_LOG_LEVEL: str = conf.get('logging', 'FAB_LOGGING_LEVEL').upper()
+
+LOG_FORMAT: str = conf.get('logging', 'LOG_FORMAT')
+
+COLORED_LOG_FORMAT: str = conf.get('logging', 'COLORED_LOG_FORMAT')
+
+COLORED_LOG: bool = conf.getboolean('logging', 'COLORED_CONSOLE_LOG')
+
+COLORED_FORMATTER_CLASS: str = conf.get('logging', 'COLORED_FORMATTER_CLASS')
+
+BASE_LOG_FOLDER: str = conf.get('logging', 'BASE_LOG_FOLDER')
+
+PROCESSOR_LOG_FOLDER: str = conf.get('scheduler', 'CHILD_PROCESS_LOG_DIRECTORY')
+
+DAG_PROCESSOR_MANAGER_LOG_LOCATION: str = conf.get('logging', 'DAG_PROCESSOR_MANAGER_LOG_LOCATION')
+
+FILENAME_TEMPLATE: str = conf.get('logging', 'LOG_FILENAME_TEMPLATE')
+
+PROCESSOR_FILENAME_TEMPLATE: str = conf.get('logging', 'LOG_PROCESSOR_FILENAME_TEMPLATE')
+
+DEFAULT_LOGGING_CONFIG: Dict[str, Any] = {
+ 'version': 1,
+ 'disable_existing_loggers': False,
+ 'formatters': {
+ 'airflow': {
+ 'format': LOG_FORMAT
+ },
+ 'airflow_coloured': {
+ 'format': COLORED_LOG_FORMAT if COLORED_LOG else LOG_FORMAT,
+ 'class': COLORED_FORMATTER_CLASS if COLORED_LOG else 'logging.Formatter'
+ },
+ },
+ 'handlers': {
+ 'console': {
+ 'class': 'airflow.utils.log.logging_mixin.RedirectStdHandler',
+ 'formatter': 'airflow_coloured',
+ 'stream': 'sys.stdout'
+ },
+ 'task': {
+ 'class': 'airflow.utils.log.file_task_handler.FileTaskHandler',
+ 'formatter': 'airflow',
+ 'base_log_folder': os.path.expanduser(BASE_LOG_FOLDER),
+ 'filename_template': FILENAME_TEMPLATE,
+ },
+ 'processor': {
+ 'class': 'airflow.utils.log.file_processor_handler.FileProcessorHandler',
+ 'formatter': 'airflow',
+ 'base_log_folder': os.path.expanduser(PROCESSOR_LOG_FOLDER),
+ 'filename_template': PROCESSOR_FILENAME_TEMPLATE,
+ }
+ },
+ 'loggers': {
+ 'airflow.processor': {
+ 'handlers': ['processor'],
+ 'level': LOG_LEVEL,
+ 'propagate': False,
+ },
+ 'airflow.task': {
+ 'handlers': ['task'],
+ 'level': LOG_LEVEL,
+ 'propagate': False,
+ },
+ 'flask_appbuilder': {
+ 'handler': ['console'],
+ 'level': FAB_LOG_LEVEL,
+ 'propagate': True,
+ }
+ },
+ 'root': {
+ 'handlers': ['console'],
+ 'level': LOG_LEVEL,
+ }
+}
+
+DEFAULT_DAG_PARSING_LOGGING_CONFIG: Dict[str, Dict[str, Dict[str, Any]]] = {
+ 'handlers': {
+ 'processor_manager': {
+ 'class': 'logging.handlers.RotatingFileHandler',
+ 'formatter': 'airflow',
+ 'filename': DAG_PROCESSOR_MANAGER_LOG_LOCATION,
+ 'mode': 'a',
+ 'maxBytes': 104857600, # 100MB
+ 'backupCount': 5
+ }
+ },
+ 'loggers': {
+ 'airflow.processor_manager': {
+ 'handlers': ['processor_manager'],
+ 'level': LOG_LEVEL,
+ 'propagate': False,
+ }
+ }
+}
+
+# Only update the handlers and loggers when CONFIG_PROCESSOR_MANAGER_LOGGER is set.
+# This is to avoid exceptions when initializing RotatingFileHandler multiple times
+# in multiple processes.
+if os.environ.get('CONFIG_PROCESSOR_MANAGER_LOGGER') == 'True':
+ DEFAULT_LOGGING_CONFIG['handlers'] \
+ .update(DEFAULT_DAG_PARSING_LOGGING_CONFIG['handlers'])
+ DEFAULT_LOGGING_CONFIG['loggers'] \
+ .update(DEFAULT_DAG_PARSING_LOGGING_CONFIG['loggers'])
+
+ # Manually create log directory for processor_manager handler as RotatingFileHandler
+ # will only create file but not the directory.
+ processor_manager_handler_config: Dict[str, Any] = \
+ DEFAULT_DAG_PARSING_LOGGING_CONFIG['handlers']['processor_manager']
+ directory: str = os.path.dirname(processor_manager_handler_config['filename'])
+ mkdirs(directory, 0o755)
+
+##################
+# Remote logging #
+##################
+
+REMOTE_LOGGING: bool = conf.getboolean('logging', 'remote_logging')
+
+if REMOTE_LOGGING:
+
+ ELASTICSEARCH_HOST: str = conf.get('elasticsearch', 'HOST')
+
+ # Storage bucket URL for remote logging
+ # S3 buckets should start with "s3://"
+ # Cloudwatch log groups should start with "cloudwatch://"
+ # GCS buckets should start with "gs://"
+ # WASB buckets should start with "wasb"
+ # just to help Airflow select correct handler
+ REMOTE_BASE_LOG_FOLDER: str = conf.get('logging', 'REMOTE_BASE_LOG_FOLDER')
+
+ if REMOTE_BASE_LOG_FOLDER.startswith('s3://'):
+ S3_REMOTE_HANDLERS: Dict[str, Dict[str, str]] = {
+ 'task': {
+ 'class': 'airflow.utils.log.s3_task_handler.S3TaskHandler',
+ 'formatter': 'airflow',
+ 'base_log_folder': str(os.path.expanduser(BASE_LOG_FOLDER)),
+ 's3_log_folder': REMOTE_BASE_LOG_FOLDER,
+ 'filename_template': FILENAME_TEMPLATE,
+ },
+ }
+
+ DEFAULT_LOGGING_CONFIG['handlers'].update(S3_REMOTE_HANDLERS)
+ elif REMOTE_BASE_LOG_FOLDER.startswith('cloudwatch://'):
+ CLOUDWATCH_REMOTE_HANDLERS: Dict[str, Dict[str, str]] = {
+ 'task': {
+ 'class': 'airflow.utils.log.cloudwatch_task_handler.CloudwatchTaskHandler',
+ 'formatter': 'airflow',
+ 'base_log_folder': str(os.path.expanduser(BASE_LOG_FOLDER)),
+ 'log_group_arn': urlparse(REMOTE_BASE_LOG_FOLDER).netloc,
+ 'filename_template': FILENAME_TEMPLATE,
+ },
+ }
+
+ DEFAULT_LOGGING_CONFIG['handlers'].update(CLOUDWATCH_REMOTE_HANDLERS)
+ elif REMOTE_BASE_LOG_FOLDER.startswith('gs://'):
+ GCS_REMOTE_HANDLERS: Dict[str, Dict[str, str]] = {
+ 'task': {
+ 'class': 'airflow.utils.log.gcs_task_handler.GCSTaskHandler',
+ 'formatter': 'airflow',
+ 'base_log_folder': str(os.path.expanduser(BASE_LOG_FOLDER)),
+ 'gcs_log_folder': REMOTE_BASE_LOG_FOLDER,
+ 'filename_template': FILENAME_TEMPLATE,
+ },
+ }
+
+ DEFAULT_LOGGING_CONFIG['handlers'].update(GCS_REMOTE_HANDLERS)
+ elif REMOTE_BASE_LOG_FOLDER.startswith('wasb'):
+ WASB_REMOTE_HANDLERS: Dict[str, Dict[str, Union[str, bool]]] = {
+ 'task': {
+ 'class': 'airflow.utils.log.wasb_task_handler.WasbTaskHandler',
+ 'formatter': 'airflow',
+ 'base_log_folder': str(os.path.expanduser(BASE_LOG_FOLDER)),
+ 'wasb_log_folder': REMOTE_BASE_LOG_FOLDER,
+ 'wasb_container': 'airflow-logs',
+ 'filename_template': FILENAME_TEMPLATE,
+ 'delete_local_copy': False,
+ },
+ }
+
+ DEFAULT_LOGGING_CONFIG['handlers'].update(WASB_REMOTE_HANDLERS)
+ elif REMOTE_BASE_LOG_FOLDER.startswith('stackdriver://'):
+ gcp_conn_id = conf.get('core', 'REMOTE_LOG_CONN_ID', fallback=None)
+ # stackdriver:///airflow-tasks => airflow-tasks
+ log_name = urlparse(REMOTE_BASE_LOG_FOLDER).path[1:]
+ STACKDRIVER_REMOTE_HANDLERS = {
+ 'task': {
+ 'class': 'airflow.utils.log.stackdriver_task_handler.StackdriverTaskHandler',
+ 'formatter': 'airflow',
+ 'name': log_name,
+ 'gcp_conn_id': gcp_conn_id
+ }
+ }
+
+ DEFAULT_LOGGING_CONFIG['handlers'].update(STACKDRIVER_REMOTE_HANDLERS)
+ elif ELASTICSEARCH_HOST:
+ ELASTICSEARCH_LOG_ID_TEMPLATE: str = conf.get('elasticsearch', 'LOG_ID_TEMPLATE')
+ ELASTICSEARCH_END_OF_LOG_MARK: str = conf.get('elasticsearch', 'END_OF_LOG_MARK')
+ ELASTICSEARCH_WRITE_STDOUT: bool = conf.getboolean('elasticsearch', 'WRITE_STDOUT')
+ ELASTICSEARCH_JSON_FORMAT: bool = conf.getboolean('elasticsearch', 'JSON_FORMAT')
+ ELASTICSEARCH_JSON_FIELDS: str = conf.get('elasticsearch', 'JSON_FIELDS')
+
+ ELASTIC_REMOTE_HANDLERS: Dict[str, Dict[str, Union[str, bool]]] = {
+ 'task': {
+ 'class': 'airflow.utils.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,
+ 'write_stdout': ELASTICSEARCH_WRITE_STDOUT,
+ 'json_format': ELASTICSEARCH_JSON_FORMAT,
+ 'json_fields': ELASTICSEARCH_JSON_FIELDS
+ },
+ }
+
+ DEFAULT_LOGGING_CONFIG['handlers'].update(ELASTIC_REMOTE_HANDLERS)
+ else:
+ raise AirflowException(
Review comment:
Good spot. I'll have a think.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] mik-laj commented on pull request #9092: airflow_local_settings is not a "template" file
Posted by GitBox <gi...@apache.org>.
mik-laj commented on pull request #9092:
URL: https://github.com/apache/airflow/pull/9092#issuecomment-636875319
Should we update docs?
https://airflow.readthedocs.io/en/latest/howto/write-logs.html#advanced-configuration
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] ashb commented on a change in pull request #9092: airflow_local_settings is not a "template" file
Posted by GitBox <gi...@apache.org>.
ashb commented on a change in pull request #9092:
URL: https://github.com/apache/airflow/pull/9092#discussion_r433246412
##########
File path: airflow/config_templates/airflow_local_settings.py
##########
@@ -15,242 +15,15 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-"""Airflow logging settings"""
+"""This module is deprecated. Please use `airflow.logging_config` instead"""
-import os
-from typing import Any, Dict, Union
-from urllib.parse import urlparse
+import warnings
-from airflow.configuration import conf
-from airflow.exceptions import AirflowException
-from airflow.utils.file import mkdirs
+# pylint: disable=unused-import
+from airflow.logging_config import AwsLambdaHook # noqa
Review comment:
Whoops!
Was in a rush to get this finished before heading off for the afternoon
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] kaxil commented on a change in pull request #9092: airflow_local_settings is not a "template" file
Posted by GitBox <gi...@apache.org>.
kaxil commented on a change in pull request #9092:
URL: https://github.com/apache/airflow/pull/9092#discussion_r433221096
##########
File path: airflow/config_templates/airflow_local_settings.py
##########
@@ -15,242 +15,15 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-"""Airflow logging settings"""
+"""This module is deprecated. Please use `airflow.logging_config` instead"""
-import os
-from typing import Any, Dict, Union
-from urllib.parse import urlparse
+import warnings
-from airflow.configuration import conf
-from airflow.exceptions import AirflowException
-from airflow.utils.file import mkdirs
+# pylint: disable=unused-import
+from airflow.logging_config import AwsLambdaHook # noqa
Review comment:
This doesn't look right
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org