diff --git a/src/components/IOC/IOCLiveStatus/IOCLiveStatus.spec.js b/src/components/IOC/IOCLiveStatus/IOCLiveStatus.spec.js
index 7976d310180534aa32bb1078f45f8c2edafc23fa..da0e0b6761c7b1ce033c512f1389f778d27ae47a 100644
--- a/src/components/IOC/IOCLiveStatus/IOCLiveStatus.spec.js
+++ b/src/components/IOC/IOCLiveStatus/IOCLiveStatus.spec.js
@@ -13,7 +13,7 @@ function IOCLiveStatusContainer() {
const params = useMemo(
() => ({
- ioc_id: 4
+ ioc_id: 15
}),
[]
);
@@ -28,12 +28,12 @@ function IOCLiveStatusContainer() {
function commonTests() {
// Expect IOC name in badge
- cy.contains("CCCE:SC-IOC-004");
+ cy.contains("CCCE:MOCK2");
// Expected in Info table:
- cy.contains("0.0.1"); // git reference
- cy.contains("This is a test IOC with mock data and errors"); // description
- cy.contains("ccpu-evrtm.tn.esss.lu.se"); // deployed on
+ cy.contains("correct_ioc"); // git reference
+ cy.contains("Test IOC for CCCE"); // description
+ cy.contains("ccce-test-ioc-01.cslab.esss.lu.se"); // deployed on
// Expect alerts to be displayed
cy.get("#ioc-alerts")
@@ -62,7 +62,7 @@ describe("IOCLiveStatus", () => {
it("displays the logged in view", () => {
commonTests();
// check for procserv logs
- cy.wait("@getProcservLogs");
+ cy.wait("@fetchProcServLogLines");
cy.contains("This is some fake log data");
});
});
diff --git a/src/components/IOC/IOCTable/IOCStatus.js b/src/components/IOC/IOCTable/IOCStatus.js
index 14e51ff3899f405cdf40bc418c4ac92e04686112..5671f75e0b347caaf5112054a916dd948ab5c6cf 100644
--- a/src/components/IOC/IOCTable/IOCStatus.js
+++ b/src/components/IOC/IOCTable/IOCStatus.js
@@ -10,7 +10,7 @@ function createRequest(id) {
};
}
-export const IOCStatus = ({ id, activeDeployment }) => {
+export const IOCStatus = ({ id }) => {
const client = useContext(apiContext);
const params = useMemo(() => createRequest(id), [id]);
@@ -20,7 +20,7 @@ export const IOCStatus = ({ id, activeDeployment }) => {
loading,
dataReady
} = useAPIMethod({
- fcn: client.apis.Monitoring.fetchIocStatus,
+ fcn: client.apis.IOCs.fetchIocStatus,
params
});
@@ -38,7 +38,7 @@ export const IOCStatus = ({ id, activeDeployment }) => {
width={20}
/>
) : (
- <IOCStatusIcon ioc={{ id, activeDeployment, ...ioc }} />
+ <IOCStatusIcon ioc={ioc} />
)}
</Grid>
);
diff --git a/src/components/IOC/IOCTable/IOCTable.spec.js b/src/components/IOC/IOCTable/IOCTable.spec.js
index 6508c8def6a54d8ec119881afe327f2591758430..227f7b8c438f7ce6f199382687435c75ed17d6f4 100644
--- a/src/components/IOC/IOCTable/IOCTable.spec.js
+++ b/src/components/IOC/IOCTable/IOCTable.spec.js
@@ -7,7 +7,7 @@ const textColumns = ["IOC name", "Description", "Host", "Network"];
const columns = ["Status"].concat(textColumns);
const firstRowData = [
"Alert 1 warnings1 errors !",
- "VacS-RFQ:SC-IOC-130",
+ "CCCE:MOCK1",
"Some description",
"vacs-accv-vm-ioc",
"ChannelAccess-FEB"
@@ -21,7 +21,6 @@ describe("IOCTable", () => {
it("Has the correct columns", () => {
cy.findAllByRole("columnheader").each(($el, index) => {
- console.debug(index, columns[index]);
cy.wrap($el).contains(columns[index], { matchCase: false });
});
});
diff --git a/src/components/common/Loki/LokiPanel.js b/src/components/common/Loki/LokiPanel.js
index 0377b144537559bc1f37e445a5d601865a8111c4..2a2ee4cdf322626dd261394fb7d62d582eaee19f 100644
--- a/src/components/common/Loki/LokiPanel.js
+++ b/src/components/common/Loki/LokiPanel.js
@@ -178,7 +178,7 @@ export function LokiPanel({ hostName, iocName, isSyslog, isDeployed }) {
error: sysLogError,
abort: getSysLogDataAbort
} = useAPIMethod({
- fcn: client.apis.Monitoring.fetchSyslogLines,
+ fcn: client.apis.Hosts.fetchSyslogLines,
call: false,
params
});
@@ -190,7 +190,7 @@ export function LokiPanel({ hostName, iocName, isSyslog, isDeployed }) {
error: procServLogError,
abort: getProcServLogAbort
} = useAPIMethod({
- fcn: client.apis.Monitoring.fetchProcServLogLines,
+ fcn: client.apis.IOCs.fetchProcServLogLines,
call: false,
params
});
diff --git a/src/mocks/fixtures/IOCDescription.json b/src/mocks/fixtures/IOCDescription.json
index 063dd243e585b7ecde853314a3eb2734b09a3c12..88bfc4e5df0803adcc4a8ec6027fc2a0ac1d895b 100644
--- a/src/mocks/fixtures/IOCDescription.json
+++ b/src/mocks/fixtures/IOCDescription.json
@@ -1,14 +1,39 @@
[
{
- "id": 1,
- "description": "This is a test IOC for demonstrating the deployment tool"
+ "id": 14,
+ "description": ""
},
{
- "id": 2,
+ "id": 15,
"description": "Test IOC for CCCE"
},
{
- "id": 346,
+ "id": 18,
"description": "Some description"
+ },
+ {
+ "id": 39,
+ "description": ""
+ },
+ {
+ "id": 21
+ },
+ {
+ "id": 49,
+ "description": "some fun description"
+ },
+ {
+ "id": 40
+ },
+ {
+ "id": 41
+ },
+ {
+ "id": 42,
+ "description": "some description"
+ },
+ {
+ "id": 43,
+ "description": "some description"
}
]
diff --git a/src/mocks/fixtures/IOCDetails.json b/src/mocks/fixtures/IOCDetails.json
index 80ca251bd602674852045d2cbf5a24c87d19cbbb..eddd427e76e2bc3462e3bb4fccdfc13e7cd153c9 100644
--- a/src/mocks/fixtures/IOCDetails.json
+++ b/src/mocks/fixtures/IOCDetails.json
@@ -1,24 +1,77 @@
[
{
- "id": 1,
- "description": "This is a test IOC for demonstrating the deployment tool",
- "createdBy": "johnsparger",
- "namingName": "CCCE:SC-IOC-001",
- "namingUuid": "77325d6f-6d85-443f-b448-3d99a941e23e",
- "gitProjectId": 5215,
- "sourceUrl": "https://gitlab.esss.lu.se/ccce/dev/iocs/e3-ioc-test_49.git",
- "sourceVersion": "0.0.1",
- "sourceVersionShort": "0.0.1",
+ "id": 14,
+ "description": "Some description",
+ "createdBy": "mock user 1",
+ "namingName": "CCCE:MOCK1",
+ "namingUuid": "82a01351-2892-491e-932b-6fe438216cfd",
+ "gitProjectId": 5959,
+ "sourceUrl": "https://gitlab.esss.lu.se/ccce/dev/iocs/instances/e3-ioc-test-01.git",
"activeDeployment": null,
- "alerts": [],
+ "deployedWithOldPlaybook": true,
+ "alerts": [
+ {
+ "type": "INFO",
+ "message": "IOC is not deployed",
+ "link": null
+ }
+ ],
"operationInProgress": false,
"active": null
},
{
- "id": 2,
- "description": "Test instance used by the CCCE team, with mock data",
- "createdBy": "christinajenks",
- "namingName": "CCCE:SC-IOC-002",
+ "id": 15,
+ "description": "Test IOC for CCCE",
+ "namingName": "CCCE:MOCK2",
+ "createdBy": "mock user 2",
+ "namingUuid": "0a7fdee4-cfa6-447f-ab85-ae9335507fd3",
+ "gitProjectId": 5970,
+ "sourceUrl": "https://gitlab.esss.lu.se/ccce/dev/iocs/instances/e3-ioc-test-02.git",
+ "activeDeployment": {
+ "id": 410,
+ "createdBy": "johannaszepanski",
+ "startDate": "2024-06-05T09:37:56.994+0200",
+ "createdAt": "2024-06-05T09:37:24.577+0200",
+ "undeployment": false,
+ "namingName": "CCCE:SC-IOC-020",
+ "gitProjectId": 5970,
+ "sourceVersion": "correct_ioc",
+ "operationId": 560,
+ "endDate": "2024-06-05T09:39:06.763+0200",
+ "iocName": "CCCE:SC-IOC-020",
+ "host": {
+ "hostId": "MTUxX3RydWU=",
+ "externalIdValid": true,
+ "fqdn": "ccce-test-ioc-01.cslab.esss.lu.se",
+ "hostName": "ccce-test-ioc-01",
+ "network": "CSLab-GeneralLab"
+ },
+ "awxJobId": 6588,
+ "sourceUrl": "https://gitlab.esss.lu.se/ccce/dev/iocs/instances/e3-ioc-test-02.git",
+ "sourceVersionShort": "d4df546c",
+ "operationStatus": "FAILED"
+ },
+ "deployedWithOldPlaybook": false,
+ "alerts": [
+ {
+ "type": "ERROR",
+ "message": "Example alert without link",
+ "link": null
+ },
+ {
+ "type": "ERROR",
+ "message": "Example alert with link",
+ "link": "https://google.com"
+ }
+ ],
+ "operationInProgress": false,
+ "active": null
+ },
+ {
+ "id": 18,
+ "description": "Some description",
+ "namingName": "CCCE:MOCK3",
+ "createdBy": "mock user 3",
"namingUuid": "7bb52b4b-80d8-4cd9-b09a-88a9d1216df9",
"gitProjectId": 5971,
"sourceUrl": "https://gitlab.esss.lu.se/ccce/dev/iocs/instances/e3-ioc-test-03.git",
@@ -35,91 +88,194 @@
"active": null
},
{
- "id": 3,
- "description": "This is a test IOC with mock data",
- "createdBy": "gabrielfedel",
- "namingName": "CCCE:SC-IOC-003",
- "namingUuid": "40e4561e-6688-4324-b03a-dc6e4c44b06b",
- "gitProjectId": 9332,
- "sourceUrl": "https://gitlab.esss.lu.se/iocs/manual/e3-ioc-rastermagnets-evr-1.git",
+ "id": 39,
+ "description": "",
+ "namingName": "CCCE:MOCK4",
+ "createdBy": "mock user 4",
+ "namingUuid": "b4589713-b42a-4131-a086-4307ca381d81",
+ "gitProjectId": 5972,
+ "sourceUrl": "https://gitlab.esss.lu.se/ccce/dev/iocs/instances/e3-ioc-test-04.git",
"activeDeployment": {
- "id": 10440,
- "createdBy": "gabrielfedel",
- "startDate": "2024-05-08T09:28:47.068+0200",
- "createdAt": "2024-05-08T09:28:34.497+0200",
+ "id": 408,
+ "createdBy": "johannaszepanski",
+ "startDate": "2024-06-05T09:25:40.892+0200",
+ "createdAt": "2024-06-05T09:25:08.891+0200",
"undeployment": false,
- "namingName": "A2T-010Row:SC-IOC-002",
- "gitProjectId": 9332,
- "sourceVersion": "0.0.1",
- "operationId": 13860,
- "endDate": "2024-05-08T09:31:31.378+0200",
- "iocName": "A2T-010Row:SC-IOC-002",
+ "namingName": "CCCE:SC-IOC-040",
+ "gitProjectId": 5972,
+ "sourceVersion": "alias",
+ "operationId": 558,
+ "endDate": "2024-06-05T09:26:59.372+0200",
+ "iocName": "CCCE:SC-IOC-040",
"host": {
- "hostId": "NDE5NV90cnVl",
+ "hostId": "MTUyX3RydWU=",
"externalIdValid": true,
- "fqdn": "ccpu-evrtm.tn.esss.lu.se",
- "hostName": "ccpu-evrtm",
- "network": "Controls-Linac"
+ "fqdn": "ccce-test-ioc-02.cslab.esss.lu.se",
+ "hostName": "ccce-test-ioc-02",
+ "network": "CSLab-GeneralLab"
},
- "awxJobId": 495642,
- "sourceUrl": "https://gitlab.esss.lu.se/iocs/manual/e3-ioc-rastermagnets-evr-1.git",
- "sourceVersionShort": "fd7e5c70",
- "operationStatus": "SUCCESSFUL"
+ "awxJobId": 6580,
+ "sourceUrl": "https://gitlab.esss.lu.se/ccce/dev/iocs/instances/e3-ioc-test-04.git",
+ "sourceVersionShort": "8fd94089",
+ "operationStatus": "FAILED"
},
- "alerts": [],
"deployedWithOldPlaybook": false,
+ "alerts": [],
"operationInProgress": false,
- "active": true
+ "active": null
},
{
- "id": 4,
- "description": "This is a test IOC with mock data and errors",
- "createdBy": "gabrielfedel",
- "namingName": "CCCE:SC-IOC-004",
- "namingUuid": "40e4561e-6688-4324-b03a-dc6e4c44b06b",
- "gitProjectId": 9332,
- "sourceUrl": "https://gitlab.esss.lu.se/iocs/manual/e3-ioc-rastermagnets-evr-1.git",
+ "id": 21,
+ "namingName": "CCCE:MOCK5",
+ "createdBy": "mock user 5",
+ "namingUuid": "094b4411-447b-43f1-966b-6a37faf46366",
+ "gitProjectId": 8094,
+ "sourceUrl": "https://gitlab.esss.lu.se/ccce/dev/iocs/instances/e3-ioc-test-05.git",
"activeDeployment": {
- "id": 10440,
- "createdBy": "gabrielfedel",
- "startDate": "2024-05-08T09:28:47.068+0200",
- "createdAt": "2024-05-08T09:28:34.497+0200",
+ "id": 397,
+ "createdBy": "simonrose",
+ "startDate": "2024-04-11T09:30:18.786+0200",
+ "createdAt": "2024-04-11T09:29:48.620+0200",
"undeployment": false,
- "namingName": "A2T-010Row:SC-IOC-002",
- "gitProjectId": 9332,
- "sourceVersion": "0.0.1",
- "operationId": 13860,
- "endDate": "2024-05-08T09:31:31.378+0200",
- "iocName": "A2T-010Row:SC-IOC-002",
+ "namingName": "CCCE:SC-IOC-050",
+ "gitProjectId": 8094,
+ "sourceVersion": "1.0.0",
+ "operationId": 546,
+ "endDate": "2024-04-11T09:31:53.395+0200",
+ "iocName": "CCCE:SC-IOC-050",
"host": {
- "hostId": "NDE5NV90cnVl",
+ "hostId": "MTUyX3RydWU=",
"externalIdValid": true,
- "fqdn": "ccpu-evrtm.tn.esss.lu.se",
- "hostName": "ccpu-evrtm",
- "network": "Controls-Linac"
+ "fqdn": "ccce-test-ioc-02.cslab.esss.lu.se",
+ "hostName": "ccce-test-ioc-02",
+ "network": "CSLab-GeneralLab"
},
- "awxJobId": 495642,
- "sourceUrl": "https://gitlab.esss.lu.se/iocs/manual/e3-ioc-rastermagnets-evr-1.git",
- "sourceVersionShort": "fd7e5c70",
+ "awxJobId": 6479,
+ "sourceUrl": "https://gitlab.esss.lu.se/ccce/dev/iocs/instances/e3-ioc-test-05.git",
+ "sourceVersionShort": "da21c190",
"operationStatus": "SUCCESSFUL"
},
+ "deployedWithOldPlaybook": false,
+ "alerts": [],
+ "operationInProgress": false,
+ "active": null
+ },
+ {
+ "id": 49,
+ "description": "some fun description",
+ "namingName": "CCCE:MOCK6",
+ "createdBy": "mock user 6",
+ "namingUuid": "36a9cb87-66dc-4ba6-aff8-290389b083d1",
+ "gitProjectId": 12972,
+ "sourceUrl": "https://gitlab.esss.lu.se/ccce/dev/iocs/instances/e3-ioc-jsztest-3.git",
+ "activeDeployment": null,
+ "deployedWithOldPlaybook": true,
+ "alerts": [
+ {
+ "type": "INFO",
+ "message": "IOC is not deployed",
+ "link": null
+ }
+ ],
+ "operationInProgress": false,
+ "active": null
+ },
+ {
+ "id": 40,
+ "namingName": "CCCE:MOCK-TEST",
+ "createdBy": "mock user",
+ "namingUuid": "0eb277a2-0984-4f94-a8de-9c31f0c4948b",
+ "gitProjectId": null,
+ "sourceUrl": null,
+ "activeDeployment": null,
+ "deployedWithOldPlaybook": true,
"alerts": [
{
"type": "ERROR",
- "message": "Example alert without link"
+ "message": "Cannot find the repository in Gitlab",
+ "link": null
},
+ {
+ "type": "INFO",
+ "message": "IOC is not deployed",
+ "link": null
+ }
+ ],
+ "operationInProgress": false,
+ "active": null
+ },
+ {
+ "id": 41,
+ "namingName": "CCCE:MOCK7",
+ "createdBy": "mock user 7",
+ "namingUuid": "aa819884-2422-4227-91fb-60245db3d453",
+ "gitProjectId": null,
+ "sourceUrl": null,
+ "activeDeployment": null,
+ "deployedWithOldPlaybook": true,
+ "alerts": [
{
"type": "ERROR",
- "message": "Example alert with link",
- "link": "https://google.com"
+ "message": "Cannot find the repository in Gitlab",
+ "link": null
+ },
+ {
+ "type": "INFO",
+ "message": "IOC is not deployed",
+ "link": null
}
],
- "deployedWithOldPlaybook": false,
"operationInProgress": false,
- "active": true
+ "active": null
},
{
- "id": 346,
- "description": "Some description"
+ "id": 42,
+ "description": "some description",
+ "namingName": "CCCE:MOCK8",
+ "createdBy": "mock user 8",
+ "namingUuid": "9f7f3ca9-f088-4c93-9663-6051dc06df68",
+ "gitProjectId": null,
+ "sourceUrl": null,
+ "activeDeployment": null,
+ "deployedWithOldPlaybook": true,
+ "alerts": [
+ {
+ "type": "ERROR",
+ "message": "Cannot find the repository in Gitlab",
+ "link": null
+ },
+ {
+ "type": "INFO",
+ "message": "IOC is not deployed",
+ "link": null
+ }
+ ],
+ "operationInProgress": false,
+ "active": null
+ },
+ {
+ "id": 43,
+ "description": "some description",
+ "namingName": "CCCE:MOCK9",
+ "createdBy": "mock user 9",
+ "namingUuid": "da6be15b-1366-41be-af74-a8c84175cbc1",
+ "gitProjectId": null,
+ "sourceUrl": null,
+ "activeDeployment": null,
+ "deployedWithOldPlaybook": true,
+ "alerts": [
+ {
+ "type": "ERROR",
+ "message": "Cannot find the repository in Gitlab",
+ "link": null
+ },
+ {
+ "type": "INFO",
+ "message": "IOC is not deployed",
+ "link": null
+ }
+ ],
+ "operationInProgress": false,
+ "active": null
}
]
diff --git a/src/mocks/fixtures/IOCStatus.json b/src/mocks/fixtures/IOCStatus.json
index 58cc621038f7bd926e99a0c343836a41398ccef6..b2fdc5066670cb58a33b259b327b90b3ceeb893f 100644
--- a/src/mocks/fixtures/IOCStatus.json
+++ b/src/mocks/fixtures/IOCStatus.json
@@ -1,122 +1,107 @@
[
{
- "id": 346,
- "active": true,
+ "iocId": 14,
+ "alertSeverity": "ERROR",
"alerts": [
{
- "type": "WARNING",
- "message": "A temporary gravity anomaly has been detected in the cafeteria. Please secure your trays and beverages. We suspect a rogue black hole passing by, or maybe someone just dropped a super-dense bagel again. Proceed with caution, and remember, what goes up might not come down for a while. Thank you for floating with us today."
+ "type": "ERROR",
+ "message": "IOC's latest deployment failed, IOC may be in inconsistent state",
+ "link": null
},
{
- "type": "ERROR",
- "message": "The area is currently experiencing an unexpected entropy reversal. As a precaution, ice cream in the freezer may spontaneously melt, then refreeze. We recommend eating it now, just to be safe. Also, be on the lookout for random acts of orderliness. Your messy desk might just organize itself, but don't get your hopes up."
+ "type": "WARNING",
+ "message": "This is a warning message",
+ "link": null
}
],
- "alertSeverity": "ERROR"
+ "active": true
},
{
- "id": 345,
+ "iocId": 15,
+ "alertSeverity": "WARNING",
"alerts": [
{
"type": "WARNING",
- "message": "Example alert without link"
+ "message": "This is warning 1",
+ "link": null
},
{
- "type": "ERROR",
- "message": "Example alert with link",
- "link": "https://google.com"
+ "type": "WARNING",
+ "message": "This is warning 2",
+ "link": null
}
],
- "alertSeverity": "ERROR",
- "active": true
+ "active": null
},
{
- "id": 344,
+ "iocId": 18,
+ "alertSeverity": "INFO",
"alerts": [
{
- "type": "WARNING",
- "message": "Example alert warning for VacS-RFQ:SC-IOC-110"
+ "type": "INFO",
+ "message": "IOC is not deployed",
+ "link": null
}
],
- "alertSeverity": "WARNING",
- "active": true
- },
- {
- "id": 328
+ "active": null
},
{
- "id": 251
+ "iocId": 39,
+ "alertSeverity": null,
+ "alerts": [],
+ "active": null
},
{
- "id": 249,
- "active": true
+ "iocId": 21,
+ "alertSeverity": null,
+ "alerts": [],
+ "active": null
},
{
- "id": 166,
+ "iocId": 49,
+ "alertSeverity": "INFO",
"alerts": [
{
- "type": "ERROR",
- "message": "Example alert error for RFQ-010:SC-IOC-001"
+ "type": "INFO",
+ "message": "IOC is not deployed",
+ "link": null
}
],
- "alertSeverity": "ERROR"
+ "active": null
},
{
- "id": 148,
- "alerts": [
- {
- "type": "WARNING",
- "message": "Example alert warning for RFQ-010:SC-IOC-977"
- }
- ],
- "alertSeverity": "WARNING",
+ "iocId": 40,
+ "alertSeverity": null,
+ "alerts": [],
"active": true
},
{
- "id": 116,
+ "iocId": 41,
+ "alertSeverity": null,
+ "alerts": [],
"active": true
},
{
- "id": 76,
+ "iocId": 42,
+ "alertSeverity": null,
+ "alerts": [],
"active": true
},
{
- "id": 13,
+ "iocId": 43,
+ "alertSeverity": "ERROR",
"alerts": [
{
- "type": "WARNING",
- "message": "Example alert warning for RFQ-010:SC-IOC-056"
- }
- ],
- "alertSeverity": "WARNING",
- "active": true
- },
- {
- "id": 10
- },
- {
- "id": 9,
- "active": true
- },
- {
- "id": 8
- },
- {
- "id": 6
- },
- {
- "id": 4,
- "active": true
- },
- {
- "id": 3,
- "alerts": [
+ "type": "ERROR",
+ "message": "Cannot find the repository in Gitlab",
+ "link": null
+ },
{
- "type": "WARNING",
- "message": "Example alert warning RFQ-010:SC-IOC-006"
+ "type": "INFO",
+ "message": "IOC is not deployed",
+ "link": null
}
],
- "alertSeverity": "WARNING",
- "active": true
+ "active": null
}
]
diff --git a/src/mocks/fixtures/PagedIOCResponse.json b/src/mocks/fixtures/PagedIOCResponse.json
index 0a419578b824e4469be6b8b38506d9ad59fe9c84..5c4f6d0a818fee09752acb6f97927c28e9185f91 100644
--- a/src/mocks/fixtures/PagedIOCResponse.json
+++ b/src/mocks/fixtures/PagedIOCResponse.json
@@ -1,254 +1,124 @@
{
- "totalCount": 17,
- "listSize": 17,
+ "totalCount": 10,
+ "listSize": 10,
"pageNumber": 0,
- "limit": 150,
+ "limit": 20,
"iocList": [
{
- "id": 346,
- "namingName": "VacS-RFQ:SC-IOC-130",
- "createdBy": "krisztianloki",
- "gitProjectId": 5336,
+ "id": 14,
+ "namingName": "CCCE:MOCK1",
+ "createdBy": "mock user 1",
+ "gitProjectId": 5959,
+ "deployedWithOldPlaybook": true,
"activeDeployment": {
"host": {
- "hostId": 3354,
- "fqdn": "vacs-accv-vm-ioc.tn.esss.lu.se",
+ "hostId": "MTUxX3RydWU=",
"hostName": "vacs-accv-vm-ioc",
- "network": "ChannelAccess-FEB"
+ "network": "ChannelAccess-FEB",
+ "netBoxHostFromCache": true
},
- "sourceVersion": "1.0.0",
- "sourceVersionShort": "1.0.0"
+ "sourceVersion": "correct_ioc",
+ "sourceVersionShort": null
}
},
{
- "id": 345,
- "namingName": "VacS-RFQ:SC-IOC-119",
- "createdBy": "krisztianloki",
- "gitProjectId": 5335,
+ "id": 15,
+ "namingName": "CCCE:MOCK2",
+ "createdBy": "mock user 2",
+ "gitProjectId": 5970,
+ "deployedWithOldPlaybook": false,
"activeDeployment": {
"host": {
- "hostId": 3354,
- "fqdn": "vacs-accv-vm-ioc.tn.esss.lu.se",
- "hostName": "vacs-accv-vm-ioc",
- "network": "ChannelAccess-FEB"
+ "hostId": "MTUxX3RydWU=",
+ "hostName": "ccce-test-ioc-01",
+ "network": "CSLab-GeneralLab",
+ "netBoxHostFromCache": true
},
- "sourceVersion": "cc95ff21a09977fd2396ec1999259ec0a5e63147",
- "sourceVersionShort": "cc95ff21"
+ "sourceVersion": "correct_ioc",
+ "sourceVersionShort": null
}
},
{
- "id": 344,
- "description": "some description",
- "namingName": "VacS-RFQ:SC-IOC-110",
- "createdBy": "krisztianloki",
- "gitProjectId": 5334,
- "activeDeployment": {
- "host": {
- "hostId": 3354,
- "fqdn": "vacs-accv-vm-ioc.tn.esss.lu.se",
- "hostName": "vacs-accv-vm-ioc",
- "network": "ChannelAccess-FEB"
- },
- "sourceVersion": "9a3585a5bea4372f7d964b7e18b83aa3b1afc61f",
- "sourceVersionShort": "9a3585a5"
- }
+ "id": 18,
+ "namingName": "CCCE:MOCK3",
+ "createdBy": "mock user 3",
+ "gitProjectId": 5971,
+ "deployedWithOldPlaybook": false,
+ "activeDeployment": null
},
{
- "id": 328,
- "namingName": "RFQ-010:SC-IOC-117",
- "createdBy": "gabrielfedel",
- "gitProjectId": 5953,
- "sourceVersion": null,
- "activeDeployment": {}
- },
- {
- "id": 251,
- "description": "some description",
- "namingName": "RFQ-010:SC-IOC-015",
- "createdBy": "lucianocarneiro",
- "gitProjectId": 5952,
- "sourceVersion": null,
- "activeDeployment": {}
- },
- {
- "id": 249,
- "description": "some description",
- "namingName": "RFQ-010:SC-IOC-016",
- "createdBy": "gabrielfedel",
- "gitProjectId": 5954,
+ "id": 39,
+ "namingName": "CCCE:MOCK4",
+ "createdBy": "mock user 4",
+ "gitProjectId": 5972,
+ "deployedWithOldPlaybook": false,
"activeDeployment": {
"host": {
- "hostId": 4205,
- "fqdn": "rfq-rf-vm-ioc.tn.esss.lu.se",
- "hostName": "rfq-rf-vm-ioc",
- "network": "ChannelAccess-ACC"
+ "hostId": "MTUyX3RydWU=",
+ "hostName": "ccce-test-ioc-02",
+ "network": "CSLab-GeneralLab",
+ "netBoxHostFromCache": true
},
- "sourceVersion": "1.0.1",
- "sourceVersionShort": "1.0.1"
+ "sourceVersion": "alias",
+ "sourceVersionShort": null
}
},
{
- "id": 166,
- "namingName": "RFQ-010:SC-IOC-001",
- "createdBy": "gabrielfedel",
- "gitProjectId": 4314,
+ "id": 21,
+ "namingName": "CCCE:MOCK5",
+ "createdBy": "mock user 5",
+ "gitProjectId": 8094,
+ "deployedWithOldPlaybook": false,
"activeDeployment": {
"host": {
- "hostId": 2245,
- "fqdn": "rfq-llrf1-mtca-ioc.tn.esss.lu.se",
- "hostName": "rfq-llrf1-mtca-ioc",
- "network": "ChannelAccess-ACC"
- },
- "sourceVersion": "3.0.3",
- "sourceVersionShort": "3.0.3"
- }
- },
- {
- "id": 148,
- "description": "some description",
- "namingName": "RFQ-010:SC-IOC-977",
- "createdBy": "krisztianloki",
- "gitProjectId": 5429,
- "activeDeployment": {
- "host": {
- "hostId": 4178,
- "fqdn": "rfq-ipc-01.tn.esss.lu.se",
- "hostName": "rfq-ipc-01",
- "network": "ChannelAccess-FEB"
- },
- "sourceVersion": "0.0.2-usb",
- "sourceVersionShort": "0.0.2-usb"
- }
- },
- {
- "id": 116,
- "description": "some description",
- "namingName": "RFQ-010:SC-IOC-005",
- "createdBy": "joaopaulomartins",
- "gitProjectId": 1697,
- "activeDeployment": {
- "host": {
- "hostId": 4696,
- "fqdn": "rfq-rflps-vm-ioc01.tn.esss.lu.se",
- "hostName": "rfq-rflps-vm-ioc01",
- "network": "ChannelAccess-ACC"
+ "hostId": "MTUyX3RydWU=",
+ "hostName": "ccce-test-ioc-02",
+ "network": "CSLab-GeneralLab",
+ "netBoxHostFromCache": true
},
"sourceVersion": "1.0.0",
- "sourceVersionShort": "1.0.0"
- }
- },
- {
- "id": 76,
- "description": "some description",
- "namingName": "RFQ-010:SC-IOC-004",
- "createdBy": "joaopaulomartins",
- "gitProjectId": 5257,
- "activeDeployment": {
- "host": {
- "hostId": 4205,
- "fqdn": "rfq-rf-vm-ioc.tn.esss.lu.se",
- "hostName": "rfq-rf-vm-ioc",
- "network": "ChannelAccess-ACC"
- },
- "sourceVersion": "1.1.0",
- "sourceVersionShort": "1.1.0"
+ "sourceVersionShort": null
}
},
{
- "id": 13,
- "description": "some description",
- "namingName": "RFQ-010:SC-IOC-056",
- "createdBy": "krisztianloki",
- "gitProjectId": 5056,
- "activeDeployment": {
- "host": {
- "hostId": 4408,
- "fqdn": "rfq-lob-vm-ioc.tn.esss.lu.se",
- "hostName": "rfq-lob-vm-ioc",
- "network": "ChannelAccess-FEB"
- },
- "sourceVersion": "2b8a031d7b698a6944e28408cb17241a7df9ec99",
- "sourceVersionShort": "2b8a031d"
- }
+ "id": 49,
+ "namingName": "CCCE:MOCK6",
+ "createdBy": "mock user 6",
+ "gitProjectId": 12972,
+ "deployedWithOldPlaybook": true,
+ "activeDeployment": null
},
{
- "id": 10,
- "description": "some description",
- "namingName": "RFQ-010:SC-IOC-011",
- "createdBy": "anderslindh",
- "gitProjectId": 4929,
- "sourceVersion": "961ebd48020add0282688437ae34dd0974b6fa15",
- "activeDeployment": {},
- "sourceVersionShort": "961ebd48"
+ "id": 40,
+ "namingName": "CCCE:MOCK-TEST",
+ "createdBy": "mock user",
+ "gitProjectId": 12733,
+ "deployedWithOldPlaybook": true,
+ "activeDeployment": null
},
{
- "id": 9,
- "description": "some description",
- "namingName": "RFQ-010:SC-IOC-010",
- "createdBy": "anderslindh",
- "gitProjectId": 4875,
- "activeDeployment": {
- "host": {
- "hostId": 4521,
- "fqdn": "lab-rf-vm-ioc-02.cslab.esss.lu.se",
- "hostName": "lab-rf-vm-ioc-02",
- "network": "CSLab-GeneralLab"
- },
- "sourceVersion": "0527d4cfa1c64276634961fefa8f480d00faee26",
- "sourceVersionShort": "0527d4cf"
- }
+ "id": 41,
+ "namingName": "CCCE:MOCK7",
+ "createdBy": "mock user 7",
+ "gitProjectId": 12734,
+ "deployedWithOldPlaybook": true,
+ "activeDeployment": null
},
{
- "id": 8,
- "description": "some description",
- "namingName": "RFQ-010:SC-IOC-009",
- "createdBy": "anderslindh",
- "gitProjectId": 4947,
- "sourceVersion": null,
- "activeDeployment": {}
+ "id": 42,
+ "namingName": "CCCE:MOCK8",
+ "createdBy": "mock user 8",
+ "gitProjectId": 12735,
+ "deployedWithOldPlaybook": true,
+ "activeDeployment": null
},
{
- "id": 6,
- "description": "some description",
- "namingName": "RFQ-010:SC-IOC-008",
- "createdBy": "anderslindh",
- "gitProjectId": 2582,
- "sourceVersion": null,
- "activeDeployment": {}
- },
- {
- "id": 4,
- "description": "some description",
- "namingName": "RFQ-010:SC-IOC-007",
- "createdBy": "anderslindh",
- "gitProjectId": 4877,
- "activeDeployment": {
- "host": {
- "hostId": 4521,
- "fqdn": "lab-rf-vm-ioc-02.cslab.esss.lu.se",
- "hostName": "lab-rf-vm-ioc-02",
- "network": "CSLab-GeneralLab"
- },
- "sourceVersion": "cb065da1b6e5dcde6da091a93799ac8488e1e818",
- "sourceVersionShort": "cb065da1"
- }
- },
- {
- "id": 3,
- "description": "some description",
- "namingName": "RFQ-010:SC-IOC-006",
- "createdBy": "anderslindh",
- "gitProjectId": 4335,
- "activeDeployment": {
- "host": {
- "hostId": 4205,
- "fqdn": "rfq-rf-vm-ioc.tn.esss.lu.se",
- "hostName": "rfq-rf-vm-ioc",
- "network": "ChannelAccess-ACC"
- },
- "sourceVersion": "1.0.0",
- "sourceVersionShort": "1.0.0"
- }
+ "id": 43,
+ "namingName": "CCCE:MOCK9",
+ "createdBy": "mock user 9",
+ "gitProjectId": 12736,
+ "deployedWithOldPlaybook": true,
+ "activeDeployment": null
}
]
}
diff --git a/src/mocks/fixtures/ccce-api.json b/src/mocks/fixtures/ccce-api.json
index 80b60d5b5e2af9a100813dc8d365b14d8b84bd5f..2580b721c51c35382caca4bfd6ab42fd2698b296 100644
--- a/src/mocks/fixtures/ccce-api.json
+++ b/src/mocks/fixtures/ccce-api.json
@@ -41,9 +41,6 @@
},
{
"name": "Git"
- },
- {
- "name": "Monitoring"
}
],
"paths": {
@@ -479,7 +476,7 @@
}
},
"400": {
- "description": "Incomplete request",
+ "description": "Incomplete, or bad request",
"content": {
"application/json": {
"schema": {
@@ -1509,6 +1506,81 @@
}
}
},
+ "/api/v1/{host_name}/log": {
+ "get": {
+ "tags": ["Hosts"],
+ "summary": "Fetches syslog lines for a specific host",
+ "operationId": "fetchSyslogLines",
+ "parameters": [
+ {
+ "name": "host_name",
+ "in": "path",
+ "description": "Host name (without network part)",
+ "required": true,
+ "schema": {
+ "type": "string"
+ }
+ },
+ {
+ "name": "time_range",
+ "in": "query",
+ "description": "Time range (in minutes)",
+ "required": false,
+ "schema": {
+ "type": "integer",
+ "format": "int32"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "Log lines",
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/LokiResponse"
+ }
+ }
+ }
+ },
+ "401": {
+ "description": "Unauthorized",
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/GeneralException"
+ }
+ }
+ }
+ },
+ "500": {
+ "description": "Service exception",
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/GeneralException"
+ }
+ }
+ }
+ },
+ "503": {
+ "description": "Logging server unavailable",
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/GeneralException"
+ }
+ }
+ }
+ }
+ },
+ "security": [
+ {
+ "bearerAuth": []
+ }
+ ]
+ }
+ },
"/api/v1/statistics/general/{statistics_type}": {
"get": {
"tags": ["Statistics"],
@@ -1958,29 +2030,20 @@
}
}
},
- "/api/v1/monitoring/syslog/host/{host_name}": {
+ "/api/v1/iocs/{ioc_id}/status": {
"get": {
- "tags": ["Monitoring"],
- "summary": "Fetches syslog lines for a specific host",
- "operationId": "fetchSyslogLines",
+ "tags": ["IOCs"],
+ "summary": "Fetches the Prometheus status of the IOC",
+ "operationId": "fetchIocStatus",
"parameters": [
{
- "name": "host_name",
+ "name": "ioc_id",
"in": "path",
- "description": "Host name (without network part)",
+ "description": "Unique ID of the IOC",
"required": true,
- "schema": {
- "type": "string"
- }
- },
- {
- "name": "time_range",
- "in": "query",
- "description": "Time range (in minutes)",
- "required": false,
"schema": {
"type": "integer",
- "format": "int32"
+ "format": "int64"
}
}
],
@@ -1990,7 +2053,7 @@
"content": {
"application/json": {
"schema": {
- "$ref": "#/components/schemas/LokiResponse"
+ "$ref": "#/components/schemas/IocStatusResponse"
}
}
}
@@ -2005,8 +2068,8 @@
}
}
},
- "500": {
- "description": "Service exception",
+ "404": {
+ "description": "Ioc not found",
"content": {
"application/json": {
"schema": {
@@ -2015,8 +2078,8 @@
}
}
},
- "503": {
- "description": "Logging server unavailable",
+ "500": {
+ "description": "Service exception",
"content": {
"application/json": {
"schema": {
@@ -2025,24 +2088,19 @@
}
}
}
- },
- "security": [
- {
- "bearerAuth": []
- }
- ]
+ }
}
},
- "/api/v1/monitoring/status/{ioc_id}": {
+ "/api/v1/iocs/{ioc_id}/description": {
"get": {
- "tags": ["Monitoring"],
- "summary": "Fetches the Prometheus status of the IOC",
- "operationId": "fetchIocStatus",
+ "tags": ["IOCs"],
+ "summary": "Find IOC description by ID",
+ "operationId": "getIocDescription",
"parameters": [
{
"name": "ioc_id",
"in": "path",
- "description": "Unique ID of the IOC",
+ "description": "Unique ID of IOC",
"required": true,
"schema": {
"type": "integer",
@@ -2052,21 +2110,11 @@
],
"responses": {
"200": {
- "description": "Log lines",
- "content": {
- "application/json": {
- "schema": {
- "$ref": "#/components/schemas/IocStatusResponse"
- }
- }
- }
- },
- "401": {
- "description": "Unauthorized",
+ "description": "Found IOC description",
"content": {
"application/json": {
"schema": {
- "$ref": "#/components/schemas/GeneralException"
+ "$ref": "#/components/schemas/IocDescriptionResponse"
}
}
}
@@ -2094,9 +2142,9 @@
}
}
},
- "/api/v1/monitoring/procserv/host/{host_name}/{ioc_name}": {
+ "/api/v1/iocs/{host_name}/{ioc_name}/log": {
"get": {
- "tags": ["Monitoring"],
+ "tags": ["IOCs"],
"summary": "Fetches procServ Log lines for a specific host",
"operationId": "fetchProcServLogLines",
"parameters": [
@@ -2178,57 +2226,6 @@
]
}
},
- "/api/v1/iocs/{ioc_id}/description": {
- "get": {
- "tags": ["IOCs"],
- "summary": "Find IOC description by ID",
- "operationId": "getIocDescription",
- "parameters": [
- {
- "name": "ioc_id",
- "in": "path",
- "description": "Unique ID of IOC",
- "required": true,
- "schema": {
- "type": "integer",
- "format": "int64"
- }
- }
- ],
- "responses": {
- "200": {
- "description": "Found IOC description",
- "content": {
- "application/json": {
- "schema": {
- "$ref": "#/components/schemas/IocDescriptionResponse"
- }
- }
- }
- },
- "404": {
- "description": "Ioc not found",
- "content": {
- "application/json": {
- "schema": {
- "$ref": "#/components/schemas/GeneralException"
- }
- }
- }
- },
- "500": {
- "description": "Service exception",
- "content": {
- "application/json": {
- "schema": {
- "$ref": "#/components/schemas/GeneralException"
- }
- }
- }
- }
- }
- }
- },
"/api/v1/iocs/check_git_repo_id/{repo_id}": {
"get": {
"tags": ["IOCs"],
@@ -3926,6 +3923,9 @@
"gitProjectId": {
"type": "integer",
"format": "int64"
+ },
+ "repository_name": {
+ "type": "string"
}
},
"description": "IOC to create"
@@ -4077,6 +4077,32 @@
}
}
},
+ "LokiMessage": {
+ "type": "object",
+ "properties": {
+ "logDate": {
+ "type": "string",
+ "format": "date-time"
+ },
+ "logMessage": {
+ "type": "string"
+ }
+ }
+ },
+ "LokiResponse": {
+ "type": "object",
+ "properties": {
+ "lines": {
+ "type": "array",
+ "items": {
+ "$ref": "#/components/schemas/LokiMessage"
+ }
+ },
+ "warning": {
+ "type": "string"
+ }
+ }
+ },
"StatisticResponse": {
"type": "object",
"properties": {
@@ -4281,54 +4307,6 @@
}
}
},
- "LokiMessage": {
- "type": "object",
- "properties": {
- "logDate": {
- "type": "string",
- "format": "date-time"
- },
- "logMessage": {
- "type": "string"
- }
- }
- },
- "LokiResponse": {
- "type": "object",
- "properties": {
- "lines": {
- "type": "array",
- "items": {
- "$ref": "#/components/schemas/LokiMessage"
- }
- },
- "warning": {
- "type": "string"
- }
- }
- },
- "IocStatusResponse": {
- "type": "object",
- "properties": {
- "iocId": {
- "type": "integer",
- "format": "int64"
- },
- "alertSeverity": {
- "type": "string",
- "enum": ["ERROR", "WARNING", "INFO"]
- },
- "alerts": {
- "type": "array",
- "items": {
- "$ref": "#/components/schemas/Alert"
- }
- },
- "active": {
- "type": "boolean"
- }
- }
- },
"ActiveDeployment": {
"type": "object",
"properties": {
@@ -4441,6 +4419,28 @@
}
}
},
+ "IocStatusResponse": {
+ "type": "object",
+ "properties": {
+ "iocId": {
+ "type": "integer",
+ "format": "int64"
+ },
+ "alertSeverity": {
+ "type": "string",
+ "enum": ["ERROR", "WARNING", "INFO"]
+ },
+ "alerts": {
+ "type": "array",
+ "items": {
+ "$ref": "#/components/schemas/Alert"
+ }
+ },
+ "active": {
+ "type": "boolean"
+ }
+ }
+ },
"IocDescriptionResponse": {
"type": "object",
"properties": {
diff --git a/src/mocks/mockAPI.js b/src/mocks/mockAPI.js
index a43c3edcd84c8b72386b9cd2ddbadfc11be19c64..b2224285e906939131cd94e6e7f52378d60dfa58 100644
--- a/src/mocks/mockAPI.js
+++ b/src/mocks/mockAPI.js
@@ -214,24 +214,16 @@ function fetchHostStatus(req) {
return { body, status };
}
-function getProcservLogs(req) {
+function fetchProcServLogLines(req) {
const body = require("./fixtures/LokiResponse.json");
return { body };
}
function fetchIocStatus(req) {
- const params = getParameters(req, "/monitoring/status/:id");
+ const params = getParameters(req, "/iocs/:ioc_id/status");
const data = require("./fixtures/IOCStatus.json");
- const { id, alertSeverity, alerts, active } = data.find(
- (x) => `${x.id}` === params.id
- );
+ const body = data.find((x) => `${x.iocId}` === params.ioc_id);
- const body = {
- iocId: id,
- alertSeverity,
- alerts,
- active
- };
console.debug("fetchIocStatus", data, params, body);
const status = body ? 200 : 404;
@@ -297,7 +289,9 @@ const mockAPI = {
getIOC,
createIoc,
deleteIOC,
- getIocDescription
+ getIocDescription,
+ fetchIocStatus,
+ fetchProcServLogLines
},
deployments: {
getDeployment,
@@ -317,10 +311,6 @@ const mockAPI = {
listProjects,
listTagsAndCommitIds
},
- monitoring: {
- getProcservLogs,
- fetchIocStatus
- },
statistics: {
currentlyActiveIocs,
activeIocHistory,
@@ -382,6 +372,18 @@ export const apiHandlers = [
mockAPI.iocs.getIocDescription
),
+ makeHandler(
+ "GET",
+ qRegExp(".*/iocs/[0-9]+/status"),
+ mockAPI.iocs.fetchIocStatus
+ ),
+ makeHandler(
+ "GET",
+ qRegExp(".*/iocs/.*/.*/log"),
+ mockAPI.iocs.fetchProcServLogLines,
+ auth
+ ),
+
// records
makeHandler("GET", qRegExp(".*/records"), mockAPI.records.findAllRecords),
@@ -452,19 +454,6 @@ export const apiHandlers = [
mockAPI.hosts.findHostWithStatusById
),
- // monitoring
- makeHandler(
- "GET",
- qRegExp(".*/monitoring/procserv/host/.+"),
- mockAPI.monitoring.getProcservLogs,
- auth
- ),
- makeHandler(
- "GET",
- qRegExp(".*/monitoring/status/.+"),
- mockAPI.monitoring.fetchIocStatus
- ),
-
// statistics
makeHandler(
"GET",
diff --git a/src/stories/components/common/IOC/IOCTable.stories.js b/src/stories/components/common/IOC/IOCTable.stories.js
index c5a676fedc3c811671bf931971a6998a13672509..98facf89c6b36e58be15b0a2ee156d1341991224 100644
--- a/src/stories/components/common/IOC/IOCTable.stories.js
+++ b/src/stories/components/common/IOC/IOCTable.stories.js
@@ -63,9 +63,9 @@ BeforeAsync.parameters = {
msw: {
handlers: [
rest.get("*/iocs/*", (req, res, ctx) => res(ctx.delay("infinite"))),
- rest.get("*/monitoring/status/*", (req, res, ctx) =>
- res(ctx.delay("infinite"))
- )
+ rest.get("*/iocs/:ioc_id/status", (req, res, ctx) => {
+ res(ctx.delay("infinite"));
+ })
]
}
};
diff --git a/src/stories/views/IOC/IocDetailsView.stories.js b/src/stories/views/IOC/IocDetailsView.stories.js
index 60f4ac589e633e491c8f6b518f80c9a92683ba54..de85654b18b1482a602cdae646f24c7d72cadaf1 100644
--- a/src/stories/views/IOC/IocDetailsView.stories.js
+++ b/src/stories/views/IOC/IocDetailsView.stories.js
@@ -16,26 +16,25 @@ const Template = (args) => (
</AppHarness>
);
-export const Default = (args) => <Template {...args} />;
-Default.args = {
+const config = {
id: 1,
...userImpersonatorArgs
};
export const NotDeployed = (args) => <Template {...args} />;
NotDeployed.args = {
- ...Default.args,
- id: 2
+ ...config,
+ id: 18
};
export const Deployed = (args) => <Template {...args} />;
Deployed.args = {
- ...Default.args,
- id: 3
+ ...config,
+ id: 39
};
export const DeployedErrors = (args) => <Template {...args} />;
DeployedErrors.args = {
- ...Default.args,
- id: 4
+ ...config,
+ id: 15
};