Required Updates from Version 8.0 Release for 8.1 Branch (#724)

Reuqired changes for initial 8.1 branch
ubccr · Nov 9, 2018 · 4552ced · 4552ced
1 parent f9257af
commit 4552ced
Show file tree

Hide file tree

Showing 536 changed files with 6,326 additions and 1,897 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1 +1 @@
-FROM       tas-tools-ext-01.ccr.xdmod.org/xdmod-centos7:open7.5.1-v5
+FROM       tas-tools-ext-01.ccr.xdmod.org/xdmod-centos7:open8.0.0-v1
diff --git a/bin/xdmod-upgrade b/bin/xdmod-upgrade
@@ -26,8 +26,7 @@ ini_set('memory_limit', -1);
  * @var array
  */
 $supportedUpgrades = array(
-    '7.5.0' => '7.5.1',
-    '7.5.1' => '8.0.0',
+    '8.0.0' => '8.1.0',
 );
 
 /**

diff --git a/configuration/portal_settings.ini b/configuration/portal_settings.ini
@@ -6,7 +6,7 @@ contact_page_recipient = ""
 tech_support_recipient = ""
 
 ; The version number is updated during the upgrade process.
-version = "8.0.0"
+version = "8.1.0"
 
 debug_mode = "off"
 debug_recipient = ""

diff --git a/open_xdmod/modules/xdmod/build.json b/open_xdmod/modules/xdmod/build.json
@@ -1,6 +1,6 @@
 {
     "name": "xdmod",
-    "version": "8.0.0",
+    "version": "8.1.0",
     "release": "1.0",
     "files": {
         "include_paths": [

diff --git a/open_xdmod/modules/xdmod/integration_tests/scripts/bootstrap.sh b/open_xdmod/modules/xdmod/integration_tests/scripts/bootstrap.sh
@@ -24,6 +24,8 @@ then
     GRANT ALL PRIVILEGES ON *.* TO 'root'@'gateway' WITH GRANT OPTION;
     FLUSH PRIVILEGES;"
     expect $BASEDIR/xdmod-setup.tcl | col -b
+    xdmod-import-csv -t hierarchy -i $REF_DIR/hierarchy.csv
+    xdmod-import-csv -t group-to-hierarchy -i $REF_DIR/group-to-hierarchy.csv
     for resource in $REF_DIR/*.log; do
         sudo -u xdmod xdmod-shredder -r `basename $resource .log` -f slurm -i $resource;
     done
@@ -49,19 +51,5 @@ if [ "$XDMOD_TEST_MODE" = "upgrade" ];
 then
     yum -y install ~/rpmbuild/RPMS/*/*.rpm
     ~/bin/services start
-    # Delete this once it is added to the docker build by default
-    mysql -e "CREATE USER 'root'@'gateway' IDENTIFIED BY '';
-    GRANT ALL PRIVILEGES ON *.* TO 'root'@'gateway' WITH GRANT OPTION;
-    FLUSH PRIVILEGES;"
     expect $BASEDIR/xdmod-upgrade.tcl | col -b
-    expect $BASEDIR/xdmod-upgrade-add-cloud-resource.tcl | col -b
-    #Updating minmaxdate table so data for cloud realm shows up
-    mysql -e "UPDATE modw.minmaxdate SET max_job_date = '2018-07-01';"
-    #Ingesting cloud data from references folder
-    sudo -u xdmod php /usr/share/xdmod/tools/etl/etl_overseer.php -p jobs-common
-    sudo -u xdmod php /usr/share/xdmod/tools/etl/etl_overseer.php -p jobs-cloud-common
-    sudo -u xdmod php /usr/share/xdmod/tools/etl/etl_overseer.php -p ingest-resources
-    sudo -u xdmod php /usr/share/xdmod/tools/etl/etl_overseer.php -p jobs-cloud-ingest-openstack -r openstack -d "CLOUD_EVENT_LOG_DIRECTORY=$REF_DIR/openstack"
-    sudo -u xdmod php /usr/share/xdmod/tools/etl/etl_overseer.php -p jobs-cloud-extract-openstack
-    sudo -u xdmod php /usr/share/xdmod/tools/etl/etl_overseer.php -p cloud-state-pipeline
 fi
diff --git a/open_xdmod/modules/xdmod/integration_tests/scripts/samlSetup.sh b/open_xdmod/modules/xdmod/integration_tests/scripts/samlSetup.sh
@@ -231,5 +231,5 @@ cat > "$VENDOR_DIR/simplesamlphp/simplesamlphp/metadata/saml20-idp-remote.php" <
 );
 EOF
 
