Commit Graph

383 Commits (9a9e73b34a7d6a34083f486a66ce4243b89f45c6)

Author SHA1 Message Date
Fabian Reinartz 9ba61df45a Merge pull request #2789 from mtanda/aws_default_region
8 years ago
Mitsuhiro Tanda 64cef5cd05 handle NewSession() error
8 years ago
Christian Groschupp 8f781e411c Openstack Service Discovery (#2701)
8 years ago
Roman Vynar dbe2eb2afc Hide consul token on UI. (#2797)
8 years ago
Mitsuhiro Tanda a1ddab463e config: set default region for EC2 SD
8 years ago
Tobias Schmidt 287ec6e6cc Fix outdated target_group naming in error message
8 years ago
Julius Volz 240bb671e2 config: Fix overflow checking in global config (#2783)
8 years ago
Conor Broderick 6766123f93 Replace regex with Secret type and remarshal config to hide secrets (#2775)
8 years ago
Brian Akins 27d66628a1 Allow limiting Kubernetes service discover to certain namespaces
8 years ago
Julius Volz eb14678a25 Make remote read/write use config.HTTPClientConfig
8 years ago
Julius Volz 02395a224d [WIP] Remote Read
8 years ago
Julius Volz 525da88c35 Merge pull request #2479 from YKlausz/consul-tls
8 years ago
Goutham Veeramachaneni 5c89cec65c Stricter Relabel Config Checking for Labeldrop/keep (#2510)
8 years ago
yklausz 75880b594f Adding consul capability to connect via tls
8 years ago
Michael Kraus 04eadf6e20 Allow Marathon SD without bearer_token and bearer_token_file
8 years ago
Michael Kraus 47bdcf0f67 Allow the use of bearer_token or bearer_token_file for MarathonSD
8 years ago
Julius Volz e9476b35d5 Re-add multiple remote writers
8 years ago
Alex Somesan b22eb65d0f Cleaner separation between ServiceAccount and custom authentication in K8S SD (#2348)
8 years ago
Fabian Reinartz 7eb849e6a8 Merge pull request #2307 from joyent/triton_discovery
8 years ago
Richard Kiene f3d9692d09 Add Joyent Triton discovery
8 years ago
Björn Rabenstein ad40d0abbc Merge pull request #2288 from prometheus/limit-scrape
8 years ago
Brian Brazil 30448286c7 Add sample_limit to scrape config.
8 years ago
Tristan Colgate-McFarlane 4d9134e6d8 Add labeldrop and labelkeep actions. (#2279)
8 years ago
Fabian Reinartz cc35104504 config: fix naming and typo
8 years ago
Fabian Reinartz 3fb4d1191b config: rename AlertingConfig, resolve file paths
8 years ago
Fabian Reinartz 183c5749b9 config: add Alertmanager configuration
8 years ago
Fabian Reinartz 200bbe1bad config: extract SD and HTTPClient configurations
8 years ago
Fabian Reinartz ec66082749 Merge branch 'ec2_sd_profile_support' of https://github.com/Ticketmaster/prometheus into Ticketmaster-ec2_sd_profile_support
8 years ago
Kraig Amador bec6870ed4 ec2_sd_configs: Support profiles for configuring the ec2 service
8 years ago
beorn7 b2f28a9e82 Merge branch 'release-1.2'
8 years ago
Brian Brazil d1ece12c70 Handle null Regex in the config as the empty regex. (#2150)
8 years ago
bekbulatov 2bc12fa2fb Set timeout for marathon_sd
8 years ago
bekbulatov c689b35858 Merge branch 'master' into marathon_tls
8 years ago
Matti Savolainen aabf4a419b use LabelNam.IsValid() instead of LabelNameRE and MatchString instead of Match
8 years ago
Matti Savolainen ec6524ce74 test the labelTarget regex to make sure it properly validates pre-interpolated label names.
8 years ago
Matti Savolainen f867c1fd58 formating and text fixes, adjust regexp
8 years ago
Matti Savolainen 56907ba6e3 Add interpolation to good test config. Fix regex
8 years ago
Matti Savolainen 7a36af1c85 add comment about interpolation
8 years ago
Matti Savolainen 3b8e7c1277 Merge branch 'master' of https://github.com/prometheus/prometheus into bug/target_label_unmarshal
8 years ago
Matti Savolainen 5a1e909b5d Make TargetLabel in RelabelConfig a string
8 years ago
Björn Rabenstein d93f73874f Merge pull request #2093 from dominikschulz/spelling
8 years ago
Dominik Schulz 182e17958a Trivial spelling corrections and a small comment.
8 years ago
bekbulatov ac702f66eb Resolve merge conflicts
8 years ago
Fabian Reinartz 1b6dfa32a9 config: rename role 'endpoint' to 'endpoints'
8 years ago
Frederic Branczyk 2e18c81a00 config: adapt unit tests
8 years ago
Fabian Reinartz b24602f713 kubernetes: merge back into single configuration
8 years ago
Fabian Reinartz 2331701b50 kubernetes: Add K8S v2 pod discovery
8 years ago
Dominik Schulz 72cbf8af6f Fix small copy and paste error
8 years ago
bekbulatov 01b53c1180 Add tls support
8 years ago
Brian Brazil 77605649a9 Add support for remote write relabelling.
8 years ago
Tom Wilkie 4520e12440 Add HTTP Basic Auth & TLS support to the generic write path. (#1957)
8 years ago
Tobias Schmidt 874cb44bb6 Merge pull request #1996 from ton31337/Fix/allow_numbers_as_first_letter
8 years ago
Donatas Abraitis 1aa8898b66 Allow number to be the first letter as well for `job_name`
8 years ago
Ingo Gottwald 3b546d061f Add support for GCE discovery
8 years ago
Alexey Miroshkin e29d9394e5 Forbid invalid relabel configurations
8 years ago
Fabian Reinartz be596f82b4 Merge pull request #1783 from knyar/json
8 years ago
Frederic Branczyk b655aa002f introduce top level alerting config node
8 years ago
Frederic Branczyk 679d225c8d allow relabeling of alerts
8 years ago
Fabian Reinartz 7a0b3af0b7 config: validate Kubernetes role correctly.
8 years ago
Fabian Reinartz 919558f601 config: remove deprecated `target_groups` configuration
8 years ago
Fabian Reinartz 7221228843 discovery/kubernetes: select between discovery role
9 years ago
Anton Tolchanov 772a3af38f Allow URLs in targets defined via a JSON file
9 years ago
Ali Reza 98c156c361 reorder config validation, move checkOverflow before any other validation
9 years ago
Fabian Reinartz 0f21bd31ca config: deprecate `target_groups` for `static_configs`
9 years ago
Jimmi Dyson 206bcfcdaa
Kubernetes SD: Remove kubeletPort config option
9 years ago
Ali Reza c81b4e8a87 change config names to files for consistency
9 years ago
Gregory G. Tseng 7997c14b0d Add ServerName into TLS Config
9 years ago
Seth Miller 0988e3b937 Add support for Azure discovery
9 years ago
Fabian Reinartz 37c709f917 Fix global config YAML issues
9 years ago
Fabian Reinartz 44a5e860ed Fix scrape timeout config checks
9 years ago
Julius Volz 829a029dda Update two more __meta_dns_srv_name references.
9 years ago
Fabian Reinartz e26e4b6e89 Restrict scrape timeout to interval length
9 years ago
beorn7 a7408bfb47 Unify duration parsing
9 years ago
Julien Dehee 061fe2f364 Support AirBnB's Smartstack Nerve client for SD
9 years ago
Fabian Reinartz 4d1c9296d5 Add new defaults for relabel configurations
9 years ago
Brian Brazil fd2bd81cd8 Allow all instance labels in target groups
9 years ago
Fabian Reinartz f2a8261cdb Merge pull request #1177 from fabric8io/kubernetes-discovery
9 years ago
Fabian Reinartz 180da1ba65 Add overflow check in TLS config
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
Brian Brazil 1ddf75240d config: Don't hide username, it's not secret.
9 years ago
Matt Jibson dcb4856d72 Add SD for Amazon EC2 instances
9 years ago
Julius Volz dac26cef71 Rename global "labels" config option to "external_labels".
9 years ago
Matt Jibson 0e99fa6c46 Allow labelmap action
9 years ago
Jimmi Dyson ec04ba38a2 Kubernetes SD config check
9 years ago
Jimmi Dyson a1574aa2b3 Move TLS options to scrape config
9 years ago
Fabian Reinartz 1ef5ed0cf2 Merge pull request #1048 from xperimental/fix/marathon-config
9 years ago
Robert Jacob eb7416e71f Fix missing unmarshal for Marathon SD config.
9 years ago
Jimmi Dyson d7a7fd4589 Kubernetes SD improvements
9 years ago
Julius Volz f63a899744 Change config regexes to full-string matches.
9 years ago
Julius Volz 995d3b831d Fix most golint warnings.
9 years ago
Fabian Reinartz 438e232c9b Fix grouping of import blocks
9 years ago
Fabian Reinartz 306e8468a0 Switch from client_golang/model to common/model
9 years ago
Fabian Reinartz ac0be60bb9 Add license headers
9 years ago
Fabian Reinartz 139f27bf8a Increase default retry interval for file SD
9 years ago
Fabian Reinartz 3c6dd161d7 Scrape all services on empty services list.
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
Brian Brazil 43449b0581 config: Update tests/examples to use __tmp_
9 years ago
Jimmi Dyson 923f8111d4 Initial Kubernetes discovery
9 years ago
Fabian Reinartz cdcfada2ac Merge pull request #965 from prometheus/fabxc/relpath
9 years ago
Fabian Reinartz 73f1cc807d Check token and cert file existence in promtool
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
Fabian Reinartz 7a67472fc1 Resolve relative paths on configuration loading
9 years ago
Jimmi Dyson 52cf6b3e6e Configuration options for bearer tokens, client certs & CA certs
9 years ago
Johannes 'fish' Ziemke 9ab340e95e Add support for A record based DNS SD
9 years ago
Fabian Reinartz 187fe4e3d3 Fix missing defaults for empty global config blocks
9 years ago
Fabian Reinartz 2a53b107c1 Fix missing defaults in empty configurations
9 years ago
Fabian Reinartz 435fc7234f config: add overflow detection for serverset config
10 years ago
Fabian Reinartz 02e06839f2 config: hide authentication credentials in String() output
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 4319b06dd2 config: add omitempty for consul SD config.
10 years ago
Fabian Reinartz 7ec15956e4 config: show original input on String()
10 years ago
Fabian Reinartz dc7d27ab9a retrieval: add honor label handling and parametrized querying.
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 116e6df096 config: raise error on unknown config parameters.
10 years ago
Fabian Reinartz 3a24a7779d config: extend and format config example/test.
10 years ago
Fabian Reinartz 458550560c config: error on missing regex in relabel config.
10 years ago
Fabian Reinartz b5fe2e9afe Merge pull request #773 from prometheus/fabxc/simple-cfg
10 years ago
Fabian Reinartz f6c33a2347 config: prevent overwrite of DefaultGlobalConfig
10 years ago
Fabian Reinartz db3367e83f config: ensure correct labelname in JSON target group.
10 years ago
Fabian Reinartz 0af1cff8af config: simplify default config handling.
10 years ago
Fabian Reinartz 17c4c8ed95 config: fix json/yaml tag inconsistencies.
10 years ago
Fabian Reinartz 867f2ac979 Merge pull request #762 from prometheus/0.14.1
10 years ago
Joonas Bergius 5d5c3878ed Restore default ScrapeInterval of 1 minute instead of 10 seconds
10 years ago
Fabian Reinartz 0de6edbdfc Move pkg/ to util/
10 years ago
Fabian Reinartz dbc0d30e3e Move string functionality to pkg/strutil
10 years ago
Fabian Reinartz c44ac7bc26 Load rule files from entire directories
10 years ago
Fabian Reinartz ed6572fc0c Fix typos
10 years ago
Fabian Reinartz b0c181dc0d Add Consul SD configuration.
10 years ago
Fabian Reinartz 93548a8882 Add initial file based service discovery.
10 years ago
Fabian Reinartz 3b21c7037a Add file SD to configuration.
10 years ago
Fabian Reinartz d5aa012fd0 Make HTTP basic auth configurable for scrape targets.
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 0280d74167 Fix scrape timeout in config.
10 years ago
Julius Volz 464524fa44 Make config/Makefile use user Go installation.
10 years ago
Julius Volz af627bb2b9 Copy vendored deps manually instead of using Godeps.
10 years ago
Bjoern Rabenstein cf28c2efbb Change autogenerated protobuf code.
10 years ago
Bjoern Rabenstein 5859b74f1b Clean up license issues.
10 years ago
Bjoern Rabenstein 39efe6358b Fix typos and import order.
10 years ago
Bjoern Rabenstein b1e4956142 Apply a giant code cleanup.
10 years ago
Bjoern Rabenstein 006b5517e2 Simplify makefiles.
10 years ago
Julius Volz 7b013e6491 Merge "Replace some uses of obsolete `/metrics.json` with `/metrics` (haven't touched test files yet)."
11 years ago
Julius Volz 78ebc1a61f Ensure that job names are unique in parsed configs.
11 years ago
Conor Hennessy aada5ded85 Replace some uses of obsolete `/metrics.json` with `/metrics`
11 years ago
Conor Hennessy 2d26db7e37 Trivial regeneration of config proto (wasn't regenerated with new comments).
11 years ago
Julius Volz 788587426b Make scrape timeouts configurable per job.
11 years ago
Julius Volz d69b85e6c9 Add global label support via Ingesters.
11 years ago
Julius Volz c03712dc58 Update config.pb.go (now includes comments from protobuf definition file).
11 years ago
Julius Volz a310afd28f Update "build" -> ".build" in remaining Makefiles.
12 years ago
Julius Volz 1cf9e5840a Fix whitespace in config.proto.
12 years ago
Matt T. Proud f895acb9ef Trailing build system cleanups.
12 years ago
Julius Volz d9b4f98b44 Integrate DNS-SD support for discovering job targets.
12 years ago
Matt T. Proud 8f4c7ece92 Destroy naked returns in half of corpus.
12 years ago
Matt T. Proud 161c8fbf9b Include deletion processor for long-tail values.
12 years ago
Matt T. Proud 38d839d810 Include generated Protocol Buffers artifacts.
12 years ago
Julius Volz 9cea5d9df8 Convert the Prometheus configuration to protocol buffers.
12 years ago
Julius Volz c0601abf46 Implement initial no-op alert parsing and rule parsing tests.
12 years ago
Julius Volz f1fc7d717a Allow replacing job targets via HTTP API.
12 years ago
Julius Volz 39411b516d Add missing config test fixtures.
12 years ago
Julius Volz d137362257 Config tests and config cleanups+fixes.
12 years ago
Julius Volz c3d31febd6 Move durationToString to common place and cleanup error handling.
12 years ago
Julius Volz 06ace4941d Remove/replace last references to github.com/matttproud/...
12 years ago
Julius Volz 16d9dcd6a8 Add copyright notices to all remaining files.
12 years ago
Matt T. Proud ea54751431 Update import paths to new location.
12 years ago
Tobias Schmidt 6523536758 Fix bug in config.LoadFromFile if file is not present
12 years ago
Julius Volz a555ded2b3 Add "w" (weeks) as a valid timeunit.
12 years ago
Matt T. Proud efe61c18fa Refactor target scheduling to separate facility.
12 years ago
Julius Volz cb6eb30182 Fix state cleanup bug between rule/config parser runs.
12 years ago
Julius Volz 56384bf42a Add initial config and rule language implementation.
12 years ago