mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-27 22:49:40 -08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity
4152 commits 243 branches 444 tags 649 MiB
Commit graph

4152 commits

This branch
This branch
All branches
Author SHA1 Message Date
Fabian Reinartz 8e73bde650 Merge pull request #2710 from prometheus/fabxc-patch-1 
retrieval: add missing scrape context cancelation
 2017-05-11 20:30:33 +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
Fabian Reinartz 76b3378190 retrieval: add missing scrape context cancelation 2017-05-11 17:20:03 +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
Fabian Reinartz bf64d4efa8 Merge pull request #2703 from prometheus/alertmpl 
ui: fix alert template
 2017-05-10 15:42:14 +02:00
Fabian Reinartz 9a9211845e ui: fix alert template 2017-05-10 15:30:10 +02:00
Fabian Reinartz 373bec3784 Merge pull request #2700 from improbable-io/bugfix/2699-p2-sighup 
Fixup sighup for P2 TSDB init #2699
 2017-05-10 10:14:02 +02:00
Michal Witkowski 4177c35eba Fixup sighup for P2 TSDB init #2699 2017-05-09 17:00:54 +01:00
Fabian Reinartz ff0ee264ae Merge pull request #2695 from prometheus/nolock 
Allow disabling of lock file for TSDB
 2017-05-09 14:41:24 +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
Fabian Reinartz 9b175d48cb Add flag to disable TSDB lock file 2017-05-09 12:56:51 +02:00
Fabian Reinartz dae4a801cb vendor: update tsdb 2017-05-09 12:53:33 +02:00
Fabian Reinartz c1ce7cf814 Merge pull request #2694 from prometheus/txtparse 
pkg/textparse: parse metric names with ':'
 2017-05-09 12:43:42 +02:00
Fabian Reinartz f7c5d96e84 pkg/textparse: parse metric names with ':' 2017-05-09 12:21:19 +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
Tobias Schmidt 368206d2f5 Handle errSeriesDropped correctly 
If metrics_relabel_configs are used to drop metrics, an errSeriesDropped
is returned. This shouldn't be used to return an error at the end of a
append() call.
 2017-05-05 14:58:36 +02:00
Fabian Reinartz aaaec6431e Merge pull request #2642 from bakins/kubernetes-namespaces 
Allow limiting Kubernetes service discover to certain namespaces
 2017-05-04 07:36:21 +02:00
Tom Wilkie 2195bb66f7 Ensure ewma int64s are always aligned. (#2675) 2017-05-03 14:32:50 -05:00
Tom Wilkie 4d9b917d11 Instrument Prometheus with OpenTracing (#2554) 
* Use request.Context() instead of a global map of contexts.

* Add some basic opentracing instrumentation on the query path.

* Remove tracehandler endpoint.
 2017-05-02 18:49:29 -05:00
Stephan Erb 0b9fca983b Fix reload of ZooKeeper service discovery config (#2669) 
Rational:

* When the config is reloaded and the provider context is canceled, we need to
  exit the current ZK `TargetProvider.Run` method as a new provider will be
  instantiated.
* In case `Stop` is called on the `ZookeeperTreeCache`, the update/events
  channel may not be closed as it is shared by multiple caches and would
  thus be double closed.
* Stopping all `zookeeperTreeCacheNode`s on teardown ensures all associated
  watcher go-routines will be closed eagerly rather than implicityly on
  connection close events.
 2017-05-02 18:21:37 -05:00
Fabian Reinartz 86426c0566 Merge pull request #2672 from svend/kubernetes-pods-port-comment 
Document what ports are scraped by default in k8s example
 2017-05-02 11:12:13 +02:00
Svend Sorensen 94a3e863e4 Document what ports are scraped by default in k8s example 
The Kubernetes pod SD creates a target for each declared port, as documented:

https://prometheus.io/docs/operating/configuration/#pod

> The pod role discovers all pods and exposes their containers as targets. For
> each declared port of a container, a single target is generated. If a
> container has no specified ports, a port-free target per container is created
> for manually adding a port via relabeling.

This results in the default port being the declared port, or no port if none are
declared.
 2017-05-01 15:58:48 -07:00
Fabian Reinartz 8c483e27d3 Merge pull request #2661 from prometheus/texts 
pkg/textparse: implement timestamp parsing
 2017-04-27 17:49:57 +02:00
Fabian Reinartz 1df03d8346 make: disable remote tests temporarily 2017-04-27 17:27:19 +02:00
Fabian Reinartz 377886b371 pkg/textparse: implement timestamp parsing 2017-04-27 17:02:07 +02:00
Conor Broderick 314b81062d Updated vendoring for log level reporting issue (#2660) 2017-04-27 14:25:13 +01:00
Brian Akins 27d66628a1 Allow limiting Kubernetes service discover to certain namespaces 
Allow namespace discovery to be more easily extended in the future by using a struct rather than just a list.

Rename fields for kubernetes namespace discovery
 2017-04-27 07:41:36 -04:00
Fabian Reinartz e829dbe2be retrieval: comment out accept header again 2017-04-27 11:46:08 +02:00
Fabian Reinartz 0f3110487d Merge remote-tracking branch 'origin/dev-2.0' into dev-2.0 2017-04-27 10:25:04 +02:00
Fabian Reinartz 37deb21c45 vendor: remove unused dependency and last ref to fabxc/tsdb 2017-04-27 10:23:34 +02:00
Fabian Reinartz 73b8ff0ddc Merge branch 'master' into dev-2.0 2017-04-27 10:19:55 +02:00
Julius Volz fe11c5933a Fix mutation of active alert elements by notifier (#2656) 
This caused the external label application in the notifier to bleed back
into the rule manager's active alerting elements.
 2017-04-26 10:29:42 -05:00
Fabian Reinartz 5248118b10 Merge pull request #2654 from dsymonds/master 
Add maintainers' GitHub usernames to MAINTAINERS.md.
 2017-04-25 08:43:36 +02:00
David Symonds 8bb07490a2 Add maintainers' GitHub usernames to MAINTAINERS.md. 
CONTRIBUTING.md instructs people to loop them in using that mechanism,
but nothing lists the right username.
 2017-04-25 16:32:23 +10:00
Fabian Reinartz 60d9138b6b Merge pull request #2653 from dsymonds/master 
Preserve Alertmanager URLs as *url.URL.
 2017-04-25 08:27:31 +02:00
David Symonds 04ad889751 Preserve Alertmanager URLs as *url.URL. 
Render a nicer link in the web UI.
 2017-04-25 16:17:46 +10:00
Conor Broderick 9eb1a5d6bf Handle invalid query in graph UI (#2652) 2017-04-24 10:50:57 +01:00