mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-09-30 04:37:32 -07:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity
7154 commits 215 branches 425 tags 748 MiB
Commit graph

7154 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
pasquier-s b3eccdd828 Fix 'addrConn.resetTransport' error (#3004) (#3517) 
net.Listener converts 0.0.0.0 to :: which fails for hosts where IPv6 is
disabled. This change uses the original listen address parameter instead
of grpcl.Addr().String().
 2017-12-11 21:39:58 +08:00
pasquier-s 2440696961 Log file descriptor limits at startup (#3567) 
Fixes #3564
 2017-12-11 13:01:53 +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
Ed Schouten bb724f1bef Deprecate DeduplicateSeriesSet() in favor of NewMergeSeriesSet(). 
Federation makes use of dedupedSeriesSet to merge SeriesSets for every
query into one output stream. If many match[] arguments are provided,
many dedupedSeriesSet objects will get chained. This has the downside of
causing a potential O(n*k) running time, where n is the number of series
and k the number of match[] arguments.

In the mean time, the storage package provides a mergeSeriesSet that
accomplishes the same with an O(n*log(k)) running time by making use of
a binary heap. Let's just get rid of dedupedSeriesSet and change all
existing callers to use mergeSeriesSet.
 2017-12-10 19:51:20 +01:00
Goutham Veeramachaneni 667b5575e9 Close db so that file space is reclaimed immediately after delete. 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-12-10 12:02:01 -06:00
Fabian Reinartz e103f21cca
Merge pull request #220 from cstyan/master 
Use internal test utils rather than testify package
 2017-12-08 22:52:10 +01:00
Callum Styan df7cc4dff5 remove Nil/NotNil functions 2017-12-08 13:42:08 -08:00
Fabian Reinartz 838fc5a4d1
Merge pull request #3300 from alcortesm/update-testing-utils-to-go1.9 
testutil: simplify code
 2017-12-08 22:33:18 +01:00
Alberto Cortés 29da2fb9cd testutil: update to go1.9 testing.Helper 2017-12-08 19:06:53 +01:00
Alberto Cortés 8f6a9f7833 config: simplify tests by using testutil.NotOk (#3289) 
Also include filename in all LoadFile errors

Also add mesage to testuitl.NotOk so we can identify failing tests when
using table driven tests.
 2017-12-08 16:52:25 +00:00
Tom Wiedenbein 937ac8c060
fixed bug with initialization of queueconfig 
QueueConfigs would only ever initialize to the default settings, and would not pick up their respective values from YAML.
 2017-12-08 02:11:45 -08: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
Conor Broderick 08a4e0693b
Merge pull request #3556 from prometheus/remove-obsolete-todo 
Remove obsolete TODO in API code
 2017-12-07 15:54:47 +00:00
Shubheksha Jalan 35c1926d14 use httptest.NewRequest, remove http.ReadRequest (#3557) 2017-12-07 23:52:50 +08:00
Goutham Veeramachaneni f0599d4dbf Incorporate review-feedback 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-12-07 09:06:04 -06:00
Julius Volz ab11a457e8 Remove obsolete TODO in API code 
In https://github.com/prometheus/prometheus/pull/3230/files, contexts were
added to the Querier() method instead, and Cortex is fine with that.
 2017-12-07 23:01:13 +08:00
James Turnbull 330735aca6 Added another full link to the configuration docs (#3553) 2017-12-07 08:31:15 +00:00
Callum Styan ff0b0ac4b6 use test utils in chunk_test 2017-12-06 19:05:58 -08:00
Callum Styan 2ad78b3e51 use test utils in buffer_test 2017-12-06 17:15:02 -08:00
Callum Styan ef99a94ffe use test utils in labels_test 2017-12-06 17:13:00 -08:00
Callum Styan e68ff0caec use test utils in postings_test 2017-12-06 17:12:38 -08:00
Callum Styan ca4e817372 move test utils to it's own package so we can use it in tests for other packages in tsdb repo 2017-12-06 17:06:14 -08:00
Callum Styan fa26e2b6c3 use test utils in compact_test 2017-12-06 16:30:24 -08:00
Callum Styan 945b6b01aa use test utils in index_test 2017-12-06 16:27:21 -08:00
Callum Styan a1a91ea96a use test utils in querier_test 2017-12-06 16:27:09 -08:00
Callum Styan 6c8bbf3f61 use test utils in wal_test 2017-12-06 16:16:42 -08:00
Callum Styan 76417b9b2a use test utils in tombstone_tests 2017-12-06 16:05:37 -08:00
Callum Styan 5aa2af255b use test utils in head_test 2017-12-06 16:00:14 -08:00
Callum Styan ae8bb5fd16 add Nil and NotNil to test utils 2017-12-06 15:58:52 -08:00
Callum Styan 31c420088b use test utils in chunks_test 2017-12-06 15:19:09 -08:00
Callum Styan 670c2917e2 use test utils in db_test 2017-12-06 15:18:42 -08:00
Amy Holt 607a675617 Add prefix to relative 3 URLs (#3551) 2017-12-06 21:16:53 +00:00
Conor Broderick 7417c60071
Merge pull request #3548 from whoward/fix-marathon-1-5 
Parse the normalized container.PortMappings presented by the Marathon 1.5.x API
 2017-12-06 17:25:21 +00:00
Will Howard 6a80fc24cf Parse the normalized container.PortMappings presented by the Marathon 1.5.x API 
Fixes #3465
 2017-12-06 11:23:12 -05:00
Conor Broderick 59d4c539d1 Added rule name to rule error for easier debugging (#3549) 2017-12-06 15:39:06 +00:00
Krasi Georgiev 740662644e write to temp dir and remove it at the end. 
Signed-off-by: Krasi Georgiev <krasi.root@gmail.com>
 2017-12-06 10:45:58 +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