mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-11 08:04:04 -08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity
3344 commits 249 branches 436 tags 652 MiB
Commit graph

3344 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dmitry Vorobev 273e457da4 web: return status code and error message for config resource 2016-07-15 10:15:24 +02:00
Fabian Reinartz 4d0c697548 circle: add tag v-prefix 2016-07-14 11:46:48 +09:00
Fabian Reinartz a6c81f32bc Merge branch 'release-1.0' of github.com:prometheus/prometheus into release-1.0 2016-07-14 10:44:02 +09:00
Fabian Reinartz 675b0184af Merge pull request #1812 from prometheus/fabxc-1.0.0-rc.0 
Release 1.0.0-rc.0
 2016-07-14 10:43:41 +09:00
Fabian Reinartz 1c4b3ab0e2 *: update changelog for version 1.0.0-rc.0 2016-07-14 10:04:40 +09:00
Fabian Reinartz e3f4df75a8 Merge pull request #1807 from prometheus/am-label 
Expand alert templates at eval time.
 2016-07-14 10:04:09 +09:00
Fabian Reinartz ca7ab62f40 *: bump version to 1.0.0-rc.0 2016-07-14 09:55:00 +09:00
Fabian Reinartz 919558f601 config: remove deprecated target_groups configuration 2016-07-14 09:55:00 +09:00
Fabian Reinartz 9c3129746c Merge pull request #1807 from prometheus/am-label 
Expand alert templates at eval time.
 2016-07-13 17:01:42 +02:00
Björn Rabenstein 0622304244 Merge pull request #1798 from prometheus/beorn7/storage2 
Crash recovery: Fix an edge case.
 2016-07-13 16:53:18 +02:00
Brian Brazil 0509b0f2db Expand alert templates at eval time. 
Fixes #1678 #1677
 2016-07-12 17:13:55 +01:00
Fabian Reinartz e87d604f94 Merge pull request #1791 from prometheus/fabxc-routepref 
web: add -web.route-prefix flag
 2016-07-10 12:05:39 +02:00
Fabian Reinartz f8bb0ee91f Merge pull request #1793 from prometheus/count_values 
Add count_values() aggregator.
 2016-07-08 11:50:42 +02:00
Fabian Reinartz b4660a550c Merge pull request #1797 from prometheus/beorn7/storage 
Consistently use the `Seconds()` method for conversion of durations
 2016-07-07 17:23:06 +02:00
beorn7 2a75b15328 Crash recovery: Fix an edge case. 
If the chunks of a series in the checkpoint are all older then the
latest chunk on disk, the head chunk is persisted and therefore has to
be declared closed.

It would be great to have a test for this, but that would require more
plumbing, subject of #447.
 2016-07-07 16:17:38 +02:00
beorn7 064b57858e Consistently use the Seconds() method for conversion of durations 
This also fixes one remaining case of recording integral numbers
of seconds only for a metric, i.e. this will probably fix #1796.
 2016-07-07 15:24:35 +02:00
Fabian Reinartz 59d26e8536 web: add -web.route-prefix flag 
Fixes #1191
 2016-07-07 11:49:16 +02:00
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