Commit graph

946 commits

Author SHA1 Message Date
Julius Volz 788587426b Make scrape timeouts configurable per job.
Change-Id: I77a7514ad9e7969771f873d63d6353ec50082a62
2013-08-19 12:21:47 +02:00
Matt T. Proud 1e37b23a17 Extract LRUCache into generic cache type.
Change-Id: I402da4de408a44457daeec7497d2393c5f65ab66
2013-08-17 13:57:49 +02:00
Matt T. Proud d74c2c54d4 Interfacification of stream.
Move the stream to an interface, for a number of additional changes
around it are underway.

Conflicts:
	storage/metric/memory.go

Change-Id: I4a5fc176f4a5274a64ebdb1cad52600954c463c3
2013-08-16 17:35:21 +02:00
Matt T. Proud c262907fec Kill interface cruft.
These pieces were never used and should be thusly removed.

Change-Id: I8dd151ec4c40b6d3ccffad1bb9b8b75a92e9ee37
2013-08-15 11:39:07 +02:00
Matt T. Proud b23acccea8 Kill AppendSample interface definition.
AppendSample will be repcated with AppendSamples, which will take
advantage of bulks appends.  This is a necessary step for indexing
pipeline decoupling.

Change-Id: Ia83811a87bcc89973d3b64d64b85a28710253ebc
2013-08-15 11:35:50 +02:00
Matt T. Proud 9c8112a053 Revert "Add flags to build prometheus statically"
This reverts commit 0e9e3e068d.

Not only do we know this to produce problematic artifacts, it refuses
to build on Mac OS X.

    TMPDIR=/tmp GOROOT=/Users/mattproud/Development/go/src/github.com/prometheus/prometheus/.build/root/go GOPATH=/Users/mattproud/Development/go/src/github.com/prometheus/prometheus/.build/root/gopath /Users/mattproud/Development/go/src/github.com/prometheus/prometheus/.build/root/go/bin/go build -o prometheus -ldflags " -X main.buildVersion c7052ed -X main.buildBranch refactor/storage/modify-append-signature -X main.buildUser mattproud@Berlin.local -X main.buildDate 20130815-11:15:49 -X main.goVersion 1.1 -X main.leveldbVersion 1.12.0 -X main.protobufVersion 2.5.0 -X main.snappyVersion 1.1.0 -linkmode external -extldflags '-lstdc++ -lpthread -static /Users/mattproud/Development/go/src/github.com/prometheus/prometheus/.build/root/lib/libleveldb.a /Users/mattproud/Development/go/src/github.com/prometheus/prometheus/.build/root/lib/libsnappy.a'" .
    # _/Users/mattproud/Development/go/src/github.com/prometheus/prometheus
    ld: library not found for -lcrt0.o

Change-Id: I4f42161aebfd35a6f09cd7f984b78cc4498774aa
2013-08-15 11:19:44 +02:00
Julius Volz c7052ede27 Tarball build rule fixups.
Change-Id: Idc4db7e20cd705901ea9ad39a0f7269bbb5572b7
2013-08-14 19:23:28 +02:00
Johannes 'fish' Ziemke 0e9e3e068d Add flags to build prometheus statically
Change-Id: I8fc883247e0657d26aa8ca6f24315fb9217277f3
2013-08-14 19:16:00 +02:00
Matt T. Proud aaaf3367d6 Include forgotten imports.
This fixes the build.

Change-Id: Id132f4342adb9ed20116191086f157ca7f7cf515
2013-08-14 18:52:55 +02:00
Matt T. Proud bd7cd61939 Merge "Build layered indexers." 2013-08-14 11:43:11 +00:00
Matt T. Proud acf91f38bd Build layered indexers.
The indexers will be extracted in a short while and wrapped accordingly with
these types.

Change-Id: I4d1abda4e46117210babad5aa0d42f9ca1f6594f
2013-08-14 13:32:53 +02:00
Matt T. Proud a411a6bdea Merge pull request #361 from prometheus/handle-sigterm
Handle SIGTERM in addition to SIGINT.
2013-08-14 03:42:19 -07:00
Julius Volz 305662bfdd Handle SIGTERM in addition to SIGINT.
Change-Id: I9c91ec7e2b9026b9eb152b98a6986f2bf773eb03
2013-08-14 12:38:21 +02:00
Matt T. Proud 972e856d9b Kill the curation state channel.
The use of the channels for curation state were always unidiomatic.

Change-Id: I1cb1d7175ebfb4faf28dff84201066278d6a0d92
2013-08-13 17:20:22 +02:00
juliusv f8b51c2638 Merge pull request #359 from prometheus/feature/add-global-labels
Add global label support via Ingester.
2013-08-13 08:11:18 -07:00
Julius Volz d69b85e6c9 Add global label support via Ingesters. 2013-08-13 16:54:15 +02:00
Matt T. Proud 417e6ffa0c Rename the queue arguments for another trial.
Again, playing around.

Change-Id: I5413f7723a38ae18792802c5ed91753101adf491

Moving order of arguments by priority.

Testing out patch sets.

Change-Id: I5413f7723a38ae18792802c5ed91753101adf491
2013-08-13 14:05:12 +02:00
Matt T. Proud 014c5ef176 Move version to the bottom.
Again, dummy commit.  Just to demonstrate naive drafting with Gerrit.

Change-Id: I43afaf346c61738a17be60eaa22c966545e1eccf
2013-08-13 13:52:24 +02:00
Matt T. Proud 13bfc6c120 Consolidate queue arguments in main.
This is a no-op commit to demonstrate Gerrit workflow.

