You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by ep...@apache.org on 2022/06/29 15:20:17 UTC

[airflow] 32/45: Docs: Fix default 2.2.5 log_id_template (#24455)

This is an automated email from the ASF dual-hosted git repository.

ephraimanierobi pushed a commit to branch v2-3-test
in repository https://gitbox.apache.org/repos/asf/airflow.git

commit 45b308750f5d4e6b03e01cd36ec76eb19a5a9e07
Author: Jed Cunningham <66...@users.noreply.github.com>
AuthorDate: Tue Jun 14 17:30:09 2022 -0600

    Docs: Fix default 2.2.5 log_id_template (#24455)
    
    I accidentally got the wrong default for 2.2.5 when documenting how
    to fix elasticsearch remote logging after upgrading to 2.3.0+.
    
    (cherry picked from commit c8fa9e96e29f9f8b4ff9c7db416097fb70a87c2d)
---
 RELEASE_NOTES.rst                                             | 2 +-
 docs/apache-airflow-providers-elasticsearch/logging/index.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/RELEASE_NOTES.rst b/RELEASE_NOTES.rst
index 66edcf9c90..9629aebedf 100644
--- a/RELEASE_NOTES.rst
+++ b/RELEASE_NOTES.rst
@@ -256,7 +256,7 @@ containing your previous ``log_id_template`` and ``log_filename_template``. For
 
 .. code-block:: sql
 
-    INSERT INTO log_template (id, filename, elasticsearch_id, created_at) VALUES (0, '{{ ti.dag_id }}/{{ ti.task_id }}/{{ ts }}/{{ try_number }}.log', '{dag_id}_{task_id}_{run_id}_{try_number}', NOW());
+    INSERT INTO log_template (id, filename, elasticsearch_id, created_at) VALUES (0, '{{ ti.dag_id }}/{{ ti.task_id }}/{{ ts }}/{{ try_number }}.log', '{dag_id}-{task_id}-{execution_date}-{try_number}', NOW());
 
 BaseOperatorLink's ``get_link`` method changed to take a ``ti_key`` keyword argument (#21798)
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
diff --git a/docs/apache-airflow-providers-elasticsearch/logging/index.rst b/docs/apache-airflow-providers-elasticsearch/logging/index.rst
index d2f237d6bd..eb2acc55d2 100644
--- a/docs/apache-airflow-providers-elasticsearch/logging/index.rst
+++ b/docs/apache-airflow-providers-elasticsearch/logging/index.rst
@@ -95,4 +95,4 @@ containing your previous ``log_id_template``. For example, if you used the defau
 
 .. code-block:: sql
 
-    INSERT INTO log_template (id, filename, elasticsearch_id, created_at) VALUES (0, '{{ ti.dag_id }}/{{ ti.task_id }}/{{ ts }}/{{ try_number }}.log', '{dag_id}_{task_id}_{run_id}_{try_number}', NOW());
+    INSERT INTO log_template (id, filename, elasticsearch_id, created_at) VALUES (0, '{{ ti.dag_id }}/{{ ti.task_id }}/{{ ts }}/{{ try_number }}.log', '{dag_id}-{task_id}-{execution_date}-{try_number}', NOW());