I think I'm right in saying that, providing you fork from any commit before the introduction of the AGPL license, you can continue with Apache-licensed Grafana. Sounds like the way forward.
They amount to the same thing. A git repo is an historical document. All commits (and forks) up to the one changing to the new license "going forward" are available under the original license.