-node app.js  --acs http://localhost:8080/simplesaml/module.php/saml/sp/saml2-acs.php/xdmod-sp --aud http://localhost:8080/simplesaml/module.php/saml/sp/metadata.php/xdmod-sp --httpsPrivateKey ./idp-private-key.pem --httpsCert ./idp-public-cert.pem  --https false &
+node app.js  --acs http://localhost:8080/simplesaml/module.php/saml/sp/saml2-acs.php/xdmod-sp --aud http://localhost:8080/simplesaml/module.php/saml/sp/metadata.php/xdmod-sp --httpsPrivateKey ./idp-private-key.pem --httpsCert ./idp-public-cert.pem  --https false > /var/log/xdmod/samlidp.log 2>&1 &
 httpd -k start
diff --git a/open_xdmod/modules/xdmod/integration_tests/scripts/xdmod-upgrade.tcl b/open_xdmod/modules/xdmod/integration_tests/scripts/xdmod-upgrade.tcl
@@ -23,32 +23,9 @@ expect {
     timeout {
         send_user "\nFailed to get prompt\n"; exit 1
     }
-    -re "\nDo you want to run aggregation now.*\\\]" {
-        send yes\n
-    }
-}
-expect {
-    timeout {
-        send_user "\nFailed to get prompt\n"; exit 1
-    }
-    -re "\nAdmin Username:" {
-        send root\n
-    }
-}
-
-expect {
-    timeout {
-        send_user "\nFailed to get prompt\n"; exit 1
-    }
-    -re "\nAdmin Password:" {
-        send \n
-        exp_continue
-    }
     "Upgrade Complete" {
         lassign [wait] pid spawnid os_error_flag value
     }
 }
 
-
-
 exit $value
diff --git a/open_xdmod/modules/xdmod/regression_tests/lib/Controllers/UsageExplorerTest.php b/open_xdmod/modules/xdmod/regression_tests/lib/Controllers/UsageExplorerTest.php
@@ -76,6 +76,7 @@ public function testCsvExport($testName, $input, $expectedFile, $userRole)
                     $this->assertEquals($expected, $csvdata);
                     return;
                 }
+                self::$messages[] = "Raw Expected:\n$expected\n\nRaw Actual:\n$csvdata\n";
 
                 $failures = $this->csvDataDiff($expected, $csvdata, $fullTestName);
                 if(empty($failures))

diff --git a/...nt/expected/reference/Jobs/fieldofscience/active_person_count/aggregate-Day-reference.csv b/...nt/expected/reference/Jobs/fieldofscience/active_person_count/aggregate-Day-reference.csv
@@ -6,5 +6,44 @@ start,end
 2016-12-22,2017-01-01
 ---------
 "PI Group","Number of Users: Active"
-Unknown,66
+"Galactic Astronomy",6
+"Physical Chemistry",4
+"Quantum Electronics, Waves, and Beams",4
+"Stellar Astronomy and Astrophysics",4
+Arts,3
+"Mechanics and Materials",3
+Biophysics,2
+"Cell Biology",2
+"Decision, Risk, and Management Science",2
+"Experimental Systems",2
+"Organic and Macromolecular Chemistry",2
+Sociology,2
+"Solid State Chemistry and Polymers",2
+"Statistics and Probability",2
+"Algebra and Number Theory",1
+"Biochemistry and Molecular Structure and Function",1
+"Computer and Computation Theory",1
+"Design and Computer-Integrated Engineering",1
+"Design, Tools, and Test",1
+Economics,1
+"Emerging Technologies Initiation",1
+"Extragalactic Astronomy and Cosmology",1
+"Fluid, Particulate, and Hydraulic Systems",1
+"Geology and Paleontology",1
+Geophysics,1
+"Global Atmospheric Research",1
+"Law and Social Sciences",1
+"Metals, Ceramics, and Electronic Materials",1
+"Operations Research and Production Systems",1
+"Polar Aeronomy and Astrophysics",1
+"Polar Meteorology",1
+"Polar Ocean and Climate Systems",1
+Seismology,1
+"Solid-State and Microstructures",1
+"Structures and Building Systems",1
+"Systematic and Population Biology",1
+"Systems Prototyping and Fabrication",1
+Tectonics,1
+"Theoretical Physics",1
+"Volcanology and Mantle Geochemistry",1
 ---------
