From 1c5a0ce7d2b68f9446f72c37996b1a4ff65007b8 Mon Sep 17 00:00:00 2001 From: Aaron van Meerten Date: Thu, 21 Nov 2024 12:57:20 -0600 Subject: [PATCH 1/4] feat(vector): include release number if available --- ansible/roles/vector/templates/vector.yaml.j2 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ansible/roles/vector/templates/vector.yaml.j2 b/ansible/roles/vector/templates/vector.yaml.j2 index 30017ce0..7d0bf94b 100644 --- a/ansible/roles/vector/templates/vector.yaml.j2 +++ b/ansible/roles/vector/templates/vector.yaml.j2 @@ -95,6 +95,9 @@ sinks: node: "{{ ansible_hostname }}" region: "{{ vector_cloud_region }}" level: "{{ '{{' }} .severity }}" +{%- if vector_release_number %} + release: "{{ vector_release_number }}" +{%- endif %} loki_jicofo: remove_timestamp: false type: "loki" @@ -112,6 +115,9 @@ sinks: namespace: "default" node: "{{ ansible_hostname }}" region: "{{ vector_cloud_region }}" +{%- if vector_release_number %} + release: "{{ vector_release_number }}" +{%- endif %} level: "{{ '{{' }} .level }}" loki_prosody: remove_timestamp: false @@ -130,6 +136,9 @@ sinks: namespace: "default" node: "{{ ansible_hostname }}" region: "{{ vector_cloud_region }}" +{%- if vector_release_number %} + release: "{{ vector_release_number }}" +{%- endif %} level: "{{ '{{' }} .level }}" loki_vault_audit: remove_timestamp: false @@ -165,6 +174,9 @@ sinks: namespace: "default" node: "{{ ansible_hostname }}" region: "{{ vector_cloud_region }}" +{%- if vector_release_number %} + release: "{{ vector_release_number }}" +{%- endif %} level: "{{ '{{' }} .level }}" loki_jigasi: remove_timestamp: false From 5d7f512060e3fc5b660764a5523dc6ae1faf39c9 Mon Sep 17 00:00:00 2001 From: Aaron van Meerten Date: Thu, 21 Nov 2024 14:03:57 -0600 Subject: [PATCH 2/4] missing variable --- ansible/roles/vector/defaults/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible/roles/vector/defaults/main.yml b/ansible/roles/vector/defaults/main.yml index 1685393f..ba199b44 100644 --- a/ansible/roles/vector/defaults/main.yml +++ b/ansible/roles/vector/defaults/main.yml @@ -8,3 +8,4 @@ vector_install_flag: true vector_loki_url: "https://{{ hcv_environment}}-{{oracle_region }}-loki.{{ top_level_domain }}" vector_shard_name: "{{ shard_name }}" vector_shard_role: "{{ shard_role | default('vector') }}" +vector_release_number: "{{ jitsi_release_number | default(0) }}" From 3b9e6b05d79bbfb98e9a65b608224d9b07f8e5cc Mon Sep 17 00:00:00 2001 From: Aaron van Meerten Date: Thu, 21 Nov 2024 15:38:28 -0600 Subject: [PATCH 3/4] mroe whitespace --- ansible/roles/vector/templates/vector.yaml.j2 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ansible/roles/vector/templates/vector.yaml.j2 b/ansible/roles/vector/templates/vector.yaml.j2 index 7d0bf94b..aed7a895 100644 --- a/ansible/roles/vector/templates/vector.yaml.j2 +++ b/ansible/roles/vector/templates/vector.yaml.j2 @@ -95,9 +95,9 @@ sinks: node: "{{ ansible_hostname }}" region: "{{ vector_cloud_region }}" level: "{{ '{{' }} .severity }}" -{%- if vector_release_number %} +{% if vector_release_number %} release: "{{ vector_release_number }}" -{%- endif %} +{% endif %} loki_jicofo: remove_timestamp: false type: "loki" @@ -115,9 +115,9 @@ sinks: namespace: "default" node: "{{ ansible_hostname }}" region: "{{ vector_cloud_region }}" -{%- if vector_release_number %} +{% if vector_release_number %} release: "{{ vector_release_number }}" -{%- endif %} +{% endif %} level: "{{ '{{' }} .level }}" loki_prosody: remove_timestamp: false @@ -136,9 +136,9 @@ sinks: namespace: "default" node: "{{ ansible_hostname }}" region: "{{ vector_cloud_region }}" -{%- if vector_release_number %} +{% if vector_release_number %} release: "{{ vector_release_number }}" -{%- endif %} +{% endif %} level: "{{ '{{' }} .level }}" loki_vault_audit: remove_timestamp: false @@ -174,9 +174,9 @@ sinks: namespace: "default" node: "{{ ansible_hostname }}" region: "{{ vector_cloud_region }}" -{%- if vector_release_number %} +{% if vector_release_number %} release: "{{ vector_release_number }}" -{%- endif %} +{% endif %} level: "{{ '{{' }} .level }}" loki_jigasi: remove_timestamp: false From 12de5df8196b98c50e79a3ba97a5b6d3c46652dc Mon Sep 17 00:00:00 2001 From: Aaron van Meerten Date: Thu, 21 Nov 2024 15:40:36 -0600 Subject: [PATCH 4/4] fix templating --- ansible/roles/vector/defaults/main.yml | 2 +- ansible/roles/vector/templates/vector.yaml.j2 | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/ansible/roles/vector/defaults/main.yml b/ansible/roles/vector/defaults/main.yml index ba199b44..19729ee8 100644 --- a/ansible/roles/vector/defaults/main.yml +++ b/ansible/roles/vector/defaults/main.yml @@ -8,4 +8,4 @@ vector_install_flag: true vector_loki_url: "https://{{ hcv_environment}}-{{oracle_region }}-loki.{{ top_level_domain }}" vector_shard_name: "{{ shard_name }}" vector_shard_role: "{{ shard_role | default('vector') }}" -vector_release_number: "{{ jitsi_release_number | default(0) }}" +vector_release_number: "{{ jitsi_release_number | default('default') }}" diff --git a/ansible/roles/vector/templates/vector.yaml.j2 b/ansible/roles/vector/templates/vector.yaml.j2 index aed7a895..72a0fee6 100644 --- a/ansible/roles/vector/templates/vector.yaml.j2 +++ b/ansible/roles/vector/templates/vector.yaml.j2 @@ -95,9 +95,7 @@ sinks: node: "{{ ansible_hostname }}" region: "{{ vector_cloud_region }}" level: "{{ '{{' }} .severity }}" -{% if vector_release_number %} release: "{{ vector_release_number }}" -{% endif %} loki_jicofo: remove_timestamp: false type: "loki" @@ -115,9 +113,7 @@ sinks: namespace: "default" node: "{{ ansible_hostname }}" region: "{{ vector_cloud_region }}" -{% if vector_release_number %} release: "{{ vector_release_number }}" -{% endif %} level: "{{ '{{' }} .level }}" loki_prosody: remove_timestamp: false @@ -136,9 +132,7 @@ sinks: namespace: "default" node: "{{ ansible_hostname }}" region: "{{ vector_cloud_region }}" -{% if vector_release_number %} release: "{{ vector_release_number }}" -{% endif %} level: "{{ '{{' }} .level }}" loki_vault_audit: remove_timestamp: false @@ -174,9 +168,7 @@ sinks: namespace: "default" node: "{{ ansible_hostname }}" region: "{{ vector_cloud_region }}" -{% if vector_release_number %} release: "{{ vector_release_number }}" -{% endif %} level: "{{ '{{' }} .level }}" loki_jigasi: remove_timestamp: false