Commit graph

3983 commits

Author SHA1 Message Date
beorn7 645f6772e5 Add Consul Address, ServicePort, and ServiceAddress to the meta labels.
In setups where the ServiceAddress is the relevant address for
scraping, users can relabel the `__address__` label to ServiceAddress
+ ":" + ServicePort.

This needs to be documented, of course. Will do once this is LGTM'd.
2015-07-22 18:19:13 +02:00
Björn Rabenstein 31fdb85d2c Merge pull request #919 from prometheus/revert-consul-service-address
Revert "Use Consul ServiceAddress instead of Address when set"
2015-07-22 14:48:32 +02:00
Björn Rabenstein 276dbf8a5d Merge pull request #915 from prometheus/fix-pprof
Fix /debug/pprof endpoint with new web router.
2015-07-22 14:39:43 +02:00
Julius Volz 9d98910fca Revert "Use Consul ServiceAddress instead of Address when set"
This reverts commit 0ac7e7217e.

See discussion on https://github.com/prometheus/prometheus/pull/812 for
reasoning. While fixing one use case, it breaks others, and we need a
more generic way of handling this.
2015-07-22 13:04:29 +02:00
Julius Volz c5c7f92960 Fix /debug/pprof endpoint with new web router.
This got broken in
78047326b4
since it stopped using the DefaultServeMux.

This approach will defer pprof requests to the DefaultServeMux, which
may or may not have pprof enabled (in Prometheus, it gets it included in
main.go). An alternative approach would be to duplicate the four lines in
https://golang.org/src/net/http/pprof/pprof.go#L62. When choosing that
approach though, we would not automatically gain any new endpoints added
by net/http/pprof or other /debug endpoints in the future.
2015-07-22 12:28:46 +02:00
Björn Rabenstein d437fce299 Merge pull request #906 from prometheus/beorn7/release
Cut 0.15.0rc3
2015-07-20 15:04:26 +02:00
beorn7 54be7cabd7 Cut 0.15.0rc3 2015-07-20 14:04:40 +02:00
Fabian Reinartz 5a3712fe1b Merge pull request #903 from prometheus/fabxc/cfgnil
Fix empty configuration file cases
2015-07-18 08:05:55 +02:00
Fabian Reinartz 187fe4e3d3 Fix missing defaults for empty global config blocks 2015-07-17 21:25:56 +02:00
Fabian Reinartz 2a53b107c1 Fix missing defaults in empty configurations 2015-07-17 19:15:01 +02:00
Fabian Reinartz b4aa96c58a Merge pull request #901 from gesellix/patch-1
Update email address
2015-07-17 00:23:59 +02:00
Tobias Gesellchen ceec110541 Update email address
... since the old is not valid anymore (will refuse to accept mails).
2015-07-17 00:17:29 +02:00
Fabian Reinartz 0924e7c830 Merge pull request #900 from prometheus/fabxc/scalar
Restore legacy API scalar format
2015-07-16 23:34:25 +02:00
Fabian Reinartz 62b4e89b39 Restore legacy API scalar format 2015-07-16 20:19:18 +02:00
Björn Rabenstein 742efb4538 Merge pull request #898 from prometheus/beorn7/release
Cut release 0.15.0rc2
2015-07-16 16:26:35 +02:00
beorn7 b590c748ce Cut release 0.15.0rc2 2015-07-16 16:23:43 +02:00
Björn Rabenstein c5d8730150 Merge pull request #880 from prometheus/beorn7/fix
Fix the storage corruption bug.
2015-07-16 15:55:48 +02:00
beorn7 699946bf32 Fix chunk desc loading.
If all samples in consecutive chunks have the same timestamp, the way
we used to load chunks will fail. With this change, the persist
watermark is used to load the right amount of chunkDescs from disk.

This bug is a possible reason for the rare storage corruption we have
observed.
2015-07-16 13:09:20 +02:00
beorn7 4203849c92 Test chunkDesc eviction and loading 2015-07-16 13:09:13 +02:00
Björn Rabenstein 82e2fd8566 Merge pull request #889 from prometheus/monotonicity
Ensure timestamp monotonicity within a series.
2015-07-16 12:55:40 +02:00
beorn7 37e12df9ff Improve TestAppendOutOfOrder 2015-07-16 12:48:33 +02:00
beorn7 502aa9ded5 Use Has instead of Get for existence test. 2015-07-16 12:26:50 +02:00
beorn7 ff08f0b6fe storage: ensure timestamp monotonicity within series.
Fixes https://github.com/prometheus/prometheus/issues/481

While doing so, clean up and fix a few other things:

- Fix `go vet` warnings (@fabxc to blame ;).

- Fix a racey problem with unarchiving: Whenever we unarchive a
  series, we essentially want to do something with it. However, until
  we have done something with it, it appears like a series that is
  ready to be archived or even purged. So e.g. it would be ignored
  during checkpointing. With this fix, we always load the chunkDescs
  upon unarchiving. This is wasteful if we only want to add a new
  sample to an archived time series, but the (presumably more common)
  case where we access an archived time series in a query doesn't
  become more expensive.