diff --git a/.../expected/reference/Jobs/fieldofscience/active_person_count/aggregate-Month-reference.csv b/.../expected/reference/Jobs/fieldofscience/active_person_count/aggregate-Month-reference.csv
@@ -6,5 +6,44 @@ start,end
 2016-12-22,2017-01-01
 ---------
 "PI Group","Number of Users: Active"
-Unknown,66
+"Galactic Astronomy",6
+"Physical Chemistry",4
+"Quantum Electronics, Waves, and Beams",4
+"Stellar Astronomy and Astrophysics",4
+Arts,3
+"Mechanics and Materials",3
+Biophysics,2
+"Cell Biology",2
+"Decision, Risk, and Management Science",2
+"Experimental Systems",2
+"Organic and Macromolecular Chemistry",2
+Sociology,2
+"Solid State Chemistry and Polymers",2
+"Statistics and Probability",2
+"Algebra and Number Theory",1
+"Biochemistry and Molecular Structure and Function",1
+"Computer and Computation Theory",1
+"Design and Computer-Integrated Engineering",1
+"Design, Tools, and Test",1
+Economics,1
+"Emerging Technologies Initiation",1
+"Extragalactic Astronomy and Cosmology",1
+"Fluid, Particulate, and Hydraulic Systems",1
+"Geology and Paleontology",1
+Geophysics,1
+"Global Atmospheric Research",1
+"Law and Social Sciences",1
+"Metals, Ceramics, and Electronic Materials",1
+"Operations Research and Production Systems",1
+"Polar Aeronomy and Astrophysics",1
+"Polar Meteorology",1
+"Polar Ocean and Climate Systems",1
+Seismology,1
+"Solid-State and Microstructures",1
+"Structures and Building Systems",1
+"Systematic and Population Biology",1
+"Systems Prototyping and Fabrication",1
+Tectonics,1
+"Theoretical Physics",1
+"Volcanology and Mantle Geochemistry",1
 ---------
diff --git a/...xpected/reference/Jobs/fieldofscience/active_person_count/aggregate-Quarter-reference.csv b/...xpected/reference/Jobs/fieldofscience/active_person_count/aggregate-Quarter-reference.csv
@@ -6,5 +6,44 @@ start,end
 2016-12-22,2017-01-01
 ---------
 "PI Group","Number of Users: Active"
-Unknown,66
+"Galactic Astronomy",6
+"Physical Chemistry",4
+"Quantum Electronics, Waves, and Beams",4
+"Stellar Astronomy and Astrophysics",4
+Arts,3
+"Mechanics and Materials",3
+Biophysics,2
+"Cell Biology",2
+"Decision, Risk, and Management Science",2
+"Experimental Systems",2
+"Organic and Macromolecular Chemistry",2
+Sociology,2
+"Solid State Chemistry and Polymers",2
+"Statistics and Probability",2
+"Algebra and Number Theory",1
+"Biochemistry and Molecular Structure and Function",1
+"Computer and Computation Theory",1
+"Design and Computer-Integrated Engineering",1
+"Design, Tools, and Test",1
+Economics,1
+"Emerging Technologies Initiation",1
+"Extragalactic Astronomy and Cosmology",1
+"Fluid, Particulate, and Hydraulic Systems",1
+"Geology and Paleontology",1
+Geophysics,1
+"Global Atmospheric Research",1
+"Law and Social Sciences",1
+"Metals, Ceramics, and Electronic Materials",1
+"Operations Research and Production Systems",1
+"Polar Aeronomy and Astrophysics",1
+"Polar Meteorology",1
+"Polar Ocean and Climate Systems",1
+Seismology,1
+"Solid-State and Microstructures",1
+"Structures and Building Systems",1
+"Systematic and Population Biology",1
+"Systems Prototyping and Fabrication",1
+Tectonics,1
+"Theoretical Physics",1
+"Volcanology and Mantle Geochemistry",1
 ---------
