Skip to content

Commit

Permalink
Merge pull request #34 from stakater/revert-33-fixStringAlertmanager
Browse files Browse the repository at this point in the history
Revert "Update Json"
  • Loading branch information
KhizerJaan authored Dec 28, 2023
2 parents 03d54d7 + 5d81e2d commit 45de14c
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 36 deletions.
8 changes: 4 additions & 4 deletions config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
resources:
- manager.yaml
- manager.yaml
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
images:
- name: controller
newName: ghcr.io/stakater/grafana-cloud-ansible-operator
newTag: v0.0.20
- name: controller
newName: ghcr.io/stakater/grafana-cloud-ansible-operator
newTag: v0.0.20
Original file line number Diff line number Diff line change
Expand Up @@ -13,36 +13,36 @@ spec:
Grafana Cloud
displayName: grafana-cloud-operator
icon:
- base64data: ""
mediatype: ""
- base64data: ""
mediatype: ""
install:
spec:
deployments: null
strategy: ""
installModes:
- supported: true
type: OwnNamespace
- supported: true
type: SingleNamespace
- supported: false
type: MultiNamespace
- supported: false
type: AllNamespaces
- supported: true
type: OwnNamespace
- supported: true
type: SingleNamespace
- supported: false
type: MultiNamespace
- supported: false
type: AllNamespaces
keywords:
- grafana-cloud
- oncall
- sre
- dashboard
- grafana-sre
- grafana-oncall
- slo
- grafana-slo
- grafana-cloud
- oncall
- sre
- dashboard
- grafana-sre
- grafana-oncall
- slo
- grafana-slo
links:
- name: Grafana Cloud Ansible Operator
url: https://grafana-cloud-ansible-operator.domain
- name: Grafana Cloud Ansible Operator
url: https://grafana-cloud-ansible-operator.domain
maintainers:
- email: [email protected]
name: stakater
- email: [email protected]
name: stakater
maturity: alpha
provider:
name: Stakater
Expand Down
20 changes: 10 additions & 10 deletions roles/grafana_cloud_operator/tasks/modify_alertmanager_secret.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@
ansible.builtin.set_fact:
modified_alertmanager_secret_content: >
{{ (fetched_alertmanager_secret.resources[0].data['alertmanager.yaml'] | b64decode | from_yaml) | combine({
"receivers": [
'receivers': [
{
"name": "receiver_name",
"webhook_configs": [{
"url": "receiver_url"
'name': receiver_name,
'webhook_configs': [{
'url': receiver_url
}]
}
],
"route": {
"receiver": "receiver_name",
"routes": [
'route': {
'receiver': receiver_name,
'routes': [
{
"receiver": "receiver_name",
"match": {
"severity": "info | warning | critical"
'receiver': receiver_name,
'match': {
'severity': 'info | warning | critical'
}
}
]
Expand Down

0 comments on commit 45de14c

Please sign in to comment.