mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-02-02 00:21:42 -08:00
Code Issues Actions 53 Packages Projects Releases Wiki Activity
11019 commits 288 branches 448 tags 661 MiB
Commit graph

119 commits

Author SHA1 Message Date
György Krajcsovits 103c4fd289 Merge remote-tracking branch 'upstream/main' into main 
# Conflicts:
#	.github/workflows/ci.yml
#	tsdb/block.go
#	tsdb/compact.go
#	tsdb/compact_test.go
#	tsdb/head_read.go
#	tsdb/index/index.go
#	tsdb/ooo_head_read.go
#	tsdb/querier_test.go
 2023-01-08 14:55:44 +01:00
Bryan Boreham cdbe7f462b Update package rules for new labels.Labels type 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2022-12-19 15:22:09 +00:00
Ganesh Vernekar b522fb0b76
Merge remote-tracking branch 'upstream/main' into sync-prom 2022-10-10 18:07:39 +05:30
Ganesh Vernekar 46b26c4f09
Fix notifier relabel changing the labels of active alerts (#11427) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2022-10-07 20:28:17 +05:30
Ganesh Vernekar 83d9ee3ab7
Merge remote-tracking branch 'upstream/main' into sync-prom 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2022-10-05 20:33:36 +05:30
Cosrider bef6556ca5
delete redundant alias (#11180) 
Signed-off-by: Cosrider <cosrider7@gmail.com>

Signed-off-by: Cosrider <cosrider7@gmail.com>
 2022-08-31 15:50:38 +02:00
Bryan Boreham 8b863c42dd
Optimise relabeling by re-using memory (#11147) 
* model/relabel: Add benchmark

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>

* model/relabel: re-use Builder across relabels

Saves memory allocations.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>

* labels.Builder: allow re-use of result slice

This reduces memory allocations where the caller has a suitable slice available.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>

* model/relabel: re-use source values slice

To reduce memory allocations.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>

* Unwind one change causing test failures

Restore original behaviour in PopulateLabels, where we must not overwrite the input set.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>

* relabel: simplify values optimisation

Use a stack-based array for up to 16 source labels, which will be the
vast majority of cases.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>

* lint

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2022-08-19 15:27:52 +05:30
Jimmie Han a5fea2cdd0
Use atomic field avoid (*AlertingRule).mtx wait when template expanding (#10858) 
* Use atomic field avoid (*AlertingRule).mtx wait when template expanding (#10703)

Signed-off-by: hanjm <hanjinming@outlook.com>
 2022-07-19 12:58:37 +02:00
Peter Štibraný ae49ab5ea8 Merge remote-tracking branch 'upstream/main' into update-upstream-prometheus 2022-07-13 10:18:09 +02:00
Matthieu MOREL ddfa9a7cc5
refactor (rules): move from github.com/pkg/errors to 'errors' and 'fmt' (#10855) 
* refactor (rules): move from github.com/pkg/errors to 'errors' and 'fmt'

Signed-off-by: Matthieu MOREL <mmorel-35@users.noreply.github.com>
 2022-06-17 09:54:25 +02:00
Peter Štibraný 9d51bf50db Merge upstream Prometheus 2022-06-09 11:29:19 +02:00
Julien Pivotto 0d94cdf107
rules: remove classic UI code (#10730) 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2022-05-23 16:21:50 +02:00
Jesus Vazquez 48aa5cd096 Merge remote-tracking branch 'upstream/main' into jvp/merge-prometheus-main 2022-04-12 16:40:00 +02:00
Wilbert Guo 83a2e52bc2
Add SyncForState Implementation for Ruler HA (#10070) 
* continuously syncing activeAt for alerts

Signed-off-by: Yijie Qin <qinyijie@amazon.com>
Signed-off-by: Wilbert Guo <wilbeguo@amazon.com>

* add import

Signed-off-by: Yijie Qin <qinyijie@amazon.com>
Signed-off-by: Wilbert Guo <wilbeguo@amazon.com>

* Refactor SyncForState and add unit tests

Signed-off-by: Wilbert Guo <wilbeguo@amazon.com>

* Format code

Signed-off-by: Wilbert Guo <wilbeguo@amazon.com>

* Add hook for syncForState

Signed-off-by: Wilbert Guo <wilbeguo@amazon.com>

Fix go lint

Signed-off-by: Wilbert Guo <wilbeguo@amazon.com>

Refactor syncForState override implementation

Signed-off-by: Wilbert Guo <wilbeguo@amazon.com>

Add syncForState override func as argument to Update()

Signed-off-by: Wilbert Guo <wilbeguo@amazon.com>

Fix go formatting

Signed-off-by: Wilbert Guo <wilbeguo@amazon.com>

Fix circleci test errors

Signed-off-by: Wilbert Guo <wilbeguo@amazon.com>

Remove overrideFunc as argument to run()

Signed-off-by: Wilbert Guo <wilbeguo@amazon.com>

* remove the syncForState

Signed-off-by: Yijie Qin <qinyijie@amazon.com>

* use the override function to decide if need to replace the activeAt or not

Signed-off-by: Yijie Qin <qinyijie@amazon.com>

* fix test case

Signed-off-by: Yijie Qin <qinyijie@amazon.com>

* fix format

Signed-off-by: Yijie Qin <qinyijie@amazon.com>

* Trigger build

Signed-off-by: Yijie Qin <qinyijie@amazon.com>

* fixing comments

Signed-off-by: Yijie Qin <qinyijie@amazon.com>

* return the result of map of alerts instead of single one

Signed-off-by: Yijie Qin <qinyijie@amazon.com>

* upper case the QueryforStateSeries

Signed-off-by: Yijie Qin <qinyijie@amazon.com>

* use a more generic rule group post process function type

Signed-off-by: Yijie Qin <qinyijie@amazon.com>

* fix indentation

Signed-off-by: Yijie Qin <qinyijie@amazon.com>

* fix gofmt

Signed-off-by: Yijie Qin <qinyijie@amazon.com>

* fix lint

Signed-off-by: Yijie Qin <qinyijie@amazon.com>

* fixing naming

Signed-off-by: Yijie Qin <qinyijie@amazon.com>

* fix comments

Signed-off-by: Yijie Qin <qinyijie@amazon.com>

* add the lastEvalTimestamp as parameter

Signed-off-by: Yijie Qin <qinyijie@amazon.com>

* fmt

Signed-off-by: Yijie Qin <qinyijie@amazon.com>

* change funcType to func

Signed-off-by: Yijie Qin <qinyijie@amazon.com>

Co-authored-by: Yijie Qin <qinyijie@amazon.com>
Co-authored-by: Yijie Qin <63399121+qinxx108@users.noreply.github.com>
 2022-03-29 02:16:46 +02:00
Ganesh Vernekar 23ce9ad9f0
Introduce evaluation delay for rule groups (#155) 
* Allow having evaluation delay for rule groups

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

* Fix lint

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

* Move the option to ManagerOptions

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

* Include evaluation_delay in the group config

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

* Fix comments

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2022-03-14 13:20:07 +00:00
beorn7 c954cd9d1d Move packages out of deprecated pkg directory 
This creates a new `model` directory and moves all data-model related
packages over there:
  exemplar labels relabel rulefmt textparse timestamp value

All the others are more or less utilities and have been moved to `util`:
  gate logging modetimevfs pool runtime

Signed-off-by: beorn7 <beorn@grafana.com>
 2021-11-09 08:03:10 +01:00
Yijie Qin 6fce45838a
Add access function for restoration state of alerting rule (#9665) 2021-11-05 18:26:29 -04:00
Mateusz Gozdek 1a6c2283a3 Format Go source files using 'gofumpt -w -s -extra' 
Part of #9557

Signed-off-by: Mateusz Gozdek <mgozdekof@gmail.com>
 2021-11-02 19:52:34 +01:00
Levi Harrison d81bbe154d
Rule alerts/series limit updates (#9541) 
* Add docs and do not limit inactive alerts.

Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2021-10-21 23:14:17 +02:00
Levi Harrison dc2f1993d8
Limit number of alerts or series produced by a rule (#9260) 
* Add limit to rules

Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2021-09-15 09:48:26 +02:00
George Robinson 049b4f4f13
Support customization of template options in TemplateExpander (#9290) 
Signed-off-by: George Robinson <george.robinson@grafana.com>
 2021-09-13 17:19:08 +05:30
Levi Harrison 8c29046ab2
Remove unneeded state modifications 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2021-08-20 16:42:31 -04:00
Levi Harrison b5f6f8fb36 Switched to go-kit/log 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2021-06-11 12:28:36 -04:00
Levi Harrison 17ea8d006a
Added external URL access 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2021-05-30 23:35:26 -04:00
Julien Pivotto 4e5b1722b3
Move away from testutil, refactor imports (#8087) 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-10-22 11:00:08 +02:00
johncming a69a8b931f
rules: fix bug for unknown alert state. (#7599) 
Signed-off-by: johncming <johncming@yahoo.com>
 2020-07-17 08:39:15 +01:00
Brian Brazil 5368066b58
Give a bit more slack for alertmanager send failures. (#7228) 
Fixes #5277

Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
 2020-05-09 05:37:46 +01:00
Tobias Guggenmos 20b1f596f6 Fix build errors in rest of prometheus 
Signed-off-by: Tobias Guggenmos <tguggenm@redhat.com>
 2020-02-17 16:09:23 +01:00
Julien Pivotto 0e912faf4f
rules: Cleanup unused function alert.Duration (#6734) 
The function HoldDuration and Duration did the exact same thing.

Let's only keep HoldDuration() as Duration() is more confusing.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2020-02-01 07:31:37 +00:00
Julien Pivotto 2d7c8069d0 Check that rules don't contain metrics with the same labelset (#6469) 
Closes #5529

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2019-12-18 12:29:35 +00:00
AllenZMC 5c2c9a03e9 fix word 'consequentally' to 'consequently' (#5827) 
Signed-off-by: czm <zhongming.chang@daocloud.io>
 2019-08-03 14:56:58 +01:00
Bjoern Rabenstein 38d518c0fe Rework #5009 after comments 
Signed-off-by: Bjoern Rabenstein <bjoern@rabenste.in>
 2019-04-17 01:40:10 +02:00
Sylvain Rabot 335a34486e Add external labels to template expansion 
This affects the expansion of templates in alert labels and
annotations and console templates.

Signed-off-by: Sylvain Rabot <sylvain@abstraction.fr>
 2019-04-17 01:40:10 +02:00
Tariq Ibrahim 8fdfa8abea refine error handling in prometheus (#5388) 
i) Uses the more idiomatic Wrap and Wrapf methods for creating nested errors.
ii) Fixes some incorrect usages of fmt.Errorf where the error messages don't have any formatting directives.
iii) Does away with the use of fmt package for errors in favour of pkg/errors

Signed-off-by: tariqibrahim <tariq181290@gmail.com>
 2019-03-26 00:01:12 +01:00
Simon Pasquier f678e27eb6
*: use latest release of staticcheck (#5057) 
* *: use latest release of staticcheck

It also fixes a couple of things in the code flagged by the additional
checks.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* Use official release of staticcheck

Also run 'go list' before staticcheck to avoid failures when downloading packages.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2019-01-04 14:47:38 +01:00
AixesHunter fb8479a677 Variable 'labels' collides with imported package name (#5012) 
Signed-off-by: aixeshunter <aixeshunter@gmail.com>
 2018-12-19 09:44:03 +00:00
Ben Kochie c6399296dc
Fix spelling/typos (#4921) 
* Fix spelling/typos

Fix spelling/typos reported by codespell/misspell.
* UK -> US spelling changes.

Signed-off-by: Ben Kochie <superq@gmail.com>
 2018-11-27 17:44:29 +01:00
Will Hegedus 193ebe7e34 Updates to /targets and /rules (scrape duration, last evaluation time) (#4722) 
* Add evaluationTimestamp (Last Evaluation) column to display on /rules
Signed-off-by: Will Hegedus <wbhegedus@liberty.edu>

* Add lastScrapeDuration ("Scrape Duration") to display on /targets
Signed-off-by: Will Hegedus <wbhegedus@liberty.edu>

* Updates based on Julius' feedback

Signed-off-by: Will Hegedus <wbhegedus@liberty.edu>

* Update to set timestamp to when eval started (after eval completes)

Signed-off-by: Will Hegedus <wbhegedus@liberty.edu>

* Update /rules to display time since last evaluation

Signed-off-by: Will Hegedus <wbhegedus@liberty.edu>

* Re-order Last Eval/Eval Time to be consistent with targets page

Signed-off-by: Will Hegedus <wbhegedus@liberty.edu>
 2018-10-12 18:26:59 +02:00
Ganesh Vernekar 05726c5ea2 Test template expansion while loading groups (#4537) 
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2018-09-13 13:55:58 +01:00
Chris Marchbanks 63ed9d1b70 Send EndsAt along with alerts (#4550) 
Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>
 2018-08-28 16:05:00 +01:00
Chris Marchbanks 87f1dad16d throttle resends of alerts to 1 minute by default (#4538) 
Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>
 2018-08-27 17:41:42 +01:00
Goutham Veeramachaneni f3b7c22827 rules: add comment about lock taking (#4525) 
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
 2018-08-21 21:30:08 +02:00
Chris Marchbanks 11155c7028 Existing alert labels will update based on templates (#4500) 
Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>
 2018-08-15 08:52:08 +01:00
Fabian Reinartz b7e2f407de rules: Fix double-locking of mutex 
Signed-off-by: Fabian Reinartz <freinartz@google.com>
 2018-08-07 07:33:39 -04:00
Benji Visser 8bb6e0dd6e Show rule evaluation errors on rules page (#4457) 
* adding information about the health and errors for Rules

adding Health() and LastError() to the Rule interface. This will allow
us to easily surface information about rules.

Signed-off-by: noqcks <benny@noqcks.io>

* updating rules.html with fields for Rule errors and health state

Signed-off-by: noqcks <benny@noqcks.io>

* fix code comment grammar & access Rule health/error info using a mutex

Signed-off-by: noqcks <benny@noqcks.io>

* s/Errors/Error/ in rules.html to remain consistent with targets.html

Signed-off-by: noqcks <benny@noqcks.io>

* adding periods to code comments in reporting/alerting

Signed-off-by: noqcks <benny@noqcks.io>

* putting health/error below mutex in struct field

Signed-off-by: noqcks <benny@noqcks.io>
 2018-08-07 00:33:45 +02:00
Julius Volz 2b8fc062a8
rules: HTML-escape rule YAML marshal errors (#4464) 
This was pointed out by `gosec`.

Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2018-08-05 14:01:51 +02:00
Ganesh Vernekar f1db699dff Persist alert 'for' state across restarts (#4061) 
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2018-08-02 11:18:24 +01:00
Max Leonard Inden 71fafad099
api/v1: Coninue work exposing rules and alerts 
Signed-off-by: Max Leonard Inden <IndenML@gmail.com>
 2018-07-30 15:31:51 +02:00
mg03 31f8ca0dfb
api v1 alerts/rules json endpoint 
Signed-off-by: mg03 <mgeng03@gmail.com>
 2018-07-30 15:29:44 +02:00
Julius Volz 9e3171f6e3 rules: Minor naming/comment cleanups (#4328) 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2018-07-18 04:54:33 +01:00