diff --git a/...t/expected/reference/Jobs/fieldofscience/active_person_count/aggregate-Year-reference.csv b/...t/expected/reference/Jobs/fieldofscience/active_person_count/aggregate-Year-reference.csv
@@ -6,5 +6,44 @@ start,end
 2016-12-22,2017-01-01
 ---------
 "PI Group","Number of Users: Active"
-Unknown,66
+"Galactic Astronomy",6
+"Physical Chemistry",4
+"Quantum Electronics, Waves, and Beams",4
+"Stellar Astronomy and Astrophysics",4
+Arts,3
+"Mechanics and Materials",3
+Biophysics,2
+"Cell Biology",2
+"Decision, Risk, and Management Science",2
+"Experimental Systems",2
+"Organic and Macromolecular Chemistry",2
+Sociology,2
+"Solid State Chemistry and Polymers",2
+"Statistics and Probability",2
+"Algebra and Number Theory",1
+"Biochemistry and Molecular Structure and Function",1
+"Computer and Computation Theory",1
+"Design and Computer-Integrated Engineering",1
+"Design, Tools, and Test",1
+Economics,1
+"Emerging Technologies Initiation",1
+"Extragalactic Astronomy and Cosmology",1
+"Fluid, Particulate, and Hydraulic Systems",1
+"Geology and Paleontology",1
+Geophysics,1
+"Global Atmospheric Research",1
+"Law and Social Sciences",1
+"Metals, Ceramics, and Electronic Materials",1
+"Operations Research and Production Systems",1
+"Polar Aeronomy and Astrophysics",1
+"Polar Meteorology",1
+"Polar Ocean and Climate Systems",1
+Seismology,1
+"Solid-State and Microstructures",1
+"Structures and Building Systems",1
+"Systematic and Population Biology",1
+"Systems Prototyping and Fabrication",1
+Tectonics,1
+"Theoretical Physics",1
+"Volcanology and Mantle Geochemistry",1
 ---------
diff --git a/...t/expected/reference/Jobs/fieldofscience/active_person_count/timeseries-Day-reference.csv b/...t/expected/reference/Jobs/fieldofscience/active_person_count/timeseries-Day-reference.csv
@@ -5,16 +5,16 @@ parameters
 start,end
 2016-12-22,2017-01-01
 ---------
