diff --git a/grafana/Dockerfile b/grafana/Dockerfile index 7b27417..99ee8c4 100644 --- a/grafana/Dockerfile +++ b/grafana/Dockerfile @@ -1,8 +1,8 @@ FROM --platform=arm64 grafana/grafana:latest # List of plugins to install... -ENV GF_INSTALL_PLUGINS=grafana-x-ray-datasource +ENV GF_INSTALL_PLUGINS=grafana-x-ray-datasource,grafana-athena-datasource ADD provisioning/. /usr/local/grafana/provisioning -ENV GF_PATHS_PROVISIONING=/usr/local/grafana/provisioning +ENV GF_PATHS_PROVISIONING=/usr/local/grafana/provisioning diff --git a/grafana/provisioning/datasources/athena.yaml b/grafana/provisioning/datasources/athena.yaml new file mode 100644 index 0000000..545be25 --- /dev/null +++ b/grafana/provisioning/datasources/athena.yaml @@ -0,0 +1,12 @@ +apiVersion: 1 +datasources: + - name: Athena + type: grafana-athena-datasource + jsonData: + authType: default + defaultRegion: $AWS_REGION + + + + + diff --git a/stacks/grafana.py b/stacks/grafana.py index 9c02e30..3c4c108 100644 --- a/stacks/grafana.py +++ b/stacks/grafana.py @@ -83,6 +83,8 @@ def __init__( else f"https://{distro.distribution_domain_name}" ), } + print(f"<====> {settings.github_oauth_secret_name}") + print(settings.github_admin_group) if settings.github_oauth_secret_name: env.update( self.github_oauth_settings(