diff --git a/src/components/IOC/IOCLiveStatus/IOCLiveStatus.js b/src/components/IOC/IOCLiveStatus/IOCLiveStatus.js index 848b1eb8c35e612ce62b28cb15c81f8baf1c5519..fd133eafc253e44561c258d885dbc089f70ddc26 100644 --- a/src/components/IOC/IOCLiveStatus/IOCLiveStatus.js +++ b/src/components/IOC/IOCLiveStatus/IOCLiveStatus.js @@ -91,7 +91,7 @@ export function IOCLiveStatus({ ioc }) { renderNoAccess={() => <></>} > <SimpleAccordion - summary="ProcServLog info" + summary="IOC log stream" expanded={deserialize(state.procserv_log_open)} onChange={(event, expanded) => setState({ procserv_log_open: serialize(expanded) }) diff --git a/src/components/IOC/IOCManage/IOCManage.js b/src/components/IOC/IOCManage/IOCManage.js index 8e3835ff87c4a512517acfb5860197a8120814e4..ed29204df52baa1deb51a162d1eb27452c8ab828 100644 --- a/src/components/IOC/IOCManage/IOCManage.js +++ b/src/components/IOC/IOCManage/IOCManage.js @@ -88,7 +88,7 @@ export function IOCManage({ const showControls = deploymentStatus.wasSuccessful(); let subset = { - "IOC name": ( + "Naming service record": ( <Typography> <MuiLink href={`${window.NAMING_ADDRESS}/devices.xhtml?i=2&deviceName=${ioc.namingName}`} @@ -100,7 +100,7 @@ export function IOCManage({ </MuiLink> </Typography> ), - git: ( + Repository: ( <Typography> <MuiLink href={git} @@ -127,7 +127,7 @@ export function IOCManage({ }} /> ) : ( - "Can't be controlled, because IOC is not (yet) deployed succesfully" + "IOC not yet deployed" ); } diff --git a/src/components/common/Loki/LokiPanel.js b/src/components/common/Loki/LokiPanel.js index 8ddc073e41d473041e26ba5cf4f9633d659faff2..95dde124c65e29fe3266e8f2aa063f52979520f7 100644 --- a/src/components/common/Loki/LokiPanel.js +++ b/src/components/common/Loki/LokiPanel.js @@ -220,7 +220,7 @@ export function LokiPanel({ host, iocName, isSyslog, isDeployed }) { )} dataReady={dataReady} extraClass={isDeployed ? classes.deployed : classes.undeployed} - title={isSyslog ? "Syslog" : "ProcServ log"} + title={isSyslog ? "Host log stream" : "IOC log stream"} dialogHeader={header} loading={periodChange} /> diff --git a/src/views/help/HelpView.js b/src/views/help/HelpView.js index e9d37441bd2770ff966def84821d9c7d026a2fb9..ab89777f78be6b5e71ed5efd31b2a8b4b5fba9cc 100644 --- a/src/views/help/HelpView.js +++ b/src/views/help/HelpView.js @@ -14,16 +14,16 @@ export function HelpView() { summary={ <Stack gap={1.5}> <Typography> - This is the deployment and monitoring parts of the IOC toolchain - in the Controls Ecosystem; CE Deploy & Monitor.{" "} + CE Deploy & Monitor is the deployment and monitoring parts of the + IOC toolchain in the Controls Ecosystem.{" "} </Typography> <Typography> It is a tool that manages IOCs on host machines, using Ansible to perform the necessary configuration management. This tool will set - up IOC-hosts and deploy IOC(s) in a consistent manner, and will - configure all necessary services towards this purpose. The tool - also integrates with various other systems to enable monitoring of - IOCs and hosts, and enables some limited remote execution + up IOC hosts and deploy IOCs in a consistent manner, and will + configure all necessary services needed for this purpose. It also + integrates with various other systems to enable monitoring of IOCs + and hosts, and further enables some limited remote execution features. </Typography> <Typography fontStyle="italic"> diff --git a/src/views/host/HostDetailsView.js b/src/views/host/HostDetailsView.js index f7e78f6e53527ed19b4deb39e3056e4e4a0bfe42..19ccd06a11089d424a38ac6b585b67ad7cae1227 100644 --- a/src/views/host/HostDetailsView.js +++ b/src/views/host/HostDetailsView.js @@ -242,7 +242,7 @@ export function HostDetailsView({ id, host }) { renderNoAccess={() => <></>} > <SimpleAccordion - summary="Syslog info" + summary="Host log stream" expanded={deserialize(urlState.syslog_open)} onChange={(event, expanded) => setUrlState({ syslog_open: serialize(expanded) }) diff --git a/src/views/records/RecordDetailsView.js b/src/views/records/RecordDetailsView.js index b625d00c1eeb960cb7ad0219724b30acd0d007c8..b21c8e05aa6ad58ea796e72ec1351b2f05bb4d9b 100644 --- a/src/views/records/RecordDetailsView.js +++ b/src/views/records/RecordDetailsView.js @@ -128,6 +128,8 @@ export function RecordDetailsView() { subset.Description = value; } else if (key.toLowerCase().includes("alias")) { subset["Record type"] = value; + } else if (key.toLowerCase() === "iocversion") { + subset["IOC Revision"] = value; } else if (key.toLowerCase() !== "iocid") { subset[key.replaceAll("_", " ")] = value; }