Commit Graph

35 Commits

Author SHA1 Message Date
Jimmi Dyson da4c50a6cf Make scheme relabelable via discovery 2015-08-06 12:00:33 +01:00
Brian Brazil d8875d17d8 Retrieval: Make it possible to relabel query params
This only allows relabelling the first value
for a given parameter, this should be sufficient in practice.
2015-07-31 10:09:28 +01:00
Julius Volz 33b7895481 Update vendored dependencies. 2015-07-27 17:48:37 +02:00
Fabian Reinartz dc7d27ab9a retrieval: add honor label handling and parametrized querying.
This commit adds the honor_labels and params arguments to the scrape
config. This allows to specify query parameters used by the scrapers
and handling scraped labels with precedence.
2015-06-23 13:45:14 +02:00
Brian Brazil 4d895242f9 Add support for Zookeeper Serversets for SD.
It can discover an entire tree of serversets, or just one.
2015-06-16 11:02:08 +01:00
Fabian Reinartz db3367e83f config: ensure correct labelname in JSON target group. 2015-06-06 10:08:42 +02:00
Fabian Reinartz 1024900218 Godeps: add github.com/julienschmidt/httprouter 2015-06-03 08:45:43 +02:00
Fabian Reinartz 31c9c5d324 Update client_golang dependency to 0.6.0 2015-06-01 19:28:17 +02:00
Julius Volz a7229565e6 Update all vendored dependency to latest versions. 2015-05-22 13:45:14 +02:00
Julius Volz 267fd34156 Switch Prometheus to use github.com/prometheus/log.
This change is conceptually very simple, although the diff is large. It
switches logging from "github.com/golang/glog" to
"github.com/prometheus/log", while not actually changing any log
messages. V(1)-style logging has been changed to be log.Debug*().
2015-05-20 18:19:32 +02:00
Fabian Reinartz e2ed921505 Merge branch 'master' into fabxc/servdisc 2015-05-20 14:13:08 +02:00
Fabian Reinartz ab4e3ee594 Add consul api package to godeps. 2015-05-20 11:42:17 +02:00
Fabian Reinartz 36016cb308 Add fsnotify to godeps. 2015-05-15 14:44:54 +02:00
Fabian Reinartz 3b0777ff84 Merge branch 'master' into fabxc/servdisc 2015-05-12 15:46:16 +02:00
Fabian Reinartz 5fbde88919 Switch config to YAML format. 2015-05-07 16:52:14 +02:00
Fabian Reinartz 66ecc420ef Add gopkg.in/yaml.v2 godep. 2015-05-07 11:07:04 +02:00
Fabian Reinartz eeca323d24 Merge branch 'master' into promql 2015-05-06 13:04:54 +02:00
beorn7 bb141fd3db Updated vendoring.
This pulls in the required changes in client_golang.
2015-05-06 12:14:05 +02:00
Fabian Reinartz 0b619b46d6 Change JobConfig to ScrapeConfig.
This commit changes the configuration interface from job configs to scrape
configs. This includes allowing multiple ways of target definition at once
and moving DNS SD to its own config message. DNS SD can now contain multiple
DNS names per configured discovery.
2015-04-28 23:18:55 +02:00
Fabian Reinartz 5602328c7c Refactor query evaluation.
This copies the evaluation logic from the current rules/ package.
The new engine handles the execution process from query string to final result.
It provides query timeout and cancellation and general flexibility for
future changes.

functions.go: Add evaluation implementation. Slight changes to in/out data but
	not to the processing logic.
quantile.go: No changes.
analyzer.go: No changes.
engine.go: Actually new part. Mainly consists of evaluation methods
	which were not changed.
setup_test.go: Copy of rules/helpers_test.go to setup test storage.
promql_test.go: Copy of rules/rules_test.go.
2015-04-28 14:19:05 +02:00
Fabian Reinartz 5015c2a0e8 Make target manager source based.
This commit shifts responsibility for maintaining targets from providers and
pools to the target manager. Target groups have a source name that identifies
them for updates.
2015-04-24 15:49:35 +02:00
beorn7 191c728152 Update vendoring. 2015-04-08 18:24:23 +02:00
Julius Volz 18efed761b Update vendored client_golang to 0.3.2.
For the Prometheus server, this fixes a bug where rules with a
right-hand-side that had a metric name would not correctly replace that
metric name with the left-hand side's rule name.
2015-03-11 18:20:02 +01:00
beorn7 b98622094f Add license files left out by godep.
As it looks, `godep update ...` will preserve the files.

Obviously, if you blow away everything and run a `godep save ...` from
scratch, those files will be missing again. A `godep save` to add new
dependencies without blowing away the `Godeps` directory should work
fine, though.
2015-03-04 15:48:51 +01:00
beorn7 5ed3bf2e4b Update vendoring of client_golang to 0.3.1. 2015-03-04 13:42:06 +01:00
beorn7 a18cb29fa8 Update vendored client_golang to v0.3.0. 2015-03-03 18:34:01 +01:00
beorn7 f74f7f2fb1 Re-rewrite import paths.
Another run of 'godep save' fixed the import path.

So you first have to run 'godep update <packages>' and then a 'godep save'.

Let's see if this satisfies Travis.
2015-02-26 22:08:45 +01:00
beorn7 08acf744f7 Update client_golang. 2015-02-26 19:26:44 +01:00
beorn7 784176d572 Update vendoring. 2015-02-26 19:26:43 +01:00
beorn7 a4f6edf496 Vendor client_golang v0.2.0. 2015-02-23 18:11:42 +01:00
beorn7 9827e1ccec Update vendoring of client_golang. 2015-02-22 01:04:52 +01:00
Julius Volz 5643587cc9 Also vendor Prometheus-internal deps and update existing ones. 2015-02-17 02:20:12 +01:00
Julius Volz 740a99a9ac Remove Google Code files, add GitHub files for protobuf lib. 2015-02-17 02:08:56 +01:00
Julius Volz af627bb2b9 Copy vendored deps manually instead of using Godeps.
We were using Godep incorrectly (cloning repos from the internet during
build time instead of including Godeps/_workspace in the GOPATH via
"godep go"). However, to avoid even having to fetch "godeps" from the
internet during build, this now just copies the vendored files into the
GOPATH.

Also, the protocol buffer library moved from Google Code to GitHub,
which is reflected in these updates.

This fixes https://github.com/prometheus/prometheus/issues/525
2015-02-17 02:08:56 +01:00
Stuart Nelson f1c257845f Vendor external dependencies with godep. 2015-01-09 12:00:42 +01:00