diff -pruN 2.31.2+ds1-1/CHANGELOG.md 2.33.5+ds1-2/CHANGELOG.md --- 2.31.2+ds1-1/CHANGELOG.md 2022-01-21 00:33:16.000000000 +0000 +++ 2.33.5+ds1-2/CHANGELOG.md 2022-03-08 16:34:32.000000000 +0000 @@ -1,3 +1,93 @@ +## 2.33.5 / 2022-03-08 + +The binaries published with this release are built with Go1.17.8 to avoid [CVE-2022-24921](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-24921). + +* [BUGFIX] Remote-write: Fix deadlock between adding to queue and getting batch. #10395 + +## 2.33.4 / 2022-02-22 + +* [BUGFIX] TSDB: Fix panic when m-mapping head chunks onto the disk. #10316 + +## 2.33.3 / 2022-02-11 + +* [BUGFIX] Azure SD: Fix a regression when public IP Address isn't set. #10289 + +## 2.33.2 / 2022-02-11 + +* [BUGFIX] Azure SD: Fix panic when public IP Address isn't set. #10280 +* [BUGFIX] Remote-write: Fix deadlock when stopping a shard. #10279 + +## 2.33.1 / 2022-02-02 + +* [BUGFIX] SD: Fix _no such file or directory_ in K8s SD when not running inside K8s. #10235 + +## 2.33.0 / 2022-01-29 + +* [CHANGE] PromQL: Promote negative offset and `@` modifer to stable features. #10121 +* [CHANGE] Web: Promote remote-write-receiver to stable. #10119 +* [FEATURE] Config: Add `stripPort` template function. #10002 +* [FEATURE] Promtool: Add cardinality analysis to `check metrics`, enabled by flag `--extended`. #10045 +* [FEATURE] SD: Enable target discovery in own K8s namespace. #9881 +* [FEATURE] SD: Add provider ID label in K8s SD. #9603 +* [FEATURE] Web: Add limit field to the rules API. #10152 +* [ENHANCEMENT] Remote-write: Avoid allocations by buffering concrete structs instead of interfaces. #9934 +* [ENHANCEMENT] Remote-write: Log time series details for out-of-order samples in remote write receiver. #9894 +* [ENHANCEMENT] Remote-write: Shard up more when backlogged. #9274 +* [ENHANCEMENT] TSDB: Use simpler map key to improve exemplar ingest performance. #10111 +* [ENHANCEMENT] TSDB: Avoid allocations when popping from the intersected postings heap. #10092 +* [ENHANCEMENT] TSDB: Make chunk writing non-blocking, avoiding latency spikes in remote-write. #10051 +* [ENHANCEMENT] TSDB: Improve label matching performance. #9907 +* [ENHANCEMENT] UI: Optimize the service discovery page and add a search bar. #10131 +* [ENHANCEMENT] UI: Optimize the target page and add a search bar. #10103 +* [BUGFIX] Promtool: Make exit codes more consistent. #9861 +* [BUGFIX] Promtool: Fix flakiness of rule testing. #8818 +* [BUGFIX] Remote-write: Update `prometheus_remote_storage_queue_highest_sent_timestamp_seconds` metric when write irrecoverably fails. #10102 +* [BUGFIX] Storage: Avoid panic in `BufferedSeriesIterator`. #9945 +* [BUGFIX] TSDB: CompactBlockMetas should produce correct mint/maxt for overlapping blocks. #10108 +* [BUGFIX] TSDB: Fix logging of exemplar storage size. #9938 +* [BUGFIX] UI: Fix overlapping click targets for the alert state checkboxes. #10136 +* [BUGFIX] UI: Fix _Unhealthy_ filter on target page to actually display only _Unhealthy_ targets. #10103 +* [BUGFIX] UI: Fix autocompletion when expression is empty. #10053 +* [BUGFIX] TSDB: Fix deadlock from simultaneous GC and write. #10166 + +## 2.32.1 / 2021-12-17 + +* [BUGFIX] Scrape: Fix reporting metrics when sample limit is reached during the report. #9996 +* [BUGFIX] Scrape: Ensure that scrape interval and scrape timeout are always set. #10023 +* [BUGFIX] TSDB: Expose and fix bug in iterators' `Seek()` method. #10030 + +## 2.32.0 / 2021-12-09 + +This release introduces the Prometheus Agent, a new mode of operation for +Prometheus optimized for remote-write only scenarios. In this mode, Prometheus +does not generate blocks on the local filesystem and is not queryable locally. +Enable with `--enable-feature=agent`. + +Learn more about the Prometheus Agent in our [blog post](https://prometheus.io/blog/2021/11/16/agent/). + +* [CHANGE] Remote-write: Change default max retry time from 100ms to 5 seconds. #9634 +* [FEATURE] Agent: New mode of operation optimized for remote-write only scenarios, without local storage. Enable with `--enable-feature=agent`. #8785 #9851 #9664 #9939 #9941 #9943 +* [FEATURE] Promtool: Add `promtool check service-discovery` command. #8970 +* [FEATURE] UI: Add search in metrics dropdown. #9629 +* [FEATURE] Templates: Add parseDuration to template functions. #8817 +* [ENHANCEMENT] Promtool: Improve test output. #8064 +* [ENHANCEMENT] Promtool: Use kahan summation for better numerical stability. #9588 +* [ENHANCEMENT] Remote-write: Reuse memory for marshalling. #9412 +* [ENHANCEMENT] Scrape: Add `scrape_body_size_bytes` scrape metric behind the `--enable-feature=extra-scrape-metrics` flag. #9569 +* [ENHANCEMENT] TSDB: Add windows arm64 support. #9703 +* [ENHANCEMENT] TSDB: Optimize query by skipping unneeded sorting in TSDB. #9673 +* [ENHANCEMENT] Templates: Support int and uint as datatypes for template formatting. #9680 +* [ENHANCEMENT] UI: Prefer `rate` over `rad`, `delta` over `deg`, and `count` over `cos` in autocomplete. #9688 +* [ENHANCEMENT] Linode SD: Tune API request page sizes. #9779 +* [BUGFIX] TSDB: Add more size checks when writing individual sections in the index. #9710 +* [BUGFIX] PromQL: Make `deriv()` return zero values for constant series. #9728 +* [BUGFIX] TSDB: Fix panic when checkpoint directory is empty. #9687 +* [BUGFIX] TSDB: Fix panic, out of order chunks, and race warning during WAL replay. #9856 +* [BUGFIX] UI: Correctly render links for targets with IPv6 addresses that contain a Zone ID. #9853 +* [BUGFIX] Promtool: Fix checking of `authorization.credentials_file` and `bearer_token_file` fields. #9883 +* [BUGFIX] Uyuni SD: Fix null pointer exception during initialization. #9924 #9950 +* [BUGFIX] TSDB: Fix queries after a failed snapshot replay. #9980 + ## 2.31.2 / 2021-12-09 * [BUGFIX] TSDB: Fix queries after a failed snapshot replay. #9980 @@ -32,6 +122,10 @@ * [BUGFIX] TSDB: Fix memory leak in samples deletion. #9151 * [BUGFIX] UI: Use consistent margin-bottom for all alert kinds. #9318 +## 2.30.4 / 2021-12-09 + +* [BUGFIX] TSDB: Fix queries after a failed snapshot replay. #9980 + ## 2.30.3 / 2021-10-05 * [BUGFIX] TSDB: Fix panic on failed snapshot replay. #9438 @@ -225,7 +319,7 @@ Alertmanager API v2 was released in Aler * [ENHANCEMENT] Mixins: Scope grafana configuration. #8332 * [ENHANCEMENT] Kubernetes SD: Add endpoint labels metadata. #8273 * [ENHANCEMENT] UI: Expose total number of label pairs in head in TSDB stats page. #8343 -* [ENHANCEMENT] TSDB: Reload blocks every minute, to detect new blocks and enforce retention more often. #8343 +* [ENHANCEMENT] TSDB: Reload blocks every minute, to detect new blocks and enforce retention more often. #8340 * [BUGFIX] API: Fix global URL when external address has no port. #8359 * [BUGFIX] Backfill: Fix error message handling. #8432 * [BUGFIX] Backfill: Fix "add sample: out of bounds" error when series span an entire block. #8476 diff -pruN 2.31.2+ds1-1/.circleci/config.yml 2.33.5+ds1-2/.circleci/config.yml --- 2.31.2+ds1-1/.circleci/config.yml 2022-01-21 00:33:16.000000000 +0000 +++ 2.33.5+ds1-2/.circleci/config.yml 2022-03-08 16:34:32.000000000 +0000 @@ -2,7 +2,7 @@ version: 2.1 orbs: - prometheus: prometheus/prometheus@0.11.0 + prometheus: prometheus/prometheus@0.15.0 go: circleci/go@1.7.0 win: circleci/windows@2.3.0 @@ -12,9 +12,9 @@ executors: golang: docker: - image: quay.io/prometheus/golang-builder:1.17-base - golang_115: + golang_oldest: docker: - - image: quay.io/prometheus/golang-builder:1.15-base + - image: quay.io/prometheus/golang-builder:1.16-base jobs: test_go: @@ -36,6 +36,7 @@ jobs: GOOPTS: "-p 2" GOMAXPROCS: "2" GO111MODULE: "on" + - run: go test ./tsdb/ -test.tsdb-isolation=false - prometheus/check_proto: version: "3.15.8" - prometheus/store_artifact: @@ -88,32 +89,26 @@ jobs: GOGC: "20" GOOPTS: "-p 2" - test_tsdb_go115: - executor: golang_115 + test_golang_oldest: + executor: golang_oldest steps: - checkout + - run: make build - run: go test ./tsdb/... + - run: go test ./tsdb/ -test.tsdb-isolation=false test_mixins: executor: golang steps: - checkout - run: go install ./cmd/promtool/. - - run: - command: go install -mod=readonly github.com/google/go-jsonnet/cmd/jsonnet github.com/google/go-jsonnet/cmd/jsonnetfmt github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb - working_directory: ~/project/documentation/prometheus-mixin - - run: - command: make clean - working_directory: ~/project/documentation/prometheus-mixin - - run: - command: jb install - working_directory: ~/project/documentation/prometheus-mixin - - run: - command: make - working_directory: ~/project/documentation/prometheus-mixin - - run: - command: git diff --exit-code - working_directory: ~/project/documentation/prometheus-mixin + - run: go install github.com/google/go-jsonnet/cmd/jsonnet@latest + - run: go install github.com/google/go-jsonnet/cmd/jsonnetfmt@latest + - run: go install github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb@latest + - run: make -C documentation/prometheus-mixin clean + - run: make -C documentation/prometheus-mixin jb_install + - run: make -C documentation/prometheus-mixin + - run: git diff --exit-code repo_sync: executor: golang @@ -134,7 +129,7 @@ workflows: filters: tags: only: /.*/ - - test_tsdb_go115: + - test_golang_oldest: filters: tags: only: /.*/ @@ -148,8 +143,19 @@ workflows: only: /.*/ - prometheus/build: name: build + parallelism: 3 + promu_opts: "-p linux/amd64 -p windows/amd64 -p linux/arm64 -p darwin/amd64 -p darwin/arm64 -p linux/386" + filters: + tags: + ignore: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/ + branches: + ignore: /^(main|release-.*|.*build-all.*)$/ + - prometheus/build: + name: build_all parallelism: 12 filters: + branches: + only: /^(main|release-.*|.*build-all.*)$/ tags: only: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/ - prometheus/publish_main: @@ -157,7 +163,7 @@ workflows: requires: - test_go - test_ui - - build + - build_all filters: branches: only: main @@ -167,7 +173,7 @@ workflows: requires: - test_go - test_ui - - build + - build_all filters: tags: only: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/ diff -pruN 2.31.2+ds1-1/cmd/prometheus/main.go 2.33.5+ds1-2/cmd/prometheus/main.go --- 2.31.2+ds1-1/cmd/prometheus/main.go 2022-01-21 00:33:16.000000000 +0000 +++ 2.33.5+ds1-2/cmd/prometheus/main.go 2022-03-08 16:34:32.000000000 +0000 @@ -60,23 +60,26 @@ import ( _ "github.com/prometheus/prometheus/discovery/install" // Register service discovery implementations. "github.com/prometheus/prometheus/discovery/legacymanager" "github.com/prometheus/prometheus/discovery/targetgroup" + "github.com/prometheus/prometheus/model/exemplar" + "github.com/prometheus/prometheus/model/labels" + "github.com/prometheus/prometheus/model/relabel" "github.com/prometheus/prometheus/notifier" - "github.com/prometheus/prometheus/pkg/exemplar" - "github.com/prometheus/prometheus/pkg/labels" - "github.com/prometheus/prometheus/pkg/logging" - "github.com/prometheus/prometheus/pkg/relabel" - prom_runtime "github.com/prometheus/prometheus/pkg/runtime" "github.com/prometheus/prometheus/promql" "github.com/prometheus/prometheus/rules" "github.com/prometheus/prometheus/scrape" "github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/storage/remote" "github.com/prometheus/prometheus/tsdb" + "github.com/prometheus/prometheus/tsdb/agent" + "github.com/prometheus/prometheus/util/logging" + prom_runtime "github.com/prometheus/prometheus/util/runtime" "github.com/prometheus/prometheus/util/strutil" "github.com/prometheus/prometheus/web" ) var ( + appName = "prometheus" + configSuccess = prometheus.NewGauge(prometheus.GaugeOpts{ Name: "prometheus_config_last_reload_successful", Help: "Whether the last configuration reload attempt was successful.", @@ -88,10 +91,13 @@ var ( defaultRetentionString = "15d" defaultRetentionDuration model.Duration + + agentMode bool + agentOnlyFlags, serverOnlyFlags []string ) func init() { - prometheus.MustRegister(version.NewCollector("prometheus")) + prometheus.MustRegister(version.NewCollector(strings.ReplaceAll(appName, "-", "_"))) var err error defaultRetentionDuration, err = model.ParseDuration(defaultRetentionString) @@ -100,10 +106,31 @@ func init() { } } +// serverOnlyFlag creates server-only kingpin flag. +func serverOnlyFlag(app *kingpin.Application, name, help string) *kingpin.FlagClause { + return app.Flag(name, fmt.Sprintf("%s Use with server mode only.", help)). + PreAction(func(parseContext *kingpin.ParseContext) error { + // This will be invoked only if flag is actually provided by user. + serverOnlyFlags = append(serverOnlyFlags, "--"+name) + return nil + }) +} + +// agentOnlyFlag creates agent-only kingpin flag. +func agentOnlyFlag(app *kingpin.Application, name, help string) *kingpin.FlagClause { + return app.Flag(name, fmt.Sprintf("%s Use with agent mode only.", help)). + PreAction(func(parseContext *kingpin.ParseContext) error { + // This will be invoked only if flag is actually provided by user. + agentOnlyFlags = append(agentOnlyFlags, "--"+name) + return nil + }) +} + type flagConfig struct { configFile string - localStoragePath string + agentStoragePath string + serverStoragePath string notifier notifier.Options forGracePeriod model.Duration outageTolerance model.Duration @@ -111,6 +138,7 @@ type flagConfig struct { web web.Options scrape scrape.Options tsdb tsdbOptions + agent agentOptions lookbackDelta model.Duration webTimeout model.Duration queryTimeout model.Duration @@ -121,8 +149,6 @@ type flagConfig struct { featureList []string // These options are extracted from featureList // for ease of use. - enablePromQLAtModifier bool - enablePromQLNegativeOffset bool enableExpandExternalLabels bool enableNewSDManager bool @@ -138,15 +164,9 @@ func (c *flagConfig) setFeatureListOptio opts := strings.Split(f, ",") for _, o := range opts { switch o { - case "promql-at-modifier": - c.enablePromQLAtModifier = true - level.Info(logger).Log("msg", "Experimental promql-at-modifier enabled") - case "promql-negative-offset": - c.enablePromQLNegativeOffset = true - level.Info(logger).Log("msg", "Experimental promql-negative-offset enabled") case "remote-write-receiver": - c.web.RemoteWriteReceiver = true - level.Info(logger).Log("msg", "Experimental remote-write-receiver enabled") + c.web.EnableRemoteWriteReceiver = true + level.Warn(logger).Log("msg", "Remote write receiver enabled via feature flag remote-write-receiver. This is DEPRECATED. Use --web.enable-remote-write-receiver.") case "expand-external-labels": c.enableExpandExternalLabels = true level.Info(logger).Log("msg", "Experimental expand-external-labels enabled") @@ -162,8 +182,13 @@ func (c *flagConfig) setFeatureListOptio case "new-service-discovery-manager": c.enableNewSDManager = true level.Info(logger).Log("msg", "Experimental service discovery manager") + case "agent": + agentMode = true + level.Info(logger).Log("msg", "Experimental agent mode enabled.") case "": continue + case "promql-at-modifier", "promql-negative-offset": + level.Warn(logger).Log("msg", "This option for --enable-feature is now permanently enabled and therefore a no-op.", "option", o) default: level.Warn(logger).Log("msg", "Unknown option for --enable-feature", "option", o) } @@ -196,7 +221,7 @@ func main() { a := kingpin.New(filepath.Base(os.Args[0]), "The Prometheus monitoring server").UsageWriter(os.Stdout) - a.Version(version.Print("prometheus")) + a.Version(version.Print(appName)) a.HelpFlag.Short('h') @@ -232,6 +257,9 @@ func main() { a.Flag("web.enable-admin-api", "Enable API endpoints for admin control actions."). Default("false").BoolVar(&cfg.web.EnableAdminAPI) + a.Flag("web.enable-remote-write-receiver", "Enable API endpoint accepting remote write requests."). + Default("false").BoolVar(&cfg.web.EnableRemoteWriteReceiver) + a.Flag("web.console.templates", "Path to the console template directory, available at /consoles."). Default("consoles").StringVar(&cfg.web.ConsoleTemplatesPath) @@ -244,61 +272,86 @@ func main() { a.Flag("web.cors.origin", `Regex for CORS origin. It is fully anchored. Example: 'https?://(domain1|domain2)\.com'`). Default(".*").StringVar(&cfg.corsRegexString) - a.Flag("storage.tsdb.path", "Base path for metrics storage."). - Default("data/").StringVar(&cfg.localStoragePath) + serverOnlyFlag(a, "storage.tsdb.path", "Base path for metrics storage."). + Default("data/").StringVar(&cfg.serverStoragePath) - a.Flag("storage.tsdb.min-block-duration", "Minimum duration of a data block before being persisted. For use in testing."). + serverOnlyFlag(a, "storage.tsdb.min-block-duration", "Minimum duration of a data block before being persisted. For use in testing."). Hidden().Default("2h").SetValue(&cfg.tsdb.MinBlockDuration) - a.Flag("storage.tsdb.max-block-duration", + serverOnlyFlag(a, "storage.tsdb.max-block-duration", "Maximum duration compacted blocks may span. For use in testing. (Defaults to 10% of the retention period.)"). Hidden().PlaceHolder("").SetValue(&cfg.tsdb.MaxBlockDuration) - a.Flag("storage.tsdb.max-block-chunk-segment-size", + serverOnlyFlag(a, "storage.tsdb.max-block-chunk-segment-size", "The maximum size for a single chunk segment in a block. Example: 512MB"). Hidden().PlaceHolder("").BytesVar(&cfg.tsdb.MaxBlockChunkSegmentSize) - a.Flag("storage.tsdb.wal-segment-size", + serverOnlyFlag(a, "storage.tsdb.wal-segment-size", "Size at which to split the tsdb WAL segment files. Example: 100MB"). Hidden().PlaceHolder("").BytesVar(&cfg.tsdb.WALSegmentSize) - a.Flag("storage.tsdb.retention", "[DEPRECATED] How long to retain samples in storage. This flag has been deprecated, use \"storage.tsdb.retention.time\" instead."). + serverOnlyFlag(a, "storage.tsdb.retention", "[DEPRECATED] How long to retain samples in storage. This flag has been deprecated, use \"storage.tsdb.retention.time\" instead."). SetValue(&oldFlagRetentionDuration) - a.Flag("storage.tsdb.retention.time", "How long to retain samples in storage. When this flag is set it overrides \"storage.tsdb.retention\". If neither this flag nor \"storage.tsdb.retention\" nor \"storage.tsdb.retention.size\" is set, the retention time defaults to "+defaultRetentionString+". Units Supported: y, w, d, h, m, s, ms."). + serverOnlyFlag(a, "storage.tsdb.retention.time", "How long to retain samples in storage. When this flag is set it overrides \"storage.tsdb.retention\". If neither this flag nor \"storage.tsdb.retention\" nor \"storage.tsdb.retention.size\" is set, the retention time defaults to "+defaultRetentionString+". Units Supported: y, w, d, h, m, s, ms."). SetValue(&newFlagRetentionDuration) - a.Flag("storage.tsdb.retention.size", "Maximum number of bytes that can be stored for blocks. A unit is required, supported units: B, KB, MB, GB, TB, PB, EB. Ex: \"512MB\"."). + serverOnlyFlag(a, "storage.tsdb.retention.size", "Maximum number of bytes that can be stored for blocks. A unit is required, supported units: B, KB, MB, GB, TB, PB, EB. Ex: \"512MB\"."). BytesVar(&cfg.tsdb.MaxBytes) - a.Flag("storage.tsdb.no-lockfile", "Do not create lockfile in data directory."). + serverOnlyFlag(a, "storage.tsdb.no-lockfile", "Do not create lockfile in data directory."). Default("false").BoolVar(&cfg.tsdb.NoLockfile) - a.Flag("storage.tsdb.allow-overlapping-blocks", "Allow overlapping blocks, which in turn enables vertical compaction and vertical query merge."). + serverOnlyFlag(a, "storage.tsdb.allow-overlapping-blocks", "Allow overlapping blocks, which in turn enables vertical compaction and vertical query merge."). Default("false").BoolVar(&cfg.tsdb.AllowOverlappingBlocks) - a.Flag("storage.tsdb.wal-compression", "Compress the tsdb WAL."). + serverOnlyFlag(a, "storage.tsdb.wal-compression", "Compress the tsdb WAL."). Hidden().Default("true").BoolVar(&cfg.tsdb.WALCompression) + agentOnlyFlag(a, "storage.agent.path", "Base path for metrics storage."). + Default("data-agent/").StringVar(&cfg.agentStoragePath) + + agentOnlyFlag(a, "storage.agent.wal-segment-size", + "Size at which to split WAL segment files. Example: 100MB"). + Hidden().PlaceHolder("").BytesVar(&cfg.agent.WALSegmentSize) + + agentOnlyFlag(a, "storage.agent.wal-compression", "Compress the agent WAL."). + Default("true").BoolVar(&cfg.agent.WALCompression) + + agentOnlyFlag(a, "storage.agent.wal-truncate-frequency", + "The frequency at which to truncate the WAL and remove old data."). + Hidden().PlaceHolder("").SetValue(&cfg.agent.TruncateFrequency) + + agentOnlyFlag(a, "storage.agent.retention.min-time", + "Minimum age samples may be before being considered for deletion when the WAL is truncated"). + SetValue(&cfg.agent.MinWALTime) + + agentOnlyFlag(a, "storage.agent.retention.max-time", + "Maximum age samples may be before being forcibly deleted when the WAL is truncated"). + SetValue(&cfg.agent.MaxWALTime) + + agentOnlyFlag(a, "storage.agent.no-lockfile", "Do not create lockfile in data directory."). + Default("false").BoolVar(&cfg.agent.NoLockfile) + a.Flag("storage.remote.flush-deadline", "How long to wait flushing sample on shutdown or config reload."). Default("1m").PlaceHolder("").SetValue(&cfg.RemoteFlushDeadline) - a.Flag("storage.remote.read-sample-limit", "Maximum overall number of samples to return via the remote read interface, in a single query. 0 means no limit. This limit is ignored for streamed response types."). + serverOnlyFlag(a, "storage.remote.read-sample-limit", "Maximum overall number of samples to return via the remote read interface, in a single query. 0 means no limit. This limit is ignored for streamed response types."). Default("5e7").IntVar(&cfg.web.RemoteReadSampleLimit) - a.Flag("storage.remote.read-concurrent-limit", "Maximum number of concurrent remote read calls. 0 means no limit."). + serverOnlyFlag(a, "storage.remote.read-concurrent-limit", "Maximum number of concurrent remote read calls. 0 means no limit."). Default("10").IntVar(&cfg.web.RemoteReadConcurrencyLimit) - a.Flag("storage.remote.read-max-bytes-in-frame", "Maximum number of bytes in a single frame for streaming remote read response types before marshalling. Note that client might have limit on frame size as well. 1MB as recommended by protobuf by default."). + serverOnlyFlag(a, "storage.remote.read-max-bytes-in-frame", "Maximum number of bytes in a single frame for streaming remote read response types before marshalling. Note that client might have limit on frame size as well. 1MB as recommended by protobuf by default."). Default("1048576").IntVar(&cfg.web.RemoteReadBytesInFrame) - a.Flag("rules.alert.for-outage-tolerance", "Max time to tolerate prometheus outage for restoring \"for\" state of alert."). + serverOnlyFlag(a, "rules.alert.for-outage-tolerance", "Max time to tolerate prometheus outage for restoring \"for\" state of alert."). Default("1h").SetValue(&cfg.outageTolerance) - a.Flag("rules.alert.for-grace-period", "Minimum duration between alert and restored \"for\" state. This is maintained only for alerts with configured \"for\" time greater than grace period."). + serverOnlyFlag(a, "rules.alert.for-grace-period", "Minimum duration between alert and restored \"for\" state. This is maintained only for alerts with configured \"for\" time greater than grace period."). Default("10m").SetValue(&cfg.forGracePeriod) - a.Flag("rules.alert.resend-delay", "Minimum amount of time to wait before resending an alert to Alertmanager."). + serverOnlyFlag(a, "rules.alert.resend-delay", "Minimum amount of time to wait before resending an alert to Alertmanager."). Default("1m").SetValue(&cfg.resendDelay) a.Flag("scrape.adjust-timestamps", "Adjust scrape timestamps by up to `scrape.timestamp-tolerance` to align them to the intended schedule. See https://github.com/prometheus/prometheus/issues/7846 for more context. Experimental. This flag will be removed in a future release."). @@ -307,25 +360,25 @@ func main() { a.Flag("scrape.timestamp-tolerance", "Timestamp tolerance. See https://github.com/prometheus/prometheus/issues/7846 for more context. Experimental. This flag will be removed in a future release."). Hidden().Default("2ms").DurationVar(&scrape.ScrapeTimestampTolerance) - a.Flag("alertmanager.notification-queue-capacity", "The capacity of the queue for pending Alertmanager notifications."). + serverOnlyFlag(a, "alertmanager.notification-queue-capacity", "The capacity of the queue for pending Alertmanager notifications."). Default("10000").IntVar(&cfg.notifier.QueueCapacity) // TODO: Remove in Prometheus 3.0. alertmanagerTimeout := a.Flag("alertmanager.timeout", "[DEPRECATED] This flag has no effect.").Hidden().String() - a.Flag("query.lookback-delta", "The maximum lookback duration for retrieving metrics during expression evaluations and federation."). + serverOnlyFlag(a, "query.lookback-delta", "The maximum lookback duration for retrieving metrics during expression evaluations and federation."). Default("5m").SetValue(&cfg.lookbackDelta) - a.Flag("query.timeout", "Maximum time a query may take before being aborted."). + serverOnlyFlag(a, "query.timeout", "Maximum time a query may take before being aborted."). Default("2m").SetValue(&cfg.queryTimeout) - a.Flag("query.max-concurrency", "Maximum number of queries executed concurrently."). + serverOnlyFlag(a, "query.max-concurrency", "Maximum number of queries executed concurrently."). Default("20").IntVar(&cfg.queryConcurrency) - a.Flag("query.max-samples", "Maximum number of samples a single query can load into memory. Note that queries will fail if they try to load more samples than this into memory, so this also limits the number of samples a query can return."). + serverOnlyFlag(a, "query.max-samples", "Maximum number of samples a single query can load into memory. Note that queries will fail if they try to load more samples than this into memory, so this also limits the number of samples a query can return."). Default("50000000").IntVar(&cfg.queryMaxSamples) - a.Flag("enable-feature", "Comma separated feature names to enable. Valid options: exemplar-storage, expand-external-labels, memory-snapshot-on-shutdown, promql-at-modifier, promql-negative-offset, remote-write-receiver, extra-scrape-metrics, new-service-discovery-manager. See https://prometheus.io/docs/prometheus/latest/feature_flags/ for more details."). + a.Flag("enable-feature", "Comma separated feature names to enable. Valid options: agent, exemplar-storage, expand-external-labels, memory-snapshot-on-shutdown, promql-at-modifier, promql-negative-offset, remote-write-receiver (DEPRECATED), extra-scrape-metrics, new-service-discovery-manager. See https://prometheus.io/docs/prometheus/latest/feature_flags/ for more details."). Default("").StringsVar(&cfg.featureList) promlogflag.AddFlags(a, &cfg.promlogConfig) @@ -344,6 +397,21 @@ func main() { os.Exit(1) } + if agentMode && len(serverOnlyFlags) > 0 { + fmt.Fprintf(os.Stderr, "The following flag(s) can not be used in agent mode: %q", serverOnlyFlags) + os.Exit(3) + } + + if !agentMode && len(agentOnlyFlags) > 0 { + fmt.Fprintf(os.Stderr, "The following flag(s) can only be used in agent mode: %q", agentOnlyFlags) + os.Exit(3) + } + + localStoragePath := cfg.serverStoragePath + if agentMode { + localStoragePath = cfg.agentStoragePath + } + cfg.web.ExternalURL, err = computeExternalURL(cfg.prometheusURL, cfg.web.ListenAddress) if err != nil { fmt.Fprintln(os.Stderr, errors.Wrapf(err, "parse external URL %q", cfg.prometheusURL)) @@ -362,7 +430,7 @@ func main() { // Throw error for invalid config before starting other components. var cfgFile *config.Config - if cfgFile, err = config.LoadFile(cfg.configFile, false, log.NewNopLogger()); err != nil { + if cfgFile, err = config.LoadFile(cfg.configFile, agentMode, false, log.NewNopLogger()); err != nil { level.Error(logger).Log("msg", fmt.Sprintf("Error loading config (--config.file=%s)", cfg.configFile), "err", err) os.Exit(2) } @@ -390,7 +458,8 @@ func main() { // RoutePrefix must always be at least '/'. cfg.web.RoutePrefix = "/" + strings.Trim(cfg.web.RoutePrefix, "/") - { // Time retention settings. + if !agentMode { + // Time retention settings. if oldFlagRetentionDuration != 0 { level.Warn(logger).Log("deprecation_notice", "'storage.tsdb.retention' flag is deprecated use 'storage.tsdb.retention.time' instead.") cfg.tsdb.RetentionDuration = oldFlagRetentionDuration @@ -415,9 +484,8 @@ func main() { cfg.tsdb.RetentionDuration = y level.Warn(logger).Log("msg", "Time retention value is too high. Limiting to: "+y.String()) } - } - { // Max block size settings. + // Max block size settings. if cfg.tsdb.MaxBlockDuration == 0 { maxBlockDuration, err := model.ParseDuration("31d") if err != nil { @@ -454,7 +522,7 @@ func main() { var ( localStorage = &readyStorage{stats: tsdb.NewDBStats()} scraper = &readyScrapeManager{} - remoteStorage = remote.NewStorage(log.With(logger, "component", "remote"), prometheus.DefaultRegisterer, localStorage.StartTime, cfg.localStoragePath, time.Duration(cfg.RemoteFlushDeadline), scraper) + remoteStorage = remote.NewStorage(log.With(logger, "component", "remote"), prometheus.DefaultRegisterer, localStorage.StartTime, localStoragePath, time.Duration(cfg.RemoteFlushDeadline), scraper) fanoutStorage = storage.NewFanout(logger, localStorage, remoteStorage) ) @@ -483,16 +551,23 @@ func main() { var ( scrapeManager = scrape.NewManager(&cfg.scrape, log.With(logger, "component", "scrape manager"), fanoutStorage) - opts = promql.EngineOpts{ + queryEngine *promql.Engine + ruleManager *rules.Manager + ) + + if !agentMode { + opts := promql.EngineOpts{ Logger: log.With(logger, "component", "query engine"), Reg: prometheus.DefaultRegisterer, MaxSamples: cfg.queryMaxSamples, Timeout: time.Duration(cfg.queryTimeout), - ActiveQueryTracker: promql.NewActiveQueryTracker(cfg.localStoragePath, cfg.queryConcurrency, log.With(logger, "component", "activeQueryTracker")), + ActiveQueryTracker: promql.NewActiveQueryTracker(localStoragePath, cfg.queryConcurrency, log.With(logger, "component", "activeQueryTracker")), LookbackDelta: time.Duration(cfg.lookbackDelta), NoStepSubqueryIntervalFn: noStepSubqueryInterval.Get, - EnableAtModifier: cfg.enablePromQLAtModifier, - EnableNegativeOffset: cfg.enablePromQLNegativeOffset, + // EnableAtModifier and EnableNegativeOffset have to be + // always on for regular PromQL as of Prometheus v2.33. + EnableAtModifier: true, + EnableNegativeOffset: true, } queryEngine = promql.NewEngine(opts) @@ -510,14 +585,14 @@ func main() { ForGracePeriod: time.Duration(cfg.forGracePeriod), ResendDelay: time.Duration(cfg.resendDelay), }) - ) + } scraper.Set(scrapeManager) cfg.web.Context = ctxWeb cfg.web.TSDBRetentionDuration = cfg.tsdb.RetentionDuration cfg.web.TSDBMaxBytes = cfg.tsdb.MaxBytes - cfg.web.TSDBDir = cfg.localStoragePath + cfg.web.TSDBDir = localStoragePath cfg.web.LocalStorage = localStorage cfg.web.Storage = fanoutStorage cfg.web.ExemplarStorage = localStorage @@ -526,6 +601,7 @@ func main() { cfg.web.RuleManager = ruleManager cfg.web.Notifier = notifierManager cfg.web.LookbackDelta = time.Duration(cfg.lookbackDelta) + cfg.web.IsAgent = agentMode cfg.web.Version = &web.PrometheusVersion{ Version: version.Version, @@ -557,7 +633,7 @@ func main() { ) // This is passed to ruleManager.Update(). - var externalURL = cfg.web.ExternalURL.String() + externalURL := cfg.web.ExternalURL.String() reloaders := []reloader{ { @@ -572,6 +648,11 @@ func main() { }, { name: "query_engine", reloader: func(cfg *config.Config) error { + if agentMode { + // No-op in Agent mode. + return nil + } + if cfg.GlobalConfig.QueryLogFile == "" { queryEngine.SetQueryLogger(nil) return nil @@ -613,6 +694,11 @@ func main() { }, { name: "rules", reloader: func(cfg *config.Config) error { + if agentMode { + // No-op in Agent mode + return nil + } + // Get all rule files matching the configuration paths. var files []string for _, pat := range cfg.RuleFiles { @@ -779,7 +865,6 @@ func main() { return nil } } - }, func(err error) { // Wait for any in-progress reloads to complete to avoid @@ -817,7 +902,7 @@ func main() { }, ) } - { + if !agentMode { // Rule manager. g.Add( func() error { @@ -829,8 +914,7 @@ func main() { ruleManager.Stop() }, ) - } - { + // TSDB. opts := cfg.tsdb.ToTSDBOptions() cancel := make(chan struct{}) @@ -848,18 +932,12 @@ func main() { } } - db, err := openDBWithMetrics( - cfg.localStoragePath, - logger, - prometheus.DefaultRegisterer, - &opts, - localStorage.getStats(), - ) + db, err := openDBWithMetrics(localStoragePath, logger, prometheus.DefaultRegisterer, &opts, localStorage.getStats()) if err != nil { return errors.Wrapf(err, "opening storage failed") } - switch fsType := prom_runtime.Statfs(cfg.localStoragePath); fsType { + switch fsType := prom_runtime.Statfs(localStoragePath); fsType { case "NFS_SUPER_MAGIC": level.Warn(logger).Log("fs_type", fsType, "msg", "This filesystem is not supported and may lead to data corruption and data loss. Please carefully read https://prometheus.io/docs/prometheus/latest/storage/ to learn more about supported filesystems.") default: @@ -892,6 +970,59 @@ func main() { }, ) } + if agentMode { + // WAL storage. + opts := cfg.agent.ToAgentOptions() + cancel := make(chan struct{}) + g.Add( + func() error { + level.Info(logger).Log("msg", "Starting WAL storage ...") + if cfg.agent.WALSegmentSize != 0 { + if cfg.agent.WALSegmentSize < 10*1024*1024 || cfg.agent.WALSegmentSize > 256*1024*1024 { + return errors.New("flag 'storage.agent.wal-segment-size' must be set between 10MB and 256MB") + } + } + db, err := agent.Open( + logger, + prometheus.DefaultRegisterer, + remoteStorage, + localStoragePath, + &opts, + ) + if err != nil { + return errors.Wrap(err, "opening storage failed") + } + + switch fsType := prom_runtime.Statfs(localStoragePath); fsType { + case "NFS_SUPER_MAGIC": + level.Warn(logger).Log("fs_type", fsType, "msg", "This filesystem is not supported and may lead to data corruption and data loss. Please carefully read https://prometheus.io/docs/prometheus/latest/storage/ to learn more about supported filesystems.") + default: + level.Info(logger).Log("fs_type", fsType) + } + + level.Info(logger).Log("msg", "Agent WAL storage started") + level.Debug(logger).Log("msg", "Agent WAL storage options", + "WALSegmentSize", cfg.agent.WALSegmentSize, + "WALCompression", cfg.agent.WALCompression, + "StripeSize", cfg.agent.StripeSize, + "TruncateFrequency", cfg.agent.TruncateFrequency, + "MinWALTime", cfg.agent.MinWALTime, + "MaxWALTime", cfg.agent.MaxWALTime, + ) + + localStorage.Set(db, 0) + close(dbOpen) + <-cancel + return nil + }, + func(e error) { + if err := fanoutStorage.Close(); err != nil { + level.Error(logger).Log("msg", "Error stopping storage", "err", err) + } + close(cancel) + }, + ) + } { // Web handler. g.Add( @@ -977,6 +1108,7 @@ type safePromQLNoStepSubqueryInterval st func durationToInt64Millis(d time.Duration) int64 { return int64(d / time.Millisecond) } + func (i *safePromQLNoStepSubqueryInterval) Set(ev model.Duration) { i.value.Store(durationToInt64Millis(time.Duration(ev))) } @@ -990,7 +1122,7 @@ type reloader struct { reloader func(*config.Config) error } -func reloadConfig(filename string, expandExternalLabels bool, enableExemplarStorage bool, logger log.Logger, noStepSuqueryInterval *safePromQLNoStepSubqueryInterval, rls ...reloader) (err error) { +func reloadConfig(filename string, expandExternalLabels, enableExemplarStorage bool, logger log.Logger, noStepSuqueryInterval *safePromQLNoStepSubqueryInterval, rls ...reloader) (err error) { start := time.Now() timings := []interface{}{} level.Info(logger).Log("msg", "Loading configuration file", "filename", filename) @@ -1004,7 +1136,7 @@ func reloadConfig(filename string, expan } }() - conf, err := config.LoadFile(filename, expandExternalLabels, logger) + conf, err := config.LoadFile(filename, agentMode, expandExternalLabels, logger) if err != nil { return errors.Wrapf(err, "couldn't load configuration (--config.file=%q)", filename) } @@ -1115,18 +1247,21 @@ func sendAlerts(s sender, externalURL st // storage at a later point in time. type readyStorage struct { mtx sync.RWMutex - db *tsdb.DB + db storage.Storage startTimeMargin int64 stats *tsdb.DBStats } func (s *readyStorage) ApplyConfig(conf *config.Config) error { db := s.get() - return db.ApplyConfig(conf) + if db, ok := db.(*tsdb.DB); ok { + return db.ApplyConfig(conf) + } + return nil } // Set the storage. -func (s *readyStorage) Set(db *tsdb.DB, startTimeMargin int64) { +func (s *readyStorage) Set(db storage.Storage, startTimeMargin int64) { s.mtx.Lock() defer s.mtx.Unlock() @@ -1134,7 +1269,7 @@ func (s *readyStorage) Set(db *tsdb.DB, s.startTimeMargin = startTimeMargin } -func (s *readyStorage) get() *tsdb.DB { +func (s *readyStorage) get() storage.Storage { s.mtx.RLock() x := s.db s.mtx.RUnlock() @@ -1151,15 +1286,21 @@ func (s *readyStorage) getStats() *tsdb. // StartTime implements the Storage interface. func (s *readyStorage) StartTime() (int64, error) { if x := s.get(); x != nil { - var startTime int64 - - if len(x.Blocks()) > 0 { - startTime = x.Blocks()[0].Meta().MinTime - } else { - startTime = time.Now().Unix() * 1000 + switch db := x.(type) { + case *tsdb.DB: + var startTime int64 + if len(db.Blocks()) > 0 { + startTime = db.Blocks()[0].Meta().MinTime + } else { + startTime = time.Now().Unix() * 1000 + } + // Add a safety margin as it may take a few minutes for everything to spin up. + return startTime + s.startTimeMargin, nil + case *agent.DB: + return db.StartTime() + default: + panic(fmt.Sprintf("unknown storage type %T", db)) } - // Add a safety margin as it may take a few minutes for everything to spin up. - return startTime + s.startTimeMargin, nil } return math.MaxInt64, tsdb.ErrNotReady @@ -1183,7 +1324,14 @@ func (s *readyStorage) ChunkQuerier(ctx func (s *readyStorage) ExemplarQuerier(ctx context.Context) (storage.ExemplarQuerier, error) { if x := s.get(); x != nil { - return x.ExemplarQuerier(ctx) + switch db := x.(type) { + case *tsdb.DB: + return db.ExemplarQuerier(ctx) + case *agent.DB: + return nil, agent.ErrUnsupported + default: + panic(fmt.Sprintf("unknown storage type %T", db)) + } } return nil, tsdb.ErrNotReady } @@ -1198,11 +1346,11 @@ func (s *readyStorage) Appender(ctx cont type notReadyAppender struct{} -func (n notReadyAppender) Append(ref uint64, l labels.Labels, t int64, v float64) (uint64, error) { +func (n notReadyAppender) Append(ref storage.SeriesRef, l labels.Labels, t int64, v float64) (storage.SeriesRef, error) { return 0, tsdb.ErrNotReady } -func (n notReadyAppender) AppendExemplar(ref uint64, l labels.Labels, e exemplar.Exemplar) (uint64, error) { +func (n notReadyAppender) AppendExemplar(ref storage.SeriesRef, l labels.Labels, e exemplar.Exemplar) (storage.SeriesRef, error) { return 0, tsdb.ErrNotReady } @@ -1221,7 +1369,14 @@ func (s *readyStorage) Close() error { // CleanTombstones implements the api_v1.TSDBAdminStats and api_v2.TSDBAdmin interfaces. func (s *readyStorage) CleanTombstones() error { if x := s.get(); x != nil { - return x.CleanTombstones() + switch db := x.(type) { + case *tsdb.DB: + return db.CleanTombstones() + case *agent.DB: + return agent.ErrUnsupported + default: + panic(fmt.Sprintf("unknown storage type %T", db)) + } } return tsdb.ErrNotReady } @@ -1229,7 +1384,14 @@ func (s *readyStorage) CleanTombstones() // Delete implements the api_v1.TSDBAdminStats and api_v2.TSDBAdmin interfaces. func (s *readyStorage) Delete(mint, maxt int64, ms ...*labels.Matcher) error { if x := s.get(); x != nil { - return x.Delete(mint, maxt, ms...) + switch db := x.(type) { + case *tsdb.DB: + return db.Delete(mint, maxt, ms...) + case *agent.DB: + return agent.ErrUnsupported + default: + panic(fmt.Sprintf("unknown storage type %T", db)) + } } return tsdb.ErrNotReady } @@ -1237,7 +1399,14 @@ func (s *readyStorage) Delete(mint, maxt // Snapshot implements the api_v1.TSDBAdminStats and api_v2.TSDBAdmin interfaces. func (s *readyStorage) Snapshot(dir string, withHead bool) error { if x := s.get(); x != nil { - return x.Snapshot(dir, withHead) + switch db := x.(type) { + case *tsdb.DB: + return db.Snapshot(dir, withHead) + case *agent.DB: + return agent.ErrUnsupported + default: + panic(fmt.Sprintf("unknown storage type %T", db)) + } } return tsdb.ErrNotReady } @@ -1245,7 +1414,14 @@ func (s *readyStorage) Snapshot(dir stri // Stats implements the api_v1.TSDBAdminStats interface. func (s *readyStorage) Stats(statsByLabelName string) (*tsdb.Stats, error) { if x := s.get(); x != nil { - return x.Head().Stats(statsByLabelName), nil + switch db := x.(type) { + case *tsdb.DB: + return db.Head().Stats(statsByLabelName), nil + case *agent.DB: + return nil, agent.ErrUnsupported + default: + panic(fmt.Sprintf("unknown storage type %T", db)) + } } return nil, tsdb.ErrNotReady } @@ -1323,6 +1499,29 @@ func (opts tsdbOptions) ToTSDBOptions() } } +// agentOptions is a version of agent.Options with defined units. This is required +// as agent.Option fields are unit agnostic (time). +type agentOptions struct { + WALSegmentSize units.Base2Bytes + WALCompression bool + StripeSize int + TruncateFrequency model.Duration + MinWALTime, MaxWALTime model.Duration + NoLockfile bool +} + +func (opts agentOptions) ToAgentOptions() agent.Options { + return agent.Options{ + WALSegmentSize: int(opts.WALSegmentSize), + WALCompression: opts.WALCompression, + StripeSize: opts.StripeSize, + TruncateFrequency: time.Duration(opts.TruncateFrequency), + MinWALTime: durationToInt64Millis(time.Duration(opts.MinWALTime)), + MaxWALTime: durationToInt64Millis(time.Duration(opts.MaxWALTime)), + NoLockfile: opts.NoLockfile, + } +} + func initTracing(logger log.Logger) (io.Closer, error) { // Set tracing configuration defaults. cfg := &jcfg.Configuration{ diff -pruN 2.31.2+ds1-1/cmd/prometheus/main_test.go 2.33.5+ds1-2/cmd/prometheus/main_test.go --- 2.31.2+ds1-1/cmd/prometheus/main_test.go 2022-01-21 00:33:16.000000000 +0000 +++ 2.33.5+ds1-2/cmd/prometheus/main_test.go 2022-03-08 16:34:32.000000000 +0000 @@ -14,6 +14,7 @@ package main import ( + "bytes" "context" "fmt" "io/ioutil" @@ -21,6 +22,7 @@ import ( "os" "os/exec" "path/filepath" + "strings" "syscall" "testing" "time" @@ -30,14 +32,16 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" + "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/notifier" - "github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/rules" ) -var promPath = os.Args[0] -var promConfig = filepath.Join("..", "..", "documentation", "examples", "prometheus.yml") -var promData = filepath.Join(os.TempDir(), "data") +var ( + promPath = os.Args[0] + promConfig = filepath.Join("..", "..", "documentation", "examples", "prometheus.yml") + agentConfig = filepath.Join("..", "..", "documentation", "examples", "prometheus-agent.yml") +) func TestMain(m *testing.M) { for i, arg := range os.Args { @@ -52,7 +56,6 @@ func TestMain(m *testing.M) { os.Setenv("no_proxy", "localhost,127.0.0.1,0.0.0.0,:") exitCode := m.Run() - os.RemoveAll(promData) os.Exit(exitCode) } @@ -202,7 +205,7 @@ func TestWALSegmentSizeBounds(t *testing } for size, expectedExitStatus := range map[string]int{"9MB": 1, "257MB": 1, "10": 2, "1GB": 1, "12MB": 0} { - prom := exec.Command(promPath, "-test.main", "--storage.tsdb.wal-segment-size="+size, "--web.listen-address=0.0.0.0:0", "--config.file="+promConfig) + prom := exec.Command(promPath, "-test.main", "--storage.tsdb.wal-segment-size="+size, "--web.listen-address=0.0.0.0:0", "--config.file="+promConfig, "--storage.tsdb.path="+filepath.Join(t.TempDir(), "data")) // Log stderr in case of failure. stderr, err := prom.StderrPipe() @@ -223,6 +226,7 @@ func TestWALSegmentSizeBounds(t *testing t.Errorf("prometheus should be still running: %v", err) case <-time.After(5 * time.Second): prom.Process.Kill() + <-done } continue } @@ -239,12 +243,14 @@ func TestWALSegmentSizeBounds(t *testing } func TestMaxBlockChunkSegmentSizeBounds(t *testing.T) { + t.Parallel() + if testing.Short() { t.Skip("skipping test in short mode.") } for size, expectedExitStatus := range map[string]int{"512KB": 1, "1MB": 0} { - prom := exec.Command(promPath, "-test.main", "--storage.tsdb.max-block-chunk-segment-size="+size, "--web.listen-address=0.0.0.0:0", "--config.file="+promConfig) + prom := exec.Command(promPath, "-test.main", "--storage.tsdb.max-block-chunk-segment-size="+size, "--web.listen-address=0.0.0.0:0", "--config.file="+promConfig, "--storage.tsdb.path="+filepath.Join(t.TempDir(), "data")) // Log stderr in case of failure. stderr, err := prom.StderrPipe() @@ -265,6 +271,7 @@ func TestMaxBlockChunkSegmentSizeBounds( t.Errorf("prometheus should be still running: %v", err) case <-time.After(5 * time.Second): prom.Process.Kill() + <-done } continue } @@ -281,12 +288,7 @@ func TestMaxBlockChunkSegmentSizeBounds( } func TestTimeMetrics(t *testing.T) { - tmpDir, err := ioutil.TempDir("", "time_metrics_e2e") - require.NoError(t, err) - - defer func() { - require.NoError(t, os.RemoveAll(tmpDir)) - }() + tmpDir := t.TempDir() reg := prometheus.NewRegistry() db, err := openDBWithMetrics(tmpDir, log.NewNopLogger(), reg, nil, nil) @@ -347,3 +349,130 @@ func getCurrentGaugeValuesFor(t *testing } return res } + +func TestAgentSuccessfulStartup(t *testing.T) { + prom := exec.Command(promPath, "-test.main", "--enable-feature=agent", "--config.file="+agentConfig) + require.NoError(t, prom.Start()) + + actualExitStatus := 0 + done := make(chan error, 1) + + go func() { done <- prom.Wait() }() + select { + case err := <-done: + t.Logf("prometheus agent should be still running: %v", err) + actualExitStatus = prom.ProcessState.ExitCode() + case <-time.After(5 * time.Second): + prom.Process.Kill() + } + require.Equal(t, 0, actualExitStatus) +} + +func TestAgentFailedStartupWithServerFlag(t *testing.T) { + prom := exec.Command(promPath, "-test.main", "--enable-feature=agent", "--storage.tsdb.path=.", "--config.file="+promConfig) + + output := bytes.Buffer{} + prom.Stderr = &output + require.NoError(t, prom.Start()) + + actualExitStatus := 0 + done := make(chan error, 1) + + go func() { done <- prom.Wait() }() + select { + case err := <-done: + t.Logf("prometheus agent should not be running: %v", err) + actualExitStatus = prom.ProcessState.ExitCode() + case <-time.After(5 * time.Second): + prom.Process.Kill() + } + + require.Equal(t, 3, actualExitStatus) + + // Assert on last line. + lines := strings.Split(output.String(), "\n") + last := lines[len(lines)-1] + require.Equal(t, "The following flag(s) can not be used in agent mode: [\"--storage.tsdb.path\"]", last) +} + +func TestAgentFailedStartupWithInvalidConfig(t *testing.T) { + prom := exec.Command(promPath, "-test.main", "--enable-feature=agent", "--config.file="+promConfig) + require.NoError(t, prom.Start()) + + actualExitStatus := 0 + done := make(chan error, 1) + + go func() { done <- prom.Wait() }() + select { + case err := <-done: + t.Logf("prometheus agent should not be running: %v", err) + actualExitStatus = prom.ProcessState.ExitCode() + case <-time.After(5 * time.Second): + prom.Process.Kill() + } + require.Equal(t, 2, actualExitStatus) +} + +func TestModeSpecificFlags(t *testing.T) { + if testing.Short() { + t.Skip("skipping test in short mode.") + } + + testcases := []struct { + mode string + arg string + exitStatus int + }{ + {"agent", "--storage.agent.path", 0}, + {"server", "--storage.tsdb.path", 0}, + {"server", "--storage.agent.path", 3}, + {"agent", "--storage.tsdb.path", 3}, + } + + for _, tc := range testcases { + t.Run(fmt.Sprintf("%s mode with option %s", tc.mode, tc.arg), func(t *testing.T) { + args := []string{"-test.main", tc.arg, t.TempDir()} + + if tc.mode == "agent" { + args = append(args, "--enable-feature=agent", "--config.file="+agentConfig) + } else { + args = append(args, "--config.file="+promConfig) + } + + prom := exec.Command(promPath, args...) + + // Log stderr in case of failure. + stderr, err := prom.StderrPipe() + require.NoError(t, err) + go func() { + slurp, _ := ioutil.ReadAll(stderr) + t.Log(string(slurp)) + }() + + err = prom.Start() + require.NoError(t, err) + + if tc.exitStatus == 0 { + done := make(chan error, 1) + go func() { done <- prom.Wait() }() + select { + case err := <-done: + t.Errorf("prometheus should be still running: %v", err) + case <-time.After(5 * time.Second): + prom.Process.Kill() + <-done + } + return + } + + err = prom.Wait() + require.Error(t, err) + if exitError, ok := err.(*exec.ExitError); ok { + status := exitError.Sys().(syscall.WaitStatus) + require.Equal(t, tc.exitStatus, status.ExitStatus()) + } else { + t.Errorf("unable to retrieve the exit status for prometheus: %v", err) + } + }) + } +} diff -pruN 2.31.2+ds1-1/cmd/prometheus/main_unix_test.go 2.33.5+ds1-2/cmd/prometheus/main_unix_test.go --- 2.31.2+ds1-1/cmd/prometheus/main_unix_test.go 2022-01-21 00:33:16.000000000 +0000 +++ 2.33.5+ds1-2/cmd/prometheus/main_unix_test.go 2022-03-08 16:34:32.000000000 +0000 @@ -17,11 +17,14 @@ package main import ( + "fmt" "net/http" "os" "os/exec" "testing" "time" + + "github.com/prometheus/prometheus/util/testutil" ) // As soon as prometheus starts responding to http request it should be able to @@ -31,11 +34,12 @@ func TestStartupInterrupt(t *testing.T) t.Skip("skipping test in short mode.") } - prom := exec.Command(promPath, "-test.main", "--config.file="+promConfig, "--storage.tsdb.path="+promData) + port := fmt.Sprintf(":%d", testutil.RandomUnprivilegedPort(t)) + + prom := exec.Command(promPath, "-test.main", "--config.file="+promConfig, "--storage.tsdb.path="+t.TempDir(), "--web.listen-address=0.0.0.0"+port) err := prom.Start() if err != nil { - t.Errorf("execution error: %v", err) - return + t.Fatalf("execution error: %v", err) } done := make(chan error, 1) @@ -46,11 +50,13 @@ func TestStartupInterrupt(t *testing.T) var startedOk bool var stoppedErr error + url := "http://localhost" + port + "/graph" + Loop: for x := 0; x < 10; x++ { // error=nil means prometheus has started so we can send the interrupt // signal and wait for the graceful shutdown. - if _, err := http.Get("http://localhost:9090/graph"); err == nil { + if _, err := http.Get(url); err == nil { startedOk = true prom.Process.Signal(os.Interrupt) select { @@ -64,12 +70,11 @@ Loop: } if !startedOk { - t.Errorf("prometheus didn't start in the specified timeout") - return + t.Fatal("prometheus didn't start in the specified timeout") } if err := prom.Process.Kill(); err == nil { t.Errorf("prometheus didn't shutdown gracefully after sending the Interrupt signal") } else if stoppedErr != nil && stoppedErr.Error() != "signal: interrupt" { // TODO - find a better way to detect when the process didn't exit as expected! - t.Errorf("prometheus exited with an unexpected error:%v", stoppedErr) + t.Errorf("prometheus exited with an unexpected error: %v", stoppedErr) } } diff -pruN 2.31.2+ds1-1/cmd/prometheus/query_log_test.go 2.33.5+ds1-2/cmd/prometheus/query_log_test.go --- 2.31.2+ds1-1/cmd/prometheus/query_log_test.go 2022-01-21 00:33:16.000000000 +0000 +++ 2.33.5+ds1-2/cmd/prometheus/query_log_test.go 2022-03-08 16:34:32.000000000 +0000 @@ -31,6 +31,8 @@ import ( "time" "github.com/stretchr/testify/require" + + "github.com/prometheus/prometheus/util/testutil" ) type origin int @@ -246,11 +248,7 @@ func (p *queryLogTest) run(t *testing.T) p.setQueryLog(t, "") } - dir, err := ioutil.TempDir("", "query_log_test") - require.NoError(t, err) - defer func() { - require.NoError(t, os.RemoveAll(dir)) - }() + dir := t.TempDir() params := append([]string{ "-test.main", @@ -412,7 +410,6 @@ func TestQueryLog(t *testing.T) { cwd, err := os.Getwd() require.NoError(t, err) - port := 15000 for _, host := range []string{"127.0.0.1", "[::1]"} { for _, prefix := range []string{"", "/foobar"} { for _, enabledAtStart := range []bool{true, false} { @@ -422,7 +419,7 @@ func TestQueryLog(t *testing.T) { host: host, enabledAtStart: enabledAtStart, prefix: prefix, - port: port, + port: testutil.RandomUnprivilegedPort(t), cwd: cwd, } diff -pruN 2.31.2+ds1-1/cmd/promtool/archive.go 2.33.5+ds1-2/cmd/promtool/archive.go --- 2.31.2+ds1-1/cmd/promtool/archive.go 2022-01-21 00:33:16.000000000 +0000 +++ 2.33.5+ds1-2/cmd/promtool/archive.go 2022-03-08 16:34:32.000000000 +0000 @@ -21,7 +21,7 @@ import ( "github.com/pkg/errors" ) -const filePerm = 0666 +const filePerm = 0o666 type tarGzFileWriter struct { tarWriter *tar.Writer diff -pruN 2.31.2+ds1-1/cmd/promtool/backfill.go 2.33.5+ds1-2/cmd/promtool/backfill.go --- 2.31.2+ds1-1/cmd/promtool/backfill.go 2022-01-21 00:33:16.000000000 +0000 +++ 2.33.5+ds1-2/cmd/promtool/backfill.go 2022-03-08 16:34:32.000000000 +0000 @@ -21,8 +21,9 @@ import ( "github.com/go-kit/log" "github.com/pkg/errors" - "github.com/prometheus/prometheus/pkg/labels" - "github.com/prometheus/prometheus/pkg/textparse" + + "github.com/prometheus/prometheus/model/labels" + "github.com/prometheus/prometheus/model/textparse" "github.com/prometheus/prometheus/tsdb" tsdb_errors "github.com/prometheus/prometheus/tsdb/errors" ) @@ -105,7 +106,6 @@ func createBlocks(input []byte, mint, ma // The next sample is not in this timerange, we can avoid parsing // the file for this timerange. continue - } nextSampleTs = math.MaxInt64 @@ -207,13 +207,11 @@ func createBlocks(input []byte, mint, ma return nil }() - if err != nil { return errors.Wrap(err, "process blocks") } } return nil - } func backfill(maxSamplesInAppender int, input []byte, outputDir string, humanReadable, quiet bool, maxBlockDuration time.Duration) (err error) { diff -pruN 2.31.2+ds1-1/cmd/promtool/backfill_test.go 2.33.5+ds1-2/cmd/promtool/backfill_test.go --- 2.31.2+ds1-1/cmd/promtool/backfill_test.go 2022-01-21 00:33:16.000000000 +0000 +++ 2.33.5+ds1-2/cmd/promtool/backfill_test.go 2022-03-08 16:34:32.000000000 +0000 @@ -15,17 +15,16 @@ package main import ( "context" - "io/ioutil" "math" - "os" "sort" "testing" "time" - "github.com/prometheus/prometheus/pkg/labels" + "github.com/stretchr/testify/require" + + "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/tsdb" - "github.com/stretchr/testify/require" ) type backfillSample struct { @@ -686,13 +685,9 @@ after_eof 1 2 t.Run(test.Description, func(t *testing.T) { t.Logf("Test:%s", test.Description) - outputDir, err := ioutil.TempDir("", "myDir") - require.NoError(t, err) - defer func() { - require.NoError(t, os.RemoveAll(outputDir)) - }() + outputDir := t.TempDir() - err = backfill(test.MaxSamplesInAppender, []byte(test.ToParse), outputDir, false, false, test.MaxBlockDuration) + err := backfill(test.MaxSamplesInAppender, []byte(test.ToParse), outputDir, false, false, test.MaxBlockDuration) if !test.IsOk { require.Error(t, err, test.Description) diff -pruN 2.31.2+ds1-1/cmd/promtool/debug.go 2.33.5+ds1-2/cmd/promtool/debug.go --- 2.31.2+ds1-1/cmd/promtool/debug.go 2022-01-21 00:33:16.000000000 +0000 +++ 2.33.5+ds1-2/cmd/promtool/debug.go 2022-03-08 16:34:32.000000000 +0000 @@ -57,7 +57,6 @@ func debugWrite(cfg debugWriterConfig) e return errors.Wrap(err, "error writing into the archive") } } - } if err := archiver.close(); err != nil { diff -pruN 2.31.2+ds1-1/cmd/promtool/main.go 2.33.5+ds1-2/cmd/promtool/main.go --- 2.31.2+ds1-1/cmd/promtool/main.go 2022-01-21 00:33:16.000000000 +0000 +++ 2.33.5+ds1-2/cmd/promtool/main.go 2022-03-08 16:34:32.000000000 +0000 @@ -18,6 +18,7 @@ import ( "context" "encoding/json" "fmt" + "io" "io/ioutil" "math" "net/http" @@ -27,6 +28,7 @@ import ( "sort" "strconv" "strings" + "text/tabwriter" "time" "github.com/go-kit/log" @@ -43,14 +45,27 @@ import ( "gopkg.in/alecthomas/kingpin.v2" yaml "gopkg.in/yaml.v2" + dto "github.com/prometheus/client_model/go" + "github.com/prometheus/common/expfmt" + "github.com/prometheus/prometheus/config" + "github.com/prometheus/prometheus/discovery" "github.com/prometheus/prometheus/discovery/file" _ "github.com/prometheus/prometheus/discovery/install" // Register service discovery implementations. "github.com/prometheus/prometheus/discovery/kubernetes" "github.com/prometheus/prometheus/discovery/targetgroup" - "github.com/prometheus/prometheus/pkg/labels" - "github.com/prometheus/prometheus/pkg/rulefmt" + "github.com/prometheus/prometheus/model/labels" + "github.com/prometheus/prometheus/model/rulefmt" + "github.com/prometheus/prometheus/notifier" "github.com/prometheus/prometheus/promql" + "github.com/prometheus/prometheus/scrape" +) + +const ( + successExitCode = 0 + failureExitCode = 1 + // Exit code 3 is used for "one or more lint issues detected". + lintErrExitCode = 3 ) func main() { @@ -60,11 +75,17 @@ func main() { checkCmd := app.Command("check", "Check the resources for validity.") + sdCheckCmd := checkCmd.Command("service-discovery", "Perform service discovery for the given job name and report the results, including relabeling.") + sdConfigFile := sdCheckCmd.Arg("config-file", "The prometheus config file.").Required().ExistingFile() + sdJobName := sdCheckCmd.Arg("job", "The job to run service discovery for.").Required().String() + sdTimeout := sdCheckCmd.Flag("timeout", "The time to wait for discovery results.").Default("30s").Duration() + checkConfigCmd := checkCmd.Command("config", "Check if the config files are valid or not.") configFiles := checkConfigCmd.Arg( "config-files", "The config files to check.", ).Required().ExistingFiles() + checkConfigSyntaxOnly := checkConfigCmd.Flag("syntax-only", "Only check the config file syntax, ignoring file and content validation referenced in the config").Bool() checkWebConfigCmd := checkCmd.Command("web-config", "Check if the web config files are valid or not.") webConfigFiles := checkWebConfigCmd.Arg( @@ -79,6 +100,8 @@ func main() { ).Required().ExistingFiles() checkMetricsCmd := checkCmd.Command("metrics", checkMetricsUsage) + checkMetricsExtended := checkCmd.Flag("extended", "Print extended information related to the cardinality of the metrics.").Bool() + agentMode := checkConfigCmd.Flag("agent", "Check config file for Prometheus in Agent mode.").Bool() queryCmd := app.Command("query", "Run query against a Prometheus server.") queryCmdFmt := queryCmd.Flag("format", "Output format of the query.").Short('o').Default("promql").Enum("promql", "json") @@ -180,17 +203,14 @@ func main() { p = &promqlPrinter{} } - var queryOpts promql.LazyLoaderOpts for _, f := range *featureList { opts := strings.Split(f, ",") for _, o := range opts { switch o { - case "promql-at-modifier": - queryOpts.EnableAtModifier = true - case "promql-negative-offset": - queryOpts.EnableNegativeOffset = true case "": continue + case "promql-at-modifier", "promql-negative-offset": + fmt.Printf(" WARNING: Option for --enable-feature is a no-op after promotion to a stable feature: %q\n", o) default: fmt.Printf(" WARNING: Unknown option for --enable-feature: %q\n", o) } @@ -198,8 +218,11 @@ func main() { } switch parsedCmd { + case sdCheckCmd.FullCommand(): + os.Exit(CheckSD(*sdConfigFile, *sdJobName, *sdTimeout)) + case checkConfigCmd.FullCommand(): - os.Exit(CheckConfig(*configFiles...)) + os.Exit(CheckConfig(*agentMode, *checkConfigSyntaxOnly, *configFiles...)) case checkWebConfigCmd.FullCommand(): os.Exit(CheckWebConfig(*webConfigFiles...)) @@ -208,7 +231,7 @@ func main() { os.Exit(CheckRules(*ruleFiles...)) case checkMetricsCmd.FullCommand(): - os.Exit(CheckMetrics()) + os.Exit(CheckMetrics(*checkMetricsExtended)) case queryInstantCmd.FullCommand(): os.Exit(QueryInstant(*queryInstantServer, *queryInstantExpr, *queryInstantTime, p)) @@ -232,7 +255,13 @@ func main() { os.Exit(QueryLabels(*queryLabelsServer, *queryLabelsName, *queryLabelsBegin, *queryLabelsEnd, p)) case testRulesCmd.FullCommand(): - os.Exit(RulesUnitTest(queryOpts, *testRulesFiles...)) + os.Exit(RulesUnitTest( + promql.LazyLoaderOpts{ + EnableAtModifier: true, + EnableNegativeOffset: true, + }, + *testRulesFiles...), + ) case tsdbBenchWriteCmd.FullCommand(): os.Exit(checkErr(benchmarkWrite(*benchWriteOutPath, *benchSamplesFile, *benchWriteNumMetrics, *benchWriteNumScrapes))) @@ -245,7 +274,7 @@ func main() { case tsdbDumpCmd.FullCommand(): os.Exit(checkErr(dumpSamples(*dumpPath, *dumpMinTime, *dumpMaxTime))) - //TODO(aSquare14): Work on adding support for custom block size. + // TODO(aSquare14): Work on adding support for custom block size. case openMetricsImportCmd.FullCommand(): os.Exit(backfillOpenMetrics(*importFilePath, *importDBPath, *importHumanReadable, *importQuiet, *maxBlockDuration)) @@ -255,16 +284,19 @@ func main() { } // CheckConfig validates configuration files. -func CheckConfig(files ...string) int { +func CheckConfig(agentMode, checkSyntaxOnly bool, files ...string) int { failed := false for _, f := range files { - ruleFiles, err := checkConfig(f) + ruleFiles, err := checkConfig(agentMode, f, checkSyntaxOnly) if err != nil { fmt.Fprintln(os.Stderr, " FAILED:", err) failed = true } else { - fmt.Printf(" SUCCESS: %d rule files found\n", len(ruleFiles)) + if len(ruleFiles) > 0 { + fmt.Printf(" SUCCESS: %d rule files found\n", len(ruleFiles)) + } + fmt.Printf(" SUCCESS: %s is valid prometheus config file syntax\n", f) } fmt.Println() @@ -282,9 +314,9 @@ func CheckConfig(files ...string) int { } } if failed { - return 1 + return failureExitCode } - return 0 + return successExitCode } // CheckWebConfig validates web configuration files. @@ -300,9 +332,9 @@ func CheckWebConfig(files ...string) int fmt.Fprintln(os.Stderr, f, "SUCCESS") } if failed { - return 1 + return failureExitCode } - return 0 + return successExitCode } func checkFileExists(fn string) error { @@ -314,48 +346,55 @@ func checkFileExists(fn string) error { return err } -func checkConfig(filename string) ([]string, error) { +func checkConfig(agentMode bool, filename string, checkSyntaxOnly bool) ([]string, error) { fmt.Println("Checking", filename) - cfg, err := config.LoadFile(filename, false, log.NewNopLogger()) + cfg, err := config.LoadFile(filename, agentMode, false, log.NewNopLogger()) if err != nil { return nil, err } var ruleFiles []string - for _, rf := range cfg.RuleFiles { - rfs, err := filepath.Glob(rf) - if err != nil { - return nil, err - } - // If an explicit file was given, error if it is not accessible. - if !strings.Contains(rf, "*") { - if len(rfs) == 0 { - return nil, errors.Errorf("%q does not point to an existing file", rf) + if !checkSyntaxOnly { + for _, rf := range cfg.RuleFiles { + rfs, err := filepath.Glob(rf) + if err != nil { + return nil, err } - if err := checkFileExists(rfs[0]); err != nil { - return nil, errors.Wrapf(err, "error checking rule file %q", rfs[0]) + // If an explicit file was given, error if it is not accessible. + if !strings.Contains(rf, "*") { + if len(rfs) == 0 { + return nil, errors.Errorf("%q does not point to an existing file", rf) + } + if err := checkFileExists(rfs[0]); err != nil { + return nil, errors.Wrapf(err, "error checking rule file %q", rfs[0]) + } } + ruleFiles = append(ruleFiles, rfs...) } - ruleFiles = append(ruleFiles, rfs...) } for _, scfg := range cfg.ScrapeConfigs { - if err := checkFileExists(scfg.HTTPClientConfig.BearerTokenFile); err != nil { - return nil, errors.Wrapf(err, "error checking bearer token file %q", scfg.HTTPClientConfig.BearerTokenFile) + if !checkSyntaxOnly && scfg.HTTPClientConfig.Authorization != nil { + if err := checkFileExists(scfg.HTTPClientConfig.Authorization.CredentialsFile); err != nil { + return nil, errors.Wrapf(err, "error checking authorization credentials or bearer token file %q", scfg.HTTPClientConfig.Authorization.CredentialsFile) + } } - if err := checkTLSConfig(scfg.HTTPClientConfig.TLSConfig); err != nil { + if err := checkTLSConfig(scfg.HTTPClientConfig.TLSConfig, checkSyntaxOnly); err != nil { return nil, err } for _, c := range scfg.ServiceDiscoveryConfigs { switch c := c.(type) { case *kubernetes.SDConfig: - if err := checkTLSConfig(c.HTTPClientConfig.TLSConfig); err != nil { + if err := checkTLSConfig(c.HTTPClientConfig.TLSConfig, checkSyntaxOnly); err != nil { return nil, err } case *file.SDConfig: + if checkSyntaxOnly { + break + } for _, file := range c.Files { files, err := filepath.Glob(file) if err != nil { @@ -363,30 +402,67 @@ func checkConfig(filename string) ([]str } if len(files) != 0 { for _, f := range files { - err = checkSDFile(f) + var targetGroups []*targetgroup.Group + targetGroups, err = checkSDFile(f) if err != nil { return nil, errors.Errorf("checking SD file %q: %v", file, err) } + if err := checkTargetGroupsForScrapeConfig(targetGroups, scfg); err != nil { + return nil, err + } } continue } fmt.Printf(" WARNING: file %q for file_sd in scrape job %q does not exist\n", file, scfg.JobName) } + case discovery.StaticConfig: + if err := checkTargetGroupsForScrapeConfig(c, scfg); err != nil { + return nil, err + } } } } - return ruleFiles, nil -} + alertConfig := cfg.AlertingConfig + for _, amcfg := range alertConfig.AlertmanagerConfigs { + for _, c := range amcfg.ServiceDiscoveryConfigs { + switch c := c.(type) { + case *file.SDConfig: + if checkSyntaxOnly { + break + } + for _, file := range c.Files { + files, err := filepath.Glob(file) + if err != nil { + return nil, err + } + if len(files) != 0 { + for _, f := range files { + var targetGroups []*targetgroup.Group + targetGroups, err = checkSDFile(f) + if err != nil { + return nil, errors.Errorf("checking SD file %q: %v", file, err) + } -func checkTLSConfig(tlsConfig config_util.TLSConfig) error { - if err := checkFileExists(tlsConfig.CertFile); err != nil { - return errors.Wrapf(err, "error checking client cert file %q", tlsConfig.CertFile) - } - if err := checkFileExists(tlsConfig.KeyFile); err != nil { - return errors.Wrapf(err, "error checking client key file %q", tlsConfig.KeyFile) + if err := checkTargetGroupsForAlertmanager(targetGroups, amcfg); err != nil { + return nil, err + } + } + continue + } + fmt.Printf(" WARNING: file %q for file_sd in alertmanager config does not exist\n", file) + } + case discovery.StaticConfig: + if err := checkTargetGroupsForAlertmanager(c, amcfg); err != nil { + return nil, err + } + } + } } + return ruleFiles, nil +} +func checkTLSConfig(tlsConfig config_util.TLSConfig, checkSyntaxOnly bool) error { if len(tlsConfig.CertFile) > 0 && len(tlsConfig.KeyFile) == 0 { return errors.Errorf("client cert file %q specified without client key file", tlsConfig.CertFile) } @@ -394,19 +470,30 @@ func checkTLSConfig(tlsConfig config_uti return errors.Errorf("client key file %q specified without client cert file", tlsConfig.KeyFile) } + if checkSyntaxOnly { + return nil + } + + if err := checkFileExists(tlsConfig.CertFile); err != nil { + return errors.Wrapf(err, "error checking client cert file %q", tlsConfig.CertFile) + } + if err := checkFileExists(tlsConfig.KeyFile); err != nil { + return errors.Wrapf(err, "error checking client key file %q", tlsConfig.KeyFile) + } + return nil } -func checkSDFile(filename string) error { +func checkSDFile(filename string) ([]*targetgroup.Group, error) { fd, err := os.Open(filename) if err != nil { - return err + return nil, err } defer fd.Close() content, err := ioutil.ReadAll(fd) if err != nil { - return err + return nil, err } var targetGroups []*targetgroup.Group @@ -414,23 +501,23 @@ func checkSDFile(filename string) error switch ext := filepath.Ext(filename); strings.ToLower(ext) { case ".json": if err := json.Unmarshal(content, &targetGroups); err != nil { - return err + return nil, err } case ".yml", ".yaml": if err := yaml.UnmarshalStrict(content, &targetGroups); err != nil { - return err + return nil, err } default: - return errors.Errorf("invalid file extension: %q", ext) + return nil, errors.Errorf("invalid file extension: %q", ext) } for i, tg := range targetGroups { if tg == nil { - return errors.Errorf("nil target group item found (index %d)", i) + return nil, errors.Errorf("nil target group item found (index %d)", i) } } - return nil + return targetGroups, nil } // CheckRules validates rule files. @@ -450,9 +537,9 @@ func CheckRules(files ...string) int { fmt.Println() } if failed { - return 1 + return failureExitCode } - return 0 + return successExitCode } func checkRules(filename string) (int, []error) { @@ -460,7 +547,7 @@ func checkRules(filename string) (int, [ rgs, errs := rulefmt.ParseFile(filename) if errs != nil { - return 0, errs + return successExitCode, errs } numRules := 0 @@ -507,7 +594,6 @@ func checkDuplicates(groups []rulefmt.Ru var rules compareRuleTypes for _, group := range groups { - for _, rule := range group.Rules { rules = append(rules, compareRuleType{ metric: ruleMetric(rule), @@ -552,12 +638,14 @@ $ curl -s http://localhost:9090/metrics `) // CheckMetrics performs a linting pass on input metrics. -func CheckMetrics() int { - l := promlint.New(os.Stdin) +func CheckMetrics(extended bool) int { + var buf bytes.Buffer + tee := io.TeeReader(os.Stdin, &buf) + l := promlint.New(tee) problems, err := l.Lint() if err != nil { fmt.Fprintln(os.Stderr, "error while linting:", err) - return 1 + return failureExitCode } for _, p := range problems { @@ -565,10 +653,71 @@ func CheckMetrics() int { } if len(problems) > 0 { - return 3 + return lintErrExitCode + } + + if extended { + stats, total, err := checkMetricsExtended(&buf) + if err != nil { + fmt.Fprintln(os.Stderr, err) + return failureExitCode + } + w := tabwriter.NewWriter(os.Stdout, 4, 4, 4, ' ', tabwriter.TabIndent) + fmt.Fprintf(w, "Metric\tCardinality\tPercentage\t\n") + for _, stat := range stats { + fmt.Fprintf(w, "%s\t%d\t%.2f%%\t\n", stat.name, stat.cardinality, stat.percentage*100) + } + fmt.Fprintf(w, "Total\t%d\t%.f%%\t\n", total, 100.) + w.Flush() + } + + return successExitCode +} + +type metricStat struct { + name string + cardinality int + percentage float64 +} + +func checkMetricsExtended(r io.Reader) ([]metricStat, int, error) { + p := expfmt.TextParser{} + metricFamilies, err := p.TextToMetricFamilies(r) + if err != nil { + return nil, 0, fmt.Errorf("error while parsing text to metric families: %w", err) + } + + var total int + stats := make([]metricStat, 0, len(metricFamilies)) + for _, mf := range metricFamilies { + var cardinality int + switch mf.GetType() { + case dto.MetricType_COUNTER, dto.MetricType_GAUGE, dto.MetricType_UNTYPED: + cardinality = len(mf.Metric) + case dto.MetricType_HISTOGRAM: + // Histogram metrics includes sum, count, buckets. + buckets := len(mf.Metric[0].Histogram.Bucket) + cardinality = len(mf.Metric) * (2 + buckets) + case dto.MetricType_SUMMARY: + // Summary metrics includes sum, count, quantiles. + quantiles := len(mf.Metric[0].Summary.Quantile) + cardinality = len(mf.Metric) * (2 + quantiles) + default: + cardinality = len(mf.Metric) + } + stats = append(stats, metricStat{name: mf.GetName(), cardinality: cardinality}) + total += cardinality } - return 0 + for i := range stats { + stats[i].percentage = float64(stats[i].cardinality) / float64(total) + } + + sort.SliceStable(stats, func(i, j int) bool { + return stats[i].cardinality > stats[j].cardinality + }) + + return stats, total, nil } // QueryInstant performs an instant query against a Prometheus server. @@ -584,7 +733,7 @@ func QueryInstant(url *url.URL, query, e c, err := api.NewClient(config) if err != nil { fmt.Fprintln(os.Stderr, "error creating API client:", err) - return 1 + return failureExitCode } eTime := time.Now() @@ -592,7 +741,7 @@ func QueryInstant(url *url.URL, query, e eTime, err = parseTime(evalTime) if err != nil { fmt.Fprintln(os.Stderr, "error parsing evaluation time:", err) - return 1 + return failureExitCode } } @@ -608,7 +757,7 @@ func QueryInstant(url *url.URL, query, e p.printValue(val) - return 0 + return successExitCode } // QueryRange performs a range query against a Prometheus server. @@ -633,7 +782,7 @@ func QueryRange(url *url.URL, headers ma c, err := api.NewClient(config) if err != nil { fmt.Fprintln(os.Stderr, "error creating API client:", err) - return 1 + return failureExitCode } var stime, etime time.Time @@ -644,7 +793,7 @@ func QueryRange(url *url.URL, headers ma etime, err = parseTime(end) if err != nil { fmt.Fprintln(os.Stderr, "error parsing end time:", err) - return 1 + return failureExitCode } } @@ -654,13 +803,13 @@ func QueryRange(url *url.URL, headers ma stime, err = parseTime(start) if err != nil { fmt.Fprintln(os.Stderr, "error parsing start time:", err) - return 1 + return failureExitCode } } if !stime.Before(etime) { fmt.Fprintln(os.Stderr, "start time is not before end time") - return 1 + return failureExitCode } if step == 0 { @@ -681,7 +830,7 @@ func QueryRange(url *url.URL, headers ma } p.printValue(val) - return 0 + return successExitCode } // QuerySeries queries for a series against a Prometheus server. @@ -697,13 +846,13 @@ func QuerySeries(url *url.URL, matchers c, err := api.NewClient(config) if err != nil { fmt.Fprintln(os.Stderr, "error creating API client:", err) - return 1 + return failureExitCode } stime, etime, err := parseStartTimeAndEndTime(start, end) if err != nil { fmt.Fprintln(os.Stderr, err) - return 1 + return failureExitCode } // Run query against client. @@ -717,11 +866,11 @@ func QuerySeries(url *url.URL, matchers } p.printSeries(val) - return 0 + return successExitCode } // QueryLabels queries for label values against a Prometheus server. -func QueryLabels(url *url.URL, name string, start, end string, p printer) int { +func QueryLabels(url *url.URL, name, start, end string, p printer) int { if url.Scheme == "" { url.Scheme = "http" } @@ -733,13 +882,13 @@ func QueryLabels(url *url.URL, name stri c, err := api.NewClient(config) if err != nil { fmt.Fprintln(os.Stderr, "error creating API client:", err) - return 1 + return failureExitCode } stime, etime, err := parseStartTimeAndEndTime(start, end) if err != nil { fmt.Fprintln(os.Stderr, err) - return 1 + return failureExitCode } // Run query against client. @@ -756,7 +905,7 @@ func QueryLabels(url *url.URL, name stri } p.printLabelValues(val) - return 0 + return successExitCode } func handleAPIError(err error) int { @@ -767,7 +916,7 @@ func handleAPIError(err error) int { fmt.Fprintln(os.Stderr, "query error:", err) } - return 1 + return failureExitCode } func parseStartTimeAndEndTime(start, end string) (time.Time, time.Time, error) { @@ -859,9 +1008,9 @@ func debugPprof(url string) int { endPointGroups: pprofEndpoints, }); err != nil { fmt.Fprintln(os.Stderr, "error completing debug command:", err) - return 1 + return failureExitCode } - return 0 + return successExitCode } func debugMetrics(url string) int { @@ -871,9 +1020,9 @@ func debugMetrics(url string) int { endPointGroups: metricsEndpoints, }); err != nil { fmt.Fprintln(os.Stderr, "error completing debug command:", err) - return 1 + return failureExitCode } - return 0 + return successExitCode } func debugAll(url string) int { @@ -883,9 +1032,9 @@ func debugAll(url string) int { endPointGroups: allEndpoints, }); err != nil { fmt.Fprintln(os.Stderr, "error completing debug command:", err) - return 1 + return failureExitCode } - return 0 + return successExitCode } type printer interface { @@ -899,11 +1048,13 @@ type promqlPrinter struct{} func (p *promqlPrinter) printValue(v model.Value) { fmt.Println(v) } + func (p *promqlPrinter) printSeries(val []model.LabelSet) { for _, v := range val { fmt.Println(v) } } + func (p *promqlPrinter) printLabelValues(val model.LabelValues) { for _, v := range val { fmt.Println(v) @@ -916,10 +1067,12 @@ func (j *jsonPrinter) printValue(v model //nolint:errcheck json.NewEncoder(os.Stdout).Encode(v) } + func (j *jsonPrinter) printSeries(v []model.LabelSet) { //nolint:errcheck json.NewEncoder(os.Stdout).Encode(v) } + func (j *jsonPrinter) printLabelValues(v model.LabelValues) { //nolint:errcheck json.NewEncoder(os.Stdout).Encode(v) @@ -927,7 +1080,7 @@ func (j *jsonPrinter) printLabelValues(v // importRules backfills recording rules from the files provided. The output are blocks of data // at the outputDir location. -func importRules(url *url.URL, start, end, outputDir string, evalInterval time.Duration, maxBlockDuration time.Duration, files ...string) error { +func importRules(url *url.URL, start, end, outputDir string, evalInterval, maxBlockDuration time.Duration, files ...string) error { ctx := context.Background() var stime, etime time.Time var err error @@ -980,4 +1133,26 @@ func importRules(url *url.URL, start, en } return nil +} + +func checkTargetGroupsForAlertmanager(targetGroups []*targetgroup.Group, amcfg *config.AlertmanagerConfig) error { + for _, tg := range targetGroups { + if _, _, err := notifier.AlertmanagerFromGroup(tg, amcfg); err != nil { + return err + } + } + + return nil +} + +func checkTargetGroupsForScrapeConfig(targetGroups []*targetgroup.Group, scfg *config.ScrapeConfig) error { + for _, tg := range targetGroups { + _, failures := scrape.TargetsFromGroup(tg, scfg) + if len(failures) > 0 { + first := failures[0] + return first + } + } + + return nil } diff -pruN 2.31.2+ds1-1/cmd/promtool/main_test.go 2.33.5+ds1-2/cmd/promtool/main_test.go --- 2.31.2+ds1-1/cmd/promtool/main_test.go 2022-01-21 00:33:16.000000000 +0000 +++ 2.33.5+ds1-2/cmd/promtool/main_test.go 2022-03-08 16:34:32.000000000 +0000 @@ -18,12 +18,16 @@ import ( "net/http" "net/http/httptest" "net/url" + "os" + "runtime" + "strings" "testing" "time" - "github.com/prometheus/prometheus/pkg/labels" - "github.com/prometheus/prometheus/pkg/rulefmt" "github.com/stretchr/testify/require" + + "github.com/prometheus/prometheus/model/labels" + "github.com/prometheus/prometheus/model/rulefmt" ) func TestQueryRange(t *testing.T) { @@ -111,7 +115,7 @@ func TestCheckSDFile(t *testing.T) { } for _, test := range cases { t.Run(test.name, func(t *testing.T) { - err := checkSDFile(test.file) + _, err := checkSDFile(test.file) if test.err != "" { require.Equalf(t, test.err, err.Error(), "Expected error %q, got %q", test.err, err.Error()) return @@ -163,3 +167,195 @@ func BenchmarkCheckDuplicates(b *testing checkDuplicates(rgs.Groups) } } + +func TestCheckTargetConfig(t *testing.T) { + cases := []struct { + name string + file string + err string + }{ + { + name: "url_in_scrape_targetgroup_with_relabel_config.good", + file: "url_in_scrape_targetgroup_with_relabel_config.good.yml", + err: "", + }, + { + name: "url_in_alert_targetgroup_with_relabel_config.good", + file: "url_in_alert_targetgroup_with_relabel_config.good.yml", + err: "", + }, + { + name: "url_in_scrape_targetgroup_with_relabel_config.bad", + file: "url_in_scrape_targetgroup_with_relabel_config.bad.yml", + err: "instance 0 in group 0: \"http://bad\" is not a valid hostname", + }, + { + name: "url_in_alert_targetgroup_with_relabel_config.bad", + file: "url_in_alert_targetgroup_with_relabel_config.bad.yml", + err: "\"http://bad\" is not a valid hostname", + }, + } + for _, test := range cases { + t.Run(test.name, func(t *testing.T) { + _, err := checkConfig(false, "testdata/"+test.file, false) + if test.err != "" { + require.Equalf(t, test.err, err.Error(), "Expected error %q, got %q", test.err, err.Error()) + return + } + require.NoError(t, err) + }) + } +} + +func TestCheckConfigSyntax(t *testing.T) { + cases := []struct { + name string + file string + syntaxOnly bool + err string + errWindows string + }{ + { + name: "check with syntax only succeeds with nonexistent rule files", + file: "config_with_rule_files.yml", + syntaxOnly: true, + err: "", + errWindows: "", + }, + { + name: "check without syntax only fails with nonexistent rule files", + file: "config_with_rule_files.yml", + syntaxOnly: false, + err: "\"testdata/non-existent-file.yml\" does not point to an existing file", + errWindows: "\"testdata\\\\non-existent-file.yml\" does not point to an existing file", + }, + { + name: "check with syntax only succeeds with nonexistent service discovery files", + file: "config_with_service_discovery_files.yml", + syntaxOnly: true, + err: "", + errWindows: "", + }, + // The test below doesn't fail because the file verification for ServiceDiscoveryConfigs doesn't fail the check if + // file isn't found; it only outputs a warning message. + { + name: "check without syntax only succeeds with nonexistent service discovery files", + file: "config_with_service_discovery_files.yml", + syntaxOnly: false, + err: "", + errWindows: "", + }, + { + name: "check with syntax only succeeds with nonexistent TLS files", + file: "config_with_tls_files.yml", + syntaxOnly: true, + err: "", + errWindows: "", + }, + { + name: "check without syntax only fails with nonexistent TLS files", + file: "config_with_tls_files.yml", + syntaxOnly: false, + err: "error checking client cert file \"testdata/nonexistent_cert_file.yml\": " + + "stat testdata/nonexistent_cert_file.yml: no such file or directory", + errWindows: "error checking client cert file \"testdata\\\\nonexistent_cert_file.yml\": " + + "CreateFile testdata\\nonexistent_cert_file.yml: The system cannot find the file specified.", + }, + { + name: "check with syntax only succeeds with nonexistent credentials file", + file: "authorization_credentials_file.bad.yml", + syntaxOnly: true, + err: "", + errWindows: "", + }, + { + name: "check without syntax only fails with nonexistent credentials file", + file: "authorization_credentials_file.bad.yml", + syntaxOnly: false, + err: "error checking authorization credentials or bearer token file \"/random/file/which/does/not/exist.yml\": " + + "stat /random/file/which/does/not/exist.yml: no such file or directory", + errWindows: "error checking authorization credentials or bearer token file \"testdata\\\\random\\\\file\\\\which\\\\does\\\\not\\\\exist.yml\": " + + "CreateFile testdata\\random\\file\\which\\does\\not\\exist.yml: The system cannot find the path specified.", + }, + } + for _, test := range cases { + t.Run(test.name, func(t *testing.T) { + _, err := checkConfig(false, "testdata/"+test.file, test.syntaxOnly) + expectedErrMsg := test.err + if strings.Contains(runtime.GOOS, "windows") { + expectedErrMsg = test.errWindows + } + if expectedErrMsg != "" { + require.Equalf(t, expectedErrMsg, err.Error(), "Expected error %q, got %q", test.err, err.Error()) + return + } + require.NoError(t, err) + }) + } +} + +func TestAuthorizationConfig(t *testing.T) { + cases := []struct { + name string + file string + err string + }{ + { + name: "authorization_credentials_file.bad", + file: "authorization_credentials_file.bad.yml", + err: "error checking authorization credentials or bearer token file", + }, + { + name: "authorization_credentials_file.good", + file: "authorization_credentials_file.good.yml", + err: "", + }, + } + + for _, test := range cases { + t.Run(test.name, func(t *testing.T) { + _, err := checkConfig(false, "testdata/"+test.file, false) + if test.err != "" { + require.Contains(t, err.Error(), test.err, "Expected error to contain %q, got %q", test.err, err.Error()) + return + } + require.NoError(t, err) + }) + } +} + +func TestCheckMetricsExtended(t *testing.T) { + if runtime.GOOS == "windows" { + t.Skip("Skipping on windows") + } + + f, err := os.Open("testdata/metrics-test.prom") + require.NoError(t, err) + defer f.Close() + + stats, total, err := checkMetricsExtended(f) + require.NoError(t, err) + require.Equal(t, 27, total) + require.Equal(t, []metricStat{ + { + name: "prometheus_tsdb_compaction_chunk_size_bytes", + cardinality: 15, + percentage: float64(15) / float64(27), + }, + { + name: "go_gc_duration_seconds", + cardinality: 7, + percentage: float64(7) / float64(27), + }, + { + name: "net_conntrack_dialer_conn_attempted_total", + cardinality: 4, + percentage: float64(4) / float64(27), + }, + { + name: "go_info", + cardinality: 1, + percentage: float64(1) / float64(27), + }, + }, stats) +} diff -pruN 2.31.2+ds1-1/cmd/promtool/rules.go 2.33.5+ds1-2/cmd/promtool/rules.go --- 2.31.2+ds1-1/cmd/promtool/rules.go 2022-01-21 00:33:16.000000000 +0000 +++ 2.33.5+ds1-2/cmd/promtool/rules.go 2022-03-08 16:34:32.000000000 +0000 @@ -23,8 +23,9 @@ import ( "github.com/pkg/errors" v1 "github.com/prometheus/client_golang/api/prometheus/v1" "github.com/prometheus/common/model" - "github.com/prometheus/prometheus/pkg/labels" - "github.com/prometheus/prometheus/pkg/timestamp" + + "github.com/prometheus/prometheus/model/labels" + "github.com/prometheus/prometheus/model/timestamp" "github.com/prometheus/prometheus/rules" "github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/tsdb" @@ -170,7 +171,7 @@ func (importer *ruleImporter) importRule } } default: - return errors.New(fmt.Sprintf("rule result is wrong type %s", val.Type().String())) + return fmt.Errorf("rule result is wrong type %s", val.Type().String()) } if err := app.flushAndCommit(ctx); err != nil { diff -pruN 2.31.2+ds1-1/cmd/promtool/rules_test.go 2.33.5+ds1-2/cmd/promtool/rules_test.go --- 2.31.2+ds1-1/cmd/promtool/rules_test.go 2022-01-21 00:33:16.000000000 +0000 +++ 2.33.5+ds1-2/cmd/promtool/rules_test.go 2022-03-08 16:34:32.000000000 +0000 @@ -17,7 +17,6 @@ import ( "context" "io/ioutil" "math" - "os" "path/filepath" "testing" "time" @@ -25,9 +24,10 @@ import ( "github.com/go-kit/log" v1 "github.com/prometheus/client_golang/api/prometheus/v1" "github.com/prometheus/common/model" - "github.com/prometheus/prometheus/pkg/labels" - "github.com/prometheus/prometheus/tsdb" "github.com/stretchr/testify/require" + + "github.com/prometheus/prometheus/model/labels" + "github.com/prometheus/prometheus/tsdb" ) type mockQueryRangeAPI struct { @@ -54,7 +54,7 @@ func TestBackfillRuleIntegration(t *test twentyFourHourDuration, _ = time.ParseDuration("24h") ) - var testCases = []struct { + testCases := []struct { name string runcount int maxBlockDuration time.Duration @@ -71,11 +71,7 @@ func TestBackfillRuleIntegration(t *test } for _, tt := range testCases { t.Run(tt.name, func(t *testing.T) { - tmpDir, err := ioutil.TempDir("", "backfilldata") - require.NoError(t, err) - defer func() { - require.NoError(t, os.RemoveAll(tmpDir)) - }() + tmpDir := t.TempDir() ctx := context.Background() // Execute the test more than once to simulate running the rule importer twice with the same data. @@ -192,7 +188,7 @@ func createSingleRuleTestFiles(path stri labels: testlabel11: testlabelvalue11 ` - return ioutil.WriteFile(path, []byte(recordingRules), 0777) + return ioutil.WriteFile(path, []byte(recordingRules), 0o777) } func createMultiRuleTestFiles(path string) error { @@ -212,17 +208,13 @@ func createMultiRuleTestFiles(path strin labels: testlabel11: testlabelvalue13 ` - return ioutil.WriteFile(path, []byte(recordingRules), 0777) + return ioutil.WriteFile(path, []byte(recordingRules), 0o777) } // TestBackfillLabels confirms that the labels in the rule file override the labels from the metrics // received from Prometheus Query API, including the __name__ label. func TestBackfillLabels(t *testing.T) { - tmpDir, err := ioutil.TempDir("", "backfilldata") - require.NoError(t, err) - defer func() { - require.NoError(t, os.RemoveAll(tmpDir)) - }() + tmpDir := t.TempDir() ctx := context.Background() start := time.Date(2009, time.November, 10, 6, 34, 0, 0, time.UTC) @@ -244,7 +236,7 @@ func TestBackfillLabels(t *testing.T) { labels: name1: value-from-rule ` - require.NoError(t, ioutil.WriteFile(path, []byte(recordingRules), 0777)) + require.NoError(t, ioutil.WriteFile(path, []byte(recordingRules), 0o777)) errs := ruleImporter.loadGroups(ctx, []string{path}) for _, err := range errs { require.NoError(t, err) diff -pruN 2.31.2+ds1-1/cmd/promtool/sd.go 2.33.5+ds1-2/cmd/promtool/sd.go --- 2.31.2+ds1-1/cmd/promtool/sd.go 1970-01-01 00:00:00.000000000 +0000 +++ 2.33.5+ds1-2/cmd/promtool/sd.go 2022-03-08 16:34:32.000000000 +0000 @@ -0,0 +1,148 @@ +// Copyright 2021 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. + +package main + +import ( + "context" + "encoding/json" + "fmt" + "os" + "reflect" + "time" + + "github.com/go-kit/log" + + "github.com/prometheus/prometheus/config" + "github.com/prometheus/prometheus/discovery" + "github.com/prometheus/prometheus/discovery/targetgroup" + "github.com/prometheus/prometheus/model/labels" + "github.com/prometheus/prometheus/scrape" +) + +type sdCheckResult struct { + DiscoveredLabels labels.Labels `json:"discoveredLabels"` + Labels labels.Labels `json:"labels"` + Error error `json:"error,omitempty"` +} + +// CheckSD performs service discovery for the given job name and reports the results. +func CheckSD(sdConfigFiles, sdJobName string, sdTimeout time.Duration) int { + logger := log.NewLogfmtLogger(log.NewSyncWriter(os.Stderr)) + + cfg, err := config.LoadFile(sdConfigFiles, false, false, logger) + if err != nil { + fmt.Fprintln(os.Stderr, "Cannot load config", err) + return failureExitCode + } + + var scrapeConfig *config.ScrapeConfig + jobs := []string{} + jobMatched := false + for _, v := range cfg.ScrapeConfigs { + jobs = append(jobs, v.JobName) + if v.JobName == sdJobName { + jobMatched = true + scrapeConfig = v + break + } + } + + if !jobMatched { + fmt.Fprintf(os.Stderr, "Job %s not found. Select one of:\n", sdJobName) + for _, job := range jobs { + fmt.Fprintf(os.Stderr, "\t%s\n", job) + } + return failureExitCode + } + + targetGroupChan := make(chan []*targetgroup.Group) + ctx, cancel := context.WithTimeout(context.Background(), sdTimeout) + defer cancel() + + for _, cfg := range scrapeConfig.ServiceDiscoveryConfigs { + d, err := cfg.NewDiscoverer(discovery.DiscovererOptions{Logger: logger}) + if err != nil { + fmt.Fprintln(os.Stderr, "Could not create new discoverer", err) + return failureExitCode + } + go d.Run(ctx, targetGroupChan) + } + + var targetGroups []*targetgroup.Group + sdCheckResults := make(map[string][]*targetgroup.Group) +outerLoop: + for { + select { + case targetGroups = <-targetGroupChan: + for _, tg := range targetGroups { + sdCheckResults[tg.Source] = append(sdCheckResults[tg.Source], tg) + } + case <-ctx.Done(): + break outerLoop + } + } + results := []sdCheckResult{} + for _, tgs := range sdCheckResults { + results = append(results, getSDCheckResult(tgs, scrapeConfig)...) + } + + res, err := json.MarshalIndent(results, "", " ") + if err != nil { + fmt.Fprintf(os.Stderr, "Could not marshal result json: %s", err) + return failureExitCode + } + + fmt.Printf("%s", res) + return successExitCode +} + +func getSDCheckResult(targetGroups []*targetgroup.Group, scrapeConfig *config.ScrapeConfig) []sdCheckResult { + sdCheckResults := []sdCheckResult{} + for _, targetGroup := range targetGroups { + for _, target := range targetGroup.Targets { + labelSlice := make([]labels.Label, 0, len(target)+len(targetGroup.Labels)) + + for name, value := range target { + labelSlice = append(labelSlice, labels.Label{Name: string(name), Value: string(value)}) + } + + for name, value := range targetGroup.Labels { + if _, ok := target[name]; !ok { + labelSlice = append(labelSlice, labels.Label{Name: string(name), Value: string(value)}) + } + } + + targetLabels := labels.New(labelSlice...) + res, orig, err := scrape.PopulateLabels(targetLabels, scrapeConfig) + result := sdCheckResult{ + DiscoveredLabels: orig, + Labels: res, + Error: err, + } + + duplicateRes := false + for _, sdCheckRes := range sdCheckResults { + if reflect.DeepEqual(sdCheckRes, result) { + duplicateRes = true + break + } + } + + if !duplicateRes { + sdCheckResults = append(sdCheckResults, result) + } + } + } + return sdCheckResults +} diff -pruN 2.31.2+ds1-1/cmd/promtool/sd_test.go 2.33.5+ds1-2/cmd/promtool/sd_test.go --- 2.31.2+ds1-1/cmd/promtool/sd_test.go 1970-01-01 00:00:00.000000000 +0000 +++ 2.33.5+ds1-2/cmd/promtool/sd_test.go 2022-03-08 16:34:32.000000000 +0000 @@ -0,0 +1,73 @@ +// Copyright 2021 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. + +package main + +import ( + "testing" + "time" + + "github.com/prometheus/common/model" + + "github.com/prometheus/prometheus/config" + "github.com/prometheus/prometheus/discovery/targetgroup" + "github.com/prometheus/prometheus/model/labels" + "github.com/prometheus/prometheus/model/relabel" + + "github.com/stretchr/testify/require" +) + +func TestSDCheckResult(t *testing.T) { + targetGroups := []*targetgroup.Group{{ + Targets: []model.LabelSet{ + map[model.LabelName]model.LabelValue{"__address__": "localhost:8080", "foo": "bar"}, + }, + }} + + reg, err := relabel.NewRegexp("(.*)") + require.Nil(t, err) + + scrapeConfig := &config.ScrapeConfig{ + ScrapeInterval: model.Duration(1 * time.Minute), + ScrapeTimeout: model.Duration(10 * time.Second), + RelabelConfigs: []*relabel.Config{{ + SourceLabels: model.LabelNames{"foo"}, + Action: relabel.Replace, + TargetLabel: "newfoo", + Regex: reg, + Replacement: "$1", + }}, + } + + expectedSDCheckResult := []sdCheckResult{ + { + DiscoveredLabels: labels.Labels{ + labels.Label{Name: "__address__", Value: "localhost:8080"}, + labels.Label{Name: "__scrape_interval__", Value: "1m"}, + labels.Label{Name: "__scrape_timeout__", Value: "10s"}, + labels.Label{Name: "foo", Value: "bar"}, + }, + Labels: labels.Labels{ + labels.Label{Name: "__address__", Value: "localhost:8080"}, + labels.Label{Name: "__scrape_interval__", Value: "1m"}, + labels.Label{Name: "__scrape_timeout__", Value: "10s"}, + labels.Label{Name: "foo", Value: "bar"}, + labels.Label{Name: "instance", Value: "localhost:8080"}, + labels.Label{Name: "newfoo", Value: "bar"}, + }, + Error: nil, + }, + } + + require.Equal(t, expectedSDCheckResult, getSDCheckResult(targetGroups, scrapeConfig)) +} diff -pruN 2.31.2+ds1-1/cmd/promtool/testdata/authorization_credentials_file.bad.yml 2.33.5+ds1-2/cmd/promtool/testdata/authorization_credentials_file.bad.yml --- 2.31.2+ds1-1/cmd/promtool/testdata/authorization_credentials_file.bad.yml 1970-01-01 00:00:00.000000000 +0000 +++ 2.33.5+ds1-2/cmd/promtool/testdata/authorization_credentials_file.bad.yml 2022-03-08 16:34:32.000000000 +0000 @@ -0,0 +1,4 @@ +scrape_configs: + - job_name: test + authorization: + credentials_file: "/random/file/which/does/not/exist.yml" diff -pruN 2.31.2+ds1-1/cmd/promtool/testdata/authorization_credentials_file.good.yml 2.33.5+ds1-2/cmd/promtool/testdata/authorization_credentials_file.good.yml --- 2.31.2+ds1-1/cmd/promtool/testdata/authorization_credentials_file.good.yml 1970-01-01 00:00:00.000000000 +0000 +++ 2.33.5+ds1-2/cmd/promtool/testdata/authorization_credentials_file.good.yml 2022-03-08 16:34:32.000000000 +0000 @@ -0,0 +1,4 @@ +scrape_configs: + - job_name: test + authorization: + credentials_file: "." diff -pruN 2.31.2+ds1-1/cmd/promtool/testdata/config_with_rule_files.yml 2.33.5+ds1-2/cmd/promtool/testdata/config_with_rule_files.yml --- 2.31.2+ds1-1/cmd/promtool/testdata/config_with_rule_files.yml 1970-01-01 00:00:00.000000000 +0000 +++ 2.33.5+ds1-2/cmd/promtool/testdata/config_with_rule_files.yml 2022-03-08 16:34:32.000000000 +0000 @@ -0,0 +1,3 @@ +rule_files: + - non-existent-file.yml + - /etc/non/existent/file.yml diff -pruN 2.31.2+ds1-1/cmd/promtool/testdata/config_with_service_discovery_files.yml 2.33.5+ds1-2/cmd/promtool/testdata/config_with_service_discovery_files.yml --- 2.31.2+ds1-1/cmd/promtool/testdata/config_with_service_discovery_files.yml 1970-01-01 00:00:00.000000000 +0000 +++ 2.33.5+ds1-2/cmd/promtool/testdata/config_with_service_discovery_files.yml 2022-03-08 16:34:32.000000000 +0000 @@ -0,0 +1,12 @@ +scrape_configs: + - job_name: prometheus + file_sd_configs: + - files: + - nonexistent_file.yml +alerting: + alertmanagers: + - scheme: http + api_version: v1 + file_sd_configs: + - files: + - nonexistent_file.yml diff -pruN 2.31.2+ds1-1/cmd/promtool/testdata/config_with_tls_files.yml 2.33.5+ds1-2/cmd/promtool/testdata/config_with_tls_files.yml --- 2.31.2+ds1-1/cmd/promtool/testdata/config_with_tls_files.yml 1970-01-01 00:00:00.000000000 +0000 +++ 2.33.5+ds1-2/cmd/promtool/testdata/config_with_tls_files.yml 2022-03-08 16:34:32.000000000 +0000 @@ -0,0 +1,5 @@ +scrape_configs: + - job_name: "some job" + tls_config: + cert_file: nonexistent_cert_file.yml + key_file: nonexistent_key_file.yml diff -pruN 2.31.2+ds1-1/cmd/promtool/testdata/long-period.yml 2.33.5+ds1-2/cmd/promtool/testdata/long-period.yml --- 2.31.2+ds1-1/cmd/promtool/testdata/long-period.yml 1970-01-01 00:00:00.000000000 +0000 +++ 2.33.5+ds1-2/cmd/promtool/testdata/long-period.yml 2022-03-08 16:34:32.000000000 +0000 @@ -0,0 +1,34 @@ +# Evaluate once every 100d to avoid this taking too long. +evaluation_interval: 100d + +rule_files: + - rules.yml + +tests: + - interval: 100d + input_series: + - series: test + # Max time in time.Duration is 106751d from 1970 (2^63/10^9), i.e. 2262. + # We use the nearest 100 days to that to ensure the unit tests can fully + # cover the expected range. + values: '0+1x1067' + + promql_expr_test: + - expr: timestamp(test) + eval_time: 0m + exp_samples: + - value: 0 + - expr: test + eval_time: 100d # one evaluation_interval. + exp_samples: + - labels: test + value: 1 + - expr: timestamp(test) + eval_time: 106700d + exp_samples: + - value: 9218880000 # 106700d -> seconds. + - expr: fixed_data + eval_time: 106700d + exp_samples: + - labels: fixed_data + value: 1 diff -pruN 2.31.2+ds1-1/cmd/promtool/testdata/metrics-test.prom 2.33.5+ds1-2/cmd/promtool/testdata/metrics-test.prom --- 2.31.2+ds1-1/cmd/promtool/testdata/metrics-test.prom 1970-01-01 00:00:00.000000000 +0000 +++ 2.33.5+ds1-2/cmd/promtool/testdata/metrics-test.prom 2022-03-08 16:34:32.000000000 +0000 @@ -0,0 +1,35 @@ +# HELP go_gc_duration_seconds A summary of the pause duration of garbage collection cycles. +# TYPE go_gc_duration_seconds summary +go_gc_duration_seconds{quantile="0"} 2.391e-05 +go_gc_duration_seconds{quantile="0.25"} 9.4402e-05 +go_gc_duration_seconds{quantile="0.5"} 0.000118953 +go_gc_duration_seconds{quantile="0.75"} 0.000145884 +go_gc_duration_seconds{quantile="1"} 0.005201208 +go_gc_duration_seconds_sum 0.036134048 +go_gc_duration_seconds_count 232 +# HELP prometheus_tsdb_compaction_chunk_size_bytes Final size of chunks on their first compaction +# TYPE prometheus_tsdb_compaction_chunk_size_bytes histogram +prometheus_tsdb_compaction_chunk_size_bytes_bucket{le="32"} 662 +prometheus_tsdb_compaction_chunk_size_bytes_bucket{le="48"} 1460 +prometheus_tsdb_compaction_chunk_size_bytes_bucket{le="72"} 2266 +prometheus_tsdb_compaction_chunk_size_bytes_bucket{le="108"} 3958 +prometheus_tsdb_compaction_chunk_size_bytes_bucket{le="162"} 4861 +prometheus_tsdb_compaction_chunk_size_bytes_bucket{le="243"} 5721 +prometheus_tsdb_compaction_chunk_size_bytes_bucket{le="364.5"} 10493 +prometheus_tsdb_compaction_chunk_size_bytes_bucket{le="546.75"} 12464 +prometheus_tsdb_compaction_chunk_size_bytes_bucket{le="820.125"} 13254 +prometheus_tsdb_compaction_chunk_size_bytes_bucket{le="1230.1875"} 13699 +prometheus_tsdb_compaction_chunk_size_bytes_bucket{le="1845.28125"} 13806 +prometheus_tsdb_compaction_chunk_size_bytes_bucket{le="2767.921875"} 13852 +prometheus_tsdb_compaction_chunk_size_bytes_bucket{le="+Inf"} 13867 +prometheus_tsdb_compaction_chunk_size_bytes_sum 3.886707e+06 +prometheus_tsdb_compaction_chunk_size_bytes_count 13867 +# HELP net_conntrack_dialer_conn_attempted_total Total number of connections attempted by the given dialer a given name. +# TYPE net_conntrack_dialer_conn_attempted_total counter +net_conntrack_dialer_conn_attempted_total{dialer_name="blackbox"} 5210 +net_conntrack_dialer_conn_attempted_total{dialer_name="default"} 0 +net_conntrack_dialer_conn_attempted_total{dialer_name="node"} 21 +net_conntrack_dialer_conn_attempted_total{dialer_name="prometheus"} 21 +# HELP go_info Information about the Go environment. +# TYPE go_info gauge +go_info{version="go1.17"} 1 diff -pruN 2.31.2+ds1-1/cmd/promtool/testdata/url_in_alert_targetgroup_with_relabel_config.bad.yml 2.33.5+ds1-2/cmd/promtool/testdata/url_in_alert_targetgroup_with_relabel_config.bad.yml --- 2.31.2+ds1-1/cmd/promtool/testdata/url_in_alert_targetgroup_with_relabel_config.bad.yml 1970-01-01 00:00:00.000000000 +0000 +++ 2.33.5+ds1-2/cmd/promtool/testdata/url_in_alert_targetgroup_with_relabel_config.bad.yml 2022-03-08 16:34:32.000000000 +0000 @@ -0,0 +1,8 @@ +alerting: + alertmanagers: + - relabel_configs: + - source_labels: [__address__] + target_label: __param_target + static_configs: + - targets: + - http://bad diff -pruN 2.31.2+ds1-1/cmd/promtool/testdata/url_in_alert_targetgroup_with_relabel_config.good.yml 2.33.5+ds1-2/cmd/promtool/testdata/url_in_alert_targetgroup_with_relabel_config.good.yml --- 2.31.2+ds1-1/cmd/promtool/testdata/url_in_alert_targetgroup_with_relabel_config.good.yml 1970-01-01 00:00:00.000000000 +0000 +++ 2.33.5+ds1-2/cmd/promtool/testdata/url_in_alert_targetgroup_with_relabel_config.good.yml 2022-03-08 16:34:32.000000000 +0000 @@ -0,0 +1,10 @@ +alerting: + alertmanagers: + - relabel_configs: + - source_labels: [__address__] + target_label: __param_target + - target_label: __address__ + replacement: good + static_configs: + - targets: + - http://bad diff -pruN 2.31.2+ds1-1/cmd/promtool/testdata/url_in_scrape_targetgroup_with_relabel_config.bad.yml 2.33.5+ds1-2/cmd/promtool/testdata/url_in_scrape_targetgroup_with_relabel_config.bad.yml --- 2.31.2+ds1-1/cmd/promtool/testdata/url_in_scrape_targetgroup_with_relabel_config.bad.yml 1970-01-01 00:00:00.000000000 +0000 +++ 2.33.5+ds1-2/cmd/promtool/testdata/url_in_scrape_targetgroup_with_relabel_config.bad.yml 2022-03-08 16:34:32.000000000 +0000 @@ -0,0 +1,8 @@ +scrape_configs: + - job_name: prometheus + relabel_configs: + - source_labels: [__address__] + target_label: __param_target + static_configs: + - targets: + - http://bad diff -pruN 2.31.2+ds1-1/cmd/promtool/testdata/url_in_scrape_targetgroup_with_relabel_config.good.yml 2.33.5+ds1-2/cmd/promtool/testdata/url_in_scrape_targetgroup_with_relabel_config.good.yml --- 2.31.2+ds1-1/cmd/promtool/testdata/url_in_scrape_targetgroup_with_relabel_config.good.yml 1970-01-01 00:00:00.000000000 +0000 +++ 2.33.5+ds1-2/cmd/promtool/testdata/url_in_scrape_targetgroup_with_relabel_config.good.yml 2022-03-08 16:34:32.000000000 +0000 @@ -0,0 +1,10 @@ +scrape_configs: + - job_name: prometheus + relabel_configs: + - source_labels: [__address__] + target_label: __param_target + - target_label: __address__ + replacement: good + static_configs: + - targets: + - http://good diff -pruN 2.31.2+ds1-1/cmd/promtool/tsdb.go 2.33.5+ds1-2/cmd/promtool/tsdb.go --- 2.31.2+ds1-1/cmd/promtool/tsdb.go 2022-01-21 00:33:16.000000000 +0000 +++ 2.33.5+ds1-2/cmd/promtool/tsdb.go 2022-03-08 16:34:32.000000000 +0000 @@ -17,7 +17,6 @@ import ( "bufio" "context" "fmt" - "github.com/prometheus/prometheus/tsdb/index" "io" "io/ioutil" "math" @@ -32,11 +31,14 @@ import ( "text/tabwriter" "time" + "github.com/prometheus/prometheus/storage" + "github.com/prometheus/prometheus/tsdb/index" + "github.com/alecthomas/units" "github.com/go-kit/log" "github.com/pkg/errors" - "github.com/prometheus/prometheus/pkg/labels" + "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/tsdb" "github.com/prometheus/prometheus/tsdb/chunks" tsdb_errors "github.com/prometheus/prometheus/tsdb/errors" @@ -78,7 +80,7 @@ func benchmarkWrite(outPath, samplesFile if err := os.RemoveAll(b.outPath); err != nil { return err } - if err := os.MkdirAll(b.outPath, 0777); err != nil { + if err := os.MkdirAll(b.outPath, 0o777); err != nil { return err } @@ -187,7 +189,7 @@ func (b *writeBenchmark) ingestScrapesSh type sample struct { labels labels.Labels value int64 - ref *uint64 + ref *storage.SeriesRef } scrape := make([]*sample, 0, len(lbls)) @@ -207,7 +209,7 @@ func (b *writeBenchmark) ingestScrapesSh for _, s := range scrape { s.value += 1000 - var ref uint64 + var ref storage.SeriesRef if s.ref != nil { ref = *s.ref } @@ -589,7 +591,7 @@ func analyzeCompaction(block tsdb.BlockR histogram := make([]int, nBuckets) totalChunks := 0 for postingsr.Next() { - var lbsl = labels.Labels{} + lbsl := labels.Labels{} var chks []chunks.Meta if err := indexr.Series(postingsr.At(), &lbsl, &chks); err != nil { return err @@ -671,14 +673,14 @@ func checkErr(err error) int { return 0 } -func backfillOpenMetrics(path string, outputDir string, humanReadable, quiet bool, maxBlockDuration time.Duration) int { +func backfillOpenMetrics(path, outputDir string, humanReadable, quiet bool, maxBlockDuration time.Duration) int { inputFile, err := fileutil.OpenMmapFile(path) if err != nil { return checkErr(err) } defer inputFile.Close() - if err := os.MkdirAll(outputDir, 0777); err != nil { + if err := os.MkdirAll(outputDir, 0o777); err != nil { return checkErr(errors.Wrap(err, "create output dir")) } diff -pruN 2.31.2+ds1-1/cmd/promtool/unittest.go 2.33.5+ds1-2/cmd/promtool/unittest.go --- 2.31.2+ds1-1/cmd/promtool/unittest.go 2022-01-21 00:33:16.000000000 +0000 +++ 2.33.5+ds1-2/cmd/promtool/unittest.go 2022-03-08 16:34:32.000000000 +0000 @@ -30,7 +30,7 @@ import ( "github.com/prometheus/common/model" yaml "gopkg.in/yaml.v2" - "github.com/prometheus/prometheus/pkg/labels" + "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/promql" "github.com/prometheus/prometheus/promql/parser" "github.com/prometheus/prometheus/rules" @@ -47,6 +47,7 @@ func RulesUnitTest(queryOpts promql.Lazy fmt.Fprintln(os.Stderr, " FAILED:") for _, e := range errs { fmt.Fprintln(os.Stderr, e.Error()) + fmt.Println() } failed = true } else { @@ -55,9 +56,9 @@ func RulesUnitTest(queryOpts promql.Lazy fmt.Println() } if failed { - return 1 + return failureExitCode } - return 0 + return successExitCode } func ruleUnitTest(filename string, queryOpts promql.LazyLoaderOpts) []error { @@ -313,30 +314,18 @@ func (tg *testGroup) test(evalInterval t }) } - var sb strings.Builder - if gotAlerts.Len() != expAlerts.Len() { - if tg.TestGroupName != "" { - fmt.Fprintf(&sb, " name: %s,\n", tg.TestGroupName) - } - fmt.Fprintf(&sb, " alertname:%s, time:%s, \n", testcase.Alertname, testcase.EvalTime.String()) - fmt.Fprintf(&sb, " exp:%#v, \n", expAlerts.String()) - fmt.Fprintf(&sb, " got:%#v", gotAlerts.String()) - - errs = append(errs, errors.New(sb.String())) - } else { - sort.Sort(gotAlerts) - sort.Sort(expAlerts) - - if !reflect.DeepEqual(expAlerts, gotAlerts) { - if tg.TestGroupName != "" { - fmt.Fprintf(&sb, " name: %s,\n", tg.TestGroupName) - } - fmt.Fprintf(&sb, " alertname:%s, time:%s, \n", testcase.Alertname, testcase.EvalTime.String()) - fmt.Fprintf(&sb, " exp:%#v, \n", expAlerts.String()) - fmt.Fprintf(&sb, " got:%#v", gotAlerts.String()) + sort.Sort(gotAlerts) + sort.Sort(expAlerts) - errs = append(errs, errors.New(sb.String())) + if !reflect.DeepEqual(expAlerts, gotAlerts) { + var testName string + if tg.TestGroupName != "" { + testName = fmt.Sprintf(" name: %s,\n", tg.TestGroupName) } + expString := indentLines(expAlerts.String(), " ") + gotString := indentLines(gotAlerts.String(), " ") + errs = append(errs, errors.Errorf("%s alertname: %s, time: %s, \n exp:%v, \n got:%v", + testName, testcase.Alertname, testcase.EvalTime.String(), expString, gotString)) } } @@ -385,7 +374,7 @@ Outer: return labels.Compare(gotSamples[i].Labels, gotSamples[j].Labels) <= 0 }) if !reflect.DeepEqual(expSamples, gotSamples) { - errs = append(errs, errors.Errorf(" expr: %q, time: %s,\n exp:%#v\n got:%#v", testCase.Expr, + errs = append(errs, errors.Errorf(" expr: %q, time: %s,\n exp: %v\n got: %v", testCase.Expr, testCase.EvalTime.String(), parsedSamplesString(expSamples), parsedSamplesString(gotSamples))) } } @@ -398,7 +387,6 @@ Outer: // seriesLoadingString returns the input series in PromQL notation. func (tg *testGroup) seriesLoadingString() string { - result := fmt.Sprintf("load %v\n", shortDuration(tg.Interval)) for _, is := range tg.InputSeries { result += fmt.Sprintf(" %v %v\n", is.Series, is.Values) @@ -468,6 +456,23 @@ func query(ctx context.Context, qs strin } } +// indentLines prefixes each line in the supplied string with the given "indent" +// string. +func indentLines(lines, indent string) string { + sb := strings.Builder{} + n := strings.Split(lines, "\n") + for i, l := range n { + if i > 0 { + sb.WriteString(indent) + } + sb.WriteString(l) + if i != len(n)-1 { + sb.WriteRune('\n') + } + } + return sb.String() +} + type labelsAndAnnotations []labelAndAnnotation func (la labelsAndAnnotations) Len() int { return len(la) } @@ -484,11 +489,11 @@ func (la labelsAndAnnotations) String() if len(la) == 0 { return "[]" } - s := "[" + la[0].String() - for _, l := range la[1:] { - s += ", " + l.String() + s := "[\n0:" + indentLines("\n"+la[0].String(), " ") + for i, l := range la[1:] { + s += ",\n" + fmt.Sprintf("%d", i+1) + ":" + indentLines("\n"+l.String(), " ") } - s += "]" + s += "\n]" return s } @@ -499,7 +504,7 @@ type labelAndAnnotation struct { } func (la *labelAndAnnotation) String() string { - return "Labels:" + la.Labels.String() + " Annotations:" + la.Annotations.String() + return "Labels:" + la.Labels.String() + "\nAnnotations:" + la.Annotations.String() } type series struct { diff -pruN 2.31.2+ds1-1/cmd/promtool/unittest_test.go 2.33.5+ds1-2/cmd/promtool/unittest_test.go --- 2.31.2+ds1-1/cmd/promtool/unittest_test.go 2022-01-21 00:33:16.000000000 +0000 +++ 2.33.5+ds1-2/cmd/promtool/unittest_test.go 2022-03-08 16:34:32.000000000 +0000 @@ -37,6 +37,13 @@ func TestRulesUnitTest(t *testing.T) { want: 0, }, { + name: "Long evaluation interval", + args: args{ + files: []string{"./testdata/long-period.yml"}, + }, + want: 0, + }, + { name: "Bad input series", args: args{ files: []string{"./testdata/bad-input-series.yml"}, diff -pruN 2.31.2+ds1-1/config/config.go 2.33.5+ds1-2/config/config.go --- 2.31.2+ds1-1/config/config.go 2022-01-21 00:33:16.000000000 +0000 +++ 2.33.5+ds1-2/config/config.go 2022-03-08 16:34:32.000000000 +0000 @@ -33,8 +33,8 @@ import ( yaml "gopkg.in/yaml.v2" "github.com/prometheus/prometheus/discovery" - "github.com/prometheus/prometheus/pkg/labels" - "github.com/prometheus/prometheus/pkg/relabel" + "github.com/prometheus/prometheus/model/labels" + "github.com/prometheus/prometheus/model/relabel" ) var ( @@ -99,7 +99,7 @@ func Load(s string, expandExternalLabels } // LoadFile parses the given YAML file into a Config. -func LoadFile(filename string, expandExternalLabels bool, logger log.Logger) (*Config, error) { +func LoadFile(filename string, agentMode, expandExternalLabels bool, logger log.Logger) (*Config, error) { content, err := ioutil.ReadFile(filename) if err != nil { return nil, err @@ -108,6 +108,25 @@ func LoadFile(filename string, expandExt if err != nil { return nil, errors.Wrapf(err, "parsing YAML file %s", filename) } + + if agentMode { + if len(cfg.RemoteWriteConfigs) == 0 { + return nil, errors.New("at least one remote_write target must be specified in agent mode") + } + + if len(cfg.AlertingConfig.AlertmanagerConfigs) > 0 || len(cfg.AlertingConfig.AlertRelabelConfigs) > 0 { + return nil, errors.New("field alerting is not allowed in agent mode") + } + + if len(cfg.RuleFiles) > 0 { + return nil, errors.New("field rule_files is not allowed in agent mode") + } + + if len(cfg.RemoteReadConfigs) > 0 { + return nil, errors.New("field remote_read is not allowed in agent mode") + } + } + cfg.SetDirectory(filepath.Dir(filename)) return cfg, nil } @@ -169,7 +188,7 @@ var ( // Backoff times for retrying a batch of samples on recoverable errors. MinBackoff: model.Duration(30 * time.Millisecond), - MaxBackoff: model.Duration(100 * time.Millisecond), + MaxBackoff: model.Duration(5 * time.Second), } // DefaultMetadataConfig is the default metadata configuration for a remote write endpoint. diff -pruN 2.31.2+ds1-1/config/config_test.go 2.33.5+ds1-2/config/config_test.go --- 2.31.2+ds1-1/config/config_test.go 2022-01-21 00:33:16.000000000 +0000 +++ 2.33.5+ds1-2/config/config_test.go 2022-03-08 16:34:32.000000000 +0000 @@ -52,8 +52,8 @@ import ( "github.com/prometheus/prometheus/discovery/uyuni" "github.com/prometheus/prometheus/discovery/xds" "github.com/prometheus/prometheus/discovery/zookeeper" - "github.com/prometheus/prometheus/pkg/labels" - "github.com/prometheus/prometheus/pkg/relabel" + "github.com/prometheus/prometheus/model/labels" + "github.com/prometheus/prometheus/model/relabel" ) func mustParseURL(u string) *config.URL { @@ -227,7 +227,6 @@ var expectedConf = &Config{ }, }, { - JobName: "service-x", HonorTimestamps: true, @@ -784,17 +783,19 @@ var expectedConf = &Config{ Scheme: DefaultScrapeConfig.Scheme, HTTPClientConfig: config.DefaultHTTPClientConfig, - ServiceDiscoveryConfigs: discovery.Configs{&openstack.SDConfig{ - Role: "instance", - Region: "RegionOne", - Port: 80, - Availability: "public", - RefreshInterval: model.Duration(60 * time.Second), - TLSConfig: config.TLSConfig{ - CAFile: "testdata/valid_ca_file", - CertFile: "testdata/valid_cert_file", - KeyFile: "testdata/valid_key_file", - }}, + ServiceDiscoveryConfigs: discovery.Configs{ + &openstack.SDConfig{ + Role: "instance", + Region: "RegionOne", + Port: 80, + Availability: "public", + RefreshInterval: model.Duration(60 * time.Second), + TLSConfig: config.TLSConfig{ + CAFile: "testdata/valid_ca_file", + CertFile: "testdata/valid_cert_file", + KeyFile: "testdata/valid_key_file", + }, + }, }, }, { @@ -808,22 +809,23 @@ var expectedConf = &Config{ Scheme: DefaultScrapeConfig.Scheme, HTTPClientConfig: config.DefaultHTTPClientConfig, - ServiceDiscoveryConfigs: discovery.Configs{&puppetdb.SDConfig{ - URL: "https://puppetserver/", - Query: "resources { type = \"Package\" and title = \"httpd\" }", - IncludeParameters: true, - Port: 80, - RefreshInterval: model.Duration(60 * time.Second), - HTTPClientConfig: config.HTTPClientConfig{ - FollowRedirects: true, - TLSConfig: config.TLSConfig{ - CAFile: "testdata/valid_ca_file", - CertFile: "testdata/valid_cert_file", - KeyFile: "testdata/valid_key_file", + ServiceDiscoveryConfigs: discovery.Configs{ + &puppetdb.SDConfig{ + URL: "https://puppetserver/", + Query: "resources { type = \"Package\" and title = \"httpd\" }", + IncludeParameters: true, + Port: 80, + RefreshInterval: model.Duration(60 * time.Second), + HTTPClientConfig: config.HTTPClientConfig{ + FollowRedirects: true, + TLSConfig: config.TLSConfig{ + CAFile: "testdata/valid_ca_file", + CertFile: "testdata/valid_cert_file", + KeyFile: "testdata/valid_key_file", + }, }, }, }, - }, }, { JobName: "hetzner", @@ -951,7 +953,7 @@ var expectedConf = &Config{ Scheme: DefaultScrapeConfig.Scheme, ServiceDiscoveryConfigs: discovery.Configs{ &uyuni.SDConfig{ - Server: kubernetesSDHostURL(), + Server: "https://localhost:1234", Username: "gopher", Password: "hole", Entitlement: "monitoring_entitled", @@ -986,7 +988,7 @@ var expectedConf = &Config{ } func TestYAMLRoundtrip(t *testing.T) { - want, err := LoadFile("testdata/roundtrip.good.yml", false, log.NewNopLogger()) + want, err := LoadFile("testdata/roundtrip.good.yml", false, false, log.NewNopLogger()) require.NoError(t, err) out, err := yaml.Marshal(want) @@ -999,7 +1001,7 @@ func TestYAMLRoundtrip(t *testing.T) { } func TestRemoteWriteRetryOnRateLimit(t *testing.T) { - want, err := LoadFile("testdata/remote_write_retry_on_rate_limit.good.yml", false, log.NewNopLogger()) + want, err := LoadFile("testdata/remote_write_retry_on_rate_limit.good.yml", false, false, log.NewNopLogger()) require.NoError(t, err) out, err := yaml.Marshal(want) @@ -1015,16 +1017,16 @@ func TestRemoteWriteRetryOnRateLimit(t * func TestLoadConfig(t *testing.T) { // Parse a valid file that sets a global scrape timeout. This tests whether parsing // an overwritten default field in the global config permanently changes the default. - _, err := LoadFile("testdata/global_timeout.good.yml", false, log.NewNopLogger()) + _, err := LoadFile("testdata/global_timeout.good.yml", false, false, log.NewNopLogger()) require.NoError(t, err) - c, err := LoadFile("testdata/conf.good.yml", false, log.NewNopLogger()) + c, err := LoadFile("testdata/conf.good.yml", false, false, log.NewNopLogger()) require.NoError(t, err) require.Equal(t, expectedConf, c) } func TestScrapeIntervalLarger(t *testing.T) { - c, err := LoadFile("testdata/scrape_interval_larger.good.yml", false, log.NewNopLogger()) + c, err := LoadFile("testdata/scrape_interval_larger.good.yml", false, false, log.NewNopLogger()) require.NoError(t, err) require.Equal(t, 1, len(c.ScrapeConfigs)) for _, sc := range c.ScrapeConfigs { @@ -1034,7 +1036,7 @@ func TestScrapeIntervalLarger(t *testing // YAML marshaling must not reveal authentication credentials. func TestElideSecrets(t *testing.T) { - c, err := LoadFile("testdata/conf.good.yml", false, log.NewNopLogger()) + c, err := LoadFile("testdata/conf.good.yml", false, false, log.NewNopLogger()) require.NoError(t, err) secretRe := regexp.MustCompile(`\\u003csecret\\u003e|`) @@ -1051,31 +1053,31 @@ func TestElideSecrets(t *testing.T) { func TestLoadConfigRuleFilesAbsolutePath(t *testing.T) { // Parse a valid file that sets a rule files with an absolute path - c, err := LoadFile(ruleFilesConfigFile, false, log.NewNopLogger()) + c, err := LoadFile(ruleFilesConfigFile, false, false, log.NewNopLogger()) require.NoError(t, err) require.Equal(t, ruleFilesExpectedConf, c) } func TestKubernetesEmptyAPIServer(t *testing.T) { - _, err := LoadFile("testdata/kubernetes_empty_apiserver.good.yml", false, log.NewNopLogger()) + _, err := LoadFile("testdata/kubernetes_empty_apiserver.good.yml", false, false, log.NewNopLogger()) require.NoError(t, err) } func TestKubernetesWithKubeConfig(t *testing.T) { - _, err := LoadFile("testdata/kubernetes_kubeconfig_without_apiserver.good.yml", false, log.NewNopLogger()) + _, err := LoadFile("testdata/kubernetes_kubeconfig_without_apiserver.good.yml", false, false, log.NewNopLogger()) require.NoError(t, err) } func TestKubernetesSelectors(t *testing.T) { - _, err := LoadFile("testdata/kubernetes_selectors_endpoints.good.yml", false, log.NewNopLogger()) + _, err := LoadFile("testdata/kubernetes_selectors_endpoints.good.yml", false, false, log.NewNopLogger()) require.NoError(t, err) - _, err = LoadFile("testdata/kubernetes_selectors_node.good.yml", false, log.NewNopLogger()) + _, err = LoadFile("testdata/kubernetes_selectors_node.good.yml", false, false, log.NewNopLogger()) require.NoError(t, err) - _, err = LoadFile("testdata/kubernetes_selectors_ingress.good.yml", false, log.NewNopLogger()) + _, err = LoadFile("testdata/kubernetes_selectors_ingress.good.yml", false, false, log.NewNopLogger()) require.NoError(t, err) - _, err = LoadFile("testdata/kubernetes_selectors_pod.good.yml", false, log.NewNopLogger()) + _, err = LoadFile("testdata/kubernetes_selectors_pod.good.yml", false, false, log.NewNopLogger()) require.NoError(t, err) - _, err = LoadFile("testdata/kubernetes_selectors_service.good.yml", false, log.NewNopLogger()) + _, err = LoadFile("testdata/kubernetes_selectors_service.good.yml", false, false, log.NewNopLogger()) require.NoError(t, err) } @@ -1086,170 +1088,232 @@ var expectedErrors = []struct { { filename: "jobname.bad.yml", errMsg: `job_name is empty`, - }, { + }, + { filename: "jobname_dup.bad.yml", errMsg: `found multiple scrape configs with job name "prometheus"`, - }, { + }, + { filename: "scrape_interval.bad.yml", errMsg: `scrape timeout greater than scrape interval`, - }, { + }, + { filename: "labelname.bad.yml", errMsg: `"not$allowed" is not a valid label name`, - }, { + }, + { filename: "labelname2.bad.yml", errMsg: `"not:allowed" is not a valid label name`, - }, { + }, + { filename: "labelvalue.bad.yml", errMsg: `"\xff" is not a valid label value`, - }, { + }, + { filename: "regex.bad.yml", errMsg: "error parsing regexp", - }, { + }, + { filename: "modulus_missing.bad.yml", errMsg: "relabel configuration for hashmod requires non-zero modulus", - }, { + }, + { filename: "labelkeep.bad.yml", errMsg: "labelkeep action requires only 'regex', and no other fields", - }, { + }, + { filename: "labelkeep2.bad.yml", errMsg: "labelkeep action requires only 'regex', and no other fields", - }, { + }, + { filename: "labelkeep3.bad.yml", errMsg: "labelkeep action requires only 'regex', and no other fields", - }, { + }, + { filename: "labelkeep4.bad.yml", errMsg: "labelkeep action requires only 'regex', and no other fields", - }, { + }, + { filename: "labelkeep5.bad.yml", errMsg: "labelkeep action requires only 'regex', and no other fields", - }, { + }, + { filename: "labeldrop.bad.yml", errMsg: "labeldrop action requires only 'regex', and no other fields", - }, { + }, + { filename: "labeldrop2.bad.yml", errMsg: "labeldrop action requires only 'regex', and no other fields", - }, { + }, + { filename: "labeldrop3.bad.yml", errMsg: "labeldrop action requires only 'regex', and no other fields", - }, { + }, + { filename: "labeldrop4.bad.yml", errMsg: "labeldrop action requires only 'regex', and no other fields", - }, { + }, + { filename: "labeldrop5.bad.yml", errMsg: "labeldrop action requires only 'regex', and no other fields", - }, { + }, + { filename: "labelmap.bad.yml", errMsg: "\"l-$1\" is invalid 'replacement' for labelmap action", - }, { + }, + { filename: "rules.bad.yml", errMsg: "invalid rule file path", - }, { + }, + { filename: "unknown_attr.bad.yml", errMsg: "field consult_sd_configs not found in type", - }, { + }, + { filename: "bearertoken.bad.yml", errMsg: "at most one of bearer_token & bearer_token_file must be configured", - }, { + }, + { filename: "bearertoken_basicauth.bad.yml", errMsg: "at most one of basic_auth, oauth2, bearer_token & bearer_token_file must be configured", - }, { + }, + { filename: "kubernetes_http_config_without_api_server.bad.yml", errMsg: "to use custom HTTP client configuration please provide the 'api_server' URL explicitly", - }, { + }, + { + filename: "kubernetes_kubeconfig_with_own_namespace.bad.yml", + errMsg: "cannot use 'kubeconfig_file' and 'namespaces.own_namespace' simultaneously", + }, + { + filename: "kubernetes_api_server_with_own_namespace.bad.yml", + errMsg: "cannot use 'api_server' and 'namespaces.own_namespace' simultaneously", + }, + { filename: "kubernetes_kubeconfig_with_apiserver.bad.yml", errMsg: "cannot use 'kubeconfig_file' and 'api_server' simultaneously", - }, { + }, + { filename: "kubernetes_kubeconfig_with_http_config.bad.yml", errMsg: "cannot use a custom HTTP client configuration together with 'kubeconfig_file'", }, { filename: "kubernetes_bearertoken.bad.yml", errMsg: "at most one of bearer_token & bearer_token_file must be configured", - }, { + }, + { filename: "kubernetes_role.bad.yml", errMsg: "role", - }, { + }, + { filename: "kubernetes_selectors_endpoints.bad.yml", errMsg: "endpoints role supports only pod, service, endpoints selectors", - }, { + }, + { filename: "kubernetes_selectors_ingress.bad.yml", errMsg: "ingress role supports only ingress selectors", - }, { + }, + { filename: "kubernetes_selectors_node.bad.yml", errMsg: "node role supports only node selectors", - }, { + }, + { filename: "kubernetes_selectors_pod.bad.yml", errMsg: "pod role supports only pod selectors", - }, { + }, + { filename: "kubernetes_selectors_service.bad.yml", errMsg: "service role supports only service selectors", - }, { + }, + { filename: "kubernetes_namespace_discovery.bad.yml", errMsg: "field foo not found in type kubernetes.plain", - }, { + }, + { filename: "kubernetes_selectors_duplicated_role.bad.yml", errMsg: "duplicated selector role: pod", - }, { + }, + { filename: "kubernetes_selectors_incorrect_selector.bad.yml", errMsg: "invalid selector: 'metadata.status-Running'; can't understand 'metadata.status-Running'", - }, { + }, + { filename: "kubernetes_bearertoken_basicauth.bad.yml", errMsg: "at most one of basic_auth, oauth2, bearer_token & bearer_token_file must be configured", - }, { + }, + { filename: "kubernetes_authorization_basicauth.bad.yml", errMsg: "at most one of basic_auth, oauth2 & authorization must be configured", - }, { + }, + { filename: "marathon_no_servers.bad.yml", errMsg: "marathon_sd: must contain at least one Marathon server", - }, { + }, + { filename: "marathon_authtoken_authtokenfile.bad.yml", errMsg: "marathon_sd: at most one of auth_token & auth_token_file must be configured", - }, { + }, + { filename: "marathon_authtoken_basicauth.bad.yml", errMsg: "marathon_sd: at most one of basic_auth, auth_token & auth_token_file must be configured", - }, { + }, + { filename: "marathon_authtoken_bearertoken.bad.yml", errMsg: "marathon_sd: at most one of bearer_token, bearer_token_file, auth_token & auth_token_file must be configured", - }, { + }, + { filename: "marathon_authtoken_authorization.bad.yml", errMsg: "marathon_sd: at most one of auth_token, auth_token_file & authorization must be configured", - }, { + }, + { filename: "openstack_role.bad.yml", errMsg: "unknown OpenStack SD role", - }, { + }, + { filename: "openstack_availability.bad.yml", errMsg: "unknown availability invalid, must be one of admin, internal or public", - }, { + }, + { filename: "url_in_targetgroup.bad.yml", errMsg: "\"http://bad\" is not a valid hostname", - }, { + }, + { filename: "target_label_missing.bad.yml", errMsg: "relabel configuration for replace action requires 'target_label' value", - }, { + }, + { filename: "target_label_hashmod_missing.bad.yml", errMsg: "relabel configuration for hashmod action requires 'target_label' value", - }, { + }, + { filename: "unknown_global_attr.bad.yml", errMsg: "field nonexistent_field not found in type config.plain", - }, { + }, + { filename: "remote_read_url_missing.bad.yml", errMsg: `url for remote_read is empty`, - }, { + }, + { filename: "remote_write_header.bad.yml", errMsg: `x-prometheus-remote-write-version is a reserved header. It must not be changed`, - }, { + }, + { filename: "remote_read_header.bad.yml", errMsg: `x-prometheus-remote-write-version is a reserved header. It must not be changed`, - }, { + }, + { filename: "remote_write_authorization_header.bad.yml", errMsg: `authorization header must be changed via the basic_auth, authorization, oauth2, or sigv4 parameter`, - }, { + }, + { filename: "remote_write_url_missing.bad.yml", errMsg: `url for remote_write is empty`, - }, { + }, + { filename: "remote_write_dup.bad.yml", errMsg: `found multiple remote write configs with job name "queue1"`, - }, { + }, + { filename: "remote_read_dup.bad.yml", errMsg: `found multiple remote read configs with job name "queue1"`, }, @@ -1377,11 +1441,15 @@ var expectedErrors = []struct { filename: "empty_scrape_config_action.bad.yml", errMsg: "relabel action cannot be empty", }, + { + filename: "uyuni_no_server.bad.yml", + errMsg: "Uyuni SD configuration requires server host", + }, } func TestBadConfigs(t *testing.T) { for _, ee := range expectedErrors { - _, err := LoadFile("testdata/"+ee.filename, false, log.NewNopLogger()) + _, err := LoadFile("testdata/"+ee.filename, false, false, log.NewNopLogger()) require.Error(t, err, "%s", ee.filename) require.Contains(t, err.Error(), ee.errMsg, "Expected error for %s to contain %q but got: %s", ee.filename, ee.errMsg, err) @@ -1415,20 +1483,20 @@ func TestExpandExternalLabels(t *testing // Cleanup ant TEST env variable that could exist on the system. os.Setenv("TEST", "") - c, err := LoadFile("testdata/external_labels.good.yml", false, log.NewNopLogger()) + c, err := LoadFile("testdata/external_labels.good.yml", false, false, log.NewNopLogger()) require.NoError(t, err) require.Equal(t, labels.Label{Name: "bar", Value: "foo"}, c.GlobalConfig.ExternalLabels[0]) require.Equal(t, labels.Label{Name: "baz", Value: "foo${TEST}bar"}, c.GlobalConfig.ExternalLabels[1]) require.Equal(t, labels.Label{Name: "foo", Value: "${TEST}"}, c.GlobalConfig.ExternalLabels[2]) - c, err = LoadFile("testdata/external_labels.good.yml", true, log.NewNopLogger()) + c, err = LoadFile("testdata/external_labels.good.yml", false, true, log.NewNopLogger()) require.NoError(t, err) require.Equal(t, labels.Label{Name: "bar", Value: "foo"}, c.GlobalConfig.ExternalLabels[0]) require.Equal(t, labels.Label{Name: "baz", Value: "foobar"}, c.GlobalConfig.ExternalLabels[1]) require.Equal(t, labels.Label{Name: "foo", Value: ""}, c.GlobalConfig.ExternalLabels[2]) os.Setenv("TEST", "TestValue") - c, err = LoadFile("testdata/external_labels.good.yml", true, log.NewNopLogger()) + c, err = LoadFile("testdata/external_labels.good.yml", false, true, log.NewNopLogger()) require.NoError(t, err) require.Equal(t, labels.Label{Name: "bar", Value: "foo"}, c.GlobalConfig.ExternalLabels[0]) require.Equal(t, labels.Label{Name: "baz", Value: "fooTestValuebar"}, c.GlobalConfig.ExternalLabels[1]) diff -pruN 2.31.2+ds1-1/config/testdata/kubernetes_api_server_with_own_namespace.bad.yml 2.33.5+ds1-2/config/testdata/kubernetes_api_server_with_own_namespace.bad.yml --- 2.31.2+ds1-1/config/testdata/kubernetes_api_server_with_own_namespace.bad.yml 1970-01-01 00:00:00.000000000 +0000 +++ 2.33.5+ds1-2/config/testdata/kubernetes_api_server_with_own_namespace.bad.yml 2022-03-08 16:34:32.000000000 +0000 @@ -0,0 +1,7 @@ +scrape_configs: + - job_name: prometheus + kubernetes_sd_configs: + - role: endpoints + api_server: 'https://localhost:1234' + namespaces: + own_namespace: true diff -pruN 2.31.2+ds1-1/config/testdata/kubernetes_kubeconfig_with_own_namespace.bad.yml 2.33.5+ds1-2/config/testdata/kubernetes_kubeconfig_with_own_namespace.bad.yml --- 2.31.2+ds1-1/config/testdata/kubernetes_kubeconfig_with_own_namespace.bad.yml 1970-01-01 00:00:00.000000000 +0000 +++ 2.33.5+ds1-2/config/testdata/kubernetes_kubeconfig_with_own_namespace.bad.yml 2022-03-08 16:34:32.000000000 +0000 @@ -0,0 +1,7 @@ +scrape_configs: + - job_name: prometheus + kubernetes_sd_configs: + - role: endpoints + kubeconfig_file: /home/User1/.kubeconfig + namespaces: + own_namespace: true diff -pruN 2.31.2+ds1-1/config/testdata/uyuni_no_server.bad.yml 2.33.5+ds1-2/config/testdata/uyuni_no_server.bad.yml --- 2.31.2+ds1-1/config/testdata/uyuni_no_server.bad.yml 1970-01-01 00:00:00.000000000 +0000 +++ 2.33.5+ds1-2/config/testdata/uyuni_no_server.bad.yml 2022-03-08 16:34:32.000000000 +0000 @@ -0,0 +1,4 @@ +scrape_configs: + - job_name: uyuni + uyuni_sd_configs: + - server: diff -pruN 2.31.2+ds1-1/debian/changelog 2.33.5+ds1-2/debian/changelog --- 2.31.2+ds1-1/debian/changelog 2022-01-22 02:07:45.000000000 +0000 +++ 2.33.5+ds1-2/debian/changelog 2022-03-23 22:28:20.000000000 +0000 @@ -1,3 +1,29 @@ +prometheus (2.33.5+ds1-2) unstable; urgency=medium + + * New patch: Avoid literal integer overflows in 32 bit arches. + * debian/rules: Avoid test failures due to newer crypto/x509 + requirements. + + -- Martina Ferrari Wed, 23 Mar 2022 22:28:20 +0000 + +prometheus (2.33.5+ds1-1) unstable; urgency=medium + + * New upstream release. + * debian/gbp.conf: Avoid re-creating orig tarball. + * debian/copyright: Exclude more files from React UI. + * Refresh and reorganise patches. + - Removed 11-Set_temporary_storage_path_for_tsdb.patch as the fix was + implemented upstream. + - Renamed and split 01-Do_not_embed_blobs.patch into + 11-Disable_react_UI.patch and 12-Do_not_embed_blobs.patch to separate + concerns and reflect actual patch order. + * debian/patches: Add classic UI page for agent mode. + * debian/rules: Update test data paths. + * debian/default: Update available flags and descriptions. + * debian/copyright: Update years. + + -- Martina Ferrari Wed, 16 Mar 2022 06:03:09 +0000 + prometheus (2.31.2+ds1-1) unstable; urgency=medium * Team upload. diff -pruN 2.31.2+ds1-1/debian/copyright 2.33.5+ds1-2/debian/copyright --- 2.31.2+ds1-1/debian/copyright 2022-01-21 00:32:14.000000000 +0000 +++ 2.33.5+ds1-2/debian/copyright 2022-03-23 22:28:20.000000000 +0000 @@ -7,6 +7,10 @@ Comment: Upstream embeds many dependenci rest was left embedded. Files-Excluded: vendor + web/ui/build_ui.sh + web/ui/module + web/ui/package.json + web/ui/package-lock.json web/ui/react-app web/ui/static/vendor/bootstrap-4.5.2 web/ui/static/vendor/bootstrap3-typeahead/bootstrap3-typeahead.min.js @@ -22,12 +26,12 @@ Files-Excluded: web/ui/static/vendor/rickshaw Files: * -Copyright: 2012-2020 The Prometheus Authors +Copyright: 2012-2022 The Prometheus Authors License: Apache-2.0 Files: debian/* -Copyright: 2015 Martina Ferrari - 2020-2021 Sipwise GmbH, Austria +Copyright: 2015-2022 Martina Ferrari + 2020-2022 Sipwise GmbH, Austria License: Apache-2.0 Files: web/ui/static/vendor/js/jquery.selection.js diff -pruN 2.31.2+ds1-1/debian/default 2.33.5+ds1-2/debian/default --- 2.31.2+ds1-1/debian/default 2022-01-21 00:32:14.000000000 +0000 +++ 2.33.5+ds1-2/debian/default 2022-03-23 22:28:20.000000000 +0000 @@ -6,85 +6,18 @@ ARGS="" # prometheus supports the following options: # -# --alertmanager.notification-queue-capacity=10000 -# The capacity of the queue for pending Alertmanager notifications. # --config.file="/etc/prometheus/prometheus.yml" # Prometheus configuration file path. -# --enable-feature= -# Comma separated feature names to enable. Valid options: -# exemplar-storage, expand-external-labels, memory-snapshot-on-shutdown, -# promql-at-modifier, promql-negative-offset, remote-write-receiver, -# extra-scrape-metrics, new-service-discovery-manager. See -# https://prometheus.io/docs/prometheus/latest/feature_flags/ for more -# details. -# --log.format=logfmt -# Output format of log messages. One of: [logfmt, json]. -# --log.level=info -# Only log messages with the given severity or above. One of: [debug, info, -# warn, error]. -# --query.lookback-delta=5m -# The maximum lookback duration for retrieving metrics during expression -# evaluations and federation. -# --query.max-concurrency=20 -# Maximum number of queries executed concurrently. -# --query.max-samples=50000000 -# Maximum number of samples a single query can load into memory. Note that -# queries will fail if they try to load more samples than this into memory, -# so this also limits the number of samples a query can return. -# --query.timeout=2m -# Maximum time a query may take before being aborted. -# --rules.alert.for-grace-period=10m -# Minimum duration between alert and restored "for" state. This is -# maintained only for alerts with configured "for" time greater than grace -# period. -# --rules.alert.for-outage-tolerance=1h -# Max time to tolerate prometheus outage for restoring "for" state of alert. -# --rules.alert.resend-delay=1m -# Minimum amount of time to wait before resending an alert to Alertmanager. -# --storage.remote.flush-deadline= -# How long to wait flushing sample on shutdown or config reload. -# --storage.remote.read-concurrent-limit=10 -# Maximum number of concurrent remote read calls. 0 means no limit. -# --storage.remote.read-max-bytes-in-frame=1048576 -# Maximum number of bytes in a single frame for streaming remote read -# response types before marshalling. Note that client might have limit on -# frame size as well. 1MB as recommended by protobuf by default. -# --storage.remote.read-sample-limit=5e7 -# Maximum overall number of samples to return via the remote read interface, -# in a single query. 0 means no limit. This limit is ignored for streamed -# response types. -# --storage.tsdb.allow-overlapping-blocks -# Allow overlapping blocks, which in turn enables vertical compaction and -# vertical query merge. -# --storage.tsdb.path="/var/lib/prometheus/metrics2/" -# Base path for metrics storage. -# --storage.tsdb.retention.size=STORAGE.TSDB.RETENTION.SIZE -# Maximum number of bytes that can be stored for blocks. A unit is required, -# supported units: B, KB, MB, GB, TB, PB, EB. Ex: "512MB". -# --storage.tsdb.retention.time=STORAGE.TSDB.RETENTION.TIME -# How long to retain samples in storage. When this flag is set it overrides -# "storage.tsdb.retention". If neither this flag nor -# "storage.tsdb.retention" nor "storage.tsdb.retention.size" is set, the -# retention time defaults to 15d. Units Supported: y, w, d, h, m, s, ms. -# --storage.tsdb.retention=STORAGE.TSDB.RETENTION -# [DEPRECATED] How long to retain samples in storage. This flag has been -# deprecated, use "storage.tsdb.retention.time" instead. -# --storage.tsdb.use-lockfile -# Create a lockfile in data directory. +# --web.listen-address="0.0.0.0:9090" +# Address to listen on for UI, API, and telemetry. # --web.config.file="" # [EXPERIMENTAL] Path to configuration file that can enable TLS or # authentication. -# --web.console.libraries="/etc/prometheus/console_libraries" -# Path to the console library directory. -# --web.console.templates="/etc/prometheus/consoles" -# Path to the console template directory, available at /consoles. -# --web.cors.origin=".*" -# Regex for CORS origin. It is fully anchored. Example: -# 'https?://(domain1|domain2)\.com'. -# --web.enable-admin-api -# Enable API endpoints for admin control actions. -# --web.enable-lifecycle -# Enable shutdown and reload via HTTP request. +# --web.read-timeout=5m +# Maximum duration before timing out read of the request, and closing idle +# connections. +# --web.max-connections=512 +# Maximum number of simultaneous connections. # --web.external-url= # The URL under which Prometheus is externally reachable (for example, if # Prometheus is served via a reverse proxy). Used for generating relative @@ -92,19 +25,125 @@ ARGS="" # portion, it will be used to prefix all HTTP endpoints served by # Prometheus. If omitted, relevant URL components will be derived # automatically. -# --web.listen-address="0.0.0.0:9090" -# Address to listen on for UI, API, and telemetry. -# --web.local-assets="/usr/share/prometheus/web/" -# Path to static asset/templates directory. -# --web.max-connections=512 -# Maximum number of simultaneous connections. -# --web.page-title="Prometheus Time Series Collection and Processing Server" -# Document title of Prometheus instance. -# --web.read-timeout=5m -# Maximum duration before timing out read of the request, and closing idle -# connections. # --web.route-prefix= # Prefix for the internal routes of web endpoints. Defaults to path of # --web.external-url. +# --web.local-assets="/usr/share/prometheus/web/" +# Path to static asset/templates directory. # --web.user-assets= # Path to user asset directory, available at /user. +# --web.enable-lifecycle +# Enable shutdown and reload via HTTP request. +# --web.enable-admin-api +# Enable API endpoints for admin control actions. +# --web.enable-remote-write-receiver +# Enable API endpoint accepting remote write requests. +# --web.console.templates="/etc/prometheus/consoles" +# Path to the console template directory, available at /consoles. +# --web.console.libraries="/etc/prometheus/console_libraries" +# Path to the console library directory. +# --web.page-title="Prometheus Time Series Collection and Processing Server" +# Document title of Prometheus instance. +# --web.cors.origin=".*" +# Regex for CORS origin. It is fully anchored. +# Example: 'https?://(domain1|domain2)\.com' +# --storage.tsdb.path="/var/lib/prometheus/metrics2/" +# Base path for metrics storage. +# Use with server mode only. +# --storage.tsdb.retention=STORAGE.TSDB.RETENTION +# [DEPRECATED] How long to retain samples in storage. This flag has been +# deprecated, use "storage.tsdb.retention.time" instead. +# Use with server mode only. +# --storage.tsdb.retention.time=STORAGE.TSDB.RETENTION.TIME +# How long to retain samples in storage. +# When this flag is set it overrides "storage.tsdb.retention". If neither +# this flag nor "storage.tsdb.retention" nor "storage.tsdb.retention.size" +# is set, the retention time defaults to 15d. +# Units Supported: y, w, d, h, m, s, ms. +# Use with server mode only. +# --storage.tsdb.retention.size=STORAGE.TSDB.RETENTION.SIZE +# Maximum number of bytes that can be stored for blocks. A unit is required, +# supported units: B, KB, MB, GB, TB, PB, EB. Ex: "512MB". +# Use with server mode only. +# --storage.tsdb.use-lockfile +# Create a lockfile in data directory. +# Use with server mode only. +# --storage.tsdb.allow-overlapping-blocks +# Allow overlapping blocks, which in turn enables vertical compaction and +# vertical query merge. +# Use with server mode only. +# --storage.agent.path="/var/lib/prometheus/data-agent/" +# Base path for metrics storage. +# Use with agent mode only. +# --storage.agent.wal-compression +# Compress the agent WAL. +# Use with agent mode only. +# --storage.agent.retention.min-time=STORAGE.AGENT.RETENTION.MIN-TIME +# Minimum age samples may be before being considered for deletion when the +# WAL is truncated. +# Use with agent mode only. +# --storage.agent.retention.max-time=STORAGE.AGENT.RETENTION.MAX-TIME +# Maximum age samples may be before being forcibly deleted when the WAL is +# truncated. +# Use with agent mode only. +# --storage.agent.use-lockfile +# Create a lockfile in data directory. +# Use with agent mode only. +# --storage.remote.flush-deadline= +# How long to wait flushing sample on shutdown or config reload. +# --storage.remote.read-sample-limit=5e7 +# Maximum overall number of samples to return via the remote read interface, +# in a single query. 0 means no limit. This limit is ignored for streamed +# response types. +# Use with server mode only. +# --storage.remote.read-concurrent-limit=10 +# Maximum number of concurrent remote read calls. 0 means no limit. +# Use with server mode only. +# --storage.remote.read-max-bytes-in-frame=1048576 +# Maximum number of bytes in a single frame for streaming remote read +# response types before marshalling. Note that client might have limit on +# frame size as well. 1MB as recommended by protobuf by default. +# Use with server mode only. +# --rules.alert.for-outage-tolerance=1h +# Max time to tolerate prometheus outage for restoring "for" state of alert. +# Use with server mode only. +# --rules.alert.for-grace-period=10m +# Minimum duration between alert and restored "for" state. This is +# maintained only for alerts with configured "for" time greater than grace +# period. +# Use with server mode only. +# --rules.alert.resend-delay=1m +# Minimum amount of time to wait before resending an alert to Alertmanager. +# Use with server mode only. +# --alertmanager.notification-queue-capacity=10000 +# The capacity of the queue for pending Alertmanager notifications. +# Use with server mode only. +# --query.lookback-delta=5m +# The maximum lookback duration for retrieving metrics during expression +# evaluations and federation. +# Use with server mode only. +# --query.timeout=2m +# Maximum time a query may take before being aborted. +# Use with server mode only. +# --query.max-concurrency=20 +# Maximum number of queries executed concurrently. +# Use with server mode only. +# --query.max-samples=50000000 +# Maximum number of samples a single query can load into memory. Note that +# queries will fail if they try to load more samples than this into memory, +# so this also limits the number of samples a query can return. +# Use with server mode only. +# --enable-feature=... +# Comma separated feature names to enable. +# Valid options: agent, exemplar-storage, expand-external-labels, +# memory-snapshot-on-shutdown, promql-at-modifier, promql-negative-offset, +# remote-write-receiver (DEPRECATED), extra-scrape-metrics, +# new-service-discovery-manager. +# See https://prometheus.io/docs/prometheus/latest/feature_flags/ for more +# details. +# --log.level=info +# Only log messages with the given severity or above. One of: [debug, info, +# warn, error]. +# --log.format=logfmt +# Output format of log messages. One of: [logfmt, json]. + diff -pruN 2.31.2+ds1-1/debian/gbp.conf 2.33.5+ds1-2/debian/gbp.conf --- 2.31.2+ds1-1/debian/gbp.conf 2022-01-21 00:32:14.000000000 +0000 +++ 2.33.5+ds1-2/debian/gbp.conf 2022-03-23 22:28:20.000000000 +0000 @@ -1,3 +1,6 @@ [DEFAULT] debian-branch = debian/sid + +[buildpackage] dist = DEP14 +no-create-orig = True diff -pruN 2.31.2+ds1-1/debian/patches/01-Do_not_embed_blobs.patch 2.33.5+ds1-2/debian/patches/01-Do_not_embed_blobs.patch --- 2.31.2+ds1-1/debian/patches/01-Do_not_embed_blobs.patch 2022-01-21 00:32:14.000000000 +0000 +++ 2.33.5+ds1-2/debian/patches/01-Do_not_embed_blobs.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,302 +0,0 @@ -From: Martina Ferrari -Date: Sat, 20 Jun 2020 15:32:33 -0300 -Subject: Do not embed blobs - -Avoid embedding blobs into the prometheus binary, instead use files -installed on disk. ---- ---- - cmd/prometheus/main.go | 3 + - console_libraries/prom.lib | 17 ++++----- - web/ui/doc.go | 2 + - web/ui/templates/_base.html | 11 ++---- - web/ui/templates/graph.html | 22 +++++------- - web/ui/ui.go | 3 - - web/web.go | 78 +++----------------------------------------- - web/web_test.go | 1 - 8 files changed, 37 insertions(+), 100 deletions(-) - ---- a/cmd/prometheus/main.go -+++ b/cmd/prometheus/main.go -@@ -221,6 +221,9 @@ func main() { - "Prefix for the internal routes of web endpoints. Defaults to path of --web.external-url."). - PlaceHolder("").StringVar(&cfg.web.RoutePrefix) - -+ a.Flag("web.local-assets", "Path to static asset/templates directory."). -+ Default("/usr/share/prometheus/web/").StringVar(&cfg.web.LocalAssets) -+ - a.Flag("web.user-assets", "Path to user asset directory, available at /user."). - PlaceHolder("").StringVar(&cfg.web.UserAssetsPath) - ---- a/console_libraries/prom.lib -+++ b/console_libraries/prom.lib -@@ -1,16 +1,15 @@ - {{/* vim: set ft=html: */}} - {{/* Load Prometheus console library JS/CSS. Should go in */}} - {{ define "prom_console_head" }} -- -- -+ -+ - -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ - - -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ - - -- -+ - -- -+ - - - -@@ -29,7 +28,6 @@ - - - -- - - - ---- a/web/web.go -+++ b/web/web.go -@@ -14,7 +14,6 @@ - package web - - import ( -- "bytes" - "context" - "encoding/json" - "fmt" -@@ -49,7 +48,6 @@ import ( - io_prometheus_client "github.com/prometheus/client_model/go" - "github.com/prometheus/common/model" - "github.com/prometheus/common/route" -- "github.com/prometheus/common/server" - toolkit_web "github.com/prometheus/exporter-toolkit/web" - "go.uber.org/atomic" - "golang.org/x/net/netutil" -@@ -65,23 +63,8 @@ import ( - "github.com/prometheus/prometheus/tsdb/index" - "github.com/prometheus/prometheus/util/httputil" - api_v1 "github.com/prometheus/prometheus/web/api/v1" -- "github.com/prometheus/prometheus/web/ui" - ) - --// Paths that are handled by the React / Reach router that should all be served the main React app's index.html. --var reactRouterPaths = []string{ -- "/alerts", -- "/config", -- "/flags", -- "/graph", -- "/rules", -- "/service-discovery", -- "/status", -- "/targets", -- "/tsdb-status", -- "/starting", --} -- - // withStackTrace logs the stack trace in case the request panics. The function - // will re-raise the error which will then be handled by the net/http package. - // It is needed because the go-kit log package doesn't manage properly the -@@ -237,7 +220,7 @@ type Options struct { - MaxConnections int - ExternalURL *url.URL - RoutePrefix string -- UseLocalAssets bool -+ LocalAssets string - UserAssetsPath string - ConsoleTemplatesPath string - ConsoleLibrariesPath string -@@ -346,16 +329,15 @@ func New(logger log.Logger, o *Options) - readyf := h.testReady - - router.Get("/", func(w http.ResponseWriter, r *http.Request) { -- http.Redirect(w, r, path.Join(o.ExternalURL.Path, "/graph"), http.StatusFound) -+ http.Redirect(w, r, path.Join(o.ExternalURL.Path, "/classic/graph"), http.StatusFound) - }) - router.Get("/classic/", func(w http.ResponseWriter, r *http.Request) { - http.Redirect(w, r, path.Join(o.ExternalURL.Path, "/classic/graph"), http.StatusFound) - }) - -- // Redirect the original React UI's path (under "/new") to its new path at the root. -- router.Get("/new/*path", func(w http.ResponseWriter, r *http.Request) { -- p := route.Param(r.Context(), "path") -- http.Redirect(w, r, path.Join(o.ExternalURL.Path, p)+"?"+r.URL.RawQuery, http.StatusFound) -+ // Catch requests to legacy URLs that would try to hit the "new" web UI -+ router.Get("/graph/", func(w http.ResponseWriter, r *http.Request) { -+ http.Redirect(w, r, path.Join(o.ExternalURL.Path, "/classic/graph")+"?"+r.URL.RawQuery, http.StatusFound) - }) - - router.Get("/classic/alerts", readyf(h.alerts)) -@@ -366,11 +348,7 @@ func New(logger log.Logger, o *Options) - router.Get("/classic/rules", readyf(h.rules)) - router.Get("/classic/targets", readyf(h.targets)) - router.Get("/classic/service-discovery", readyf(h.serviceDiscovery)) -- router.Get("/classic/static/*filepath", func(w http.ResponseWriter, r *http.Request) { -- r.URL.Path = path.Join("/static", route.Param(r.Context(), "filepath")) -- fs := server.StaticFileServer(ui.Assets) -- fs.ServeHTTP(w, r) -- }) -+ router.Get("/classic/static/*filepath", route.FileServe(path.Join(o.LocalAssets, "/static"))) - // Make sure that "/classic" is redirected to "/classic/" and - // not just the naked "/classic/", which would be the default behavior of the router - // with the "RedirectTrailingSlash" option (https://pkg.go.dev/github.com/julienschmidt/httprouter#Router.RedirectTrailingSlash), -@@ -390,48 +368,6 @@ func New(logger log.Logger, o *Options) - - router.Get("/consoles/*filepath", readyf(h.consoles)) - -- serveReactApp := func(w http.ResponseWriter, r *http.Request) { -- f, err := ui.Assets.Open("/static/react/index.html") -- if err != nil { -- w.WriteHeader(http.StatusInternalServerError) -- fmt.Fprintf(w, "Error opening React index.html: %v", err) -- return -- } -- defer func() { _ = f.Close() }() -- idx, err := ioutil.ReadAll(f) -- if err != nil { -- w.WriteHeader(http.StatusInternalServerError) -- fmt.Fprintf(w, "Error reading React index.html: %v", err) -- return -- } -- replacedIdx := bytes.ReplaceAll(idx, []byte("CONSOLES_LINK_PLACEHOLDER"), []byte(h.consolesPath())) -- replacedIdx = bytes.ReplaceAll(replacedIdx, []byte("TITLE_PLACEHOLDER"), []byte(h.options.PageTitle)) -- w.Write(replacedIdx) -- } -- -- // Serve the React app. -- for _, p := range reactRouterPaths { -- router.Get(p, serveReactApp) -- } -- -- // The favicon and manifest are bundled as part of the React app, but we want to serve -- // them on the root. -- for _, p := range []string{"/favicon.ico", "/manifest.json"} { -- assetPath := "/static/react" + p -- router.Get(p, func(w http.ResponseWriter, r *http.Request) { -- r.URL.Path = assetPath -- fs := server.StaticFileServer(ui.Assets) -- fs.ServeHTTP(w, r) -- }) -- } -- -- // Static files required by the React app. -- router.Get("/static/*filepath", func(w http.ResponseWriter, r *http.Request) { -- r.URL.Path = path.Join("/static/react/static", route.Param(r.Context(), "filepath")) -- fs := server.StaticFileServer(ui.Assets) -- fs.ServeHTTP(w, r) -- }) -- - if o.UserAssetsPath != "" { - router.Get("/user/*filepath", route.FileServe(o.UserAssetsPath)) - } -@@ -1076,7 +1012,7 @@ func (h *Handler) getTemplate(name strin - var tmpl string - - appendf := func(name string) error { -- f, err := ui.Assets.Open(path.Join("/templates", name)) -+ f, err := os.Open(filepath.Join(h.options.LocalAssets, "templates", name)) - if err != nil { - return err - } ---- a/web/web_test.go -+++ b/web/web_test.go -@@ -139,6 +139,7 @@ func TestReadyAndHealthy(t *testing.T) { - }, - Version: &PrometheusVersion{}, - Gatherer: prometheus.DefaultGatherer, -+ LocalAssets: "../../../../../../web/ui", - } - - opts.Flags = map[string]string{} ---- a/web/ui/templates/_base.html -+++ b/web/ui/templates/_base.html -@@ -5,13 +5,13 @@ - - {{ pageTitle }} - -- -- -- -+ -+ -+ - -- -+ - -- -+ - - +- +- +- +- +- ++ ++ ++ ++ ++ ++ + + +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ + + +- ++ + +- ++ + + + +@@ -29,7 +28,6 @@ + + + +- + + + +--- a/web/web.go ++++ b/web/web.go +@@ -48,7 +48,6 @@ + io_prometheus_client "github.com/prometheus/client_model/go" + "github.com/prometheus/common/model" + "github.com/prometheus/common/route" +- "github.com/prometheus/common/server" + toolkit_web "github.com/prometheus/exporter-toolkit/web" + "go.uber.org/atomic" + "golang.org/x/net/netutil" +@@ -64,7 +63,6 @@ + "github.com/prometheus/prometheus/tsdb/index" + "github.com/prometheus/prometheus/util/httputil" + api_v1 "github.com/prometheus/prometheus/web/api/v1" +- "github.com/prometheus/prometheus/web/ui" + ) + + // withStackTrace logs the stack trace in case the request panics. The function +@@ -222,7 +220,7 @@ + MaxConnections int + ExternalURL *url.URL + RoutePrefix string +- UseLocalAssets bool ++ LocalAssets string + UserAssetsPath string + ConsoleTemplatesPath string + ConsoleLibrariesPath string +@@ -358,11 +356,7 @@ + router.Get("/classic/rules", readyf(h.rules)) + router.Get("/classic/targets", readyf(h.targets)) + router.Get("/classic/service-discovery", readyf(h.serviceDiscovery)) +- router.Get("/classic/static/*filepath", func(w http.ResponseWriter, r *http.Request) { +- r.URL.Path = path.Join("/static", route.Param(r.Context(), "filepath")) +- fs := server.StaticFileServer(ui.Assets) +- fs.ServeHTTP(w, r) +- }) ++ router.Get("/classic/static/*filepath", route.FileServe(path.Join(o.LocalAssets, "/static"))) + // Make sure that "/classic" is redirected to "/classic/" and + // not just the naked "/classic/", which would be the default behavior of the router + // with the "RedirectTrailingSlash" option (https://pkg.go.dev/github.com/julienschmidt/httprouter#Router.RedirectTrailingSlash), +@@ -1029,7 +1023,7 @@ + var tmpl string + + appendf := func(name string) error { +- f, err := ui.Assets.Open(path.Join("/templates", name)) ++ f, err := os.Open(filepath.Join(h.options.LocalAssets, "templates", name)) + if err != nil { + return err + } +--- a/web/web_test.go ++++ b/web/web_test.go +@@ -142,6 +142,7 @@ + }, + Version: &PrometheusVersion{}, + Gatherer: prometheus.DefaultGatherer, ++ LocalAssets: "../../../../../../web/ui", + } + + opts.Flags = map[string]string{} +--- a/web/ui/templates/_base.html ++++ b/web/ui/templates/_base.html +@@ -5,13 +5,13 @@ + + {{ pageTitle }} + +- +- +- ++ ++ ++ + +- ++ + +- ++ + +