Commit Graph

3681 Commits (6aee1551e1ec53054d5cbf6464b806339c26ced7)

Author SHA1 Message Date
Fabian Reinartz 1b206efdb9 Merge pull request #1175 from prometheus/format-web-asset
Format web/blob/files.go after generation
2015-10-23 16:50:30 +02:00
Tobias Schmidt ee600cf949 Format web/blob/files.go after generation 2015-10-23 02:51:29 -04:00
Brian Brazil 2a1d7ca33f Merge pull request #1174 from lyda/humanizeTimestamp
Add a humanizeTimestamp to prom.lib.
2015-10-22 14:13:18 +01:00
Kevin Lyda 02960343bb Add a humanizeTimestamp to prom.lib. 2015-10-22 13:57:22 +01:00
Tobias Schmidt 93753a0500 Merge pull request #1173 from claushellsing/patch-1
Update CHANGELOG.md
2015-10-21 01:28:40 -04:00
Rainer Eli f99ef14d7b Update CHANGELOG.md
Small typo fix
2015-10-20 23:25:24 -06:00
Fabian Reinartz f70f998696 Merge pull request #1170 from prometheus/rel0.16.1
Add changelog for 0.16.1
2015-10-16 13:45:33 +02:00
Fabian Reinartz b0da6e2d3e Add changelog for 0.16.1 2015-10-16 13:40:12 +02:00
Fabian Reinartz 51e8badc7f Merge pull request #1159 from prometheus/scalar-bool
promql: Remove scalar/scalar comparisons.
2015-10-16 12:28:56 +02:00
Fabian Reinartz e4229ea6ca Merge pull request #1166 from prometheus/fix-source-building-docs
Fix and improve build-from-source instructions.
2015-10-16 08:53:25 +02:00
Julius Volz 41a7217986 Fix and improve build-from-source instructions.
Fixes https://github.com/prometheus/prometheus/issues/1165
2015-10-15 23:01:26 +02:00
Julius Volz 5a0ce511dc Merge pull request #907 from prometheus/better-autocomplete
Enable autocomplete anywhere in expression.
2015-10-15 22:16:40 +02:00
Julius Volz c27400de21 Recompile web assets for autocomplete change. 2015-10-13 15:18:03 -04:00
Julius Volz 15c58c0f3e Enable autocomplete anywhere in expression.
This enables metric name autocompletion for every word in an expression,
not just the very first one. It would be great to also support all
language keywords during autocompletion in the future.
2015-10-13 15:17:56 -04:00
Julius Volz 28ba85c37a Merge pull request #1162 from fabric8io/kubernetes-discovery
Kubernetes SD: Use node name as instance label
2015-10-13 15:00:52 -04:00
Jimmi Dyson ea9a173008 Kubernetes SD: Use node name as instance label 2015-10-12 21:26:09 +01:00
Brian Brazil c36961130b promql: Remove scalar/scalar comparisons.
This change is breaking, use the 'bool' modifier for such comprisons.

After this change all comparisons without 'bool' will filter, and all
comparisons with 'bool' will return 0/1. This makes the language more
consistent and orthogonal, and ultimately easier to learn and use.

If we ever figure out sane semantics for filtering scalar/scalar
comparisons we can add them in, which will most likely come out of how
the new vector() function is used.
2015-10-11 08:51:04 +01:00
Brian Brazil bbdfb10da1 Merge pull request #1158 from prometheus/delta
promql: Remove deprecated 2nd argument to delta()
2015-10-10 21:24:16 +01:00
Fabian Reinartz 58e08622e8 Merge pull request #1160 from prometheus/escape-regex
consoles: Escape regexes.
2015-10-10 22:16:01 +02:00
Brian Brazil f148179ef7 consoles: Escape regexes.
With the new string handling, some regexes need escaping.
2015-10-10 17:05:46 +01:00
Brian Brazil 5740a8fade promql: Remove deprecated 2nd argument to delta()
This change is breaking, use increase() instead.

I'm not cleaning up the function in this PR, as my solution to #581 will
rewrite and simplify increase/rate/delta.
2015-10-10 15:41:23 +01:00
Brian Brazil 965a71dc4d Merge pull request #1155 from prometheus/irate
promql: Add irate() function
2015-10-10 08:05:05 +01:00
Julius Volz dcb8ba4c68 Correct date of 0.16.0 release in CHANGELOG.md 2015-10-09 22:49:17 +02:00
Brian Brazil f08abdb48b promql: Add irate() function
irate is a rate function that only looks at the most
recent two data points, and calucaltes a per-second value
from that. This produces much more granular graphs for
fast moving data, and works sanely across many scrape intervals.

It doesn't do so well for slowly moving data.
2015-10-09 21:44:35 +01:00
Julius Volz ae5b642d45 Merge pull request #1156 from prometheus/0.16.0
Cut Prometheus 0.16.0.
2015-10-09 22:34:40 +02:00
Julius Volz 31e623485c Cut Prometheus 0.16.0. 2015-10-09 19:19:35 +02:00
Julius Volz 288964eeaf Merge pull request #1151 from prometheus/fix-sd-source-handling
Fix SD mechanism source prefix handling.
2015-10-09 18:21:51 +02:00
Julius Volz d88aea7e6f Fix SD mechanism source prefix handling.
The prefixed target provider changed a pointerized target group that was
reused in the wrapped target provider, causing an ever-increasing chain
of source prefixes in target groups from the Consul target provider.

