Merge pull request #117 from rhobs/automated-updates-master

Bug 2034192: [bot] Bump openshift/prometheus to v2.32.1

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 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

VERSION

@@ -1 +1 @@
-2.32.0
+2.32.1

cmd/promtool/sd_test.go

@@ -15,6 +15,7 @@ package main
 
 import (
 	"testing"
+	"time"
 
 	"github.com/prometheus/common/model"
 
@@ -37,6 +38,8 @@ func TestSDCheckResult(t *testing.T) {
 	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,
@@ -50,14 +53,14 @@ func TestSDCheckResult(t *testing.T) {
 		{
 			DiscoveredLabels: labels.Labels{
 				labels.Label{Name: "__address__", Value: "localhost:8080"},
-				labels.Label{Name: "__scrape_interval__", Value: "0s"},
-				labels.Label{Name: "__scrape_timeout__", Value: "0s"},
+				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: "0s"},
-				labels.Label{Name: "__scrape_timeout__", Value: "0s"},
+				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"},

rh-manifest.txt

@@ -1,190 +1,159 @@
-@babel/runtime@7.15.4
-@codemirror/autocomplete@0.18.8
-@codemirror/closebrackets@0.18.0
-@codemirror/commands@0.18.3
-@codemirror/comment@0.18.1
-@codemirror/highlight@0.18.4
-@codemirror/history@0.18.1
-@codemirror/language@0.18.2
-@codemirror/lint@0.18.6
-@codemirror/matchbrackets@0.18.0
-@codemirror/panel@0.18.2
-@codemirror/rangeset@0.18.5
-@codemirror/search@0.18.4
-@codemirror/state@0.18.7
-@codemirror/text@0.18.1
-@codemirror/tooltip@0.18.4
-@codemirror/view@0.18.19
+@babel/runtime@7.16.3
+@codemirror/autocomplete@0.19.9
+@codemirror/closebrackets@0.19.0
+@codemirror/commands@0.19.5
+@codemirror/comment@0.19.0
+@codemirror/gutter@0.19.5
+@codemirror/highlight@0.19.6
+@codemirror/history@0.19.0
+@codemirror/language@0.19.6
+@codemirror/lint@0.19.3
+@codemirror/matchbrackets@0.19.3
+@codemirror/panel@0.19.0
+@codemirror/rangeset@0.19.1
+@codemirror/search@0.19.3
+@codemirror/state@0.19.6
+@codemirror/text@0.19.3
+@codemirror/tooltip@0.19.7
+@codemirror/view@0.19.24
 @forevolve/bootstrap-dark@1.1.0
 @fortawesome/fontawesome-common-types@0.2.36
 @fortawesome/fontawesome-svg-core@1.2.36
 @fortawesome/free-solid-svg-icons@5.15.4
-@fortawesome/react-fontawesome@0.1.15
+@fortawesome/react-fontawesome@0.1.16
 @hypnosphi/create-react-context@0.3.1
+@lezer/common@0.15.10
+@lezer/lr@0.15.2
 @nexucis/fuzzy@0.3.0
-@tootallnate/once@1.1.2
-abab@2.0.5
-acorn-globals@6.0.0
-acorn-walk@7.2.0
-acorn@7.4.1
-acorn@8.5.0
-agent-base@6.0.2
+@types/json5@0.0.29
+@types/resize-observer-browser@0.1.6
 anymatch@3.1.2
-asynckit@0.4.0
+arrify@1.0.1
 binary-extensions@2.2.0
-bootstrap@4.6.0
+bootstrap@4.6.1
 braces@3.0.2
-browser-process-hrtime@1.0.0
+buffer-from@1.1.1
 call-bind@1.0.2
-chokidar@3.5.2
+chokidar@3.5.1
 classnames@2.3.1
-codemirror-promql@0.17.0
-colorette@1.3.0
-combined-stream@1.0.8
+codemirror-promql@0.18.0
+colors@0.5.1
 compute-scroll-into-view@1.0.17
 copy-to-clipboard@3.3.1
+core-js@2.5.0
 crelt@1.0.5
 css.escape@1.5.1
-cssom@0.3.8
-cssom@0.4.4
-cssstyle@2.3.0
-data-urls@2.0.0
-debug@4.3.2
-decimal.js@10.3.1
 deep-equal@1.1.1
-deep-is@0.1.4
+deepmerge@2.1.1
 deepmerge@4.2.2
 define-properties@1.1.3
-delayed-stream@1.0.0
+diff@3.4.0
+discontinuous-range@1.0.0
 dom-helpers@3.4.0
 dom-serializer@1.3.2
 domelementtype@2.2.0
-domexception@2.0.1
 domhandler@4.2.2
 domutils@2.8.0
-downshift@3.4.8
+downshift@6.1.7
 entities@2.2.0
 escape-string-regexp@4.0.0
-escodegen@2.0.0
-esprima@4.0.1
-estraverse@5.2.0
-esutils@2.0.3
-fast-levenshtein@2.0.6
 fill-range@7.0.1
-form-data@3.0.1
 fsevents@2.3.2
 function-bind@1.1.1
 get-intrinsic@1.1.1
 glob-parent@5.1.2
+graph@0.1.0
 gud@1.0.0
 has-symbols@1.0.2
 has-tostringtag@1.0.0
 has@1.0.3
 history@4.10.1
 hoist-non-react-statics@3.3.2
-html-encoding-sniffer@2.0.1
 htmlparser2@6.1.0
-http-proxy-agent@4.0.1
-https-proxy-agent@5.0.0
-i@0.3.6
-iconv-lite@0.4.24
+i@0.3.7
 is-arguments@1.1.1
 is-binary-path@2.1.0
 is-date-object@1.0.5
 is-extglob@2.1.1
-is-glob@4.0.1
+is-glob@4.0.3
 is-number@7.0.0
 is-plain-object@5.0.0
-is-potential-custom-element-name@1.0.1
 is-regex@1.1.4
 isarray@0.0.1
 jquery.flot.tooltip@0.9.0
 jquery@3.6.0
 js-tokens@4.0.0
-jsdom@16.7.0
-klona@2.0.4
-levn@0.3.0
-lezer-promql@0.20.0
-lezer-tree@0.13.2
-lezer@0.13.5
-lodash@4.17.21
+json5@1.0.1
+lodash.debounce@4.0.8
+lodash.flattendeep@4.4.0
+lodash.throttle@4.1.1
 loose-envify@1.4.0
 lru-cache@6.0.0
-mime-db@1.49.0
-mime-types@2.1.32
+make-error@1.3.5
 mini-create-react-context@0.4.1
-moment-timezone@0.5.33
+minimist@1.2.5
+mkdirp@0.5.5
+moment-timezone@0.5.34
 moment@2.24.0
 moment@2.29.1
-ms@2.1.2
-nanoid@3.1.25
+nanoid@3.1.30
+nearley@2.7.10
+nomnom@1.6.2
 normalize-path@3.0.0
-nwsapi@2.2.0
 object-assign@4.1.1
 object-is@1.1.5
 object-keys@1.1.1
-optionator@0.8.3
 parse-srcset@1.0.2
-parse5@6.0.1
 path-to-regexp@1.8.0
+picocolors@1.0.0
 picomatch@2.3.0
 popper.js@1.16.1
-postcss@8.3.6
-prelude-ls@1.1.2
+postcss@8.3.11
 prop-types@15.7.2
-psl@1.8.0
-punycode@2.1.1
-raf-schd@4.0.3
+railroad-diagrams@1.0.0
+randexp@0.4.6
 react-copy-to-clipboard@5.0.4
-react-dom@16.14.0
+react-dom@17.0.2
 react-is@16.13.1
+react-is@17.0.2
 react-lifecycles-compat@3.0.4
 react-popper@1.3.11
-react-resize-detector@5.2.0
+react-resize-detector@6.7.6
 react-router-dom@5.3.0
 react-router@5.2.1
-react-test-renderer@16.14.0
+react-shallow-renderer@16.14.1
+react-test-renderer@17.0.2
 react-transition-group@2.9.0
-react@16.14.0
+react@17.0.2
 reactstrap@8.10.0
-readdirp@3.6.0
+readdirp@3.5.0
+regenerator-runtime@0.11.0
 regenerator-runtime@0.13.9
 regexp.prototype.flags@1.3.1
 resize-observer-polyfill@1.5.1
 resolve-pathname@3.0.0
-safer-buffer@2.1.2
-sanitize-html@2.4.0
-sass@1.39.0
-saxes@5.0.1
-scheduler@0.19.1
+ret@0.1.15
+sanitize-html@2.6.0
+sass@1.43.4
+scheduler@0.20.2
 source-map-js@0.6.2
+source-map-support@0.5.10
 source-map@0.6.1
+strip-bom@3.0.0
 style-mod@4.0.0
-symbol-tree@3.2.4
 tempusdominus-bootstrap-4@5.39.0
 tempusdominus-core@5.19.0
 tiny-invariant@1.1.0
 tiny-warning@1.0.3
 to-regex-range@5.0.1
 toggle-selection@1.0.6
-tough-cookie@4.0.0
-tr46@2.1.0
-type-check@0.3.2
+ts-node@7.0.1
+tsconfig-paths@3.5.0
+tslib@2.3.1
 typed-styles@0.0.7
-universalify@0.1.2
-use-media@1.4.0
+underscore@1.4.4
 value-equal@1.0.1
-w3c-hr-time@1.0.2
 w3c-keyname@2.2.4
-w3c-xmlserializer@2.0.0
 warning@4.0.3
-webidl-conversions@5.0.0
-webidl-conversions@6.1.0
-whatwg-encoding@1.0.5
-whatwg-mimetype@2.3.0
-whatwg-url@8.7.0
-word-wrap@1.2.3
-ws@7.5.4
-xml-name-validator@3.0.0
-xmlchars@2.2.0
 yallist@4.0.0
+yn@2.0.0

scrape/scrape.go

@@ -305,7 +305,7 @@ func newScrapePool(cfg *config.ScrapeConfig, app storage.Appendable, jitterSeed
 				return mutateSampleLabels(l, opts.target, opts.honorLabels, opts.mrc)
 			},
 			func(l labels.Labels) labels.Labels { return mutateReportSampleLabels(l, opts.target) },
-			func(ctx context.Context) storage.Appender { return appender(app.Appender(ctx), opts.sampleLimit) },
+			func(ctx context.Context) storage.Appender { return app.Appender(ctx) },
 			cache,
 			jitterSeed,
 			opts.honorTimestamps,
@@ -1426,6 +1426,9 @@ func (sl *scrapeLoop) append(app storage.Appender, b []byte, contentType string,
 		e              exemplar.Exemplar // escapes to heap so hoisted out of loop
 	)
 
+	// Take an appender with limits.
+	app = appender(app, sl.sampleLimit)
+
 	defer func() {
 		if err != nil {
 			return