mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
2266 commits 313 branches 456 tags 672 MiB
Commit graph

18 commits

Author SHA1 Message Date
Jimmi Dyson dfe2dd610b KubernetesSD: Remove redundant defaults from example config 2016-01-11 18:20:57 +01:00
Jimmi Dyson f979cecc90 KubernetesSD: Create targets for services as well as service endpoints 2016-01-11 18:20:56 +01:00
Jimmi Dyson cf99e45c9c Kubernetes SD: Cleanup example config label regexps 2016-01-11 16:48:24 +01:00
Jimmi Dyson 6c299c02c3 Kubernetes SD: Rename masters to api_servers in config 2016-01-11 16:48:24 +01:00
Thach MAI 734c361f05 Fix example prometheus.yml to use "external_labels" instead of "labels". 2016-01-11 16:48:21 +01:00
Jimmi Dyson 5028482388 Add Kubernetes namespace & name labels to example config 2016-01-11 16:48:20 +01:00
Jimmi Dyson 88c6da77f9 Kubernetes SD example: separate out cluster level components & services 2016-01-11 16:48:20 +01:00
Jimmi Dyson fb0931d681 Kubernetes SD config tidy & add labelmap action example 2016-01-11 16:48:20 +01:00
Keegan Carruthers-Smith cf5a5a82ac Move InCluster auth in kubernetes example config 
CA and Bearer Token are config of `kubernetes_sd_configs`, not the
`scrape_config`. Also updated misleading top-level comment and removed
unnecessary global config.
 2016-01-11 16:48:20 +01:00
Jimmi Dyson 609db27948 Move TLS options to scrape config 
Fixes #1013, fixes #989
 2016-01-11 16:48:14 +01:00
Jimmi Dyson 852dfd99e2 Kubernetes SD improvements 
* Support multiple masters with retries against each master as required.
* Scrape masters' metrics.
* Add role meta label for node/service/master to make it easier for relabeling.
 2016-01-11 16:48:13 +01:00
Jimmi Dyson 923f8111d4 Initial Kubernetes discovery 
Fixes #904
 2015-08-13 10:38:52 +01:00
Fabian Reinartz a703241bf8 Adjust example config to naming changes 2015-05-19 18:12:58 +02:00
Fabian Reinartz 86087120dd Replace example config with new YAML format. 2015-05-11 18:14:07 +02:00
Julius Volz fceef4137c Fix /metrics endpoint in sample config. 
Change-Id: I2daca6a31f536b87aa8e49a2190787ad9d803595
 2013-10-28 08:03:58 +01:00
Conor Hennessy 2d2c434d48 More updates for first time users. 
- Modified sample conf so it is useable by default, also added some
      comments from the 'hello world' configuration.
    - Updated README so there's a clear two step start for newbies.
    - Added extra vim swap files to gitignore.

Change-Id: I76203973db4a7b332014662fcfb2ce5e7d137bd8
 2013-10-22 20:54:43 +02:00
Conor Hennessy 986adfa557 Update example config file from json to new protobuf format. 
Change-Id: I38646c2be53b6993abe464d9cdd9b211678de496
 2013-10-22 20:54:43 +02:00
Matt T. Proud 5d1c794b30 Move documentation examples to dedicated location. 2013-01-27 17:55:08 +01:00