KPI as external projects, plot stubs

.gitlab-ci.yml

@@ -17,6 +17,10 @@ after_script:
   - echo "After script section"
 
 plot_general:
+  only:
+    - master
+    - tags
+    - merge_requests
   stage: build
   variables:
     GIT_SUBMODULE_STRATEGY: recursive

.gitmodules

 [submodule "KPI"]
-	path = data/KPI
+	path = subprojects/KPI
 	url = ../../hifis/cloud/KPI.git
 [submodule "AAI"]
-	path = data/AAI
+	path = subprojects/AAI
 	url = ../../hifis/overall/communication/service-usage-plots.git

plot_general/plot.plt

@@ -8,7 +8,7 @@ set yrange [0:*]
 set xdata time
 set timefmt "%Y-%m-%d %H:%M"
 set format x "%Y-%m-%d"
-set xrange ["2019-07-01":"2021-07-02"]
+set xrange ["2019-07-01":"2021-09-02"]
 set grid 
 set xtics rotate by 45
 set key top left
@@ -50,12 +50,29 @@ set xtics textcolor rgbcolor "black" offset -4,-3
 set ylabel '{/Arial:Bold B2d}: Registered VOs (root)'
 plot '../stats/aai/aai_vo.csv' u 1:2 w lp pt 6 ps 0.5 lt 2 lc black title 'VO - total' ,\
      ''                        u 1:3 w lp pt 7 ps 0.5 lt 1 lc black title 'VO - HIFIS' 
-set timefmt "%Y-%m-%d %H:%M"
               
+unset multiplot
+
+set multiplot layout 2,2 columnsfirst margins screen MP_LEFT, MP_RIGHT, MP_BOTTOM, MP_TOP spacing screen MP_xGAP, MP_yGAP
+
+set xrange [*:*]
+set yrange [*:*]
+unset ylabel
+
+set timefmt "%Y-%m-%d %H:%M"
+plot '../stats/cloud-services/jsc_openstack.csv' u 1:3 w lp lc black notitle
+
+set timefmt "%d.%m.%Y"
+plot '../stats/cloud-services/hzb_nubes.csv' u 1:2 w lp lc black notitle
               
+set timefmt "%Y-%m-%d %H:%M"
+plot '../stats/cloud-services/kit_bwsyncnshare.csv' u 1:2 w d lc black notitle
 unset multiplot
 
 
+exit
+
+
 
 set key bottom left
 set ylabel '{/Arial:Bold B2a}: AAI-connected centres'

stats/aai

-../data/AAI/stats/aai
\ No newline at end of file
+../subprojects/AAI/stats/aai
\ No newline at end of file

stats/cloud-services/hzb_nubes.csv

+../../subprojects/KPI/HZB/KPi_nubes.csv
\ No newline at end of file

stats/cloud-services/hzdr_gitlab.csv

+../../subprojects/KPI/HZDR/gitlab/active_users.csv
\ No newline at end of file

stats/cloud-services/hzdr_mattermost.csv

+/home/desy-internet/Documents/DESY/git/service-usage-plots-ci/subprojects/KPI/HZDR/mattermost/instance_statistics.csv
\ No newline at end of file

stats/cloud-services/jsc_openstack.csv

+../../subprojects/KPI/FZJ/usage-stats-openstack-jsc-weekly.csv
\ No newline at end of file

stats/cloud-services/kit_bwsyncnshare.csv

+../../subprojects/KPI/KIT/active_users_last_1_h-data-2021-07-02_13_49_18.csv
\ No newline at end of file

stats/gitlab

-../data/AAI/stats/gitlab
\ No newline at end of file
+../subprojects/AAI/stats/gitlab
\ No newline at end of file

stats/vpn

-../data/AAI/stats/vpn
\ No newline at end of file
+../subprojects/AAI/stats/vpn
\ No newline at end of file

stats/workshops

-../data/AAI/stats/workshops
\ No newline at end of file
+../subprojects/AAI/stats/workshops
\ No newline at end of file