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.

Sign up for GitHub

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

Upgrading to grafana 9.0.3 #314

Open
wants to merge 1 commit into
base: 1.11.0
Choose a base branch
from
Open

Upgrading to grafana 9.0.3 #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "plugins/globalnoc-networkmap-panel"]
path = plugins/globalnoc-networkmap-panel
url = https://github.com/GlobalNOC/globalnoc-networkmap-panel
[submodule "plugins/tsds-grafana"]
path = plugins/tsds-grafana
url = https://github.com/GlobalNOC/tsds-grafana
Expand All @@ -19,3 +16,6 @@
[submodule "plugins/netsage-nav-plugin"]
path = plugins/netsage-nav-plugin
url = https://github.com/netsage-project/Netsage-Navigation.git
[submodule "plugins/globalnoc-worldview-panel"]
path = plugins/globalnoc-worldview-panel
url = https://github.com/GlobalNOC/globalnoc-worldview-panel.git
4 changes: 2 additions & 2 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM grafana/grafana:8.2.7-ubuntu
FROM grafana/grafana:9.0.3-ubuntu

USER root

Expand Down Expand Up @@ -33,7 +33,7 @@ WORKDIR /app
VOLUME /app
USER grafana

ENV GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS=netsage-bumpchart-panel,netsage-sankey,netsage-nav-plugin,globalnoc-tsds-datasource,netsage-migrationmap,globalnoc-networkmap-panel,netsage-slopegraph-panel
ENV GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS=netsage-bumpchart-panel,netsage-sankey,netsage-nav-plugin,globalnoc-tsds-datasource,netsage-migrationmap,netsage-slopegraph-panel,globalnoc-worldview-panel

ENTRYPOINT [ "/usr/bin/grafana_runner" ]

9 changes: 3 additions & 6 deletions docker/setup_dashboard.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,11 @@ alien -i $HOME/rpmbuild/RPMS/noarch/globalnoc-tsds-datasource-*.noarch.rpm
mv /usr/com/grafana/plugins/globalnoc-tsds-datasource/ /var/lib/grafana/plugins/
cd ../

# Install network panel plugin
cd globalnoc-networkmap-panel
npm install -g gulp #make seems to need this
# Install worldview panel plugin
cd globalnoc-worldview-panel
yarn install
yarn build
mv /app/plugins/globalnoc-networkmap-panel/ /var/lib/grafana/plugins/
# make rpm
# alien -i $HOME/rpmbuild/RPMS/noarch/grnoc-grafana-worldview-*.noarch.rpm
mv /app/plugins/globalnoc-worldview-panel/ /var/lib/grafana/plugins/
cd ../

#Install netsage-sankey plugin
Expand Down
1 change: 0 additions & 1 deletion plugins/globalnoc-networkmap-panel
Open in desktop
Submodule globalnoc-networkmap-panel deleted from 91e38f
1 change: 1 addition & 0 deletions plugins/globalnoc-worldview-panel
Open in desktop
Submodule globalnoc-worldview-panel added at a3f466
1 change: 1 addition & 0 deletions templates/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
MarkupSafe<=2.0.1 # Need to restrict this version due to missing dependencies in latter versions https://github.com/aws/aws-sam-cli/issues/3661
jinja2==2.11.3
pyyaml==5.4