diff --git a/README.md b/README.md index 62d0452f..62d259f2 100644 --- a/README.md +++ b/README.md @@ -22,12 +22,12 @@ sudo ntpdate -u pool.ntp.org - Download the compressed file from Github releases. You can refer to Github releases and download your preffered version ``` -wget https://github.com/sophie0730/PulseTracker/releases/tag/v0.1.1 +wget [package_release_url] ``` - Create a new directory and decompress the file ``` -tar xvf pulsetracker_0.1.0-beta_linux.tar +tar xvf [package_name].tar ``` - Use docker compose to setup InfluxDB and Redis @@ -39,7 +39,7 @@ docker compose up - Edit .env.template according to your InfluxDB settings. Please remember to rename it to .env after editing all the required information. -- Edit pulse.yml and alert.yml based on your needs. +- Edit pulse.yml and alert.yml based on your needs and environment setting. - (optional) If you would like to send email or Line message, please register a SMTP server(Mailgun or other services) and Line notify(https://notify-bot.line.me/zh_TW/) token. diff --git a/client/src/components/alert.jsx b/client/src/components/alert.jsx index 5292bace..c922a716 100644 --- a/client/src/components/alert.jsx +++ b/client/src/components/alert.jsx @@ -147,8 +147,6 @@ function AlertContainer() { const alertAPI = `${import.meta.env.VITE_HOST}/api/1.0/alert?page=${currentPage}&limit=${pageSize}`; const searchAPI = `${import.meta.env.VITE_HOST}/api/1.0/alert/search?page=${currentPage}&term=${searchTerm}&limit=${pageSize}`; - const SERVER_URL = undefined; - const fetchData = () => { const api = searchTerm ? searchAPI : alertAPI; axios.get(api) @@ -170,7 +168,7 @@ function AlertContainer() { useEffect(() => { fetchData(); - const socket = io(SERVER_URL); + const socket = io(); socket.on('connect', () => console.log('connected to socket.io server')); socket.on('dataUpdate', fetchData); diff --git a/client/src/components/target.jsx b/client/src/components/target.jsx index 0ea0664f..699fe4cd 100644 --- a/client/src/components/target.jsx +++ b/client/src/components/target.jsx @@ -13,7 +13,6 @@ function TargetTitle() { export function Target() { const targetAPI = `${import.meta.env.VITE_HOST}/api/1.0/targets`; - const SERVER_URL = 'http://localhost:4000'; const [targetStatus, setTargetStatus] = useState([]); const [responseError, setError] = useState(null); @@ -28,7 +27,7 @@ export function Target() { setError(error); }); - const socket = io(SERVER_URL); + const socket = io(); socket.on('connect', () => console.log('connected to socket.io server')); socket.on('dataUpdate', () => { axios.get(targetAPI) diff --git a/server/exporters/application.js b/server/exporters/application.js index 603f3ee4..3468272a 100644 --- a/server/exporters/application.js +++ b/server/exporters/application.js @@ -24,19 +24,19 @@ collectDefaultMetrics({ }); const httpTotalRequest = new client.Gauge({ - name: 'http_total_requests', + name: 'Http_Total_Requests', help: 'http total request', }); const guageRequestPerSecond = new client.Gauge({ - name: 'request_per_second', + name: 'Request_Per_Second', help: 'Request per second', labelNames: ['time'], }); const guageResponseTime = new client.Gauge({ - name: 'max_response_time', - help: 'max response time', + name: 'Max_Response_Time', + help: 'ms', labelNames: ['api'], }); diff --git a/server/exporters/system.js b/server/exporters/system.js index d3774011..29ebaa19 100755 --- a/server/exporters/system.js +++ b/server/exporters/system.js @@ -21,38 +21,38 @@ collectDefaultMetrics({ }); const guageCPULoad1m = new client.Gauge({ - name: 'load_duration_1m', + name: 'CPU_Load_1m', help: 'Average Load duration 1m', }); const guageCPULoad5m = new client.Gauge({ - name: 'load_duration_5m', - help: 'Average Load duration 5m', + name: 'CPU_Load_5m', + help: 'Average Load 5m', }); const guageCPULoad15m = new client.Gauge({ - name: 'load_duration_15m', - help: 'Average Load duration 15m', + name: 'CPU_Load_15m', + help: 'Average Load 15m', }); const guageCPUsage = new client.Gauge({ - name: 'cpu_average_usage', - help: 'CPU usage percentage', + name: 'CPU_Average_Usage', + help: '(%)', }); const guageMemoryUsage = new client.Gauge({ - name: 'memory_usage', - help: 'Memory usage percentage', + name: 'Memory_Usage', + help: '(%)', }); const guageDiskRead = new client.Gauge({ - name: 'disk_read_average_time', - help: 'Disk read average time per I/O (ms)', + name: 'Disk_Read_Average_Time', + help: '(ms)', labelNames: ['device'], }); const guageDiskWrite = new client.Gauge({ - name: 'disk_write_average_time', - help: 'Disk write average time per I/O (ms)', + name: 'Disk_Write_Average_Time', + help: '(ms)', labelNames: ['device'], });