diff --git a/cmd/traefik/configuration.go b/cmd/traefik/configuration.go index dec67e328..b76c84eaf 100644 --- a/cmd/traefik/configuration.go +++ b/cmd/traefik/configuration.go @@ -61,7 +61,8 @@ func NewTraefikDefaultPointersConfiguration() *TraefikConfiguration { // TODO: Deprecated - default Metrics defaultWeb.Metrics = &types.Metrics{ Prometheus: &types.Prometheus{ - Buckets: types.Buckets{0.1, 0.3, 1.2, 5}, + Buckets: types.Buckets{0.1, 0.3, 1.2, 5}, + EntryPoint: configuration.DefaultInternalEntryPointName, }, Datadog: &types.Datadog{ Address: "localhost:8125", @@ -220,7 +221,7 @@ func NewTraefikDefaultPointersConfiguration() *TraefikConfiguration { defaultMetrics := types.Metrics{ Prometheus: &types.Prometheus{ Buckets: types.Buckets{0.1, 0.3, 1.2, 5}, - EntryPoint: "traefik", + EntryPoint: configuration.DefaultInternalEntryPointName, }, Datadog: &types.Datadog{ Address: "localhost:8125", diff --git a/integration/basic_test.go b/integration/basic_test.go index cc3eacd57..7684d5507 100644 --- a/integration/basic_test.go +++ b/integration/basic_test.go @@ -336,3 +336,25 @@ func (s *SimpleSuite) TestWithUnexistingEntrypoint(c *check.C) { err = try.GetRequest("http://127.0.0.1:8000/whoami", 1*time.Second, try.StatusCodeIs(http.StatusOK)) c.Assert(err, checker.IsNil) } + +func (s *SimpleSuite) TestMetricsPrometheusDefaultEntrypoint(c *check.C) { + + s.createComposeProject(c, "base") + s.composeProject.Start(c) + + cmd, output := s.traefikCmd("--defaultEntryPoints=http", "--entryPoints=Name:http Address::8000", "--web", "--web.metrics.prometheus.buckets=0.1,0.3,1.2,5.0", "--docker", "--debug") + defer output(c) + + err := cmd.Start() + c.Assert(err, checker.IsNil) + defer cmd.Process.Kill() + + err = try.GetRequest("http://127.0.0.1:8080/api/providers", 1*time.Second, try.BodyContains("PathPrefix")) + c.Assert(err, checker.IsNil) + + err = try.GetRequest("http://127.0.0.1:8000/whoami", 1*time.Second, try.StatusCodeIs(http.StatusOK)) + c.Assert(err, checker.IsNil) + + err = try.GetRequest("http://127.0.0.1:8080/metrics", 1*time.Second, try.StatusCodeIs(http.StatusOK)) + c.Assert(err, checker.IsNil) +}