TheArchive/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2024-11-30 13:35:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

metrics: make metrics endpoint toggleable

Browse Source
This commit is contained in:
Nico Rey 2022-02-25 18:36:03 -03:00
parent a9122c3de3
commit 06e6c29a5b
8 changed files with 38 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app.go
View File

@ -72,6 +72,7 @@ const (
type Config struct {
ServerURL string
Addr string
MetricsEnabled bool
MetricsAddr string
GRPCAddr string
GRPCAllowInsecure bool
@ -655,6 +656,7 @@ func (h *Headscale) Serve() error {
log.Info().
Msgf("listening and serving HTTP on: %s", h.cfg.Addr)
if h.cfg.MetricsEnabled {
promRouter := h.createPrometheusRouter()
promHTTPServer := &http.Server{
@ -675,6 +677,7 @@ func (h *Headscale) Serve() error {
log.Info().
Msgf("listening and serving metrics on: %s", h.cfg.MetricsAddr)
}
return errorGroup.Wait()
}

1
cmd/headscale/cli/utils.go
View File

@ -303,6 +303,7 @@ func getHeadscaleConfig() headscale.Config {
return headscale.Config{
ServerURL: viper.GetString("server_url"),
Addr: viper.GetString("listen_addr"),
MetricsEnabled: viper.GetBool("metrics_enabled"),
MetricsAddr: viper.GetString("metrics_listen_addr"),
GRPCAddr: viper.GetString("grpc_listen_addr"),
GRPCAllowInsecure: viper.GetBool("grpc_allow_insecure"),

1
cmd/headscale/headscale_test.go
View File

@ -56,6 +56,7 @@ func (*Suite) TestConfigLoading(c *check.C) {
c.Assert(viper.GetString("server_url"), check.Equals, "http://127.0.0.1:8080")
c.Assert(viper.GetString("listen_addr"), check.Equals, "0.0.0.0:8080")
c.Assert(viper.GetString("metrics_listen_addr"), check.Equals, "127.0.0.1:9915")
c.Assert(viper.GetString("metrics_enabled"), check.Equals, "true")
c.Assert(viper.GetString("db_type"), check.Equals, "sqlite3")
c.Assert(viper.GetString("db_path"), check.Equals, "/var/lib/headscale/db.sqlite")
c.Assert(viper.GetString("tls_letsencrypt_hostname"), check.Equals, "")

3
config-example.yaml
View File

@ -16,6 +16,9 @@ server_url: http://127.0.0.1:8080
#
listen_addr: 0.0.0.0:8080
# Enable Prometheus metrics endpoint
metrics_enabled: true
# Address to listen to /metrics, you may want
# to keep this endpoint private to your internal
# network

1
docs/examples/kustomize/base/configmap.yaml
View File

@ -5,5 +5,6 @@ metadata:
data:
server_url: $(PUBLIC_PROTO)://$(PUBLIC_HOSTNAME)
listen_addr: "0.0.0.0:8080"
metrics_enabled: "true"
metrics_listen_addr: "127.0.0.1:9915"
ephemeral_node_inactivity_timeout: "30m"

5
docs/examples/kustomize/postgres/deployment.yaml
View File

@ -30,6 +30,11 @@ spec:
configMapKeyRef:
name: headscale-config
key: metrics_listen_addr
- name: METRICS_ENABLED
valueFrom:
configMapKeyRef:
name: headscale-config
key: metrics_enabled
- name: DERP_MAP_PATH
value: /vol/config/derp.yaml
- name: EPHEMERAL_NODE_INACTIVITY_TIMEOUT

5
docs/examples/kustomize/sqlite/statefulset.yaml
View File

@ -31,6 +31,11 @@ spec:
configMapKeyRef:
name: headscale-config
key: metrics_listen_addr
- name: METRICS_ENABLED
valueFrom:
configMapKeyRef:
name: headscale-config
key: metrics_enabled
- name: DERP_MAP_PATH
value: /vol/config/derp.yaml
- name: EPHEMERAL_NODE_INACTIVITY_TIMEOUT

1
integration_test/etc/config.yaml
View File

@ -14,6 +14,7 @@ dns_config:
db_path: /tmp/integration_test_db.sqlite3
private_key_path: private.key
listen_addr: 0.0.0.0:8080
metrics_enabled: true
metrics_listen_addr: 127.0.0.1:9915
server_url: http://headscale:8080