Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fr 162 perf monitor core device health in topology discovery view #1543

Merged
merged 17 commits into from
May 22, 2024
Merged

Fr 162 perf monitor core device health in topology discovery view #1543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
f3cc7ca
ptp interface status added (#1533)
soson Apr 30, 2024
fb7eccd
Add kafka notification (#1537)
MarcoMruz Apr 30, 2024
01ecf20
add graphql ws support and add device health subscription into LLDP t…
MarcoMruz May 2, 2024
af244b5
remove logs
MarcoMruz May 2, 2024
d4f1792
pause subscription when no node is selected
MarcoMruz May 2, 2024
f6692b5
remove refresh every second
MarcoMruz May 2, 2024
7ebc82c
fix-topology displaying redundant ports (#1538)
plehocky May 6, 2024
e54f759
FR-231 stream list (#1539)
soson May 9, 2024
4cca98b
Fd 674 wm (#1540)
MarcoMruz May 10, 2024
86f863d
Release 6.0.2 (#1542)
soson May 10, 2024
13868ad
resolve merge conflicts
MarcoMruz May 13, 2024
dad4ebb
resolve merge conflicts
MarcoMruz May 13, 2024
4bb9cd2
change graphql-ws version to make it same as in the rest of the app
MarcoMruz May 13, 2024
cd51dc5
remove ^ from graphql-ws version
MarcoMruz May 13, 2024
d155eda
change graphql ws version inside device topology
MarcoMruz May 13, 2024
37521ae
Merge branch 'main' into FR-162-PerfMonitor-core-Device-health-in-Top…
MarcoMruz May 17, 2024
47102e4
Merge branch 'story-performance-monitoring' into FR-162-PerfMonitor-c…
MarcoMruz May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions cypress/cypress/e2e/3-resource-manager/pools-filtering.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,9 +466,6 @@ describe('Check pools', () => {
.find('option')
.then((options) => {
const actual = Array.from(options).map((o) => o.text);
// console.log(options);
// console.log(actual);
// console.log(['Select resource type', 'ipv6_prefix', 'ipv4', 'ipv4_prefix', 'ipv6']);
expect(actual).to.deep.eq(['Select resource type', 'ipv6_prefix', 'ipv4', 'ipv4_prefix', 'ipv6']);
});
});
Expand Down
30 changes: 16 additions & 14 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/frinx-dashboard/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@frinx/dashboard",
"version": "6.0.1",
"version": "6.0.2",
"private": false,
"dependencies": {
"@chakra-ui/react": "2.8.1",
Expand All @@ -16,7 +16,7 @@
"@frinx/shared": "^2.0.0",
"@frinx/workflow-builder": "^2.0.0",
"@frinx/workflow-ui": "^2.0.0",
"@frinxio/gamma": "6.0.0",
"@frinxio/gamma": "6.0.1",
"@types/react": "17.0.65",
"@types/react-dom": "18.2.7",
"eventemitter3": "5.0.1",
Expand Down
5 changes: 3 additions & 2 deletions packages/frinx-dashboard/src/device-topology-app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React, { FC, useEffect, useState } from 'react';
import { useConfig } from './config.provider';

const DeviceTopologyApp: FC = () => {
const { inventoryApiURL } = useConfig();
const { inventoryApiURL, devInventoryWsURL, inventoryWsSchema, inventoryWsPath } = useConfig();
const [components, setComponents] = useState<typeof import('@frinx/device-topology') | null>(null);

useEffect(() => {
Expand All @@ -17,9 +17,10 @@ const DeviceTopologyApp: FC = () => {
}

const { InventoryAPIProvider, DeviceTopologyApp: App } = components;
const wsURL = devInventoryWsURL || `${inventoryWsSchema}${window.location.host}${inventoryWsPath}`;

return (
<InventoryAPIProvider client={InventoryApi.create({ url: inventoryApiURL }).client}>
<InventoryAPIProvider client={InventoryApi.create({ url: inventoryApiURL }).client} wsUrl={wsURL}>
<App />
</InventoryAPIProvider>
);
Expand Down
1 change: 1 addition & 0 deletions packages/frinx-device-topology/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
"date-fns": "^2.29.3",
"feather-icons-react": "0.6.2",
"graphql": "15.8.0",
"graphql-ws": "5.14.1",
"immer": "10.0.2",
"lodash": "4.17.21",
"mathjs": "^12.2.1",
Expand Down
Loading