-Day,"[Unknown] Number of Users: Active"
-2016-12-22,2
-2016-12-23,3
-2016-12-24,3
-2016-12-25,4
-2016-12-26,5
-2016-12-27,16
-2016-12-28,25
-2016-12-29,43
-2016-12-30,64
-2016-12-31,55
-2017-01-01,38
+Day,"[Galactic Astronomy] Number of Users: Active","[Physical Chemistry] Number of Users: Active","[Quantum Electronics, Waves, and Beams] Number of Users: Active","[Stellar Astronomy and Astrophysics] Number of Users: Active","[Arts] Number of Users: Active","[Mechanics and Materials] Number of Users: Active","[Biophysics] Number of Users: Active","[Cell Biology] Number of Users: Active","[Decision, Risk, and Management Science] Number of Users: Active","[Experimental Systems] Number of Users: Active","[Organic and Macromolecular Chemistry] Number of Users: Active","[Sociology] Number of Users: Active","[Solid State Chemistry and Polymers] Number of Users: Active","[Statistics and Probability] Number of Users: Active","[Algebra and Number Theory] Number of Users: Active","[Biochemistry and Molecular Structure and Function] Number of Users: Active","[Computer and Computation Theory] Number of Users: Active","[Design and Computer-Integrated Engineering] Number of Users: Active","[Design, Tools, and Test] Number of Users: Active","[Economics] Number of Users: Active","[Emerging Technologies Initiation] Number of Users: Active","[Extragalactic Astronomy and Cosmology] Number of Users: Active","[Fluid, Particulate, and Hydraulic Systems] Number of Users: Active","[Geology and Paleontology] Number of Users: Active","[Geophysics] Number of Users: Active","[Global Atmospheric Research] Number of Users: Active","[Law and Social Sciences] Number of Users: Active","[Metals, Ceramics, and Electronic Materials] Number of Users: Active","[Operations Research and Production Systems] Number of Users: Active","[Polar Aeronomy and Astrophysics] Number of Users: Active","[Polar Meteorology] Number of Users: Active","[Polar Ocean and Climate Systems] Number of Users: Active","[Seismology] Number of Users: Active","[Solid-State and Microstructures] Number of Users: Active","[Structures and Building Systems] Number of Users: Active","[Systematic and Population Biology] Number of Users: Active","[Systems Prototyping and Fabrication] Number of Users: Active","[Tectonics] Number of Users: Active","[Theoretical Physics] Number of Users: Active","[Volcanology and Mantle Geochemistry] Number of Users: Active"
+2016-12-22,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2016-12-23,1,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2016-12-24,1,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2016-12-25,1,2,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2016-12-26,1,2,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2016-12-27,3,2,1,1,0,0,2,1,0,0,0,1,2,2,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2016-12-28,3,4,1,1,0,0,2,1,0,1,1,1,2,2,1,1,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,1,1
+2016-12-29,4,4,2,3,2,0,2,2,1,2,1,2,2,2,1,1,1,0,0,0,1,0,0,0,0,1,0,1,1,1,0,0,1,1,1,0,1,0,1,1
+2016-12-30,6,4,4,4,3,3,2,2,2,2,2,2,2,2,1,1,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,1
+2016-12-31,5,4,4,4,3,3,2,1,1,2,2,2,1,1,1,1,1,1,0,1,1,1,1,1,0,0,0,1,1,1,1,1,1,1,1,1,1,1,0,0
+2017-01-01,2,4,3,3,2,3,2,1,0,1,1,2,0,1,1,0,0,1,0,1,1,0,0,1,0,1,0,0,1,0,1,1,1,1,0,1,1,0,0,0
 ---------
diff --git a/...expected/reference/Jobs/fieldofscience/active_person_count/timeseries-Month-reference.csv b/...expected/reference/Jobs/fieldofscience/active_person_count/timeseries-Month-reference.csv
@@ -5,7 +5,7 @@ parameters
 start,end
 2016-12-22,2017-01-01
 ---------
-Month,"[Unknown] Number of Users: Active"
-2016-12,66
-2017-01,38
+Month,"[Galactic Astronomy] Number of Users: Active","[Physical Chemistry] Number of Users: Active","[Quantum Electronics, Waves, and Beams] Number of Users: Active","[Stellar Astronomy and Astrophysics] Number of Users: Active","[Arts] Number of Users: Active","[Mechanics and Materials] Number of Users: Active","[Biophysics] Number of Users: Active","[Cell Biology] Number of Users: Active","[Decision, Risk, and Management Science] Number of Users: Active","[Experimental Systems] Number of Users: Active","[Organic and Macromolecular Chemistry] Number of Users: Active","[Sociology] Number of Users: Active","[Solid State Chemistry and Polymers] Number of Users: Active","[Statistics and Probability] Number of Users: Active","[Algebra and Number Theory] Number of Users: Active","[Biochemistry and Molecular Structure and Function] Number of Users: Active","[Computer and Computation Theory] Number of Users: Active","[Design and Computer-Integrated Engineering] Number of Users: Active","[Design, Tools, and Test] Number of Users: Active","[Economics] Number of Users: Active","[Emerging Technologies Initiation] Number of Users: Active","[Extragalactic Astronomy and Cosmology] Number of Users: Active","[Fluid, Particulate, and Hydraulic Systems] Number of Users: Active","[Geology and Paleontology] Number of Users: Active","[Geophysics] Number of Users: Active","[Global Atmospheric Research] Number of Users: Active","[Law and Social Sciences] Number of Users: Active","[Metals, Ceramics, and Electronic Materials] Number of Users: Active","[Operations Research and Production Systems] Number of Users: Active","[Polar Aeronomy and Astrophysics] Number of Users: Active","[Polar Meteorology] Number of Users: Active","[Polar Ocean and Climate Systems] Number of Users: Active","[Seismology] Number of Users: Active","[Solid-State and Microstructures] Number of Users: Active","[Structures and Building Systems] Number of Users: Active","[Systematic and Population Biology] Number of Users: Active","[Systems Prototyping and Fabrication] Number of Users: Active","[Tectonics] Number of Users: Active","[Theoretical Physics] Number of Users: Active","[Volcanology and Mantle Geochemistry] Number of Users: Active"
+2016-12,6,4,4,4,3,3,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+2017-01,2,4,3,3,2,3,2,1,0,1,1,2,0,1,1,0,0,1,0,1,1,0,0,1,0,1,0,0,1,0,1,1,1,1,0,1,1,0,0,0
 ---------
