fix: prometheus test/doc cleanup (#252)

go-graphite · Nov 2, 2023 · c47e8c8 · c47e8c8
1 parent 10918b8
commit c47e8c8
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 14 deletions.
diff --git a/Makefile b/Makefile
@@ -48,6 +48,10 @@ doc/config.md: deploy/doc/graphite-clickhouse.conf deploy/doc/config.md
 
 config: doc/config.md
 
+# run after prometheus upgrade
+prometheus/ui:
+	vendor_prometheus_ui.sh
+
 test:
 	$(GO) test -race ./...
 

diff --git a/config/config_test.go b/config/config_test.go
@@ -390,7 +390,7 @@ sample-thereafter = 12
 	assert.Equal(t, expected.Carbonlink, config.Carbonlink)
 
 	// Prometheus
-	expected.Prometheus = Prometheus{":9092", "https://server:3456/uri", nil, "Prometheus Time Series", 5 * time.Minute}
+	expected.Prometheus = Prometheus{Listen: ":9092", ExternalURLRaw: "https://server:3456/uri", PageTitle: "Prometheus Time Series", LookbackDelta: 5 * time.Minute, RemoteReadConcurrencyLimit: 10}
 	u, _ := url.Parse(expected.Prometheus.ExternalURLRaw)
 	expected.Prometheus.ExternalURL = u
 	assert.Equal(t, expected.Prometheus, config.Prometheus)
@@ -690,7 +690,7 @@ sample-thereafter = 12
 	assert.Equal(t, expected.Carbonlink, config.Carbonlink)
 
 	// Prometheus
-	expected.Prometheus = Prometheus{":9092", "https://server:3456/uri", nil, "Prometheus Time Series", 5 * time.Minute}
+	expected.Prometheus = Prometheus{Listen: ":9092", ExternalURLRaw: "https://server:3456/uri", PageTitle: "Prometheus Time Series", LookbackDelta: 5 * time.Minute, RemoteReadConcurrencyLimit: 10}
 	u, _ := url.Parse(expected.Prometheus.ExternalURLRaw)
 	expected.Prometheus.ExternalURL = u
 	assert.Equal(t, expected.Prometheus, config.Prometheus)
@@ -1005,7 +1005,7 @@ sample-thereafter = 12
 	assert.Equal(t, expected.Carbonlink, config.Carbonlink)
 
 	// Prometheus
-	expected.Prometheus = Prometheus{":9092", "https://server:3456/uri", nil, "Prometheus Time Series", 5 * time.Minute}
+	expected.Prometheus = Prometheus{Listen: ":9092", ExternalURLRaw: "https://server:3456/uri", PageTitle: "Prometheus Time Series", LookbackDelta: 5 * time.Minute, RemoteReadConcurrencyLimit: 10}
 	u, _ := url.Parse(expected.Prometheus.ExternalURLRaw)
 	expected.Prometheus.ExternalURL = u
 	assert.Equal(t, expected.Prometheus, config.Prometheus)

diff --git a/doc/config.md b/doc/config.md
@@ -398,6 +398,8 @@ Only one tag used as filter for index field Tag1, see graphite_tagged table [str
  external-url = ""
  page-title = "Prometheus Time Series Collection and Processing Server"
  lookback-delta = "5m0s"
+ # concurrently handled remote read requests
+ remote-read-concurrency-limit = 10
 
 # see doc/debugging.md
 [debug]

diff --git a/vendor_prometheus_ui.sh b/vendor_prometheus_ui.sh
@@ -4,17 +4,16 @@ cd $(dirname $0)
 
 BRANCH=$(cat go.mod  | grep 'github.com/prometheus/prometheus' | awk '{print $2}')
 
-rm -rf tmp
-mkdir tmp
-git clone --depth 1 --branch $BRANCH https://github.com/prometheus/prometheus.git tmp
+rm -rf tmp || exit 1
+mkdir tmp || exit 1
+git clone --depth 1 --branch $BRANCH https://github.com/prometheus/prometheus.git tmp || exit 1
 
-cd tmp
-make assets-compress
+cd tmp || exit 1
+make assets-compress || exit 1
 
-cd ..
+cd .. || exit 1
 
-cp tmp/web/ui/embed.go vendor/github.com/prometheus/prometheus/web/ui/embed.go
-rm -rf vendor/github.com/prometheus/prometheus/web/ui/static
-cp -a tmp/web/ui/static vendor/github.com/prometheus/prometheus/web/ui/static
-rm -f vendor/github.com/prometheus/prometheus/web/ui/.gitignore
-rm -rf tmp
+cp tmp/web/ui/embed.go vendor/github.com/prometheus/prometheus/web/ui/embed.go || exit 1
+rm -rf vendor/github.com/prometheus/prometheus/web/ui/static || exit 1
+cp -a tmp/web/ui/static vendor/github.com/prometheus/prometheus/web/ui/static || exit 1
+rm -rf vendor/github.com/prometheus/prometheus/web/ui/.gitignore tmp || exit 1