You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by as...@apache.org on 2021/07/28 12:33:29 UTC

[airflow-ci-infra] branch fix-log-shipping-config created (now 7fbce6b)

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

ash pushed a change to branch fix-log-shipping-config
in repository https://gitbox.apache.org/repos/asf/airflow-ci-infra.git.


      at 7fbce6b  Update to vector 0.15 syntax

This branch includes the following new commits:

     new 7fbce6b  Update to vector 0.15 syntax

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


[airflow-ci-infra] 01/01: Update to vector 0.15 syntax

Posted by as...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ash pushed a commit to branch fix-log-shipping-config
in repository https://gitbox.apache.org/repos/asf/airflow-ci-infra.git

commit 7fbce6bd95aa3112309dfac8be3a423cb3e397d8
Author: Ash Berlin-Taylor <as...@firemirror.com>
AuthorDate: Wed Jul 28 13:30:22 2021 +0100

    Update to vector 0.15 syntax
    
    Vector 0.15 had a breaking change that stopped our config working, so
    rather than only noticing at run time, fail at build time
---
 github-runner-ami/packer/files/install-dependencies.sh | 5 ++++-
 github-runner-ami/packer/files/vector.toml             | 3 +--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/github-runner-ami/packer/files/install-dependencies.sh b/github-runner-ami/packer/files/install-dependencies.sh
index 81d1663..db329d0 100644
--- a/github-runner-ami/packer/files/install-dependencies.sh
+++ b/github-runner-ami/packer/files/install-dependencies.sh
@@ -39,8 +39,11 @@ apt-get install -yq --no-install-recommends -o Dpkg::Options::="--force-confold"
             python3-venv \
             python3-wheel \
             yarn \
-            vector
+            vector='0.15.*'
 
 
 # Re-enabled in clout-init once AWS_DEFAULT_REGION env var is set
 systemctl disable vector
+
+# validate the vector config file we have already installed
+sudo -u vector vector validate --deny-warnings
diff --git a/github-runner-ami/packer/files/vector.toml b/github-runner-ami/packer/files/vector.toml
index 07da3a0..81112e6 100644
--- a/github-runner-ami/packer/files/vector.toml
+++ b/github-runner-ami/packer/files/vector.toml
@@ -59,8 +59,7 @@ data_dir = "/var/lib/vector"
 [transforms.filter-runner-logs]
   type = "filter"
   inputs = ['grok-runner-logs']
-  condition.type = "remap"
-  condition.source = '''
+  condition = '''
     if .logger == "JobServerQueue" {
       !match!(.message, r'Try to append \d+ batches web console lines for record')
     } else if .logger == "HostContext" {