mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-13 17:14:05 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
4127 commits 247 branches 438 tags 656 MiB
Commit graph

4127 commits

This branch
This branch
All branches
Author SHA1 Message Date
Fabian Reinartz b16f49bb44 Merge pull request #1795 from prometheus/keeping_extra 
Clean out old keywords
 2016-07-07 09:08:37 +02:00
Brian Brazil 875818d060 Clean out old keywords 2016-07-07 05:30:48 +01:00
Brian Brazil 16690736ab Add count_values() aggregator. 
This is useful for counting how many instances
of a job are running a particular version/build.

Fixes #622
 2016-07-05 17:14:01 +01:00
Fabian Reinartz 6f19e418e1 Merge pull request #1781 from prometheus/fabxc-k8s-sd 
Select Kubernetes SD type in configuration
 2016-07-05 14:29:46 +02:00
Fabian Reinartz 4591a2623b discovery/kubernetes: filter pod/container, service/endpoint 
This change distinguishes and filters by pod/container and
service/endpoint in the respective sub-SDs.
 2016-07-05 14:24:17 +02:00
Fabian Reinartz 0ff354341b discovery/kubernetes: remove unused channel 2016-07-05 14:22:12 +02:00
Fabian Reinartz 7221228843 discovery/kubernetes: select between discovery role 
This adds `role` field to the Kubernetes SD config, which indicates
which type of Kubernetes SD should be run.
This no longer allows discovering pods and nodes with the same SD
configuration for example.
 2016-07-05 14:22:12 +02:00
Fabian Reinartz abdf3536e4 Merge pull request #1788 from prometheus/topk 
Make topk/bottomk aggregators.
 2016-07-05 11:32:17 +02:00
Fabian Reinartz e0f8caacd7 discovery/kubernetes: extract service endpoint discovery 
This extract discovery of services and their endpoints into its own
type.
 2016-07-05 10:26:23 +02:00
Brian Brazil 7f23a4a099 Add type check on topk/bottomk parameter. 2016-07-04 18:03:05 +01:00
Brian Brazil fa9cc15573 Add topk/bottomk tests for multiple buckets. 2016-07-04 13:18:28 +01:00
Brian Brazil 3b0c182eee Move topk/bottomk unittests over to aggregators. 2016-07-04 13:18:28 +01:00
Brian Brazil 3e5136e36d Make topk/bottomk aggregators. 2016-07-04 13:18:19 +01:00
Fabian Reinartz 3c1e15087d Merge pull request #1785 from prometheus/fabxc-vendor 
Update vendoring
 2016-07-04 13:21:50 +02:00
Fabian Reinartz f26823afa7 Merge pull request #1787 from prometheus/fabxc-gitignore 
gitignore: clean up
 2016-07-04 11:47:44 +02:00
Fabian Reinartz 746d330a23 gitignore: clean up 
This removes several outdated or unnecessary ignore patterns.
Especially those that match random words such as 'local' or 'core',
which repeatedly caused weird behavior that's hard to debug, e.g.
invisble vendored files.
 2016-07-04 11:34:33 +02:00
Fabian Reinartz 7d441abd7b vendor: update prometheus org dependencies 2016-07-04 11:09:06 +02:00
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