Webdash

Tom-Willemsen · Tom-Willemsen · commit 70c0271a0a44 · 2025-10-24T15:45:16.000+01:00
diff --git a/doc/Web.md b/doc/Web.md
@@ -5,7 +5,6 @@
 :titlesonly:
 
 webdashboard/Web-Dashboard
-webdashboard/PVWS
 webdashboard/ISIS-Info-Slack
 webdashboard/MCR-News-in-Teams
 ```
diff --git a/doc/conf.py b/doc/conf.py
@@ -100,6 +100,7 @@
     "client/coding/Migrating-or-adding-a-button-to-the-E4-perspective-switcher": "Perspectives.html",  # noqa E501
     "client/coding/Adding-a-Button-to-the-Perspective-Switcher": "Perspectives.html",
     "client/testing/Using-Mockito-for-Testing-in-the-GUI": "Mockito.html",
+    "webdashboard/PVWS": "Web-Dashboard.html",
 }
 
 intersphinx_mapping = {
diff --git a/doc/systems/Webserver.md b/doc/systems/Webserver.md
@@ -18,8 +18,8 @@ If a new server is setup, then ciphers and old TLS versions may need to be disab
 
 ## NDAEXTWEB4
 
-NDAEXTWEB4 is similar in that it also runs on the Hyper-V cluster. This currently hosts the [PVWS](/webdashboard/PVWS) which is a PVWS instance for the IBEX web dashboard. 
+NDAEXTWEB4 is similar in that it also runs on the Hyper-V cluster. This currently hosts the [PVWS](#pvws) which is a PVWS instance for the IBEX web dashboard. 
 
 ## Shadow
     
-Some web services run on Shadow - see [here](/systems/Shadow) for more information. 
+Some web services run on Shadow - see [here](Shadow) for more information. 
diff --git a/doc/webdashboard/PVWS.md b/doc/webdashboard/PVWS.md
diff --git a/doc/webdashboard/Web-Dashboard.md b/doc/webdashboard/Web-Dashboard.md
@@ -1,123 +1,24 @@
 # Web Dashboard
 
 ```{important}
