mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-27 14:39:40 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
4596 commits 243 branches 444 tags 649 MiB
Commit graph

4596 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Brian Brazil d7b3df5ae1 Fix staticcheck errors 2017-12-02 14:52:13 +00:00
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 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
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
Fabian Reinartz 2d0e3746ac rules: remove dependency on promql.Engine 2017-11-24 07:57:54 +01:00
Fabian Reinartz f8fccc73d8 promql: remove global metrics 2017-11-24 07:57:54 +01:00
Fabian Reinartz 2ec5965b75
Merge pull request #3508 from prometheus/uptsdb 
update TSDB
 2017-11-23 19:11:54 +01:00
Fabian Reinartz ca1cb01177
Merge pull request #3509 from Gouthamve/rule-eval-times 
Fix unexported method on exported interface.
 2017-11-23 19:10:52 +01:00
Fabian Reinartz 83cd270ea4 *: adapt to storage interface changes 2017-11-23 19:05:04 +01:00
Fabian Reinartz 10b2e8c637 vendor: update prometheus/tsdb 2017-11-23 18:44:23 +01:00
Goutham Veeramachaneni a880c86375
Fix unexported method on exported interface. 
Also move to model.Duration

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-11-23 19:13:57 +05:30
Conor Broderick 84eca7dfb2
Merge pull request #3491 from Conorbro/eval-rules 
Add rule evaluation time
 2017-11-22 16:37:16 +00:00
conorbroderick 55aaece116 Add rule evaluation time 2017-11-22 15:22:02 +00: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
Frederic Branczyk 0deb74626f
Merge pull request #3498 from discostur/update-rbac-example 
Fixed RBAC Example, added ingress privileges; @brian-brazil
 2017-11-21 12:04:11 +01:00
root 80e5867a87 Fixed RBAC Example, added ingress privileges; @brian-brazil 2017-11-21 11:04:07 +01:00
Tom Wilkie 06dc1e8797 Include Pod UID in the discovery metadata. 2017-11-20 21:09:47 +00:00
Goutham Veeramachaneni 303efee1a9
Merge pull request #2408 from davkal/api-stats 
Adds execution timer stats to the range query
 2017-11-20 23:17:47 +05:30
David Kaltschmidt 8e01e7e388 Handle runtime errors as fatal test results 2017-11-19 21:15:24 +01:00
David Kaltschmidt 3c5d207a53 Changed test failure handler to Fatalf(), added comment 2017-11-19 21:06:35 +01:00
David Kaltschmidt 79caf5342e Comment styles 2017-11-17 22:33:24 +01:00
David Kaltschmidt 0a3faee526 Pushed query timings into timings field, added tests 2017-11-17 22:30:59 +01:00
David Kaltschmidt 87c46ea6c3 Renamed TotalEvalTime to EvalTotalTime 
* TotalFoo suggested a comprehensive timing, but TotalEvalTime was part
of the Exec timings, together with Queue timings
* The other option was to rename ExecTotalTime to TotalExecTime, but
 there was already ExecQueueTime, suggesting Exec to be some sort of
group
 2017-11-17 17:46:51 +01:00
David Kaltschmidt af75ce02c1 Review feedback 
* renamed MakeQueryStats
* added stats to query() as well
* gofmt
 2017-11-16 16:30:48 +01:00
David Kaltschmidt c93e54d240 Adds execution timer stats to the range query 
API consumers should be able to get insight into the query run times.
The UI currently measures total roundtrip times. This PR allows for more
fine grained metrics to be exposed.

* adds new timer for total execution time (queue + eval)

* expose new timer, queue timer, and eval timer in stats field of the
 range query response:
```json
{
  "status": "success",
  "data": {
    "resultType": "matrix",
    "result": [],
    "stats": {
      "execQueueTimeNs": 4683,
      "execTotalTimeNs": 2086587,
      "totalEvalTimeNs": 2077851
    }
  }
}
```

* stats field is optional, only set when query parameter `stats` is not
empty

Try it via
```sh
curl 'http://localhost:9090/api/v1/query_range?query=up&start=1486480279&end=1486483879&step=14000&stats=true'
```

Review feedback

* moved query stats json generation to query_stats.go
* use seconds for all query timers
* expose all timers available
* Changed ExecTotalTime string representation from Exec queue total time to Exec total time
 2017-11-16 16:05:10 +01:00
Tobias Schmidt a51c500e30
Merge pull request #3453 from prometheus/grobie/remote-read-filter 
Add remote read filter option
 2017-11-14 13:56:26 +01:00
Tobias Schmidt deb64bf79a
Merge pull request #3471 from Gouthamve/remove-skipped-evals 
rules: remove skipped iterations because no throttling anymore
 2017-11-14 13:08:35 +01:00
Goutham Veeramachaneni e1117715fe
rules: remove skipped iterations cuz no throttling 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-11-14 17:33:00 +05:30