Commit graph

5269 commits

Author SHA1 Message Date
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
Matt T. Proud 032373a2c7 Merge pull request #346 from prometheus/refactor/storage/componentize
Componentize Storage Subsystems
2013-08-05 08:50:50 -07:00
Matt T. Proud 2cc666be9d Code Review: Revert. 2013-08-05 17:37:40 +02:00
Matt T. Proud 07ac921aec Code Review: First pass. 2013-08-05 17:31:49 +02:00
Matt T. Proud d8792cfd86 Extract HighWatermarking.
Clean up the rest.
2013-08-05 11:03:03 +02:00
Matt T. Proud f4669a812c Extract index storage into separate types. 2013-08-04 15:31:52 +02:00
Matt T. Proud 772d3d6b11 Consolidate LevelDB storage construction.
There are too many parameters to constructing a LevelDB storage
instance for a construction method, so I've opted to take an
idiomatic approach of embedding them in a struct for easier
mediation and versioning.
2013-08-03 17:25:03 +02:00
Julius Volz fcf784c13c Fix query error notification in tabular view.
Instead of "Unsupported value type" when type="error", the delivered
error message should be shown.
2013-08-02 09:04:13 +02:00
juliusv 4f8a010637 Merge pull request #343 from prometheus/notifications/telemetry
Add notifications telemetry.
2013-07-31 03:48:44 -07:00
Julius Volz e3415e953f Add notifications telemetry. 2013-07-31 12:40:56 +02:00
juliusv 89797e08eb Merge pull request #342 from prometheus/optional-alertmanager
Drop notifications when no alert manager URL is configured.
2013-07-30 15:49:11 -07:00
Julius Volz 24f4bb1f07 Drop notifications when no alert manager URL is configured. 2013-07-31 00:47:46 +02:00
juliusv e969562b13 Merge pull request #341 from prometheus/feature/notifications
Add alertmanager notification support to Prometheus.
2013-07-30 12:16:59 -07:00
Julius Volz 35ee2cd3cb Add alertmanager notification support to Prometheus.
Alert definitions now also have mandatory SUMMARY and DESCRIPTION fields
that get sent along a firing alert to the alert manager.
2013-07-30 17:23:41 +02:00
juliusv 8eb1e8e679 Merge pull request #340 from prometheus/ui/console-null-values
Send [] instead of "null" for empty result vectors, fix retrieval tests
2013-07-25 05:05:48 -07:00
Julius Volz 81f0b85013 Return [] instead of null for empty result vectors. 2013-07-25 12:16:32 +02:00
Julius Volz 331be19af6 Fix broken retrieval tests.
These have been broken since 06b4a40661
2013-07-25 12:15:00 +02:00
juliusv c32dd276df Merge pull request #339 from prometheus/static-caching
Add caching to static assets when served from blob handler.
2013-07-24 10:38:38 -07:00
Julius Volz 4e941255d8 Add caching to static assets when served from blob handler. 2013-07-24 18:52:57 +02:00
juliusv 212775bfc4 Merge pull request #338 from prometheus/ui/bootstrappify-status
Bootstrappify remaining status pages.
2013-07-24 07:14:53 -07:00
Julius Volz 1b9cbaf842 Bootstrappify remaining status pages. 2013-07-24 16:09:34 +02:00
juliusv ce4881d673 Merge pull request #337 from prometheus/ui/alert-tables
Prettify/Bootstrapify alert tables.
2013-07-24 06:10:27 -07:00
Julius Volz 481ee4096b Add no-op silencing links. 2013-07-24 15:09:42 +02:00
Julius Volz d9f403ab7d Prettify/Bootstrapify alert tables. 2013-07-24 15:03:13 +02:00
juliusv f52baf02ab Merge pull request #336 from prometheus/fix/ui-cleanups
JSON-based tabular view and minor UI cleanups
2013-07-24 03:30:12 -07:00
Julius Volz f665534b61 Make quote and semicolon usage consistent in graph.js 2013-07-24 12:29:03 +02:00
Julius Volz c91c100102 Fix graph resize bug when no graph exists. 2013-07-24 12:29:03 +02:00
Julius Volz 9f07f8677a Generate tabular console view from JSON data. 2013-07-24 12:28:59 +02:00