beorn7 
							
						 
					 
					
						
						
						
						
							
						
						
							44aa7ec46d 
							
						 
					 
					
						
						
							
							doc: Update scrape config in example prometheus.yml  
						
						
						
						
					 
					
						2016-06-14 09:57:03 +02:00 
						 
				 
			
				
					
						
							
							
								Pieter Lange 
							
						 
					 
					
						
						
						
						
							
						
						
							427b322078 
							
						 
					 
					
						
						
							
							Minor typo  
						
						
						
						
					 
					
						2016-05-24 11:12:42 +02:00 
						 
				 
			
				
					
						
							
							
								Patrick Bogen 
							
						 
					 
					
						
						
						
						
							
						
						
							ae413704e8 
							
						 
					 
					
						
						
							
							kubernetes pod-level discovery  
						
						
						
						
					 
					
						2016-05-18 17:18:52 -07:00 
						 
				 
			
				
					
						
							
							
								Julius Volz 
							
						 
					 
					
						
						
						
						
							
						
						
							657d65d6d6 
							
						 
					 
					
						
						
							
							Remove invalid scrape timeout from example config.  
						
						... 
						
						
						
						It can't be greater than the scrape interval. Let's just remove it. 
						
						
					 
					
						2016-02-24 21:06:36 +01:00 
						 
				 
			
				
					
						
							
							
								Julius Volz 
							
						 
					 
					
						
						
						
						
							
						
						
							e3baa35e9f 
							
						 
					 
					
						
						
							
							Fix typo in documentation/examples/kubernetes-rabbitmq/README.md  
						
						
						
						
					 
					
						2016-02-08 02:00:10 +01:00 
						 
				 
			
				
					
						
							
							
								Tiago Katcipis 
							
						 
					 
					
						
						
						
						
							
						
						
							73be7f63be 
							
						 
					 
					
						
						
							
							Fix typos and moving example to the correct place  
						
						
						
						
					 
					
						2016-01-23 16:38:24 -02:00 
						 
				 
			
				
					
						
							
							
								Tiago Katcipis 
							
						 
					 
					
						
						
						
						
							
						
						
							b7ae20d3d8 
							
						 
					 
					
						
						
							
							fixing typos  
						
						
						
						
					 
					
						2016-01-17 21:35:51 -02:00 
						 
				 
			
				
					
						
							
							
								Tiago Katcipis 
							
						 
					 
					
						
						
						
						
							
						
						
							53fb648849 
							
						 
					 
					
						
						
							
							adding README to explain the example  
						
						
						
						
					 
					
						2016-01-17 15:57:49 -02:00 
						 
				 
			
				
					
						
							
							
								Tiago Katcipis 
							
						 
					 
					
						
						
						
						
							
						
						
							bb4722d6b5 
							
						 
					 
					
						
						
							
							Adding RabbitMQ example as mentioned on  #1312  
						
						
						
						
					 
					
						2016-01-12 20:59:37 -02:00 
						 
				 
			
				
					
						
							
							
								Jimmi Dyson 
							
						 
					 
					
						
						
						
						
							
						
						
							d3934345e9 
							
						 
					 
					
						
						
							
							Kubernetes Discovery: Ensure metrics path isn't overwritten in example relabeling  
						
						
						
						
					 
					
						2016-01-12 21:06:32 +00:00 
						 
				 
			
				
					
						
							
							
								Jimmi Dyson 
							
						 
					 
					
						
						
						
						
							
						
						
							c12fb447b8 
							
						 
					 
					
						
						
							
							Kubernetes SD: Use first TCP service port as target port & clean up  
						
						... 
						
						
						
						example config
Fixes  #1256  
						
						
					 
					
						2015-12-08 10:29:40 +00:00 
						 
				 
			
				
					
						
							
							
								Jimmi Dyson 
							
						 
					 
					
						
						
						
						
							
						
						
							042f18b07a 
							
						 
					 
					
						
						
							
							Kubernetes SD: Fix metrics path relabeling in example config  
						
						
						
						
					 
					
						2015-11-25 10:27:11 +00:00 
						 
				 
			
				
					
						
							
							
								Jimmi Dyson 
							
						 
					 
					
						
						
						
						
							
						
						
							645feba8cf 
							
						 
					 
					
						
						
							
							KubernetesSD: Remove redundant defaults from example config  
						
						
						
						
					 
					
						2015-11-18 14:24:30 +00:00 
						 
				 
			
				
					
						
							
							
								Jimmi Dyson 
							
						 
					 
					
						
						
						
						
							
						
						
							2cca07381b 
							
						 
					 
					
						
						
							
							KubernetesSD: Create targets for services as well as service endpoints  
						
						
						
						
					 
					
						2015-11-18 14:15:39 +00:00 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Jimmi Dyson 
							
						 
					 
					
						
						
						
						
							
						
						
							a1574aa2b3 
							
						 
					 
					
						
						
							
							Move TLS options to scrape config  
						
						... 
						
						
						
						Fixes  #1013 , fixes  #989  
					
						2015-09-09 09:52:21 +01: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 
						 
				 
			
				
					
						
							
							
								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