feat: A new port is added for prometheus collection, and the indicator init… #1826
Conversation
…ialization process is extracted to form a separate function.
…bator-pegasus/collector
limowang
changed the title
GehaFearless
changed the title
| @@ -15,7 +15,7 @@ | |||
| // specific language governing permissions and limitations | |||
| // under the License. | |||
|
|
|||
| module github.com/pegasus-kv/collector | |||
| module github.com/limowang/incubator-pegasus/collector | |||
There was a problem hiding this comment.
| module github.com/limowang/incubator-pegasus/collector | |
| module github.com/apache/incubator-pegasus/collector |
collector/main
Outdated
There was a problem hiding this comment.
Don't add binaries to the codebase.
| // "github.com/pegasus-kv/collector/avail" | ||
| // "github.com/pegasus-kv/collector/metrics" | ||
| // "github.com/pegasus-kv/collector/webui" | ||
| "github.com/limowang/incubator-pegasus/collector/avail" |
There was a problem hiding this comment.
Remove the comments and use the apache repository.
collector/main.go
Outdated
| @@ -81,7 +84,8 @@ func main() { | |||
| return | |||
| } | |||
|
|
|||
| webui.StartWebServer() | |||
| metrics.InitMetrics() | |||
| //webui.StartWebServer() | |||
There was a problem hiding this comment.
Just remove it if it's not needed.
collector/webui/webserver.go
Outdated
| @@ -53,9 +56,22 @@ func StartWebServer() { | |||
| app.RegisterView(tmpl) | |||
|
|
|||
| go func() { | |||
| err := app.Listen(":8080") | |||
| err := app.Listen(":8081") | |||
There was a problem hiding this comment.
It would be better to read from config file or command line rather than hard code.
The port should be user-defined to avoid port conflicts in user environments.
| @@ -167,17 +149,15 @@ func initMetrics() { | |||
| Help: desc, | |||
| }, []string{"endpoint", "role", "level", "title"}) | |||
| GaugeMetricsMap[name] = *gaugeMetric | |||
| case "Percentile": | |||
| if _, ok := SummaryMetricsMap[name]; ok { | |||
| case "Percentile": //这个需要改动不能用这个表示,用gauge来表示分位数 --level(p50,p99),title(task_name)来替代区分 | |||
There was a problem hiding this comment.
Use English because this is a globally open-source project.
|
The PR title seems too long and incomplete. |
…n and collection functions of partition entity metrics with new labels.
| @@ -25,7 +25,7 @@ meta_servers: | |||
| - 127.0.0.1:34603 | |||
|
|
|||
| # local server port | |||
| port : 34101 | |||
| port : 8081 | |||
There was a problem hiding this comment.
8080, 8081 are widely used ports for web servers, it would be better to use 34101 to keep compatible (old version of collectors may have been used by communituy users, don't change the behavior).
| @@ -34,7 +34,7 @@ metrics: | |||
|
|
|||
| prometheus: | |||
| # the exposed port for prometheus exposer | |||
| exposer_port : 1111 | |||
| exposer_port : 8080 | |||
There was a problem hiding this comment.
Same, and 34*01 ports are used by Pegasus by habit, how about use 34201 instead?
| if err != nil { | ||
| return | ||
| } | ||
| }() | ||
|
|
||
| //Provide metrics for prometheus |
There was a problem hiding this comment.
| //Provide metrics for prometheus | |
| // Provide metrics for Prometheus. |
A new port is added for prometheus collection, and the indicator initialization process is extracted to form a separate function.