diff -y /tmp/1.7.0_prod2.yaml /tmp/1.7.1_repo.yaml

1.7.0_diff_1.7.1.diff

global:								global:
  resolve_timeout: 5m						  resolve_timeout: 5m
  smtp_smarthost: {{ smtp_smarthost }}				  smtp_smarthost: {{ smtp_smarthost }}
  smtp_from: noreply@{{ alertmanager_route }}			  smtp_from: noreply@{{ alertmanager_route }}
  smtp_auth_username: {{ smtp_auth_username }}			  smtp_auth_username: {{ smtp_auth_username }}
  smtp_auth_password: {{ smtp_auth_password }}			  smtp_auth_password: {{ smtp_auth_password }}
							      >	  slack_api_url: {{ alertmanager_slack_api_url }}
route:								route:
  group_wait: 30s						  group_wait: 30s
  group_interval: 5m						  group_interval: 5m
  repeat_interval: 12h						  repeat_interval: 12h
  receiver: default						  receiver: default
  routes:							  routes:
							      >	  - receiver: "null"
							      >	    match:
							      >	      alertname: UnifiedPushJavaHeapThresholdExceeded
							      >	  - match_re:
							      >	      alertname: ^RouterMeshConnectivityHealth$|^RouterMeshUn
							      >	    receiver: critical
  - match:							  - match:
      severity: critical					      severity: critical
    receiver: critical						    receiver: critical
  - match:							  - match:
      alertname: DeadMansSwitch					      alertname: DeadMansSwitch
    repeat_interval: 5m						    repeat_interval: 5m
    receiver: deadmansswitch					    receiver: deadmansswitch
receivers:							receivers:
- name: default							- name: default
  email_configs:						  email_configs:
  - send_resolved: true						  - send_resolved: true
    to: {{ alertmanager_to_email }}				    to: {{ alertmanager_to_email }}
							      >	    html: '{{ '{{' }} template "email.enhanced.html" . {{ '}}
							      >	  slack_configs:
							      >	    - send_resolved: true
							      >	    - api_url: {{ alertmanager_slack_api_url }}
							      >	      channel: {{ alertmanager_slack_default_channel }}
							      >	      text: "message: {{ '{{' }} .CommonAnnotations.message {
- name: critical						- name: critical
  pagerduty_configs:						  pagerduty_configs:
  - service_key: {{ pd_service_key }}				  - service_key: {{ pd_service_key }}
							      >	    details:
							      >	      sop_url: |-
							      >	        {{ '{{' }} range .Alerts {{ '}}' }}
							      >	          {{ '{{' }}if eq .Labels.alertname "AuthenticationSe
							      >	          {{ '{{' }}else if eq .Labels.alertname "BrokerMemor
							      >	          {{ '{{' }}else if eq .Labels.alertname "ComponentHe
							      >	          {{ '{{' }}else if eq .Labels.alertname "RouterMeshC
							      >	          {{ '{{' }}else if eq .Labels.alertname "RouterMeshU
							      >	          {{ '{{' }} end {{ '}}' }}
							      >	        {{ '{{' }} end {{ '}}' }}
  email_configs:						  email_configs:
  - send_resolved: true						  - send_resolved: true
    to: {{ alertmanager_to_email }}				    to: {{ alertmanager_to_email }}
							      >	    html: '{{ '{{' }} template "email.enhanced.html" . {{ '}}
- name: deadmansswitch						- name: deadmansswitch
  webhook_configs:						  webhook_configs:
    - url: "{{ dms_webhook_url }}"				    - url: "{{ dms_webhook_url }}"
inhibit_rules:						      |	- name: "null"
- source_match:						      |	templates:
    alertname: 'JobRunningTimeExceeded'			      |	- '*.tmpl'
    severity: 'critical'				      <
  target_match:						      <
    alertname: 'JobRunningTimeExceeded'			      <
    severity: 'warning'					      <
  equal: ['alertname', 'job', 'label_cronjob_name']	      <