Skip to content

chore: improve launch stability #321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ma-hartma wants to merge 2 commits into
base: master
Choose a base branch
from
Open

chore: improve launch stability #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfb5121
chore: improve launch stability
ma-hartma Jul 27, 2026
7f30f0b
fix: make dev-env only after make up as now depending on secret
ma-hartma Jul 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/integration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@ jobs:
- name: Run integration tests
shell: bash
run: |
eval $(make dev-env)
./test/ci-cleanup.sh
./test/integration.sh
env:
Expand Down
6 changes: 3 additions & 3 deletions deploy_control_plane.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@
tags: auth
- name: metal-roles/control-plane/roles/metal
tags: metal
- name: metal-roles/control-plane/roles/logging
when: monitoring_enabled
tags: logging
- name: metal-roles/control-plane/roles/monitoring
when: monitoring_enabled
tags: monitoring
- name: metal-roles/control-plane/roles/logging
when: monitoring_enabled
tags: logging

- name: deploy gardener
import_playbook: deploy_gardener.yaml
Expand Down
9 changes: 0 additions & 9 deletions inventories/group_vars/partition/monitoring.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,2 @@
monitoring_node_exporter_port: 9100

monitoring_blackbox_exporter_port: 9115

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
25 changes: 14 additions & 11 deletions inventories/group_vars/partition/prometheus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,24 @@
---
# exporters
prometheus_alloy_targets:
- leaf01:12345
- leaf02:12345

prometheus_metal_core_targets:
- leaf01:2112"
- leaf02:2112"

# exporters
prometheus_sonic_exporter_targets:
- "leaf01:{{ monitoring_sonic_exporter_port }}"
- "leaf02:{{ monitoring_sonic_exporter_port }}"
- leaf01:9101
- leaf02:9101

prometheus_blackbox_exporter_targets:
- "leaf01:{{ monitoring_blackbox_exporter_port }}"
- "leaf02:{{ monitoring_blackbox_exporter_port }}"
- leaf01:9115
- leaf02:9115

prometheus_node_exporter_targets:
- "leaf01:{{ monitoring_node_exporter_port }}"
- "leaf02:{{ monitoring_node_exporter_port }}"
- leaf01:9100
- leaf02:9100

prometheus_ipmi_exporter_targets:
- "{{ hostvars['machine01'].ansible_host }}"
Expand All @@ -28,8 +35,4 @@ 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
2 changes: 2 additions & 0 deletions test/integration.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ set -e
echo "Starting mini-lab"
make up

eval $(make dev-env)

echo "Waiting for machines to get to waiting state"
waiting=$(docker compose run --no-TTY --rm metalctl machine ls | grep Waiting | wc -l)
minWaiting=2
Expand Down
Loading