From fa3b68c3fab6e9261f95829e04a89e9bd8be9e89 Mon Sep 17 00:00:00 2001 From: fatedier Date: Thu, 20 Feb 2020 21:02:16 +0800 Subject: [PATCH] refactoring monitor code, support prometheus --- cmd/frps/main.go | 1 + conf/frps_full.ini | 3 + go.mod | 4 +- go.sum | 102 +++++-- models/config/server_common.go | 14 +- models/metrics/aggregate/server.go | 93 ++++++ models/metrics/mem/server.go | 262 +++++++++++++++++ .../stats.go => models/metrics/mem/types.go | 49 +--- models/metrics/metrics.go | 8 + models/metrics/prometheus/server.go | 95 ++++++ server/control.go | 27 +- server/dashboard.go | 6 + server/dashboard_api.go | 9 +- server/metrics/metrics.go | 37 +++ server/proxy/http.go | 17 +- server/proxy/proxy.go | 58 ++-- server/proxy/udp.go | 20 +- server/service.go | 19 +- server/stats/internal.go | 277 ------------------ utils/metric/metrics.go | 34 +++ utils/vhost/http.go | 1 - utils/vhost/vhost.go | 1 - 22 files changed, 695 insertions(+), 442 deletions(-) create mode 100644 models/metrics/aggregate/server.go create mode 100644 models/metrics/mem/server.go rename server/stats/stats.go => models/metrics/mem/types.go (72%) create mode 100644 models/metrics/metrics.go create mode 100644 models/metrics/prometheus/server.go create mode 100644 server/metrics/metrics.go delete mode 100644 server/stats/internal.go create mode 100644 utils/metric/metrics.go diff --git a/cmd/frps/main.go b/cmd/frps/main.go index 8264dd70..50be5862 100644 --- a/cmd/frps/main.go +++ b/cmd/frps/main.go @@ -21,6 +21,7 @@ import ( "github.com/fatedier/golib/crypto" _ "github.com/fatedier/frp/assets/frps/statik" + _ "github.com/fatedier/frp/models/metrics" ) func main() { diff --git a/conf/frps_full.ini b/conf/frps_full.ini index 030a3b3a..6713561c 100644 --- a/conf/frps_full.ini +++ b/conf/frps_full.ini @@ -33,6 +33,9 @@ dashboard_port = 7500 dashboard_user = admin dashboard_pwd = admin +# enable_prometheus will export prometheus metrics on {dashboard_addr}:{dashboard_port} in /metrics api. +enable_prometheus = true + # dashboard assets directory(only for debug mode) # assets_dir = ./static # console or real logFile path like ./frps.log diff --git a/go.mod b/go.mod index c43c3646..c511e8c2 100644 --- a/go.mod +++ b/go.mod @@ -17,13 +17,13 @@ require ( github.com/klauspost/reedsolomon v1.9.1 // indirect github.com/mattn/go-runewidth v0.0.4 // indirect github.com/pires/go-proxyproto v0.0.0-20190111085350-4d51b51e3bfc - github.com/pkg/errors v0.8.0 // indirect github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 // indirect + github.com/prometheus/client_golang v1.4.1 github.com/rakyll/statik v0.1.1 github.com/rodaine/table v1.0.0 github.com/spf13/cobra v0.0.3 github.com/spf13/pflag v1.0.1 // indirect - github.com/stretchr/testify v1.3.0 + github.com/stretchr/testify v1.4.0 github.com/templexxx/cpufeat v0.0.0-20170927014610-3794dfbfb047 // indirect github.com/templexxx/xor v0.0.0-20170926022130-0af8e873c554 // indirect github.com/tjfoc/gmsm v0.0.0-20171124023159-98aa888b79d8 // indirect diff --git a/go.sum b/go.sum index 36268cd5..fc1f5452 100644 --- a/go.sum +++ b/go.sum @@ -1,81 +1,141 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/coreos/go-oidc v2.2.1+incompatible h1:mh48q/BqXqgjVHpy2ZY7WnWAbenxRjsz9N1i1YxjHAk= github.com/coreos/go-oidc v2.2.1+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= -github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/fatedier/beego v0.0.0-20171024143340-6c6a4f5bd5eb h1:wCrNShQidLmvVWn/0PikGmpdP0vtQmnvyRg3ZBEhczw= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fatedier/beego v0.0.0-20171024143340-6c6a4f5bd5eb/go.mod h1:wx3gB6dbIfBRcucp94PI9Bt3I0F2c/MyNEWuhzpWiwk= github.com/fatedier/golib v0.0.0-20181107124048-ff8cd814b049 h1:teH578mf2ii42NHhIp3PhgvjU5bv+NFMq9fSQR8NaG8= github.com/fatedier/golib v0.0.0-20181107124048-ff8cd814b049/go.mod h1:DqIrnl0rp3Zybg9zbJmozTy1n8fYJoX+QoAj9slIkKM= github.com/fatedier/kcp-go v2.0.4-0.20190803094908-fe8645b0a904+incompatible h1:ssXat9YXFvigNge/IkkZvFMn8yeYKFX+uI6wn2mLJ74= github.com/fatedier/kcp-go v2.0.4-0.20190803094908-fe8645b0a904+incompatible/go.mod h1:YpCOaxj7vvMThhIQ9AfTOPW2sfztQR5WDfs7AflSy4s= -github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/snappy v0.0.0-20170215233205-553a64147049 h1:K9KHZbXKpGydfDN0aZrsoHpLJlZsBrGMFWbgLDGnPZk= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw= github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d h1:kJCB4vdITiW1eC1vq2e6IsrXKrZit1bv/TDYFGMp4BQ= github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= -github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/klauspost/cpuid v1.2.0 h1:NMpwD2G9JSFOE1/TJjGSo5zG7Yb2bTe7eq1jH+irmeE= github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/reedsolomon v1.9.1 h1:kYrT1MlR4JH6PqOpC+okdb9CDTcwEC/BqpzK4WFyXL8= github.com/klauspost/reedsolomon v1.9.1/go.mod h1:CwCi+NUr9pqSVktrkN+Ondf06rkhYZ/pcNv7fu+8Un4= -github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/pires/go-proxyproto v0.0.0-20190111085350-4d51b51e3bfc h1:lNOt1SMsgHXTdpuGw+RpnJtzUcCb/oRKZP65pBy9pr8= github.com/pires/go-proxyproto v0.0.0-20190111085350-4d51b51e3bfc/go.mod h1:6/gX3+E/IYGa0wMORlSMla999awQFdbaeQCHjSMKIzY= -github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 h1:J9b7z+QKAmPf4YLrFg6oQUotqHQeUNWwkvo7jZp1GLU= github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= -github.com/rakyll/statik v0.1.1 h1:fCLHsIMajHqD5RKigbFXpvX3dN7c80Pm12+NCrI3kvg= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.4.1 h1:FFSuS004yOQEtDdTq+TAOLP5xUq63KqAFYyOi8zA+Y8= +github.com/prometheus/client_golang v1.4.1/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= +github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.9.1 h1:KOMtN28tlbam3/7ZKEYKHhKoJZYYj3gMH4uc62x7X7U= +github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.8 h1:+fpWZdT24pJBiqJdAwYBjPSk+5YmQzYNPYzQsdzLkt8= +github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/rakyll/statik v0.1.1/go.mod h1:OEi9wJV/fMUAGx1eNjq75DKDsJVuEv1U0oYdX6GX8Zs= -github.com/rodaine/table v1.0.0 h1:UaCJG5Axc/cNXVGXqnCrffm1KxP0OfYLe1HuJLf5sFY= github.com/rodaine/table v1.0.0/go.mod h1:YAUzwPOji0DUJNEvggdxyQcUAl4g3hDRcFlyjnnR51I= -github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= -github.com/spf13/pflag v1.0.1 h1:aCvUg6QPl3ibpQUxyLkrEkCHtPqYJL4x9AuhqVqFis4= github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/templexxx/cpufeat v0.0.0-20170927014610-3794dfbfb047 h1:K+jtWCOuZgCra7eXZ/VWn2FbJmrA/D058mTXhh2rq+8= +github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/templexxx/cpufeat v0.0.0-20170927014610-3794dfbfb047/go.mod h1:wM7WEvslTq+iOEAMDLSzhVuOt5BRZ05WirO+b09GHQU= -github.com/templexxx/xor v0.0.0-20170926022130-0af8e873c554 h1:pexgSe+JCFuxG+uoMZLO+ce8KHtdHGhst4cs6rw3gmk= github.com/templexxx/xor v0.0.0-20170926022130-0af8e873c554/go.mod h1:5XA7W9S6mni3h5uvOC75dA3m9CCCaS83lltmc0ukdi4= -github.com/tjfoc/gmsm v0.0.0-20171124023159-98aa888b79d8 h1:6CNSDqI1wiE+JqyOy5Qt/yo/DoNI2/QmmOZeiCid2Nw= github.com/tjfoc/gmsm v0.0.0-20171124023159-98aa888b79d8/go.mod h1:XxO4hdhhrzAd+G4CjDqaOkd0hUzmtPR/d3EiBBMn/wc= -github.com/vaughan0/go-ini v0.0.0-20130923145212-a98ad7ee00ec h1:DGmKwyZwEB8dI7tbLt/I/gQuP559o/0FrAkHKlQM/Ks= github.com/vaughan0/go-ini v0.0.0-20130923145212-a98ad7ee00ec/go.mod h1:owBmyHYMLkxyrugmfwE/DLJyW8Ro9mkphwuVErQ0iUw= -github.com/xtaci/lossyconn v0.0.0-20190602105132-8df528c0c9ae h1:J0GxkO96kL4WF+AIT3M4mfUVinOCPgf2uUWYFUzN0sM= github.com/xtaci/lossyconn v0.0.0-20190602105132-8df528c0c9ae/go.mod h1:gXtu8J62kEgmN++bm9BVICuT/e8yiLI2KFobd/TRFsE= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 h1:Ao/3l156eZf2AW5wK8a7/smtodRU+gha3+BeqJ69lRk= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200122134326-e047566fdf82 h1:ywK/j/KkyTHcdyYSZNXGjMwgmDSfjglYZ3vStQ/gSCU= +golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/square/go-jose.v2 v2.4.1 h1:H0TmLt7/KmzlrDOpa1F+zr0Tk90PbJYBfsVUmRLrf9Y= gopkg.in/square/go-jose.v2 v2.4.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.5 h1:ymVxjfMaHvXD8RqPRmzHHsB3VvucivSkIAvJFDI5O3c= +gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/models/config/server_common.go b/models/config/server_common.go index 54703ce1..a6aa969e 100644 --- a/models/config/server_common.go +++ b/models/config/server_common.go @@ -48,31 +48,25 @@ type ServerCommonConf struct { // ProxyBindAddr specifies the address that the proxy binds to. This value // may be the same as BindAddr. By default, this value is "0.0.0.0". ProxyBindAddr string `json:"proxy_bind_addr"` - // VhostHttpPort specifies the port that the server listens for HTTP Vhost // requests. If this value is 0, the server will not listen for HTTP // requests. By default, this value is 0. VhostHttpPort int `json:"vhost_http_port"` - // VhostHttpsPort specifies the port that the server listens for HTTPS // Vhost requests. If this value is 0, the server will not listen for HTTPS // requests. By default, this value is 0. VhostHttpsPort int `json:"vhost_https_port"` - // TcpMuxHttpConnectPort specifies the port that the server listens for TCP // HTTP CONNECT requests. If the value is 0, the server will not multiplex TCP // requests on one single port. If it's not - it will listen on this value for // HTTP CONNECT requests. By default, this value is 0. TcpMuxHttpConnectPort int `json:"tcpmux_httpconnect_port"` - // VhostHttpTimeout specifies the response header timeout for the Vhost // HTTP server, in seconds. By default, this value is 60. VhostHttpTimeout int64 `json:"vhost_http_timeout"` - // DashboardAddr specifies the address that the dashboard binds to. By // default, this value is "0.0.0.0". DashboardAddr string `json:"dashboard_addr"` - // DashboardPort specifies the port that the dashboard listens on. If this // value is 0, the dashboard will not be started. By default, this value is // 0. @@ -83,6 +77,9 @@ type ServerCommonConf struct { // DashboardUser specifies the password that the dashboard will use for // login. By default, this value is "admin". DashboardPwd string `json:"dashboard_pwd"` + // EnablePrometheus will export prometheus metrics on {dashboard_addr}:{dashboard_port} + // in /metrics api. + EnablePrometheus bool `json:"enable_prometheus"` // AssetsDir specifies the local directory that the dashboard will load // resources from. If this value is "", assets will be loaded from the // bundled executable using statik. By default, this value is "". @@ -167,6 +164,7 @@ func GetDefaultServerConf() ServerCommonConf { DashboardPort: 0, DashboardUser: "admin", DashboardPwd: "admin", + EnablePrometheus: false, AssetsDir: "", LogFile: "console", LogWay: "console", @@ -312,6 +310,10 @@ func UnmarshalServerConfFromIni(content string) (cfg ServerCommonConf, err error cfg.DashboardPwd = tmpStr } + if tmpStr, ok = conf.Get("common", "enable_prometheus"); ok && tmpStr == "true" { + cfg.EnablePrometheus = true + } + if tmpStr, ok = conf.Get("common", "assets_dir"); ok { cfg.AssetsDir = tmpStr } diff --git a/models/metrics/aggregate/server.go b/models/metrics/aggregate/server.go new file mode 100644 index 00000000..39549f97 --- /dev/null +++ b/models/metrics/aggregate/server.go @@ -0,0 +1,93 @@ +// Copyright 2020 fatedier, fatedier@gmail.com +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package aggregate + +import ( + "github.com/fatedier/frp/models/metrics/mem" + "github.com/fatedier/frp/models/metrics/prometheus" + "github.com/fatedier/frp/server/metrics" +) + +// EnableMem start to mark metrics to memory monitor system. +func EnableMem() { + sm.Add(mem.ServerMetrics) +} + +// EnablePrometheus start to mark metrics to prometheus. +func EnablePrometheus() { + sm.Add(prometheus.ServerMetrics) +} + +var sm *serverMetrics = &serverMetrics{} + +func init() { + metrics.Register(sm) +} + +type serverMetrics struct { + ms []metrics.ServerMetrics +} + +func (m *serverMetrics) Add(sm metrics.ServerMetrics) { + m.ms = append(m.ms, sm) +} + +func (m *serverMetrics) NewClient() { + for _, v := range m.ms { + v.NewClient() + } +} + +func (m *serverMetrics) CloseClient() { + for _, v := range m.ms { + v.CloseClient() + } +} + +func (m *serverMetrics) NewProxy(name string, proxyType string) { + for _, v := range m.ms { + v.NewProxy(name, proxyType) + } +} + +func (m *serverMetrics) CloseProxy(name string, proxyType string) { + for _, v := range m.ms { + v.CloseProxy(name, proxyType) + } +} + +func (m *serverMetrics) OpenConnection(name string, proxyType string) { + for _, v := range m.ms { + v.OpenConnection(name, proxyType) + } +} + +func (m *serverMetrics) CloseConnection(name string, proxyType string) { + for _, v := range m.ms { + v.CloseConnection(name, proxyType) + } +} + +func (m *serverMetrics) AddTrafficIn(name string, proxyType string, trafficBytes int64) { + for _, v := range m.ms { + v.AddTrafficIn(name, proxyType, trafficBytes) + } +} + +func (m *serverMetrics) AddTrafficOut(name string, proxyType string, trafficBytes int64) { + for _, v := range m.ms { + v.AddTrafficOut(name, proxyType, trafficBytes) + } +} diff --git a/models/metrics/mem/server.go b/models/metrics/mem/server.go new file mode 100644 index 00000000..d7c191fa --- /dev/null +++ b/models/metrics/mem/server.go @@ -0,0 +1,262 @@ +// Copyright 2019 fatedier, fatedier@gmail.com +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package mem + +import ( + "sync" + "time" + + server "github.com/fatedier/frp/server/metrics" + "github.com/fatedier/frp/utils/log" + "github.com/fatedier/frp/utils/metric" +) + +var sm *serverMetrics = newServerMetrics() +var ServerMetrics server.ServerMetrics +var StatsCollector Collector + +func init() { + ServerMetrics = sm + StatsCollector = sm + sm.run() +} + +type serverMetrics struct { + info *ServerStatistics + mu sync.Mutex +} + +func newServerMetrics() *serverMetrics { + return &serverMetrics{ + info: &ServerStatistics{ + TotalTrafficIn: metric.NewDateCounter(ReserveDays), + TotalTrafficOut: metric.NewDateCounter(ReserveDays), + CurConns: metric.NewCounter(), + + ClientCounts: metric.NewCounter(), + ProxyTypeCounts: make(map[string]metric.Counter), + + ProxyStatistics: make(map[string]*ProxyStatistics), + }, + } +} + +func (m *serverMetrics) run() { + go func() { + for { + time.Sleep(12 * time.Hour) + log.Debug("start to clear useless proxy statistics data...") + m.clearUselessInfo() + log.Debug("finish to clear useless proxy statistics data") + } + }() +} + +func (m *serverMetrics) clearUselessInfo() { + // To check if there are proxies that closed than 7 days and drop them. + m.mu.Lock() + defer m.mu.Unlock() + for name, data := range m.info.ProxyStatistics { + if !data.LastCloseTime.IsZero() && time.Since(data.LastCloseTime) > time.Duration(7*24)*time.Hour { + delete(m.info.ProxyStatistics, name) + log.Trace("clear proxy [%s]'s statistics data, lastCloseTime: [%s]", name, data.LastCloseTime.String()) + } + } +} + +func (m *serverMetrics) NewClient() { + m.info.ClientCounts.Inc(1) +} + +func (m *serverMetrics) CloseClient() { + m.info.ClientCounts.Dec(1) +} + +func (m *serverMetrics) NewProxy(name string, proxyType string) { + m.mu.Lock() + defer m.mu.Unlock() + counter, ok := m.info.ProxyTypeCounts[proxyType] + if !ok { + counter = metric.NewCounter() + } + counter.Inc(1) + m.info.ProxyTypeCounts[proxyType] = counter + + proxyStats, ok := m.info.ProxyStatistics[name] + if !(ok && proxyStats.ProxyType == proxyType) { + proxyStats = &ProxyStatistics{ + Name: name, + ProxyType: proxyType, + CurConns: metric.NewCounter(), + TrafficIn: metric.NewDateCounter(ReserveDays), + TrafficOut: metric.NewDateCounter(ReserveDays), + } + m.info.ProxyStatistics[name] = proxyStats + } + proxyStats.LastStartTime = time.Now() +} + +func (m *serverMetrics) CloseProxy(name string, proxyType string) { + m.mu.Lock() + defer m.mu.Unlock() + if counter, ok := m.info.ProxyTypeCounts[proxyType]; ok { + counter.Dec(1) + } + if proxyStats, ok := m.info.ProxyStatistics[name]; ok { + proxyStats.LastCloseTime = time.Now() + } +} + +func (m *serverMetrics) OpenConnection(name string, proxyType string) { + m.info.CurConns.Inc(1) + + m.mu.Lock() + defer m.mu.Unlock() + proxyStats, ok := m.info.ProxyStatistics[name] + if ok { + proxyStats.CurConns.Inc(1) + m.info.ProxyStatistics[name] = proxyStats + } +} + +func (m *serverMetrics) CloseConnection(name string, proxyType string) { + m.info.CurConns.Dec(1) + + m.mu.Lock() + defer m.mu.Unlock() + proxyStats, ok := m.info.ProxyStatistics[name] + if ok { + proxyStats.CurConns.Dec(1) + m.info.ProxyStatistics[name] = proxyStats + } +} + +func (m *serverMetrics) AddTrafficIn(name string, proxyType string, trafficBytes int64) { + m.info.TotalTrafficIn.Inc(trafficBytes) + + m.mu.Lock() + defer m.mu.Unlock() + + proxyStats, ok := m.info.ProxyStatistics[name] + if ok { + proxyStats.TrafficIn.Inc(trafficBytes) + m.info.ProxyStatistics[name] = proxyStats + } +} + +func (m *serverMetrics) AddTrafficOut(name string, proxyType string, trafficBytes int64) { + m.info.TotalTrafficOut.Inc(trafficBytes) + + m.mu.Lock() + defer m.mu.Unlock() + + proxyStats, ok := m.info.ProxyStatistics[name] + if ok { + proxyStats.TrafficOut.Inc(trafficBytes) + m.info.ProxyStatistics[name] = proxyStats + } +} + +// Get stats data api. + +func (m *serverMetrics) GetServer() *ServerStats { + m.mu.Lock() + defer m.mu.Unlock() + s := &ServerStats{ + TotalTrafficIn: m.info.TotalTrafficIn.TodayCount(), + TotalTrafficOut: m.info.TotalTrafficOut.TodayCount(), + CurConns: m.info.CurConns.Count(), + ClientCounts: m.info.ClientCounts.Count(), + ProxyTypeCounts: make(map[string]int64), + } + for k, v := range m.info.ProxyTypeCounts { + s.ProxyTypeCounts[k] = v.Count() + } + return s +} + +func (m *serverMetrics) GetProxiesByType(proxyType string) []*ProxyStats { + res := make([]*ProxyStats, 0) + m.mu.Lock() + defer m.mu.Unlock() + + for name, proxyStats := range m.info.ProxyStatistics { + if proxyStats.ProxyType != proxyType { + continue + } + + ps := &ProxyStats{ + Name: name, + Type: proxyStats.ProxyType, + TodayTrafficIn: proxyStats.TrafficIn.TodayCount(), + TodayTrafficOut: proxyStats.TrafficOut.TodayCount(), + CurConns: proxyStats.CurConns.Count(), + } + if !proxyStats.LastStartTime.IsZero() { + ps.LastStartTime = proxyStats.LastStartTime.Format("01-02 15:04:05") + } + if !proxyStats.LastCloseTime.IsZero() { + ps.LastCloseTime = proxyStats.LastCloseTime.Format("01-02 15:04:05") + } + res = append(res, ps) + } + return res +} + +func (m *serverMetrics) GetProxiesByTypeAndName(proxyType string, proxyName string) (res *ProxyStats) { + m.mu.Lock() + defer m.mu.Unlock() + + for name, proxyStats := range m.info.ProxyStatistics { + if proxyStats.ProxyType != proxyType { + continue + } + + if name != proxyName { + continue + } + + res = &ProxyStats{ + Name: name, + Type: proxyStats.ProxyType, + TodayTrafficIn: proxyStats.TrafficIn.TodayCount(), + TodayTrafficOut: proxyStats.TrafficOut.TodayCount(), + CurConns: proxyStats.CurConns.Count(), + } + if !proxyStats.LastStartTime.IsZero() { + res.LastStartTime = proxyStats.LastStartTime.Format("01-02 15:04:05") + } + if !proxyStats.LastCloseTime.IsZero() { + res.LastCloseTime = proxyStats.LastCloseTime.Format("01-02 15:04:05") + } + break + } + return +} + +func (m *serverMetrics) GetProxyTraffic(name string) (res *ProxyTrafficInfo) { + m.mu.Lock() + defer m.mu.Unlock() + + proxyStats, ok := m.info.ProxyStatistics[name] + if ok { + res = &ProxyTrafficInfo{ + Name: name, + } + res.TrafficIn = proxyStats.TrafficIn.GetLastDaysCount(ReserveDays) + res.TrafficOut = proxyStats.TrafficOut.GetLastDaysCount(ReserveDays) + } + return +} diff --git a/server/stats/stats.go b/models/metrics/mem/types.go similarity index 72% rename from server/stats/stats.go rename to models/metrics/mem/types.go index a09d7daa..bdb1863d 100644 --- a/server/stats/stats.go +++ b/models/metrics/mem/types.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package stats +package mem import ( "time" @@ -24,19 +24,6 @@ const ( ReserveDays = 7 ) -type StatsType int - -const ( - TypeNewClient StatsType = iota - TypeCloseClient - TypeNewProxy - TypeCloseProxy - TypeOpenConnection - TypeCloseConnection - TypeAddTrafficIn - TypeAddTrafficOut -) - type ServerStats struct { TotalTrafficIn int64 TotalTrafficOut int64 @@ -88,42 +75,8 @@ type ServerStatistics struct { } type Collector interface { - Mark(statsType StatsType, payload interface{}) - Run() error GetServer() *ServerStats GetProxiesByType(proxyType string) []*ProxyStats GetProxiesByTypeAndName(proxyType string, proxyName string) *ProxyStats GetProxyTraffic(name string) *ProxyTrafficInfo } - -type NewClientPayload struct{} - -type CloseClientPayload struct{} - -type NewProxyPayload struct { - Name string - ProxyType string -} - -type CloseProxyPayload struct { - Name string - ProxyType string -} - -type OpenConnectionPayload struct { - ProxyName string -} - -type CloseConnectionPayload struct { - ProxyName string -} - -type AddTrafficInPayload struct { - ProxyName string - TrafficBytes int64 -} - -type AddTrafficOutPayload struct { - ProxyName string - TrafficBytes int64 -} diff --git a/models/metrics/metrics.go b/models/metrics/metrics.go new file mode 100644 index 00000000..b9fb3084 --- /dev/null +++ b/models/metrics/metrics.go @@ -0,0 +1,8 @@ +package metrics + +import ( + "github.com/fatedier/frp/models/metrics/aggregate" +) + +var EnableMem = aggregate.EnableMem +var EnablePrometheus = aggregate.EnablePrometheus diff --git a/models/metrics/prometheus/server.go b/models/metrics/prometheus/server.go new file mode 100644 index 00000000..9cfdfda6 --- /dev/null +++ b/models/metrics/prometheus/server.go @@ -0,0 +1,95 @@ +package prometheus + +import ( + "github.com/fatedier/frp/server/metrics" + + "github.com/prometheus/client_golang/prometheus" +) + +const ( + namespace = "frp" + serverSubsystem = "server" +) + +var ServerMetrics metrics.ServerMetrics = newServerMetrics() + +type serverMetrics struct { + clientCount prometheus.Gauge + proxyCount *prometheus.GaugeVec + connectionCount *prometheus.GaugeVec + trafficIn *prometheus.CounterVec + trafficOut *prometheus.CounterVec +} + +func (m *serverMetrics) NewClient() { + m.clientCount.Inc() +} + +func (m *serverMetrics) CloseClient() { + m.clientCount.Dec() +} + +func (m *serverMetrics) NewProxy(name string, proxyType string) { + m.proxyCount.WithLabelValues(proxyType).Inc() +} + +func (m *serverMetrics) CloseProxy(name string, proxyType string) { + m.proxyCount.WithLabelValues(proxyType).Dec() +} + +func (m *serverMetrics) OpenConnection(name string, proxyType string) { + m.connectionCount.WithLabelValues(name, proxyType).Inc() +} + +func (m *serverMetrics) CloseConnection(name string, proxyType string) { + m.connectionCount.WithLabelValues(name, proxyType).Dec() +} + +func (m *serverMetrics) AddTrafficIn(name string, proxyType string, trafficBytes int64) { + m.trafficIn.WithLabelValues(name, proxyType).Add(float64(trafficBytes)) +} + +func (m *serverMetrics) AddTrafficOut(name string, proxyType string, trafficBytes int64) { + m.trafficOut.WithLabelValues(name, proxyType).Add(float64(trafficBytes)) +} + +func newServerMetrics() *serverMetrics { + m := &serverMetrics{ + clientCount: prometheus.NewGauge(prometheus.GaugeOpts{ + Namespace: namespace, + Subsystem: serverSubsystem, + Name: "client_counts", + Help: "The current client counts of frps", + }), + proxyCount: prometheus.NewGaugeVec(prometheus.GaugeOpts{ + Namespace: namespace, + Subsystem: serverSubsystem, + Name: "proxy_counts", + Help: "The current proxy counts", + }, []string{"type"}), + connectionCount: prometheus.NewGaugeVec(prometheus.GaugeOpts{ + Namespace: namespace, + Subsystem: serverSubsystem, + Name: "connection_counts", + Help: "The current connection counts", + }, []string{"name", "type"}), + trafficIn: prometheus.NewCounterVec(prometheus.CounterOpts{ + Namespace: namespace, + Subsystem: serverSubsystem, + Name: "traffic_in", + Help: "The total in traffic", + }, []string{"name", "type"}), + trafficOut: prometheus.NewCounterVec(prometheus.CounterOpts{ + Namespace: namespace, + Subsystem: serverSubsystem, + Name: "traffic_out", + Help: "The total out traffic", + }, []string{"name", "type"}), + } + prometheus.MustRegister(m.clientCount) + prometheus.MustRegister(m.proxyCount) + prometheus.MustRegister(m.connectionCount) + prometheus.MustRegister(m.trafficIn) + prometheus.MustRegister(m.trafficOut) + return m +} diff --git a/server/control.go b/server/control.go index e7d6f3bb..f4ed481d 100644 --- a/server/control.go +++ b/server/control.go @@ -30,8 +30,8 @@ import ( "github.com/fatedier/frp/models/msg" plugin "github.com/fatedier/frp/models/plugin/server" "github.com/fatedier/frp/server/controller" + "github.com/fatedier/frp/server/metrics" "github.com/fatedier/frp/server/proxy" - "github.com/fatedier/frp/server/stats" "github.com/fatedier/frp/utils/util" "github.com/fatedier/frp/utils/version" "github.com/fatedier/frp/utils/xlog" @@ -92,9 +92,6 @@ type Control struct { // plugin manager pluginManager *plugin.Manager - // stats collector to store stats info of clients and proxies - statsCollector stats.Collector - // verifies authentication based on selected method authVerifier auth.Verifier @@ -152,7 +149,6 @@ func NewControl( rc *controller.ResourceController, pxyManager *proxy.ProxyManager, pluginManager *plugin.Manager, - statsCollector stats.Collector, authVerifier auth.Verifier, ctlConn net.Conn, loginMsg *msg.Login, @@ -167,7 +163,6 @@ func NewControl( rc: rc, pxyManager: pxyManager, pluginManager: pluginManager, - statsCollector: statsCollector, authVerifier: authVerifier, conn: ctlConn, loginMsg: loginMsg, @@ -381,16 +376,12 @@ func (ctl *Control) stoper() { for _, pxy := range ctl.proxies { pxy.Close() ctl.pxyManager.Del(pxy.GetName()) - ctl.statsCollector.Mark(stats.TypeCloseProxy, &stats.CloseProxyPayload{ - Name: pxy.GetName(), - ProxyType: pxy.GetConf().GetBaseInfo().ProxyType, - }) + metrics.Server.CloseProxy(pxy.GetName(), pxy.GetConf().GetBaseInfo().ProxyType) } ctl.allShutdown.Done() xl.Info("client exit success") - - ctl.statsCollector.Mark(stats.TypeCloseClient, &stats.CloseClientPayload{}) + metrics.Server.CloseClient() } // block until Control closed @@ -451,10 +442,7 @@ func (ctl *Control) manager() { } else { resp.RemoteAddr = remoteAddr xl.Info("new proxy [%s] success", m.ProxyName) - ctl.statsCollector.Mark(stats.TypeNewProxy, &stats.NewProxyPayload{ - Name: m.ProxyName, - ProxyType: m.ProxyType, - }) + metrics.Server.NewProxy(m.ProxyName, m.ProxyType) } ctl.sendCh <- resp case *msg.CloseProxy: @@ -486,7 +474,7 @@ func (ctl *Control) RegisterProxy(pxyMsg *msg.NewProxy) (remoteAddr string, err // NewProxy will return a interface Proxy. // In fact it create different proxies by different proxy type, we just call run() here. - pxy, err := proxy.NewProxy(ctl.ctx, ctl.runId, ctl.rc, ctl.statsCollector, ctl.poolCount, ctl.GetWorkConn, pxyConf, ctl.serverCfg) + pxy, err := proxy.NewProxy(ctl.ctx, ctl.runId, ctl.rc, ctl.poolCount, ctl.GetWorkConn, pxyConf, ctl.serverCfg) if err != nil { return remoteAddr, err } @@ -548,9 +536,6 @@ func (ctl *Control) CloseProxy(closeMsg *msg.CloseProxy) (err error) { delete(ctl.proxies, closeMsg.ProxyName) ctl.mu.Unlock() - ctl.statsCollector.Mark(stats.TypeCloseProxy, &stats.CloseProxyPayload{ - Name: pxy.GetName(), - ProxyType: pxy.GetConf().GetBaseInfo().ProxyType, - }) + metrics.Server.CloseProxy(pxy.GetName(), pxy.GetConf().GetBaseInfo().ProxyType) return } diff --git a/server/dashboard.go b/server/dashboard.go index 0a65dbb2..94a36680 100644 --- a/server/dashboard.go +++ b/server/dashboard.go @@ -24,6 +24,7 @@ import ( frpNet "github.com/fatedier/frp/utils/net" "github.com/gorilla/mux" + "github.com/prometheus/client_golang/prometheus/promhttp" ) var ( @@ -38,6 +39,11 @@ func (svr *Service) RunDashboardServer(addr string, port int) (err error) { user, passwd := svr.cfg.DashboardUser, svr.cfg.DashboardPwd router.Use(frpNet.NewHttpAuthMiddleware(user, passwd).Middleware) + // metrics + if svr.cfg.EnablePrometheus { + router.Handle("/metrics", promhttp.Handler()) + } + // api, see dashboard_api.go router.HandleFunc("/api/serverinfo", svr.ApiServerInfo).Methods("GET") router.HandleFunc("/api/proxy/{type}", svr.ApiProxyByType).Methods("GET") diff --git a/server/dashboard_api.go b/server/dashboard_api.go index bc91ccfb..89d8d8a4 100644 --- a/server/dashboard_api.go +++ b/server/dashboard_api.go @@ -20,6 +20,7 @@ import ( "github.com/fatedier/frp/models/config" "github.com/fatedier/frp/models/consts" + "github.com/fatedier/frp/models/metrics/mem" "github.com/fatedier/frp/utils/log" "github.com/fatedier/frp/utils/version" @@ -62,7 +63,7 @@ func (svr *Service) ApiServerInfo(w http.ResponseWriter, r *http.Request) { }() log.Info("Http request: [%s]", r.URL.Path) - serverStats := svr.statsCollector.GetServer() + serverStats := mem.StatsCollector.GetServer() svrResp := ServerInfoResp{ Version: version.Full(), BindPort: svr.cfg.BindPort, @@ -186,7 +187,7 @@ func (svr *Service) ApiProxyByType(w http.ResponseWriter, r *http.Request) { } func (svr *Service) getProxyStatsByType(proxyType string) (proxyInfos []*ProxyStatsInfo) { - proxyStats := svr.statsCollector.GetProxiesByType(proxyType) + proxyStats := mem.StatsCollector.GetProxiesByType(proxyType) proxyInfos = make([]*ProxyStatsInfo, 0, len(proxyStats)) for _, ps := range proxyStats { proxyInfo := &ProxyStatsInfo{} @@ -256,7 +257,7 @@ func (svr *Service) ApiProxyByTypeAndName(w http.ResponseWriter, r *http.Request func (svr *Service) getProxyStatsByTypeAndName(proxyType string, proxyName string) (proxyInfo GetProxyStatsResp, code int, msg string) { proxyInfo.Name = proxyName - ps := svr.statsCollector.GetProxiesByTypeAndName(proxyType, proxyName) + ps := mem.StatsCollector.GetProxiesByTypeAndName(proxyType, proxyName) if ps == nil { code = 404 msg = "no proxy info found" @@ -314,7 +315,7 @@ func (svr *Service) ApiProxyTraffic(w http.ResponseWriter, r *http.Request) { trafficResp := GetProxyTrafficResp{} trafficResp.Name = name - proxyTrafficInfo := svr.statsCollector.GetProxyTraffic(name) + proxyTrafficInfo := mem.StatsCollector.GetProxyTraffic(name) if proxyTrafficInfo == nil { res.Code = 404 diff --git a/server/metrics/metrics.go b/server/metrics/metrics.go new file mode 100644 index 00000000..faf00d14 --- /dev/null +++ b/server/metrics/metrics.go @@ -0,0 +1,37 @@ +package metrics + +import ( + "sync" +) + +type ServerMetrics interface { + NewClient() + CloseClient() + NewProxy(name string, proxyType string) + CloseProxy(name string, proxyType string) + OpenConnection(name string, proxyType string) + CloseConnection(name string, proxyType string) + AddTrafficIn(name string, proxyType string, trafficBytes int64) + AddTrafficOut(name string, proxyType string, trafficBytes int64) +} + +var Server ServerMetrics = noopServerMetrics{} + +var registerMetrics sync.Once + +func Register(m ServerMetrics) { + registerMetrics.Do(func() { + Server = m + }) +} + +type noopServerMetrics struct{} + +func (noopServerMetrics) NewClient() {} +func (noopServerMetrics) CloseClient() {} +func (noopServerMetrics) NewProxy(name string, proxyType string) {} +func (noopServerMetrics) CloseProxy(name string, proxyType string) {} +func (noopServerMetrics) OpenConnection(name string, proxyType string) {} +func (noopServerMetrics) CloseConnection(name string, proxyType string) {} +func (noopServerMetrics) AddTrafficIn(name string, proxyType string, trafficBytes int64) {} +func (noopServerMetrics) AddTrafficOut(name string, proxyType string, trafficBytes int64) {} diff --git a/server/proxy/http.go b/server/proxy/http.go index 09fb3e44..35f65cbd 100644 --- a/server/proxy/http.go +++ b/server/proxy/http.go @@ -20,7 +20,7 @@ import ( "strings" "github.com/fatedier/frp/models/config" - "github.com/fatedier/frp/server/stats" + "github.com/fatedier/frp/server/metrics" frpNet "github.com/fatedier/frp/utils/net" "github.com/fatedier/frp/utils/util" "github.com/fatedier/frp/utils/vhost" @@ -159,21 +159,16 @@ func (pxy *HttpProxy) GetRealConn(remoteAddr string) (workConn net.Conn, err err } workConn = frpNet.WrapReadWriteCloserToConn(rwc, tmpConn) workConn = frpNet.WrapStatsConn(workConn, pxy.updateStatsAfterClosedConn) - pxy.statsCollector.Mark(stats.TypeOpenConnection, &stats.OpenConnectionPayload{ProxyName: pxy.GetName()}) + metrics.Server.OpenConnection(pxy.GetName(), pxy.GetConf().GetBaseInfo().ProxyType) return } func (pxy *HttpProxy) updateStatsAfterClosedConn(totalRead, totalWrite int64) { name := pxy.GetName() - pxy.statsCollector.Mark(stats.TypeCloseProxy, &stats.CloseConnectionPayload{ProxyName: name}) - pxy.statsCollector.Mark(stats.TypeAddTrafficIn, &stats.AddTrafficInPayload{ - ProxyName: name, - TrafficBytes: totalWrite, - }) - pxy.statsCollector.Mark(stats.TypeAddTrafficOut, &stats.AddTrafficOutPayload{ - ProxyName: name, - TrafficBytes: totalRead, - }) + proxyType := pxy.GetConf().GetBaseInfo().ProxyType + metrics.Server.CloseConnection(name, proxyType) + metrics.Server.AddTrafficIn(name, proxyType, totalWrite) + metrics.Server.AddTrafficOut(name, proxyType, totalRead) } func (pxy *HttpProxy) Close() { diff --git a/server/proxy/proxy.go b/server/proxy/proxy.go index ecd9621b..7f86212d 100644 --- a/server/proxy/proxy.go +++ b/server/proxy/proxy.go @@ -25,7 +25,7 @@ import ( "github.com/fatedier/frp/models/config" "github.com/fatedier/frp/models/msg" "github.com/fatedier/frp/server/controller" - "github.com/fatedier/frp/server/stats" + "github.com/fatedier/frp/server/metrics" frpNet "github.com/fatedier/frp/utils/net" "github.com/fatedier/frp/utils/xlog" @@ -45,14 +45,13 @@ type Proxy interface { } type BaseProxy struct { - name string - rc *controller.ResourceController - statsCollector stats.Collector - listeners []net.Listener - usedPortsNum int - poolCount int - getWorkConnFn GetWorkConnFn - serverCfg config.ServerCommonConf + name string + rc *controller.ResourceController + listeners []net.Listener + usedPortsNum int + poolCount int + getWorkConnFn GetWorkConnFn + serverCfg config.ServerCommonConf mu sync.RWMutex xl *xlog.Logger @@ -136,7 +135,7 @@ func (pxy *BaseProxy) GetWorkConnFromPool(src, dst net.Addr) (workConn net.Conn, // startListenHandler start a goroutine handler for each listener. // p: p will just be passed to handler(Proxy, frpNet.Conn). // handler: each proxy type can set different handler function to deal with connections accepted from listeners. -func (pxy *BaseProxy) startListenHandler(p Proxy, handler func(Proxy, net.Conn, stats.Collector, config.ServerCommonConf)) { +func (pxy *BaseProxy) startListenHandler(p Proxy, handler func(Proxy, net.Conn, config.ServerCommonConf)) { xl := xlog.FromContextSafe(pxy.ctx) for _, listener := range pxy.listeners { go func(l net.Listener) { @@ -149,26 +148,25 @@ func (pxy *BaseProxy) startListenHandler(p Proxy, handler func(Proxy, net.Conn, return } xl.Debug("get a user connection [%s]", c.RemoteAddr().String()) - go handler(p, c, pxy.statsCollector, pxy.serverCfg) + go handler(p, c, pxy.serverCfg) } }(listener) } } -func NewProxy(ctx context.Context, runId string, rc *controller.ResourceController, statsCollector stats.Collector, poolCount int, +func NewProxy(ctx context.Context, runId string, rc *controller.ResourceController, poolCount int, getWorkConnFn GetWorkConnFn, pxyConf config.ProxyConf, serverCfg config.ServerCommonConf) (pxy Proxy, err error) { xl := xlog.FromContextSafe(ctx).Spawn().AppendPrefix(pxyConf.GetBaseInfo().ProxyName) basePxy := BaseProxy{ - name: pxyConf.GetBaseInfo().ProxyName, - rc: rc, - statsCollector: statsCollector, - listeners: make([]net.Listener, 0), - poolCount: poolCount, - getWorkConnFn: getWorkConnFn, - serverCfg: serverCfg, - xl: xl, - ctx: xlog.NewContext(ctx, xl), + name: pxyConf.GetBaseInfo().ProxyName, + rc: rc, + listeners: make([]net.Listener, 0), + poolCount: poolCount, + getWorkConnFn: getWorkConnFn, + serverCfg: serverCfg, + xl: xl, + ctx: xlog.NewContext(ctx, xl), } switch cfg := pxyConf.(type) { case *config.TcpProxyConf: @@ -216,7 +214,7 @@ func NewProxy(ctx context.Context, runId string, rc *controller.ResourceControll // HandleUserTcpConnection is used for incoming tcp user connections. // It can be used for tcp, http, https type. -func HandleUserTcpConnection(pxy Proxy, userConn net.Conn, statsCollector stats.Collector, serverCfg config.ServerCommonConf) { +func HandleUserTcpConnection(pxy Proxy, userConn net.Conn, serverCfg config.ServerCommonConf) { xl := xlog.FromContextSafe(pxy.Context()) defer userConn.Close() @@ -243,17 +241,13 @@ func HandleUserTcpConnection(pxy Proxy, userConn net.Conn, statsCollector stats. xl.Debug("join connections, workConn(l[%s] r[%s]) userConn(l[%s] r[%s])", workConn.LocalAddr().String(), workConn.RemoteAddr().String(), userConn.LocalAddr().String(), userConn.RemoteAddr().String()) - statsCollector.Mark(stats.TypeOpenConnection, &stats.OpenConnectionPayload{ProxyName: pxy.GetName()}) + name := pxy.GetName() + proxyType := pxy.GetConf().GetBaseInfo().ProxyType + metrics.Server.OpenConnection(name, proxyType) inCount, outCount := frpIo.Join(local, userConn) - statsCollector.Mark(stats.TypeCloseConnection, &stats.CloseConnectionPayload{ProxyName: pxy.GetName()}) - statsCollector.Mark(stats.TypeAddTrafficIn, &stats.AddTrafficInPayload{ - ProxyName: pxy.GetName(), - TrafficBytes: inCount, - }) - statsCollector.Mark(stats.TypeAddTrafficOut, &stats.AddTrafficOutPayload{ - ProxyName: pxy.GetName(), - TrafficBytes: outCount, - }) + metrics.Server.CloseConnection(name, proxyType) + metrics.Server.AddTrafficIn(name, proxyType, inCount) + metrics.Server.AddTrafficOut(name, proxyType, outCount) xl.Debug("join connections closed") } diff --git a/server/proxy/udp.go b/server/proxy/udp.go index 397f60fb..a0471839 100644 --- a/server/proxy/udp.go +++ b/server/proxy/udp.go @@ -23,7 +23,7 @@ import ( "github.com/fatedier/frp/models/config" "github.com/fatedier/frp/models/msg" "github.com/fatedier/frp/models/proto/udp" - "github.com/fatedier/frp/server/stats" + "github.com/fatedier/frp/server/metrics" "github.com/fatedier/golib/errors" ) @@ -114,10 +114,11 @@ func (pxy *UdpProxy) Run() (remoteAddr string, err error) { if errRet := errors.PanicToError(func() { xl.Trace("get udp message from workConn: %s", m.Content) pxy.readCh <- m - pxy.statsCollector.Mark(stats.TypeAddTrafficOut, &stats.AddTrafficOutPayload{ - ProxyName: pxy.GetName(), - TrafficBytes: int64(len(m.Content)), - }) + metrics.Server.AddTrafficOut( + pxy.GetName(), + pxy.GetConf().GetBaseInfo().ProxyType, + int64(len(m.Content)), + ) }); errRet != nil { conn.Close() xl.Info("reader goroutine for udp work connection closed") @@ -143,10 +144,11 @@ func (pxy *UdpProxy) Run() (remoteAddr string, err error) { return } else { xl.Trace("send message to udp workConn: %s", udpMsg.Content) - pxy.statsCollector.Mark(stats.TypeAddTrafficIn, &stats.AddTrafficInPayload{ - ProxyName: pxy.GetName(), - TrafficBytes: int64(len(udpMsg.Content)), - }) + metrics.Server.AddTrafficIn( + pxy.GetName(), + pxy.GetConf().GetBaseInfo().ProxyType, + int64(len(udpMsg.Content)), + ) continue } case <-ctx.Done(): diff --git a/server/service.go b/server/service.go index ec015a1f..43870733 100644 --- a/server/service.go +++ b/server/service.go @@ -32,14 +32,15 @@ import ( "github.com/fatedier/frp/assets" "github.com/fatedier/frp/models/auth" "github.com/fatedier/frp/models/config" + modelmetrics "github.com/fatedier/frp/models/metrics" "github.com/fatedier/frp/models/msg" "github.com/fatedier/frp/models/nathole" plugin "github.com/fatedier/frp/models/plugin/server" "github.com/fatedier/frp/server/controller" "github.com/fatedier/frp/server/group" + "github.com/fatedier/frp/server/metrics" "github.com/fatedier/frp/server/ports" "github.com/fatedier/frp/server/proxy" - "github.com/fatedier/frp/server/stats" "github.com/fatedier/frp/utils/log" frpNet "github.com/fatedier/frp/utils/net" "github.com/fatedier/frp/utils/tcpmux" @@ -92,9 +93,6 @@ type Service struct { // Verifies authentication based on selected method authVerifier auth.Verifier - // stats collector to store server and proxies stats info - statsCollector stats.Collector - tlsConfig *tls.Config cfg config.ServerCommonConf @@ -275,8 +273,12 @@ func NewService(cfg config.ServerCommonConf) (svr *Service, err error) { log.Info("Dashboard listen on %s:%d", cfg.DashboardAddr, cfg.DashboardPort) statsEnable = true } - - svr.statsCollector = stats.NewInternalCollector(statsEnable) + if statsEnable { + modelmetrics.EnableMem() + if cfg.EnablePrometheus { + modelmetrics.EnablePrometheus() + } + } return } @@ -429,8 +431,7 @@ func (svr *Service) RegisterControl(ctlConn net.Conn, loginMsg *msg.Login) (err return } - ctl := NewControl(ctx, svr.rc, svr.pxyManager, svr.pluginManager, svr.statsCollector, svr.authVerifier, ctlConn, loginMsg, svr.cfg) - + ctl := NewControl(ctx, svr.rc, svr.pxyManager, svr.pluginManager, svr.authVerifier, ctlConn, loginMsg, svr.cfg) if oldCtl := svr.ctlManager.Add(loginMsg.RunId, ctl); oldCtl != nil { oldCtl.allShutdown.WaitDone() } @@ -438,7 +439,7 @@ func (svr *Service) RegisterControl(ctlConn net.Conn, loginMsg *msg.Login) (err ctl.Start() // for statistics - svr.statsCollector.Mark(stats.TypeNewClient, &stats.NewClientPayload{}) + metrics.Server.NewClient() go func() { // block until control closed diff --git a/server/stats/internal.go b/server/stats/internal.go deleted file mode 100644 index 4b28c2c0..00000000 --- a/server/stats/internal.go +++ /dev/null @@ -1,277 +0,0 @@ -// Copyright 2019 fatedier, fatedier@gmail.com -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package stats - -import ( - "sync" - "time" - - "github.com/fatedier/frp/utils/log" - "github.com/fatedier/frp/utils/metric" -) - -type internalCollector struct { - enable bool - info *ServerStatistics - mu sync.Mutex -} - -func NewInternalCollector(enable bool) Collector { - return &internalCollector{ - enable: enable, - info: &ServerStatistics{ - TotalTrafficIn: metric.NewDateCounter(ReserveDays), - TotalTrafficOut: metric.NewDateCounter(ReserveDays), - CurConns: metric.NewCounter(), - - ClientCounts: metric.NewCounter(), - ProxyTypeCounts: make(map[string]metric.Counter), - - ProxyStatistics: make(map[string]*ProxyStatistics), - }, - } -} - -func (collector *internalCollector) Run() error { - go func() { - for { - time.Sleep(12 * time.Hour) - log.Debug("start to clear useless proxy statistics data...") - collector.ClearUselessInfo() - log.Debug("finish to clear useless proxy statistics data") - } - }() - return nil -} - -func (collector *internalCollector) ClearUselessInfo() { - // To check if there are proxies that closed than 7 days and drop them. - collector.mu.Lock() - defer collector.mu.Unlock() - for name, data := range collector.info.ProxyStatistics { - if !data.LastCloseTime.IsZero() && time.Since(data.LastCloseTime) > time.Duration(7*24)*time.Hour { - delete(collector.info.ProxyStatistics, name) - log.Trace("clear proxy [%s]'s statistics data, lastCloseTime: [%s]", name, data.LastCloseTime.String()) - } - } -} - -func (collector *internalCollector) Mark(statsType StatsType, payload interface{}) { - if !collector.enable { - return - } - - switch v := payload.(type) { - case *NewClientPayload: - collector.newClient(v) - case *CloseClientPayload: - collector.closeClient(v) - case *NewProxyPayload: - collector.newProxy(v) - case *CloseProxyPayload: - collector.closeProxy(v) - case *OpenConnectionPayload: - collector.openConnection(v) - case *CloseConnectionPayload: - collector.closeConnection(v) - case *AddTrafficInPayload: - collector.addTrafficIn(v) - case *AddTrafficOutPayload: - collector.addTrafficOut(v) - } -} - -func (collector *internalCollector) newClient(payload *NewClientPayload) { - collector.info.ClientCounts.Inc(1) -} - -func (collector *internalCollector) closeClient(payload *CloseClientPayload) { - collector.info.ClientCounts.Dec(1) -} - -func (collector *internalCollector) newProxy(payload *NewProxyPayload) { - collector.mu.Lock() - defer collector.mu.Unlock() - counter, ok := collector.info.ProxyTypeCounts[payload.ProxyType] - if !ok { - counter = metric.NewCounter() - } - counter.Inc(1) - collector.info.ProxyTypeCounts[payload.ProxyType] = counter - - proxyStats, ok := collector.info.ProxyStatistics[payload.Name] - if !(ok && proxyStats.ProxyType == payload.ProxyType) { - proxyStats = &ProxyStatistics{ - Name: payload.Name, - ProxyType: payload.ProxyType, - CurConns: metric.NewCounter(), - TrafficIn: metric.NewDateCounter(ReserveDays), - TrafficOut: metric.NewDateCounter(ReserveDays), - } - collector.info.ProxyStatistics[payload.Name] = proxyStats - } - proxyStats.LastStartTime = time.Now() -} - -func (collector *internalCollector) closeProxy(payload *CloseProxyPayload) { - collector.mu.Lock() - defer collector.mu.Unlock() - if counter, ok := collector.info.ProxyTypeCounts[payload.ProxyType]; ok { - counter.Dec(1) - } - if proxyStats, ok := collector.info.ProxyStatistics[payload.Name]; ok { - proxyStats.LastCloseTime = time.Now() - } -} - -func (collector *internalCollector) openConnection(payload *OpenConnectionPayload) { - collector.info.CurConns.Inc(1) - - collector.mu.Lock() - defer collector.mu.Unlock() - proxyStats, ok := collector.info.ProxyStatistics[payload.ProxyName] - if ok { - proxyStats.CurConns.Inc(1) - collector.info.ProxyStatistics[payload.ProxyName] = proxyStats - } -} - -func (collector *internalCollector) closeConnection(payload *CloseConnectionPayload) { - collector.info.CurConns.Dec(1) - - collector.mu.Lock() - defer collector.mu.Unlock() - proxyStats, ok := collector.info.ProxyStatistics[payload.ProxyName] - if ok { - proxyStats.CurConns.Dec(1) - collector.info.ProxyStatistics[payload.ProxyName] = proxyStats - } -} - -func (collector *internalCollector) addTrafficIn(payload *AddTrafficInPayload) { - collector.info.TotalTrafficIn.Inc(payload.TrafficBytes) - - collector.mu.Lock() - defer collector.mu.Unlock() - - proxyStats, ok := collector.info.ProxyStatistics[payload.ProxyName] - if ok { - proxyStats.TrafficIn.Inc(payload.TrafficBytes) - collector.info.ProxyStatistics[payload.ProxyName] = proxyStats - } -} - -func (collector *internalCollector) addTrafficOut(payload *AddTrafficOutPayload) { - collector.info.TotalTrafficOut.Inc(payload.TrafficBytes) - - collector.mu.Lock() - defer collector.mu.Unlock() - - proxyStats, ok := collector.info.ProxyStatistics[payload.ProxyName] - if ok { - proxyStats.TrafficOut.Inc(payload.TrafficBytes) - collector.info.ProxyStatistics[payload.ProxyName] = proxyStats - } -} - -func (collector *internalCollector) GetServer() *ServerStats { - collector.mu.Lock() - defer collector.mu.Unlock() - s := &ServerStats{ - TotalTrafficIn: collector.info.TotalTrafficIn.TodayCount(), - TotalTrafficOut: collector.info.TotalTrafficOut.TodayCount(), - CurConns: collector.info.CurConns.Count(), - ClientCounts: collector.info.ClientCounts.Count(), - ProxyTypeCounts: make(map[string]int64), - } - for k, v := range collector.info.ProxyTypeCounts { - s.ProxyTypeCounts[k] = v.Count() - } - return s -} - -func (collector *internalCollector) GetProxiesByType(proxyType string) []*ProxyStats { - res := make([]*ProxyStats, 0) - collector.mu.Lock() - defer collector.mu.Unlock() - - for name, proxyStats := range collector.info.ProxyStatistics { - if proxyStats.ProxyType != proxyType { - continue - } - - ps := &ProxyStats{ - Name: name, - Type: proxyStats.ProxyType, - TodayTrafficIn: proxyStats.TrafficIn.TodayCount(), - TodayTrafficOut: proxyStats.TrafficOut.TodayCount(), - CurConns: proxyStats.CurConns.Count(), - } - if !proxyStats.LastStartTime.IsZero() { - ps.LastStartTime = proxyStats.LastStartTime.Format("01-02 15:04:05") - } - if !proxyStats.LastCloseTime.IsZero() { - ps.LastCloseTime = proxyStats.LastCloseTime.Format("01-02 15:04:05") - } - res = append(res, ps) - } - return res -} - -func (collector *internalCollector) GetProxiesByTypeAndName(proxyType string, proxyName string) (res *ProxyStats) { - collector.mu.Lock() - defer collector.mu.Unlock() - - for name, proxyStats := range collector.info.ProxyStatistics { - if proxyStats.ProxyType != proxyType { - continue - } - - if name != proxyName { - continue - } - - res = &ProxyStats{ - Name: name, - Type: proxyStats.ProxyType, - TodayTrafficIn: proxyStats.TrafficIn.TodayCount(), - TodayTrafficOut: proxyStats.TrafficOut.TodayCount(), - CurConns: proxyStats.CurConns.Count(), - } - if !proxyStats.LastStartTime.IsZero() { - res.LastStartTime = proxyStats.LastStartTime.Format("01-02 15:04:05") - } - if !proxyStats.LastCloseTime.IsZero() { - res.LastCloseTime = proxyStats.LastCloseTime.Format("01-02 15:04:05") - } - break - } - return -} - -func (collector *internalCollector) GetProxyTraffic(name string) (res *ProxyTrafficInfo) { - collector.mu.Lock() - defer collector.mu.Unlock() - - proxyStats, ok := collector.info.ProxyStatistics[name] - if ok { - res = &ProxyTrafficInfo{ - Name: name, - } - res.TrafficIn = proxyStats.TrafficIn.GetLastDaysCount(ReserveDays) - res.TrafficOut = proxyStats.TrafficOut.GetLastDaysCount(ReserveDays) - } - return -} diff --git a/utils/metric/metrics.go b/utils/metric/metrics.go new file mode 100644 index 00000000..0fbefc5d --- /dev/null +++ b/utils/metric/metrics.go @@ -0,0 +1,34 @@ +// Copyright 2020 fatedier, fatedier@gmail.com +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package metric + +// GaugeMetric represents a single numerical value that can arbitrarily go up +// and down. +type GaugeMetric interface { + Inc() + Dec() + Set(float64) +} + +// CounterMetric represents a single numerical value that only ever +// goes up. +type CounterMetric interface { + Inc() +} + +// HistogramMetric counts individual observations. +type HistogramMetric interface { + Observe(float64) +} diff --git a/utils/vhost/http.go b/utils/vhost/http.go index f63920b3..1bf6cc30 100644 --- a/utils/vhost/http.go +++ b/utils/vhost/http.go @@ -174,7 +174,6 @@ func (rp *HttpReverseProxy) getVhost(domain string, location string) (vr *VhostR } domainSplit = domainSplit[1:] } - return } func (rp *HttpReverseProxy) ServeHTTP(rw http.ResponseWriter, req *http.Request) { diff --git a/utils/vhost/vhost.go b/utils/vhost/vhost.go index ad322be6..fec3f525 100644 --- a/utils/vhost/vhost.go +++ b/utils/vhost/vhost.go @@ -116,7 +116,6 @@ func (v *VhostMuxer) getListener(name, path string) (l *Listener, exist bool) { } domainSplit = domainSplit[1:] } - return } func (v *VhostMuxer) run() {