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/control_plane/logging.yaml b/inventories/group_vars/control_plane/logging.yaml index 4e931d1c..2ec973fc 100644 --- a/inventories/group_vars/control_plane/logging.yaml +++ b/inventories/group_vars/control_plane/logging.yaml @@ -1,2 +1,14 @@ --- logging_ingress_loki_tls: no +logging_ingress_dns: "loki.{{ metal_control_plane_ingress_dns }}" + +logging_alloy_enabled: true + +logging_alloy_service_monitor_enabled: true + +logging_alloy_loki_write_endpoints: + - url: "http://{{ logging_ingress_dns }}:8080/loki/api/v1/push" + +logging_promtail_enabled: false + +logging_alloy_cluster_label: "mini-lab" diff --git a/inventories/group_vars/control_plane/monitoring.yaml b/inventories/group_vars/control_plane/monitoring.yaml index db54d9be..0e2c0095 100644 --- a/inventories/group_vars/control_plane/monitoring.yaml +++ b/inventories/group_vars/control_plane/monitoring.yaml @@ -10,3 +10,5 @@ monitoring_thanos_receive_ingress_enabled: true monitoring_thanos_receive_size: 5Gi monitoring_prometheus_core_dns_enabled: true + +event_exporter_enabled: false diff --git a/inventories/group_vars/leaves/alloy.yaml b/inventories/group_vars/leaves/alloy.yaml new file mode 100644 index 00000000..add469bc --- /dev/null +++ b/inventories/group_vars/leaves/alloy.yaml @@ -0,0 +1,2 @@ +alloy_config_snippets: + - 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..a0624c57 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 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 diff --git a/inventories/group_vars/partition/promtail.yaml b/inventories/group_vars/partition/promtail.yaml deleted file mode 100644 index fda39638..00000000 --- a/inventories/group_vars/partition/promtail.yaml +++ /dev/null @@ -1,14 +0,0 @@ -promtail_clients: - - url: http://loki.{{ metal_control_plane_ingress_dns }}:8080/loki/api/v1/push - -promtail_scrape_configs: - - job_name: leaf-node-docker - docker_sd_configs: - - host: "unix:///var/run/docker.sock" - refresh_interval: 5s - relabel_configs: - - regex: /(.*) - source_labels: [__meta_docker_container_name] - target_label: container - - replacement: "{{ inventory_hostname }}" - target_label: node_name