Fabian Reinartz
7700cff1ff
vendor: update golang.org/x/sys
2016-07-04 11:07:02 +02:00
Fabian Reinartz
e4e8479716
vendor: add missing liencse/patent notices
2016-07-04 11:06:26 +02:00
Fabian Reinartz
bc506ce959
vendor: update goleveldb dependencies
2016-07-04 10:08:49 +02:00
Fabian Reinartz
f4398d5bdf
Merge pull request #1782 from prometheus/fabxc-testflags
...
cmd/prometheus: use own flag set
2016-07-04 09:27:10 +02:00
Anton Tolchanov
772a3af38f
Allow URLs in targets defined via a JSON file
...
This enables defining `blackbox_exporter` targets (which can be URLs,
because of relabeling) in a JSON file.
Not sure if this is the best approach, but current behaviour is
inconsistent (`UnmarshalYAML` does not have this check) and breaks
officially documented way to use `blackbox_exporter`.
2016-07-04 00:05:57 +03:00
Fabian Reinartz
8c24dfdb86
cmd/prometheus: use own flag set
...
Fixes #1743
2016-07-03 14:23:31 +02:00
Fabian Reinartz
fdbe28df85
discovery/kubernetes: extract node discovery
...
This change extracts node discovery into its own type.
2016-07-01 19:31:04 +02:00
Fabian Reinartz
8a97c211a8
discovery/kubernetes: extract pod discovery
...
This change extracts pod discovery into its own type.
2016-07-01 19:30:00 +02:00
Fabian Reinartz
e03e138d34
discovery: consolidate constructors into single file
2016-07-01 19:30:00 +02:00
Fabian Reinartz
b3f321b38a
Merge pull request #1780 from prometheus/fabxc-k8s-locks
...
discovery/kubernetes: add missing locking
2016-07-01 17:10:09 +02:00
Fabian Reinartz
57333d1831
discovery/kubernetes: add missing locking
2016-07-01 17:07:13 +02:00
Fabian Reinartz
2901376940
Merge pull request #1777 from prometheus/fabxc-patch-1
...
readme: update debian and container releases
2016-07-01 16:53:29 +02:00
Fabian Reinartz
4d1985e405
Merge pull request #1778 from mattbostock/fix_annotations
...
promql: Fix annotations conflated with labels
2016-07-01 11:45:18 +02:00
Matt Bostock
cc98e164d3
promql: Fix annotations conflated with labels
...
When converting `AlertStmt` to a string, the alert rule labels were
printed as `ANNOTATIONS` instead of the annotations themselves.
Fix and add a test to catch future regressions.
2016-07-01 10:39:17 +01:00
Fabian Reinartz
472b8363a1
readme: update debian and container releases
2016-07-01 10:16:49 +02:00
Fabian Reinartz
44036a08d0
Merge pull request #1725 from nicholascapo/use-consul-service-address
...
discovery: use consul service address if available
2016-06-30 09:30:14 +02:00
Fabian Reinartz
e1cf13aaef
Merge pull request #1771 from prometheus/make-storage-public
...
storage: Make MemorySeriesStorage a public type
2016-06-29 10:34:23 +02:00
Julius Volz
91401794fa
storage: Make MemorySeriesStorage a public type
...
See https://twitter.com/fabxc/status/748032597876482048
2016-06-29 08:14:23 +02:00
Fabian Reinartz
c673aa2b34
Merge pull request #1770 from prometheus/milliseconds-console
...
The metrics are no longer ms, we can remove the scaling.
2016-06-29 07:35:01 +02:00
Brian Brazil
b86db088b5
The metrics are no longer ms, we can remove the scaling.
2016-06-29 01:09:24 +01:00
Fabian Reinartz
f68789dc5a
Merge pull request #1767 from fabric8io/k8s-sd-https-config
...
Kubernetes SD: Update example config with TLS options
2016-06-27 15:49:52 +02:00
Jimmi Dyson
5733de0dfe
Kubernetes SD: Update example config with TLS options
2016-06-27 14:38:51 +01:00
Fabian Reinartz
62af249d06
Merge pull request #1761 from prometheus/fabxc-legacyapi
...
api: drop legacy API
2016-06-27 14:26:03 +02:00
Brian Brazil
ba9fbb9ea2
Merge pull request #1765 from prometheus/on-dummy
...
Support on()
2016-06-24 14:15:23 +01:00
Brian Brazil
3b89616d82
Allow on, ignoring, by and without wit empty laberls.
...
This offers new semantics in allowing on() for matching
two single-element vectors with no known common labels.
Previosuly this was often done using on(dummy).
This also allows making it explict that you meant
to do an aggregation without labels via by().
Fixes #1597 .
2016-06-24 14:12:51 +01:00
Brian Brazil
246a817300
Flip vector matching to be ignoring by default.
...
This is a noop semantically.
2016-06-23 17:23:44 +01:00
Fabian Reinartz
d431187f77
Merge pull request #1763 from prometheus/fabxc-sec-metrics
...
*: remove last remainers of non-second metrics
2016-06-23 17:57:05 +02:00
Fabian Reinartz
425736a377
*: remove last remainers of non-second metrics
2016-06-23 17:50:39 +02:00
Brian Brazil
dc4d5fef2a
Merge pull request #1762 from prometheus/fabxc-common
...
vendor: update common/expfmt
2016-06-23 16:23:59 +01:00
Fabian Reinartz
e2bc30585f
vendor: update common/expfmt
...
Update the exposition library to drop the JSON format decoding.
2016-06-23 17:21:06 +02:00
Fabian Reinartz
97f62c021e
api: drop legacy API
2016-06-23 17:14:32 +02:00
Fabian Reinartz
6f6dddb230
Merge pull request #1759 from prometheus/separate-querier
...
Separate query interface out of local.Storage.
2016-06-23 15:56:03 +02:00
Julius Volz
b7b6717438
Separate query interface out of local.Storage.
...
PromQL only requires a much narrower interface than local.Storage in
order to run queries. Narrower interfaces are easier to replace and
test, too.
We could also change the web interface to use local.Querier, except that
we'll probably use appending functions from there in the future.
2016-06-23 15:14:38 +02:00
Fabian Reinartz
0e281f5500
Merge pull request #1687 from royels/issue-1629
...
Added power binop
2016-06-23 10:28:57 +02:00
royels
2fdc5717a3
promql: add power binary operation
2016-06-22 23:34:46 -04:00
Fabian Reinartz
f928ca13d0
Merge pull request #1754 from prometheus/jan11011977-master
...
Fix 'access denied' error on Windows
2016-06-21 11:24:59 +02:00
Jan van Valburg
68f3df49d0
stoarge: fix 'access denied' error on Windows
...
On Windows, it is not possible to rename or delete a file that is
currerntly open. This change closes the file in dropAndPersistChunks
before it tries to delete it, or rename the temporary file to it.
2016-06-21 11:21:20 +02:00
Fabian Reinartz
beecbe3d2f
Merge branch 'release-0.20'
2016-06-17 14:43:10 +02:00
Brian Brazil
f3e3befb83
Merge pull request #1746 from fatih/fix-alertstmt-print
...
promql: fix printing annotations of an *AlertStmt
2016-06-16 16:49:19 +01:00
Fatih Arslan
362e44501a
promql: fix printing annotations of an *AlertStmt
...
Currently the printer doesn't print the annotations of an `*AlertStmt`
declaration. I've added a test case as well, which fails for the current
master.
2016-06-16 17:43:54 +03:00
Nicholas Capo
84334a8410
discovery: use consul service address if available
2016-06-15 19:27:05 -05:00
Fabian Reinartz
aeab25c35d
Merge pull request #1742 from prometheus/fabxc-0.20.0
...
*: cut 0.20.0
2016-06-15 17:52:52 +02:00
Fabian Reinartz
3a9b739f30
*: cut 0.20.0
2016-06-15 17:31:26 +02:00
Fabian Reinartz
bae1cfee69
Merge pull request #1739 from prometheus/fabxc-opendbsd-arm
...
promu: don't build openbsd/arm
2016-06-15 17:20:16 +02:00
Fabian Reinartz
384153fe1f
promu: don't build openbsd/arm and mips
...
Deactivate crossbuilding for openbsd/arm and mips as golang.org/x/sys
does not have the necessary syscalls implemented.
2016-06-15 15:41:22 +02:00
Fabian Reinartz
4aeab798e8
Merge pull request #1738 from prometheus/release-0.19
...
Forward-merge 0.19 fixes into master
2016-06-14 18:11:47 +02:00
Fabian Reinartz
3c80609fce
Merge pull request #1737 from prometheus/fabxc-0.19.3
...
Bump version to 0.19.3
2016-06-14 18:04:56 +02:00
Fabian Reinartz
a5b35498a8
*: bump version to 0.19.3
2016-06-14 14:19:31 +02:00
Fabian Reinartz
4c864c8a88
retrieval: don't sync to uninitialized scrape pool
...
This change does just signal a scrape target update to the scraping loop
once an initial target set is fetched.
Before, the scrape pool was directly synced, causing a race against an
uninitialized scrape pool.
Fixes #1703
2016-06-14 14:18:40 +02:00
Fabian Reinartz
4f139c765b
Merge pull request #1736 from prometheus/fabxc-ctxpanic
...
retrieval: don't sync to uninitialized scrape pool
2016-06-14 14:16:11 +02:00
