Merge pull request #152 from FalkorDB/monitor

fix #14 add monitor view

app/api/monitor/route.ts

@@ -2,6 +2,10 @@ import { NextResponse } from "next/server";
 import { getServerSession } from "next-auth/next";
 import authOptions, { getConnection } from "../auth/[...nextauth]/options";
 
+const fileds = [
+    "used_memory",
+    "used_memory_rss"
+]
 // eslint-disable-next-line import/prefer-default-export
 export async function GET() {
 
@@ -16,20 +20,21 @@ export async function GET() {
         return NextResponse.json({ message: "Not authenticated" }, { status: 401 })
     }
 
-    const info = await client.info("memory")
-
-    if(typeof info === 'string') {
-
-        const data = (info as string).split('\r\n').map((item) => {
-            const name = item.split(':')[0]
-            const num = item.split(':')[1]
-            return { name, series: num }
-        })
-
-        data.splice(0, 1)
-        return NextResponse.json(data, { status: 200 })
-    } 
-
-    return NextResponse.json({message: "Failed to retrive info"}, { status: 500 })
+    const infoMemory = await client.connection.info("memory")
+    const infoGraph = await client.info()
+
+    const dataMemory = infoMemory.split('\r\n').map((item: string) => {
+        const name = item.split(':')[0]
+        const series = item.split(':')[1]
+        return { name, series }
+    }).filter((item: {name: string, series: string}) => fileds.find(filed => filed === item.name))
+    const dataGraph: {name: string, series: number}[] = []
+    for (let i = 0; i < infoGraph.length; i += 2) {
+        const name = (infoGraph[i] as string).substring(2)
+        const series = (infoGraph[i + 1] as string[]).length
+        dataGraph.push({name, series})
+    }
+
+    return NextResponse.json({ memory: dataMemory, graph: dataGraph }, { status: 200 })
 
 }

app/monitor/MonitorView.tsx

@@ -0,0 +1,74 @@
+import { ECharts } from "echarts";
+import ReactEcharts, { EChartsInstance, EChartsOption } from "echarts-for-react"
+import { useEffect, useRef, useState } from "react"
+
+interface Props {
+  data: { name: string, series: string }[]
+  time: Date
+}
+
+export default function MonitorView({ data, time }: Props) {
+
+  const echartRef = useRef<EChartsInstance | null>(null)
+  const [timeArr] = useState<string[]>([])
+  const [chartReady, setChartReady] = useState<boolean>(false)
+
+  useEffect(() => {
+    if (chartReady && echartRef.current) {
+      const myChart: ECharts = echartRef.current
+      data.forEach((item, index) => {
+        myChart.appendData({
+          seriesIndex: index,
+          data: [item.series]
+        })
+      })
+      timeArr.push(time.toLocaleTimeString().split(" ")[0])
+      myChart.setOption({
+        xAxis: {
+          type: "category",
+          data: timeArr
+        }
+      })
+    }
+  }, [data, time, timeArr, chartReady])
+
+  const options: EChartsOption = {
+    tooltip: {
+      trigger: 'axis',
+      axisPointer: {
+        type: 'cross',
+      },
+    },
+    legend: {
+      data: data.map(item => item.name)
+    },
+    xAxis: {
+      type: "category",
+      data: timeArr,
+      min: 0
+    },
+    yAxis: {
+      type: "value",
+    },
+    series: data.map(item => ({
+      name: item.name,
+      data: [],
+      type: "line",
+      smooth: true,
+      itemStyle: {
+        opacity: 0
+      }
+    }))
+  }
+
+  return (
+    <ReactEcharts
+      className="w-full h-full"
+      option={options}
+      onChartReady={(e) => {
+        echartRef.current = e
+        setChartReady(true)
+      }}
+    />
+  )
+}

app/monitor/page.tsx

@@ -0,0 +1,36 @@
+"use client"
+
+import useSWR from 'swr'
+import React, { useState } from 'react'
+import MonitorView from './MonitorView'
+
+export default function Page() {
+
+    const [time, setTime] = useState<Date | null>(null)
+
+    const fetcher = (url: string) => fetch(url, {
+        method: 'GET',
+        headers: {
+            'Content-Type': 'application/json'
+        }
+    }).then((result) => {
+        if (result.status < 300) {
+            setTime(new Date())
+            return result.json()
+        }
+        return []
+    })
+
+    const { data } = useSWR(`/api/monitor/`, fetcher, { refreshInterval: 1000 })
+    return (
+        <div className='flex flex-col items-center w-full h-full'>
+            <h1 className='p-5 text-6xl'>Monitor</h1>
+            <div className='w-10/12 h-full'>
+                {(data?.memory && time) && <MonitorView data={data?.memory} time={time} />}
+            </div>
+            <div className='w-10/12 h-full'>
+                {(data?.graph && time) && <MonitorView data={data?.graph} time={time} />}
+            </div>
+        </div>
+    )
+}

app/providers.tsx

@@ -2,7 +2,7 @@
 
 import Navbar from "@/components/custom/navbar";
 import { ResizableHandle, ResizablePanel, ResizablePanelGroup } from "@/components/ui/resizable";
-import { Info, LogOut, Waypoints } from "lucide-react";
+import { Activity, Info, LogOut, Waypoints } from "lucide-react";
 import { SessionProvider, signOut } from "next-auth/react";
 import { ThemeProvider } from 'next-themes'
 import { useEffect, useRef, useState } from "react";
@@ -20,6 +20,12 @@ const LINKS = [
     href: "/graph",
     icon: (<Waypoints className="h-6 w-6" />),
   },
+  {
+    name: "Monitor",
+    // href: "/api/monitor",
+    href: "/monitor",
+    icon: (<Activity className="h-6 w-6" />),
+  },
   {
     name: "Disconnect",
     href: "",
@@ -32,12 +38,12 @@ export default function NextAuthProvider({ children }: { children: React.ReactNo
 
   const { screenSize } = useScreenSize();
   const isSmallScreen = screenSize === 'sm' || screenSize === 'xs'
-  
+
   const [isCollapsed, setCollapsed] = useState(isSmallScreen)
   const navPanel = useRef<ImperativePanelHandle>(null)
 
   useEffect(() => {
-    if (isSmallScreen){
+    if (isSmallScreen) {
       setCollapsed(true)
       if (navPanel.current) {
         navPanel.current.collapse()
@@ -74,7 +80,7 @@ export default function NextAuthProvider({ children }: { children: React.ReactNo
             <Navbar links={LINKS} collapsed={isCollapsed} onExpand={onExpand} />
           </ResizablePanel>
           <ResizableHandle withHandle />
-          <ResizablePanel defaultSize={100-panelSize}>{children}</ResizablePanel>
+          <ResizablePanel defaultSize={100 - panelSize}>{children}</ResizablePanel>
         </ResizablePanelGroup>
       </ThemeProvider>
     </SessionProvider>

package.json

@@ -31,6 +31,8 @@
     "cmdk": "^0.2.0",
     "cytoscape": "^3.28.1",
     "cytoscape-fcose": "^2.2.0",
+    "echarts": "^5.5.0",
+    "echarts-for-react": "^3.0.2",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-import": "^2.29.1",
@@ -50,6 +52,7 @@
     "react-json-tree": "^0.18.0",
     "react-resizable-panels": "^1.0.9",
     "save-dev": "^0.0.1-security",
+    "swr": "^2.2.5",
     "tailwind-merge": "^2.2.0",
     "tailwindcss": "^3.4.1",
     "tailwindcss-animate": "^1.0.7",