Merge branch 'v3' into PMM-9288-extended-profiler

percona · Feb 26, 2025 · af5ec05 · af5ec05
2 parents f32d830 + 96385dd
commit af5ec05
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -23,7 +23,7 @@ services:
       - PMM_ENABLE_ACCESS_CONTROL=${PMM_ENABLE_ACCESS_CONTROL:-0}
       - PMM_WATCHTOWER_HOST=${PMM_WATCHTOWER_HOST:-http://watchtower:8080}
       - PMM_WATCHTOWER_TOKEN=${PMM_WATCHTOWER_TOKEN:-INSECURE_TOKEN}
-      - PMM_RELEASE_VERSION=3.0.0-alpha
+      - PMM_RELEASE_VERSION=3.0.0
       # - PMM_DISTRIBUTION_METHOD=${PMM_DISTRIBUTION_METHOD:-docker}
       # - PMM_DEV_UPDATE_DOCKER_IMAGE=${PMM_DEV_UPDATE_DOCKER_IMAGE:-}
       # - PMM_DEV_PERCONA_PLATFORM_ADDRESS=https://check.localhost

diff --git a/managed/services/victoriametrics/scrape_configs.go b/managed/services/victoriametrics/scrape_configs.go
@@ -67,7 +67,7 @@ func scrapeConfigForGrafana(interval time.Duration) *config.ScrapeConfig {
 		JobName:        "grafana",
 		ScrapeInterval: config.Duration(interval),
 		ScrapeTimeout:  scrapeTimeout(interval),
-		MetricsPath:    "/metrics",
+		MetricsPath:    "/graph/metrics",
 		ServiceDiscoveryConfig: config.ServiceDiscoveryConfig{
 			StaticConfigs: []*config.Group{{
 				Targets: []string{"127.0.0.1:3000"},

diff --git a/managed/services/victoriametrics/victoriametrics_test.go b/managed/services/victoriametrics/victoriametrics_test.go
@@ -287,7 +287,7 @@ scrape_configs:
       honor_timestamps: false
       scrape_interval: 10s
       scrape_timeout: 9s
-      metrics_path: /metrics
+      metrics_path: /graph/metrics
       static_configs:
         - targets:
             - 127.0.0.1:3000
@@ -843,7 +843,7 @@ scrape_configs:
       honor_timestamps: false
       scrape_interval: 10s
       scrape_timeout: 9s
-      metrics_path: /metrics
+      metrics_path: /graph/metrics
       static_configs:
         - targets:
             - 127.0.0.1:3000

diff --git a/managed/testdata/victoriametrics/promscrape.yml b/managed/testdata/victoriametrics/promscrape.yml
@@ -30,7 +30,7 @@ scrape_configs:
       honor_timestamps: false
       scrape_interval: 10s
       scrape_timeout: 9s
-      metrics_path: /metrics
+      metrics_path: /graph/metrics
       static_configs:
         - targets:
             - 127.0.0.1:3000