Merge "post - get loki-log: revert to previous command"

playbooks/upgrade.yaml

@@ -5,7 +5,6 @@
     - setup-env
     - sanity-check
     - sfconfig-dev-prepare
-    - setup-log-forwarding
     - role: build-operator-assets
       vars:
         build_bundle: false

roles/health-check/initialize-log-forwarding/tasks/main.yaml → roles/health-check/enable-log-forward/tasks/main.yaml

@@ -1,8 +1,4 @@
 ---
-- name: Set up log forwarding
-  ansible.builtin.include_role:
-    name: setup-log-forwarding
-
 - name: Enable log forwarding
   ansible.builtin.include_role:
     name: "update-custom-resource"

roles/post/get-loki-logs/tasks/main.yaml

@@ -26,9 +26,11 @@
   retries: 10
   until: "loki_buildinfo.status == 200 and '2.9.2' in loki_buildinfo.content"
 
+# TODO: Remove exclusion of mariadb (this was done because of the mariadb container logs everything at high rate breaking the capability of loki to wrap logs)
+# Remove after the next sf-operator release (it affects only the upgrade job)
 - name: Get aggregated logs prefixed by service
   ansible.builtin.shell: >
-    ~/bin/logcli query  --batch 200 --limit 1000 --tail --forward --since=6h --parallel-duration 15m --parallel-max-workers 4 --part-path-prefix=/tmp/all-query --merge-parts --no-labels --quiet '{namespace="sf"} | json | {{ line_format_query }}' > {{ _output_dir_realpath.stdout }}/all.log
+    ~/bin/logcli query --batch 2000 --forward --since=6h --parallel-duration 15m --parallel-max-workers 4 --part-path-prefix=/tmp/all-query --merge-parts --no-labels --quiet '{namespace="sf", container != "mariadb"} | json | {{ line_format_query }}' > {{ _output_dir_realpath.stdout }}/all.log
 
 - name: Change owner and group for the log dir
   ansible.builtin.command: chown -R {{ ansible_user }}:{{ ansible_user }} {{ _output_dir_realpath.stdout }}

roles/run-tests/tasks/main.yaml

@@ -13,6 +13,7 @@
     - name: utils/manage-hosts
     - name: utils/get-gerrit-admin-user-api-key
     - name: utils/config-repo-reset
+    - name: utils/setup-log-forwarding-stack
   loop_control:
     loop_var: role
 
@@ -21,8 +22,8 @@
     name: "health-check/{{ role.name }}"
   when: role.when | default(true)
   loop:
-    - name: initialize-log-forwarding
     - name: check-service-uri
+    - name: enable-log-forward
     - name: scale-resources
     - name: zuul-connections
     - name: zuul-authenticators