mirror of
https://github.com/prometheus/prometheus.git
synced 2024-12-30 07:59:40 -08:00
095f572d4a
* Fix `kuma_sd` targetgroup reporting (#9157) * Bundle all xDS targets into a single group Signed-off-by: austin ce <austin.cawley@gmail.com> * Snapshot in-memory chunks on shutdown for faster restarts (#7229) Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com> * Rename links Signed-off-by: Levi Harrison <git@leviharrison.dev> * Remove Individual Data Type Caps in Per-shard Buffering for Remote Write (#8921) * Moved everything to nPending buffer Signed-off-by: Levi Harrison <git@leviharrison.dev> * Simplify exemplar capacity addition Signed-off-by: Levi Harrison <git@leviharrison.dev> * Added pre-allocation Signed-off-by: Levi Harrison <git@leviharrison.dev> * Don't allocate if not sending exemplars Signed-off-by: Levi Harrison <git@leviharrison.dev> * Avoid deadlock when processing duplicate series record (#9170) * Avoid deadlock when processing duplicate series record `processWALSamples()` needs to be able to send on its output channel before it can read the input channel, so reads to allow this in case the output channel is full. Signed-off-by: Bryan Boreham <bjboreham@gmail.com> * processWALSamples: update comment Previous text seems to relate to an earlier implementation. Signed-off-by: Bryan Boreham <bjboreham@gmail.com> * Optimise WAL loading by removing extra map and caching min-time (#9160) * BenchmarkLoadWAL: close WAL after use So that goroutines are stopped and resources released Signed-off-by: Bryan Boreham <bjboreham@gmail.com> * BenchmarkLoadWAL: make series IDs co-prime with #workers Series are distributed across workers by taking the modulus of the ID with the number of workers, so multiples of 100 are a poor choice. Signed-off-by: Bryan Boreham <bjboreham@gmail.com> * BenchmarkLoadWAL: simulate mmapped chunks Real Prometheus cuts chunks every 120 samples, then skips those samples when re-reading the WAL. Simulate this by creating a single mapped chunk for each series, since the max time is all the reader looks at. Signed-off-by: Bryan Boreham <bjboreham@gmail.com> * Fix comment Signed-off-by: Bryan Boreham <bjboreham@gmail.com> * Remove series map from processWALSamples() The locks that is commented to reduce contention in are now sharded 32,000 ways, so won't be contended. Removing the map saves memory and goes just as fast. Signed-off-by: Bryan Boreham <bjboreham@gmail.com> * loadWAL: Cache the last mmapped chunk time So we can skip calling append() for samples it will reject. Signed-off-by: Bryan Boreham <bjboreham@gmail.com> * Improvements from code review Signed-off-by: Bryan Boreham <bjboreham@gmail.com> * Full stops and capitals on comments Signed-off-by: Bryan Boreham <bjboreham@gmail.com> * Cache max time in both places mmappedChunks is updated Including refactor to extract function `setMMappedChunks`, to reduce code duplication. Signed-off-by: Bryan Boreham <bjboreham@gmail.com> * Update head min/max time when mmapped chunks added This ensures we have the correct values if no WAL samples are added for that series. Note that `mSeries.maxTime()` was always `math.MinInt64` before, since that function doesn't consider mmapped chunks. Signed-off-by: Bryan Boreham <bjboreham@gmail.com> * Split Go and React Tests (#8897) * Added go-ci and react-ci Co-authored-by: Julien Pivotto <roidelapluie@inuits.eu> Signed-off-by: Levi Harrison <git@leviharrison.dev> * Remove search keymap from new expression editor (#9184) Signed-off-by: Julius Volz <julius.volz@gmail.com> Co-authored-by: Austin Cawley-Edwards <austin.cawley@gmail.com> Co-authored-by: Levi Harrison <git@leviharrison.dev> Co-authored-by: Julien Pivotto <roidelapluie@inuits.eu> Co-authored-by: Bryan Boreham <bjboreham@gmail.com> Co-authored-by: Julius Volz <julius.volz@gmail.com>
102 lines
4 KiB
Makefile
102 lines
4 KiB
Makefile
# Copyright 2018 The Prometheus Authors
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
# Needs to be defined before including Makefile.common to auto-generate targets
|
|
DOCKER_ARCHS ?= amd64 armv7 arm64 ppc64le s390x
|
|
|
|
REACT_APP_PATH = web/ui/react-app
|
|
REACT_APP_SOURCE_FILES = $(shell find $(REACT_APP_PATH)/public/ $(REACT_APP_PATH)/src/ $(REACT_APP_PATH)/tsconfig.json)
|
|
REACT_APP_OUTPUT_DIR = web/ui/static/react
|
|
REACT_APP_NODE_MODULES_PATH = $(REACT_APP_PATH)/node_modules
|
|
REACT_APP_NPM_LICENSES_TARBALL = "npm_licenses.tar.bz2"
|
|
REACT_APP_BUILD_SCRIPT = ./scripts/build_react_app.sh
|
|
|
|
PROMTOOL = ./promtool
|
|
TSDB_BENCHMARK_NUM_METRICS ?= 1000
|
|
TSDB_BENCHMARK_DATASET ?= ./tsdb/testdata/20kseries.json
|
|
TSDB_BENCHMARK_OUTPUT_DIR ?= ./benchout
|
|
|
|
GOLANGCI_LINT_OPTS ?= --timeout 4m
|
|
|
|
include Makefile.common
|
|
|
|
DOCKER_IMAGE_NAME ?= prometheus
|
|
|
|
$(REACT_APP_NODE_MODULES_PATH): $(REACT_APP_PATH)/package.json $(REACT_APP_PATH)/yarn.lock
|
|
cd $(REACT_APP_PATH) && yarn --frozen-lockfile
|
|
|
|
$(REACT_APP_OUTPUT_DIR): $(REACT_APP_NODE_MODULES_PATH) $(REACT_APP_SOURCE_FILES) $(REACT_APP_BUILD_SCRIPT)
|
|
@echo ">> building React app"
|
|
@$(REACT_APP_BUILD_SCRIPT)
|
|
|
|
.PHONY: assets
|
|
assets: $(REACT_APP_OUTPUT_DIR)
|
|
@echo ">> writing assets"
|
|
# Un-setting GOOS and GOARCH here because the generated Go code is always the same,
|
|
# but the cached object code is incompatible between architectures and OSes (which
|
|
# breaks cross-building for different combinations on CI in the same container).
|
|
cd web/ui && GO111MODULE=$(GO111MODULE) GOOS= GOARCH= $(GO) generate -x -v $(GOOPTS)
|
|
@$(GOFMT) -w ./web/ui
|
|
|
|
.PHONY: react-app-lint
|
|
react-app-lint:
|
|
@echo ">> running React app linting"
|
|
cd $(REACT_APP_PATH) && yarn lint:ci
|
|
|
|
.PHONY: react-app-lint-fix
|
|
react-app-lint-fix:
|
|
@echo ">> running React app linting and fixing errors where possible"
|
|
cd $(REACT_APP_PATH) && yarn lint
|
|
|
|
.PHONY: react-app-test
|
|
react-app-test: | $(REACT_APP_NODE_MODULES_PATH) react-app-lint
|
|
@echo ">> running React app tests"
|
|
cd $(REACT_APP_PATH) && yarn test --no-watch --coverage
|
|
|
|
.PHONY: test
|
|
# If we only want to only test go code we have to change the test target
|
|
# which is called by all.
|
|
ifeq ($(GO_ONLY),1)
|
|
test: common-test
|
|
else
|
|
test: common-test react-app-test
|
|
endif
|
|
|
|
|
|
.PHONY: npm_licenses
|
|
npm_licenses: $(REACT_APP_NODE_MODULES_PATH)
|
|
@echo ">> bundling npm licenses"
|
|
rm -f $(REACT_APP_NPM_LICENSES_TARBALL)
|
|
find $(REACT_APP_NODE_MODULES_PATH) -iname "license*" | tar cfj $(REACT_APP_NPM_LICENSES_TARBALL) --transform 's/^/npm_licenses\//' --files-from=-
|
|
|
|
.PHONY: tarball
|
|
tarball: npm_licenses common-tarball
|
|
|
|
.PHONY: docker
|
|
docker: npm_licenses common-docker
|
|
|
|
.PHONY: build
|
|
build: assets common-build
|
|
|
|
.PHONY: bench_tsdb
|
|
bench_tsdb: $(PROMU)
|
|
@echo ">> building promtool"
|
|
@GO111MODULE=$(GO111MODULE) $(PROMU) build --prefix $(PREFIX) promtool
|
|
@echo ">> running benchmark, writing result to $(TSDB_BENCHMARK_OUTPUT_DIR)"
|
|
@$(PROMTOOL) tsdb bench write --metrics=$(TSDB_BENCHMARK_NUM_METRICS) --out=$(TSDB_BENCHMARK_OUTPUT_DIR) $(TSDB_BENCHMARK_DATASET)
|
|
@$(GO) tool pprof -svg $(PROMTOOL) $(TSDB_BENCHMARK_OUTPUT_DIR)/cpu.prof > $(TSDB_BENCHMARK_OUTPUT_DIR)/cpuprof.svg
|
|
@$(GO) tool pprof --inuse_space -svg $(PROMTOOL) $(TSDB_BENCHMARK_OUTPUT_DIR)/mem.prof > $(TSDB_BENCHMARK_OUTPUT_DIR)/memprof.inuse.svg
|
|
@$(GO) tool pprof --alloc_space -svg $(PROMTOOL) $(TSDB_BENCHMARK_OUTPUT_DIR)/mem.prof > $(TSDB_BENCHMARK_OUTPUT_DIR)/memprof.alloc.svg
|
|
@$(GO) tool pprof -svg $(PROMTOOL) $(TSDB_BENCHMARK_OUTPUT_DIR)/block.prof > $(TSDB_BENCHMARK_OUTPUT_DIR)/blockprof.svg
|
|
@$(GO) tool pprof -svg $(PROMTOOL) $(TSDB_BENCHMARK_OUTPUT_DIR)/mutex.prof > $(TSDB_BENCHMARK_OUTPUT_DIR)/mutexprof.svg
|