Frederic Branczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							507617e150 
							
						 
					 
					
						
						
							
							Remove old manifests and replace with jsonnet build  
						
						
						
						
					 
					
						2018-04-13 13:36:34 +02:00 
						 
				 
			
				
					
						
							
							
								Max Leonard Inden 
							
						 
					 
					
						
						
						
						
							
						
						
							2f302943fe 
							
						 
					 
					
						
						
							
							Unify rule file label accross repository  
						
						... 
						
						
						
						In some cases we have been using `alert-rules` in some cases
`prometheus-rulefiles`. This led to confusion [1]. Instead, unify the
Prometheus rules configmap labels to:
```yaml
labels:
  role: alert-rules
```
[1] https://github.com/coreos/prometheus-operator/issues/1102  
						
						
					 
					
						2018-03-19 14:24:48 +01:00 
						 
				 
			
				
					
						
							
							
								Frederic Branczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							e8a19234dc 
							
						 
					 
					
						
						
							
							kube-prometheus/hack: Add generation for grafana dashboard source file  
						
						
						
						
					 
					
						2018-02-12 11:50:04 +01:00 
						 
				 
			
				
					
						
							
							
								Antoine Legrand 
							
						 
					 
					
						
						
						
						
							
						
						
							8a0c21ff29 
							
						 
					 
					
						
						
							
							Merge pull request  #968  from brancz/grafana-v5  
						
						... 
						
						
						
						kube-prometheus: Upgrade to grafana v5 
						
						
					 
					
						2018-02-12 10:41:07 +01:00 
						 
				 
			
				
					
						
							
							
								Frederic Branczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							85f88025f3 
							
						 
					 
					
						
						
							
							kube-prometheus: Upgrade to grafana v5  
						
						
						
						
					 
					
						2018-02-09 13:21:37 +01:00 
						 
				 
			
				
					
						
							
							
								Frederic Branczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							acb10c1678 
							
						 
					 
					
						
						
							
							Merge pull request  #973  from  Ludek2/fixing#972  
						
						... 
						
						
						
						fixing#972 
						
						
					 
					
						2018-02-09 11:14:01 +01:00 
						 
				 
			
				
					
						
							
							
								Scott Brenner 
							
						 
					 
					
						
						
						
						
							
						
						
							51515b1e2b 
							
						 
					 
					
						
						
							
							Update wrap-dashboard.sh  
						
						... 
						
						
						
						Might as well, right? 
						
						
					 
					
						2018-02-08 12:50:19 -08:00 
						 
				 
			
				
					
						
							
							
								ludek_navratil 
							
						 
					 
					
						
						
						
						
							
						
						
							37f7fd52e8 
							
						 
					 
					
						
						
							
							fixing#972  
						
						
						
						
					 
					
						2018-02-08 17:21:44 +00:00 
						 
				 
			
				
					
						
							
							
								Frederic Branczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							9b134da849 
							
						 
					 
					
						
						
							
							Merge pull request  #948  from  Ludek2/fixing#947  
						
						... 
						
						
						
						fixing#947 
						
						
					 
					
						2018-02-01 14:02:13 +01:00 
						 
				 
			
				
					
						
							
							
								ludek_navratil 
							
						 
					 
					
						
						
						
						
							
						
						
							614f8ee0a3 
							
						 
					 
					
						
						
							
							fixing#947  
						
						
						
						
					 
					
						2018-01-31 19:48:28 +00:00 
						 
				 
			
				
					
						
							
							
								ludek_navratil 
							
						 
					 
					
						
						
						
						
							
						
						
							aafb48c4db 
							
						 
					 
					
						
						
							
							fixing inputname var assignment  
						
						
						
						
					 
					
						2018-01-30 22:53:26 +00:00 
						 
				 
			
				
					
						
							
							
								Frederic Branczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							642df8ac25 
							
						 
					 
					
						
						
							
							kube-prometheus: Fix generate scripts  
						
						
						
						
					 
					
						2018-01-26 12:03:26 +01:00 
						 
				 
			
				
					
						
							
							
								Frederic Branczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							5392443721 
							
						 
					 
					
						
						
							
							kube-prometheus: Add etcd dashboard  
						
						
						
						
					 
					
						2018-01-10 14:46:00 +01:00 
						 
				 
			
				
					
						
							
							
								Nuala Gaffey 
							
						 
					 
					
						
						
						
						
							
						
						
							bf6461b851 
							
						 
					 
					
						
						
							
							Wrapping the filename in quotes preserves the .yml suffix, so regex is no longer necessary  
						
						
						
						
					 
					
						2017-11-28 19:22:17 -05:00 
						 
				 
			
				
					
						
							
							
								Nuala Gaffey 
							
						 
					 
					
						
						
						
						
							
						
						
							ce20757475 
							
						 
					 
					
						
						
							
							Per issue 593, append .yml to each filename used in the generated configmap. I wasn't able to see alerts in the Prometheus UI until I did this  
						
						
						
						
					 
					
						2017-11-27 17:04:43 -05:00 
						 
				 
			
				
					
						
							
							
								Nuala Gaffey 
							
						 
					 
					
						
						
						
						
							
						
						
							40d746e12a 
							
						 
					 
					
						
						
							
							Promtool appends .yml, not .yaml, but for backwards compatibility, lets allow both  
						
						
						
						
					 
					
						2017-11-22 16:41:05 -05:00 
						 
				 
			
				
					
						
							
							
								Arve Knudsen 
							
						 
					 
					
						
						
						
						
							
						
						
							d04cccc526 
							
						 
					 
					
						
						
							
							Use grafanalib to generate Grafana dashboards  
						
						
						
						
					 
					
						2017-10-30 22:05:25 +01:00 
						 
				 
			
				
					
						
							
							
								Frederic Branczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							1b7c8cdf21 
							
						 
					 
					
						
						
							
							*: bump Prometheus to v2.0.0-rc.1  
						
						
						
						
					 
					
						2017-10-17 20:13:40 +02:00 
						 
				 
			
				
					
						
							
							
								Eduardo Gonzalez 
							
						 
					 
					
						
						
						
						
							
						
						
							41972d362c 
							
						 
					 
					
						
						
							
							added grafana-deployment updates when configmaps are generated  
						
						
						
						
					 
					
						2017-09-14 15:26:45 +02:00 
						 
				 
			
				
					
						
							
							
								Eduardo Gonzalez 
							
						 
					 
					
						
						
						
						
							
						
						
							b75d263567 
							
						 
					 
					
						
						
							
							grafana configmap generator integrated  
						
						
						
						
					 
					
						2017-08-15 17:18:09 +02:00 
						 
				 
			
				
					
						
							
							
								Frederic Branczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							066b04322d 
							
						 
					 
					
						
						
							
							grafana-watcher: allow credentials from env variable  
						
						
						
						
					 
					
						2017-04-06 15:24:22 +02:00 
						 
				 
			
				
					
						
							
							
								Frederic Branczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							d9086e9875 
							
						 
					 
					
						
						
							
							kube-prometheus: remove duplication in grafana dashboards  
						
						... 
						
						
						
						Datasource links were duplicated in the grafana dashboads. This now also
