Fabian Reinartz
5b7411e80a
Merge pull request #1204 from prometheus/port-after-relabel
...
Add in default port after relabelling.
2015-11-09 12:31:20 +01:00
Julius Volz
5b5dc5672a
Merge pull request #1205 from prometheus/readme-fed
...
Fix outdated federation feature statement
2015-11-09 02:16:11 +01:00
Fabian Reinartz
0c7edc5a4e
Fix outdated federation feature statement
2015-11-08 23:35:11 +01:00
Brian Brazil
427bf29db1
Add in default port after relabelling.
...
For the SNMP and blackbox exporters where
the ports tends to not be 80/443 and indeed
there may not be a port this makes the relabelling
a bit simpler as you don't have to figure out this
logic exists and strip off the :80.
This is a breaking change for the example configs of
those exporters.
2015-11-08 11:42:18 +00:00
Brian Brazil
452220ec90
Merge pull request #1057 from prometheus/config-target
...
Allow all instance labels in target groups
2015-11-07 14:40:44 +00:00
Brian Brazil
fd2bd81cd8
Allow all instance labels in target groups
...
With the blackbox exporter, the instance label will commonly
be used for things other than hostnames so remove this restriction.
https://example.com or https://example.com/probe/me are some examples.
To prevent user error, check that urls aren't provided as targets
when there's no relabelling that could potentically fix them.
2015-11-07 14:35:20 +00:00
Fabian Reinartz
69dd9ecd23
Merge pull request #1201 from prometheus/re
...
Anchor regexes in vector matching
2015-11-05 12:09:10 +01:00
Fabian Reinartz
33aab4169c
Anchor regexes in vector matching
...
This commit makes the regex behavior of vector matching consistent with
configuration and label_replace() by anchoring it.
Fixes #1200
2015-11-05 11:23:43 +01:00
Fabian Reinartz
f34c0fc81e
Update version on master branch
2015-11-05 10:34:29 +01:00
Fabian Reinartz
9cad147265
Merge pull request #1172 from federicobaldo/ec2_sd_improvements
...
Minor improvements to ec2 service discovery
2015-11-04 13:02:51 +01:00
Federico Baldo
d14d2429ea
Minor improvements to ec2 sd:
...
1. static credentials replaced with defaults.DefaultChainCredentials.
This change ensures that credentials are sourced form all possible
providers available with the aws sdk, in the following order:
env variables, shared awsconfig file in user folder, ec2 instance role.
2. Added a few labels: AvailabilityZone, PublicDns, VpcId (if
available), SubnetId (if in Vpc)
2015-11-02 14:55:24 +01:00
Brian Brazil
a2072d617d
Merge pull request #1195 from lyda/blackbox-console-squashed
...
Add blackbox console.
2015-11-01 20:23:13 +00:00
Kevin Lyda
384bd15bfc
Add blackbox console.
2015-11-01 20:06:52 +00:00
Julius Volz
4b2bccece9
Merge pull request #1192 from prometheus/no-hack
...
Remove Hacktoberfest
2015-10-30 16:10:08 +01:00
Brian Brazil
9efacf081b
Remove Hacktoberfest
...
It's almost at an end, so we can remove this.
2015-10-30 13:11:27 +00:00
Brian Brazil
1b2c44b1c9
Merge pull request #1183 from prometheus/vendor
...
Update vendoring
2015-10-26 12:44:42 +00:00
Fabian Reinartz
9107f583aa
Update vendoring
2015-10-26 13:40:45 +01:00
Julius Volz
b3b1df92f3
Update Julius's email address in AUTHORS.md
2015-10-26 02:21:39 +01:00
Fabian Reinartz
cae354c6a7
Merge pull request #1181 from prometheus/fix-range-autocomplete
...
Don't autocomplete metrics in range specifications.
2015-10-25 19:44:29 +01:00
Julius Volz
a635f5451e
Don't autocomplete metrics in range specifications.
2015-10-25 19:36:28 +01:00
Fabian Reinartz
cf7fda4371
Merge pull request #1180 from prometheus/logup
...
Upgrade common/log vendoring
2015-10-24 21:38:46 +02:00
Fabian Reinartz
21a7b94d6c
Upgrade common/log vendoring
2015-10-24 21:37:05 +02:00
Fabian Reinartz
f2a8261cdb
Merge pull request #1177 from fabric8io/kubernetes-discovery
...
Kubernetes SD authentication options cleanup
2015-10-24 20:32:25 +02:00
Jimmi Dyson
104803e74e
Kubernetes SD: Cleanup example config label regexps
2015-10-24 19:29:58 +01:00
Fabian Reinartz
8d128685cf
Merge pull request #1179 from prometheus/tlsconf
...
Add overflow check in TLS config
2015-10-24 17:37:49 +02:00
Fabian Reinartz
180da1ba65
Add overflow check in TLS config
2015-10-24 17:12:34 +02:00
Jimmi Dyson
87940ec213
Kubernetes SD: Rename masters to api_servers in config
2015-10-24 14:41:14 +01:00
Jimmi Dyson
7ff5cc66ea
Kubernetes SD authentication options cleanup
2015-10-23 16:47:52 +01:00
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
