Commit Graph

83 Commits (9fe8bcf4be00a7ebd73932df0cf39cc837cbb993)

Author SHA1 Message Date
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
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 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
Fabian Reinartz b964da4b75 Merge pull request #905 from fabric8io/kubernetes-discovery
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 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
Fabian Reinartz 02e06839f2 config: hide authentication credentials in String() output
10 years ago
Brian Brazil 682f949ab1 Add 'hashmod' relabel action.
10 years ago
Fabian Reinartz dc7d27ab9a retrieval: add honor label handling and parametrized querying.
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 c44ac7bc26 Load rule files from entire directories
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