mirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-11-27 05:31:01 +01:00
Code Issues Projects Releases Wiki Activity
7,075 Commits 314 Branches 499 Tags
Commit Graph

7075 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Turnbull
4486ef013b Make show annotations checkbox match query history checkbox (#3936) 
After removing the checkbox in #3913 the only remaining element that
looked like it was the new Show Annotations checkbox on the Alerts page.
Which in turn didn't look like the Enable query history checkout on the
graph page. So:

1. This takes the Enable query history button as canonical.
2. Updates the show annotations button code to match it.
3. Simplifies the JS for the checkbox.
 2018-03-09 14:39:28 +01:00
James Turnbull
50e6aff3fd Make job heading on service discovery consistent (#3937) 
The new Service Discovery page uses the CSS/JS from the Targets page but
used slightly differently. This makes the job header match in the
Service Discovery page for a more consistent look-n-feel.
 2018-03-09 14:33:53 +01:00
Tom Wilkie
f8c9d375b6 Correctly stop the timer used in the remote write path. 2018-03-09 12:00:26 +00:00
Matt Palmer
042090a6d3 [dns_sd] Send an EDNS0 query by default (#3586) 
Based on https://groups.google.com/d/topic/prometheus-users/02kezHbuea4/discussion

Does not attempt to handle a situation where the server does not understand
EDNS0, however that is an unlikely case, and the behaviour of such ancient
systems is hard to predict in advance, so if it does come up, it will need
to be handled on a case-by-case basis.
 2018-03-09 10:21:58 +00:00
James Turnbull
c3f4f2204f Refactor/redesign Unhealthy checkbox on Targets page (#3913) 
* Added only healthy to Targets

This adds a "Only heathly" button to supplement the "Only unhealthy"
button. The two are mutually exclusive.

I've also added a red/green text color to the buttons.

Arguably this could be a toggle instead if folks think this is
worthwhile... Happy to modify it.

* Moved functions above init

* Simplifed code and made prettier

* Appeased codeacy

* Made buttons square
 2018-03-09 11:19:09 +01:00
Yecheng Fu
56ed29fbf7 Map target infos of endpoints to prometheus meta labels. (#3770) 2018-03-09 10:07:00 +00:00
Brian Brazil
bf7d87aed2 Cleanup storage from all tests. 
Fixed #3299
 2018-03-09 07:53:35 +00:00
Brian Brazil
c0ce35d2d3 Only show debug output on test failure 2018-03-09 07:53:35 +00:00
Brian Brazil
e6ea146c81 Make benchmark tests pass 
A new query object is needed for each evaulation,
as the iterators would otherwise be shared across evaluations.
 2018-03-09 07:53:35 +00:00
Nikunj Aggarwal
998dfcbac6 Expose itemtype outside the package (#3933) 2018-03-08 16:52:44 +00:00
Fabian Reinartz
f63e7db4cb
Merge pull request #3931 from prometheus/cut200 
*: cut v2.2.0
v2.2.0 		2018-03-08 17:37:57 +01:00
Fabian Reinartz
6b9cbacf52 *: cut v2.2.0 2018-03-08 15:37:46 +01:00
Fabian Reinartz
60edc2b6d5
Merge pull request #3928 from prometheus/snaphead 
Add option to skip head on snapshots
 2018-03-08 13:25:22 +01:00
Fabian Reinartz
3e6c890aea api: add flag to skip head on snapshots 2018-03-08 13:07:12 +01:00
Fabian Reinartz
07299cec17 vendor: update tsdb 2018-03-08 10:49:35 +01:00
Marek Siarkowicz
1f71caf23f Add golang runtime information to status page. (#3914) 2018-03-07 15:14:46 +00:00
Marek Siarkowicz
86011047ca Validate required fields in sd configuration (#3911) 2018-03-05 19:27:54 +00:00
Fabian Reinartz
16b2bf1b45
Merge pull request #291 from mattbostock/patch-2 
Fix typo in db.go
 2018-03-02 12:51:49 +01:00
Matt Bostock
aa517c39bb
Fix typo in db.go 2018-03-02 11:12:32 +00:00
Krasi Georgiev
5bda3a8ded Check for unused vendored packages (#3892) 
* add check for unused vendor packages
* cleanup unused vendor packages
* run unused check before the tests
 2018-03-02 10:20:45 +00:00
Julien Pivotto
155faab7a2 Display annotations on Alerts page (#3900) 
Fixes #1219

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2018-03-01 15:26:36 +00:00
Fabian Reinartz
7b7e3506ac
Merge pull request #3899 from krasi-georgiev/gogofast 
revert to using the gogofast plugin and regenerate grpc server
 2018-03-01 11:10:51 +01:00
Krasi Georgiev
99e717ad18 revert ot using the gogofast plugin and regenerate grpc server 2018-03-01 11:57:31 +02:00
Fabian Reinartz
ef567ceb7d
Merge pull request #3835 from krasi-georgiev/pool-package-generalize 
Pool package generalize
 2018-02-28 14:30:46 +01:00
Fabian Reinartz
66666f091a
Merge pull request #290 from prometheus/snap 
Improve usability of snapshots
 2018-02-28 12:25:42 +01:00
Fabian Reinartz
8cd32d8fd4 Improve usability of snapshots 2018-02-28 12:07:34 +01:00
Krasi Georgiev
6b0e9ef183 Validate json parse for TargetGroup Unmarshal (#3614) 
Using DisallowUnknownFields in golang 1.10 to forbid unknown fields in targetGroups
added the license header for the targetGroup test
 2018-02-27 12:33:27 +00:00
Ben Kochie
e392b9a18b Cleanup licence check script (#3893) 
* Cleanup licence check script

* `echo -e` is not supported by POSIX shell.
* Add a license to the check script.
* Split out license check loop into function for clarity.

* Exit 1
 2018-02-27 10:06:38 +00:00
Krasi Georgiev
0f00d77661 enable race detection for the tests (#3884) 2018-02-26 23:27:59 +00:00
Fabian Reinartz
f6c76078f5
Merge pull request #288 from krasi-georgiev/tests-cleanup-tmps 
Tests cleanup tmps
 2018-02-26 15:03:14 +01:00
Frederic Branczyk
b9e836c7b7
Merge pull request #3102 from pgier/unset-gobin-during-build 
Unset GOBIN in Makefile
 2018-02-26 11:24:07 +01:00
Krasi Georgiev
4fa7e719f4 race in Triton SD Test (#3885) 2018-02-26 10:03:50 +00:00
Krasi Georgiev
7af69ad988 bump to golang 1.10 (#3856) 2018-02-26 09:42:49 +00:00
ferhat elmas
ffa673f7d8 General simplifications (#3887) 
Another try as in #1516
 2018-02-26 07:58:10 +00:00
Callum Jones
090e7e0959 Place Service Discovery labels inline (#3872) 
Fixes #3739
 2018-02-24 19:44:37 +00:00
Jeffrey Zhang
21f96caab3 Fix wrong syntax for alert field templates (#3883) 2018-02-24 09:37:43 +00:00
Krasi Georgiev
eb6cdbcb5b some test funcitons didn't cleanup after themselves. 2018-02-23 18:45:59 +02:00
Fabian Reinartz
88ddcab17c Merge branch 'master' of github.com:prometheus/tsdb 2018-02-21 21:11:26 +01:00
Fabian Reinartz
3f06121dd0 Add Version getter for index reader 2018-02-21 21:06:19 +01:00
Conor Broderick
99006d3baf Added dropped targets API to targets endpoint (#3870) 2018-02-21 17:26:18 +00:00
Fabian Reinartz
cd5e2fe687
Merge pull request #3874 from prometheus/22rc1 
*: cut 2.2.0-rc.1
v2.2.0-rc.1 		2018-02-21 17:28:18 +01:00
Matt Bostock
55ea5ae6b1 head: Rename highTimestamp to maxt 
`maxt` seems more consistent with `mint` and other uses of `maxt`
elsewhere in the code, if I've understand the intent correctly.
 2018-02-21 16:01:12 +00:00
Simon Pasquier
79defa54df Fix crash when a series has no block 2018-02-21 16:45:06 +01:00
Fabian Reinartz
3669c1e476 *: cut 2.2.0-rc.1 2018-02-21 16:40:29 +01:00
Matt Bostock
bc97c6c6be Misc fixes (#285) 
* Fix typo in head.go

pralellize -> paralellize

* Remove commented out code

It's dead code, remove it.

* Correct reference to sample buffer
 2018-02-21 16:38:59 +01:00
pasquier-s
fc8cf08f42 Prevent invalid label names with labelmap (#3868) 
This change ensures that the relabeling configurations using labelmap
can't generate invalid label names.
 2018-02-21 10:02:22 +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
Krasi Georgiev
933ab8a34e stupid return mistake fix, and dropped the additional assertion check! 2018-02-20 13:32:23 +02:00
Krasi Georgiev
675ce533c9 refactored TestScrapeLoopAppend and added a test for empty labels 2018-02-20 11:05:54 +00:00