Merge branch 'master' into fabxc/servdisc

synweap15 · May 12, 2015 · 3b0777f · 3b0777f
2 parents 1f2209b + 4234a45
commit 3b0777f
Show file tree

Hide file tree

Showing 80 changed files with 10,887 additions and 9,295 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@
 *.cgo*.c
 *.cgo*.go
 *.conf
+*.rules
 *.exe
 *.orig
 *.pyc

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,23 @@
+## 0.13.3 / 2015-05-11
+* [BUGFIX] Handle fingerprint collisions properly.
+* [CHANGE] Comments in rules file must start with `#`. (The undocumented `//`
+  and `/*...*/` comment styles are no longer supported.)
+* [ENHANCEMENT] Switch to custom expression language parser and evaluation
+  engine, which generates better error messages, fixes some parsing edge-cases,
+  and enables other future enhancements (like the ones below).
+* [ENHANCEMENT] Limit maximum number of concurrent queries.
+* [ENHANCEMENT] Terminate running queries during shutdown.
+
+## 0.13.2 / 2015-05-05
+* [MAINTENANCE] Updated vendored dependcies to their newest versions.
+* [MAINTENANCE] Include rule_checker and console templates in release tarball.
+* [BUGFIX] Sort NaN as the lowest value.
+* [ENHANCEMENT] Add square root, stddev and stdvar functions.
+* [BUGFIX] Use scrape_timeout for scrape timeout, not scrape_interval.
+* [ENHANCEMENT] Improve chunk and chunkDesc loading, increase performance when
+  reading from disk.
+* [BUGFIX] Show correct error on wrong DNS response.
+
 ## 0.13.1 / 2015-04-09
 * [BUGFIX] Treat memory series with zero chunks correctly in series maintenance.
 * [ENHANCEMENT] Improve readability of usage text even more.

diff --git a/Dockerfile b/Dockerfile
@@ -1,30 +1,35 @@
-FROM       golang:1.4
+FROM alpine:edge
 MAINTAINER The Prometheus Authors <prometheus-developers@googlegroups.com>
-RUN        apt-get -qy update && apt-get -qy install vim-common && rm -rf /var/lib/apt/lists/* && \
-           go get github.com/tools/godep
 
-WORKDIR    /go/src/github.com/prometheus/prometheus
-ADD        . /go/src/github.com/prometheus/prometheus
+ENV GOPATH /go
+COPY . /go/src/github.com/prometheus/prometheus
 
-RUN  godep restore && go get -d
-RUN  ./utility/embed-static.sh web/static web/templates | gofmt > web/blob/files.go
-
-RUN  go build -ldflags " \
-       -X main.buildVersion  $(cat VERSION) \
-       -X main.buildRevision $(git rev-parse --short HEAD) \
-       -X main.buildBranch   $(git rev-parse --abbrev-ref HEAD) \
-       -X main.buildUser     root \
-       -X main.buildDate     $(date +%Y%m%d-%H:%M:%S) \
-       -X main.goVersion     $GOLANG_VERSION \
-     "
-RUN  cd tools/rule_checker && go build
-ADD  ./documentation/examples/prometheus.conf /prometheus.conf
+RUN apk add --update -t build-deps go git mercurial vim \
+    && apk add -u musl && rm -rf /var/cache/apk/* \
+    && go get github.com/tools/godep \
+    && cd /go/src/github.com/prometheus/prometheus \
+    && $GOPATH/bin/godep restore && go get -d \
+    && ./utility/embed-static.sh web/static web/templates | gofmt > web/blob/files.go \
+    && go build -ldflags " \
+            -X main.buildVersion  $(cat VERSION) \
+            -X main.buildRevision $(git rev-parse --short HEAD) \
+            -X main.buildBranch   $(git rev-parse --abbrev-ref HEAD) \
+            -X main.buildUser     root \
+            -X main.buildDate     $(date +%Y%m%d-%H:%M:%S) \
+            -X main.goVersion     $(go version | awk '{print substr($3,3)}') \
+        " -o /bin/prometheus \
+    && cd tools/rule_checker && go build -o /bin/rule_checker && cd ../.. \
+    && mkdir -p /etc/prometheus \
+    && mv ./documentation/examples/prometheus.conf /etc/prometheus/prometheus.conf \
+    && mv ./console_libraries/ ./consoles/ /etc/prometheus/ \
+    && rm -rf /go \
+    && apk del --purge build-deps
 
 EXPOSE     9090
 VOLUME     [ "/prometheus" ]
 WORKDIR    /prometheus
-ENTRYPOINT [ "/go/src/github.com/prometheus/prometheus/prometheus" ]
-CMD        [ "-logtostderr", "-config.file=/prometheus.conf", \
+ENTRYPOINT [ "/bin/prometheus" ]
+CMD        [ "-logtostderr", "-config.file=/etc/prometheus/prometheus.conf", \
              "-storage.local.path=/prometheus", \
-             "-web.console.libraries=/go/src/github.com/prometheus/prometheus/console_libraries", \
-             "-web.console.templates=/go/src/github.com/prometheus/prometheus/consoles" ]
+             "-web.console.libraries=/etc/prometheus/console_libraries", \
+             "-web.console.templates=/etc/prometheus/consoles" ]
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/model/metric.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/model/metric.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/model/metric_test.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/model/metric_test.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/model/sample_test.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/model/sample_test.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ @@
     *.cgo*.c
     *.cgo*.go
     *.conf
+    *.rules
     *.exe
     *.orig
     *.pyc
@@ Expand Down @@