Merge pull request #3412 from igogold/grafana-fix

Sync grafana datasource and prometheus scrape intervals.

group_vars/matrix_servers

@@ -4851,6 +4851,9 @@ grafana_provisioning_datasources: |
       'type': 'prometheus',
       'access': 'proxy',
       'url': ('http://' + prometheus_identifier + ':9090'),
+      'jsonData': {
+        'timeInterval': prometheus_config_global_scrape_interval,
+      }
     }] if prometheus_enabled else [])
   }}