diff --git a/...pected/reference/Jobs/fieldofscience/active_person_count/timeseries-Quarter-reference.csv b/...pected/reference/Jobs/fieldofscience/active_person_count/timeseries-Quarter-reference.csv
@@ -5,7 +5,7 @@ parameters
 start,end
 2016-12-22,2017-01-01
 ---------
-Quarter,"[Unknown] Number of Users: Active"
-"2016 Q4",66
-"2017 Q1",38
+Quarter,"[Galactic Astronomy] Number of Users: Active","[Physical Chemistry] Number of Users: Active","[Quantum Electronics, Waves, and Beams] Number of Users: Active","[Stellar Astronomy and Astrophysics] Number of Users: Active","[Arts] Number of Users: Active","[Mechanics and Materials] Number of Users: Active","[Biophysics] Number of Users: Active","[Cell Biology] Number of Users: Active","[Decision, Risk, and Management Science] Number of Users: Active","[Experimental Systems] Number of Users: Active","[Organic and Macromolecular Chemistry] Number of Users: Active","[Sociology] Number of Users: Active","[Solid State Chemistry and Polymers] Number of Users: Active","[Statistics and Probability] Number of Users: Active","[Algebra and Number Theory] Number of Users: Active","[Biochemistry and Molecular Structure and Function] Number of Users: Active","[Computer and Computation Theory] Number of Users: Active","[Design and Computer-Integrated Engineering] Number of Users: Active","[Design, Tools, and Test] Number of Users: Active","[Economics] Number of Users: Active","[Emerging Technologies Initiation] Number of Users: Active","[Extragalactic Astronomy and Cosmology] Number of Users: Active","[Fluid, Particulate, and Hydraulic Systems] Number of Users: Active","[Geology and Paleontology] Number of Users: Active","[Geophysics] Number of Users: Active","[Global Atmospheric Research] Number of Users: Active","[Law and Social Sciences] Number of Users: Active","[Metals, Ceramics, and Electronic Materials] Number of Users: Active","[Operations Research and Production Systems] Number of Users: Active","[Polar Aeronomy and Astrophysics] Number of Users: Active","[Polar Meteorology] Number of Users: Active","[Polar Ocean and Climate Systems] Number of Users: Active","[Seismology] Number of Users: Active","[Solid-State and Microstructures] Number of Users: Active","[Structures and Building Systems] Number of Users: Active","[Systematic and Population Biology] Number of Users: Active","[Systems Prototyping and Fabrication] Number of Users: Active","[Tectonics] Number of Users: Active","[Theoretical Physics] Number of Users: Active","[Volcanology and Mantle Geochemistry] Number of Users: Active"
+"2016 Q4",6,4,4,4,3,3,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+"2017 Q1",2,4,3,3,2,3,2,1,0,1,1,2,0,1,1,0,0,1,0,1,1,0,0,1,0,1,0,0,1,0,1,1,1,1,0,1,1,0,0,0
 ---------