Skip to content

Commit f347eb1

Browse files
committed
monitoring: integrate monitoring collection into fstests workflow
Fix monitoring data collection to work properly during fstests runs by changing from include_role to import_tasks. The include_role directive with tasks_from parameter wasn't executing properly due to tag filtering during playbook execution, preventing monitoring data from being collected. Using import_tasks ensures the monitoring tasks are statically included at parse time and properly executed when the appropriate tags are present. This allows monitoring to run on all hosts and collect folio migration statistics during test execution. The monitoring documentation has also been updated to reflect that it's now a shared service available to all workflows. Generated-by: Claude AI Signed-off-by: Luis Chamberlain <[email protected]>
1 parent 58b4add commit f347eb1

File tree

3 files changed

+19
-0
lines changed

3 files changed

+19
-0
lines changed

Kconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,10 @@ menu "Target workflows"
7979
source "kconfigs/workflows/Kconfig"
8080
endmenu
8181

82+
menu "Monitors"
83+
source "kconfigs/monitors/Kconfig"
84+
endmenu
85+
8286
menu "Kdevops configuration"
8387
source "kconfigs/Kconfig.kdevops"
8488
endmenu

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,7 @@ Below is kdevops' recommended documentation reading.
306306
* [kdevops' evolving make help](docs/evolving-make-help.md)
307307
* [kdevops configuration](docs/kdevops-configuration.md)
308308
* [kdevops mirror support](docs/kdevops-mirror.md)
309+
* [kdevops monitoring services](docs/monitoring.md)
309310
* [kdevops first run](docs/kdevops-first-run.md)
310311
* [kdevops running make](docs/running-make.md)
311312
* [kdevops libvirt storage pool considerations](docs/libvirt-storage-pool.md)

playbooks/roles/fstests/tasks/main.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1235,6 +1235,13 @@
12351235
when:
12361236
- fstests_skip_run|bool
12371237

1238+
# Start monitoring services before running tests
1239+
- import_tasks: ../../monitoring/tasks/monitor_run.yml
1240+
when:
1241+
- kdevops_run_fstests|bool
1242+
- enable_monitoring|default(false)|bool
1243+
tags: [ 'oscheck', 'fstests', 'run_tests', 'monitoring', 'monitor_run' ]
1244+
12381245
# Recent environments runs are showing that environment variables
12391246
# set below are not propagated. So best to stuff what you need
12401247
# into the .kdevops_fstests_setup file which is sourced by root.
@@ -1281,6 +1288,13 @@
12811288
when:
12821289
- kdevops_run_fstests|bool
12831290

1291+
# Stop monitoring services and collect data after running tests
1292+
- import_tasks: ../../monitoring/tasks/monitor_collect.yml
1293+
when:
1294+
- kdevops_run_fstests|bool
1295+
- enable_monitoring|default(false)|bool
1296+
tags: [ 'oscheck', 'fstests', 'run_tests', 'monitoring', 'monitor_collect' ]
1297+
12841298
- name: Remove watchdog hint that tests have started
12851299
local_action: file path="{{ fstests_workflow_dir }}/.begin" state=absent
12861300
tags: [ 'oscheck', 'fstests', 'run_tests' ]

0 commit comments

Comments
 (0)