[jira] [Commented] (AIRFLOW-3111) Confusing comments and instructions for log templates in UPDATING.md and default_airflow.cfg

2018-09-25 Thread Eric Chang (JIRA) 


[ 
https://issues.apache.org/jira/browse/AIRFLOW-3111?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16628140#comment-16628140
 ] 

Eric Chang commented on AIRFLOW-3111:
-

Yep, closed it. Thanks!

> Confusing comments and instructions for log templates in UPDATING.md and 
> default_airflow.cfg
> 
>
> Key: AIRFLOW-3111
> URL: https://issues.apache.org/jira/browse/AIRFLOW-3111
> Project: Apache Airflow
>  Issue Type: Bug
>Reporter: Eric Chang
>Assignee: Eric Chang
>Priority: Minor
>
> The new 1.10 release includes instructions on updating the *airflow.cfg* 
> options core.log_filename_template and 
> elasticsearch.elasticsearch_log_id_template that are technically incorrect:
>  
> {code:java}
> // UPDATING.md
> ...the following defaults need to be added.
> [core]
> log_filename_template =  ti.dag_id / ti.task_id / ts 
> / try_number .log
> [elasticsearch]
> elasticsearch_log_id_template = 
> {{dag_id}}-{{task_id}}-{{execution_date}}-{{try_number}}{code}
>  
> Inserting the above options into an existing *airflow.cfg* will result in a 
> jinja parse failure because `` is not a valid template string. The reason 
> the extra braces are necessary is because the default *airflow.cfg* copied to 
> AIRFLOW_HOME is a rendered version of *default_airflow.cfg* (rendered by 
> *airflow.configuration.parameterized_config*).
> The confusion is compounded by several comments copied over to *airflow.cfg* 
> stating that
>  
> {code:java}
> # we need to escape the curly braces by adding an additional curly brace
> {code}
> But that's is only true for *default_airflow.cfg* and doesn't apply to the 
> actual *airflow.cfg*.
> I'll submit a PR that corrects this.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[jira] [Commented] (AIRFLOW-3111) Confusing comments and instructions for log templates in UPDATING.md and default_airflow.cfg

2018-09-25 Thread Tao Feng (JIRA) 


[ 
https://issues.apache.org/jira/browse/AIRFLOW-3111?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16628014#comment-16628014
 ] 

Tao Feng commented on AIRFLOW-3111:
---

I don't have permission to close the ticket. Could you close the ticket given 
it is merged?

> Confusing comments and instructions for log templates in UPDATING.md and 
> default_airflow.cfg
> 
>
> Key: AIRFLOW-3111
> URL: https://issues.apache.org/jira/browse/AIRFLOW-3111
> Project: Apache Airflow
>  Issue Type: Bug
>Reporter: Eric Chang
>Assignee: Eric Chang
>Priority: Minor
>
> The new 1.10 release includes instructions on updating the *airflow.cfg* 
> options core.log_filename_template and 
> elasticsearch.elasticsearch_log_id_template that are technically incorrect:
>  
> {code:java}
> // UPDATING.md
> ...the following defaults need to be added.
> [core]
> log_filename_template =  ti.dag_id / ti.task_id / ts 
> / try_number .log
> [elasticsearch]
> elasticsearch_log_id_template = 
> {{dag_id}}-{{task_id}}-{{execution_date}}-{{try_number}}{code}
>  
> Inserting the above options into an existing *airflow.cfg* will result in a 
> jinja parse failure because `` is not a valid template string. The reason 
> the extra braces are necessary is because the default *airflow.cfg* copied to 
> AIRFLOW_HOME is a rendered version of *default_airflow.cfg* (rendered by 
> *airflow.configuration.parameterized_config*).
> The confusion is compounded by several comments copied over to *airflow.cfg* 
> stating that
>  
> {code:java}
> # we need to escape the curly braces by adding an additional curly brace
> {code}
> But that's is only true for *default_airflow.cfg* and doesn't apply to the 
> actual *airflow.cfg*.
> I'll submit a PR that corrects this.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[jira] [Commented] (AIRFLOW-3111) Confusing comments and instructions for log templates in UPDATING.md and default_airflow.cfg

2018-09-25 Thread ASF GitHub Bot (JIRA) 


