Skip to content
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

Fix regex #167

Merged
merged 6 commits into from
Jan 9, 2025
Merged

Fix regex #167

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1d5e481
Fix regex
John2020-cyber Jan 9, 2025
c32632f
update
John2020-cyber Jan 9, 2025
83c2031
update
John2020-cyber Jan 9, 2025
a1fb513
update
John2020-cyber Jan 9, 2025
555c66e
update
John2020-cyber Jan 9, 2025
92a826f
update
John2020-cyber Jan 9, 2025
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
5 changes: 4 additions & 1 deletion roles/grafana_cloud_operator/tasks/grafana_oncall_hub_spoke.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@
vars:
receiver_name: "{{ item.grafana_details.name }}"
receiver_url: "{{ item.grafana_details.link }}"
transformed_namespace: "{{ item.cluster.name | regex_replace('^(.*?)-.*$', '\\1') }}"
transformed_namespace: "{{ item.cluster.name | regex_replace('^(.*)-[^-]+$', '\\1') }}"
cluster_name: "{{ item.cluster.name }}"
provision_mode: "hubAndSpoke"
loop: "{{ mapped_integrations }}"
Expand Down Expand Up @@ -351,3 +351,6 @@
# Moved to the bottom as we want to trigger deletion after all
- name: Start deletion for hubAndSpoke mode
ansible.builtin.include_tasks: delete_grafana_oncall_hub_spoke.yml
when:
- manifestwork_creation_results is not defined
- create_integration_for_dict is not defined or create_integration_for_dict | length == 0
Loading