diff --git a/deploy_partition.yaml b/deploy_partition.yaml index 705d707a..f5344479 100644 --- a/deploy_partition.yaml +++ b/deploy_partition.yaml @@ -119,9 +119,9 @@ roles: - name: ansible-common tags: always - - name: metal-roles/partition/roles/promtail + - name: metal-roles/partition/roles/alloy when: monitoring_enabled - tags: promtail + tags: alloy - name: metal-roles/partition/roles/monitoring/node-exporter when: monitoring_enabled tags: node-exporter diff --git a/inventories/group_vars/all/release_vector.yaml b/inventories/group_vars/all/release_vector.yaml index f801fffc..ea14eae0 100644 --- a/inventories/group_vars/all/release_vector.yaml +++ b/inventories/group_vars/all/release_vector.yaml @@ -32,7 +32,6 @@ metal_stack_release_vectors: # sonic_configdb_utils_image_tag: # ... # - ## ## for ansible roles ## diff --git a/inventories/group_vars/leaves/alloy.yaml b/inventories/group_vars/leaves/alloy.yaml new file mode 100644 index 00000000..27c070ba --- /dev/null +++ b/inventories/group_vars/leaves/alloy.yaml @@ -0,0 +1,3 @@ +alloy_config_snippets: + - docker + - journal diff --git a/inventories/group_vars/partition/alloy.yaml b/inventories/group_vars/partition/alloy.yaml new file mode 100644 index 00000000..bd8dba8e --- /dev/null +++ b/inventories/group_vars/partition/alloy.yaml @@ -0,0 +1,2 @@ +alloy_loki_write_endpoints: + - url: "http://loki.{{ metal_control_plane_ingress_dns }}:8080/loki/api/v1/push" diff --git a/inventories/group_vars/partition/monitoring.yaml b/inventories/group_vars/partition/monitoring.yaml index 2c3b07be..738903df 100644 --- a/inventories/group_vars/partition/monitoring.yaml +++ b/inventories/group_vars/partition/monitoring.yaml @@ -6,3 +6,6 @@ monitoring_sonic_exporter_port: 9101 # IPMI should use the same credentials as metal-api monitoring_ipmi_bmc_superuser_pwd: "{{ metal_api_bmc_superuser_pwd }}" + +# alloy offers logs and metrics +monitoring_alloy_port: 12345 diff --git a/inventories/group_vars/partition/prometheus.yaml b/inventories/group_vars/partition/prometheus.yaml index 8e691dae..8c39ce1d 100644 --- a/inventories/group_vars/partition/prometheus.yaml +++ b/inventories/group_vars/partition/prometheus.yaml @@ -28,4 +28,8 @@ prometheus_hosts_content: | {{ hostvars['leaf01'].ansible_host }} leaf01 {{ hostvars['leaf02'].ansible_host }} leaf02 +prometheus_alloy_targets: + - "leaf01:{{ monitoring_alloy_port }}" + - "leaf02:{{ monitoring_alloy_port }}" + prometheus_haproxy_enabled: false