130 Commits (933aa367b431e248524371dbab240c06ef8915da)

Author	SHA1	Message	Date
John Bampton	98a69b77d1	Fix spelling (#7512) ... Signed-off-by: John Bampton <jbampton@users.noreply.github.com>	4 years ago
Julien Pivotto	74a6959d46	Docs: fix types (#7508) ... I have batched a bunch of fixes around types in the documentation. Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	4 years ago
Steffen Neubauer	9c9b872087	OpenStack SD: Add availability config option, to choose endpoint type (#7494) ... * OpenStack SD: Add availability config option, to choose endpoint type In some environments Prometheus must query OpenStack via an alternative endpoint type (gophercloud calls this `availability`. This commit implements this option. Co-Authored-By: Dennis Kuhn <d.kuhn@syseleven.de> Signed-off-by: Steffen Neubauer <s.neubauer@syseleven.de>	4 years ago
Julien Pivotto	800c0aefcf	Fix types in k8s+dns docs (#7474) ... Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	4 years ago
Julien Pivotto	59de58d380	Docker Swarm service discovery (#7420) ... * Docker Swarm service discovery Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	4 years ago
Julien Pivotto	0444a419d7	Consul: document health meta label (#7466) ... implemented in #5313 fixes #770 Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	4 years ago
Julien Pivotto	c61141ce51	Add DigitalOcean service discovery (#7407) ... Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	5 years ago
Julien Pivotto	7b24bb3116	Docs: normalize bearer_token_file type (#7408) ... Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	5 years ago
Alex Vandiver	3c753aba5f	Add missing newline before inline-code block (#7401) ... Sections with three backticks require a blank line before them. Signed-off-by: Alex Vandiver <alex@chmrr.net>	5 years ago
Martin Lee	b5d61fb66c	Add AMI to labels scraped during service discovery. (#7386) ... Signed-off-by: Martin Lee <martin@martinlee.org>	5 years ago
Julien Pivotto	ef4d8a38ca	Change metrics relabel terminology (#7362) ... Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	5 years ago
Julien Pivotto	2209fa98b4	Fix consul_sd_config to follow types convention (#7316) ... Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	5 years ago
Jop Zinkweg	1f69c38ba4	Add discovery support for triton compute nodes (#7250) ... Added optional configuration item role, defaults to 'container' (backwards-compatible). Setting role to 'cn' will discover compute nodes instead. Human-friendly compute node hostname discovery depends on cmon 1.7.0: c1a2aeca36 Adjust testcases to use discovery config per case as two different types are now supported. Updated documentation: * new role setting * clarify what the name 'container' covers as triton uses different names in different locations Signed-off-by: jzinkweg <jzinkweg@gmail.com>	5 years ago
Harold Dost	18d45e564b	Documentation: Update example expressions to follow convention. (#7195) ... Based out of conversation on #7193 Signed-off-by: Harold Dost <h.dost@criteo.com>	5 years ago
Callum Styan	386aea7774	Add missing remote write/read config name to docs. (#7105) ... Signed-off-by: Callum Styan <callumstyan@gmail.com>	5 years ago
Frederic Hemberger	fe47c9c86e	[Docs] consul_sd_config: Add default value for `allow_stale` (#7075) ... Ref: https://github.com/prometheus/prometheus/blob/master/discovery/consul/consul.go#L97 Signed-off-by: Frederic Hemberger <mail@frederic-hemberger.de>	5 years ago
Deepjyoti Mondal	c38ca2ca95	Fix #6999 : Add architecture meta label for EC2 (#7000) ... This PR adds architecture meta labels for EC2 instances Signed-off-by: Deepjyoti Mondal <djmdeveloper060796@gmail.com>	5 years ago
Brian Brazil	445d48f4ce	Fix small docs typo (#7014) ... Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>	5 years ago
coding3min	4dfbf328f2	[OpenStack SD] Add HypervisorID meta labels about id (#6962) ... Add extra meta labels which will be useful in the case Prometheus discovery hypervisor . Signed-off-by: pzqu <pzqu@qq.com> Co-authored-by: pzqu <pzqu@example.com>	5 years ago
Alex Gaganov	df92a00838	Expose EC2 instance lifecycle as label (#6914) ... Signed-off-by: Alex Gaganov <alex.gaganov@fiverr.com>	5 years ago
李国忠	029b45aa30	add service type metadata to kubernetes_sd_config service role #6496 (#6684) ... * [service discovery] add service type metadata to kubernetes_sd_config service role Signed-off-by: fuling <fuling.lgz@alibaba-inc.com> * [fix] ServiceType -> string Signed-off-by: fuling <fuling.lgz@alibaba-inc.com> * [fix] fix testcase Signed-off-by: fuling <fuling.lgz@alibaba-inc.com> * [style] Signed-off-by: fuling <fuling.lgz@alibaba-inc.com> * [doc] add service type Signed-off-by: fuling <fuling.lgz@alibaba-inc.com> * [doc] sort Signed-off-by: fuling <fuling.lgz@alibaba-inc.com>	5 years ago
Aleksandra Gacek	8e53c19f9c	discovery/kubernetes: expose label_selector and field_selector ... Close #6807 Co-authored-by @shuttie Signed-off-by: Aleksandra Gacek <algacek@google.com>	5 years ago
Grebennikov Roman	b4445ff03f	discovery/kubernetes: expose label_selector and field_selector ... Closes #6096 Signed-off-by: Grebennikov Roman <grv@dfdx.me>	5 years ago
Andrew Hayworth	a336908678	Adds link to valid metric names (#6774) ... One of our users today asked us if dashes were allowed in recording rule names. We asserted that they were not, but also that we could not remember for certain. After determining empirically that they are _not_ allowed, I realized that the documentation could be slightly clearer about valid rule names. This PR simply adds a note to the documentation re-iterating that the rules must be valid metric names - and more importantly, adds a link to where a user can read what those *are*, in case they were not aware (or did not know where to find it). Signed-off-by: Andrew Hayworth <ahayworth@gmail.com>	5 years ago
Julien Pivotto	9d9bc524e5	Add query log (#6520) ... * Add query log, make stats logged in JSON like in the API Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	5 years ago
Kyle Hinton	16f1e252f4	Small grammar fix on alerting rules doc (#6104) ... Signed-off-by: Kyle Hinton <kyle.hinton0@gmail.com>	5 years ago
Simon Pasquier	f6f23a2675	docs: update unit testing rules (#6051) ... * docs: update unit testing rules Signed-off-by: Simon Pasquier <spasquie@redhat.com> * More nits fixed Signed-off-by: Simon Pasquier <spasquie@redhat.com>	5 years ago
li mengyang	1c6d2194c4	fix spelling mistakes in docs (#5952) ... Signed-off-by: hwdef <hwdef97@gmail.com>	5 years ago
Chris Marchbanks	a6a55c433c	Improve desired shards calculation (#5763) ... The desired shards calculation now properly keeps track of the rate of pending samples, and uses the previously unused integralAccumulator to adjust for missing information in the desired shards calculation. Also, configure more capacity for each shard. The default 10 capacity causes shards to block on each other while sending remote requests. Default to a 500 sample capacity and explain in the documentation that having more capacity will help throughput. Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>	5 years ago
Dan P	a9dea68ee6	removed document reference to meta label that doesnt exist in the kubernetes_sd (#5821) ... Signed-off-by: Dan Potepa <dan@danpotepa.co.uk>	5 years ago
beorn7	5973acd65d	Clarifying honor_labels documentation ... Previously, the wording could be misunderstood as setting honor_labels to "false" for federation. This also adds scraping the Pushgateway as a typical use case for honor_labels=true. Signed-off-by: beorn7 <beorn@grafana.com>	5 years ago
Svend Sorensen	8d54650d06	Document behavior of empty ec2_sd_config region (#5711) ... Document the behavior of an empty `ec2_sd_config` `region` setting. If this is omitted or blank, the region is discovered from the instance metadata, if available. If it is blank and instance region metadata is not available, an error will result ("EC2 SD configuration requires a region"). Signed-off-by: Svend Sorensen <svend@svends.net>	6 years ago
Max Leonard Inden	41c22effbe	config&notifier: Add option to use Alertmanager API v2 ... With v0.16.0 Alertmanager introduced a new API (v2). This patch adds a configuration option for Prometheus to send alerts to the v2 endpoint instead of the defautl v1 endpoint. Signed-off-by: Max Leonard Inden <IndenML@gmail.com>	6 years ago
Björn Rabenstein	dc22f74153	Merge pull request #5608 from simonpasquier/external-labels-for-alert-tests ... cmd/promtool: add $externalLabels for alert unit tests	6 years ago
Björn Rabenstein	f3f016d464	Merge pull request #5604 from cstyan/default-capacity-docs ... Update queue config documentation	6 years ago
Ganesh Vernekar	5888066ffa	Merge pull request #5649 from cstyan/remove-queue-retries ... Remove max_retries from queue_config	6 years ago
Jens Erat	375aeb9158	Added humanizePercentage formatting to templates (#5670) ... Lots of alerts are based on ratios (eg. disk usage), and humans are used to values in percentage in textual descriptions. Signed-off-by: Jens Erat <email@jenserat.de>	6 years ago
Keenan Romain	55f3a9fe4a	Allows globs for rules when unit testing (#5595) ... * Includes glob support when unit testing rule_files. Signed-off-by: Keenan Romain <Keenan.Romain@mailchimp.com>	6 years ago
Callum Styan	e9129abeff	Remove max_retries from queue_config since it's not used in remote write ... anymore. Signed-off-by: Callum Styan <callumstyan@gmail.com>	6 years ago
Frederic Branczyk	9fc3c61e2c	Merge pull request #5598 from sh0rez/master ... include InitContainers in Kubernetes Service Discovery	6 years ago
Simon Pasquier	74ff35ccdd	cmd/promtool: add $externalLabels for alert unit tests ... Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago
sh0rez	8ba23fb336	fix(style): container_is_init to container_init ... Removes 'is' keyword to comply style guide Signed-off-by: sh0rez <me@shorez.de>	6 years ago
Carl Bergquist	9ba2f13c5e	fix inconsistant example rule (#5605) ... Signed-off-by: bergquist <carl.bergquist@gmail.com>	6 years ago
sh0rez	88b79bae64	chore(style): Comply with style guide, order list ... Signed-off-by: sh0rez <me@shorez.de>	6 years ago
Callum Styan	babb8a0572	Update queue config documentation to reflect default value change for capacity. ... Signed-off-by: Callum Styan <callumstyan@gmail.com>	6 years ago
sh0rez	1b144e499f	doc(discovery/kubernetes): container_is_init meta label ... Signed-off-by: sh0rez <me@shorez.de>	6 years ago
Bevisy	bdebb0c890	format markdown code block (#5594) ... Signed-off-by: bevisy <binbin36520@gmail.com>	6 years ago
Frederic Branczyk	04f22700b7	Merge pull request #5571 from simonpasquier/extend-k8s-endpoint-metadata ... discovery/kubernetes: add node name and hostname to endpoints	6 years ago
Samuel Alfageme	425b07f3c4	Updated the 'consistency-modes' consul.io/api link to point to its new location (#5572) ... Ref: 626392eb62 Signed-off-by: Samuel Alfageme <samuel@alfage.me>	6 years ago
Simon Pasquier	3441ecdea1	discovery/kubernetes: add node name and hostname to endpoints ... Signed-off-by: Simon Pasquier <spasquie@redhat.com>	6 years ago