- The change above streamlined the getOrCreateSeries ond
  newMemorySeries flow. Also, the modTime is now always set correctly.

- Fix the leveldb-backed implementation of KeyValueStore.Delete. It
  had the wrong behavior of still returning true, nil if a
  non-existing key has been passed in.
2015-07-15 18:56:53 +02:00
Fabian Reinartz 0834bd03b5 Merge pull request #892 from prometheus/fabxc/cfgfix
config: add overflow detection for serverset config
2015-07-14 14:50:26 +02:00
Fabian Reinartz 435fc7234f config: add overflow detection for serverset config 2015-07-14 02:46:00 +02:00
Julius Volz 1c25247a75 Merge pull request #890 from prometheus/fix-float-conversions
storage: Fix float->uint conversions on some compilers.
2015-07-13 12:58:13 +02:00
Julius Volz acbc2b8cb6 storage: Fix float->uint conversions on some compilers.
See https://github.com/prometheus/prometheus/issues/887, which will at
least be partially fixed by this.

From the spec https://golang.org/ref/spec#Conversions:

"In all non-constant conversions involving floating-point or complex
values, if the result type cannot represent the value the conversion
succeeds but the result value is implementation-dependent."

This ended up setting the converted values to 0 on Debian's Go 1.4.2
compiler, at least on 32-bit Debians.
2015-07-13 11:19:11 +02:00
Brian Brazil 87b9813be4 Merge pull request #883 from brian-brazil/fix-menu
web: Fix regression in .Path
2015-07-10 10:38:30 +01:00
Brian Brazil 7b5a29fc8f web: Fix regression in .Path
.Path is documented as removing /consoles/,
recent changes added in a leading / which broke
the provided console templates menu system.
2015-07-10 10:31:35 +01:00
Fabian Reinartz 8b53ffb0be Merge pull request #885 from prometheus/fabxc/retrace
retrieval: avoid race conditions
2015-07-09 18:20:04 -06:00
Fabian Reinartz b0efbf8c98 Merge pull request #886 from prometheus/fabxc/fixui
web/js: fix display error for vectors in console
2015-07-09 16:46:15 -06:00
Fabian Reinartz 9e599976c4 web/js: fix display error for vectors in console 2015-07-10 00:43:43 +02:00
Julius Volz a5093e08a0 Merge pull request #882 from prometheus/export-buildinfo
Export build information as metric.
2015-07-08 18:03:54 -06:00
Fabian Reinartz d53cc7935d retrieval: avoid race conditions 2015-07-08 21:27:52 +02:00
Julius Volz 6b3c7de727 Export build information as metric.
There is more build information that could be put into labels, but
Version, Revision, and Branch seemed like the right level of detail to
me.
2015-07-07 23:29:59 -06:00
Johannes 'fish' Ziemke 1d6d39a9ed Merge pull request #881 from sdurrheimer/glibc
New dockerfile using alpine-glibc base image and make
2015-07-07 13:07:38 -07:00
Steve Durrheimer 2b025c0f49 New dockerfile using alpine-glibc base image and make 2015-07-07 21:57:58 +02:00
Björn Rabenstein aea906123d Merge pull request #879 from prometheus/beorn7/makefile
Fix the race condition targets in the Makefile.
2015-07-07 00:18:26 +02:00
beorn7 b55a71a30c Fix the race condition targets in the Makefile.
Remove race_condition_run as the original run target has been removed, too.

Fix the race_condition_binary target.
2015-07-06 22:26:41 +02:00
Fabian Reinartz 86474f3b0e Merge pull request #876 from prometheus/fabxc/authhide
config: hide authentication credentials in String() output
2015-07-06 18:35:14 +02:00
Fabian Reinartz 02e06839f2 config: hide authentication credentials in String() output 2015-07-06 14:28:07 +02:00
Fabian Reinartz f515559a96 Merge pull request #872 from prometheus/fabxc/vecfix
promql: marshal sample pairs to JSON tuples.
2015-07-06 13:46:10 +02:00
Fabian Reinartz 75ba840d88 web/js: adjust Javascript to new response format 2015-07-06 13:09:26 +02:00
Fabian Reinartz 3d67d75935 promql: implement JSON array format for scalar and string 2015-07-06 13:09:26 +02:00
Fabian Reinartz 834cec44cf httputil: remove non-general helper functions 2015-07-06 10:30:00 +02:00
Fabian Reinartz 77e8983221 promql: add MarshalJSON method for SamplePair 2015-07-06 10:29:59 +02:00
Fabian Reinartz 92c20168c4 Merge pull request #874 from prometheus/fabxc/cfgfix
resolve rule files relative to config file.
2015-07-03 16:15:16 +02:00
Julius Volz d4f1402444 Merge pull request #873 from prometheus/global-url-tests
Add tests for "globalURL" template function.
2015-07-03 15:24:05 +02:00
Fabian Reinartz 7e615dcdf0 cmd/promtool: resolve rule files relative to config file 2015-07-03 15:10:37 +02:00
Fabian Reinartz feb8a03503 rules: load rule files relative to a base dir 2015-07-03 15:10:37 +02:00