mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-28 06:59:40 -08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity
4144 commits 243 branches 444 tags 649 MiB
Commit graph

4144 commits

This branch
This branch
All branches
Author SHA1 Message Date
Fabian Reinartz ab1bc9bcdd Merge pull request #2842 from Gouthamve/rulegroups 
Rulegroups
 2017-06-19 13:27:37 +02:00
Goutham Veeramachaneni 592cb00c2f
Remove version from RuleGroups 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-19 16:38:46 +05:30
Goutham Veeramachaneni 37e7b69f56
Merge remote-tracking branch 'upstream/dev-2.0' into rulegroups 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-19 16:34:55 +05:30
Fabian Reinartz 98c2d8477a Merge pull request #2844 from Gouthamve/cobra 
Move CLI commander to cobra
 2017-06-19 11:59:52 +02:00
Goutham Veeramachaneni b2f7c8d842
Use user nobody in Dockerfile 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-19 15:03:39 +05:30
Fabian Reinartz f46a8e9ea4 Merge pull request #2854 from prometheus/promql-rune 
Check for invalid utf-8 in lexer strings.
 2017-06-17 14:42:20 +02:00
Goutham Veeramachaneni 67dc73fd59
Flag changes for 2.0 
Fixes: prometheus/prometheus#2087

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-16 20:21:41 +05:30
Goutham Veeramachaneni d407bd150c Consolidate the duration params in CLI 
* All CLI params moved to model.Duration

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-16 20:20:57 +05:30
Goutham Veeramachaneni f40a5990a0
vendor: Update common/model 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-16 20:20:44 +05:30
Brian Brazil 6f5d952132 Check for invalid utf-8 in lexer strings. 
This protects against invalid utf-8 sneaking
in via label_replace.
 2017-06-16 15:19:24 +01:00
Harsh Agarwal 16867c89a7 implement label_join issue 1147 (#2806) 
Replace OptionalArgs int with Variadic int.
 2017-06-16 14:51:22 +01:00
Goutham Veeramachaneni c472316fb3
Check done before every rule evaluation. 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-16 16:57:22 +05:30
Goutham Veeramachaneni 6b70a4d850
Incorporate PR feedback 
* Move fingerprint to Hash()
* Move away from tsdb.MultiError
* 0777 -> 0666 for files
* checkOverflow of extra fields

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-16 16:44:33 +05:30
Goutham Veeramachaneni 771e5a5d1d
vendor: gh/Sirupsen/logrus -> gh/sirupsen/logrus 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-16 16:04:33 +05:30
Goutham Veeramachaneni 6c1617fd13
Simplify usage string 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-16 15:55:13 +05:30
Goutham Veeramachaneni 507790a357
Rework logging to use explicitly passed logger 
Mostly cleaned up the global logger use. Still some uses in discovery
package.

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-16 15:52:44 +05:30
Goutham Veeramachaneni c399563ec1
vendor: Update common/log 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-16 15:49:41 +05:30
Fabian Reinartz c89f8753f5 Merge pull request #2828 from prometheus/sd-label-valid 
Check target labels are valid. Check for address after relabelling.
 2017-06-16 10:43:45 +02:00
Goutham Veeramachaneni dc69645e92
Move back to go-yaml 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-16 10:46:21 +05:30
Goutham Veeramachaneni ea255c6520
vendor: Add win specific dependency 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-15 17:02:37 +05:30
Goutham Veeramachaneni 8abb91f656
Move CLI commander to cobra 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-15 16:38:08 +05:30
Goutham Veeramachaneni cbeeaf48aa
vendor: Add cobra and pflag 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-15 16:36:36 +05:30
Fabian Reinartz dfef6cf234 Merge pull request #2843 from prometheus/fix-scrape-err-reporting 
retrieval: Fix "up" reporting for failed scrapes
 2017-06-15 11:03:13 +02:00
Julius Volz 6f66125809 retrieval: Fix "up" reporting for failed scrapes 2017-06-14 22:22:12 -04:00
Goutham Veeramachaneni 5ff283a7b7
Reflect the grouping in the UI 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-14 16:09:14 +05:30
Goutham Veeramachaneni 8cca666cf2
Add file name to group. 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-14 15:18:39 +05:30
Goutham Veeramachaneni e893c89333
Validate labels and annotations 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-14 15:07:54 +05:30
Goutham Veeramachaneni c884881f7d
Add License Header 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-14 13:34:13 +05:30
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
Fabian Reinartz 7640960469 vendor: update tsdb (#2840) 2017-06-13 07:44:07 +02:00
Goutham Veeramachaneni baf5b0f0fc Fix error where we look into the future. (#2829) 
* Fix error where we look into the future.

So currently we are adding values that are in the future for an older
timestamp. For example, if we have [(1, 1), (150, 2)] we will end up
showing [(1, 1), (2,2)].

Further it is not advisable to call .At() after Next() returns false.

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>

* Retuen early if done

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>

* Handle Seek() where we reach the end of iterator

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>

* Simplify code

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-13 07:22:27 +02:00
Fabian Reinartz 9ba61df45a Merge pull request #2789 from mtanda/aws_default_region 
config: set default region for EC2 SD
 2017-06-12 16:15:53 +02:00
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 f71d39a053 Merge pull request #2832 from brancz/fix-redirect 
web: fix double prefix redirect
 2017-06-12 10:40:43 +02:00
Frederic Branczyk 9063f8dedd
web: fix double prefix 2017-06-10 12:07:43 +02:00
Brian Brazil d8b4995ddd Check target labels are valid. Check for address after relabelling. 
Fixes #2822
Fixes #2819
 2017-06-09 16:18:19 +01:00
Fabian Reinartz c843a0cd29 pkg/rulefmt: Add rule group parsing 2017-06-07 17:06:23 +02:00
Frederic Branczyk bfa37c8ee3 Merge pull request #2814 from brancz/cut-1.7.0 
cut 1.7.0
 2017-06-07 11:40:29 +02:00
Frederic Branczyk 5d9ac3565e Merge pull request #2786 from tomwilkie/report-error-in-remote-write 
Remote write: read first line of response and include it in the error.
 2017-06-07 10:21:34 +02:00
Frederic Branczyk 6d29f0c19f
cut 1.7.0 2017-06-07 10:00:48 +02:00
Frederic Branczyk d26f789cb0 Merge pull request #2816 from brancz/gophercloud-vendoring 
vendor: fix mixed versions of gophercloud packages
 2017-06-07 09:54:31 +02:00
Frederic Branczyk d6a55c3013
vendor: fix mixed versions of gophercloud packages 2017-06-07 09:21:43 +02:00
Mitsuhiro Tanda 64cef5cd05 handle NewSession() error 2017-06-06 22:02:50 +09: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