allows exporting grafana dashboards from the UI and just dropping them
into the assets directory and they will be wrapped by the manifest
generation script. 
						
						
					 
					
						2017-03-13 12:08:30 +01:00 
						 
				 
			
				
					
						
							
							
								Frederic Branczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							9ed63f191f 
							
						 
					 
					
						
						
							
							kube-prometheus: generate manifests without kubectl  
						
						... 
						
						
						
						For `--dry-run` to work with kubectl a Kubernetes cluster's apiserver is
actually used, which is unnecessary for generating these manifests. This
approach also allows further customization, such as adding labels to the
generated manifests. 
						
						
					 
					
						2017-03-13 11:17:23 +01:00 
						 
				 
			
				
					
						
							
							
								Frederic Branczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							5546016826 
							
						 
					 
					
						
						
							
							prometheus: mount rule files based on label selector  
						
						
						
						
					 
					
						2017-03-13 11:14:16 +01:00 
						 
				 
			
				
					
						
							
							
								Frederic Branczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							e69a6f69ec 
							
						 
					 
					
						
						
							
							alertmanager: use a secret for the config  
						
						
						
						
					 
					
						2017-03-09 10:04:47 +01:00 
						 
				 
			
				
					
						
							
							
								Frederic Branczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							89ed6773e7 
							
						 
					 
					
						
						
							
							Add 'contrib/kube-prometheus/' from commit '81c0d2f4d30f63a4e274c2870c5afc89241827b0'  
						
						... 
						
						
						
						git-subtree-dir: contrib/kube-prometheus
git-subtree-mainline: 050ca21276696c8603375c699513ec487301ed62
git-subtree-split: 81c0d2f4d30f63a4e274c2870c5afc89241827b0 
						
						
					 
					
						2017-03-06 09:55:36 +01:00