Commit graph

2473 commits

Author SHA1 Message Date
Fabian Reinartz b683581f8f Merge pull request #1285 from prometheus/fix-rate-consoles
All console expressions should use irate.
2016-01-05 13:14:31 +01:00
Brian Brazil 544f3d6cee All console expressions should use irate. 2016-01-05 11:53:22 +00:00
Brian Brazil 0109300963 Merge pull request #1283 from prometheus/venup
Upgrade common/log vendoring.
2016-01-04 13:54:41 +00:00
Fabian Reinartz cadca0aa23 Upgrade common/log vendoring.
Fixes #1186
2016-01-04 14:48:35 +01:00
Brian Brazil 329670e743 Merge pull request #1282 from prometheus/document-idb-pw
Document INFLUXDB_PW env var in username flag
2016-01-04 00:01:37 +00:00
Julius Volz 87d1831f12 Document INFLUXDB_PW env var in username flag
Fixes https://github.com/prometheus/prometheus/issues/1281
2016-01-04 00:18:41 +01:00
Brian Brazil 55e85a8c2e Merge pull request #1279 from prometheus/sort
Similar to topk/bottomk, have sort/sort_desc put NaN at end.
2015-12-31 15:01:42 +00:00
Brian Brazil bac1f28cad Similar to topk/bottomk, have sort/sort_desc put NaN at end.
This makes topk and bottomk consistent with the sorting functions,
as per #1271.
2015-12-31 14:52:48 +00:00
Fabian Reinartz 60287319d3 Merge pull request #1272 from prometheus/labelskw
Change WITH keyword to LABELS
2015-12-23 15:14:03 +01:00
Fabian Reinartz 4209ec6864 Change WITH keyword to LABELS 2015-12-23 14:54:02 +01:00
Fabian Reinartz 92c851f322 Merge pull request #1266 from prometheus/ruels
rules/ refactoring
2015-12-23 12:36:00 +01:00
Fabian Reinartz 0cf3c6a9ef Add comments, rename a method 2015-12-23 12:29:28 +01:00
Brian Brazil 27dd8065ca Merge pull request #1271 from prometheus/topk-nan
Make topk/bottomk prefer returning real numbers over NaN.
2015-12-22 14:50:43 +00:00
Brian Brazil 88ca82304c Make topk/bottomk prefer returning real numbers over NaN. 2015-12-22 13:53:43 +00:00
Brian Brazil edf3e123f5 Move topk/bottomk tests from legacy. 2015-12-22 12:38:32 +00:00
Fabian Reinartz bf6abac8f4 Send resolved notifications 2015-12-17 15:42:26 +01:00
Fabian Reinartz f69e668fc4 Improve rules/ instrumentation
This commit adds a counter for the total number of rule evaluations
and standardizes the units to seconds.
2015-12-17 15:42:26 +01:00
Fabian Reinartz 62075aa037 Reduce noisy no-alertmanager warning 2015-12-17 15:42:26 +01:00
Fabian Reinartz 52e5224f5a Refactor rules/ package 2015-12-17 15:42:25 +01:00
Fabian Reinartz e4fabe135a Set StartsAt to time of first firing state 2015-12-17 11:36:58 +01:00
Fabian Reinartz e34f0fd0b5 Merge pull request #1268 from prometheus/fedfix
Don't federate stale samples
2015-12-16 14:05:53 +01:00
Fabian Reinartz b35e25a082 Don't federate stale samples 2015-12-16 13:45:44 +01:00
Fabian Reinartz 5af6dda58c Merge pull request #1263 from prometheus/notify
Annotations for alerting rules
2015-12-14 10:19:34 +01:00
Fabian Reinartz 7c90db22ed Use annotation based alerts in rules/
This commit breaks the previously used alert format.
2015-12-14 10:16:07 +01:00
Fabian Reinartz af3a6661ed Implement new alerting rule syntax 2015-12-11 17:02:34 +01:00
Fabian Reinartz a8c0307db4 Merge pull request #1262 from prometheus/notify
Notification handler
2015-12-11 15:43:48 +01:00
Fabian Reinartz 2c8a96ecdc Adjust notification handler flags 2015-12-11 15:17:32 +01:00
Fabian Reinartz e114ce0ff7 Refactor notification handler 2015-12-11 15:17:32 +01:00
Fabian Reinartz 5635d6bd13 Vendor ctxhttp package 2015-12-10 16:32:04 +01:00
Brian Brazil 6b7629be27 Merge pull request #1242 from tommyulfsparre/watcher-fix
Reduces watches in serverset
2015-12-10 10:43:57 +00:00
Brian Brazil 3270fa6afe Merge pull request #1260 from prometheus/validate
Update common/{expfmt,model}
2015-12-10 10:25:20 +00:00
Fabian Reinartz e0f70ed5ca Update common/{expfmt,model}
Closes #1232
2015-12-10 11:19:46 +01:00
Jimmi Dyson e1a8e74e0b Merge pull request #1257 from fabric8io/kubernetes-discovery
Kubernetes SD: Use first TCP service port as target port & clean up example config
2015-12-08 11:25:56 +00:00
Jimmi Dyson c12fb447b8 Kubernetes SD: Use first TCP service port as target port & clean up
example config

