disambiguated default addresses

Author: wtripp180901

environments/common/files/filebeat/filebeat.yml

@@ -54,7 +54,7 @@ processors:
         - {from: "json.ElapsedRaw", type: "integer"}
 
 output.elasticsearch:
-  hosts: ["{{ opensearch_address }}:9200"]
+  hosts: ["{{ '127.0.0.1' if groups['opensearch'] == groups['filebeat'] else opensearch_ip }}:9200"]
   protocol: "https"
   ssl.verification_mode: none
   username: "admin"

environments/common/inventory/group_vars/all/alertmanager.yml

@@ -20,7 +20,7 @@ alertmanager_slack_receiver:
         authorization:
           credentials: "{{ alertmanager_slack_integration.app_creds | default('none') }}"
       text: "{{ '{{' }} .GroupLabels.alertname {{ '}}' }} : {{ '{{' }}  .CommonAnnotations.description {{ '}}' }}"
-      title_link: "http://{{ prometheus_address }}/alertmanager/#/alerts?receiver=slack-receiver"
+      title_link: "http://{{ prometheus_address }}:{{ prometheus_port }}/alertmanager/#/alerts?receiver=slack-receiver"
       send_resolved: true
 
 # Uncomment below and add Slack bot app creds for Slack integration

environments/common/inventory/group_vars/all/defaults.yml

@@ -15,8 +15,7 @@ internal_address: "{{ inventory_hostname }}"
 api_address: "{{ inventory_hostname }}"
 
 # Service endpoints
-opensearch_address: "127.0.0.1"
-prometheus_address: "{{ hostvars[groups['prometheus'].0].api_address }}:{{ prometheus_port }}"
+prometheus_address: "{{ hostvars[groups['prometheus'].0].api_address }}"
 openondemand_address: "{{ hostvars[groups['openondemand'].0].api_address if groups['openondemand'] | count > 0 else '' }}"
 grafana_address: "{{ hostvars[groups['prometheus'].0].api_address }}"