Separating meditation into vipāssana or samatha

Did the Buddha teach a single meditation that includes jhāna and insight, or do the scriptures have him separate meditation into different techniques? In what Buddhist traditions is it necessary to qualify meditation as vipāssana or samatha?