-This page documents the old web dashboard, also known as `JSON_Bourne`. The [new one](https://github.com/ISISComputingGroup/webdashboard) should have its architecture and how it's run explained in the README of its repository. 
+The previous web dashboard, which used to be available under `https://dataweb.isis.rl.ac.uk`, is being switched off as of October 2025.
 ```
 
-The dataweb service allows some information about each instrument to be viewed in a webpage from both inside and outside the ISIS network.
+## Frontend
 
-## The Overall Architecture
+The web dashboard's front-end is deployed [on github pages](https://isiscomputinggroup.github.io/WebDashboard/). Deployment is done automatically via continuous deployment when a new change is pushed to the main branch.
 
-![Architecture](dataweb_architecture.png)
+Documentation for the setup, including local developer setup instructions, are available [in the README of its repository](https://github.com/ISISComputingGroup/WebDashboard/blob/main/README.md).
 
-The dataweb system consists of a number of parts running on each instrument:
+{#pvws}
+## Backend (`pvws`)
 
----
+PVWS is a tool which lets you get EPICS PV information and expose it via a websocket. This is used as the backend for the web dashboard.
 
-### The Archive Engine
+Information on how we run this can be found [in the README of the `pvws-config` repository](https://github.com/ISISComputingGroup/pvws-config/blob/main/README.md).
 
-The archive engine shown in the [high level design](/overview/High-Level-Architectural-Design) produces internal webpages that provides live data on various PVs in HTML format:
+See also {doc}`webserver systems documentation </systems/Webserver>` for the computer on which `pvws` is hosted.
 
-* INST (located at http://localhost:4812/group?name=INST&format=json) gives data on the PVs associated with the DAE etc.
-* BLOCKS (located at http://localhost:4813/group?name=BLOCKS&format=json) gives data on the current status of all block PVs
-* DATAWEB (located at http://localhost:4813/group?name=DATAWEB&format=json) gives data on hidden blocks
+## Grafana and Journals Setup
 
-### The WebServer
-
-The webserver is run as part of the BlockServer and provides all of the data on the current configuration in JSON format. This is the exact same data that is served on the GET_CURR_CONFIG_DETAILS PV. The webserver is currently serving the data on localhost:8008. Note that the fortinet VPN uses 8008 for internal configuration and so you cannot access this address through the fortinet VPN.
-
----
-
-### On the Dataweb Server
-
-There are also parts of the system running on a central [webserver](/systems/Webserver), which provides external access.
-
-### JSON Bourne
-
-The program collates all the data from the other sources, on all the EPICS instruments, such as putting the blocks and their values into the relevant groups as given by the configuration. This information is served as JSON to localhost:60000. This runs as a service on the central server and lives in C:\JSON_Bourne.
-
-### The Website
-
-Currently a simple JS script takes the JSON created by JSON Bourne and provides a simple webpage for an external client to view. This can be accessed from http://dataweb.isis.rl.ac.uk/. The code for the website, both the html and javascript are located in the central server at `C:\inetpub\wwwroot\DataWeb\IbexDataweb`.
-
-### Grafana and Journals Setup
-
-Docs can be found on the shares at `shares\isis_experiment_controls\web_dashboard_history.docx`
-
-## Deployment
-
-To update the production version of the dashboard:
-* Remote desktop into external webserver (for username and password see password page)
-* Open a git bash terminal in C:\JSON_Bourne and switch to the [release branch](/deployment/Creating-a-release)
-* Run the deploy batch script as admin
-* Restart JSON_bourne (see [here](#webdashboard_restart_dataweb))
-* Go to (for example) http://dataweb.isis.rl.ac.uk/IbexDataweb/default.html?Instrument=zoom and confirm the webpage is live
-
-## Development/Testing
-
-Clone the repository at https://github.com/ISISComputingGroup/JSON_bourne
-
-To test the blockserver webserver:
-* Start your instrument
-* Navigate to `localhost:8008` in a browser
-
-To test JSON_Bourne:
-* Run webserver.py
-* Navigate in a browser to http://localhost:60000/?callback=parseObject&Instrument=[Instrument-Name]&.
-  Where [Instrument-Name] is replaced by the desired instrument (i.e., ZOOM&) in all capitals.
-
-To test the front end on a developer machine:
-* Open default.html with the variable of ?Instrument=instrument-name e.g. go to `file:///C:/Instrument/Dev/JSON_bourne/front_end/default.html?Instrument=larmor` in a browser to view Larmor's dashboard. Note that the path is dependant on where you have created the local JSON_bourne repository. This will use the JSON bourne instance running on NDAEXTWEB!
-
-To test the front end and JSON bourne on a developer machine:
-* Run `webserver.py`
-* Edit display\_blocks.js to look at http://localhost rather than http://dataweb.isis.rl.ac.uk
-* Open default.html as above
-
-To be able to see your instrument as well:
-* Add your instrument to the `local_inst_list` dictionary in the `webserver.py` e.g. `local_inst_list = {"LOCALHOST": ("localhost")}`
-* Run your instrument
-* Run JSON Bourne up as above
-
-If you need to update the archive engine then you will need to:
-
-1. Run create_icp_binaries.bat
-1. `make clean uninstall install` in `..\EPICS\CSS\master`
-
-{#webdashboard_troubleshooting}
-## Troubleshooting
-
-### General Investigation
-
-First look at the log to ensure that there are no issues. The log is held in `C:\JSON_Bourne\log`. Issues may be in the front end, in which case error logs are in the web browser, visit the webpage in a browser and open up the web console.
-If there are a number of `HTTP Error 503. The service is unavailable` errors, restarting the server completely may be required, but simply restarting the Dataweb should be the first thing to try.
-
-{#webdashboard_restart_dataweb}
-### Restart the Dataweb
-
-As admin open the "Task Scheduler" (there is a shortcut for this on the desktop) and end and run the "JSON Bourne" task (in task scheduler library). Make sure that ending the task has killed the Python webserver process.
-
-### New Instrument with No Details
-
-If the instrument archive has never been restarted then the dataweb will fail to show any information and claim that the server hasn't been started. To fix this simple restart the instrument archive.
-
-{#webdashboard_troubleshooting_instrument_page_not_working}
-### Instrument Page not Working on Web Dashboard
-
-Several causes
-
-1. Check that the instrument is in the list of Instruments in https://github.com/ISISComputingGroup/JSON_bourne/blob/master/webserver.py and that the version on web server is up-to-date.
-
-1. Issues with MySQL in the moment the IBEX server was started (this seems to affect the archiver start up). Check logs of the MySQL service in the `var` area, fix any issues so that MySQL is running correctly again, then restart the IBEX server.
-
-1. If it works in your browser but not he users they may have a old cached copy (this shouldn't happen but we have seen it in Safari). Clear their browser cache and reload.
-
-1. Try restarting `ARINST` on the instrument. It can happen that the archiver does not pick up all PVs to be archived on server startup. A symptom of this is that the configuration file under `EPICS\CSS\master\ArchiveEngine\inst_config.xml` is very short compared to other machines.
-
-## Future Development Ideas
-
-* We need to improve the unit test coverage of this project. It would be worth looking into the [requests-mock](https://pypi.python.org/pypi/requests-mock) library as this would make it very easy to test server code which makes HTTP requests.
-
-## Overview page
-
-http://dataweb.isis.rl.ac.uk/IbexDataweb/Overview/ibexOverview.html
+Documentation can be found on the shares at `shares\isis_experiment_controls\web_dashboard_history.docx`

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,7 @@`
`100`	`100`	`"client/coding/Migrating-or-adding-a-button-to-the-E4-perspective-switcher": "Perspectives.html", # noqa E501`
`101`	`101`	`"client/coding/Adding-a-Button-to-the-Perspective-Switcher": "Perspectives.html",`
`102`	`102`	`"client/testing/Using-Mockito-for-Testing-in-the-GUI": "Mockito.html",`
	`103`	`+ "webdashboard/PVWS": "Web-Dashboard.html",`
`103`	`104`	`}`
`104`	`105`
`105`	`106`	`intersphinx_mapping = {`