[ 
https://issues.apache.org/jira/browse/AIRFLOW-3111?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16627594#comment-16627594
 ] 

ASF GitHub Bot commented on AIRFLOW-3111:
-

feng-tao closed pull request #3944: [AIRFLOW-3111] Fix instructions in 
UPDATING.md and remove comment artifacts
URL: https://github.com/apache/incubator-airflow/pull/3944
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/UPDATING.md b/UPDATING.md
index 4fd45b2c0e..93ea069838 100644
--- a/UPDATING.md
+++ b/UPDATING.md
@@ -134,11 +134,11 @@ With Airflow 1.9 or lower, `FILENAME_TEMPLATE`, 
`PROCESSOR_FILENAME_TEMPLATE`, `
 ```
 [core]
 fab_logging_level = WARN
-log_filename_template =  ti.dag_id / ti.task_id / ts 
/ try_number .log
-log_processor_filename_template =  filename .log
+log_filename_template = {{ ti.dag_id }}/{{ ti.task_id }}/{{ ts }}/{{ 
try_number }}.log
+log_processor_filename_template = {{ filename }}.log
 
 [elasticsearch]
-elasticsearch_log_id_template = 
{{dag_id}}-{{task_id}}-{{execution_date}}-{{try_number}}
+elasticsearch_log_id_template = 
{dag_id}-{task_id}-{execution_date}-{try_number}
 elasticsearch_end_of_log_mark = end_of_log
 ```
 
diff --git a/airflow/config_templates/default_airflow.cfg 
b/airflow/config_templates/default_airflow.cfg
index 8d068c5428..0028d7832f 100644
--- a/airflow/config_templates/default_airflow.cfg
+++ b/airflow/config_templates/default_airflow.cfg
@@ -62,12 +62,10 @@ fab_logging_level = WARN
 logging_config_class =
 
 # Log format
-# we need to escape the curly braces by adding an additional curly brace
 log_format = [%%(asctime)s] {{%%(filename)s:%%(lineno)d}} %%(levelname)s - 
%%(message)s
 simple_log_format = %%(asctime)s %%(levelname)s - %%(message)s
 
 # Log filename format
-# we need to escape the curly braces by adding an additional curly brace
 log_filename_template =  ti.dag_id / ti.task_id / ts 
/ try_number .log
 log_processor_filename_template =  filename .log
 
@@ -561,7 +559,6 @@ hide_sensitive_variable_fields = True
 
 [elasticsearch]
 elasticsearch_host =
-# we need to escape the curly braces by adding an additional curly brace
 elasticsearch_log_id_template = 
{{dag_id}}-{{task_id}}-{{execution_date}}-{{try_number}}
 elasticsearch_end_of_log_mark = end_of_log
 


 


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


> Confusing comments and instructions for log templates in UPDATING.md and 
> default_airflow.cfg
> 
>
> Key: AIRFLOW-3111
> URL: https://issues.apache.org/jira/browse/AIRFLOW-3111
> Project: Apache Airflow
>  Issue Type: Bug
>Reporter: Eric Chang
>Assignee: Eric Chang
>Priority: Minor
>
> The new 1.10 release includes instructions on updating the *airflow.cfg* 
> options core.log_filename_template and 
> elasticsearch.elasticsearch_log_id_template that are technically incorrect:
>  
> {code:java}
> // UPDATING.md
> ...the following defaults need to be added.
> [core]
> log_filename_template =  ti.dag_id / ti.task_id / ts 
> / try_number .log
> [elasticsearch]
> elasticsearch_log_id_template = 
> {{dag_id}}-{{task_id}}-{{execution_date}}-{{try_number}}{code}
>  
> Inserting the above options into an existing *airflow.cfg* will result in a 
> jinja parse failure because `` is not a valid template string. The reason 
> the extra braces are necessary is because the default *airflow.cfg* copied to 
> AIRFLOW_HOME is a rendered version of *default_airflow.cfg* (rendered by 
> *airflow.configuration.parameterized_config*).
> The confusion is compounded by several comments copied over to *airflow.cfg* 
> stating that
>  
> {code:java}
> # we need to escape the curly braces by adding an additional curly brace
> {code}
> But that's is only true for *default_airflow.cfg* and doesn't apply to the 
> actual *airflow.cfg*.
> I'll submit a PR that corrects this.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[jira] [Commented] (AIRFLOW-3111) Confusing comments and instructions for log templates in UPDATING.md and default_airflow.cfg

2018-09-24 Thread ASF GitHub Bot (JIRA) 


[ 
https://issues.apache.org/jira/browse/AIRFLOW-3111?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16626578#comment-16626578
 ] 

ASF GitHub Bot commented on AIRFLOW-3111:
-

chang opened a new pull request #3944: [AIRFLOW-3111] Fix instructions in 
UPDATING.md and remove comment artifacts
URL: https://github.com/apache/incubator-airflow/pull/3944
 
 
   Make sure you have checked _all_ steps below.
   
   ### Jira
   
   - [x] My PR addresses the following [Airflow 
Jira](https://issues.apache.org/jira/browse/AIRFLOW/) issues and references 
them in the PR title. For example, "\[AIRFLOW-XXX\] My Airflow PR"
 - https://issues.apache.org/jira/browse/AIRFLOW-XXX
 - In case you are fixing a typo in the documentation you can prepend your 
commit with \[AIRFLOW-XXX\], code changes always need a Jira issue.
   
   ### Description
   
   - [x] Here are some details about my PR, including screenshots of any UI 
changes:
   
   - fixed incorrect instructions in `UPDATING.md` about adding the options 
`core.log_filename_template` and `elasticsearch.elasticsearch_log_id_template`
   - removed comments referencing "additional curly braces" from
   `default_airflow.cfg` since they're irrelevant to the rendered `airflow.cfg`
   
   
   ### Tests
   
   - [x] My PR adds the following unit tests __OR__ does not need testing for 
this extremely good reason: 
   
   Just updating documentation and removing comments.
   
   ### Commits
   
   - [x] My commits all reference Jira issues in their subject lines, and I 
have squashed multiple commits if they address the same issue. In addition, my 
commits follow the guidelines from "[How to write a good git commit 
message](http://chris.beams.io/posts/git-commit/)":
 1. Subject is separated from body by a blank line
 1. Subject is limited to 50 characters (not including Jira issue reference)
 1. Subject does not end with a period
 1. Subject uses the imperative mood ("add", not "adding")
 1. Body wraps at 72 characters
 1. Body explains "what" and "why", not "how"
   
   ### Documentation
   
   - [x] In case of new functionality, my PR adds documentation that describes 
how to use it.
 - When adding new operators/hooks/sensors, the autoclass documentation 
generation needs to be added.
   
   ### Code Quality
   
   - [x] Passes `git diff upstream/master -u -- "*.py" | flake8 --diff`
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


> Confusing comments and instructions for log templates in UPDATING.md and 
> default_airflow.cfg
> 
>
> Key: AIRFLOW-3111
> URL: https://issues.apache.org/jira/browse/AIRFLOW-3111
> Project: Apache Airflow
>  Issue Type: Bug
>Reporter: Eric Chang
>Assignee: Eric Chang
>Priority: Minor
>
> The new 1.10 release includes instructions on updating the *airflow.cfg* 
> options core.log_filename_template and 
> elasticsearch.elasticsearch_log_id_template that are technically incorrect:
>  
> {code:java}
> // UPDATING.md
> ...the following defaults need to be added.
> [core]
> log_filename_template =  ti.dag_id / ti.task_id / ts 
> / try_number .log
> [elasticsearch]
> elasticsearch_log_id_template = 
> {{dag_id}}-{{task_id}}-{{execution_date}}-{{try_number}}{code}
>  
> Inserting the above options into an existing *airflow.cfg* will result in a 
> jinja parse failure because `` is not a valid template string. The reason 
> the extra braces are necessary is because the default *airflow.cfg* copied to 
> AIRFLOW_HOME is a rendered version of *default_airflow.cfg* (rendered by 
> *airflow.configuration.parameterized_config*).
> The confusion is compounded by several comments copied over to *airflow.cfg* 
> stating that
>  
> {code:java}
> # we need to escape the curly braces by adding an additional curly brace
> {code}
> But that's is only true for *default_airflow.cfg* and doesn't apply to the 
> actual *airflow.cfg*.
> I'll submit a PR that corrects this.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)