Jimmi Dyson
104803e74e
Kubernetes SD: Cleanup example config label regexps
2015-10-24 19:29:58 +01:00
Jimmi Dyson
87940ec213
Kubernetes SD: Rename `masters` to `api_servers` in config
2015-10-24 14:41:14 +01:00
Thach MAI
94f4430ff3
Fix example prometheus.yml to use "external_labels" instead of "labels".
2015-10-02 23:00:10 +02:00
Jimmi Dyson
1976dfe634
Add Kubernetes namespace & name labels to example config
2015-09-29 12:55:15 +01:00
Jimmi Dyson
0d61605526
Kubernetes SD example: separate out cluster level components & services
2015-09-29 11:22:18 +01:00
Jimmi Dyson
e26fc5e73c
Kubernetes SD config tidy & add labelmap action example
2015-09-29 08:59:35 +01:00
Keegan Carruthers-Smith
e633b1dc8d
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.
2015-09-29 09:05:21 +02:00
Fabian Reinartz
58c32f84ce
Merge pull request #1055 from fabric8io/kubernetes-discovery
...
Move TLS options to scrape config
2015-09-09 11:24:29 +02:00
Jimmi Dyson
a1574aa2b3
Move TLS options to scrape config
...
Fixes #1013 , fixes #989
2015-09-09 09:52:21 +01:00
Fabian Reinartz
e298463fd6
Merge pull request #1053 from prometheus/diag
...
Update architecture diagram
2015-09-07 15:08:14 +02:00
Fabian Reinartz
e761f0d664
Update architecture diagram
2015-09-07 14:11:28 +02:00
Jimmi Dyson
d7a7fd4589
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.
2015-09-04 11:31:20 +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
beorn7
33ef2e411b
Remove hopelessly outdated tutorial.
2015-03-13 15:50:57 +01:00
Julius Volz
62b69b005d
Update architecture diagram and include source file.
...
Change-Id: I2a793a5d1941dc0e945a9cfe25df5f5a79d2b10a
2014-12-23 14:04:58 +01:00
Julius Volz
9c43ed7b6d
Update architecture diagram.
...
Include links to components and include the pushgateway.
Change-Id: I8edb246fac3ba6b2f97ef0d810e0d3bf163be5f7
2014-12-07 01:58:20 +01:00
Julius Volz
6717f6b2f4
Add architecture overview diagram.
...
Change-Id: I860a748be534b2b9b0b60a9dd2e4436b78cc3907
2014-12-07 01:22:03 +01:00
Julius Volz
c35db9f080
Add Java implementation links to metric model docs.
...
Change-Id: If2a36aa305a0806ffdf490f78e85afb71da8c202
2014-02-27 15:08:44 +01:00
Julius Volz
688f4f43c3
Minor metric type documentation fixups.
...
Change-Id: Ib01ab728e9f0a6b15c23f1cde84161efe9f89e33
2014-02-25 15:29:04 +01:00
Julius Volz
91aebda74d
Merge "Interim commit of metric model."
2014-02-25 15:24:17 +01: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
9dd3f95861
Interim commit of metric model.
...
Change-Id: I54c74d796bd175fe056353983043a10c03974185
2013-08-27 14:21:25 +02:00
Matt T. Proud
d538b0382f
Include long-tail data deletion mechanism.
...
This commit introduces the long-tail deletion mechanism, which will
automatically cull old sample values. It is an acceptable
hold-over until we get a resampling pipeline implemented.
Kill legacy OS X documentation, too.
2013-05-13 10:54:36 +02:00
Julius Volz
06ace4941d
Remove/replace last references to github.com/matttproud/...
2013-02-07 14:32:18 +01:00
Matt T. Proud
5d1c794b30
Move documentation examples to dedicated location.
2013-01-27 17:55:08 +01:00