Athena Support for Grafana

Hi, Our company currently uses Graphite-Grafana combination for visualisation, we are slowly migrating to AWS S3, just wanted to know if there is going to be support for Athena with Grafana in the coming future. If yes, any timeframe?

thanks.