Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[!] bump Grafana to v10, closes #227 #232

Merged
merged 1 commit into from
Jul 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ RUN apt-get update \

# Install Grafana
RUN arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) \
&& curl "https://dl.grafana.com/oss/release/grafana_9.5.5_${arch}.deb" --output grafana.deb \
&& curl "https://dl.grafana.com/oss/release/grafana_10.0.1_${arch}.deb" --output grafana.deb \
&& dpkg -i grafana.deb && rm grafana.deb
ADD grafana /pgwatch3/grafana
COPY grafana/grafana_custom_config.ini /etc/grafana/grafana.ini
Expand Down
2 changes: 1 addition & 1 deletion docker/bootstrap/init_supervisor.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ until pg_isready ; do sleep 10 ; done
for prog in grafana grafana_dashboard_setup pgwatch3 ; do
echo "supervisorctl start $prog ..."'1'
supervisorctl start $prog
echo "sleep 5"
echo "sleep 10"
sleep 5
done

Expand Down
2 changes: 1 addition & 1 deletion docker/bootstrap/set_up_grafana_dashboards.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ curl -X POST -s -w "%{http_code}" \
'http://localhost:3000/api/datasources'

# Create dashboards
GRAFANA_MAJOR_VER=$(grafana-server -v | grep -o -E '[0-9]{1}' | head -1)
GRAFANA_MAJOR_VER=$(grafana-server -v | grep -o -E '[0-9]{2}' | head -1)

for dashboard_json in $(find /pgwatch3/grafana/postgres/v"${GRAFANA_MAJOR_VER}" -name "*.json" | sort); do
echo
Expand Down