mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-10 07:34:04 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
4620 commits 245 branches 436 tags 650 MiB
Commit graph

4620 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
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
Brian Brazil 30b4439bbd Remove rule_type label from rule metrics. 
This is not really needed now that we have rule groups
to distinguish rules.
 2017-12-04 11:44:38 +00:00
Brian Brazil b97f4cf48c Add metrics for rule group interval and last duration. 2017-12-04 11:44:38 +00:00
Brian Brazil 0a42a9fc8f Copy over rule group duration on reload. 
This is currently getting lost, this will soon be in a metric and we
don't want it dropping to 0 on every reload.
 2017-12-04 11:44:38 +00:00
Brian Brazil aa370fa568 Clarify metric names around rule groups. 
Make it clear they're about overall rule groups.
 2017-12-04 11:44:38 +00: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
Brian Brazil d7b3df5ae1 Fix staticcheck errors 2017-12-02 14:52:13 +00:00
Goutham Veeramachaneni 41b8f1f8fe
Add admin API docs 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-12-02 15:37:31 +05:30
Krasi Georgiev 29506e0bca one meaningless write to the config file to trigger anothe fsnotify (#3492) 2017-12-01 17:32:27 +00:00
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
Vickenty Fesunov 9146760aab Bump required golang version in the README (#3528) 
10b2e8c637 pulled new TSDB, which uses `math/bits` package introduced in Go 1.9
 2017-11-30 17:14:27 +00:00
Goutham Veeramachaneni 3de10e3b44
Add CleanTombstones API endpoint 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-11-30 19:51:44 +05:30
Goutham Veeramachaneni 36190239f6
Merge pull request #3524 from Gouthamve/rule-glob 
Use the files globbed files and not the files in cfg
 2017-11-30 19:04:51 +05:30
Goutham Veeramachaneni 823b7f90b3
Use the files globbed files and not the files in cfg 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-11-30 17:08:34 +05:30
Goutham Veeramachaneni 9f92a71053 vendor: update TSDB 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-11-30 16:50:41 +05:30
Goutham Veeramachaneni a1be5db99f
vendor: Update grpc gateway deps 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-11-30 16:50:34 +05:30
Julien Pivotto 52c0121890 Correctly handle empty data set in the console view (#3521) 
When there is an empty result set, the Prometheus server replies with

{"status":"success","data":{"resultType":"vector","result":null}}

That "null" reply was not handled correctly by the graphing library.
This commit handles that case and shows "no data" in the UI console view
instead of throwing an error in the browser javascript console.

Fixes #3515

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2017-11-30 10:04:02 +00:00
Fabian Reinartz b3ff5f6b0e
Merge pull request #3507 from prometheus/rulepromql 
Make PromQL metrics un-global, remove rules dep on promql.Engine
 2017-11-28 08:55:23 +01:00
Fabian Reinartz 62461379b7 rules: decouple notifier packages 
The dependency on the notifier packages caused a transitive dependency
on discovery and with that all client libraries our service discovery
uses.
 2017-11-27 16:38:14 +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
Lovisa Svallingson 2c2702e22b Align columns in Targets view (#3445) 
- rebase and resolve merge conflicts
 2017-11-26 12:49:24 +08: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
Tom Wilkie 099c50ce93 Avoid empty pod UID in test. 2017-11-24 15:02:42 +00:00
Tom Wilkie 9811e90d65 Fix tests. 2017-11-24 12:24:13 +00:00
Fabian Reinartz 4d964a0a0d rules: make glob expansion a concern of main 2017-11-24 08:22:57 +01:00
Fabian Reinartz bd9f7460eb rules: remove config package dependency 2017-11-24 07:57:54 +01:00