RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2024-12-26 00:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,807 Commits 243 Branches 444 Tags 653 MiB
6b0e9ef183
Commit Graph

68 Commits

Author SHA1 Message Date
Jeffrey Zhang
21f96caab3 Fix wrong syntax for alert field templates (#3883) 2018-02-24 09:37:43 +00:00
Conor Broderick
99006d3baf Added dropped targets API to targets endpoint (#3870) 2018-02-21 17:26:18 +00:00
Conor Broderick
1fd20fc954 Add dropped alertmanagers to alertmanagers API (#3865) 2018-02-21 09:00:07 +00:00
Bartek Plotka
93a63ac5fd api: Added v1/status/flags endpoint. (#3864) 
Endpoint URL: /api/v1/status/flags
Example Output:
```json
{
  "status": "success",
  "data": {
    "alertmanager.notification-queue-capacity": "10000",
    "alertmanager.timeout": "10s",
    "completion-bash": "false",
    "completion-script-bash": "false",
    "completion-script-zsh": "false",
    "config.file": "my_cool_prometheus.yaml",
    "help": "false",
    "help-long": "false",
    "help-man": "false",
    "log.level": "info",
    "query.lookback-delta": "5m",
    "query.max-concurrency": "20",
    "query.timeout": "2m",
    "storage.tsdb.max-block-duration": "36h",
    "storage.tsdb.min-block-duration": "2h",
    "storage.tsdb.no-lockfile": "false",
    "storage.tsdb.path": "data/",
    "storage.tsdb.retention": "15d",
    "version": "false",
    "web.console.libraries": "console_libraries",
    "web.console.templates": "consoles",
    "web.enable-admin-api": "false",
    "web.enable-lifecycle": "false",
    "web.external-url": "",
    "web.listen-address": "0.0.0.0:9090",
    "web.max-connections": "512",
    "web.read-timeout": "5m",
    "web.route-prefix": "/",
    "web.user-assets": ""
  }
}
```

Signed-off-by: Bartek Plotka <bwplotka@gmail.com>
 2018-02-21 08:49:02 +00:00
Pedro Araújo
575f665944 Add OS type meta label to Azure SD (#3863) 
There is currently no way to differentiate Windows instances from Linux
ones. This is needed when you have a mix of node_exporters /
wmi_exporters for OS-level metrics and you want to have them in separate
scrape jobs.

This change allows you to do just that. Example:

```
  - job_name: 'node'
    azure_sd_configs:
      - <azure_sd_config>
    relabel_configs:
      - source_labels: [__meta_azure_machine_os_type]
        regex: Linux
        action: keep
```

The way the vendor'd AzureSDK provides to get the OsType is a bit
awkward - as far as I can tell, this information can only be gotten from
the startup disk. Newer versions of the SDK appear to improve this a
bit (by having OS information in the InstanceView), but the current way
still works.
 2018-02-19 15:40:57 +00:00
Andrea Giardini
3a9637fa3c docs: Fix remote_read/remote_timeout default (#3829) 2018-02-12 12:52:33 +00:00
Brian Brazil
66b8bdbf4a
Fix docs for #3820 (#3823) 2018-02-11 23:35:08 +00:00
Ben Kochie
40acc632bb
Merge pull request #3505 from rdemachkovych/ansible_prom2.0 
Added to documentation Ansible roles for Prometheus 2.0
 2018-01-26 11:30:15 +01:00
Roman Demachkovych
8bfc611616 Remove not maintained roles 2018-01-26 09:46:44 +01:00
zemek
8a01a0fbed Set consul server default to localhost:8500 (#3703) 2018-01-24 12:14:32 +00:00
James Turnbull
00f4821178 Added missing ingress from role list (#3666) 2018-01-08 21:23:01 +00:00
James Turnbull
380cacd3a4 Readability edits to vector matching (#3624) 
* Added L3 headings - makes page a little easier to read

* Made use of right-hand and left-hand consistent
 2017-12-26 10:28:39 +00:00
Brian Brazil
fba80da635
Fix default of read_recent to be false. (#3617) 
This is what is documented in the migration guide, and the default settings
should make sense for a true long term storage.

Document the setting.
 2017-12-23 17:21:38 +00:00
James Turnbull
c3f9238756 Updated alert templating docs (#3596) 
The docs suggest that alert templating only works in the summary and
description annotation fields. Some testing and a review of the code
suggests this is no longer true and that you can template any
annotation field.
 2017-12-19 08:04:06 +00:00
Brian Brazil
9083d41d3a
Add 2.0 stability guarantees (#3484) 
As discussed generally consider SDs as unstable, as realistically they
are never going to be. Drop the words "experimental/beta" from most
places in the docs, as users are getting the wrong impression from this.
 2017-12-14 12:54:32 +00:00
Simon Pasquier
aa25dff1ea Update the openstack_sd_config section 
openstack_sd_config requires a 'role' parameter which wasn't documented.
 2017-12-14 12:20:28 +00:00
Krasi Georgiev
08ee713c82 example to show the difference between "sum by" and "sum without" (#3558) 2017-12-14 12:20:28 +00:00
vthriller
b4bd91958a [minor] docs: recording_rules: fix missing key 2017-12-14 12:20:28 +00:00
Tobias Schmidt
28205f5ca9 Remove wrong statement about alertmanager URL configuration 2017-12-14 12:20:28 +00:00
Mike Rostermund
4648f4c156 New server uses read protocol, to eh, read. (#3444) 2017-12-14 12:20:28 +00:00
Brian Brazil
e0711c2e9b Document consul sd tls_config (#3440) 
Fixes https://github.com/prometheus/docs/issues/681
 2017-12-14 12:20:28 +00:00
Tom Wilkie
d2f6803d14 'Prometheus lifecycle' should be a subsection of 'Miscellaneous' 2017-12-14 12:20:28 +00:00
Or Elimelech
6e8d192ba0 Wrong URL for remote.proto (#3431) 
Change wrong URL for remote.proto
 2017-12-14 12:20:28 +00:00
phyber
013dc30dee Fix markdown in recording rules. (#3432) 
Resolves an issue where rendered markdown was incorrect.
 2017-12-14 12:20:28 +00:00
Tobias Schmidt
87f5fe3576 Fix migration documentation title in docs menu 2017-12-14 12:20:28 +00:00
Brian Brazil
5dff97639f Tweak migration doc (#3430) 2017-12-14 12:20:28 +00:00
Jose Donizetti
b3b6538348 Small changes to migration guide 2017-12-14 12:20:28 +00:00
Goutham Veeramachaneni
bee6864c14 Make the date returned by snapshot script friendly 
Fixes #3568

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-12-10 15:14:31 -06:00
Goutham Veeramachaneni
e0d917e2f5
Merge pull request #3523 from Gouthamve/clean-tomb 
Add endpoint to cleanup tombstones
 2017-12-07 14:39:24 -06:00
Goutham Veeramachaneni
f0599d4dbf Incorporate review-feedback 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-12-07 09:06:04 -06:00
James Turnbull
330735aca6 Added another full link to the configuration docs (#3553) 2017-12-07 08:31:15 +00:00
Amy Holt
607a675617 Add prefix to relative 3 URLs (#3551) 2017-12-06 21:16:53 +00:00
Goutham Veeramachaneni
311edc5a38 Merge branch 'master' into clean-tomb 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-12-05 10:23:21 -06:00
Goutham Veeramachaneni
d8515b2580 Move Admin APIs to v1 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-12-04 00:13:43 +05:30
Goutham Veeramachaneni
41b8f1f8fe
Add admin API docs 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-12-02 15:37:31 +05:30
Matthias Rampke
cae4538b3e Docs: state that all regular expressions are RE2. (#3518) 
We already mentioned that regular expressions are RE2 for
[relabeling][0], but left open what the regular expression syntax
anywhere else is.

In the querying examples and reference, make it explicit that _all_
regular expressions are RE2.

[0]: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
 2017-12-01 17:26:06 +00:00
Roman Demachkovych
e0ad66f5a6 fix link name 2017-11-27 18:22:27 +01:00
Roman Demachkovych
370d045f5d Change repo link 2017-11-27 18:14:12 +01:00
James Turnbull
47311bf005 Update configuration.md (#3513) 
1. Removed https://prometheus.io prefix 
2. Fixed broken file discovery link.
 2017-11-27 14:52:32 +00:00
Tom Wilkie
9d4e332137
Merge pull request #3495 from tomwilkie/pod-uid-discovery-master 
Include Pod UID in the discovery metadata.
 2017-11-24 15:37:57 +00:00
Tom Wilkie
7d4f7c4b71 Update docs for __meta_kubernetes_pod_uid 2017-11-24 15:02:53 +00:00
Roman Demachkovych
5e243bc556 fix link 2017-11-22 16:26:06 +01:00
Roman Demachkovych
b758039f80 Added in to documentation Ansible roles for Prometheus 2.0 2017-11-22 16:15:46 +01:00
Ben Kochie
40f33f45cb Fix docs that use regexp anchors (#3504) 
Remove/fix docs that use anchors in label regexp matches.
 2017-11-22 12:11:21 +00:00
Tobias Schmidt
7098c56474 Add remote read filter option 
For special remote read endpoints which have only data for specific
queries, it is desired to limit the number of queries sent to the
configured remote read endpoint to reduce latency and performance
overhead.
 2017-11-13 23:30:01 +01:00
Tom Wilkie
617e7d0203 Add migration docs for 2.0 (#3374) 
* Initial draft of migration.md

* Edits.

* Review feedback.

* Review feedback.

* Staleness link to video; add docker root example; remote config file section.

* s/NB/NOTE/, remove external labels link.

* More typos.

* Add more details link for removed PromQL features.

* s/you/your/

* Expand on prom1.8/2.0 side by side setup.

* More feedback.

* update links.

* --query.lookback-delta flag.
 2017-11-08 08:14:33 +01:00
Julius Volz
02ca988bbd Remove /api/v1/delete_series docs for 2.0 (#3425) 
This endpoint has moved to /api/v2 (with somewhat different properties)
in Prometheus 2.0 and should now be part of a separate admin API page.
 2017-11-07 22:37:03 +00:00
Tobias Schmidt
a117f051da Remove outdated information about next-release doc branch 2017-11-07 22:28:04 +01:00
Julius Volz
ef08df0e6f
Add 2.0 storage docs (#3423) 
* Add 2.0 storage docs

* Review fixups

* More review fixups
 2017-11-07 22:00:38 +01:00
Brian Brazil
a5b7955ace Tweak marathon wording around clustering. 2017-11-02 13:03:19 +00:00