Fabian Reinartz
a391156dfb
Merge pull request #2667 from goller/go-discovery-logger
...
Add logger injection into discovery services
2017-06-01 10:20:10 -07:00
Chris Goller
42de0ae013
Use log.Logger interface for all discovery services
2017-06-01 11:25:55 -05:00
Tobias Schmidt
1c9499bbbd
Merge pull request #2785 from prometheus/grobie/fix-target-group-naming
...
Fix outdated target_group naming in error message
2017-05-31 11:28:46 +02:00
Tobias Schmidt
287ec6e6cc
Fix outdated target_group naming in error message
...
The target_groups config has been renamed to static_configs, the error
message for overflow attributes should reflect that.
2017-05-31 11:01:13 +02:00
Julius Volz
240bb671e2
config: Fix overflow checking in global config ( #2783 )
2017-05-30 20:58:06 +02:00
Julius Volz
e0f046396a
Fix InfluxDB retention policy usage in read adapter ( #2781 )
2017-05-29 16:24:24 +02:00
Stephan Erb
14eee34da3
Update vendored go-zookeeper client ( #2778 )
...
It is likely this will fix #2758 .
2017-05-29 15:59:30 +02:00
Benjamin
51626f2573
change deprecated maintainer to label ( #2724 )
2017-05-29 15:58:40 +02:00
Conor Broderick
6766123f93
Replace regex with Secret type and remarshal config to hide secrets ( #2775 )
2017-05-29 12:46:23 +01:00
Brian Brazil
d66799d7f3
Show gaps in graphs. ( #2766 )
...
Fixes #345
2017-05-26 16:17:48 +01:00
Tobias Schmidt
2a426bfead
Revert "Use tag names consistently ( #2743 )"
...
Apparently, a decision was made at some point to only use the v prefix
in tags and similar contexts where other things can appear. There was a
vote to stick to that decision. For more information, read
https://github.com/prometheus/prometheus/pull/2743 .
This reverts commit 5405a4724f
2017-05-25 08:57:01 +02:00
conorbroderick
9c953064c3
check if result is a scalar in order to display correct number of returned time series
2017-05-24 14:07:24 +01:00
Fabian Reinartz
09fcbf78df
Merge pull request #2755 from brancz/redirect-prefix
...
prefix redirect with external url path
2017-05-24 10:09:47 +02:00
Tobias Schmidt
5405a4724f
Use tag names consistently ( #2743 )
2017-05-23 14:14:15 +02:00
Frederic Branczyk
ad22606a3d
web: prefix redirect with ExternalURL path
2017-05-22 14:56:52 +02:00
Frederic Branczyk
45df5c2daf
Merge branch 'release-1.6'
2017-05-22 13:44:44 +02:00
Jacky Wu
75b89739de
Fix go version hint. ( #2750 )
2017-05-20 18:33:14 +02:00
Frederic Branczyk
7d17ecbd48
Merge pull request #2735 from brancz/cut-1.6.3
...
cut 1.6.3
2017-05-18 16:56:54 +02:00
Frederic Branczyk
53a2bd71b9
*: cut 1.6.3
2017-05-18 16:51:46 +02:00
Tobias Schmidt
2ae2b663a9
Create sha256 checksums file during release
2017-05-18 16:50:44 +02:00
Tom Wilkie
e9787382b4
Ensure ewma int64s are always aligned. ( #2675 )
2017-05-18 16:50:44 +02:00
Frederic Branczyk
363554f675
Merge pull request #2739 from Conorbro/stack-graph-fix
...
Fixed graph ui max/min logic to accommodate for toggling of stacked graph option
2017-05-18 16:49:30 +02:00
conorbroderick
9287a01bbf
Fixed fixed yaxis of stacked graph being cut off
2017-05-18 15:18:29 +01:00
Frederic Branczyk
b916b3784b
Merge pull request #2731 from brancz/lset-non-cloned
...
notifier: clone and not reuse LabelSet in AM discovery
2017-05-18 10:59:38 +02:00
Frederic Branczyk
94e8b43aae
notifier: clone and not reuse LabelSet in AM discovery
2017-05-18 10:12:42 +02:00
Fazal Majid
0e05cccfbd
updated logrus so Prometheus can build on Solaris/Illumos ( #2733 )
2017-05-17 22:50:43 +02:00
Shashank Varanasi
dea60bb553
Fix malformed uname string ( #2727 )
...
* Fix malformed uname string
* Make fix better
* Reformat code for simplicity
2017-05-16 18:44:11 +02:00
jswitzer
713fef292a
vendor: upgrade govalidator to v6 ( #2714 )
...
* vendor: upgrade govalidator to v6
* Upgrade govalidator to latest in master.
* Run govalidator update through govendor
2017-05-15 14:35:57 +02:00
Alexey Palazhchenko
b0e1ea7c6c
Simplify code, fix typos. ( #2719 )
2017-05-15 09:56:09 +01:00
Shashank Varanasi
61235fd851
Print system information (uname) at Prometheus startup ( #2709 )
...
* Print uname on prom startup
* Make uname file linux-only
* Add missing license headers
Add missing license headers
* Print OS when uname is not available
* Print only OS name when uname not available
* Remove extra space, fix cmd/prometheus/main.go license header
* Add fix for int8 and uint8 systems
* Better formatting for build tags in cmd/prometheus/uname files
* Remove newline
2017-05-13 20:42:29 +02:00
Julius Volz
ac203ef0ee
Add externalURL template function ( #2716 )
...
This allows users to e.g. add links back to the generating Prometheus
right in their alert templates.
2017-05-13 15:47:04 +02:00
Fabian Reinartz
0e0da989c5
Merge pull request #2712 from prometheus/vendor
...
vendor: remove leftover dependency
2017-05-12 09:19:15 +02:00
Fabian Reinartz
8d54499e97
vendor: remove leftover dependency
2017-05-12 09:14:44 +02:00
Julius Volz
1c72524870
Fix HTTP error handling in remote.Client.Store() ( #2708 )
...
Regression introduced in
e5d7bbfc3c
2017-05-11 18:40:10 +02:00
Julius Volz
f160f17a6f
retrieval: fix missing scrape context cancellation ( #2599 )
2017-05-11 16:15:07 +02:00
Fabian Reinartz
0c3462762b
Merge pull request #2707 from prometheus/merge16
...
Merge 1.6 into master
2017-05-11 15:06:15 +02:00
Fabian Reinartz
11aa049b05
Merge branch 'release-1.6' into merge16
2017-05-11 15:00:51 +02:00
Fabian Reinartz
b38e977fd8
Merge pull request #2706 from prometheus/cut162
...
Cut 1.6.2
2017-05-11 14:56:43 +02:00
Fabian Reinartz
b51cf7efcb
*: cut 1.6.2
2017-05-11 14:50:39 +02:00
Fabian Reinartz
ddbbd2b712
Merge branch 'release-1.5' into cut162
2017-05-11 14:29:49 +02:00
Fabian Reinartz
1edf99ce5d
Merge pull request #2705 from prometheus/cut153
...
cut 1.5.3
2017-05-11 14:22:02 +02:00
Fabian Reinartz
fc3214c7bf
*: cut 1.5.3
2017-05-11 13:58:18 +02:00
Fabian Reinartz
2ff8855ae6
discovery/k8s: update client library
2017-05-11 13:53:12 +02:00
Fabian Reinartz
a333c5612a
Merge pull request #2678 from brancz/am-discovery-metrics
...
notifier: expose metric for number of discovered alertmanagers
2017-05-10 18:37:13 +02:00
Tom Wilkie
3141a6b36b
Compress remote storage requests and responses with unframed/raw snappy. ( #2696 )
...
* Compress remote storage requests and responses with unframed/raw snappy, for compatibility with other languages.
* Remove backwards compatibility code from remote_storage_adapter, update example_write_adapter
* Add /documentation/examples/remote_storage/example_write_adapter/example_writer_adapter to .gitignore
2017-05-10 16:42:59 +02:00
Jorrit Salverda
14d0604aba
Kubernetes config scrape node via api proxy ( #2641 )
...
* scrape kubelet metrics via api node proxy
* add manifests to setup serviceaccount, clusterrole and clusterrolebinding to work with rbac
* removed .cluster.local and added newline to address comments
2017-05-09 13:57:49 +02:00
beorn7
46226088aa
Merge branch 'release-1.6'
2017-05-09 11:16:07 +02:00
Fabian Reinartz
e9c25131fe
Merge pull request #2690 from prometheus/beorn7/storage
...
storage: Correctly increase prometheus_local_storage_open_head_chunks
2017-05-09 07:28:13 +02:00
beorn7
69eddc9e84
storage: Correctly increase prometheus_local_storage_open_head_chunks
2017-05-08 18:20:23 +02:00
Frederic Branczyk
0c96c4b157
notifier: expose metric for number of discovered alertmanagers
2017-05-08 10:37:19 +02:00
