openshift · openshift-merge-robot · Nov 14, 2019 · Sep 25, 2019 · Sep 25, 2019 · Sep 28, 2019
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,14 +2,15 @@
 version: 2.1
 
 orbs:
-  prometheus: prometheus/prometheus@0.1.0
+  prometheus: prometheus/prometheus@0.3.0
+  go: circleci/go@0.2.0
 
 executors:
   # Whenever the Go version is updated here, .travis.yml and .promu.yml
   # should also be updated.
   golang:
     docker:
-    - image: circleci/golang:1.13
+    - image: circleci/golang:1.13-node
 
   fuzzit:
     docker:
@@ -21,10 +22,16 @@ jobs:
 
     steps:
     - prometheus/setup_environment
+    - go/load-cache:
+        key: v1
+    - restore_cache:
+        keys:
+        - v1-npm-deps-{{ checksum "web/ui/react-app/yarn.lock" }}
+        - v1-npm-deps-
     - run:
         command: make
         environment:
-          # Run garbage collection more aggresively to avoid getting OOMed during the lint phase.
+          # Run garbage collection more aggressively to avoid getting OOMed during the lint phase.
           GOGC: "20"
           # By default Go uses GOMAXPROCS but a Circle CI executor has many
           # cores (> 30) while the CPU and RAM resources are throttled. If we
@@ -36,6 +43,12 @@ jobs:
         file: prometheus
     - prometheus/store_artifact:
         file: promtool
+    - go/save-cache:
+        key: v1
+    - save_cache:
+        key: v1-npm-deps-{{ checksum "web/ui/react-app/yarn.lock" }}
+        paths:
+        - web/ui/react-app/node_modules
   fuzzit_regression:
     executor: fuzzit
     working_directory: /go/src/github.com/prometheus/prometheus
@@ -82,6 +95,7 @@ workflows:
         filters:
           branches:
             only: master
+        image: circleci/golang:1-node
     - prometheus/publish_release:
         context: org-context
         requires:
@@ -92,6 +106,7 @@ workflows:
             only: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
           branches:
             ignore: /.*/
+        image: circleci/golang:1-node
   nightly:
     triggers:
       - schedule:

diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,9 @@ benchmark.txt
 !/.golangci.yml
 /documentation/examples/remote_storage/remote_storage_adapter/remote_storage_adapter
 /documentation/examples/remote_storage/example_write_adapter/example_writer_adapter
+
+npm_licenses.tar.bz2
+/web/ui/static/react
+# NOTE(spasquie): unlike upstream, we want the assets to be committed in the repository because build environments don't have access to Yarn and external package repositories.
+# This means that every time we update to a new Prometheus version, 'make assets' should be run and the resulting file committed to the repository.
+#/web/ui/assets_vfsdata.go
diff --git a/.promu.yml b/.promu.yml
@@ -12,7 +12,10 @@ build:
           path: ./cmd/promtool
         - name: tsdbtool
           path: ./tsdb/cmd/tsdb
+    # NOTE(spasquie): Go 1.12 doesn't support '-tags netgo,builtinassets' and promu doesn't support
+    # space-separated tags so the 'ondiskassets' build tag is used instead of 'builtinassets'.
     flags: -mod=vendor -a -tags netgo
+    #flags: -mod=vendor -a -tags netgo,builtinassets
     ldflags: |
         -s
         -X github.com/prometheus/common/version.Version={{.Version}}
@@ -27,6 +30,7 @@ tarball:
         - documentation/examples/prometheus.yml
         - LICENSE
         - NOTICE
+        - npm_licenses.tar.bz2
 crossbuild:
     platforms:
         - linux/amd64

diff --git a/.travis.yml b/.travis.yml
@@ -12,8 +12,11 @@ go_import_path: github.com/prometheus/prometheus
 # random issues on Travis.
 before_install:
 - travis_retry make deps
+- . $HOME/.nvm/nvm.sh
+- nvm install stable
+- nvm use stable
 - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install make; fi
 
 script:
-- make check_license style unused test lint check_assets
+- make check_license style unused test lint
 - git diff --exit-code
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,21 @@
+## 2.14.0 / 2019-11-11
+
+* [SECURITY/BUGFIX] UI: Ensure warnings from the API are escaped. #6279
+* [FEATURE] API: `/api/v1/status/runtimeinfo` and `/api/v1/status/buildinfo` endpoints added for use by the React UI. #6243
+* [FEATURE] React UI: implement the new experimental React based UI. #5694 and many more
+  * Can be found by under `/new`.
+  * Not all pages are implemented yet.
+* [FEATURE] Status: Cardinality statistics added to the Runtime & Build Information page. #6125
+* [ENHANCEMENT/BUGFIX] Remote write: fix delays in remote write after a compaction. #6021
+* [ENHANCEMENT] UI: Alerts can be filtered by state. #5758
+* [BUGFIX] API: lifecycle endpoints return 403 when not enabled. #6057
+* [BUGFIX] Build: Fix Solaris build. #6149
+* [BUGFIX] Promtool: Remove false duplicate rule warnings when checking rule files with alerts. #6270
+* [BUGFIX] Remote write: restore use of deduplicating logger in remote write. #6113
+* [BUGFIX] Remote write: do not reshard when unable to send samples. #6111
+* [BUGFIX] Service discovery: errors are no longer logged on context cancellation. #6116, #6133
+* [BUGFIX] UI: handle null response from API properly. #6071
+
 ## 2.13.1 / 2019-10-16
 
 * [BUGFIX] Fix panic in ARM builds of Prometheus. #6110
@@ -138,7 +156,7 @@ and the memory is available to the kernel when it needs it.
 * [BUGFIX] Check if label value is valid when unmarshaling external labels from YAML. #5316
 * [BUGFIX] Promparse: sort all labels when parsing. #5372
 * [BUGFIX] Reload rules: copy state on both name and labels. #5368
-* [BUGFIX] Exponentation operator to drop metric name in result of operation. #5329
+* [BUGFIX] Exponentiation operator to drop metric name in result of operation. #5329
 * [BUGFIX] Config: resolve more file paths. #5284
 * [BUGFIX] Promtool: resolve relative paths in alert test files. #5336
 * [BUGFIX] Set TLSHandshakeTimeout in HTTP transport. common#179

diff --git a/Dockerfile b/Dockerfile
@@ -10,6 +10,9 @@ COPY .build/${OS}-${ARCH}/promtool          /bin/promtool
 COPY documentation/examples/prometheus.yml  /etc/prometheus/prometheus.yml
 COPY console_libraries/                     /usr/share/prometheus/console_libraries/
 COPY consoles/                              /usr/share/prometheus/consoles/
+COPY LICENSE                                /LICENSE
+COPY NOTICE                                 /NOTICE
+COPY npm_licenses.tar.bz2                   /npm_licenses.tar.bz2
 
 RUN ln -s /usr/share/prometheus/console_libraries /usr/share/prometheus/consoles/ /etc/prometheus/
 RUN mkdir -p /prometheus && \

diff --git a/Dockerfile.ocp b/Dockerfile.ocp
@@ -1,7 +1,13 @@
 FROM registry.svc.ci.openshift.org/openshift/release:golang-1.12 AS builder
 WORKDIR /go/src/github.com/prometheus/prometheus
 COPY . .
-RUN if yum install -y prometheus-promu; then export BUILD_PROMU=false; fi && make build 
+# NOTE(spasquie): the 'build' target regenerates the ReactJS code and the Go
+# assets on the fly.  Build environments don't have access to Yarn and external
+# package repositories so we use the 'common-build' target instead.
+# It means that every time we update to a new Prometheus version, 'make assets'
+# should be run locally and the resulting file (web/ui/assets_vfsdata.go)
+# should be committed to the repository.
+RUN if yum install -y prometheus-promu; then export BUILD_PROMU=false; fi && make common-build
 
 FROM  registry.svc.ci.openshift.org/openshift/origin-v4.0:base
 LABEL io.k8s.display-name="OpenShift Prometheus" \