Change-Id: I3f09ccd91e4645753517fa31ca97384e7548317f
2013-08-13 13:47:37 +02:00
Matt T. Proud c6bdde5870 Strip notes about GVM.
We no longer use GVM.

Change-Id: Ia9944fb6903becce1c68f19ac22ea9805764ac04
2013-08-13 02:26:20 +02:00
Matt T. Proud 1ceb25b701 Publication of LevelDBMetricPersistence Fields.
This will enable us to break down the onerous construction method.

Change-Id: Ia89337ba39d6745af6757180af2485ec8a990a3b
2013-08-13 00:36:12 +02:00
Julius Volz 0003027dce Add needed trailing spaces in logs. 2013-08-12 18:22:48 +02:00
Julius Volz da420a5b97 Add glog options to "make run" to also log to stderr. 2013-08-12 18:21:38 +02:00
Julius Volz aa5d251f8d Use github.com/golang/glog for all logging. 2013-08-12 17:54:36 +02:00
juliusv 83fb0a9a2d Merge pull request #357 from prometheus/refactor/storage/index-pipelines
Depointerize storage conf. and chain ingester.
2013-08-12 08:17:03 -07:00
Matt T. Proud a5141e4d0a Depointerize storage conf. and chain ingester.
The storage builders need to work with the assumption that they have
a copy of the underlying configuration data if any mutations are made.
2013-08-12 17:07:03 +02:00
juliusv c453445390 Merge pull request #356 from prometheus/refactor/retrieval-ingester
Make retrieval work with client's new Ingester interface.
2013-08-12 06:59:20 -07:00
Johannes 'fish' Ziemke d5f7eeef13 Merge pull request #352 from prometheus/feature/dockerify
Feature/dockerify
2013-08-12 06:55:49 -07:00
Julius Volz f8b20f30ac Make retrieval work with client's new Ingester interface. 2013-08-12 15:15:41 +02:00
juliusv 1800b2f39e Merge pull request #355 from prometheus/feature/interpolation
Add variable interpolation to notification messages.
2013-08-12 04:14:26 -07:00
Julius Volz 3b970c5133 Add variable interpolation to notification messages.
This includes required refactorings to enable replacing the http client (for
testing) and moving the NotificationReq type definitions to the "notifications"
package, so that this package doesn't need to depend on "rules" anymore and
that it can instead use a representation of the required data which only
includes the necessary fields.
2013-08-12 12:29:08 +02:00
juliusv 483f2be3b3 Merge pull request #354 from prometheus/feature/send-prom-metadata
Transfer alerting rule and Prometheus URL to alertmanager.
2013-08-12 03:10:17 -07:00
Johannes 'fish' Ziemke cc5d4c7eda Run prometheus in foreground. 2013-08-12 11:19:55 +02:00
Johannes 'fish' Ziemke b5cc4c6cc8 Fix entrypoint and use base image 2013-08-12 11:19:35 +02:00
Johannes 'fish' Ziemke 1c9ae08e80 Add Dockerfile 2013-08-12 11:02:50 +02:00
Matt T. Proud 974eacf36f Merge pull request #351 from prometheus/refactor/storage/componentize-index
Replace index writes with wrapped interface.
2013-08-11 17:16:05 -07:00
Julius Volz ecf0ee8f39 Transfer alerting rule and Prometheus URL to alertmanager. 2013-08-09 18:32:13 +02:00
Julius Volz c03712dc58 Update config.pb.go (now includes comments from protobuf definition file). 2013-08-07 20:18:20 +02:00
Matt T. Proud 820e551988 Code Review: Nits. 2013-08-07 13:29:10 +02:00
Matt T. Proud a3bf2efdd5 Replace index writes with wrapped interface.
This commit is the first of several and should not be regarded as the
desired end state for these cleanups.  What this one does it, however,
is wrap the query index writing behind an interface type that can be
injected into the storage stack and have its lifecycle managed
separately as needed.  It also would mean we can swap out underlying
implementations to support remote indexing, buffering, no-op indexing
very easily.

In the future, most of the individual index interface members in the
tiered storage will go away in favor of agents that can query and
resolve what they need from the datastore without the user knowing
how and why they work.
2013-08-07 12:15:48 +02:00
juliusv cba2f4b261 Merge pull request #350 from prometheus/tool/rule-checker
Add simple rule file checker tool.
2013-08-06 09:44:35 -07:00
Julius Volz b9c90925dd Add simple rule file checker tool.
This tool does the simple job of checking a Prometheus rule file for validity
and printing the parsed rules if the loading succeeds. This came out of
an immediate need to quickly verify changes to existing rule files.
2013-08-06 18:42:33 +02:00
juliusv 881e3fb6be Merge pull request #349 from prometheus/refactor/storage/componentize
Hot Fix: Use extracted time.
2013-08-06 05:37:36 -07:00
Matt T. Proud 52664f701a Hot Fix: Use extracted time. 2013-08-06 14:18:02 +02:00
Matt T. Proud e373d4c949 Merge pull request #348 from prometheus/refactor/storage/componentize
Replace direct curation table access with wrapper.
2013-08-06 03:49:10 -07:00
Matt T. Proud 38dac35b3e Code Review: Short name consistency. 2013-08-06 12:38:35 +02:00
Matt T. Proud a00f18d78b Code Review: Manual re-alignment. 2013-08-06 12:23:06 +02:00
Matt T. Proud cc989c68e1 Replace direct curation table access with wrapper. 2013-08-06 12:02:52 +02:00
juliusv 669cfdaeee Merge pull request #347 from prometheus/refactor/storage/componentize
Include forgotten interval.
2013-08-05 11:50:47 -07:00
Matt T. Proud 9baaadfc53 Include forgotten interval. 2013-08-05 18:34:19 +02:00