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

4050 commits

This branch
This branch
All branches
Author SHA1 Message Date
Goutham Veeramachaneni 1c08743721
Update check-rules to new format. 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-14 13:32:26 +05:30
Goutham Veeramachaneni 2d1e92513b
Add tests 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-14 13:21:32 +05:30
Goutham Veeramachaneni a48a018368
Make sure groups are unique in a single file 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-14 12:19:21 +05:30
Goutham Veeramachaneni cea1e99f78
Add update-rules command to promtool 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-14 11:38:54 +05:30
Goutham Veeramachaneni e8f55669ea Move rules to new format 
Signed-off-by: Goutham Veeramachaneni <goutham@boomerangcommerce.com>
 2017-06-12 18:14:39 +05:30
Fabian Reinartz c843a0cd29 pkg/rulefmt: Add rule group parsing 2017-06-07 17:06:23 +02:00
Fabian Reinartz 669075c6b9 Merge branch 'master' into dev-2.0 2017-06-06 09:36:51 +02:00
Fabian Reinartz eb651233ac Merge pull request #2787 from prometheus/limit2 
Rework sample limit to work for 2.0
 2017-06-06 08:21:12 +02:00
Christian Groschupp 8f781e411c Openstack Service Discovery (#2701) 
* Add openstack service discovery.

* Add gophercloud code for openstack service discovery.

* first changes for juliusv comments.

* add gophercloud code for floatingip.

* Add tests to openstack sd.

* Add testify suite vendor files.

* add copyright and make changes for code climate.

* Fixed typos in provider openstack.

* Renamed tenant to project in openstack sd.

* Change type of password to Secret in openstack sd.
 2017-06-01 23:49:02 +02:00
Roman Vynar dbe2eb2afc Hide consul token on UI. (#2797) 2017-06-01 22:14:23 +01:00
Fabian Reinartz a391156dfb Merge pull request #2667 from goller/go-discovery-logger 
Add logger injection into discovery services
 2017-06-01 10:20:10 -07:00
Chris Goller 42de0ae013 Use log.Logger interface for all discovery services 2017-06-01 11:25:55 -05:00
Brian Brazil 37bc607e96 Rework sample limit to work for 2.0 
Correctly update reported series.
Increment prometheus_target_scrapes_exceeded_sample_limit_total.
Add back unittests.
Ignore stale markers when calculating sample limit.

Fixes #2770
 2017-05-31 15:41:51 +01:00
Tobias Schmidt 1c9499bbbd Merge pull request #2785 from prometheus/grobie/fix-target-group-naming 
Fix outdated target_group naming in error message
 2017-05-31 11:28:46 +02:00
Tobias Schmidt 287ec6e6cc Fix outdated target_group naming in error message 
The target_groups config has been renamed to static_configs, the error
message for overflow attributes should reflect that.
 2017-05-31 11:01:13 +02:00
Fabian Reinartz c6eed97c77 Merge pull request #2774 from prometheus/stalemem 
Fix staleness memory leak
 2017-05-30 15:55:37 -07:00
Julius Volz 240bb671e2 config: Fix overflow checking in global config (#2783) 2017-05-30 20:58:06 +02:00
Fabian Reinartz bc7aff8cef retrieval: extract scrape cache 2017-05-30 09:37:23 -07:00
Julius Volz e0f046396a Fix InfluxDB retention policy usage in read adapter (#2781) 2017-05-29 16:24:24 +02:00
Stephan Erb 14eee34da3 Update vendored go-zookeeper client (#2778) 
It is likely this will fix #2758.
 2017-05-29 15:59:30 +02:00
Benjamin 51626f2573 change deprecated maintainer to label (#2724) 2017-05-29 15:58:40 +02:00
Conor Broderick 6766123f93 Replace regex with Secret type and remarshal config to hide secrets (#2775) 2017-05-29 12:46:23 +01:00
Brian Brazil d66799d7f3 Show gaps in graphs. (#2766) 
Fixes #345
 2017-05-26 16:17:48 +01:00
Brian Brazil 72a276e7ed Pass through storage errors in limitAppender. 2017-05-26 11:28:22 +01:00
Fabian Reinartz a83014f53c retrieval: fix memory leak and consumption for caches 2017-05-26 08:44:24 +02:00
Tobias Schmidt 2a426bfead Revert "Use tag names consistently (#2743)" 
Apparently, a decision was made at some point to only use the v prefix
in tags and similar contexts where other things can appear. There was a
vote to stick to that decision. For more information, read
https://github.com/prometheus/prometheus/pull/2743.

This reverts commit 5405a4724f.
 2017-05-25 08:57:01 +02:00
Fabian Reinartz ab0ce4a8d9 *: cut v2.0.0-alpha.1 2017-05-24 17:31:48 +02:00
Fabian Reinartz 8fef036078 Merge pull request #2765 from prometheus/memmap 
retrieval: Don't allocate map on every scrape
 2017-05-24 17:23:59 +02:00
Fabian Reinartz 3d8661b8d5 Add comment 2017-05-24 17:05:42 +02:00
Fabian Reinartz 43ca652217 retrieval: Don't allocate map on every scrape 2017-05-24 16:23:48 +02:00
Fabian Reinartz 4c31061251 Merge branch 'master' into dev-2.0 2017-05-24 15:36:17 +02:00
Fabian Reinartz 025f5531ad Merge pull request #2681 from prometheus/grobie/reduce-noisy-append-errors 
Handle errSeriesDropped correctly
 2017-05-24 15:30:02 +02:00
Fabian Reinartz d3f662f15e Merge branch 'dev-2.0' into grobie/reduce-noisy-append-errors 2017-05-24 15:29:30 +02:00
Brian Brazil e5f94145b8 Drop series for federation if latest sample is stale. 2017-05-24 14:27:17 +01:00
Brian Brazil 220e78b9c3 Consider a series stale after 4.1 intervals with no data. 
To cover the cases where stale markers may not be available,
we need to infer the interval and mark series stale based on that.
As we're lacking stale markers this is less accurate, however
it should be good enough for these cases.

We need 4 intervals as if say we had data at t=0 and t=10,
coming via federation. The next data point should be at t=20 however it
could take up to t=30 for it actually to be ingested, t=40 for it to be
scraped via federation and t=50 for it to be ingested.
We then add 10% on to that for slack, as we do elsewhere.
 2017-05-24 14:27:17 +01:00
Brian Brazil c02c25d5ba Allow peeking back further in buffer. 2017-05-24 14:27:17 +01:00
Fabian Reinartz 10d8b6b633 Merge pull request #2764 from prometheus/nullparse 
pkg/textparse: allow null bytes in label values
 2017-05-24 15:24:38 +02:00
conorbroderick 9c953064c3 check if result is a scalar in order to display correct number of returned time series 2017-05-24 14:07:24 +01:00
Fabian Reinartz bdc763f95f pkg/textparse: allow null bytes in label values 2017-05-24 14:52:46 +02:00
Brian Brazil dcea3e4773 Don't append a 0 when alert is no longer pending/firing 
With staleness we no longer need this behaviour.
 2017-05-24 13:52:45 +01:00
Brian Brazil cc867dae60 Copy previous series and alert state more intelligently. 
Usually rules don't more around, and if they do it's likely
that rules/alerts with the same name stay in the same order.

If rules/alerts with the same name are added/removed this
could cause a blip for one cycle, but this is unavoidable
without requiring rule and alert names to be unique - which we don't
want to do.
 2017-05-24 13:52:45 +01:00
Brian Brazil 9bc68db7e6 Track staleness per rule rather than per group. 2017-05-24 13:52:45 +01:00
Brian Brazil 0451d6d31b Add unittest for rule staleness, and rules generally. 2017-05-24 13:52:45 +01:00
Brian Brazil 0400f3cfd2 Very basic staleness handling for rules. 2017-05-24 13:52:45 +01:00
Brian Brazil 9aa8f822c1 Fix typo 2017-05-24 13:52:45 +01:00
Fabian Reinartz 09fcbf78df Merge pull request #2755 from brancz/redirect-prefix 
prefix redirect with external url path
 2017-05-24 10:09:47 +02:00
Tobias Schmidt 5405a4724f Use tag names consistently (#2743) 2017-05-23 14:14:15 +02:00
Fabian Reinartz fa58fdbd5d Merge pull request #2753 from prometheus/uptsdb2 
storage: update TSDB
 2017-05-22 16:32:25 +02:00
Frederic Branczyk ad22606a3d
web: prefix redirect with ExternalURL path 2017-05-22 14:56:52 +02:00
Frederic Branczyk 45df5c2daf
Merge branch 'release-1.6' 2017-05-22 13:44:44 +02:00