* Reapply "v1 to v2 conversion: Fix issue when Grafana datasource wouldn't be resolved correctly (#114555)" This reverts commit db9cff8e2d. * Update input and fix the failing test
db9cff8e2d