We now make this bug generally impossible by switching the target group
channel from pointer to value type and thus ensuring that target groups
are copied before being passed on to other parts of the system.

I tried to not let the depointerization leak too far outside of the
channel handling (both upstream and downstream) because I tried that
initially and caused some nasty bugs, which I want to minimize.

Fixes https://github.com/prometheus/prometheus/issues/1083
2015-10-09 14:08:22 +02:00
Julius Volz 0088aa4d45 Merge pull request #1132 from prometheus/fix-quoting-and-escaping
Support escape sequences in strings and add raw strings
2015-10-08 20:51:18 +02:00
Julius Volz dec9fc9c32 Merge pull request #1148 from prometheus/fix-serverset-multiple-paths
Fix watching multiple Zookeeper paths in serverset SD.
2015-10-08 19:27:06 +02:00
Julius Volz 46c5260761 Support escape sequences in strings and add raw strings.
This adapts some functionality from the Go standard library for string
literal lexing and unquoting/unescaping.

The following string types are now supported:

Double- or single-quoted strings:

  These support all escape sequences that Go supports in double-quoted
  string literals. The difference is that Prometheus also has
  single-quoted strings (instead of single-quoted runes in Go). Raw
  newlines are not allowed.

Backtick-quoted raw strings:

  Strings quoted in backticks are treated as raw strings just like in Go
  and may contain raw newlines and other special characters directly.

Fixes https://github.com/prometheus/prometheus/issues/1122
Fixes https://github.com/prometheus/prometheus/issues/1121
2015-10-08 19:17:21 +02:00
Fabian Reinartz 9cba38c6da Merge pull request #1150 from prometheus/kerckhoff-principle
config: Don't hide username, it's not secret.
2015-10-08 16:50:34 +02:00
Brian Brazil 1ddf75240d config: Don't hide username, it's not secret.
Usernames are not generally considered to be secrets,
and treating them as secrets may lead to confusion
as to how secure they are. Obscuring them also makes
debugging harder.
2015-10-08 15:13:21 +01:00
Fabian Reinartz be8b83f48f Merge pull request #1085 from mjibson/elb
Add SD for Amazon EC2 instances
2015-10-08 10:12:43 +02:00
Matt Jibson 5ba5a31e12 vendor EC2 dependencies 2015-10-06 18:36:19 -04:00
Matt Jibson dcb4856d72 Add SD for Amazon EC2 instances 2015-10-06 18:36:17 -04:00
Julius Volz 60cf4015a4 Fix watching multiple Zookeeper paths in serverset SD.
Fix https://github.com/prometheus/prometheus/issues/1137
2015-10-06 15:54:54 +02:00
Fabian Reinartz 5ebef5c025 Merge pull request #1144 from roymiloh/master
Remove duplicated bootstrap js on the graph template
2015-10-06 00:10:33 +02:00
Fabian Reinartz 3e48226e7b Merge pull request #1145 from prometheus/feder
consoles: Remove federation example.
2015-10-06 00:09:14 +02:00
Brian Brazil c3adc9a393 consoles: Remove federation example.
Now that federation is a 1st class feature, there's
no reason to keep this around.
2015-10-05 21:15:01 +01:00
Roy Miloh 189416cb34 Remove duplicated bootstrap js on the graph template, it's already included on the base template. 2015-10-05 22:50:16 +03:00
Fabian Reinartz b0aa877868 Merge pull request #1141 from prometheus/log
Switch to common/log
2015-10-03 14:10:57 +02:00
Fabian Reinartz e3b6ec9784 Switch to common/log 2015-10-03 10:21:43 +02:00
Brian Brazil 91436b2974 Merge pull request #1140 from thachmai/master
Fix example prometheus.yml to use "external_labels" instead of "labels"
2015-10-02 22:40:58 +01:00
Thach MAI 94f4430ff3 Fix example prometheus.yml to use "external_labels" instead of "labels". 2015-10-02 23:00:10 +02:00
Brian Brazil 5caa70ee28 Merge pull request #1138 from prometheus/brian-brazil-patch-1
Mention hactoberfest
2015-10-02 17:09:09 +01:00
Brian Brazil 4b209aa384 Mention Hacktoberfest
As DigitalOcean is linking to this page, direct users to the project list from here.
2015-10-02 17:08:11 +01:00
Julius Volz d025fcd4e2 Merge pull request #1133 from prometheus/escape-string-values
HTML-escape string return values in web UI.
2015-10-01 15:36:11 +02:00
Julius Volz 3008a35c04 HTML-escape string return values in web UI.
Querying for the string literal "<script>alert(1)</script>" would alert
otherwise.
2015-10-01 13:21:39 +02:00
Julius Volz 7e86cd1ef4 Add Unquote() strutil function. 2015-09-30 21:56:25 +02:00