github
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
3,681 Commits
252 Branches
442 Tags
626 MiB
Commit Graph

3681 Commits (6aee1551e1ec53054d5cbf6464b806339c26ced7)

Author SHA1 Message Date
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
Tobias Schmidt 7a6a0630d1 Merge pull request #1213 from prometheus/fix-wrong-http-status-codes 
Return HTTP server error codes for execution errors
 2015-11-12 09:12:17 -08:00
Tobias Schmidt 6c49edfce2 Merge pull request #1211 from prometheus/default-time-parameter 
Make time parameter optional in v1 query API
 2015-11-12 09:11:55 -08:00
Julius Volz bce5202354 Minor fixups to web/ui/README.md 2015-11-12 02:54:14 +01:00
Tobias Schmidt bf84faa010 Return HTTP server error codes for execution errors 2015-11-11 16:22:20 -08:00
Fabian Reinartz 7cbd31f7b6 Merge pull request #1212 from prometheus/uidev 
Document convenient development of UI files.
 2015-11-11 23:49:04 +01:00
Tobias Schmidt 50079a85a1 Make time parameter optional in v1 query API 
If no time paramter is provided, the current server timestamp is used.
 2015-11-11 13:30:06 -08:00
Fabian Reinartz 69e6ac735e Document convenient development of UI files. 2015-11-11 21:17:54 +01:00
Fabian Reinartz a5461e1ad7 Merge pull request #1209 from samstarling/js-tidying 
Tidy up .js files based on static analysis from jshint
 2015-11-11 20:31:39 +01:00
Sam Starling 1901875595 Tidy up .js files based on static analysis from jshint 2015-11-11 20:06:47 +01:00
Fabian Reinartz 307d9fad46 Merge pull request #1208 from prometheus/assets 
Simplify asset handling
 2015-11-11 18:02:16 +01:00
Fabian Reinartz a542cc8609 Remove -web.use-local-assets 2015-11-11 17:58:03 +01:00
Fabian Reinartz 57ca7108aa Enable debug generation of go-bindata, rename blob/ to ui/ 2015-11-11 15:55:16 +01:00
Julius Volz 75fdcf5698 Merge pull request #1197 from iksaif/master 
Add support for remote storage on Graphite
 2015-11-10 09:46:17 +01:00
Corentin Chary a2e4439086 Add support for remote storage on Graphite 
Allows to use graphite over tcp or udp. Metrics labels
and values are used to construct a valid Graphite path
in a way that will allow us to eventually read them back
and reconstruct the metrics.

For example, this metric:

model.Metric{
	model.MetricNameLabel: "test:metric",
	"testlabel":           "test:value",
	"testlabel2":           "test:value",
)

Will become:

test:metric.testlabel=test:value.testlabel2=test:value

escape.go takes care of escaping values to match Graphite
character set, it basically uses percent-encoding as a fallback
wich will work pretty will in the graphite/grafana world.

The remote storage module also has an optional 'prefix' parameter
to prefix all metrics with a path (for example, 'prometheus.').

Graphite URLs are simply in the form tcp://host:port or
udp://host:port.
 2015-11-10 07:58:57 +01:00
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