Fixes #1256
2015-12-08 10:29:40 +00:00
Tommy Ulfsparre 83e09422bf skip already watched child nodes. 2015-12-02 21:31:05 +01:00
Fabian Reinartz e3cf96c8fc Merge pull request #1248 from prometheus/panic
Do not panic in Consul SD creation
2015-11-30 18:47:46 +01:00
Fabian Reinartz 29a69eecb8 Do not panic in Consul SD creation 2015-11-30 18:41:48 +01:00
Brian Brazil 953b3bf849 Merge pull request #1244 from prometheus/template-missing-zero
template: Use zero-values for missing values.
2015-11-29 16:00:56 +00:00
Brian Brazil 738af32057 template: Use zero-values for missing values.
Currently missing values will get the value <no value>
rather than the empty string. Using the empty string is
more consistent, and should be easier for users to deal with too.
2015-11-28 13:45:32 +00:00
Brian Brazil aa5b35ed94 Merge pull request #1231 from jamessanford/clamp_function
promql: Add clamp function.
2015-11-27 00:05:34 +00:00
James Sanford 5b53262b7a promql: Add clamp_max/clamp_min functions. 2015-11-26 13:38:06 -08:00
Jimmi Dyson de21676667 Merge pull request #1240 from fabric8io/kubernetes-discovery
Kubernetes SD: Fix metrics path relabeling in example config
2015-11-25 10:35:06 +00:00
Jimmi Dyson 042f18b07a Kubernetes SD: Fix metrics path relabeling in example config 2015-11-25 10:27:11 +00:00
Fabian Reinartz 5f52ed3202 Merge pull request #1225 from fabric8io/kubernetes-discovery
KubernetesSD: Create targets for services as well as service endpoints
2015-11-18 17:05:59 +01:00
Jimmi Dyson 645feba8cf KubernetesSD: Remove redundant defaults from example config 2015-11-18 14:24:30 +00:00
Jimmi Dyson 2cca07381b KubernetesSD: Create targets for services as well as service endpoints 2015-11-18 14:15:39 +00:00
Fabian Reinartz 6c3a2eab7c Merge pull request #1226 from prometheus/rlbldef
Add new defaults for relabel configurations
2015-11-17 15:18:21 +01:00
Fabian Reinartz 4d1c9296d5 Add new defaults for relabel configurations 2015-11-16 13:16:13 +01:00
Brian Brazil 489921fe3b Merge pull request #1224 from prometheus/offset-print
Print offsets in promql.
2015-11-15 16:26:57 +00:00
Brian Brazil a287264989 Print offsets in promql. 2015-11-15 16:24:29 +00:00