Skip to content

Поддержка двойных кавычек в именах полей для тестов #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 17, 2025
Merged

Поддержка двойных кавычек в именах полей для тестов #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ansible-playbook/vars/metrics-catalog.testing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ metrics_catalog:
##
## Метрики Интернет магазина
##
- selector: "Запросы к главной странице интернет магазина"
- selector: "Запросы к главной странице интернет магазина"
filter:
http_path: # имя поля в событии лога (входящие данные трансформа vector.dev)
# возможные условия отбора: eq -> ==, neq -> !=, re -> match_any(), nre -> !match_any.
Expand Down Expand Up @@ -114,8 +114,8 @@ metrics_catalog:
namespace: "namespace"
method: "http_method"
status: "http_status_code"
event_selectors: &kubedns_http_requests_total_event_selectors
# фильтры подходящих нам метирик
event_selectors:
&kubedns_http_requests_total_event_selectors # фильтры подходящих нам метирик
- selector: Монолит - входящие запросы по kubedns
filter:
namespace:
Expand Down
4 changes: 2 additions & 2 deletions files/aggregator/tests/logs-to-metrics_tests.testing.toml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@
{%- set selector_index = (loop.index | string) -%}

{%- for test_conf in selector_conf.testdata -%}
{%- set test_name = "transforms.metrics-http-accesslog-k8s: check metric " + metric_full_name + "(sel:" + selector_index + ", test:" + (loop.index | string) + ")" -%}
{%- set test_name = "transforms.metrics-http-accesslog-k8s: check metric " + metric_full_name + "(selector #" + selector_index + ", test #" + (loop.index | string) + ")" -%}

[[tests]]
name = "{{ test_name }}"
Expand All @@ -239,7 +239,7 @@
[tests.inputs.log_fields]
# сгенерированные строки
{% for logfield_name, logfield_value in test_conf.input_values.items() -%}
"{{ logfield_name }}" = "{{ logfield_value }}"
"{{ logfield_name | replace('"','\\"') | safe }}" = "{{ logfield_value | replace('"','\\"') | safe }}"
{# newline #}
{%- endfor %}

Expand Down