prometheus

Commit Graph

Author	SHA1	Message	Date
Marek Slabicki	8224ddec23	Capitalizing first letter of all log lines (#7043 ) Signed-off-by: Marek Slabicki <thaniri@gmail.com>	5 years ago
qinng	e31b7b2679	[Doc] Fix wrong description in kubernetes expamle (#7012 ) Signed-off-by: guoruyi1 <guoruyi1@xiaomi.com> Co-authored-by: guoruyi1 <guoruyi1@xiaomi.com>	5 years ago
Benoit Gagnon	6d931a2195	Fix Windows support for custom-sd adapter (#6217 ) * add test to custom-sd/adapter writeOutput() function Signed-off-by: Benoit Gagnon <benoit.gagnon@ubisoft.com> * fix Adapter.writeOutput() function to work on Windows On that platform, files cannot be moved while a process holds a handle to them. Added an explicit Close() before that move. With this change, the unit test succeeds. Signed-off-by: Benoit Gagnon <benoit.gagnon@ubisoft.com> * add missing dot to comment Signed-off-by: Benoit Gagnon <benoit.gagnon@ubisoft.com>	5 years ago
李国忠	d89e783217	[bugfix] custom SD: when ip out of order, reflect.deepEqual can not correctly identify whether there is a change (#5856 ) * [bugfix] custom SD: when ip out of order, reflect.deepEqual can not correctly identify whether there is a change Signed-off-by: fuling <fuling.lgz@alibaba-inc.com> * [format] makefile:Makefile.common:116: common-style Signed-off-by: fuling <fuling.lgz@alibaba-inc.com> * [bugfix] custom sd: simonpasquier comment,It would be simpler to sort the targets alphabetically and keep reflect.DeepEqual. Signed-off-by: fuling <fuling.lgz@alibaba-inc.com> * [bugfix]custom SD:fix sort Signed-off-by: fuling <fuling.lgz@alibaba-inc.com> * [bugfix] custom SD : adapter.go need an empty line after "sort" Signed-off-by: fuling <fuling.lgz@alibaba-inc.com> * [bugfix]custom SD:test sign-off Signed-off-by: fuling <fuling.lgz@alibaba-inc.com> * [bugfix]custom SD: fix adaper_test.go Signed-off-by: fuling <fuling.lgz@alibaba-inc.com>	5 years ago
Vadym Martsynovskyy	a9970a47ef	Fix incorrect examples in docs Signed-off-by: Vadym Martsynovskyy <vmartsynovskyy@gmail.com>	5 years ago
Romain Baugue	95193fa027	Exhaust every request body before closing it (#5166 ) (#5479 ) From the documentation: > The default HTTP client's Transport may not > reuse HTTP/1.x "keep-alive" TCP connections if the Body is > not read to completion and closed. This effectively enable keep-alive for the fixed requests. Signed-off-by: Romain Baugue <romain.baugue@elwinar.com>	6 years ago
qinng	cc75c27580	Fix multiple response.WriteHeader calls error in remote read adapter (#5159 ) * fix multiple response.WriteHeader calls in remote read adapter * remove useless return Signed-off-by: qinng <guoruyi1@xiaomi.com>	6 years ago
Tariq Ibrahim	8fdfa8abea	refine error handling in prometheus (#5388 ) i) Uses the more idiomatic Wrap and Wrapf methods for creating nested errors. ii) Fixes some incorrect usages of fmt.Errorf where the error messages don't have any formatting directives. iii) Does away with the use of fmt package for errors in favour of pkg/errors Signed-off-by: tariqibrahim <tariq181290@gmail.com>	6 years ago
LongKB	23480bef43	Remove the duplicated words (#5251 ) Although it is spelling mistakes, it might make an affects while reading. Co-Authored-By: Nguyen Phuong An <AnNP@vn.fujitsu.com> Signed-off-by: Kim Bao Long <longkb@vn.fujitsu.com>	6 years ago
Nguyen Hai Truong	5fbda4c9d7	Secure http links (#5244 ) Fix http link to https link for secure, modify http to https in the links of project. Have some http links doesn't redirect into https. Co-Authored-By: Nguyen Van Trung trungnv@vn.fujitsu.com Signed-off-by: Nguyen Hai Truong <truongnh@vn.fujitsu.com>	6 years ago
Kim Bao Long	94f5352951	Trivial fix: Fix some typos in comments Co-Authored-By: Nguyen Phuong An <AnNP@vn.fujitsu.com> Signed-off-by: Kim Bao Long <longkb@vn.fujitsu.com>	6 years ago
Callum Styan	5358f76c5c	update remote write path proto so that Labels/Timeseries can't be nil (#4957 ) Signed-off-by: Callum Styan <callumstyan@gmail.com>	6 years ago
Simon Pasquier	f678e27eb6	: use latest release of staticcheck (#5057 ) : use latest release of staticcheck It also fixes a couple of things in the code flagged by the additional checks. Signed-off-by: Simon Pasquier <spasquie@redhat.com> Use official release of staticcheck Also run 'go list' before staticcheck to avoid failures when downloading packages. Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Thomas J. Fox	11a93b2b37	fix link in docs/examples/k8s-rabbitmq readme (#4967 ) Signed-off-by: Thomas J. Fox <thomasjfox1@gmail.com>	6 years ago
Yaqiang Wang	8b85d876f2	fix file_sd never stop update 'custom_sd.json' file in adapter.go (#4567 ) Signed-off-by: wangyaqiang1 <wangyaqiang1@jd.com>	6 years ago
Alex Yu	5dcce32ef8	update promlog to latest version (#4876 ) * update promlog to latest version Signed-off-by: Alex Yu <yu.alex96@gmail.com> * Update api tests, fix main setup Signed-off-by: Alex Yu <yu.alex96@gmail.com> * tidy go.sum Signed-off-by: Alex Yu <yu.alex96@gmail.com> * revendor prometheus/common Signed-off-by: Alex Yu <yu.alex96@gmail.com> * only initialize config; use kingpin for remote_storage_adapter Signed-off-by: Alex Yu <yu.alex96@gmail.com> * actually parse the flags Signed-off-by: Alex Yu <yu.alex96@gmail.com> * clean up imports Signed-off-by: Alex Yu <yu.alex96@gmail.com>	6 years ago
Simon Pasquier	ed19373a78	: remove use of golang.org/x/net/context (#4869 ) : remove use of golang.org/x/net/context Signed-off-by: Simon Pasquier <spasquie@redhat.com> scrape: fix TestTargetScrapeScrapeCancel Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
Timo Beckers	b12ed54f95	documentation - add marathon-sd example configuration Signed-off-by: Timo Beckers <timo@incline.eu>	6 years ago
Brian Pandola	3241c527d0	Fix typo (#4760 ) Signed-off-by: Brian Pandola <bpandola@hsdp.io>	6 years ago
Simon Pasquier	07152ecc48	Merge pull request #4575 from Nexucis/bugfix/fix-unregistered-source [ServiceDiscovery] Unregister source when the target is empty	6 years ago
Augustin Husson	f60620ec0b	format comment Signed-off-by: Augustin Husson <husson.augustin@gmail.com>	6 years ago
Tom Wilkie	d3a1ff1abf	Reduce memory usage of remote read by reducing pointer usage. (#4655 ) Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>	6 years ago
Augustin Husson	9e6dc6f96c	fix targetGroup that disappear totally Signed-off-by: Augustin Husson <husson.augustin@gmail.com>	6 years ago
Augustin Husson	3c0b130e5e	apply review Signed-off-by: Augustin Husson <husson.augustin@gmail.com>	6 years ago
beorn7	4fb59d1e61	Remove use of deprecated prometheus.Handler Signed-off-by: beorn7 <beorn@soundcloud.com>	6 years ago
Augustin Husson	e03869de76	add unit test and isolate the method that generate the target Signed-off-by: Augustin Husson <husson.augustin@gmail.com>	6 years ago
Augustin Husson	97950a3fae	remove group if the target is empty at adapter level Signed-off-by: Augustin Husson <husson.augustin@gmail.com>	6 years ago
Julius Volz	8fbe1b5133	Handle a bunch of unchecked errors (#4461 ) There are many more (mostly finalizers like Close/Stop/etc.), but most of the others seemed like one couldn't do much about them anyway. Signed-off-by: Julius Volz <julius.volz@gmail.com>	6 years ago
Harsh Agarwal	6a464ae174	expose log.level for promlog for remote_storage_adapter (#4195 ) * expose log.level for promlog for remote_storage_adapter Signed-off-by: sipian <cs15btech11019@iith.ac.in> * replace flag description Signed-off-by: Harsh Agarwal <cs15btech11019@iith.ac.in>	6 years ago
Peter Gallerani	a9d5034add	Fix missing 'msg' in remote storage adapter main.go .Log info message (#4377 ) Signed-off-by: Peter Gallerani <peter.gallerani@gmail.com>	6 years ago
Callum Styan	d0ee4da932	fix minor issues in custom SD example (#4278 ) Signed-off-by: Callum Styan <callumstyan@gmail.com>	7 years ago
Callum Styan	03578d5df8	add example usage of SD adapter for converting unsupported SD type to filesd (#3720 ) Signed-off-by: Callum Styan <callumstyan@gmail.com>	7 years ago
Bartek Plotka	03a9e7f72e	example: Commented out annotation examples as they are meant only for example not as an idiomatic way of relabelling. Signed-off-by: Bartek Plotka <bwplotka@gmail.com>	7 years ago
Paul Gier	85a3c974b7	minor yaml indentation consistency fix in example configs (#3946 )	7 years ago
ferhat elmas	ffa673f7d8	General simplifications (#3887 ) Another try as in #1516	7 years ago
root	80e5867a87	Fixed RBAC Example, added ingress privileges; @brian-brazil	7 years ago
Matthew Pound	e6dcc72f9a	Fix instructions on updating prometheus.yml for Remote Write Adapter Example (#3422 )	7 years ago
James Turnbull	4db6592d01	Removing external_labels from example conf file (#3409 ) It's unclear why this is in the example configuration file. Probably best to keep that super simple, c.f. https://github.com/prometheus/docs/pull/895#discussion_r148924390	7 years ago
David	e3b926c03b	Fix typo in AM config field static_configs (#3415 ) * typo in prometheus.yml field causes prometheus to throw an error Fixes #3414	7 years ago
Krasi Georgiev	5d8f93a22a	now using only github.com/gogo/protobuf bumped all grpc-gateway packages to v1.2.2 updated and run the denproto.sh script	7 years ago
Julien Pivotto	3382f39046	Explicitely add alertmanager to example config (#3383 ) As alertmanager needs to be configured in the config file in Prometheus 2, I think it is useful to have it in the example config. Also renamed the rules in the example config so they are explicitely yml files.	7 years ago
Julius Volz	099df0c5f0	Migrate "golang.org/x/net/context" -> "context" (#3333 ) In some places, where ctxhttp or gRPC are concerned, we still need to use the old contexts.	7 years ago
Fabian Reinartz	abf7c975c9	Merge branch 'master' into dev-2.0	7 years ago
Jack Neely	128b31d058	Log failure to send NaN values to remote store as Debug (#3235 ) This was a warning and can be a frequent occurrence. Let's not fill up logs unless we are asked to.	7 years ago
Goutham Veeramachaneni	3f0267c548	Merge branch 'dev-2.0' into go-kit/log Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>	7 years ago
Goutham Veeramachaneni	f5aed810f9	logging: Port to common/promlog Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>	7 years ago
Fabian Reinartz	e746282772	Merge branch 'master' into dev-2.0	7 years ago
Fabian Reinartz	d21f149745	*: migrate to go-kit/log	7 years ago
Fabian Reinartz	87918f3097	Merge branch 'master' into dev-2.0	7 years ago
Johannes 'fish' Ziemke	70f3d1e9f9	k8s: Support discovery of ingresses (#3111 ) * k8s: Support discovery of ingresses * Move additional labels below allocation This makes it more obvious why the additional elements are allocated. Also fix allocation for node where we only set a single label. * k8s: Remove port from ingress discovery * k8s: Add comment to ingress discovery example	7 years ago
Julius Volz	aa5cdcb11e	Remove extra space in log output	7 years ago
gdmello	35c952e344	Added logging for remote storage adapter (#3106 ) * Added logging for remote storage adapter on startup and on any error condition during /read or /write. * CR feedback.	7 years ago
Fabian Reinartz	25f3e1c424	Merge branch 'master' into mergemaster	7 years ago
Felicity	f30b10223a	documentation: update Kubernetes example for 1.7 (#2918 ) Kubernetes 1.7+ no longer exposes cAdvisor metrics on the Kubelet metrics endpoint. Update the example configuration to scrape cAdvisor in addition to Kubelet. The provided configuration works for 1.7.3+ and commented notes are given for 1.7.2 and earlier versions. Also remove the comment about node (Kubelet) CA not matching the master CA. Since the example no longer connects directly to the nodes, it doesn't matter what CA they're using. References: - https://github.com/kubernetes/kubernetes/issues/48483 - https://github.com/kubernetes/kubernetes/pull/49079	7 years ago
Tom Wilkie	cf105f9d57	Update example remote adapters for change in proto location.	7 years ago
Julius Volz	e0f046396a	Fix InfluxDB retention policy usage in read adapter (#2781 )	8 years ago
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	8 years ago
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	8 years ago
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.	8 years ago
Brian Brazil	0e0fc5a7f4	Correct example name to adapter. (#2590 )	8 years ago
Brian Brazil	c813c824d4	Separate out remote read responses. Fixes #2574	8 years ago
Julius Volz	3581057ea4	Update remote storage bridge README.md	8 years ago
Julius Volz	b391cbb808	Add InfluxDB read-back support to remote storage bridge	8 years ago
Julius Volz	815762a4ad	Move retrieval.NewHTTPClient -> httputil.NewClientFromConfig	8 years ago
Stephen Soltesz	3f29324e04	Fix kubernetes host:port relabel regex. This change corrects a bug introduced by PR https://github.com/prometheus/prometheus/pull/2427 The regex uses three groups: the hostname, an optional port, and the prefered port from a kubernetes annotation. Previously, the second group should have been ignored if a :port was not present in the input. However, making the port group optional with the "?" had the unintended side-effect of allowing the hostname regex "(.+)" to match greedily, which included the ":port" patterns up to the ";" separating the hostname from the kubernetes port annotation. This change updates the regex for the hostname to match any non-":" characters. This forces the regex to stop if a ":port" is present and allow the second group to match the optional port.	8 years ago
Stephen Soltesz	0b1790ee44	Match addresses with or without declared ports. This change updates port relabeling for pod and service discovery so the relabeling regex matches addresses with or without declared ports. As well, this change uses a consistent style in the replacement pattern for the two expressions. Previously, for both services or pods that did not have declared ports, the relabel config regex would fail to match: __meta_kubernetes_service_annotation_prometheus_io_port regex: (.+)(?::\d+);(\d+) __meta_kubernetes_pod_annotation_prometheus_io_port regex: (.+):(?:\d+);(\d+) Both regexes expected a <host>:<port> pattern. The new regex matches addresses with or without declared ports by making the :<port> pattern optional. __meta_kubernetes_service_annotation_prometheus_io_port __meta_kubernetes_pod_annotation_prometheus_io_port regex: (.+)(?::\d+)?;(\d+)	8 years ago
Julius Volz	beb3c4b389	Remove legacy remote storage implementations This removes legacy support for specific remote storage systems in favor of only offering the generic remote write protocol. An example bridge application that translates from the generic protocol to each of those legacy backends is still provided at: documentation/examples/remote_storage/remote_storage_bridge See also https://github.com/prometheus/prometheus/issues/10 The next step in the plan is to re-add support for multiple remote storages.	8 years ago
Svend Sorensen	3a96d0e267	Kubernetes SD: Fix namespace meta label Replace one more instance of `__meta_kubernetes_service_namespace` with `__meta_kubernetes_namespace`.	8 years ago
Julius Volz	b16371595d	Add standalone remote storage bridge example In preparation for removing specific remote storage implementations, this offers an example of how to achieve the same in a separate process. Rather than having three separate bridges for OpenTSDB, InfluxDB, and Graphite, I decided to support all in one binary. For now, this is in the example documenation directory, but perhaps we will want to make a first-class project / repository out of it.	8 years ago
beorn7	5770d9e545	Kubernetes SD: More fixes to example config - Avoid mentioning the `in_cluster` option. (It doesn't exist anymore.) - Replace `__meta_kubernetes_service_namespace` and `__meta_kubernetes_pod_namespace` (which don't exist anymore) by `__meta_kubernetes_namespace`.	8 years ago
gambrose	52c762e9f1	The defaults stated in the example config where wrong (#2110 ) * The stated defaults where wrong * Update prometheus.yml	8 years ago
Jimmi Dyson	473dd5b89a	Kubernetes SD: Add endpoints role to API servers job to actually discover some API servers	8 years ago
Jimmi Dyson	da23543f29	Kubernetes SD: Update example config to use endpoints role for API server discovery	8 years ago
Jimmi Dyson	4d37dca669	Kubernetes SD: Update config for discovery in 1.3	8 years ago
Julius Volz	b5163351bf	Simplify and fix remote write example After removing gRPC, this can be simplified again. Also, the configuration for the remote storage moved from flags to the config file.	8 years ago
Tom Wilkie	d83879210c	Switch back to protos over HTTP, instead of GRPC. My aim is to support the new grpc generic write path in Frankenstein. On the surface this seems easy - however I've hit a number of problems that make me think it might be better to not use grpc just yet. The explanation of the problems requires a little background. At weave, traffic to frankenstein need to go through a couple of services first, for SSL and to be authenticated. So traffic goes: internet -> frontend -> authfe -> frankenstein - The frontend is Nginx, and adds/removes SSL. Its done this way for legacy reasons, so the certs can be managed in one place, although eventually we imagine we'll merge it with authfe. All traffic from frontend is sent to authfe. - Authfe checks the auth tokens / cookie etc and then picks the service to forward the RPC to. - Frankenstein accepts the reads and does the right thing with them. First problem I hit was Nginx won't proxy http2 requests - it can accept them, but all calls downstream are http1 (see https://trac.nginx.org/nginx/ticket/923). This wasn't such a big deal, so it now looks like: internet --(grpc/http2)--> frontend --(grpc/http1)--> authfe --(grpc/http1)--> frankenstein Next problem was golang grpc server won't accept http1 requests (see https://groups.google.com/forum/#!topic/grpc-io/JnjCYGPMUms). It is possible to link a grpc server in with a normal go http mux, as long as the mux server is serving over SSL, as the golang http client & server won't do http2 over anything other than an SSL connection. This would require making all our service to service comms SSL. So I had a go a writing a grpc http1 server, and got pretty far. But is was a bit of a mess. So finally I thought I'd make a separate grpc frontend for this, running in parallel with the frontend/authfe combo on a different port - and first up I'd need a grpc reverse proxy. Ideally we'd have some nice, generic reverse proxy that only knew about a map from service names -> downstream service, and didn't need to decode & re-encode every request as it went through. It seems like this can't be done with golang's grpc library - see https://github.com/mwitkow/grpc-proxy/issues/1. And then I was surprised to find you can't do grpc from browsers! See http://www.grpc.io/faq/ - not important to us, but I'm starting to question why we decided to use grpc in the first place? It would seem we could have most of the benefits of grpc with protos over HTTP, and this wouldn't preclude moving to grpc when its a bit more mature? In fact, the grcp FAQ even admits as much: > Why is gRPC better than any binary blob over HTTP/2? > This is largely what gRPC is on the wire.	8 years ago
Julius Volz	aa3f2b7216	Generic write cleanups and changes. - fold metric name into labels - return initialization errors back to main - add snappy compression - better context handling - pre-allocation of labels - remove generic naming - other cleanups	8 years ago
Brian Brazil	36d2c4bd0b	Add generic write path using grpc. This uses a new proto format, with scope for multiple samples per timeseries in future. This will allow users to pump samples out to whatever they like without having to change the core Prometheus code. There's also an example receiver to save users figuring out the boilerplate themselves.	8 years ago
Fabian Reinartz	9a269b5507	Clarify comment on rule evaluation Fixes #1866	8 years ago
Audun Fauchald Strand	50e044bb00	added path to pods scrape job	8 years ago
William Stewart	f97cd29e47	Drop '__meta_kubernetes_role' since we have role in the config	8 years ago
William Stewart	599fafd2aa	Add node job	8 years ago
William Martin Stewart	58a3771e49	Add roles to prometheus kubernetes example Needed with Prometheus 1.0	8 years ago
Jimmi Dyson	5733de0dfe	Kubernetes SD: Update example config with TLS options	9 years ago
beorn7	44aa7ec46d	doc: Update scrape config in example prometheus.yml	9 years ago
Pieter Lange	427b322078	Minor typo	9 years ago
Patrick Bogen	ae413704e8	kubernetes pod-level discovery	9 years ago
Julius Volz	657d65d6d6	Remove invalid scrape timeout from example config. It can't be greater than the scrape interval. Let's just remove it.	9 years ago
Julius Volz	e3baa35e9f	Fix typo in documentation/examples/kubernetes-rabbitmq/README.md	9 years ago
Tiago Katcipis	73be7f63be	Fix typos and moving example to the correct place	9 years ago
Tiago Katcipis	b7ae20d3d8	fixing typos	9 years ago
Tiago Katcipis	53fb648849	adding README to explain the example	9 years ago
Tiago Katcipis	bb4722d6b5	Adding RabbitMQ example as mentioned on #1312	9 years ago
Jimmi Dyson	d3934345e9	Kubernetes Discovery: Ensure metrics path isn't overwritten in example relabeling	9 years ago
Jimmi Dyson	c12fb447b8	Kubernetes SD: Use first TCP service port as target port & clean up example config Fixes #1256	9 years ago
Jimmi Dyson	042f18b07a	Kubernetes SD: Fix metrics path relabeling in example config	9 years ago
Jimmi Dyson	645feba8cf	KubernetesSD: Remove redundant defaults from example config	9 years ago
Jimmi Dyson	2cca07381b	KubernetesSD: Create targets for services as well as service endpoints	9 years ago
Jimmi Dyson	104803e74e	Kubernetes SD: Cleanup example config label regexps	9 years ago
Jimmi Dyson	87940ec213	Kubernetes SD: Rename `masters` to `api_servers` in config	9 years ago

1 2 3 4

164 Commits (8297f5cb6bb4ac4ffede352a2a2b01422f995657)