mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-26 14:09:41 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
4840 commits 243 branches 444 tags 649 MiB
Commit graph

4840 commits

This branch
This branch
All branches
Author SHA1 Message Date
Björn Rabenstein 6cf725c56d
Merge pull request #4031 from codesome/fix-bug-from-4025 
Fix bug from 4025
 2018-03-30 16:41:30 +02:00
Ganesh Vernekar b44ce11d1b Added test to check pathPrefix 2018-03-30 11:55:54 +05:30
Ganesh Vernekar cd2820e165 Fix pathPrefix bug from PR-4025 2018-03-30 11:04:15 +05:30
Björn Rabenstein 61accb51ac
Merge pull request #4025 from codesome/route-prefix 
Fixed pathPrefix for web pages
 2018-03-29 16:22:54 +02:00
Ganesh Vernekar f30b37e00b Fixed pathPrefix for web pages 2018-03-29 18:02:25 +05:30
Fabian Reinartz bc6058c812
Merge pull request #3952 from prometheus/cut221 
*: cut 2.2.1
 2018-03-14 10:12:35 -04:00
Fabian Reinartz f22e5dce1a *: cut 2.2.1 2018-03-14 10:02:06 -04:00
Fabian Reinartz a947750dd6 vendor: update tsdb 2018-03-14 10:01:44 -04:00
Fabian Reinartz 0847a605a7
Merge pull request #3959 from prometheus/22-pick-ring 
Cherrypick #3942 onto release 2.2
 2018-03-14 07:02:37 -04:00
Brian Brazil a8e3d0fc4b Correctly handle pruning wraparound after ring expansion (#3942) 
Fixes #3939
 2018-03-14 08:25:53 +00:00
Fabian Reinartz fcb8e9ac95
Merge pull request #3951 from prometheus/tsdbup3 
vendor: update prometheus/tsdb
 2018-03-13 21:47:55 +01:00
Fabian Reinartz 5fb1e27b43 vendor: update prometheus/tsdb 2018-03-13 16:24:37 -04:00
Tom Wilkie d8cfd8f108
Merge pull request #3950 from prometheus/cherrypick-3941 
Cherrypick #3941 "Correctly stop the timer used in the remote write path."
 2018-03-13 13:38:15 +00:00
Tom Wilkie 597c17d3e9 Fix nit. 2018-03-13 09:30:51 +00:00
Tom Wilkie 731259afd0 Test sample timeout delivery. 2018-03-13 09:30:50 +00:00
Tom Wilkie fdb574b608 Review feedback. 2018-03-13 09:30:50 +00:00
Tom Wilkie 97a5fc8cbb Correctly stop the timer used in the remote write path. 2018-03-13 09:30:50 +00:00
Fabian Reinartz f63e7db4cb
Merge pull request #3931 from prometheus/cut200 
*: cut 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
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
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
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
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
 2018-02-21 17:28:18 +01:00
Fabian Reinartz 3669c1e476 *: cut 2.2.0-rc.1 2018-02-21 16:40:29 +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
Brian Brazil 4addee2bee Fix honor_labels for empty labels, prune empty labels. 
The semantics of honor_labels are that if a target exposes
and empty label it will override the target labels. This PR
fixes that by once again distinguishing between empty labels
and missing labels in this one use case.

Beyond that empty labels should be pruned and not added to storage,
which this also fixes.

Fixes #3841
 2018-02-20 11:05:54 +00:00
Krasi Georgiev a1f6b5c61d cleanup gitignore (#3869) 2018-02-20 11:03:22 +00:00
Ben Kochie de043c9593
Merge pull request #3461 from prometheus/superq/simplify_promu_fetch 
Simplify Makefile promu fetch
 2018-02-19 23:21:37 +01:00
Pedro Araújo 575f665944 Add OS type meta label to Azure SD (#3863) 
There is currently no way to differentiate Windows instances from Linux
ones. This is needed when you have a mix of node_exporters /
wmi_exporters for OS-level metrics and you want to have them in separate
scrape jobs.

This change allows you to do just that. Example:

```
  - job_name: 'node'
    azure_sd_configs:
      - <azure_sd_config>
    relabel_configs:
      - source_labels: [__meta_azure_machine_os_type]
        regex: Linux
        action: keep
```

The way the vendor'd AzureSDK provides to get the OsType is a bit
awkward - as far as I can tell, this information can only be gotten from
the startup disk. Newer versions of the SDK appear to improve this a
bit (by having OS information in the InstanceView), but the current way
still works.
 2018-02-19 15:40:57 +00:00