Commit graph

197 commits

Author SHA1 Message Date
Kyle Hinton 16f1e252f4 Small grammar fix on alerting rules doc (#6104)
Signed-off-by: Kyle Hinton <kyle.hinton0@gmail.com>
2019-10-07 10:17:36 +02:00
abejidefemi1@gmail.com 5264b9628b fix punctuation mark
fix typo
Signed-off-by: abejidefemi1@gmail.com <abejidefemi1@gmail.com>
2019-10-01 09:02:11 +01:00
Sven Nebel 5a554df085 Nit: Improve doc text grammar (#6068)
Signed-off-by: Sven Nebel <nebel.sven@gmail.com>
2019-09-28 14:38:51 +01:00
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>
2019-09-25 09:26:53 +02:00
yuxiaobo96 5f6a56a0bb Third correction (#6012)
Signed-off-by: yuxiaobo <yuxiaobogo@163.com>
2019-09-20 10:48:56 +01:00
Ben Kochie 76769d4b61
Update link to SaltStack formula (#6024)
Use the "official" saltstack-formulas version. The existing one hasn't
been updated since 2015.

Signed-off-by: Ben Kochie <superq@gmail.com>
2019-09-15 16:59:16 +02:00
Alan 42d10aea80 docs: fix error link in /migration.md (#6010)
docs: fix error link in /migration.md 
Signed-off-by: alan <zg.zhu@daocloud.io>
2019-09-11 11:01:41 +01:00
li mengyang 1c6d2194c4 fix spelling mistakes in docs (#5952)
Signed-off-by: hwdef <hwdef97@gmail.com>
2019-08-27 11:33:40 -06:00
Bartek Płotka 32be514845
Merge pull request #5805 from codesome/merge-tsdb
Merge tsdb into prometheus
2019-08-13 11:39:41 +01:00
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>
2019-08-13 10:10:21 +01:00
Ganesh Vernekar 5ecef3542d
Cleanup after merging tsdb into prometheus
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
2019-08-13 14:04:14 +05:30
Ben Kochie ff40de7ca6 Add more details about retention to storage docs (#5842)
* Make compaction docs a little more clear, easy to find.
* Expand compaction docs slightly.
* Add notes about block cleanup to operational section.

Signed-off-by: Ben Kochie <superq@gmail.com>
2019-08-07 17:04:48 +01:00
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>
2019-08-01 12:34:23 +01:00
Johnny Lim 7645ed8fd3 Fix typo (#5796)
Signed-off-by: Johnny Lim <izeye@naver.com>
2019-07-24 10:41:14 +01:00
Chris Marchbanks 08f6a43619
Add documentation for the WAL compression flag
Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>
2019-07-09 10:33:59 -06:00
Marco Pracucci 2ccc48adc6 Documented /healthy, /ready and lifecycle API (#5737)
Signed-off-by: Marco Pracucci <marco.pracucci@spreaker.com>
2019-07-05 10:50:48 +01:00
Frederic Branczyk a3d030350f
Merge pull request #5722 from c2c-engg-20170100/dockerhub_link
Fix docker hub link in installation guide
2019-07-03 15:40:05 +02:00
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>
2019-07-02 13:23:20 +02:00
c2c-engg-20170100 81f9dac6a0 Fix docker hub link in installation guide
Signed-off-by: c2c-engg-20170100 <c2c-20170100@click2cloud.net>
2019-07-01 16:26:23 +05:30
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>
2019-06-27 18:35:54 +01:00
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>
2019-06-21 16:33:53 +02:00
Björn Rabenstein dc22f74153
Merge pull request #5608 from simonpasquier/external-labels-for-alert-tests
cmd/promtool: add $externalLabels for alert unit tests
2019-06-20 16:48:12 +02:00
Björn Rabenstein f3f016d464
Merge pull request #5604 from cstyan/default-capacity-docs
Update queue config documentation
2019-06-17 13:05:14 +02:00
Ganesh Vernekar 5888066ffa
Merge pull request #5649 from cstyan/remove-queue-retries
Remove max_retries from queue_config
2019-06-17 12:47:16 +05:30
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>
2019-06-15 08:59:57 +01:00
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>
2019-06-12 11:31:07 +01:00
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>
2019-06-10 12:43:08 -07:00
mkenigs e23fa22233 Change snapshot description to be consistent with rest of the doc (#5642)
Signed-off-by: mkenigs <matthewkenigsberg@gmail.com>
2019-06-07 10:21:47 +01:00
Frederic Branczyk 9fc3c61e2c
Merge pull request #5598 from sh0rez/master
include InitContainers in Kubernetes Service Discovery
2019-06-05 18:47:13 +02:00
Simon Pasquier 74ff35ccdd cmd/promtool: add $externalLabels for alert unit tests
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-05-29 16:40:01 +02:00
sh0rez 8ba23fb336
fix(style): container_is_init to container_init
Removes 'is' keyword to comply style guide

Signed-off-by: sh0rez <me@shorez.de>
2019-05-29 16:16:19 +02:00
Carl Bergquist 9ba2f13c5e fix inconsistant example rule (#5605)
Signed-off-by: bergquist <carl.bergquist@gmail.com>
2019-05-29 10:46:00 +01:00
sh0rez 88b79bae64
chore(style): Comply with style guide, order list
Signed-off-by: sh0rez <me@shorez.de>
2019-05-29 11:22:10 +02:00
Callum Styan babb8a0572 Update queue config documentation to reflect default value change for capacity.
Signed-off-by: Callum Styan <callumstyan@gmail.com>
2019-05-28 14:12:57 -07:00
sh0rez 1b144e499f
doc(discovery/kubernetes): container_is_init meta label
Signed-off-by: sh0rez <me@shorez.de>
2019-05-28 16:52:13 +02:00
Bevisy bdebb0c890 format markdown code block (#5594)
Signed-off-by: bevisy <binbin36520@gmail.com>
2019-05-25 11:28:50 +01:00
Alex Salt d6a4daa26a web api: handle alert with Infinity/NaN values (#5582)
* web/api/v1: alert value as string in alert/rules endpoints

Signed-off-by: Alexander Saltykov <alexander-s@yandex-team.ru>
2019-05-21 10:41:54 +01:00
Frederic Branczyk 04f22700b7
Merge pull request #5571 from simonpasquier/extend-k8s-endpoint-metadata
discovery/kubernetes: add node name and hostname to endpoints
2019-05-16 20:19:29 +02:00
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>
2019-05-16 15:52:35 +01:00
Simon Pasquier 3441ecdea1 discovery/kubernetes: add node name and hostname to endpoints
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-05-16 10:49:13 +02:00
Semyon Slepov 33f085a4d6 Remove bits about substring matching from the docs (#5549)
Substring matching for labels doesn't work anymore.
These parts are misleading, and contradict with the rest of the
documentation.

Signed-off-by: Semyon Slepov <slepovss@gmail.com>
2019-05-09 11:12:32 +01:00
Simon Pasquier 9c69eec82a cmd/promtool: use log.NewNopLogger() (#5531)
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-05-03 10:00:07 +01:00
Julius Volz f04b1b5559
Clarify binary operator output label sets (#5512)
* Clarify binary operator output label sets

Signed-off-by: Julius Volz <julius.volz@gmail.com>

* Clarify binary op output labels further

Signed-off-by: Julius Volz <julius.volz@gmail.com>
2019-04-25 14:10:22 +02:00
Björn Rabenstein 0be9388f8d
Merge pull request #5463 from prometheus/beorn7/templating
Follow-up on #5009
2019-04-24 16:42:23 +02:00
EarthmanT 35be8c9e25 Add azure public ip label (#5475)
* Update Azure SD Config with Public IP label

Signed-off-by: earthmant <trammell@cloudify.co>
2019-04-17 16:05:44 +01:00
Bjoern Rabenstein 38d518c0fe Rework #5009 after comments
Signed-off-by: Bjoern Rabenstein <bjoern@rabenste.in>
2019-04-17 01:40:10 +02:00
Sylvain Rabot 335a34486e Add external labels to template expansion
This affects the expansion of templates in alert labels and
annotations and console templates.

Signed-off-by: Sylvain Rabot <sylvain@abstraction.fr>
2019-04-17 01:40:10 +02:00
Hrishikesh Barman 27404e6226 better readability for data directory tree in storage docs (#5128)
* better readabilty for data dir tree in storage docs

Signed-off-by: geekodour <hrishikeshbman@gmail.com>
2019-04-16 11:40:13 +01:00
Simon Pasquier dafd1632a2 discovery/kubernetes: add present labels for labels/annotations (#5443)
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-04-10 13:21:42 +01:00
Lucas Servén Marín 0e42449b78 docs/querying: improve wording (#5442)
This commit improves the wording of the subquery examples and makes
them more consistent with other examples.

Signed-off-by: Lucas Servén Marín <lserven@gmail.com>
2019-04-09 17:48:41 +01:00