mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-09-30 20:57:31 -07:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
7491 commits 215 branches 425 tags 748 MiB
Commit graph

7491 commits

This branch
This branch
All branches
Author SHA1 Message Date
Goutham Veeramachaneni fe67d2f16a
Merge pull request #229 from Gouthamve/remove-log 
Remove verbose log line that is causing travis issues
 2017-12-21 12:19:10 +05:30
Goutham Veeramachaneni e6e3fa566a Remove verbose log line that is causing travis issues 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-12-21 12:16:11 +05:30
Goutham Veeramachaneni 239cbae154
Merge pull request #228 from Gouthamve/not-matchers 
Select series with label unset for != and !~
 2017-12-21 12:10:51 +05:30
Goutham Veeramachaneni 9f2935c5cf
Merge pull request #224 from Gouthamve/fix-214 
Make sure gc'ed chunks are handled properly
 2017-12-21 12:10:24 +05:30
Krasi Georgiev c94fa731aa bypass the proxy for the tests 2017-12-20 18:21:10 +00:00
Fabian Reinartz 17917be844
Merge pull request #226 from cstyan/callum-decouple-prom-pkg 
decouple tsdb main.go (and tests) from prometheus/pkg
 2017-12-20 08:02:21 +01:00
Krasi Georgiev ad66476c4f fix flaky main.go test and simplify a bit 2017-12-19 15:07:49 +00:00
Krasi Georgiev 0e58cda1fe use Fatalf instead of panic 2017-12-19 12:55:43 +00:00
Krasi Georgiev 61d793cb1f handle web_test webhandler errors. 2017-12-19 12:55:43 +00:00
Fabian Reinartz 2881d73ed8
Merge pull request #3362 from krasi-georgiev/discovery-refactoring 
Decouple the discovery and refactor the retrieval package
 2017-12-19 12:56:34 +01: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
Goutham Veeramachaneni 9c9f96b2c0
Merge pull request #3529 from krasi-georgiev/main-integration-test 
main.go integration test for Startup interrupting.
 2017-12-18 22:12:13 -06:00
Goutham Veeramachaneni 3158b03e6c Select series with label unset for != and !~ 
Fixes https://github.com/prometheus/prometheus/issues/3575

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
 2017-12-19 02:47:31 +00:00
Callum Styan bcde61b237 we shouldn't assume we'll receive the labels in sorted order 2017-12-18 15:32:39 -08:00
Callum Styan 8326e410d0 decouple tsdb main.go (and tests) from prometheus/pkg 2017-12-18 15:26:16 -08:00
Krasi Georgiev 587dec9eb9 rebased and resolved conflicts with the new Discovery GUI page 
Signed-off-by: Krasi Georgiev <krasi.root@gmail.com>
 2017-12-18 20:10:03 +00:00
Krasi Georgiev 60ef2016d5 add a cancel func to the scrape pool as it is needed in the scrape loop select block 2017-12-18 17:29:00 +00:00
Krasi Georgiev 80182a5d82 use poolKey as the pool map key to avoid multi dimensional maps 2017-12-18 17:23:47 +00:00
Krasi Georgiev 1ec76d1950 rearange the contexts variables and logic 
split the groupsMerge function to set and get
other small nits
 2017-12-18 17:23:47 +00:00
Krasi Georgiev 6ff1d5c51e add the scrape manager config reloader 
handle errors with invalid scrape config
 2017-12-18 17:23:47 +00:00
Krasi Georgiev b0d4f6ee08 resolved merge confilc in main.go 2017-12-18 17:23:46 +00:00
Krasi Georgiev f2df712166 updated README 2017-12-18 17:22:50 +00:00
Krasi Georgiev aca8f85699 fixed the tests 2017-12-18 17:22:50 +00:00
Krasi Georgiev fe6c544532 some renaming and comments fixes. 
remove some select state that is most likely obsoleete and hoepfully doesn't braje anything :)
merge targets will sort by Discoverer name so we can have consistent tests for the maps.
 2017-12-18 17:22:50 +00:00
Krasi Georgiev f5c2c5ff8f brake the start provider func so that can run unit tests against it. 2017-12-18 17:22:50 +00:00
Krasi Georgiev c5cb0d2910 simplify naming and API. 2017-12-18 17:22:50 +00:00
Krasi Georgiev 9c61f0e8a0 scrape pool doesn't rely on context as Stop() needs to be blocking to prevent Scrape loops trying to write to a closed TSDB storage. 2017-12-18 17:22:49 +00:00
Krasi Georgiev e405e2f1ea refactored discovery 2017-12-18 17:22:49 +00:00
Bryan Boreham a8cce41882 Set MaxIdleConnsPerHost alongside MaxIdleConns (#3592) 
Otherwise it defaults to 2, and Go will close extra connections as
soon as a request is finished.
See https://github.com/golang/go/issues/13801
 2017-12-17 15:15:04 +00:00
Goutham Veeramachaneni 05d62ca842 Make sure gc'ed chunks are handled properly 
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
 2017-12-14 19:48:39 +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
Conor Broderick b5c30090b9
Merge pull request #3544 from Conorbro/relabel 
Added service discovery view showing labels before and after relabelling
 2017-12-13 17:33:55 +00:00
conorbroderick 8b6f3a1bd3 Added service discovery view showing labels before and after relabelling 2017-12-13 15:46:11 +00:00
Luke Overend 9532c2c700 Pass ams to go routine when sending alerts (#3284) 
Currently when sending alerts via the go routine within `sendAll`, the value
of `ams` is not passed to the routine, causing it to use the updated value of `ams`.

Example config:

```
alerting:
  alertmanagers:
    - basic_auth:
        username: 'prometheus'
        password: 'test123'
      static_configs:
      - targets:
        - localhost:9094
    - static_configs:
      - targets:
        - localhost:9095
```

In this example alerts sent to `localhost:9094` fail with:

```
level=error ts=2017-10-12T10:03:53.456819948Z caller=notifier.go:445
component=notifier alertmanager=http://localhost:9094/api/v1/alerts
count=1 msg="Error sending alert" err="bad response status 401
Unauthorized"
```

If you change the order to be:

```
alerting:
  alertmanagers:
    - static_configs:
      - targets:
        - localhost:9095
    - basic_auth:
        username: 'prometheus'
        password: 'test123'
      static_configs:
      - targets:
        - localhost:9094
```

It works as expected.

This commit changes the behavour so `ams` is passed to the go routine so
`n.sendOne` uses the appropriate `http.Client` details.
 2017-12-12 13:40:00 +00:00
Goutham Veeramachaneni 2d73d2b892
Merge pull request #3570 from Gouthamve/colon-snapshot 
Make the date returned by snapshot script friendly
 2017-12-11 19:04:10 -08:00
Brian Brazil 81db4716c1
Mention SD moratorium in README (#3573) 2017-12-11 15:38:23 +00:00
Tom Wilkie 73fa721dd2
Merge pull request #3569 from EdSchouten/faster-federation 
Deprecate DeduplicateSeriesSet() in favor of NewMergeSeriesSet().
 2017-12-11 09:37:15 -06:00
Goutham Veeramachaneni 8b7b19714d
Merge pull request #222 from Gouthamve/close-db 
Close db so that file space is reclaimed immediately after delete
 2017-12-11 08:29:22 -06:00