Skip to content

Commit

Permalink
tweak: allows prom addr with http path (#1563)
Browse files Browse the repository at this point in the history
  • Loading branch information
mornyx committed Aug 14, 2023
1 parent c088112 commit d6e3aea
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/apiserver/metrics/prom_resolve.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func normalizeCustomizedPromAddress(addr string) (string, error) {
return "", fmt.Errorf("invalid Prometheus address format")
}
// Normalize the address, remove unnecessary parts.
addr = fmt.Sprintf("%s://%s", u.Scheme, u.Host)
addr = fmt.Sprintf("%s://%s%s", u.Scheme, u.Host, strings.TrimSuffix(u.Path, "/"))
return addr, nil
}

Expand Down
24 changes: 24 additions & 0 deletions pkg/apiserver/metrics/prom_resolve_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// Copyright 2023 PingCAP, Inc. Licensed under Apache-2.0.

package metrics

import (
"testing"

"github.com/stretchr/testify/require"
)

// https://github.com/pingcap/tidb-dashboard/issues/1560
func Test_normalizeCustomizedPromAddress(t *testing.T) {
addr, err := normalizeCustomizedPromAddress("http://infra-tidb-monitoring-shadow2-prod-0a01da41:9090")
require.NoError(t, err)
require.Equal(t, "http://infra-tidb-monitoring-shadow2-prod-0a01da41:9090", addr)

addr, err = normalizeCustomizedPromAddress("http://infra-tidb-monitoring-shadow2-prod-0a01da41:9090/")
require.NoError(t, err)
require.Equal(t, "http://infra-tidb-monitoring-shadow2-prod-0a01da41:9090", addr)

addr, err = normalizeCustomizedPromAddress("http://infra-tidb-monitoring-shadow2-prod-0a01da41:9090/_/tsdb/")
require.NoError(t, err)
require.Equal(t, "http://infra-tidb-monitoring-shadow2-prod-0a01da41:9090/_/tsdb", addr)
}

0 comments on commit d6e3aea

Please sign in to comment.