From 2bfb89040ef1b564e62ae00957f86abd0c7ff8ca Mon Sep 17 00:00:00 2001
From: Dimuthu Wannipurage <dimuthu.upeksha2@gmail.com>
Date: Wed, 31 Aug 2022 17:16:37 -0400
Subject: [PATCH] Upgrading to grafana 9.0.3

---
 .gitmodules                        | 6 +++---
 docker/Dockerfile                  | 4 ++--
 docker/setup_dashboard.sh          | 9 +++------
 plugins/globalnoc-networkmap-panel | 1 -
 plugins/globalnoc-worldview-panel  | 1 +
 templates/requirements.txt         | 1 +
 6 files changed, 10 insertions(+), 12 deletions(-)
 delete mode 160000 plugins/globalnoc-networkmap-panel
 create mode 160000 plugins/globalnoc-worldview-panel

diff --git a/.gitmodules b/.gitmodules
index 91a86a1..1a3d588 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -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
@@ -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
diff --git a/docker/Dockerfile b/docker/Dockerfile
index bf36a92..e1b5284 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM grafana/grafana:8.2.7-ubuntu
+FROM grafana/grafana:9.0.3-ubuntu
 
 USER root
 
@@ -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" ]
 
diff --git a/docker/setup_dashboard.sh b/docker/setup_dashboard.sh
index f90123d..67cfa6d 100755
--- a/docker/setup_dashboard.sh
+++ b/docker/setup_dashboard.sh
@@ -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
diff --git a/plugins/globalnoc-networkmap-panel b/plugins/globalnoc-networkmap-panel
deleted file mode 160000
index 91e38fd..0000000
--- a/plugins/globalnoc-networkmap-panel
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 91e38fd20ab0035d1e3c0f3f5db6da4d0bc3b632
diff --git a/plugins/globalnoc-worldview-panel b/plugins/globalnoc-worldview-panel
new file mode 160000
index 0000000..a3f4666
--- /dev/null
+++ b/plugins/globalnoc-worldview-panel
@@ -0,0 +1 @@
+Subproject commit a3f466662a23d8a285e6191ae87d7a9d9bcfa83e
diff --git a/templates/requirements.txt b/templates/requirements.txt
index 8c2d0df..7a921d5 100644
--- a/templates/requirements.txt
+++ b/templates/requirements.txt
@@ -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