I’m doing similar with inventory by using a Bolt plugin that queries PuppetDB directly for inventory and machine groups.