From 375180b3dfe20466e240ffadd83529b9b5cce4fe Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2024 17:46:21 +0000 Subject: [PATCH] Squashed 'vendor/github.com/performancecopilot/ansible-pcp/' changes from 10055ee..3921d49 3921d49 docs(changelog): Bump release to 2.4.1 a9fd4a2 Bump release to 2.4.1 5edfad3 fix: Use of __keyserver_name needs metrics.keyserver role eaa56aa Fix of a typo in variable name for key server git-subtree-dir: vendor/github.com/performancecopilot/ansible-pcp git-subtree-split: 3921d493c9291acac1369edf515c44f2a6d2ad31 --- galaxy.yml | 2 +- tests/check_keyserver.yml | 2 +- tests/restore_services_state.yml | 2 +- tests/tests_verify_auth.yml | 1 + tests/tests_verify_basic.yml | 1 + tests/tests_verify_bpftrace.yml | 1 + tests/tests_verify_from_elasticsearch.yml | 1 + tests/tests_verify_grafana.yml | 1 + tests/tests_verify_into_elasticsearch.yml | 1 + tests/tests_verify_mssql.yml | 1 + tests/tests_verify_pmie_webhook.yml | 1 + tests/tests_verify_postfix.yml | 1 + tests/tests_verify_repository.yml | 1 + tests/tests_verify_retention.yml | 1 + tests/tests_verify_spark.yml | 1 + 15 files changed, 15 insertions(+), 3 deletions(-) diff --git a/galaxy.yml b/galaxy.yml index 5dd941cb..26d7e98a 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -2,7 +2,7 @@ ### REQUIRED namespace: performancecopilot name: metrics -version: 2.4.0 +version: 2.4.1 readme: README.md authors: - Jan Kurik diff --git a/tests/check_keyserver.yml b/tests/check_keyserver.yml index 70035dc5..8a869260 100644 --- a/tests/check_keyserver.yml +++ b/tests/check_keyserver.yml @@ -7,4 +7,4 @@ if set -o | grep -q pipefail; then set -o pipefail # no pipefail on debian, some ubuntu fi - {{ __key_server_name }}-cli PING | grep PONG + {{ __keyserver_name }}-cli PING | grep PONG diff --git a/tests/restore_services_state.yml b/tests/restore_services_state.yml index ec868257..b52d222f 100644 --- a/tests/restore_services_state.yml +++ b/tests/restore_services_state.yml @@ -21,6 +21,6 @@ - pmlogger - pmie - pmproxy - - "{{ __key_server_name }}" + - "{{ __keyserver_name }}" - grafana-server # yamllint enable rule:line-length diff --git a/tests/tests_verify_auth.yml b/tests/tests_verify_auth.yml index 4dbb42a9..589e95ae 100644 --- a/tests/tests_verify_auth.yml +++ b/tests/tests_verify_auth.yml @@ -8,6 +8,7 @@ # yamllint disable rule:line-length roles: + - role: performancecopilot.metrics.keyserver - role: performancecopilot.metrics.pcp vars: pcp_accounts: diff --git a/tests/tests_verify_basic.yml b/tests/tests_verify_basic.yml index 2ca4686b..227c91f8 100644 --- a/tests/tests_verify_basic.yml +++ b/tests/tests_verify_basic.yml @@ -4,6 +4,7 @@ hosts: all roles: + - role: performancecopilot.metrics.keyserver - role: performancecopilot.metrics.pcp pre_tasks: diff --git a/tests/tests_verify_bpftrace.yml b/tests/tests_verify_bpftrace.yml index 82d0bac1..aa37d6b4 100644 --- a/tests/tests_verify_bpftrace.yml +++ b/tests/tests_verify_bpftrace.yml @@ -8,6 +8,7 @@ # yamllint disable rule:line-length roles: + - role: performancecopilot.metrics.keyserver - role: performancecopilot.metrics.bpftrace vars: bpftrace_users: diff --git a/tests/tests_verify_from_elasticsearch.yml b/tests/tests_verify_from_elasticsearch.yml index dffbcfb4..54a1d2be 100644 --- a/tests/tests_verify_from_elasticsearch.yml +++ b/tests/tests_verify_from_elasticsearch.yml @@ -4,6 +4,7 @@ hosts: all roles: + - role: performancecopilot.metrics.keyserver - role: performancecopilot.metrics.elasticsearch vars: elasticsearch_agent: true diff --git a/tests/tests_verify_grafana.yml b/tests/tests_verify_grafana.yml index d1fee64d..f390d61b 100644 --- a/tests/tests_verify_grafana.yml +++ b/tests/tests_verify_grafana.yml @@ -4,6 +4,7 @@ hosts: all roles: + - role: performancecopilot.metrics.keyserver - role: performancecopilot.metrics.pcp vars: pcp_rest_api: true diff --git a/tests/tests_verify_into_elasticsearch.yml b/tests/tests_verify_into_elasticsearch.yml index d1709900..edf25596 100644 --- a/tests/tests_verify_into_elasticsearch.yml +++ b/tests/tests_verify_into_elasticsearch.yml @@ -4,6 +4,7 @@ hosts: all roles: + - role: performancecopilot.metrics.keyserver - role: performancecopilot.metrics.elasticsearch vars: elasticsearch_export_metrics: true diff --git a/tests/tests_verify_mssql.yml b/tests/tests_verify_mssql.yml index 3f3ab2da..2f095aa3 100644 --- a/tests/tests_verify_mssql.yml +++ b/tests/tests_verify_mssql.yml @@ -4,6 +4,7 @@ hosts: all roles: + - role: performancecopilot.metrics.keyserver - role: performancecopilot.metrics.mssql - role: performancecopilot.metrics.pcp vars: diff --git a/tests/tests_verify_pmie_webhook.yml b/tests/tests_verify_pmie_webhook.yml index 926b91d6..422ae5a5 100644 --- a/tests/tests_verify_pmie_webhook.yml +++ b/tests/tests_verify_pmie_webhook.yml @@ -4,6 +4,7 @@ hosts: all roles: + - role: performancecopilot.metrics.keyserver - role: performancecopilot.metrics.pcp vars: pcp_pmie_endpoint: https://example.com:12345/webhook diff --git a/tests/tests_verify_postfix.yml b/tests/tests_verify_postfix.yml index 1bd10b90..9f19f841 100644 --- a/tests/tests_verify_postfix.yml +++ b/tests/tests_verify_postfix.yml @@ -4,6 +4,7 @@ hosts: all roles: + - role: performancecopilot.metrics.keyserver - role: performancecopilot.metrics.postfix - role: performancecopilot.metrics.pcp vars: diff --git a/tests/tests_verify_repository.yml b/tests/tests_verify_repository.yml index fe803569..7214b1f3 100644 --- a/tests/tests_verify_repository.yml +++ b/tests/tests_verify_repository.yml @@ -4,6 +4,7 @@ hosts: all roles: + - role: performancecopilot.metrics.keyserver - role: performancecopilot.metrics.repository - role: performancecopilot.metrics.pcp diff --git a/tests/tests_verify_retention.yml b/tests/tests_verify_retention.yml index 7e511898..61fe398f 100644 --- a/tests/tests_verify_retention.yml +++ b/tests/tests_verify_retention.yml @@ -6,6 +6,7 @@ __test_retention: 137 roles: + - role: performancecopilot.metrics.keyserver - role: performancecopilot.metrics.pcp vars: pcp_pmlogger_discard: "{{ __test_retention }}" diff --git a/tests/tests_verify_spark.yml b/tests/tests_verify_spark.yml index 387ee27c..edd9c915 100644 --- a/tests/tests_verify_spark.yml +++ b/tests/tests_verify_spark.yml @@ -4,6 +4,7 @@ hosts: all roles: + - role: performancecopilot.metrics.keyserver - role: performancecopilot.metrics.pcp vars: pcp_rest_api: true