mirror of
https://github.com/fatedier/frp.git
synced 2026-05-15 08:05:49 -06:00
[PR #1668] [MERGED] refactoring monitor code, support prometheus #4431
Labels
No labels
In Progress
WIP
WaitingForInfo
bug
doc
duplicate
easy
enhancement
future
help wanted
invalid
lifecycle/stale
need-issue-template
need-usage-help
no plan
proposal
pull-request
question
todo
No milestone
No project
No assignees
1 participant
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference: github-starred/frp#4431
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
📋 Pull Request Information
Original PR: https://github.com/fatedier/frp/pull/1668
Author: @fatedier
Created: 2/20/2020
Status: ✅ Merged
Merged: 3/11/2020
Merged by: @fatedier
Base:
dev← Head:new📝 Commits (2)
fa3b68crefactoring monitor code, support prometheusbf096b2remove vendor📊 Changes
889 files changed (+680 additions, -333138 deletions)
View changed files
📝
.gitignore(+1 -0)📝
Makefile(+1 -0)📝
cmd/frps/main.go(+1 -0)📝
conf/frps_full.ini(+3 -0)📝
go.mod(+2 -2)📝
go.sum(+81 -21)📝
models/config/server_common.go(+8 -6)➕
models/metrics/aggregate/server.go(+93 -0)➕
models/metrics/mem/server.go(+262 -0)📝
models/metrics/mem/types.go(+1 -48)➕
models/metrics/metrics.go(+8 -0)➕
models/metrics/prometheus/server.go(+95 -0)📝
server/control.go(+6 -21)📝
server/dashboard.go(+6 -0)📝
server/dashboard_api.go(+5 -4)➕
server/metrics/metrics.go(+37 -0)📝
server/proxy/http.go(+6 -11)📝
server/proxy/proxy.go(+26 -32)📝
server/proxy/udp.go(+11 -9)📝
server/service.go(+10 -9)...and 80 more files
📄 Description
Only care about first commit. Just remove vendor codes in second commit since we use go mod instead.
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.