diff --git a/MAINTAINERS.md b/MAINTAINERS.md
@@ -3,4 +3,6 @@ Maintainers of this repository with their focus areas:
 * Brian Brazil <brian.brazil@robustperception.io> @brian-brazil: Console templates; semantics of PromQL, service discovery, and relabeling.
 * Fabian Reinartz <freinartz@google.com> @fabxc: PromQL parsing and evaluation; implementation of retrieval, alert notification, and service discovery.
 * Julius Volz <julius.volz@gmail.com> @juliusv: Remote storage integrations; web UI.
+* Krasi Georgiev <kgeorgie@redhat.com> @krasi-georgiev: TSDB - the storage engine.
+* Ganesh Vernekar <cs15btech11018@iith.ac.in> @codesome: TSDB - the storage engine.
 
diff --git a/Makefile b/Makefile
@@ -14,6 +14,12 @@
 # Needs to be defined before including Makefile.common to auto-generate targets
 DOCKER_ARCHS ?= amd64 armv7 arm64
 
+REACT_APP_PATH = web/ui/react-app
+REACT_APP_SOURCE_FILES = $(wildcard $(REACT_APP_PATH)/public/* $(REACT_APP_PATH)/src/* $(REACT_APP_PATH)/tsconfig.json)
+REACT_APP_OUTPUT_DIR = web/ui/static/react
+REACT_APP_NODE_MODULES_PATH = $(REACT_APP_PATH)/node_modules
+REACT_APP_NPM_LICENSES_TARBALL = "npm_licenses.tar.bz2"
+
 TSDB_PROJECT_DIR = "./tsdb"
 TSDB_CLI_DIR="$(TSDB_PROJECT_DIR)/cmd/tsdb"
 TSDB_BIN = "$(TSDB_CLI_DIR)/tsdb"
@@ -25,23 +31,60 @@ include Makefile.common
 
 DOCKER_IMAGE_NAME       ?= prometheus
 
+$(REACT_APP_NODE_MODULES_PATH): $(REACT_APP_PATH)/package.json $(REACT_APP_PATH)/yarn.lock
+	cd $(REACT_APP_PATH) && yarn --frozen-lockfile
+
+$(REACT_APP_OUTPUT_DIR): $(REACT_APP_NODE_MODULES_PATH) $(REACT_APP_SOURCE_FILES)
+	@echo ">> building React app"
+	@./scripts/build_react_app.sh
+
 .PHONY: assets
-assets:
+assets: $(REACT_APP_OUTPUT_DIR)
 	@echo ">> writing assets"
-	cd $(PREFIX)/web/ui && GO111MODULE=$(GO111MODULE) $(GO) generate -x -v $(GOOPTS)
+	# Un-setting GOOS and GOARCH here because the generated Go code is always the same,
+	# but the cached object code is incompatible between architectures and OSes (which
+	# breaks cross-building for different combinations on CI in the same container).
+	cd web/ui && GO111MODULE=$(GO111MODULE) GOOS= GOARCH= $(GO) generate -x -v $(GOOPTS)
 	@$(GOFMT) -w ./web/ui
 
-.PHONY: check_assets
-check_assets: assets
-	@echo ">> checking that assets are up-to-date"
-	@if ! (cd $(PREFIX)/web/ui && git diff --exit-code); then \
-		echo "Run 'make assets' and commit the changes to fix the error."; \
-		exit 1; \
-	fi
+.PHONY: react-app-lint
+react-app-lint: 
+	@echo ">> running React app linting"
+	cd $(REACT_APP_PATH) && yarn lint:ci
+
+.PHONY: react-app-lint-fix
+react-app-lint-fix: 
+	@echo ">> running React app linting and fixing errors where possibe"
+	cd $(REACT_APP_PATH) && yarn lint
+
+.PHONY: react-app-test
+react-app-test: | $(REACT_APP_NODE_MODULES_PATH) react-app-lint
+	@echo ">> running React app tests"
+	cd $(REACT_APP_PATH) && yarn test --no-watch --coverage
+
+.PHONY: test
+test: common-test react-app-test
+
+.PHONY: npm_licenses
+npm_licenses: $(REACT_APP_NODE_MODULES_PATH)
+	@echo ">> bundling npm licenses"
+	rm -f $(REACT_APP_NPM_LICENSES_TARBALL)
+	find $(REACT_APP_NODE_MODULES_PATH) -iname "license*" | tar cfj $(REACT_APP_NPM_LICENSES_TARBALL) --transform 's/^/npm_licenses\//' --files-from=-
+
+.PHONY: tarball
+tarball: npm_licenses common-tarball
+
+.PHONY: docker
+docker: npm_licenses common-docker
+
+.PHONY: build
+build: assets common-build
 
+.PHONY: build_tsdb
 build_tsdb:
 	GO111MODULE=$(GO111MODULE) $(GO) build -o $(TSDB_BIN) $(TSDB_CLI_DIR)
 
+.PHONY: bench_tsdb
 bench_tsdb: build_tsdb
 	@echo ">> running benchmark, writing result to $(TSDB_BENCHMARK_OUTPUT_DIR)"
 	@$(TSDB_BIN) bench write --metrics=$(TSDB_BENCHMARK_NUM_METRICS) --out=$(TSDB_BENCHMARK_OUTPUT_DIR) $(TSDB_BENCHMARK_DATASET)

diff --git a/NOTICE b/NOTICE
@@ -85,3 +85,9 @@ go-zookeeper - Native ZooKeeper client for Go
 https://github.com/samuel/go-zookeeper
 Copyright (c) 2013, Samuel Stauffer <samuel@descolada.com>
 See https://github.com/samuel/go-zookeeper/blob/master/LICENSE for license details.
+
+We also use code from a large number of npm packages. For details, see:
+- https://github.com/prometheus/prometheus/blob/master/web/ui/react-app/package.json
+- https://github.com/prometheus/prometheus/blob/master/web/ui/react-app/package-lock.json
+- The individual package licenses as copied from the node_modules directory can be found in
+  the npm_licenses.tar.bz2 archive in release tarballs and Docker images.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Prometheus 
+# Prometheus
 
 [![Build Status](https://travis-ci.org/prometheus/prometheus.svg)][travis]
 [![CircleCI](https://circleci.com/gh/prometheus/prometheus/tree/master.svg?style=shield)][circleci]
@@ -16,7 +16,7 @@ from configured targets at given intervals, evaluates rule expressions,
 displays the results, and can trigger alerts if some condition is observed
 to be true.
 
-Prometheus' main distinguishing features as compared to other monitoring systems are:
+Prometheus's main distinguishing features as compared to other monitoring systems are:
 
 - a **multi-dimensional** data model (timeseries defined by metric name and set of key/value dimensions)
 - a **flexible query language** to leverage this dimensionality
@@ -60,14 +60,23 @@ Prometheus will now be reachable at http://localhost:9090/.
 
 To build Prometheus from the source code yourself you need to have a working
 Go environment with [version 1.13 or greater installed](https://golang.org/doc/install).
+You will also need to have [Node.js](https://nodejs.org/) and [Yarn](https://yarnpkg.com/)
+installed in order to build the frontend assets.
 
 You can directly use the `go` tool to download and install the `prometheus`
 and `promtool` binaries into your `GOPATH`:
 
     $ go get github.com/prometheus/prometheus/cmd/...
     $ prometheus --config.file=your_config.yml
 
-You can also clone the repository yourself and build using `make`:
+*However*, when using `go get` to build Prometheus, Prometheus will expect to be able to
+read its web assets from local filesystem directories under `web/ui/static` and
+`web/ui/templates`. In order for these assets to be found, you will have to run Prometheus
+from the root of the cloned repository. Note also that these directories do not include the
+new experimental React UI unless it has been built explicitly using `make assets` or `make build`.
+
+You can also clone the repository yourself and build using `make build`, which will compile in
+the web assets so that Prometheus can be run from anywhere:
 
     $ mkdir -p $GOPATH/src/github.com/prometheus
     $ cd $GOPATH/src/github.com/prometheus
@@ -78,12 +87,11 @@ You can also clone the repository yourself and build using `make`:
 
 The Makefile provides several targets:
 
-  * *build*: build the `prometheus` and `promtool` binaries
+  * *build*: build the `prometheus` and `promtool` binaries (includes building and compiling in web assets)
   * *test*: run the tests
   * *test-short*: run the short tests
   * *format*: format the source code
   * *vet*: check the source code for common errors
-  * *assets*: rebuild the static assets
   * *docker*: build a docker container for the current `HEAD`
 
 ## More information

diff --git a/RELEASE.md b/RELEASE.md
@@ -56,7 +56,7 @@ For a patch release, work in the branch of the minor release you want to patch.
 
 For a new major or minor release, create the corresponding release branch based on the master branch.
 
-Bump the version in the `VERSION` file and update `CHANGELOG.md`. Do this in a proper PR as this gives others the opportunity to chime in on the release in general and on the addition to the changelog in particular.
+Bump the version in the `VERSION` file and update `CHANGELOG.md`. Do this in a proper PR pointing to the release branch as this gives others the opportunity to chime in on the release in general and on the addition to the changelog in particular.
 
 Note that `CHANGELOG.md` should only document changes relevant to users of Prometheus, including external API changes, performance improvements, and new features. Do not document changes of internal interfaces, code refactorings and clean-ups, changes to the build process, etc. People interested in these are asked to refer to the git history.
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.13.1
+2.14.0
diff --git a/cmd/promtool/main.go b/cmd/promtool/main.go
@@ -324,19 +324,19 @@ type compareRuleType struct {
 	label  map[string]string
 }
 
-func checkDuplicates(r []rulefmt.RuleGroup) []compareRuleType {
+func checkDuplicates(groups []rulefmt.RuleGroup) []compareRuleType {
 	var duplicates []compareRuleType
 
-	for rindex := range r {
-		for index, props := range r[rindex].Rules {
+	for _, group := range groups {
+		for index, rule := range group.Rules {
 			inst := compareRuleType{
-				metric: props.Record,
-				label:  props.Labels,
+				metric: ruleMetric(rule),
+				label:  rule.Labels,
 			}
 			for i := 0; i < index; i++ {
 				t := compareRuleType{
-					metric: r[rindex].Rules[i].Record,
-					label:  r[rindex].Rules[i].Labels,
+					metric: ruleMetric(group.Rules[i]),
+					label:  group.Rules[i].Labels,
 				}
 				if reflect.DeepEqual(t, inst) {
 					duplicates = append(duplicates, t)
@@ -347,6 +347,13 @@ func checkDuplicates(r []rulefmt.RuleGroup) []compareRuleType {
 	return duplicates
 }
 
+func ruleMetric(rule rulefmt.Rule) string {
+	if rule.Alert != "" {
+		return rule.Alert
+	}
+	return rule.Record
+}
+
 var checkMetricsUsage = strings.TrimSpace(`
 Pass Prometheus metrics over stdin to lint them for consistency and correctness.
 

diff --git a/discovery/consul/consul.go b/discovery/consul/consul.go
@@ -357,6 +357,13 @@ func (d *Discovery) watchServices(ctx context.Context, ch chan<- []*targetgroup.
 	elapsed := time.Since(t0)
 	rpcDuration.WithLabelValues("catalog", "services").Observe(elapsed.Seconds())
 
+	// Check the context before in order to exit early.
+	select {
+	case <-ctx.Done():
+		return
+	default:
+	}
+
 	if err != nil {
 		level.Error(d.logger).Log("msg", "Error refreshing service list", "err", err)
 		rpcFailuresCount.Inc()

diff --git a/discovery/dns/dns.go b/discovery/dns/dns.go
@@ -151,7 +151,7 @@ func (d *Discovery) refresh(ctx context.Context) ([]*targetgroup.Group, error) {
 	wg.Add(len(d.names))
 	for _, name := range d.names {
 		go func(n string) {
-			if err := d.refreshOne(ctx, n, ch); err != nil {
+			if err := d.refreshOne(ctx, n, ch); err != nil && err != context.Canceled {
 				level.Error(d.logger).Log("msg", "Error refreshing DNS targets", "err", err)
 			}
 			wg.Done()