Commit Graph

569 Commits (d76d5de66fa486ecece0777fd53dcfe61e23a09b)

Author SHA1 Message Date
Fabian Reinartz 4aeab798e8 Merge pull request #1738 from prometheus/release-0.19
9 years ago
Fabian Reinartz 3c80609fce Merge pull request #1737 from prometheus/fabxc-0.19.3
9 years ago
Fabian Reinartz 4c864c8a88 retrieval: don't sync to uninitialized scrape pool
9 years ago
Fabian Reinartz d0eeae9d0e retrieval: don't sync to uninitialized scrape pool
9 years ago
beorn7 03adbe57e4 discovery/marathon: Fix race conditions in test
9 years ago
Björn Rabenstein 2ea3a837c3 Merge pull request #1731 from prometheus/release-0.19
9 years ago
rohit01 47dd5f74ba discovery/marathon: #1722 - ignore apps with zero ports
9 years ago
Fabian Reinartz 0f21bd31ca config: deprecate `target_groups` for `static_configs`
9 years ago
Brian Brazil 05b918a024 Merge pull request #1713 from mattbostock/document_drop
9 years ago
Matt Bostock 329a00e44f Relabel: Document whole label set is dropped
9 years ago
Jimmi Dyson 206bcfcdaa
Kubernetes SD: Remove kubeletPort config option
9 years ago
Jimmi Dyson d48297c904
Kubernetes SD: Add labels for all node addresses and discover node port if available
9 years ago
Fabian Reinartz 26b1c89469 Merge pull request #1702 from pdbogen/master
9 years ago
Patrick Bogen 1e6770cdc5 Initial local pods before using the pod list to initialize pod targets; include more logging in pod target creation
9 years ago
Ali Reza c81b4e8a87 change config names to files for consistency
9 years ago
Gregory G. Tseng 4ceedffe86 Unexport testing constant
9 years ago
Gregory G. Tseng 7997c14b0d Add ServerName into TLS Config
9 years ago
Fabian Reinartz 74c448386c Merge pull request #1665 from prometheus/fabxc-retrpanic
9 years ago
Fabian Reinartz 12b03db373 retrieval: handle nil target groups from updates
9 years ago
Fabian Reinartz ea36efbbd1 retrieval: document panic behavior
9 years ago
Fabian Reinartz a5ba166935 retrieval: don't panic on non-HTTP scheme
9 years ago
Tobias Schmidt 0c6ed9d437 Fix type usage in Kubernetes discovery
9 years ago
Fabian Reinartz f7ed2ff706 Merge pull request #1644 from prometheus/beorn7/logging
9 years ago
Fabian Reinartz dec56838fc Merge pull request #1449 from pdbogen/master
9 years ago
Patrick Bogen 89940eb48d Write tests to include testing determinancy of various slice orders; ensure that container order is deterministic
9 years ago
Patrick Bogen b3350d872a Add one label named for each port name, mapping it to port number; add corresponding tests; prefix port list label with a comma
9 years ago
beorn7 d43c0159aa Fix style issues in retrieval/...
9 years ago
beorn7 45e5775f9b Add missing logging of out-of-order samples
9 years ago
Patrick Bogen ae413704e8 kubernetes pod-level discovery
9 years ago
Fabian Reinartz 2ca9ee7b0d Merge pull request #1612 from prometheus/stn-dns-mv
9 years ago
stuart nelson d959d2b90a discovery/dns: Maintain argument order consistency
9 years ago
stuart nelson d02591814b discovery/dns: move dns to own package
9 years ago
Shawn Smith d7481f266e fix typo
9 years ago
Tobias Schmidt 3ce895e86d Merge pull request #1608 from prometheus/fix-printf
9 years ago
Julius Volz 97b018d26d Fix format argument in retrieval test.
9 years ago
Fabian Reinartz f94fc76608 Merge pull request #1592 from prometheus/fabxc-consul-ref
9 years ago
Fabian Reinartz 289f306dd9 Merge pull request #1590 from prometheus/fabxc-marathon-ref
9 years ago
Fabian Reinartz 76076bfb47 discovery: simplify client initialization
9 years ago
Fabian Reinartz b5bfb502df discovery: properly check context on chan send
9 years ago
Fabian Reinartz 9f8feb9ff6 discovery: consolidate Marathon SD files
9 years ago
Fabian Reinartz 086f7caceb discovery: extract Consul shouldWatch logic
9 years ago
Fabian Reinartz e805e68c01 discovery: sanitize Consul service discovery
9 years ago
Fabian Reinartz 5837e6a97f discovery: move consul SD into own package
9 years ago
beorn7 d566808d40 Bring back logging of discarded samples
9 years ago
Fabian Reinartz 585ab6b163 Merge pull request #1494 from iamseth/master
9 years ago
Jonathan Boulle 38098f8c95 Add missing license headers
9 years ago
Seth Miller 0988e3b937 Add support for Azure discovery
9 years ago
Fabian Reinartz 769389e559 Fix potential race in ctx intialization
9 years ago
Tobias Schmidt e82ef154ee Remove unused code leftovers
9 years ago
stuart nelson dbe5d18b6e Instrument scrape pool `sync()`
9 years ago
stuart nelson 813f61e551 Merge pull request #1484 from prometheus/instrument-retrieval
9 years ago
stuart nelson a1ee77601a Instrument the duration of the `reload` function
9 years ago
Fabian Reinartz 895f2f092f Fix flaky scrape test
9 years ago
Fabian Reinartz f2e359962c Sort exported targets
9 years ago
Fabian Reinartz 56fc9bdff3 Handle closed target provider channel
9 years ago
beorn7 d44b83690e Fix flaky file-sd test
9 years ago
Fabian Reinartz ddc74f712b Add sortable target list
9 years ago
Fabian Reinartz 499f4af4aa Test target URL
9 years ago
Fabian Reinartz 50c2f20756 Add targetScraper tests
9 years ago
Fabian Reinartz 1ede7b9d72 Consolidate TargetStatus into Target.
9 years ago
Fabian Reinartz 2060a0a15b Turn target group members into plain lists.
9 years ago
Fabian Reinartz 0d7105abee Remove scrape config from Target.
9 years ago
Fabian Reinartz 75681b691a Extract HTTP client from Target.
9 years ago
Fabian Reinartz 9bea27ae8a Add scraping tests
9 years ago
Fabian Reinartz 76a8c6160d Deduplicate targets in scrape pool.
9 years ago
Fabian Reinartz 84f74b9a84 Apply new scrape config on reload.
9 years ago
Fabian Reinartz 02f635dc24 Remove interval/timeout from Target internals
9 years ago
Fabian Reinartz 775316f8d2 Move appender construction from Target to scrapePool
9 years ago
Fabian Reinartz fbe251c2df Fix scrape interval length calculation
9 years ago
Fabian Reinartz 1a3253e8ed Make scrape time unambigious.
9 years ago
Fabian Reinartz 2bb8ef99d1 Test scrape loop behavior.
9 years ago
Fabian Reinartz c7bbe95597 Remove outdated target tests
9 years ago
Fabian Reinartz 05de8b7f8d Extract target scraping into scrape loop.
9 years ago
Fabian Reinartz cebba3efbb Simplify and fix TargetManager reloading
9 years ago
Fabian Reinartz da99366f85 Consolidate Target.Update into constructor.
9 years ago
Fabian Reinartz d15adfc917 Preserve target state across reloads.
9 years ago
Fabian Reinartz 5b30bdb610 Change TargetProvider interface.
9 years ago
Fabian Reinartz bb6dc3ff78 Remove old tests
9 years ago
Fabian Reinartz 5bfa4cdd46 Simplify target update handling.
9 years ago
Jimmi Dyson e59b7c15a3 Kubernetes SD: Fix node IP discovery
9 years ago
beorn7 33a50e69f7 Fix a deadlock
9 years ago
beorn7 fd5108b038 Fix a targetmanager test
9 years ago
Fabian Reinartz 6df1f49c13 Remove fullLabels method and fix target updating
9 years ago
Fabian Reinartz 825831e98f Use fingerprint for target identity comparison
9 years ago
Fabian Reinartz 66767121ab Handle scrape timeout on request.
9 years ago
Julius Volz 293486c7b1 Remove old superfluous calls to setLastScrape().
9 years ago
Fabian Reinartz a0078ec84c Merge pull request #1394 from prometheus/scraperef2
9 years ago
Fabian Reinartz 463dd3ea06 Refactor target scrape reporting.
9 years ago
Fabian Reinartz cd28b88b08 Fix wrong EOF error on successful target scraping
9 years ago
Fabian Reinartz 27d71b08d1 Factor out appender wrapping
9 years ago
Fabian Reinartz fe7e91e2eb Make scraping offset consistent.
9 years ago
Fabian Reinartz a06bc75519 Remove occurrences of 'base' labels
9 years ago
Fabian Reinartz 0d44248fb8 Cleanup cluttered test data
9 years ago
Fabian Reinartz 65eba080a0 Cleanup internal target data
9 years ago
Julius Volz 9b6d69610a Fix various typos in comments.
9 years ago
Julius Volz 3728b5872f Fix target update error handling.
9 years ago
Fabian Reinartz 1f877f3d2a Fix deadlock, structure target logging
9 years ago
Fabian Reinartz d0d2c38c68 Fix tests for append API changes
9 years ago
Fabian Reinartz 59f1e722df Return error on sample appending
9 years ago
Björn Rabenstein 9ea3897ea7 Merge pull request #1354 from prometheus/beorn7/storage
9 years ago
beorn7 ec08c9a391 Rework the way to communicate backpressure (AKA suspended ingestion)
9 years ago
beorn7 a7408bfb47 Unify duration parsing
9 years ago
Jimmi Dyson 9faa7515c6 Kubernetes SD: Refactor to handle missing Kubernetes events
9 years ago
Brian Brazil 4a829e63a2 Merge pull request #1299 from PrFalken/master
9 years ago
Julien Dehee 061fe2f364 Support AirBnB's Smartstack Nerve client for SD
9 years ago
Brian Brazil 7a5f019c40 Use up/down in UI for consistency with 'up' metric.
9 years ago
Brian Brazil 6b7629be27 Merge pull request #1242 from tommyulfsparre/watcher-fix
9 years ago
Jimmi Dyson c12fb447b8 Kubernetes SD: Use first TCP service port as target port & clean up
9 years ago
Tommy Ulfsparre 83e09422bf skip already watched child nodes.
9 years ago
Fabian Reinartz 29a69eecb8 Do not panic in Consul SD creation
9 years ago
Jimmi Dyson 2cca07381b KubernetesSD: Create targets for services as well as service endpoints
9 years ago
Brian Brazil 427bf29db1 Add in default port after relabelling.
9 years ago
Brian Brazil fd2bd81cd8 Allow all instance labels in target groups
9 years ago
Fabian Reinartz 9cad147265 Merge pull request #1172 from federicobaldo/ec2_sd_improvements
9 years ago
Federico Baldo d14d2429ea Minor improvements to ec2 sd:
9 years ago
Jimmi Dyson 87940ec213 Kubernetes SD: Rename `masters` to `api_servers` in config
9 years ago
Jimmi Dyson 7ff5cc66ea Kubernetes SD authentication options cleanup
9 years ago
Jimmi Dyson ea9a173008 Kubernetes SD: Use node name as instance label
9 years ago
Julius Volz d88aea7e6f Fix SD mechanism source prefix handling.
9 years ago
Julius Volz dec9fc9c32 Merge pull request #1148 from prometheus/fix-serverset-multiple-paths
9 years ago
Matt Jibson dcb4856d72 Add SD for Amazon EC2 instances
9 years ago
Julius Volz 60cf4015a4 Fix watching multiple Zookeeper paths in serverset SD.
9 years ago
Fabian Reinartz e3b6ec9784 Switch to common/log
9 years ago
Jimmi Dyson 0d61605526 Kubernetes SD example: separate out cluster level components & services
9 years ago
Julius Volz 99e8fff872 Fix target manager CPU busyloop caused by bad done-channel handling.
9 years ago
Fabian Reinartz 097d810f37 Merge pull request #1120 from prometheus/flaky-test
9 years ago
Brian Brazil ba6688bfce retrieval: Reduce flakiness of TestTargetRunScraperScrapes
9 years ago
Brian Brazil b03569267e retrieval: Add URL parameters to fullLabels too
9 years ago
Brian Brazil 50258929ac Retrieval: Show error message for failed test scrape
9 years ago
Brian Brazil 4bc39dc60e retrieval: Reduce flakiness of TestTargetManagerChan
9 years ago
Brian Brazil 93145b960a retrieval: Reduce flakiness of target tests
9 years ago
Fabian Reinartz cac6eea434 Merge pull request #1105 from prometheus/consulnil
9 years ago
Fabian Reinartz 327152862c Update expfmt.NewDecoder usage
9 years ago
Fabian Reinartz 1ce89a4a0b Fix nil panic on consul error
9 years ago
Julius Volz af513468eb Fix some dead code, missing error checks, shadowings.
9 years ago
Jimmi Dyson 7ef9399920 Clean up kubernetes http response bodies
9 years ago
Anders Daljord Morken 9fb65a91af Close HTTP connections on HTTP errors too.
9 years ago
Fabian Reinartz 8456b7e12f Use go1.5.1
9 years ago
Jimmi Dyson a1574aa2b3 Move TLS options to scrape config
9 years ago
Julius Volz b7b7b2e883 Merge pull request #1050 from fabric8io/kubernetes-discovery
9 years ago
Jimmi Dyson d7a7fd4589 Kubernetes SD improvements
9 years ago
Fabian Reinartz cc1a2a2061 Remove attachment of global labels upon ingestion
9 years ago
Fabian Reinartz ebf417a282 Fix map initialization
9 years ago
Julius Volz f63a899744 Change config regexes to full-string matches.
9 years ago
Fabian Reinartz 542da6774e Fix draining of file watcher events
9 years ago
Daniel Lundin 4abf54b747 serverset: extract shard number from serverset data
9 years ago
Julius Volz 29eaa8c7cf Merge pull request #1030 from prometheus/fix-flakey-filesd
9 years ago
Julius Volz 3fd5826589 Fix flakey FileSD test.
9 years ago
Julius Volz 744d5d5a7a Merge pull request #1029 from prometheus/vet-fixes
9 years ago
Julius Volz 995d3b831d Fix most golint warnings.
9 years ago
Julius Volz 963ad82dcb Fix "go vet" errors.
9 years ago
Fabian Reinartz 6664b77f36 Merge pull request #1021 from prometheus/appenders
9 years ago
Fabian Reinartz 01834fa528 Move metric modifications into SampleAppenders
9 years ago
Fabian Reinartz d6d88f8950 Add missing license headers
9 years ago
Julius Volz d36a7f4e6f Fix busylooping in case of no target providers.
9 years ago
Fabian Reinartz 3a0145c09e Reenable blocked appending tests
9 years ago
Fabian Reinartz 438e232c9b Fix grouping of import blocks
9 years ago
Fabian Reinartz 6d0f58dcf3 sanitize scrape health recording code
9 years ago
Fabian Reinartz 25bf5fdaf5 Timeout sample appends
9 years ago
Fabian Reinartz 11a577fcd0 Switch to common/expfmt for extraction
9 years ago
Fabian Reinartz 306e8468a0 Switch from client_golang/model to common/model
9 years ago
Sharif Nassar 6cb519fe82 Add Consul ServiceID to the discovery meta labels.
9 years ago
Fabian Reinartz 0f5022c091 Add missing Kubernetes doc strings
9 years ago
Fabian Reinartz f592740bac Only exit static target provider on done
9 years ago
Julius Volz b4adf2723d Merge pull request #994 from robbiet480/consul-datacenter-name
9 years ago
Robbie Trencheny 48e461f7db Pass through current agent Consul datacenter name
9 years ago
Fabian Reinartz d0a90964c1 Fix license header
9 years ago
Fabian Reinartz eabbdc6603 Add missing license headers
9 years ago
Julius Volz 47a96bff1a Update constant names in comments.
9 years ago
Brian Brazil e1d5eb52f2 retrieval: Don't include unmatched source of regex in replacement.
9 years ago
Fabian Reinartz 3c6dd161d7 Scrape all services on empty services list.
9 years ago
Fabian Reinartz 9b9ff66212 Merge pull request #977 from prometheus/fabxc/target-dedup
9 years ago
Fabian Reinartz 8fa9ec278b Add application labels as meta labels
9 years ago
Fabian Reinartz f269943950 Adjust Kubernetes SD to pipeline changes
9 years ago
Fabian Reinartz 4e84b86510 Improve target discovery pipeline
9 years ago
Fabian Reinartz 15b4115a25 Merge pull request #986 from prometheus/fabxc/tpdoc
9 years ago
Fabian Reinartz 625374ee36 Clarify docs of TargetProvider
9 years ago
Fabian Reinartz f7e3722388 Rename __meta_dns_srv_name to __meta_dns_name
9 years ago
Fabian Reinartz b964da4b75 Merge pull request #905 from fabric8io/kubernetes-discovery
9 years ago
Fabian Reinartz 24e91720ad Merge pull request #980 from prometheus/map-labels
9 years ago
Brian Brazil 4e70a0a14e Retrieval: Add relabel action to map label names with a regex.
9 years ago
Jimmi Dyson 923f8111d4 Initial Kubernetes discovery
9 years ago
Miek Gieben caaa3de4ff Make HashMod use MD5 instead of FNV
9 years ago
Fabian Reinartz 0138d37458 Improve unique target group sources.
9 years ago
Fabian Reinartz 54202bc5a8 Merge pull request #902 from xperimental/feature/marathon-discovery
9 years ago
Robert Jacob 4d0f974c42 Add service discovery using Marathon API.
9 years ago
Will Rouesnel 7810448dbe Add proxy_url parameter to allow specifying per-job HTTP proxy servers
9 years ago
Jimmi Dyson da4c50a6cf Make scheme relabelable via discovery
9 years ago
Jimmi Dyson 52cf6b3e6e Configuration options for bearer tokens, client certs & CA certs
9 years ago
Florian Pfitzer 1fa0b0f253 fix consul port label
9 years ago
Brian Brazil adf7f16d1a Merge pull request #934 from prometheus/query-params
9 years ago
Brian Brazil d8875d17d8 Retrieval: Make it possible to relabel query params
9 years ago
Johannes 'fish' Ziemke 6e7d743cd4 Merge pull request #946 from prometheus/add-sd-dns-a
9 years ago
Johannes 'fish' Ziemke 9ab340e95e Add support for A record based DNS SD
9 years ago
beorn7 645f6772e5 Add Consul Address, ServicePort, and ServiceAddress to the meta labels.
9 years ago
Julius Volz 9d98910fca Revert "Use Consul ServiceAddress instead of Address when set"
9 years ago
Fabian Reinartz d53cc7935d retrieval: avoid race conditions
10 years ago
Brian Brazil 3d268d681e retrieval: Handle serverset node not existing.
10 years ago
Fabian Reinartz 080e067601 Merge pull request #832 from prometheus/fabxc/target-test
10 years ago
Brian Brazil 52859b8033 Merge pull request #836 from prometheus/shard
10 years ago
Brian Brazil 682f949ab1 Add 'hashmod' relabel action.
10 years ago
Fabian Reinartz 23862c92c4 retrieval/discovery: refresh services in Consul to recover from missing events.
10 years ago
Fabian Reinartz c292979374 retrieval: double timeout in target scrape test.
10 years ago
Julius Volz d868264bb8 Improve UI of /alerts page.
10 years ago
Fabian Reinartz 53b9d5917d web: improve target URL handling and display.
10 years ago
Fabian Reinartz dc7d27ab9a retrieval: add honor label handling and parametrized querying.
10 years ago
Fabian Reinartz 459d18cf18 Merge pull request #812 from Marmelatze/consul_services
10 years ago
Florian Pfitzer 0ac7e7217e Use Consul ServiceAddress instead of Address when set
10 years ago
Brian Brazil 4d895242f9 Add support for Zookeeper Serversets for SD.
10 years ago
Brian Brazil 0dbae36d36 Allow ingested metrics to be relabeled.
10 years ago
Brian Brazil 58ceae82bc Revert "Allow ingested metrics to be relabeled."
10 years ago
Brian Brazil f2f26ca08f Allow ingested metrics to be relabeled.
10 years ago
Fabian Reinartz b5fe2e9afe Merge pull request #773 from prometheus/fabxc/simple-cfg
10 years ago
Brian Brazil b8b1d3cbac Web: Add pre-relabel labels to status page.
10 years ago
Fabian Reinartz 0af1cff8af config: simplify default config handling.
10 years ago
Fabian Reinartz 8214b4ee78 retrieval/discovery: surround __meta_consul_tags value with tag seperators.
10 years ago
Fabian Reinartz 280d11dca8 main: exit on invalid rule files on startup.
10 years ago
Fabian Reinartz 0de6edbdfc Move pkg/ to util/
10 years ago
Fabian Reinartz dfaf31a1da Move web/httputils to pkg/httputil and add DeadlineClient to it
10 years ago
Fabian Reinartz a4f179230a Merge pull request #744 from prometheus/fabxc/fix-labels
10 years ago
Fabian Reinartz e9b344abee Fix discarding of labels in file target groups
10 years ago
Fabian Reinartz 8b7e5f9184 Stop holding TargetManager lock when stopping components.
10 years ago
Brian Brazil f34de493d5 Add increase() function, to replace delta(..., 1).
10 years ago
Fabian Reinartz efb39cfd4e Fix file SD test
10 years ago
Julius Volz 267fd34156 Switch Prometheus to use github.com/prometheus/log.
10 years ago
Fabian Reinartz 7143dff02f Add initial implementation for SD via Consul.
10 years ago
Fabian Reinartz b0c181dc0d Add Consul SD configuration.
10 years ago
Fabian Reinartz ff832d2e03 Attach __meta_filepath label to file SD targets.
10 years ago
Fabian Reinartz 8de50619f1 Increase target test wait times
10 years ago
Fabian Reinartz 385919a65a Avoid inter-component blocking if ingestion/scraping blocks.
10 years ago
Fabian Reinartz 1a2d57b45c Move template functionality out of target.
10 years ago
Fabian Reinartz dbc08d390e Move target status data into its own object
10 years ago
Fabian Reinartz 9ca47869ed Provide full SD configs to discovery constructors.
10 years ago
Fabian Reinartz 93548a8882 Add initial file based service discovery.
10 years ago
Fabian Reinartz d5aa012fd0 Make HTTP basic auth configurable for scrape targets.
10 years ago
Fabian Reinartz bb540fd9fd Implement config reloading on SIGHUP.
10 years ago
Fabian Reinartz 86087120dd Replace example config with new YAML format.
10 years ago
Fabian Reinartz 5fbde88919 Switch config to YAML format.
10 years ago
Fabian Reinartz b5a8f7b8fa Cleanup, test, and document config.
10 years ago
Fabian Reinartz 945c49a2dd Add relabelling to target management.
10 years ago
Fabian Reinartz 0b619b46d6 Change JobConfig to ScrapeConfig.
10 years ago
Fabian Reinartz 5015c2a0e8 Make target manager source based.
10 years ago
Fabian Reinartz 4f8673aa88 Simplify update sync for targets, format config fixtures.
10 years ago
Fabian Reinartz 36184f3530 Show correct error on wrong DNS response.
10 years ago
beorn7 fa1935a644 Remove /api/targets call and do not show job and instance labels on status.
10 years ago
beorn7 be11cb2b07 Remove the sample ingestion channel.
10 years ago
Julius Volz 140eede5e0 Rename UNREACHABLE to UNHEALTHY.
10 years ago
Sergiusz 'q3k' Bazański 0d0bb3c030 Change instance identifiers to be host:port
10 years ago
Sergiusz 'q3k' Bazański bb69a3d284 Hide HTTP auth parts from URL
10 years ago
Julius Volz af627bb2b9 Copy vendored deps manually instead of using Godeps.
10 years ago